diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index 0a62306..59224c1 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/WebSCR/WebUserControls/mod_giornataASSD.ascx b/WebSCR/WebUserControls/mod_giornataASSD.ascx
index 1d6c649..1e84882 100644
--- a/WebSCR/WebUserControls/mod_giornataASSD.ascx
+++ b/WebSCR/WebUserControls/mod_giornataASSD.ascx
@@ -4,11 +4,26 @@
 
 <asp:HiddenField runat="server" ID="hfDataRif" />
 <asp:HiddenField runat="server" ID="hfSlot" />
-<asp:Repeater ID="repSquadre" runat="server" DataSourceID="odsSquadre">
+<asp:Repeater ID="repShow" runat="server" DataSourceID="odsSquadre">
     <ItemTemplate>
         <div runat="server" id="divSquadra" style='<%# Eval("CssColor","background-color: {0};") %>'>
             <div style="font-size: 0.7em; line-height: 1.4;">
-                <b><asp:Label runat="server" ID="lblSquadra"><%# Eval("DescrSquadra") %></asp:Label></b>
+                <b>
+                    <asp:Label runat="server" ID="lblSquadra"><%# Eval("DescrSquadra") %></asp:Label></b>
+            </div>
+            <div style="font-size: 0.6em; line-height: 1.1; margin: 1px;">
+                <uc1:mod_dettASSD runat="server" ID="mod_dettASSD" DataRif='<%# Eval("Data") %>' Slot='<%# Eval("Slot") %>' CodSquadra='<%# Eval("CodSquadra") %>' />
+            </div>
+        </div>
+    </ItemTemplate>
+</asp:Repeater>
+
+<asp:Repeater ID="repEdit" runat="server" DataSourceID="odsSquadre">
+    <ItemTemplate>
+        <div class="flLeft" runat="server" id="divSquadra" style='<%# Eval("CssColor","min-width:250px; background-color: {0};") %>'>
+            <div style="font-size: 0.7em; line-height: 1.4;">
+                <b>
+                    <asp:Label runat="server" ID="lblSquadra"><%# Eval("DescrSquadra") %></asp:Label></b>
             </div>
             <div style="font-size: 0.6em; line-height: 1.1; margin: 1px;">
                 <uc1:mod_dettASSD runat="server" ID="mod_dettASSD" DataRif='<%# Eval("Data") %>' Slot='<%# Eval("Slot") %>' CodSquadra='<%# Eval("CodSquadra") %>' />
diff --git a/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs b/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs
index e1f2b0d..b5c95dc 100644
--- a/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs
+++ b/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs
@@ -11,7 +11,6 @@ namespace WebSCR.WebUserControls
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-
         }
 
         /// <summary>
@@ -49,6 +48,18 @@ namespace WebSCR.WebUserControls
                 hfSlot.Value = value;
             }
         }
