diff --git a/ETS-WS/ETS-WS/MyDocs.aspx b/ETS-WS/ETS-WS/MyDocs.aspx
index e118c2c..806cd74 100644
--- a/ETS-WS/ETS-WS/MyDocs.aspx
+++ b/ETS-WS/ETS-WS/MyDocs.aspx
@@ -10,12 +10,12 @@
         <div class="divCenter" style="padding-top: 0px; padding-bottom: 4px;">
             <div class="divSx half">
                 <div class="tabLabelGreen">
-                    <asp:LinkButton ID="lnkUpload" runat="server" OnClick="lnkUpload_Click">Upload File</asp:LinkButton>
+                    <asp:LinkButton ID="lnkUpload" runat="server" OnClick="lnkUpload_Click">Carica</asp:LinkButton>
                 </div>
             </div>
             <div class="divDx half">
                 <div class="tabLabelGray">
-                    <asp:LinkButton ID="lnkGestione" runat="server" OnClick="lnkGestione_Click">Gestione File</asp:LinkButton>
+                    <asp:LinkButton ID="lnkGestione" runat="server" OnClick="lnkGestione_Click">Gestisci</asp:LinkButton>
                 </div>
             </div>
         </div>
diff --git a/ETS-WS/ETS-WS/Web.sitemap b/ETS-WS/ETS-WS/Web.sitemap
index d6c2efd..1488564 100644
--- a/ETS-WS/ETS-WS/Web.sitemap
+++ b/ETS-WS/ETS-WS/Web.sitemap
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" >
     <siteMapNode url="Menu.aspx" title="Home"  description="ETS - WebScip">
-        <siteMapNode url="MyDocs.aspx" title="Upload"  description="Upload documenti ed editing" />
+        <siteMapNode url="MyDocs.aspx" title="Nuovo"  description="Upload documenti ed editing" />
         <siteMapNode url="GestioneDocumenti.aspx" title="Archivio"  description="Gestione Archivio Documenti" />
-        <siteMapNode url="Admin.aspx" title="Admin"  description="Area Admin">
+        <siteMapNode url="Admin.aspx" title="Impostazioni"  description="Area Admin">
             <siteMapNode url="AnagFasi.aspx" title="Fasi"  description="Gestione Fasi" />
-            <siteMapNode url="AnagTags.aspx" title="Tags"  description="Gestione Tags" />
+            <siteMapNode url="AnagTags.aspx" title="Etichette"  description="Gestione Tags" />
 
         </siteMapNode>
-        <siteMapNode url="Help.aspx" title="Help"  description="Help Area" />
+        <siteMapNode url="Help.aspx" title="Guida"  description="Help Area" />
     </siteMapNode>
 </siteMap>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx
index 1a0c4d3..a245034 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_fileUpload.ascx
@@ -10,9 +10,6 @@
 <link href="../css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="divCenter fontPiccolo">
-    <div class="fontMedio">
-        <b>File list</b>
-    </div>
     <asp:AjaxFileUpload ID="fileUpload" runat="server" OnUploadComplete="fileUpload_UploadComplete" />
     <i>Caricamento files in area personale per catalogazione</i>
 </div>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
index 27abb38..e79cb56 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
@@ -15,11 +15,11 @@
         <div class="clearDiv">
             <asp:Panel runat="server" ID="pnlTemplateMetaDati" Height="86px" BackColor="#222222" ForeColor="#CDCDCD">
                 <div class="clearDiv" style="padding: 4px;">
-                    <asp:Label runat="server" ID="Label4" Text="Template MetaDati" CssClass="fontMedio" />
+                    <asp:Label runat="server" ID="Label4" Text="Modelli personalizzati" CssClass="fontMedio" />
                 </div>
                 <div class="clearDiv" style="padding: 4px;">
                     <div class="divSx">
