diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index d81ecde..cda988f 100644
--- a/PROJ-ETS/PROJ-ETS/Web.config
+++ b/PROJ-ETS/PROJ-ETS/Web.config
@@ -26,7 +26,7 @@
         <add key="appName" value="PROJ-ETS"/>
         <add key="SiteName" value="ETS"/>
         <add key="mainRev" value="0.6"/>
-        <add key="minRev" value="174"/>
+        <add key="minRev" value="176"/>
         <add key="stdEmail" value="info@steamware.net"/>
         <add key="_safePages" value="Default.aspx#unauthorized.aspx#forceUser.aspx#login.aspx#test.aspx#Test.aspx"/>
         <!--area gestione auth cookie-->
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx
index d7802fb..01b622c 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx
@@ -21,9 +21,72 @@
             No record
         </EmptyDataTemplate>
         <Columns>
+            <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Wrap="false">
+                <ItemTemplate>
+                    <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Modifica" ImageUrl="../images/edit_m.png" />
+                </ItemTemplate>
+                <EditItemTemplate>
+                    <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update" ToolTip="Update" ImageUrl="../images/apply_m.png" />
+                    <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" ImageUrl="../images/cancel_m.png" />
+                </EditItemTemplate>
+                <HeaderTemplate>
+                    <%--<asp:ImageButton ID="imgBtnReset" runat="server" ToolTip="Reset" CausesValidation="False" OnClick="btnReset_Click" ImageUrl="../images/reload_l.png" Visible="true" />--%>
+                </HeaderTemplate>
+                <ItemStyle HorizontalAlign="Center"></ItemStyle>
+            </asp:TemplateField>
             <asp:TemplateField HeaderText="Elenco Fasi" SortExpression="codFase">
                 <EditItemTemplate>
-                    <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("nomeFase") %>'></asp:TextBox>
+                    <div class="clearDiv" style="height: 40px;">
+                        <div class="divSx" style="width: 300px;">
+                            <asp:Label ID="lblNome" runat="server" Text='<%# Eval("nomeFase") %>' CssClass="fontStd textAzzurro" Font-Bold="true" />
+                            <br />
+                            <asp:Label ID="lblDescr" runat="server" Text='<%# Eval("descrizioneFase") %>' CssClass="fontMini textGrigio" />
+                        </div>
+                        <div class="divSx" style="width: 450px; margin: 8px auto; text-align: center;">
+                            <uc1:mod_statiFasi runat="server" ID="mod_statiFasi" percUtil='<%# percAttiva(Eval("percUtil_money"),Eval("Attivo")) %>' />
+                        </div>
+                    </div>
+                    <div class="clearDiv" style="height: 70px;">
+                        <div class="divSx" style="width: 80px; margin: 2px; white-space: nowrap;">
+                            <asp:Label runat="server" ID="lblTT" AssociatedControlID="chkTime" Text="Time Track" />
+                            <asp:CheckBox Enabled="false" runat="server" ID="chkTime" Checked='<%# Eval("enableTime") %>' ToolTip="Time Track Attivo (s/n)" />
+                            <asp:Label runat="server" ID="lblMT" AssociatedControlID="chkMoney" Text="Money Track" />
+                            <asp:CheckBox Enabled="false" runat="server" ID="chkMoney" Checked='<%# Eval("enableMoney") %>' ToolTip="Money Track Attivo (s/n)" />
+                        </div>
+                        <div class="divSx" style="width: 220px;">
+                            <asp:Label runat="server" ID="lblDatSca" AssociatedControlID="DataScadLabel" Text="Data Scadenza" />
+                            <asp:TextBox ID="DataScadLabel" runat="server" Text='<%# Bind("DataScad","{0:dd/MM/yyyy}") %>' CssClass="divSx bordoAzzurro datepicker" BorderWidth="1px" Width="80px" />
+                            <asp:Label runat="server" ID="lblScadImpr" AssociatedControlID="chkScadFix" Text="improrogabile" />
+                            <asp:CheckBox runat="server" ID="chkScadFix" Checked='<%# Bind("ScadFixed") %>' ToolTip="Scadenza improrogabile (s/n)" />
+                        </div>
+                        <div class="divSx" style="width: 450px; margin: 0px auto; text-align: center;">
+                            <div>
+                                <div class="divSx" style="width: 150px; text-align: center; margin: auto;">
+                                    BCWS
+                                    <div class="bordoVerde" style="width: 90%;">
+                                        <asp:Label ID="lblBCWS_money" runat="server" Text='<%# Eval("BCWS_money","{0:0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
+                                        <asp:Label ID="lblBCWS_time" runat="server" Text='<%# Eval("BCWS_time","({0:0.##} h)") %>' CssClass="fontPiccolo textGrigio" />
+                                        | IMG
+                                    </div>
+                                </div>
+                                <div class="divSx" style="width: 150px; text-align: center; margin: auto;">
+                                    ACWP
+                                    <div class="bordoAzzurro" style="width: 90%;">
+                                        <asp:Label ID="lblACWP_money" runat="server" Text='<%# Eval("ACWP_money","{0:0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
+                                        <asp:Label ID="lblACWP_time" runat="server" Text='<%# Eval("ACWP_time","({0:0.##} h)") %>' CssClass="fontPiccolo textGrigio" />
+                                    </div>
+                                </div>
+                                <div class="divSx" style="width: 150px; text-align: center; margin: auto;">
+                                    % utilizzo bdgt
+                                    <div class="bordoRosso" style="width: 90%;">
+                                        <asp:Label ID="lblpercUtil_money" runat="server" Text='<%# Eval("percUtil_money","{0:P} (€)") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
+                                        <asp:Label ID="lblpercUtil_time" runat="server" Text='<%# Eval("percUtil_time","{0:P} (h)") %>' CssClass="fontPiccolo textGrigio" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
                 </EditItemTemplate>
                 <ItemTemplate>
                     <div class="clearDiv" style="height: 40px;">
