diff --git a/MP-TAB/Commenti.aspx b/MP-TAB/Commenti.aspx
index 977d4422..d1be1844 100644
--- a/MP-TAB/Commenti.aspx
+++ b/MP-TAB/Commenti.aspx
@@ -8,25 +8,25 @@
 <%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-  <div class="container-flow m-3" role="main">
-    <div class="row">
-      <div class="col-12 col-md-8 col-lg-9 col-xl-10">
-        <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
-        <uc4:mod_insComm ID="mod_insComm1" runat="server" showSalva="true" labelAddCommento="Nuovo Commento" />
-        <div runat="server" id="pnlEventi">
-          <div class="row">
-            <div class="col-7 col-sm-8 col-lg-9 pr-1">
-              <uc5:mod_fermate ID="mod_fermate1" runat="server" />
+    <div class="container-flow m-3" role="main">
+        <div class="row">
+            <div class="col-12 col-md-8 col-lg-9 col-xl-10">
+                <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
+                <uc4:mod_insComm ID="mod_insComm1" runat="server" showSalva="true" labelAddCommento="Nuovo Commento" />
+                <div runat="server" id="pnlEventi">
+                    <div class="row">
+                        <div class="col-7 col-sm-8 col-lg-9 pr-1">
+                            <uc5:mod_fermate ID="mod_fermate1" runat="server" />
+                        </div>
+                        <div class="col-5  col-sm-4 col-lg-3 pl-1">
+                            <uc2:mod_commenti ID="mod_commenti1" runat="server" />
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div class="col-5  col-sm-4 col-lg-3 pl-1">
-              <uc2:mod_commenti ID="mod_commenti1" runat="server" />
+            <div class="col-12 col-md-4 col-lg-3 col-xl-2">
+                <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
             </div>
-          </div>
         </div>
-      </div>
-      <div class="col-12 col-md-4 col-lg-3 col-xl-2">
-        <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
-      </div>
     </div>
-  </div>
 </asp:Content>
