diff --git a/Test.UI/Components/Layout/MainLayout.razor.css b/Test.UI/Components/Layout/MainLayout.razor.css
index 5d0becd..514eb49 100644
--- a/Test.UI/Components/Layout/MainLayout.razor.css
+++ b/Test.UI/Components/Layout/MainLayout.razor.css
@@ -5,7 +5,6 @@
 }
 main {
   flex: 1;
-  margin-left: 14rem;
 }
 .sidebar,
 .sidebarSmall {
@@ -57,14 +56,12 @@ main {
   .sidebar {
     width: 13.5rem;
     height: 100vh;
-    position: fixed;
+    position: sticky;
     top: 0;
-    left: 0;
     border-radius: 30px;
-    z-index: 1000;
   }
   .sidebarSmall {
-    width: 4.5rem;
+    width: 5.5rem;
     height: 100vh;
     position: sticky;
     top: 0;
diff --git a/Test.UI/Components/Layout/MainLayout.razor.less b/Test.UI/Components/Layout/MainLayout.razor.less
index e2a6c3b..c37c551 100644
--- a/Test.UI/Components/Layout/MainLayout.razor.less
+++ b/Test.UI/Components/Layout/MainLayout.razor.less
@@ -6,7 +6,6 @@
 
 main {
     flex: 1;
-    margin-left: 14rem;
 }
 
 .sidebar,
@@ -64,15 +63,13 @@ main {
     .sidebar {
         width: 13.5rem;
         height: 100vh;
-        position: fixed;
+        position: sticky;
         top: 0;
-        left: 0;
         border-radius: 30px;
-        z-index:1000;
     }
 
     .sidebarSmall {
-        width: 4.5rem;
+        width: 5.5rem;
         height: 100vh;
         position: sticky;
         top: 0;
diff --git a/Test.UI/Components/Layout/MainLayout.razor.min.css b/Test.UI/Components/Layout/MainLayout.razor.min.css
index 3a0416e..0f4cca1 100644
--- a/Test.UI/Components/Layout/MainLayout.razor.min.css
+++ b/Test.UI/Components/Layout/MainLayout.razor.min.css
@@ -1 +1 @@
-.page{position:relative;display:flex;flex-direction:column;}main{flex:1;margin-left:14rem;}.sidebar,.sidebarSmall{background:-webkit-linear-gradient(to bottom,#d5f1f2,#d5f1f2);background:linear-gradient(to bottom,#d5f1f2,#d5f1f2);}.top-row{background-color:#f7f7f7;border-bottom:1px solid #d6d5d5;height:3.5rem;display:flex;align-items:center;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:1.6rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:13.5rem;height:100vh;position:fixed;top:0;left:0;border-radius:30px;z-index:1000;}.sidebarSmall{width:4.5rem;height:100vh;position:sticky;top:0;border-radius:30px;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}}
\ No newline at end of file
+.page{position:relative;display:flex;flex-direction:column;}main{flex:1;}.sidebar,.sidebarSmall{background:-webkit-linear-gradient(to bottom,#d5f1f2,#d5f1f2);background:linear-gradient(to bottom,#d5f1f2,#d5f1f2);}.top-row{background-color:#f7f7f7;border-bottom:1px solid #d6d5d5;height:3.5rem;display:flex;align-items:center;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:1.6rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:13.5rem;height:100vh;position:sticky;top:0;border-radius:30px;}.sidebarSmall{width:5.5rem;height:100vh;position:sticky;top:0;border-radius:30px;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}}
\ No newline at end of file
diff --git a/Test.UI/Components/Layout/NavMenu.razor b/Test.UI/Components/Layout/NavMenu.razor
index 44e7876..046de1f 100644
--- a/Test.UI/Components/Layout/NavMenu.razor
+++ b/Test.UI/Components/Layout/NavMenu.razor
@@ -12,6 +12,9 @@
         {
             <a class="navbar-brand text-center" @onclick="() => ToggleCompress()">Window <i class="fas fa-caret-square-left"></i></a>
         }
+        <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
+            <span class="navbar-toggler-icon"></span>
+        </button>
     </div>
 </div>
 
@@ -19,10 +22,14 @@
     <nav class="flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="Home" Match="NavLinkMatch.All">
-                <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> Home
+                <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> 
+                @if (showText)
+                {
+                    <span class="@hideText">Home</span>
+                }
             </NavLink>
         </div>
-        <div class="nav-item px-3">
+        @* <div class="nav-item px-3">
             <NavLink class="nav-link" href="TestComponentTemplate">
                 <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">TestTemplate</span>
             </NavLink>
@@ -36,13 +43,13 @@
             <NavLink class="nav-link" href="Gerarchia">
                 <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> <span class="@hideText"> Gerarchia</span>
             </NavLink>
-        </div>
+        </div> *@
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="EditJWD">
-                <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">EditJWD</span>
+                <span class="fa-solid fa-gear px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">EditJWD</span>
             </NavLink>
         </div>
-        <div class="nav-item px-3">
+        @* <div class="nav-item px-3">
             <NavLink class="nav-link" href="Aedifica">
                 <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">Aedifica</span>
             </NavLink>
@@ -51,7 +58,7 @@
             <NavLink class="nav-link" href="uitest">
                 <span class="bi bi-house-fill px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">UI Testing</span>
             </NavLink>
-        </div>
+        </div> *@
     </nav>
 </div>
 
diff --git a/Test.UI/Components/Layout/NavMenu.razor.cs b/Test.UI/Components/Layout/NavMenu.razor.cs
index 5ee29cc..0ac6c6b 100644
--- a/Test.UI/Components/Layout/NavMenu.razor.cs
+++ b/Test.UI/Components/Layout/NavMenu.razor.cs
@@ -13,7 +13,7 @@ namespace Test.UI.Components.Layout
             NavigationManager.LocationChanged -= OnLocationChanged;
         }
 
-        protected string hideText { get => showText ? "" : "invisible"; }
+        protected string hideText { get => showText ? "px-2" : "invisible"; }
 
         protected string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
 
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs
index cbe300f..7c389b7 100644
--- a/WebWindowComplex/Compo/CardFrame.razor.cs
+++ b/WebWindowComplex/Compo/CardFrame.razor.cs
@@ -138,7 +138,7 @@ namespace WebWindowComplex.Compo
                 currFrame = CurrFrameWindow,
                 svgNoHw = true
             };
-            await EC_ReqResetDictShape.InvokeAsync();
+            await EC_ReqResetDictShape.InvokeAsync(new DataUpdateRes { req=LayoutConst.DataAction.ResetDictShape});
             await EC_ReqOptionHw.InvokeAsync(CurrFrameWindow);
             await EC_UpdatePreview.InvokeAsync(args);
         }
@@ -189,7 +189,7 @@ namespace WebWindowComplex.Compo
                     currFrame = CurrFrameWindow,
                     svgNoHw = true
                 };
-                await EC_ReqResetDictShape.InvokeAsync();
+                await EC_ReqResetDictShape.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDictShape });
                 await EC_UpdatePreview.InvokeAsync(args);
             }
         }
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index f8a238d..e186ad4 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -247,6 +247,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 88297ee..0b6a97c 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -403,6 +403,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+