diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
index fc97abe..06be4c4 100644
--- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
+++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
@@ -126,9 +126,9 @@
             <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
                 <div class="d-flex justify-content-between w-100 px-4">
                     <div class="d-flex justify-content-between">
-                        <a class="navbar-brand" href="/">
+                        <NavLink class="navbar-brand" href="Home">
                             <img src="images/DCALogoCut.png" style="width: 7.5rem;height: 3rem;" />
-                        </a>
+                        </NavLink>
                     </div>
                 </div>
             </div>
diff --git a/WebDoorCreator.UI/Shared/MainLayout.razor b/WebDoorCreator.UI/Shared/MainLayout.razor
index 065b14e..2298f77 100644
--- a/WebDoorCreator.UI/Shared/MainLayout.razor
+++ b/WebDoorCreator.UI/Shared/MainLayout.razor
@@ -17,30 +17,17 @@
         </div>
 
         @if (NavManager.Uri == NavManager.BaseUri)
-        {
-            <article class="px-0 content">
-                @Body
-            </article>
-        }
-        else
         {
             <article class="px-4 content">
                 @Body
             </article>
         }
-        @*else if (NavManager.Uri.Contains("DoorDefinition"))
-        {
-        <article class="px-4 py-0 content">
-        @Body
-        </article>
-        }
         else
         {
-        }*@
-
-        @*<div class="bottom-row px-4 auth">
-        <LoginDisplay />
-        </div>*@
+            <article class="px-0 content">
+                @Body
+            </article>
+        }
     </main>
 </div>
 <div class="fixed-bottom">