diff --git a/GMW/WebUserControls/mod_UdcCella.ascx b/GMW/WebUserControls/mod_UdcCella.ascx
index 870f5ac4..0e05d4ba 100644
--- a/GMW/WebUserControls/mod_UdcCella.ascx
+++ b/GMW/WebUserControls/mod_UdcCella.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_UdcCella.ascx.cs"
     Inherits="GMW.WebUserControls.mod_UdcCella" %>
-<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <table>
     <tr>
         <td>
@@ -86,8 +85,7 @@
                     <tr>
                         <td>
                             [ALT-U]<br />
-                            <asp:Button runat="server" ID="btnQta" OnClick="btnQta_Click" AccessKey="U" />
-                            <asp:ConfirmButtonExtender ID="cbeQta" runat="server" TargetControlID="btnQta" />
+                            <asp:Button runat="server" ID="btnQta" OnClick="btnQta_Click" AccessKey="U" OnClientClick="return confirm('Confermi modifica?')" />
                         </td>
                     </tr>
                 </table>
@@ -104,17 +102,15 @@
                     <tr>
                         <td>
                             <asp:TextBox runat="server" ID="txtNewCella" />
-                            <asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtNewCella"
+                            <%--<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtNewCella"
                                 MinimumPrefixLength="2" CompletionInterval="200" ServicePath="~/WS/AutoCompletamento.asmx"
-                                ServiceMethod="elencoCelle" />
+                                ServiceMethod="elencoCelle" />--%>
                         </td>
                     </tr>
                     <tr>
                         <td>
                             [ALT-W]<br />
-                            <asp:Button runat="server" ID="btnSposta" OnClick="btnSposta_Click1" AccessKey="W" />
-                            <asp:ConfirmButtonExtender ID="cbeSposta" runat="server" TargetControlID="btnSposta">
-                            </asp:ConfirmButtonExtender>
+                            <asp:Button runat="server" ID="btnSposta" OnClick="btnSposta_Click1" AccessKey="W" OnClientClick="return confirm('Confermi Spostamento?')"/>
                         </td>
                     </tr>
                 </table>
diff --git a/GMW/WebUserControls/mod_UdcCella.ascx.cs b/GMW/WebUserControls/mod_UdcCella.ascx.cs
index 3e8fea6e..1ebb1de0 100644
--- a/GMW/WebUserControls/mod_UdcCella.ascx.cs
+++ b/GMW/WebUserControls/mod_UdcCella.ascx.cs
@@ -152,8 +152,6 @@ namespace GMW.WebUserControls
             lblErrore.Text = traduci("ErroreCellaDestOccupata");
             btnQta.Text = traduci("btnQta");
             btnSposta.Text = traduci("btnSposta");
-            cbeQta.ConfirmText = traduci("confermaRettificaQta");
-            cbeSposta.ConfirmText = traduci("confermaSpostamentoUDC");
             btnCerca.Text = traduci("btnSearch");
         }
         /// <summary>
diff --git a/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs b/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs
index 374ffdb3..8e20015d 100644
--- a/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_UdcCella.ascx.designer.cs
@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4963
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -103,15 +102,6 @@ namespace GMW.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnQta;
         
-        /// <summary>
-        /// cbeQta control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::AjaxControlToolkit.ConfirmButtonExtender cbeQta;
-        
         /// <summary>
         /// pnlSposta control.
         /// </summary>
@@ -139,15 +129,6 @@ namespace GMW.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtNewCella;
         
-        /// <summary>
-        /// aceParticolare control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
-        
         /// <summary>
         /// btnSposta control.
         /// </summary>
@@ -157,15 +138,6 @@ namespace GMW.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnSposta;
         
-        /// <summary>
-        /// cbeSposta control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::AjaxControlToolkit.ConfirmButtonExtender cbeSposta;
-        
         /// <summary>
         /// lblErrore control.
         /// </summary>
