diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css
index 6878ad4a..3732a316 100644
--- a/GMW/GMW_Term/Style.css
+++ b/GMW/GMW_Term/Style.css
@@ -37,7 +37,7 @@
 #smallGridDetail
 {
     width:240px;
-    font-size: 8pt;
+    font-size: 9pt;
 }
 
 .quadro1, .quadro2
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
index a2aaaa9b..66ca96b0 100644
--- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
+++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
@@ -10,95 +10,107 @@
     <div class="filtro_1" style="white-space: nowrap; height: 28px; padding: 2px;">
         <uc1:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" />
     </div>
-    <div id="smallGrid">
-        <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
-            OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
-            DataKeyNames="CodLista" DataSourceID="ods" OnRowUpdating="grView_RowUpdating">
-            <RowStyle CssClass="ctrRowStyle" />
-            <AlternatingRowStyle CssClass="ctrAltRowStyle" />
-            <EditRowStyle CssClass="ctrEditRowStyle" />
-            <SelectedRowStyle CssClass="ctrSelRowStyle" />
-            <FooterStyle CssClass="ctrFooter" />
-            <PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
-            <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
-            <EmptyDataRowStyle CssClass="ctrRowStyle" />
-            <EmptyDataTemplate>
-                <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
-            </EmptyDataTemplate>
-            <Columns>
-                <asp:TemplateField HeaderText="TipoLista" SortExpression="CodTipoLista" ItemStyle-HorizontalAlign="Center">
-                    <ItemTemplate>
-                        <asp:ImageButton runat="server" ID="imgCodTipoLista" ImageUrl='<%# pathImgTipo(Eval("CodTipoLista")) %>'
-                            CausesValidation="False" CommandArgument="ShowDetail" OnClick="imgAzioneLista_Click"
-                            CommandName="Update" ToolTip='<%# tooltipTipo(Eval("CodTipoLista")) %>' />
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Dest/Data" SortExpression="Destinatario">
-                    <ItemTemplate>
-                        <div>
-                            <div style="float: left;">
-                                <b>
-                                    <asp:Label ID="lblDestinatario" runat="server" Text='<%# Eval("Destinatario") %>' />
-                                </b>
+    <asp:Panel runat="server" ID="pnlMaster" Visible="true">
+        <div id="Button">
+            <asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" Width="100px"
+                Font-Size="Smaller" />
+            <asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" Width="100px"
+                Font-Size="Smaller" />
+        </div>
+        <div id="smallGrid">
+            <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
+                OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
+                Width="100%" DataKeyNames="CodLista" DataSourceID="ods" OnRowUpdating="grView_RowUpdating">
+                <RowStyle CssClass="ctrRowStyle" />
+                <AlternatingRowStyle CssClass="ctrAltRowStyle" />
+                <EditRowStyle CssClass="ctrEditRowStyle" />
+                <SelectedRowStyle CssClass="ctrSelRowStyle" />
+                <FooterStyle CssClass="ctrFooter" />
+                <PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
+                <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
+                <EmptyDataRowStyle CssClass="ctrRowStyle" />
+                <EmptyDataTemplate>
+                    <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
+                </EmptyDataTemplate>
+                <Columns>
+                    <asp:TemplateField HeaderText="TipoLista" SortExpression="CodTipoLista" ItemStyle-HorizontalAlign="Center">
+                        <ItemTemplate>
+                            <asp:ImageButton runat="server" ID="imgCodTipoLista" ImageUrl='<%# pathImgTipo(Eval("CodTipoLista")) %>'
+                                CausesValidation="False" CommandArgument="ShowDetail" OnClick="imgAzioneLista_Click"
+                                CommandName="Update" ToolTip='<%# tooltipTipo(Eval("CodTipoLista")) %>' />
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="Dest/Data" SortExpression="Destinatario">
+                        <ItemTemplate>
+                            <div>
+                                <div style="float: left;">
+                                    <b>
+                                        <asp:Label ID="lblDestinatario" runat="server" Text='<%# Eval("Destinatario") %>' />
+                                    </b>
+                                </div>
                             </div>
-                        </div>
-                        <br />
-                        <div style="float: right; white-space: nowrap;">
-                            <asp:Label ID="lblDataCreaz" runat="server" Text='<%# Eval("DataCreaz","{0:dd/MM/yy HH:mm}") %>' />
-                        </div>
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Part/qta" SortExpression="Particolare">
-                    <ItemTemplate>
-                        <div>
-                            <div style="float: left;">
-                                <b>
-                                    <asp:Label ID="Label1" runat="server" Text='<%# Eval("Particolare") %>' />
-                                </b>
+                            <br />
+                            <div style="float: right; white-space: nowrap;">
+                                <asp:Label ID="lblDataCreaz" runat="server" Text='<%# Eval("DataCreaz","{0:dd/MM/yy HH:mm}") %>' />
                             </div>