diff --git a/MP-TAB/Commenti.aspx.cs b/MP-TAB/Commenti.aspx.cs
index a7a5ef71..3e999451 100644
--- a/MP-TAB/Commenti.aspx.cs
+++ b/MP-TAB/Commenti.aspx.cs
@@ -1,10 +1,67 @@
-using SteamWare;
-using System;
+using System;
 
 namespace MoonProTablet
 {
     public partial class Commenti : BasePage
     {
+        #region Private Methods
+
+        /// <summary>
+        /// richiesta ins nuovo evento...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void mod_commenti1_eh_newVal(object sender, EventArgs e)
+        {
+            showPnlDichiaraz(true);
+        }
+
+        private void mod_commenti1_eh_reqEdit(object sender, EventArgs e)
+        {
+            mod_insComm1.caricaCommento();
+        }
+
+        private void mod_commenti1_eh_reset(object sender, EventArgs e)
+        {
+            showPnlDichiaraz(false);
+        }
+
+        private void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
+        {
+            // ricarico tutto!
+            Response.Redirect("Commenti.aspx");
+        }
+
+        private void mod_fermate1_eh_reqEdit(object sender, EventArgs e)
+        {
+            // avendo in sessione inizio fermata DEVO andare a pagina DichFermi, in modalità "ritroso", precompilare data/ora ed eventuale descizione...
+            Response.Redirect("Fermate.aspx");
+        }
+
+        private void mod_insComm1_eh_inserting(object sender, EventArgs e)
+        {
+        }
+
+        private void mod_insComm1_eh_newVal(object sender, EventArgs e)
+        {
+            mod_commenti1.doUpdate();
+        }
+
+        private void mod_insComm1_eh_reset(object sender, EventArgs e)
+        {
+            showPnlDichiaraz(false);
+            mod_commenti1.doUpdate();
+        }
+
+        private void showPnlDichiaraz(bool showDich)
+        {
+            pnlEventi.Visible = !showDich;
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
         protected void Page_Load(object sender, EventArgs e)
         {
             Session["TipoLink"] = "EditMacch";
@@ -15,55 +72,6 @@ namespace MoonProTablet
             mod_fermate1.eh_reqEdit += mod_fermate1_eh_reqEdit;
         }
 
-        void mod_fermate1_eh_reqEdit(object sender, EventArgs e)
-        {
-            // avendo in sessione inizio fermata DEVO andare a pagina DichFermi, in modalità "ritroso", precompilare data/ora ed eventuale descizione...
-            Response.Redirect("Fermate.aspx");
-        }
-
-        void mod_insComm1_eh_inserting(object sender, EventArgs e)
-        {
-        }
-
-        void mod_commenti1_eh_reqEdit(object sender, EventArgs e)
-        {
-            mod_insComm1.caricaCommento();
-        }
-
-        void mod_insComm1_eh_reset(object sender, EventArgs e)
-        {
-            showPnlDichiaraz(false);
-            mod_commenti1.doUpdate();
-        }
-
-        void mod_insComm1_eh_newVal(object sender, EventArgs e)
-        {
-            mod_commenti1.doUpdate();
-        }
-
-        void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
-        {
-            // ricarico tutto!
-            Response.Redirect("Commenti.aspx");
-        }
-
-        void mod_commenti1_eh_reset(object sender, EventArgs e)
-        {
-            showPnlDichiaraz(false);
-        }
-        /// <summary>
-        /// richiesta ins nuovo evento...
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void mod_commenti1_eh_newVal(object sender, EventArgs e)
-        {
-            showPnlDichiaraz(true);
-        }
-
-        private void showPnlDichiaraz(bool showDich)
-        {
-            pnlEventi.Visible = !showDich;
-        }
+        #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/MP-TAB/Commenti.aspx.designer.cs b/MP-TAB/Commenti.aspx.designer.cs
index 2e6f6cb9..8b8943b0 100644
--- a/MP-TAB/Commenti.aspx.designer.cs
+++ b/MP-TAB/Commenti.aspx.designer.cs
@@ -1,68 +1,70 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MoonProTablet {
-    
-    
-    public partial class Commenti {
-        
+namespace MoonProTablet
+{
+
+
+    public partial class Commenti
+    {
+
         /// <summary>
-        /// Controllo mod_dettMacchina1.
+        /// mod_dettMacchina1 control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
-        
+
         /// <summary>
-        /// Controllo mod_insComm1.
+        /// mod_insComm1 control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::MoonProTablet.WebUserControls.mod_insComm mod_insComm1;
-        
+
         /// <summary>
-        /// Controllo pnlEventi.
+        /// pnlEventi control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlEventi;
-        
+
         /// <summary>
-        /// Controllo mod_fermate1.
+        /// mod_fermate1 control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::MoonProTablet.WebUserControls.mod_fermate mod_fermate1;
-        
+
         /// <summary>
-        /// Controllo mod_commenti1.
+        /// mod_commenti1 control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::MoonProTablet.WebUserControls.mod_commenti mod_commenti1;
-        
+
         /// <summary>
-        /// Controllo mod_directLinks.
+        /// mod_directLinks control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
     }
diff --git a/MP-TAB/Dichiarazioni.aspx b/MP-TAB/Dichiarazioni.aspx
new file mode 100644
index 00000000..b1a8dfa0
--- /dev/null
+++ b/MP-TAB/Dichiarazioni.aspx
@@ -0,0 +1,32 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Dichiarazioni.aspx.cs" Inherits="MoonProTablet.Dichiarazioni" %>
+
+<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_commenti.ascx" TagName="mod_commenti" TagPrefix="uc2" %>
+<%@ Register Src="~/WebUserControls/mod_dichiarazione.ascx" TagName="mod_dichiarazione" TagPrefix="uc3" %>
+<%@ Register Src="~/WebUserControls/mod_insComm.ascx" TagName="mod_insComm" TagPrefix="uc4" %>
+<%@ Register Src="~/WebUserControls/mod_fermate.ascx" TagName="mod_fermate" TagPrefix="uc5" %>
+<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+    <div class="container-flow m-3" role="main">
+        <div class="row">
+            <div class="col-12 col-md-8 col-lg-9 col-xl-10">
+                <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
+                <uc4:mod_insComm ID="mod_insComm1" runat="server" showSalva="true" labelAddCommento="Nuovo Commento" />
+                <div runat="server" id="pnlEventi">
+                    <div class="row">
+                        <div class="col-7 col-sm-8 col-lg-9 pr-1">
+                            <uc5:mod_fermate ID="mod_fermate1" runat="server" />
+                        </div>
+                        <div class="col-5  col-sm-4 col-lg-3 pl-1">
+                            <uc2:mod_commenti ID="mod_commenti1" runat="server" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-12 col-md-4 col-lg-3 col-xl-2">
+                <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
+            </div>
+        </div>
+    </div>
+</asp:Content>
diff --git a/MP-TAB/Dichiarazioni.aspx.cs b/MP-TAB/Dichiarazioni.aspx.cs
new file mode 100644
index 00000000..c4fd43df
--- /dev/null
+++ b/MP-TAB/Dichiarazioni.aspx.cs
@@ -0,0 +1,77 @@
+using System;
+
+namespace MoonProTablet
+{
+    public partial class Dichiarazioni : BasePage
+    {
+        #region Private Methods
+
+        /// <summary>
+        /// richiesta ins nuovo evento...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void mod_commenti1_eh_newVal(object sender, EventArgs e)
+        {
+            showPnlDichiaraz(true);
+        }
+
+        private void mod_commenti1_eh_reqEdit(object sender, EventArgs e)
+        {
+            mod_insComm1.caricaCommento();
+        }
+
+        private void mod_commenti1_eh_reset(object sender, EventArgs e)
+        {
+            showPnlDichiaraz(false);
+        }
+
+        private void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
+        {
+            // ricarico tutto!
+            Response.Redirect("Commenti.aspx");
+        }
+
+        private void mod_fermate1_eh_reqEdit(object sender, EventArgs e)
+        {
+            // avendo in sessione inizio fermata DEVO andare a pagina DichFermi, in modalità "ritroso", precompilare data/ora ed eventuale descizione...
+            Response.Redirect("Fermate.aspx");
+        }
+
+        private void mod_insComm1_eh_inserting(object sender, EventArgs e)
+        {
+        }
+
+        private void mod_insComm1_eh_newVal(object sender, EventArgs e)
+        {
+            mod_commenti1.doUpdate();
+        }
+
+        private void mod_insComm1_eh_reset(object sender, EventArgs e)
+        {
+            showPnlDichiaraz(false);
+            mod_commenti1.doUpdate();
+        }
+
+        private void showPnlDichiaraz(bool showDich)
+        {
+            pnlEventi.Visible = !showDich;
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            Session["TipoLink"] = "EditMacch";
+            mod_insComm1.eh_newVal += mod_insComm1_eh_newVal;
+            mod_insComm1.eh_reset += mod_insComm1_eh_reset;
+            mod_insComm1.eh_inserting += mod_insComm1_eh_inserting;
+            mod_commenti1.eh_reqEdit += mod_commenti1_eh_reqEdit;
+            mod_fermate1.eh_reqEdit += mod_fermate1_eh_reqEdit;
+        }
+
+        #endregion Protected Methods
+    }
+}
\ No newline at end of file
diff --git a/MP-TAB/Dichiarazioni.aspx.designer.cs b/MP-TAB/Dichiarazioni.aspx.designer.cs
new file mode 100644
index 00000000..3a089838
--- /dev/null
+++ b/MP-TAB/Dichiarazioni.aspx.designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet
+{
+
+
+    public partial class Dichiarazioni
+    {
+
+        /// <summary>
+        /// mod_dettMacchina1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
+
+        /// <summary>
+        /// mod_insComm1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_insComm mod_insComm1;
+
+        /// <summary>
+        /// pnlEventi control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlEventi;
+
+        /// <summary>
+        /// mod_fermate1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_fermate mod_fermate1;
+
+        /// <summary>
+        /// mod_commenti1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_commenti mod_commenti1;
+
+        /// <summary>
+        /// mod_directLinks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
+    }
+}
diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj
index 87fe3282..3dabfe6a 100644
--- a/MP-TAB/MP-TAB.csproj
+++ b/MP-TAB/MP-TAB.csproj
@@ -461,6 +461,7 @@
     <Content Include="Default.aspx" />
     <Content Include="Demo.aspx" />
     <Content Include="DettaglioMacchina.aspx" />
+    <Content Include="Dichiarazioni.aspx" />
     <Content Include="favicon.ico" />
     <Content Include="Fermate.aspx" />
     <Content Include="fixODL.aspx" />
@@ -810,6 +811,13 @@
     <Compile Include="DettaglioMacchina.aspx.designer.cs">
       <DependentUpon>DettaglioMacchina.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Dichiarazioni.aspx.cs">
+      <DependentUpon>Dichiarazioni.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Dichiarazioni.aspx.designer.cs">
+      <DependentUpon>Dichiarazioni.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Fermate.aspx.cs">
       <DependentUpon>Fermate.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>