-        
+        public bool editMode
+        {
+            get
+            {
+                return repShow.Visible;
+
+            }
+            set
+            {
+                repShow.Visible = !value;
+                repEdit.Visible = value;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_giornataASSD.ascx.designer.cs b/WebSCR/WebUserControls/mod_giornataASSD.ascx.designer.cs
index 199511c..8d7eec5 100644
--- a/WebSCR/WebUserControls/mod_giornataASSD.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_giornataASSD.ascx.designer.cs
@@ -31,13 +31,22 @@ namespace WebSCR.WebUserControls {
         protected global::System.Web.UI.WebControls.HiddenField hfSlot;
         
         /// <summary>
-        /// repSquadre control.
+        /// repShow 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.Repeater repSquadre;
+        protected global::System.Web.UI.WebControls.Repeater repShow;
+        
+        /// <summary>
+        /// repEdit 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.Repeater repEdit;
         
         /// <summary>
         /// odsSquadre control.
diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx
index 5f3ad59..d1c8368 100644
--- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx
+++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx
@@ -20,13 +20,13 @@
                     <asp:Label runat="server" ID="lblTestata" Text='<%# Eval("Data", "{0:ddd dd/MM}") %>' />
                 </div>
                 <div style="min-height: 250px;">
-                    <asp:LinkButton runat="server" ID="lbtEditMat" CssClass="ui-btn ui-mini ui-btn-c" Font-Size="0.6em" ToolTip="Edit" CommandArgument='<%# string.Format("{0}",Eval("Data"))  %>' OnClick="lbtEditMat_Click">MATTINA</asp:LinkButton>
-                    <uc1:mod_giornataASSD runat="server" ID="mod_giornataASSD" DataRif='<%# Eval("Data") %>' Slot="MAT" />
+                    <asp:LinkButton runat="server" ID="lbtEditMat" CssClass="ui-btn ui-mini ui-btn-c" Font-Size="0.6em" ToolTip="Edit" CommandArgument='<%# Eval("Data")  %>' OnClick="lbtEditMat_Click">MATTINA</asp:LinkButton>
+                    <uc1:mod_giornataASSD runat="server" ID="mod_giornataASSD" DataRif='<%# Eval("Data") %>' Slot="MAT" editMode="false" />
                 </div>
                 <hr />
                 <div style="min-height: 250px;">
-                    <asp:LinkButton runat="server" ID="lbtEditPom" CssClass="ui-btn ui-mini ui-btn-c" Font-Size="0.6em" ToolTip="Edit" CommandArgument='<%# string.Format("{0}#POM",Eval("Data"))  %>' OnClick="lbtEditPom_Click">POMERIGGIO</asp:LinkButton>
-                    <uc1:mod_giornataASSD runat="server" ID="mod_giornataASSD1" DataRif='<%# Eval("Data") %>' Slot="POM" />
+                    <asp:LinkButton runat="server" ID="lbtEditPom" CssClass="ui-btn ui-mini ui-btn-c" Font-Size="0.6em" ToolTip="Edit" CommandArgument='<%# Eval("Data")  %>' OnClick="lbtEditPom_Click">POMERIGGIO</asp:LinkButton>
+                    <uc1:mod_giornataASSD runat="server" ID="mod_giornataASSD1" DataRif='<%# Eval("Data") %>' Slot="POM" editMode="false" />
                 </div>
             </div>
         </ItemTemplate>
@@ -37,17 +37,16 @@
         </SelectParameters>
     </asp:ObjectDataSource>
     <div runat="server" id="divEdit">
-        <div class="div_1_4">
-            <h3>DATA - SLOT</h3>
-            <asp:LinkButton ID="lbCancel" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-refresh ui-btn-icon-right ui-btn-inline" runat="server" Width="25em" OnClick="lbCancel_Click">Torna a schema SETTIMANALE</asp:LinkButton>
-            <div style="font-size: 1.4em;">
-                <uc1:mod_giornataASSD runat="server" ID="mod_giornataASSD" />
+        <div class="ui-grid-a noShadows" style="font-size: 1.2em;">
+            <div class="ui-block-a ui-corner-all">
+                <h3><asp:Label runat="server" ID="lblData" /> - <asp:Label runat="server" ID="lblSlot" /></h3>
+            </div>
+            <div class="ui-block-b ui-corner-all">
+                <asp:LinkButton ID="lbCancel" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-refresh ui-btn-icon-right ui-btn-inline" runat="server" Width="20em" OnClick="lbCancel_Click">Torna a schema SETTIMANALE</asp:LinkButton>
             </div>
         </div>
-        <div class="div_3_4">
-            <asp:GridView ID="GridView1" runat="server"></asp:GridView>
-            <asp:HiddenField runat="server" ID="hfDataSel" />
-            <asp:HiddenField runat="server" ID="hfSlot" />
+        <div style="font-size: 1.1em;">
+            <uc1:mod_giornataASSD runat="server" ID="mod_giornataASSD" editMode="true" />
         </div>
     </div>
 </div>
diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs
index 511e831..b8d0dc4 100644
--- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs
+++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.cs
@@ -53,32 +53,30 @@ namespace WebSCR.WebUserControls
 
         protected void lbtEditMat_Click(object sender, EventArgs e)
         {
-            // salvo data
+            // sistemo dati x dettaglio giorno
             LinkButton lbt = (LinkButton)sender;
             DateTime data = Convert.ToDateTime(lbt.CommandArgument);
-            hfDataSel.Value = data.ToShortDateString();
-            // salva slot
-            hfSlot.Value = "MAT";
-            // sistemo dati x dettaglio giorno
+            string slot = "MAT";
+            showEditMode(data, slot);
+        }
+
+        private void showEditMode(DateTime data, string slot)
+        {
             mod_giornataASSD.DataRif = data;
-            mod_giornataASSD.Slot = "MAT";
+            mod_giornataASSD.Slot = slot;
+            lblData.Text = data.ToString("ddd dd/MM");
+            lblSlot.Text = slot;
             // update visualizzazione
             fixVisibility(true);
         }
 
         protected void lbtEditPom_Click(object sender, EventArgs e)
         {
-            // salvo data
+            // sistemo dati x dettaglio giorno
             LinkButton lbt = (LinkButton)sender;
             DateTime data = Convert.ToDateTime(lbt.CommandArgument);
-            hfDataSel.Value = data.ToShortDateString();
-            // salva slot
-            hfSlot.Value = "POM";
-            // sistemo dati x dettaglio giorno
-            mod_giornataASSD.DataRif = data;
-            mod_giornataASSD.Slot = "POM";
-            // update visualizzazione
-            fixVisibility(true);
+            string slot = "POM";
+            showEditMode(data, slot);
         }
         
         protected void lbCancel_Click(object sender, EventArgs e)
diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs
index 08df7f3..a507e7b 100644
--- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs
@@ -66,6 +66,24 @@ namespace WebSCR.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEdit;
         
+        /// <summary>
+        /// lblData 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.Label lblData;
+        
+        /// <summary>
+        /// lblSlot 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.Label lblSlot;
+        
         /// <summary>
         /// lbCancel control.
         /// </summary>
@@ -83,32 +101,5 @@ namespace WebSCR.WebUserControls {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::WebSCR.WebUserControls.mod_giornataASSD mod_giornataASSD;
-        
-        /// <summary>
-        /// GridView1 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.GridView GridView1;
-        
-        /// <summary>
-        /// hfDataSel 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.HiddenField hfDataSel;
-        
-        /// <summary>
-        /// hfSlot 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.HiddenField hfSlot;
     }
 }
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 10f36a3..e39fa6a 100644
Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index 6e6e1a2..779e2a9 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ
diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll
index dd73bee..0a23211 100644
Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index 10f36a3..e39fa6a 100644
Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ
diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll
index dd73bee..0a23211 100644
Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ
diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache
index 2fb84b0..6d8a41a 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ
diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll
index dd73bee..0a23211 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