-                        </div>
-                        <br />
-                        <div style="float: right;">
-                            <asp:Label ID="lblPrelevati" runat="server" Text='<%# Eval("Prelevato","{0:0}") %>' />
-                            <asp:Label ID="lblTotale" runat="server" Text='<%# Eval("QtaTot","/ {0:0}") %>' />
-                        </div>
-                    </ItemTemplate>
-                </asp:TemplateField>
-                <asp:TemplateField HeaderText="Stato" SortExpression="CodStatoLista" ItemStyle-HorizontalAlign="Center">
-                    <ItemTemplate>
-                        <asp:ImageButton runat="server" ID="imgCodStatoLista" ImageUrl='<%# pathImgStato(Eval("CodStatoLista")) %>'
-                            CausesValidation="False" CommandArgument='<%# cmdArgStato(Eval("CodStatoLista")) %>'
-                            ToolTip='<%# cmdArgStato(Eval("CodStatoLista")) %>' OnClick="imgAzioneLista_Click"
-                            CommandName="Update" Enabled='<%# enabledStato(Eval("CodStatoLista")) %>' />
-                        <cc1:ConfirmButtonExtender ID="cbeCambia" runat="server" ConfirmText='<%# traduci(cmdArgStato(Eval("CodStatoLista")))%>'
-                            TargetControlID="imgCodStatoLista" />
-                    </ItemTemplate>
-                </asp:TemplateField>
-            </Columns>
-        </asp:GridView>
-        <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
-        <asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
-        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
-            SelectMethod="getByFilt" TypeName="GMW_data.DS_magazzinoTableAdapters.ElencoListePrelievoTableAdapter"
-            OnInserting="recuperaFooter" FilterExpression=" (CodLista LIKE '%{0}%' OR Particolare LIKE '%{0}%' OR DescParticolare LIKE '%{0}%') AND ((CodStatoLista = 1) OR ((CodStatoLista = 2) AND (CodSoggetto = '{1}'))) "
-            OnInserted="ods_Updated" OnUpdated="ods_Updated" DeleteMethod="DeleteQuery" OnDeleted="ods_Updated">
-            <FilterParameters>
-                <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
-                <asp:SessionParameter DefaultValue="O" Name="CodSoggetto" SessionField="CodSoggetto" />
-            </FilterParameters>
-            <DeleteParameters>
-                <asp:Parameter Name="Original_CodLista" Type="String" />
-            </DeleteParameters>
-            <SelectParameters>
-                <asp:SessionParameter Name="DataFrom" SessionField="_inizio" Type="DateTime" />
-                <asp:SessionParameter Name="DataTo" SessionField="_fine" Type="DateTime" />
-            </SelectParameters>
-        </asp:ObjectDataSource>
-    </div>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="Part/qta" SortExpression="Particolare">
+                        <ItemTemplate>
+                            <div>
+                                <div style="float: left;">
+                                    <b>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# Eval("Particolare") %>' />
+                                    </b>
+                                </div>
+                            </div>
+                            <br />
+                            <div style="float: right;">
+                                <asp:Label ID="lblPrelevati" runat="server" Text='<%# Eval("Prelevato","{0:0}") %>' />
+                                <asp:Label ID="lblTotale" runat="server" Text='<%# Eval("QtaTot","/ {0:0}") %>' />
+                            </div>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="Stato" SortExpression="CodStatoLista" ItemStyle-HorizontalAlign="Center">
+                        <ItemTemplate>
+                            <asp:ImageButton runat="server" ID="imgCodStatoLista" ImageUrl='<%# pathImgStato(Eval("CodStatoLista")) %>'
+                                CausesValidation="False" CommandArgument='<%# cmdArgStato(Eval("CodStatoLista")) %>'
+                                ToolTip='<%# cmdArgStato(Eval("CodStatoLista")) %>' OnClick="imgAzioneLista_Click"
+                                CommandName="Update" Enabled='<%# enabledStato(Eval("CodStatoLista")) %>' />
+                            <cc1:ConfirmButtonExtender ID="cbeCambia" runat="server" ConfirmText='<%# traduci(cmdArgStato(Eval("CodStatoLista")))%>'
+                                TargetControlID="imgCodStatoLista" />
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                </Columns>
+            </asp:GridView>
+            <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
+            <asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
+            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
+                SelectMethod="getByFilt" TypeName="GMW_data.DS_magazzinoTableAdapters.ElencoListePrelievoTableAdapter"
+                OnInserting="recuperaFooter" FilterExpression=" (CodLista LIKE '%{0}%' OR Particolare LIKE '%{0}%' OR DescParticolare LIKE '%{0}%') AND ((CodStatoLista = 1) OR ((CodStatoLista = 2) AND (CodSoggetto = '{1}'))) "
+                OnInserted="ods_Updated" OnUpdated="ods_Updated" DeleteMethod="DeleteQuery" OnDeleted="ods_Updated">
+                <FilterParameters>
+                    <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
+                    <asp:SessionParameter DefaultValue="O" Name="CodSoggetto" SessionField="CodSoggetto" />
+                </FilterParameters>
+                <DeleteParameters>
+                    <asp:Parameter Name="Original_CodLista" Type="String" />
+                </DeleteParameters>
+                <SelectParameters>
+                    <asp:SessionParameter Name="DataFrom" SessionField="_inizio" Type="DateTime" />
+                    <asp:SessionParameter Name="DataTo" SessionField="_fine" Type="DateTime" />
+                </SelectParameters>
+            </asp:ObjectDataSource>
+        </div>
+    </asp:Panel>
     <asp:Panel runat="server" ID="pnlDetail" Visible="false">
