diff --git a/MP-TAB-SERV/Components/CmpTop.razor b/MP-TAB-SERV/Components/CmpTop.razor
index d6353247..bde404e3 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor
+++ b/MP-TAB-SERV/Components/CmpTop.razor
@@ -25,6 +25,3 @@
         }
     </div>
 </div>
-
-
-@NavMan.Uri
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index 775a885c..96d822ed 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -82,7 +82,7 @@ namespace MP_TAB_SERV.Components
                     await MsgServ.SetLastMatrOprAsync(rigaOpr.MatrOpr);
                     await MsgServ.SetCurrOperDtoAsync(hash);
                     await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash);
-                    NavMan.NavigateTo("status-map");
+                    //NavMan.NavigateTo("status-map");
                 }
             }
         }
diff --git a/MP-TAB-SERV/Pages/Index.razor b/MP-TAB-SERV/Pages/Index.razor
index 5a545bca..b5d0a9fb 100644
--- a/MP-TAB-SERV/Pages/Index.razor
+++ b/MP-TAB-SERV/Pages/Index.razor
@@ -1,6 +1,20 @@
 @page "/"
+@page "/home"
+
 <img src="~/images/LogoEgw.png" />
 
 @code {
+    protected override async Task OnInitializedAsync()
+    {
+        await Task.Delay(1);
+    }
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await Task.Delay(1);
+    }
 
+    protected override async Task OnParametersSetAsync()
+    {
+        await Task.Delay(1);
+    }
 }
diff --git a/MP-TAB-SERV/Pages/StatusMap.razor b/MP-TAB-SERV/Pages/StatusMap.razor
index 46a97e18..37a4a0d2 100644
--- a/MP-TAB-SERV/Pages/StatusMap.razor
+++ b/MP-TAB-SERV/Pages/StatusMap.razor
@@ -1,5 +1,4 @@
-@page "/home"
-@page "/status-map"
+@page "/status-map"
 
 <MseSampler SampleMult="1.5" E_Updated="SaveData"></MseSampler>
 <div class="row">
diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor
index 811396de..df3d355f 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor
+++ b/MP-TAB-SERV/Shared/MainLayout.razor
@@ -7,17 +7,20 @@
 <div class="page" @onclick="()=>handleBodyClick()">
     <main>
         <CmpTop CurrMenuItems="@CurrMenuItems"></CmpTop>
-        <article class="content pt-1 d-flex mb-5">
-            <div class="" id="@bodyTipe">
-                @Body
-            </div>
-            @if (!HideMenu)
-            {
-                <div class="sidebar" id="barLat">
-                    <NavMenu MenuItems="@CurrMenuItems"></NavMenu>
+        @if (MsgServ.RigaOper != null || NavMan.Uri.Contains("reg-new-device"))
+        {
+            <article class="content pt-1 d-flex mb-5">
+                <div class="" id="@bodyTipe">
+                    @Body
                 </div>
-            }
-        </article>
+                @if (!HideMenu)
+                {
+                    <div class="sidebar" id="barLat">
+                        <NavMenu MenuItems="@CurrMenuItems"></NavMenu>
+                    </div>
+                }
+            </article>
+        }
     </main>
 </div>
 <div class="fixed-bottom">