diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor
index bb680883ea..467e7ba42c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavBar.razor
@@ -2,49 +2,16 @@
 @inherits AppComponentBase;
 
 <section>
-    <a href="@Urls.HomePage">
-        <BitIcon IconName="@BitIconName.Home" Color="@(IsActive(Urls.HomePage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
-        <BitText Typography="BitTypography.Caption2" Color="@(IsActive(Urls.HomePage) ? BitColor.Primary : BitColor.SecondaryForeground)">
-            @Localizer[nameof(AppStrings.Home)]
-        </BitText>
-    </a>
-
-    @*#if (sample == "Todo")*@
-    <a href="@Urls.TodoPage">
-        <BitIcon IconName="@BitIconName.ToDoLogoOutline" Color="@(IsActive(Urls.TodoPage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
-        <BitText Typography="BitTypography.Caption2" Color="@(IsActive(Urls.TodoPage) ? BitColor.Primary : BitColor.SecondaryForeground)">
-            @Localizer[nameof(AppStrings.Todo)]
-        </BitText>
-    </a>
-    @*#endif*@
-
-    @*#if (sample == "Admin")*@
-    <a href="@Urls.DashboardPage">
-        <BitIcon IconName="@BitIconName.BarChartVerticalFill" Color="@(IsActive(Urls.DashboardPage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
-        <BitText Typography="BitTypography.Caption2" Color="@(IsActive(Urls.DashboardPage) ? BitColor.Primary : BitColor.SecondaryForeground)">
-            @Localizer[nameof(AppStrings.Dashboard)]
-        </BitText>
-    </a>
-
-    <a href="@Urls.ProductsPage">
-        <BitIcon IconName="@BitIconName.Product" Color="@(IsActive(Urls.ProductsPage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
-        <BitText Typography="BitTypography.Caption2" Color="@(IsActive(Urls.ProductsPage) ? BitColor.Primary : BitColor.SecondaryForeground)">
-            @Localizer[nameof(AppStrings.Products)]
-        </BitText>
-    </a>
-
-    <a href="@Urls.CategoriesPage">
-        <BitIcon IconName="@BitIconName.BuildQueue" Color="@(IsActive(Urls.CategoriesPage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
-        <BitText Typography="BitTypography.Caption2" Color="@(IsActive(Urls.CategoriesPage) ? BitColor.Primary : BitColor.SecondaryForeground)">
-            @Localizer[nameof(AppStrings.Categories)]
-        </BitText>
-    </a>
-    @*#endif*@
-
-    <a href="@Urls.TermsPage">
-        <BitIcon IconName="@BitIconName.EntityExtraction" Color="@(IsActive(Urls.TermsPage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
-        <BitText Typography="BitTypography.Caption2" Color="@(IsActive(Urls.TermsPage) ? BitColor.Primary : BitColor.SecondaryForeground)">
-            @Localizer[nameof(AppStrings.Terms)]
-        </BitText>
-    </a>
+    <BitNavBar TItem="BitNavBarOption" Style="width:100%">
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Home)]" IconName="@BitIconName.Home" Url="@Urls.HomePage" />
+        @*#if (sample == "Todo")*@
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Todo)]" IconName="@BitIconName.ToDoLogoOutline" Url="@Urls.TodoPage" />
+        @*#endif*@
+        @*#if (sample == "Admin")*@
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Dashboard)]" IconName="@BitIconName.BarChartVerticalFill" Url="@Urls.DashboardPage" />
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Products)]" IconName="@BitIconName.Product" Url="@Urls.ProductsPage" />
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Categories)]" IconName="@BitIconName.BuildQueue" Url="@Urls.CategoriesPage" />
+        @*#endif*@
+        <BitNavBarOption Text="@Localizer[nameof(AppStrings.Terms)]" IconName="@BitIconName.EntityExtraction" Url="@Urls.TermsPage" />
+    </BitNavBar>
 </section>
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor
index bc2abde553..fdd55d4843 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/NavPanel.razor
@@ -63,6 +63,7 @@
             <BitSpacer />
 
             <BitActionButton IconOnly="isToggled"
