diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor
index 99a3e9f387..76ff00356c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor
@@ -6,23 +6,28 @@
 }
 else if (ErrorContent is null)
 {
-    <div class="main">
-        <div class="header">
-            <BitButton OnClick="Recover" IconName="@BitIconName.ChromeClose" Variant="BitVariant.Text" />
-        </div>
-        <div>
-            <img src="_content/Boilerplate.Client.Core/images/icons/error-triangle.svg" />
-        </div>
-        <h1 class="title">@localizer[nameof(AppStrings.SomethingWentWrong)]</h1>
-        @if (showException)
-        {
-            <div class="exception">@CurrentException?.ToString()</div>
-        }
-        <div class="buttons">
-            <BitButton OnClick="Refresh">@localizer[nameof(AppStrings.Refresh)]</BitButton>
-            <BitButton OnClick="GoHome" Variant="BitVariant.Outline">@localizer[nameof(AppStrings.Home)]</BitButton>
-        </div>
-    </div>
+    <main>
+        <BitStack Alignment="BitAlignment.Center">
+            <BitImage Src="_content/Boilerplate.Client.Core/images/icons/error-triangle.svg" />
+
+            <BitText Color="BitColor.Error" Typography="BitTypography.H3">
+                @localizer[nameof(AppStrings.SomethingWentWrong)]
+            </BitText>
+
+            @if (showException)
+            {
+                <div class="exception">
+                    @CurrentException?.ToString()
+                </div>
+            }
+
+            <BitStack Horizontal Alignment="BitAlignment.Center" AutoHeight>
+                <BitButton OnClick="Refresh">@localizer[nameof(AppStrings.Refresh)]</BitButton>
+                <BitButton OnClick="GoHome" Variant="BitVariant.Outline">@localizer[nameof(AppStrings.Home)]</BitButton>
+                <BitButton OnClick="Recover" Variant="BitVariant.Outline">@localizer[nameof(AppStrings.Recover)]</BitButton>
+            </BitStack>
+        </BitStack>
+    </main>
 }
 else
 {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor.scss
index dccdeb59b8..8e394c72db 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppErrorBoundary.razor.scss
@@ -1,33 +1,15 @@
 @import '../../Styles/abstracts/_functions.scss';
 @import '../../Styles/abstracts/_bit-css-variables.scss';
 
-.main {
+main {
     width: 100%;
-    display: flex;
-    padding: rem2(8px);
-    text-align: center;
-    max-width: rem2(800px);
-    max-height: rem2(600px);
-    flex-direction: column;
-    border-radius: rem2(4px);
-    background-color: $bit-color-background-primary;
-}
-
-.header {
-    text-align: end;
-}
-
-.title {
-    color: $bit-color-error;
+    height: 100%;
 }
 
 .exception {
+    width: 90%;
     overflow: auto;
     white-space: pre;
     text-align: start;
     margin: rem2(24px);
 }
-
-.buttons {
-    margin-bottom: rem2(24px);
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss
index a9c09412e6..7091cad7be 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/RootContainer.razor.scss
@@ -9,10 +9,6 @@
     --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%;
-    }
 }
 
 .inset-top {
@@ -26,6 +22,7 @@
 
 .inset-main {
     width: 100%;
+    height: 100%;
     display: flex;
     min-height: 100%;
 
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 c493d97336..4c6efc9a66 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
@@ -93,6 +93,7 @@ main {
     }
 
     .stack {
+        width: 100%;
         display: flex;
     }
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Settings/DeleteAccountSection.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Settings/DeleteAccountSection.razor
index 48df71c9c4..93c27c3e6a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Settings/DeleteAccountSection.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Settings/DeleteAccountSection.razor
@@ -19,7 +19,7 @@
     </BitStack>
 </section>
 
-<BitDialog OnOk="DeleteAccount"
+<BitDialog OnOk="WrapHandled(DeleteAccount)"
            @bind-IsOpen="isDialogOpen"
            OkText="@Localizer[nameof(AppStrings.Yes)]"
            CancelText="@Localizer[nameof(AppStrings.No)]"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Todo/TodoPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Todo/TodoPage.razor
index a44bd81c75..d0ef2d8c82 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Todo/TodoPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Todo/TodoPage.razor
@@ -125,7 +125,7 @@
     </BitStack>
 </section>
 
-<BitDialog OnOk="DeleteTodoItem"
+<BitDialog OnOk="WrapHandled(DeleteTodoItem)"
            @bind-IsOpen="isDeleteDialogOpen"
            OkText="@Localizer[nameof(AppStrings.Yes)]"
            CancelText="@Localizer[nameof(AppStrings.No)]"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor
index d894ccdefe..3895643a29 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Routes.razor
@@ -15,6 +15,7 @@
                 </AuthorizeRouteView>
             </Found>
             <NotFound>
+                <RouteDataPublisher RouteData="@null" />
                 <NotFoundPage />
             </NotFound>
             <Navigating>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
index d9196839b7..c68e4e3bdb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
@@ -386,6 +386,9 @@
   </data>
     <data name="Refresh" xml:space="preserve">
     <value>تلاش مجدد</value>
+  </data>
+    <data name="Recover" xml:space="preserve">
+    <value>بازیابی</value>
   </data>
     <data name="SomethingWentWrong" xml:space="preserve">
     <value>اوه! به نظر مشکلی پیش اومده...</value>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
index 42c5daa676..acf8074779 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
@@ -386,6 +386,9 @@
   </data>
     <data name="Refresh" xml:space="preserve">
     <value>Opfrissen</value>
+  </data>
+    <data name="Recover" xml:space="preserve">
+    <value>Herstellen</value>
   </data>
     <data name="SomethingWentWrong" xml:space="preserve">
     <value>Oeps, er is iets misgegaan...</value>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
index d12bac8e23..3d761d150f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
@@ -386,6 +386,9 @@
   </data>
     <data name="Refresh" xml:space="preserve">
     <value>Refresh</value>
+  </data>
+    <data name="Recover" xml:space="preserve">
+    <value>Recover</value>
   </data>
     <data name="SomethingWentWrong" xml:space="preserve">
     <value>Oops, something went wrong...</value>