-                        <asp:Label runat="server" ID="Label2" Text="Salva parametri attuali" CssClass="labelInput" />
+                        <asp:Label runat="server" ID="Label2" Text="Nuovo Modello" CssClass="labelInput" />
                     </div>
                     <div class="divDx">
                         <asp:TextBox runat="server" ID="txtNomeTMD" Font-Size="8pt" Width="8em" ToolTip="Nome template metadati" />
@@ -28,7 +28,7 @@
                 </div>
                 <div class="clearDiv" style="padding: 2px;">
                     <div class="divSx">
-                        <asp:Label runat="server" ID="Label3" Text="Carica da template" CssClass="labelInput" />
+                        <asp:Label runat="server" ID="Label3" Text="Carica Modello" CssClass="labelInput" />
                     </div>
                     <div class="divDx">
                         <asp:ImageButton ID="imgDeleteTemplate" runat="server" ImageUrl="~/images/delete_m.png" ImageAlign="AbsMiddle" ToolTip="ELIMINA template metadati" onclick="imgDeleteTemplate_Click"  />
@@ -63,22 +63,22 @@
             </div>
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblInOut" Text="In/Out" CssClass="labelInput" /><br />
+            <asp:Label runat="server" ID="lblInOut" Text="Provenienza" CssClass="labelInput" /><br />
             <asp:RadioButtonList ID="rblInOut" runat="server" AutoPostBack="true" RepeatDirection="Horizontal" RepeatLayout="Flow" CssClass="radioBtn" OnSelectedIndexChanged="rblInOut_SelectedIndexChanged" TabIndex="2">
                 <asp:ListItem Value="In" Text="In" />
                 <asp:ListItem Value="Out" Text="Out" Selected="True" />
             </asp:RadioButtonList>
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblCommessa" Text="Commessa (autocomplete)" CssClass="labelInput" /><br />
+            <asp:Label runat="server" ID="lblCommessa" Text="Commessa" CssClass="labelInput" /><br />
             <uc1:mod_textAutocomplete ID="tacCommesse" runat="server" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoCommesse" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char" TabIndex="3" />
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblFase" Text="Fase (autocomplete)" CssClass="labelInput" /><br />
+            <asp:Label runat="server" ID="lblFase" Text="Fase" CssClass="labelInput" /><br />
             <uc1:mod_textAutocomplete ID="tacFasi" runat="server" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFasi" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" TabIndex="4" />
         </div>
         <div class="clearDiv">
-            <asp:Label runat="server" ID="lblFonte" Text="Fonte (autocomplete)" CssClass="labelInput" />
+            <asp:Label runat="server" ID="lblFonte" Text="Fonte" CssClass="labelInput" />
             <br />
             <uc1:mod_textAutocomplete ID="tacFonti" runat="server" ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFonti" minCharAutocomplete="3" showKey="false" toolTip="Digitare per iniziare ricerca, min 3 char" TabIndex="5" />
         </div>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx
index dee75b9..1686e3e 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx
@@ -16,7 +16,26 @@
         </div>
     </asp:Panel>
 </div>
+<div class="clearDiv" style="text-align: center; background: #EFEFBC; border-top: 1px solid #999999; border-bottom: 1px solid #999999;">
+    <asp:Panel runat="server" ID="pnlGenDocs">
+        <div style="padding: 4px 0px 4px 0px;">
+            <div style="height: 1.5em; font-weight:bold;" class="fontMedio">
+                Generatore nuovi documenti
+            </div>
+            <asp:Button ID="btnStaccaProto" runat="server" Text="Solo Protocollo" ToolTip="Genera e blocca protocollo" CssClass="btnGenProto" TabIndex="13" OnClick="btnStaccaProto_Click" />
+            &nbsp;
+            <asp:Button ID="btnGenLettera" runat="server" Text="Lettera" ToolTip="Genera doc tipo lettera" CssClass="btnGenDoc" TabIndex="14" OnClick="btnGenLettera_Click" />
+            &nbsp;
+            <asp:Button ID="btnGenFax" runat="server" Text="Fax" ToolTip="Genera doc tipo Fax" CssClass="btnGenFax" TabIndex="15" OnClick="btnGenFax_Click" />
+            &nbsp;
+            <asp:Button ID="btnGenMail" runat="server" Text="Email" ToolTip="Genera email" CssClass="btnGenMail" TabIndex="16" OnClick="btnGenMail_Click" />
+        </div>
+    </asp:Panel>
+</div>
 <div class="clearDiv" style="text-align: center; padding: 4px 0px 4px 0px; background: #EFEFEF;">