diff --git a/GMW/WebUserControls/mod_operazioniUdc.ascx b/GMW/WebUserControls/mod_operazioniUdc.ascx
index 976b1fab..00630297 100644
--- a/GMW/WebUserControls/mod_operazioniUdc.ascx
+++ b/GMW/WebUserControls/mod_operazioniUdc.ascx
@@ -1,41 +1,45 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_operazioniUdc.ascx.cs"
     Inherits="GMW.WebUserControls.mod_operazioniUdc" %>
 <%@ Register Src="mod_UdcCella.ascx" TagName="mod_UdcCella" TagPrefix="uc1" %>
+<div class="col-sm-3">
+    <table>
+        <tr>
+            <td colspan="2">
+                <asp:Label runat="server" ID="lblCella" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Button ID="btnBlocca" runat="server" Text='<%# traduci("Block") %>' Width="100px" OnClick="btnBlocca_Click" />
+            </td>
+            <td>
+                <asp:Button ID="btnSblocca" runat="server" Text='<%# traduci("Unlock") %>' Width="100px" OnClick="btnSblocca_Click" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Button ID="btnCompleta" runat="server" Text='<%# traduci("Complete") %>' Width="100px" OnClick="btnCompleta_Click" />
+            </td>
+            <td>
+                <asp:Button ID="btnDisponibile" runat="server" Text='<%# traduci("Disponibile") %>' Width="100px" OnClick="btnDisponibile_Click" />
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <asp:Button ID="btnClose" runat="server" Text="Reset" Width="160px" OnClick="btnClose_Click" />
+            </td>
+        </tr>
+    </table>
+</div>
+<div class="col-sm-9">
+    <uc1:mod_UdcCella ID="mod_UdcCella1" runat="server" />
+</div>
+
 <table>
     <tr>
-        <td valign="top">
-            <table>
-                <tr>
-                    <td colspan="2">
-                        <asp:Label runat="server" ID="lblCella" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <asp:Button ID="btnBlocca" runat="server" Text='<%# traduci("Block") %>' Width="100px" OnClick="btnBlocca_Click" />
-                    </td>
-                    <td>
-                        <asp:Button ID="btnSblocca" runat="server" Text='<%# traduci("Unlock") %>' Width="100px" OnClick="btnSblocca_Click" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <asp:Button ID="btnCompleta" runat="server" Text='<%# traduci("Complete") %>' Width="100px" OnClick="btnCompleta_Click" />
-                    </td>
-                    <td>
-                        <asp:Button ID="btnDisponibile" runat="server" Text='<%# traduci("Disponibile") %>' Width="100px" OnClick="btnDisponibile_Click" />
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2" align="center">
-                        <asp:Button ID="btnClose" runat="server" Text="Reset" Width="160px" OnClick="btnClose_Click" />
-                    </td>
-                </tr>
-            </table>
-        </td>
+        <td valign="top"></td>
         <td valign="top">
             <div style="font-size: 7pt;">
-                <uc1:mod_UdcCella ID="mod_UdcCella1" runat="server" />
             </div>
         </td>
     </tr>
diff --git a/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs b/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs
index cac9d3b2..eeaac224 100644
--- a/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs
+++ b/GMW/WebUserControls/mod_operazioniUdc.ascx.designer.cs
@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index ac9f9907..477c36e0 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index ac502e12..59a0f2d5 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index e090fe50..ec12a205 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index d9f0df6f..a0afb7fe 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index dfd4c11d..206c13ce 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.629.1539")]
-[assembly: AssemblyFileVersion("2.5.629.1539")]
+[assembly: AssemblyVersion("2.5.630.1539")]
+[assembly: AssemblyFileVersion("2.5.630.1539")]
 //[assembly: AssemblyCopyright("© Steamware 2007-2014")]
 //[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index 2e3a7ebb..a33bea54 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.629.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.629.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.630.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.630.<#= this.RevisionNumber #>")]
 //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
 //[assembly: AssemblyCompany("Steamware")]
 <#+