+                             Color="BitColor.Error"
                              FullWidth="!isToggled"
                              OnClick="ShowSignOutConfirm"
                              IconName="@BitIconName.SignOut"
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor
index b072ed0e18..d6c56d0648 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor
@@ -36,6 +36,10 @@
 
                         <BitSeparator />
 
+                        <BitActionButton IconName="@BitIconName.Contact" Href="@($"{Urls.SettingsPage}/{Urls.SettingsSections.Profile}")" FullWidth OnClick="() => isOpen=false">
+                            @Localizer[nameof(AppStrings.ProfileTitle)]
+                        </BitActionButton>
+
                         <BitActionButton IconName="@BitIconName.Globe" FullWidth OnClick="() => showCultures=true">
                             <BitStack Horizontal Gap="0" Grows VerticalAlign="BitAlignment.Center">
                                 @Localizer[nameof(AppStrings.Language)]
@@ -55,11 +59,10 @@
                             <BitToggle OnChange="ToggleTheme" Value="currentTheme == AppThemeType.Light" ValueChanged="v => {}" />
                         </BitStack>
 
-                        <BitActionButton IconName="@BitIconName.Contact" Href="@($"{Urls.SettingsPage}/{Urls.SettingsSections.Profile}")" FullWidth OnClick="() => isOpen=false">
-                            @Localizer[nameof(AppStrings.ProfileTitle)]
-                        </BitActionButton>
-
-                        <BitActionButton IconName="@BitIconName.SignOut" FullWidth OnClick="() => { isSignOutConfirmOpen=true; isOpen=false; }">
+                        <BitActionButton FullWidth
+                                         Color="BitColor.Error"
+                                         IconName="@BitIconName.SignOut"
+                                         OnClick="() => { isSignOutConfirmOpen=true; isOpen=false; }">
                             @Localizer[nameof(AppStrings.SignOut)]
                         </BitActionButton>
                     </BitStack>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor
index df85275898..dbc86a99ec 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/CategoriesPage.razor
@@ -66,7 +66,16 @@
                     </BitDataGridTemplateColumn>
                 </BitDataGrid>
             </div>
-            <BitDataGridPaginator Value="pagination" />
+            <BitDataGridPaginator Value="pagination"
+                                  SummaryFormat="v => string.Format(Localizer[nameof(AppStrings.PaginatorSummary)], v.TotalItemCount)"
+                                  GoToFirstButtonTitle="Go to first page"
+                                  GoToPrevButtonTitle="Go to previous page"
+                                  GoToNextButtonTitle="Go to next page"
+                                  GoToLastButtonTitle="Go to last page">
+                <TextTemplate Context="value">
+                    <span>@Localizer[nameof(AppStrings.Page)] <b>@(value.CurrentPageIndex + 1)</b> @Localizer[nameof(AppStrings.Of)] <b>@(value.LastPageIndex + 1)</b></span>
+                </TextTemplate>
+            </BitDataGridPaginator>
         </BitStack>
     </BitStack>
 </section>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor
index 937d6a595d..651c0cf8d1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor
@@ -78,7 +78,16 @@
                     </BitDataGridTemplateColumn>
                 </BitDataGrid>
             </div>
-            <BitDataGridPaginator Value="pagination" />
+            <BitDataGridPaginator Value="pagination"
+                                  SummaryFormat="v => string.Format(Localizer[nameof(AppStrings.PaginatorSummary)], v.TotalItemCount)"
+                                  GoToFirstButtonTitle="Go to first page"
+                                  GoToPrevButtonTitle="Go to previous page"
+                                  GoToNextButtonTitle="Go to next page"
+                                  GoToLastButtonTitle="Go to last page">
+                <TextTemplate Context="value">
+                    <span>@Localizer[nameof(AppStrings.Page)] <b>@(value.CurrentPageIndex + 1)</b> @Localizer[nameof(AppStrings.Of)] <b>@(value.LastPageIndex + 1)</b></span>
+                </TextTemplate>
+            </BitDataGridPaginator>
         </BitStack>
     </BitStack>
 </section>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
