diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityLayout.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityLayout.razor.scss
index 4f8629a473..3f91c2be05 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityLayout.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Identity/IdentityLayout.razor.scss
@@ -4,7 +4,7 @@
 
 main {
     width: 100%;
-    height: 100%
+    min-height: 100%;
 }
 
 .panel {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainLayout.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainLayout.razor.scss
index e2f1c5e442..5a25a2c8f4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainLayout.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/MainLayout.razor.scss
@@ -3,7 +3,7 @@
 
 main {
     width: 100%;
-    height: 100%;
+    min-height: 100%;
 
     @include lt-md {
         height: unset;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavPanel.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavPanel.razor.scss
index 974fa0276b..5609e962ce 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavPanel.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavPanel.razor.scss
@@ -2,11 +2,11 @@
 @import '../../../Styles/abstracts/_bit-css-variables.scss';
 
 section {
-    top: 0;
     height: 100vh;
     padding: 1rem;
     position: sticky;
     overflow: hidden auto;
+    top: var(--app-inset-top);
     min-width: var(--nav-menu-width);
     max-width: var(--nav-menu-width);
 
@@ -17,9 +17,8 @@ section {
     @include lt-md {
         z-index: 3;
         padding: 0;
-        height: unset;
         position: fixed;
-        top: var(--app-inset-top);
+        height: unset !important;
         bottom: var(--app-inset-bottom);
 
         &.closed {
@@ -28,6 +27,12 @@ section {
     }
 }
 
+.bit-macos {
+    section {
+        height: -webkit-fill-available;
+    }
+}
+
 .menu-overlay {
     inset: 0;
     z-index: 2;
@@ -48,6 +53,7 @@ section {
         padding: 0.5rem;
         min-height: 100%;
         flex-direction: column;
+        height: -webkit-fill-available;
         background-color: $bit-color-background-secondary;
 
         @include lt-md {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
index aa67f2a9e5..891e7f70c6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor
@@ -5,14 +5,16 @@
         <CascadingValue Value="currentUrl" Name="@Parameters.CurrentUrl">
             <CascadingValue Value="isAuthenticated" Name="@Parameters.IsAuthenticated">
                 <CascadingValue Value="isAnonymousPage" Name="@Parameters.IsCrossLayoutPage">
-                    <div dir="@currentDir?.ToString().ToLower()" class="layout">
+                    <div class="layout">
                         <div class="inset-top"></div>
-                        <div class="inset-main">
+                        <div class="inset-main" dir="@currentDir?.ToString().ToLower()">
+                            <div class="inset-left"></div>
                             <AppErrorBoundary>
                                 <LayoutView Layout="GetCurrentLayout()">
                                     @Body
                                 </LayoutView>
                             </AppErrorBoundary>
+                            <div class="inset-right"></div>
                         </div>
                         <div class="inset-bottom"></div>
                     </div>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss
index e7315a1107..259799c699 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootLayout.razor.scss
@@ -9,6 +9,8 @@
     background-color: $bit-color-background-primary;
     --app-inset-top: env(safe-area-inset-top);
     --app-inset-bottom: env(safe-area-inset-bottom);
+    --app-inset-left: env(safe-area-inset-left);
+    --app-inset-right: env(safe-area-inset-right);
 
     @include lt-md {
         height: 100%;
@@ -19,19 +21,31 @@
     height: var(--app-inset-top);
 }
 
+.inset-left {
+    height: 100%;
+    width: var(--app-inset-left);
+}
+
 .inset-main {
     width: 100%;
-    height: 100%;
+    display: flex;
+    min-height: 100%;
 
     @include lt-md {
         overflow: auto;
         position: relative;
         scroll-behavior: smooth;
         overscroll-behavior: none;
+        width: calc(100% - var(--app-inset-left) - var(--app-inset-right));
         height: calc(100% - var(--app-inset-top) - var(--app-inset-bottom));
     }
 }
 
+.inset-right {
+    height: 100%;
+    width: var(--app-inset-right);
+}
+
 .inset-bottom {
     height: var(--app-inset-bottom);
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
index 457e391fc6..bfb86bb70e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
@@ -4,7 +4,7 @@
     <base href="/" />
     <meta charset="utf-8" />
     <meta name="theme-color">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
     <!--#if (captcha == "reCaptcha")-->
     <link rel="preconnect" href="https://www.google.com">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
index e1d3f57a04..c2bd3e8bfa 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
@@ -4,13 +4,13 @@
     <base href="/">
     <meta charset="utf-8">
     <meta name="theme-color">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
     <meta name="description" content="The Boilerplate is built with ASP.NET Core, Identity, Web API, EF Core and Blazor.">
 
     <script>
         // disable auto-zoom of iOS Safari when focusing an input
         (/iPad|iPhone|iPod/.test(navigator.userAgent)) &&
-            (document.querySelector('meta[name="viewport"]').content = 'width=device-width, initial-scale=1.0, maximum-scale=1.0')
+            (document.querySelector('meta[name="viewport"]').content = 'width=device-width, initial-scale=1.0, viewport-fit=cover, maximum-scale=1.0')
     </script>
 
     <!--#if (captcha == "reCaptcha")-->
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Urls.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Urls.cs
index f576f0ef7c..b9b3ea3d1b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Urls.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Urls.cs
@@ -50,5 +50,5 @@ public static partial class Urls
     /// <summary>
     /// The pages that are getting rendered in multiple layouts (identity and main).
     /// </summary>
-    public static readonly string[] CrossLayoutPages = [HomePage, TermsPage];
+    public static readonly string[] CrossLayoutPages = [HomePage, TermsPage, NotFoundPage];
 }