diff --git a/MP-TAB/Dichiarazioni.aspx b/MP-TAB/Dichiarazioni.aspx
index b1a8dfa0..7afeeabd 100644
--- a/MP-TAB/Dichiarazioni.aspx
+++ b/MP-TAB/Dichiarazioni.aspx
@@ -1,28 +1,35 @@
 <%@ 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" %>
+<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc6" %>
+<%@ Register Src="~/WebUserControls/cmp_dichiarList.ascx" TagPrefix="uc1" TagName="cmp_dichiarList" %>
+<%@ Register Src="~/WebUserControls/cmp_dichiarInsert.ascx" TagPrefix="uc1" TagName="cmp_dichiarInsert" %>
 
+<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
 <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 class="my-2">
+                    <uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
                 </div>
+                <uc1:cmp_dichiarInsert runat="server" id="cmp_dichiarInsert" />
+                <asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
+                    <ProgressTemplate>
+                        <div id="progress_back">
+                        </div>
+                        <div id="progress_top" class="text-center text-warning align-middle">
+                            <i class="fa fa-spinner fa-pulse"></i>&nbsp;
+              <b>ELABORAZIONE IN CORSO</b>
+                            <i class="fa fa-spinner fa-pulse"></i>&nbsp;
+              <div class="progress">
+                  <div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
+              </div>
+                        </div>
+                    </ProgressTemplate>
+                </asp:UpdateProgress>
+                <uc1:cmp_dichiarList runat="server" ID="cmp_dichiarList" />
             </div>
             <div class="col-12 col-md-4 col-lg-3 col-xl-2">
                 <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
diff --git a/MP-TAB/Dichiarazioni.aspx.cs b/MP-TAB/Dichiarazioni.aspx.cs
index c4fd43df..3d64d96f 100644
--- a/MP-TAB/Dichiarazioni.aspx.cs
+++ b/MP-TAB/Dichiarazioni.aspx.cs
@@ -4,74 +4,14 @@ 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;
+            cmp_dichiarInsert.eh_newVal += cmp_dichiarInsert_eh_newVal;
         }
 
-        #endregion Protected Methods
+        private void cmp_dichiarInsert_eh_newVal(object sender, EventArgs e)
+        {
+            cmp_dichiarList.doUpdate();
+        }
     }
 }
\ No newline at end of file
diff --git a/MP-TAB/Dichiarazioni.aspx.designer.cs b/MP-TAB/Dichiarazioni.aspx.designer.cs
index 3a089838..03a8c776 100644
--- a/MP-TAB/Dichiarazioni.aspx.designer.cs
+++ b/MP-TAB/Dichiarazioni.aspx.designer.cs
@@ -24,40 +24,31 @@ namespace MoonProTablet
         protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
 
         /// <summary>
-        /// mod_insComm1 control.
+        /// cmp_dichiarInsert 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;
+        protected global::MoonProTablet.WebUserControls.cmp_dichiarInsert cmp_dichiarInsert;
 
         /// <summary>
-        /// pnlEventi control.
+        /// updtRicerca 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;
+        protected global::System.Web.UI.UpdateProgress updtRicerca;
 
         /// <summary>
-        /// mod_fermate1 control.
+        /// cmp_dichiarList 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;
+        protected global::MoonProTablet.WebUserControls.cmp_dichiarList cmp_dichiarList;
 
         /// <summary>
         /// mod_directLinks control.
diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj
index 3dabfe6a..799a6c37 100644
--- a/MP-TAB/MP-TAB.csproj
+++ b/MP-TAB/MP-TAB.csproj
@@ -704,6 +704,8 @@
     </Content>
     <Content Include="WebUserControls\cmp_dettODL.ascx" />
     <Content Include="WebUserControls\cmp_dettPODL.ascx" />
+    <Content Include="WebUserControls\cmp_dichiarInsert.ascx" />
+    <Content Include="WebUserControls\cmp_dichiarList.ascx" />
     <Content Include="WebUserControls\cmp_disabled.ascx" />
     <Content Include="WebUserControls\cmp_displNumPzProd.ascx" />
     <Content Include="WebUserControls\cmp_goPrint.ascx" />
@@ -1015,6 +1017,20 @@
     <Compile Include="WebUserControls\cmp_dettPODL.ascx.designer.cs">
       <DependentUpon>cmp_dettPODL.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\cmp_dichiarInsert.ascx.cs">
+      <DependentUpon>cmp_dichiarInsert.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_dichiarInsert.ascx.designer.cs">
+      <DependentUpon>cmp_dichiarInsert.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_dichiarList.ascx.cs">
+      <DependentUpon>cmp_dichiarList.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_dichiarList.ascx.designer.cs">
+      <DependentUpon>cmp_dichiarList.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\cmp_disabled.ascx.cs">
       <DependentUpon>cmp_disabled.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>