index e298ce2c75..adc05da2fb 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
@@ -44,7 +44,7 @@ public static IServiceCollection AddClientCoreProjectServices(this IServiceColle
         services.AddSessioned<MessageBoxService>();
         services.AddSessioned<ILocalHttpServer, NoopLocalHttpServer>();
         services.AddSessioned<ITelemetryContext, AppTelemetryContext>();
-        services.AddSessioned(sp =>
+        services.AddSessioned<AuthenticationStateProvider>(sp =>
         {
             var authenticationStateProvider = ActivatorUtilities.CreateInstance<AuthenticationManager>(sp);
             authenticationStateProvider.OnInit();
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 a66f43540e..fbbb0d4adb 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
@@ -1033,6 +1033,27 @@
     <!--#elif (sample == "Admin") -->
     <data name="AdminPanel" xml:space="preserve">
     <value>پنل ادمین</value>
+  </data>
+    <data name="PaginatorSummary" xml:space="preserve">
+    <value>{0} آیتم</value>
+  </data>
+    <data name="PaginatorFirstButtonTitle" xml:space="preserve">
+    <value>برو به اولین برگه</value>
+  </data>
+    <data name="PaginatorPrevButtonTitle" xml:space="preserve">
+    <value>برو به برگه قبل</value>
+  </data>
+    <data name="PaginatorNextButtonTitle" xml:space="preserve">
+    <value>برو به برگه بعد</value>
+  </data>
+    <data name="PaginatorLastButtonTitle" xml:space="preserve">
+    <value>برو به آخرین برگه</value>
+  </data>
+    <data name="Page" xml:space="preserve">
+    <value>برگه</value>
+  </data>
+    <data name="Of" xml:space="preserve">
+    <value>از</value>
   </data>
     <data name="ProductsCount" 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 5949f0f411..c2289002da 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
@@ -1033,6 +1033,27 @@
     <!--#elif (sample == "Admin") -->
     <data name="AdminPanel" xml:space="preserve">
     <value>Beheerderspaneel</value>
+  </data>
+    <data name="PaginatorSummary" xml:space="preserve">
+    <value>{0} items</value>
+  </data>
+    <data name="PaginatorFirstButtonTitle" xml:space="preserve">
+    <value>Ga naar de eerste pagina</value>
+  </data>
+    <data name="PaginatorPrevButtonTitle" xml:space="preserve">
+    <value>Ga naar de vorige pagina</value>
+  </data>
+    <data name="PaginatorNextButtonTitle" xml:space="preserve">
+    <value>Ga naar de volgende pagina</value>
+  </data>
+    <data name="PaginatorLastButtonTitle" xml:space="preserve">
+    <value>Ga naar de laatste pagina</value>
+  </data>
+    <data name="Page" xml:space="preserve">
+    <value>Pagina</value>
+  </data>
+    <data name="Of" xml:space="preserve">
+    <value>tot</value>
   </data>
     <data name="ProductsCount" xml:space="preserve">
     <value>Aantal producten</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 4ca26211f3..6d3bc4291d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
@@ -1033,6 +1033,27 @@
     <!--#elif (sample == "Admin") -->
     <data name="AdminPanel" xml:space="preserve">
     <value>Admin panel</value>
+  </data>
+    <data name="PaginatorSummary" xml:space="preserve">
+    <value>{0} items</value>
+  </data>
+    <data name="PaginatorFirstButtonTitle" xml:space="preserve">
+    <value>Go to the first page</value>
+  </data>
+    <data name="PaginatorPrevButtonTitle" xml:space="preserve">
+    <value>Go to the previous page</value>
+  </data>
+    <data name="PaginatorNextButtonTitle" xml:space="preserve">
+    <value>Go to the next page</value>
+  </data>
+    <data name="PaginatorLastButtonTitle" xml:space="preserve">
+    <value>Go to the last page</value>
+  </data>
+    <data name="Page" xml:space="preserve">
+    <value>Page</value>
+  </data>
+    <data name="Of" xml:space="preserve">
+    <value>of</value>
   </data>
     <data name="ProductsCount" xml:space="preserve">
     <value>Products count</value>