+    <div style="height: 1.5em; font-weight: bold;" class="fontMedio">
+        Associa Documenti Caricati
+    </div>
     <div class="divDx">
         <asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
             <ProgressTemplate>
@@ -32,17 +51,3 @@
     &nbsp;
     <asp:Button ID="btnSubmit" runat="server" Text="Archivia" OnClick="btnSubmit_Click" TabIndex="12" CssClass="btnArchivia" />
 </div>
-<div class="clearDiv" style="text-align: center; background: #DEDEDE; border-top: 1px solid #999999; border-bottom: 1px solid #999999;">
-    <asp:Panel runat="server" ID="pnlGenDocs">
-        <div style="padding: 4px 0px 4px 0px;">
-            generatore doc: &nbsp;
-            <asp:Button ID="btnStaccaProto" runat="server" Text="Solo Protocollo" ToolTip="Genera e blocca protocollo" CssClass="btnGenProto" TabIndex="13" OnClick="btnStaccaProto_Click" />
-            &nbsp;
-            <asp:Button ID="btnGenLettera" runat="server" Text="Lettera" ToolTip="Genera doc tipo lettera" CssClass="btnGenDoc" TabIndex="14" OnClick="btnGenLettera_Click" />
-            &nbsp;
-            <asp:Button ID="btnGenFax" runat="server" Text="Fax" ToolTip="Genera doc tipo Fax" CssClass="btnGenFax" TabIndex="15" OnClick="btnGenFax_Click" />
-            &nbsp;
-            <asp:Button ID="btnGenMail" runat="server" Text="Email" ToolTip="Genera email" CssClass="btnGenMail" TabIndex="16" OnClick="btnGenMail_Click" />
-    </asp:Panel>
-</div>
-</div> 
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs
index 89fad57..06c7807 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs
@@ -39,33 +39,6 @@ namespace ETS_WS.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblFullPath;
         
-        /// <summary>
-        /// 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.UpdateProgress updtRicerca;
-        
-        /// <summary>
-        /// btnUpdate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnUpdate;
-        
-        /// <summary>
-        /// btnSubmit control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnSubmit;
-        
         /// <summary>
         /// pnlGenDocs control.
         /// </summary>
@@ -110,5 +83,32 @@ namespace ETS_WS.WebUserControls {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnGenMail;
+        
+        /// <summary>
+        /// 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.UpdateProgress updtRicerca;
+        
+        /// <summary>
+        /// btnUpdate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnUpdate;
+        
+        /// <summary>
+        /// btnSubmit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSubmit;
     }
 }
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index e40e7f2..8cf5aca 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ
diff --git a/ETS-WS/ETS-WS/images/load_l.png b/ETS-WS/ETS-WS/images/load_l.png
index 0f4bc16..6ff1887 100644
Binary files a/ETS-WS/ETS-WS/images/load_l.png and b/ETS-WS/ETS-WS/images/load_l.png differ
diff --git a/ETS-WS/ETS-WS/images/load_m.png b/ETS-WS/ETS-WS/images/load_m.png
index 0c435ca..4dcfd87 100644
Binary files a/ETS-WS/ETS-WS/images/load_m.png and b/ETS-WS/ETS-WS/images/load_m.png differ
diff --git a/ETS-WS/ETS-WS/images/load_s.png b/ETS-WS/ETS-WS/images/load_s.png
index 262600c..1e9c09b 100644
Binary files a/ETS-WS/ETS-WS/images/load_s.png and b/ETS-WS/ETS-WS/images/load_s.png differ