+        <div>
+            <asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" Width="100px"
+                Font-Size="Smaller" />
+        </div>
         <div id="smallGridDetail">
             <asp:GridView ID="grViewDetail" runat="server" AllowPaging="True" AllowSorting="True"
-                AutoGenerateColumns="False" OnDataBound="grView_DataBound" DataKeyNames="CodLista,UDC"
+                Width="100%" AutoGenerateColumns="False" OnDataBound="grView_DataBound" DataKeyNames="CodLista,UDC"
                 DataSourceID="odsDetail">
                 <RowStyle CssClass="ctrRowStyle" />
                 <AlternatingRowStyle CssClass="ctrAltRowStyle" />
@@ -109,53 +121,28 @@
                 <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
                 <EmptyDataRowStyle CssClass="ctrRowStyle" />
                 <Columns>
-                    <%--         <asp:TemplateField ShowHeader="False">
-                    <HeaderTemplate>
-                        <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
-                            Visible="true" />
-                    </HeaderTemplate>
-                    <ItemTemplate>
-                        <div style="white-space: nowrap;">
-                            <asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
-                                ToolTip='<%# traduci("Select") %>' ImageUrl="~/images/view_s.png" />
-                        </div>
-                    </ItemTemplate>
-                </asp:TemplateField>--%>
                     <asp:TemplateField HeaderText="UDC" SortExpression="UDC">
                         <ItemTemplate>
-                            <asp:Label ID="Label1" runat="server" Text='<%# Eval("UDC") %>'></asp:Label>
+                            <div>
+                                <asp:Label ID="lblUDC" runat="server" Text='<%# Eval("UDC","<b>{0}</b>") %>' />
+                            </div>
+                            <div>
+                                <asp:Label ID="lblQta" runat="server" Text='<%# Eval("Qta", "{0:#} pz") %>' />
+                            </div>
+                        </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:TemplateField HeaderText="CodCella" SortExpression="CodCella">
+                        <ItemTemplate>
+                            <div>
+                                <asp:Label ID="lblCodCella" runat="server" Text='<%# Eval("CodCella","<b>{0}</b>") %>' />
+                            </div>
+                            <div>
+                                <asp:Label ID="lblCodMag" runat="server" Text='<%# Eval("CodMag","({0})") %>' />
+                            </div>
                         </ItemTemplate>
                     </asp:TemplateField>
-                    <asp:BoundField DataField="CodCella" HeaderText="CodCella" ReadOnly="True" SortExpression="CodCella" />
-                    <asp:BoundField DataField="Qta" HeaderText="Qta" SortExpression="Qta" ReadOnly="true" />
-                    <asp:CheckBoxField DataField="Proposto" HeaderText="Prop" SortExpression="Proposto"
-                        ReadOnly="true" />
                     <asp:CheckBoxField DataField="Prelevato" HeaderText="Prel" SortExpression="Prelevato"
                         ReadOnly="true" />