@@ -50,35 +113,32 @@
                             <asp:CheckBox Enabled="false" runat="server" ID="chkScadFix" Checked='<%# Eval("ScadFixed") %>' ToolTip="Scadenza improrogabile (s/n)" />
                         </div>
                         <div class="divSx" style="width: 450px; margin: 0px auto; text-align: center;">
-                            <div>
-                                Avanzamenti
-                            </div>
                             <div>
                                 <div class="divSx" style="width: 150px; text-align: center; margin: auto;">
                                     BCWS
-                                <div class="bordoVerde" style="width: 90%;">
-                                    <asp:Label ID="lblBCWS_money" runat="server" Text='<%# Eval("BCWS_money","{0:0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
-                                    <asp:Label ID="lblBCWS_time" runat="server" Text='<%# Eval("BCWS_time","({0:0.##} h)") %>' CssClass="fontPiccolo textGrigio" />
-                                </div>
+                                    <div class="bordoVerde" style="width: 90%;">
+                                        <asp:Label ID="lblBCWS_money" runat="server" Text='<%# Eval("BCWS_money","{0:0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
+                                        <asp:Label ID="lblBCWS_time" runat="server" Text='<%# Eval("BCWS_time","({0:0.##} h)") %>' CssClass="fontPiccolo textGrigio" />
+                                        | IMG
+                                    </div>
                                 </div>
                                 <div class="divSx" style="width: 150px; text-align: center; margin: auto;">
                                     ACWP
-                                <div class="bordoAzzurro" style="width: 90%;">
-                                    <asp:Label ID="lblACWP_money" runat="server" Text='<%# Eval("ACWP_money","{0:0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
-                                    <asp:Label ID="lblACWP_time" runat="server" Text='<%# Eval("ACWP_time","({0:0.##} h)") %>' CssClass="fontPiccolo textGrigio" />
-                                </div>
+                                    <div class="bordoAzzurro" style="width: 90%;">
+                                        <asp:Label ID="lblACWP_money" runat="server" Text='<%# Eval("ACWP_money","{0:0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
+                                        <asp:Label ID="lblACWP_time" runat="server" Text='<%# Eval("ACWP_time","({0:0.##} h)") %>' CssClass="fontPiccolo textGrigio" />
+                                    </div>
                                 </div>
                                 <div class="divSx" style="width: 150px; text-align: center; margin: auto;">
                                     % utilizzo bdgt
-                                <div class="bordoRosso" style="width: 90%;">
-                                    <asp:Label ID="lblpercUtil_money" runat="server" Text='<%# Eval("percUtil_money","{0:P} (€)") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
-                                    <asp:Label ID="lblpercUtil_time" runat="server" Text='<%# Eval("percUtil_time","{0:P} (h)") %>' CssClass="fontPiccolo textGrigio" />
-                                </div>
+                                    <div class="bordoRosso" style="width: 90%;">
+                                        <asp:Label ID="lblpercUtil_money" runat="server" Text='<%# Eval("percUtil_money","{0:P} (€)") %>' Font-Bold="true" CssClass="fontStd textNero" /><br />
+                                        <asp:Label ID="lblpercUtil_time" runat="server" Text='<%# Eval("percUtil_time","{0:P} (h)") %>' CssClass="fontPiccolo textGrigio" />
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-
                 </ItemTemplate>
             </asp:TemplateField>
         </Columns>
@@ -90,15 +150,6 @@
     </asp:ObjectDataSource>
 </div>
 
-<div class="divDx">
-    dettagli (budget...)
+<div class="divSx">
+    dettagli (budget ore su selezione...)
 </div>
-
-<div class="clearDiv"></div>
-<style type="text/css">
-    .auto-style1 {
-        width: 947px;
-        height: 603px;
-    }
-</style>
-<asp:Image runat="server" ID="imgDemo" ImageUrl="~/Scratch/imgDemoFasi.png" />
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs
index 6ed9405..ff9c2ab 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs
@@ -29,14 +29,5 @@ namespace PROJ_ETS.WebUserControls {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsFasi;
-        
-        /// <summary>
-        /// imgDemo 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.Image imgDemo;
     }
 }