-                    <asp:TemplateField ShowHeader="False">
-                        <HeaderTemplate>
-                            <asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text='<%# traduci("New") %>'
-                                Visible="false" />
-                        </HeaderTemplate>
-                        <ItemTemplate>
-                            <%-- <asp:ImageButton ID="imgPrelevato" runat="server" CausesValidation="False" CommandName="Update"
-                    CommandArgument="ConfermaPrelevato" ToolTip='<%# traduci("EffettuaPrelievo") %>'
-                    Visible='<%# prelevaEnabled(Eval("Prelevato"), Eval("UDC")) %>' ImageUrl="~/images/ArrowUpGreen_m.png"
-                    OnClick="imgPrelevato_Click" />
-                <cc1:ConfirmButtonExtender ID="cbePreleva" runat="server" ConfirmText='<%# traduci("confermaPrelievo")%>'
-                    TargetControlID="imgPrelevato" />
-                <asp:ImageButton ID="imgAnnullaPrelevato" runat="server" CausesValidation="False"
-                    CommandName="Update" CommandArgument="AnnullaPrelevato" ToolTip='<%# traduci("AnnullaPrelievo") %>'
-                    Visible='<%# annullaEnabled(Eval("Prelevato")) %>' ImageUrl="~/images/ArrowDownRed_m.png"
-                    OnClick="imgAnnullato_Click" />
-                <cc1:ConfirmButtonExtender ID="cbeAnnulla" runat="server" ConfirmText='<%# traduci("confermaAnnullaPrelievo")%>'
-                    TargetControlID="imgAnnullaPrelevato" />
-                <asp:ImageButton ID="imgScambiaUDC" runat="server" CausesValidation="False" CommandName="Update"
-                    CommandArgument="ScambiaUdc" ToolTip='<%# traduci("ScambiaUdc") %>' Visible='<%# scambiaVisible(Eval("Prelevato"), Eval("UDC")) %>' Enabled='<%# scambiaEnabled(Eval("Prelevato"), Eval("UDC")) %>' ImageUrl="~/images/recycle_orange_s.png" OnClick="imgScambia_Click" />
-                <cc1:ConfirmButtonExtender ID="cbeScambiaUDC" runat="server" ConfirmText='<%# traduci("confermaScambiaUdc")%>'
-                    TargetControlID="imgScambiaUDC" />--%>
-                        </ItemTemplate>
-                    </asp:TemplateField>
                 </Columns>
             </asp:GridView>
             <asp:ObjectDataSource ID="odsDetail" runat="server" OldValuesParameterFormatString="Original_{0}"
@@ -172,12 +159,5 @@
                 </SelectParameters>
             </asp:ObjectDataSource>
         </div>
-        <div id="Div1">
-            <asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" Width="100px" />
-        </div>
     </asp:Panel>
-    <div id="Button">
-        <asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" Width="100px" />
-        <asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" Width="100px" />
-    </div>
 </div>
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
index 3b695284..f193c0ed 100644
--- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
@@ -472,7 +472,7 @@ namespace GMW_Term.WebUserControls
                     // mostro dettaglio lista (e relativi buttons)
                     pnlDetail.Visible = true;
                     // nascondo elenco lista prelievo
-                    grView.Visible = false;
+                    pnlMaster.Visible = false;
                     // blocco update!
                     e.Cancel = true;
                     break;
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
index da5cb899..5be5dbcd 100644
--- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
@@ -40,6 +40,33 @@ namespace GMW_Term.WebUserControls {
         /// </remarks>
         protected global::mod_periodoAnalisi mod_periodoAnalisi1;
         
+        /// <summary>
+        /// pnlMaster 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.Panel pnlMaster;
+        
+        /// <summary>
+        /// btnLoginPage 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 btnLoginPage;
+        
+        /// <summary>
+        /// btnButtonsHome 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 btnButtonsHome;
+        
         /// <summary>
         /// grView control.
         /// </summary>
@@ -85,6 +112,15 @@ namespace GMW_Term.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel pnlDetail;
         
+        /// <summary>
+        /// btnCloseDet 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 btnCloseDet;
+        
         /// <summary>
         /// grViewDetail control.
         /// </summary>
@@ -102,32 +138,5 @@ namespace GMW_Term.WebUserControls {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsDetail;
-        
-        /// <summary>
-        /// btnCloseDet 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 btnCloseDet;
-        
-        /// <summary>
-        /// btnLoginPage 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 btnLoginPage;
-        
-        /// <summary>
-        /// btnButtonsHome 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 btnButtonsHome;
     }
 }
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index 53db764d..adc4f83b 100644
Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll
index 53db764d..adc4f83b 100644
Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