diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs
index 2bb61b37b..e6c72f53f 100644
--- a/BTCPayServer.Tests/SeleniumTester.cs
+++ b/BTCPayServer.Tests/SeleniumTester.cs
@@ -225,7 +225,7 @@ namespace BTCPayServer.Tests
 
         public void ClickOnAllSideMenus()
         {
-            var links = Driver.FindElements(By.CssSelector(".nav-pills .nav-link")).Select(c => c.GetAttribute("href")).ToList();
+            var links = Driver.FindElements(By.CssSelector(".nav .nav-link")).Select(c => c.GetAttribute("href")).ToList();
             Driver.AssertNoError();
             Assert.NotEmpty(links);
             foreach (var l in links)
diff --git a/BTCPayServer/Controllers/AppsController.Crowdfund.cs b/BTCPayServer/Controllers/AppsController.Crowdfund.cs
index 5727ee368..ca3caaf6d 100644
--- a/BTCPayServer/Controllers/AppsController.Crowdfund.cs
+++ b/BTCPayServer/Controllers/AppsController.Crowdfund.cs
@@ -16,23 +16,22 @@ namespace BTCPayServer.Controllers
             public string StoreId { get; set; }
             public override string ToString()
             {
-                return String.Empty;
+                return string.Empty;
             }
         }
 
-
-        [HttpGet]
-        [Route("{appId}/settings/crowdfund")]
+        [HttpGet("{appId}/settings/crowdfund")]
         public async Task<IActionResult> UpdateCrowdfund(string appId)
         {
             var app = await GetOwnedApp(appId, AppType.Crowdfund);
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<CrowdfundSettings>();
-            var vm = new UpdateCrowdfundViewModel()
+            var vm = new UpdateCrowdfundViewModel
             {
                 Title = settings.Title,
                 StoreId = app.StoreDataId,
+                StoreName = app.StoreData?.StoreName,
                 Enabled = settings.Enabled,
                 EnforceTargetAmount = settings.EnforceTargetAmount,
                 StartDate = settings.StartDate,
diff --git a/BTCPayServer/Controllers/AppsController.PointOfSale.cs b/BTCPayServer/Controllers/AppsController.PointOfSale.cs
index fb46bf12d..427ec1f98 100644
--- a/BTCPayServer/Controllers/AppsController.PointOfSale.cs
+++ b/BTCPayServer/Controllers/AppsController.PointOfSale.cs
@@ -97,10 +97,11 @@ namespace BTCPayServer.Controllers
             settings.DefaultView = settings.EnableShoppingCart ? PosViewType.Cart : settings.DefaultView;
             settings.EnableShoppingCart = false;
 
-            var vm = new UpdatePointOfSaleViewModel()
+            var vm = new UpdatePointOfSaleViewModel
             {
                 Id = appId,
                 StoreId = app.StoreDataId,
+                StoreName = app.StoreData?.StoreName,
                 Title = settings.Title,
                 DefaultView = settings.DefaultView,
                 ShowCustomAmount = settings.ShowCustomAmount,
@@ -183,7 +184,7 @@ namespace BTCPayServer.Controllers
             var app = await GetOwnedApp(appId, AppType.PointOfSale);
             if (app == null)
                 return NotFound();
-            app.SetSettings(new PointOfSaleSettings()
+            app.SetSettings(new PointOfSaleSettings
             {
                 Title = vm.Title,
                 DefaultView = vm.DefaultView,
diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index 626adb145..822eba6ba 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -857,6 +857,12 @@ namespace BTCPayServer.Controllers
             if (string.IsNullOrWhiteSpace(userId))
                 return Challenge(AuthenticationSchemes.Cookie);
             var storeId = CurrentStore?.Id;
+            if (storeId != null)
+            {
+                var store = await _Repo.FindStore(storeId, userId);
+                if (store != null)
+                    HttpContext.SetStoreData(store);
+            }
             var model = new CreateTokenViewModel();
             ViewBag.HidePublicKey = true;
             ViewBag.ShowStores = true;
@@ -913,6 +919,14 @@ namespace BTCPayServer.Controllers
                 return Challenge(AuthenticationSchemes.Cookie);
             if (pairingCode == null)
                 return NotFound();
+            if (selectedStore != null)
+            {
+                var store = await _Repo.FindStore(selectedStore, userId);
+                if (store == null)
+                    return NotFound();
+                HttpContext.SetStoreData(store);
+                ViewBag.ShowStores = false;
+            }
             var pairing = await _TokenRepository.GetPairingAsync(pairingCode);
             if (pairing == null)
             {
@@ -922,7 +936,7 @@ namespace BTCPayServer.Controllers
             else
             {
                 var stores = await _Repo.GetStoresByUserId(userId);
-                return View(new PairingModel()
+                return View(new PairingModel
                 {
                     Id = pairing.Id,
                     Label = pairing.Label,
@@ -981,8 +995,6 @@ namespace BTCPayServer.Controllers
             return _UserManager.GetUserId(User);
         }
 
-
-
         // TODO: Need to have talk about how architect default currency implementation
         // For now we have also hardcoded USD for Store creation and then Invoice creation
         const string DEFAULT_CURRENCY = "USD";
diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/WalletsController.cs
index 02083a6d6..ebee6f7e8 100644
--- a/BTCPayServer/Controllers/WalletsController.cs
+++ b/BTCPayServer/Controllers/WalletsController.cs
@@ -341,6 +341,8 @@ namespace BTCPayServer.Controllers
                 model.Transactions = model.Transactions.OrderByDescending(t => t.Timestamp).Skip(skip).Take(count).ToList();
             }
 
+            model.CryptoCode = walletId.CryptoCode;
+
             return View(model);
         }
 
diff --git a/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs b/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs
index 02572b8d9..51cd8bbbc 100644
--- a/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs
+++ b/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs
@@ -9,6 +9,8 @@ namespace BTCPayServer.Models.AppViewModels
     public class UpdateCrowdfundViewModel
     {
         public string StoreId { get; set; }
+        public string StoreName { get; set; }
+
         [Required]
         [MaxLength(30)]
         public string Title { get; set; }
@@ -95,12 +97,7 @@ namespace BTCPayServer.Models.AppViewModels
         [Display(Name = "Colors to rotate between with animation when a payment is made. First color is the default background. One color per line. Can be any valid css color value.")]
         public string AnimationColors { get; set; }
 
-
         // NOTE: Improve validation if needed
-        public bool ModelWithMinimumData
-        {
-            get { return Description != null && Title != null && TargetCurrency != null; }
-        }
-
+        public bool ModelWithMinimumData => Description != null && Title != null && TargetCurrency != null;
     }
 }
diff --git a/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs b/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs
index 84aaa6b06..5e9af8c04 100644
--- a/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs
+++ b/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs
@@ -9,6 +9,8 @@ namespace BTCPayServer.Models.AppViewModels
     public class UpdatePointOfSaleViewModel
     {
         public string StoreId { get; set; }
+        public string StoreName { get; set; }
+
         [Required]
         [MaxLength(30)]
         public string Title { get; set; }
diff --git a/BTCPayServer/Models/WalletViewModels/ListTransactionsViewModel.cs b/BTCPayServer/Models/WalletViewModels/ListTransactionsViewModel.cs
index e58df812f..9294f1673 100644
--- a/BTCPayServer/Models/WalletViewModels/ListTransactionsViewModel.cs
+++ b/BTCPayServer/Models/WalletViewModels/ListTransactionsViewModel.cs
@@ -19,5 +19,6 @@ namespace BTCPayServer.Models.WalletViewModels
         }
         public HashSet<ColoredLabel> Labels { get; set; } = new HashSet<ColoredLabel>();
         public List<TransactionViewModel> Transactions { get; set; } = new List<TransactionViewModel>();
+        public string CryptoCode { get; set; }
     }
 }
diff --git a/BTCPayServer/Views/Account/ForgotPassword.cshtml b/BTCPayServer/Views/Account/ForgotPassword.cshtml
index 714812515..767ddbe65 100644
--- a/BTCPayServer/Views/Account/ForgotPassword.cshtml
+++ b/BTCPayServer/Views/Account/ForgotPassword.cshtml
@@ -5,14 +5,8 @@
 
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" />
-            </div>
-        </div>
-        }
+        <partial name="_StatusMessage" />
+
         <div class="row justify-content-center">
             <div class="col-md-6 section-heading">
                 <h2>@ViewData["Title"]</h2>
@@ -39,6 +33,7 @@
         </div>
     </div>
 </section>
+
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Account/Login.cshtml b/BTCPayServer/Views/Account/Login.cshtml
index 7e6833b21..27feb0077 100644
--- a/BTCPayServer/Views/Account/Login.cshtml
+++ b/BTCPayServer/Views/Account/Login.cshtml
@@ -7,7 +7,7 @@
 }
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
 
 <div class="row justify-content-center mb-2">
@@ -18,10 +18,7 @@
 
         <h1 class="h2 mb-3">Welcome to your BTCPay&nbsp;Server</h1>
 
-        @if (TempData.HasStatusMessage())
-        {
-            <partial name="_StatusMessage"/>
-        }
+        <partial name="_StatusMessage" />
     </div>
 </div>
 
diff --git a/BTCPayServer/Views/Account/LoginWith2fa.cshtml b/BTCPayServer/Views/Account/LoginWith2fa.cshtml
index b145b3b33..f8886d049 100644
--- a/BTCPayServer/Views/Account/LoginWith2fa.cshtml
+++ b/BTCPayServer/Views/Account/LoginWith2fa.cshtml
@@ -43,5 +43,5 @@
 </section>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml b/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
index 1af51bcaa..e2534bfb3 100644
--- a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
+++ b/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
@@ -33,5 +33,5 @@
 
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Account/Register.cshtml b/BTCPayServer/Views/Account/Register.cshtml
index 812a02ae5..ed42a1f24 100644
--- a/BTCPayServer/Views/Account/Register.cshtml
+++ b/BTCPayServer/Views/Account/Register.cshtml
@@ -6,7 +6,7 @@
 }
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
 
 <div class="row justify-content-center mb-2">
@@ -22,10 +22,7 @@
             <span class="d-sm-block">It is secure, private, censorship-resistant and free.</span>
         </p>
 
-        @if (TempData.HasStatusMessage())
-        {
-            <partial name="_StatusMessage"/>
-        }
+        <partial name="_StatusMessage" />
     </div>
 </div>
 
diff --git a/BTCPayServer/Views/Account/SecondaryLogin.cshtml b/BTCPayServer/Views/Account/SecondaryLogin.cshtml
index 9b2760645..89f579e19 100644
--- a/BTCPayServer/Views/Account/SecondaryLogin.cshtml
+++ b/BTCPayServer/Views/Account/SecondaryLogin.cshtml
@@ -36,6 +36,7 @@
         </div>
     </div>
 </section>
+
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Account/SetPassword.cshtml b/BTCPayServer/Views/Account/SetPassword.cshtml
index 0a72969ae..0e62f7e9a 100644
--- a/BTCPayServer/Views/Account/SetPassword.cshtml
+++ b/BTCPayServer/Views/Account/SetPassword.cshtml
@@ -1,12 +1,11 @@
 @model BTCPayServer.Models.AccountViewModels.SetPasswordViewModel
 @{
     ViewData["Title"] = "Reset password";
-
     Layout = "_LayoutSimple";
 }
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
 
 <div class="row justify-content-center mb-2">
@@ -17,10 +16,7 @@
 
         <h1 class="h2 mb-3">Welcome to your BTCPay&nbsp;Server</h1>
 
-        @if (TempData.HasStatusMessage())
-        {
-            <partial name="_StatusMessage"/>
-        }
+        <partial name="_StatusMessage" />
     </div>
 </div>
 
diff --git a/BTCPayServer/Views/Apps/AppsNavPages.cs b/BTCPayServer/Views/Apps/AppsNavPages.cs
index 2ec18d1d6..e8b7f1529 100644
--- a/BTCPayServer/Views/Apps/AppsNavPages.cs
+++ b/BTCPayServer/Views/Apps/AppsNavPages.cs
@@ -2,6 +2,6 @@ namespace BTCPayServer.Views.Apps
 {
     public enum AppsNavPages
     {
-        Index, Create
+        Index, Create, Update
     }
 }
diff --git a/BTCPayServer/Views/Apps/CreateApp.cshtml b/BTCPayServer/Views/Apps/CreateApp.cshtml
index 6136dac1b..2a0189924 100644
--- a/BTCPayServer/Views/Apps/CreateApp.cshtml
+++ b/BTCPayServer/Views/Apps/CreateApp.cshtml
@@ -1,15 +1,13 @@
 @model CreateAppViewModel
 @{
-    ViewData["Title"] = "Create a new app";
+    ViewData.SetActivePageAndTitle(AppsNavPages.Create, "Create a new app");
 }
 <section>
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-        </div>
+        <partial name="_StatusMessage" />
+
+        <h2 class="mb-4">@ViewData["Title"]</h2>
+
         <div class="row">
             <div class="col-lg-12">
                 <form asp-action="CreateApp">
@@ -28,10 +26,10 @@
                         <select asp-for="SelectedStore" asp-items="Model.Stores" class="form-control"></select>
                     </div>
                     <div class="form-group">
-                        <input type="submit" value="Create" class="btn btn-primary" id="Create" />
+                        <input type="submit" value="Create" class="btn btn-primary" id="Create"/>
+                        <a asp-action="ListApps" class="text-muted ml-3">Back to list</a>
                     </div>
                 </form>
-                <a asp-action="ListApps">Back to the app list</a>
             </div>
         </div>
     </div>
diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index 3e4f1f149..d5268697d 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -1,6 +1,6 @@
 @model ListAppsViewModel
 @{
-    ViewData["Title"] = "Apps";
+    ViewData.SetActivePageAndTitle(AppsNavPages.Index, "Apps");
     var storeNameSortOrder = (string)ViewData["StoreNameSortOrder"];
     var appNameSortOrder = (string)ViewData["AppNameSortOrder"];
     var appTypeSortOrder = (string)ViewData["AppTypeSortOrder"];
@@ -10,27 +10,20 @@
 
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-                <p>Create and manage apps.</p>
-            </div>
-        </div>
-        <div class="row button-row mb-3">
-            <div class="col-lg-12">
-                <a asp-action="CreateApp" class="btn btn-primary" role="button" id="CreateNewApp"><span class="fa fa-plus"></span> Create a new app</a>
-                <a href="https://docs.btcpayserver.org/Apps/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
-            </div>
+        <partial name="_StatusMessage" />
+
+        <div class="d-sm-flex align-items-center justify-content-between mb-2">
+            <h2 class="mb-0">
+                @ViewData["PageTitle"]
+                <small>
+                    <a href="https://docs.btcpayserver.org/Apps/" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
+                </small>
+            </h2>
+            <a asp-action="CreateApp" class="btn btn-primary mt-3 mt-sm-0" role="button" id="CreateNewApp"><span class="fa fa-plus"></span> Create a new app</a>
         </div>
+
         <div class="row">
             <div class="col-lg-12">
                 @if (Model.Apps.Any())
diff --git a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
index 175942830..28ebbe6d8 100644
--- a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
@@ -2,25 +2,14 @@
 @using System.Globalization
 @model UpdateCrowdfundViewModel
 @{
-    ViewData["Title"] = "Update Crowdfund";
+    ViewData.SetActivePageAndTitle(AppsNavPages.Update, "Update Crowdfund", Model.StoreName);
 }
 <section>
-
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-        </div>
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
+        <partial name="_StatusMessage" />
+
+        <h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
         <div class="row">
             <div class="col-lg-12">
                 <form method="post">
@@ -92,7 +81,9 @@
                         </div>
                         <span asp-validation-for="EndDate" class="text-danger"></span>
                     </div>
-                    <partial name="TemplateEditor" model="@(nameof(Model.PerksTemplate), "Perks" )"/>
+
+                    <partial name="TemplateEditor" model="@(nameof(Model.PerksTemplate), "Perks")" />
+
                     <div class="form-group">
                         <label asp-for="PerksTemplate" class="control-label"></label>
                         <textarea asp-for="PerksTemplate" rows="10" cols="40" class="js-product-template form-control"></textarea>
@@ -100,7 +91,9 @@
                     </div>
                     <div class="form-group">
                         <label asp-for="CustomCSSLink" class="control-label"></label>
-                        <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                        <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank">
+                            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                        </a>
                         <input asp-for="CustomCSSLink" class="form-control" />
                         <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
                     </div>
diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
index 3418a5305..ee20a465a 100644
--- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
@@ -2,24 +2,14 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @model UpdatePointOfSaleViewModel
 @{
-    ViewData["Title"] = "Update Point of Sale";
+    ViewData.SetActivePageAndTitle(AppsNavPages.Update, "Update Point of Sale", Model.StoreName);
 }
 <section>
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-        </div>
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
+        <partial name="_StatusMessage" />
+
+        <h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
         <div class="row">
             <div class="col-lg-12">
                 <form method="post">
@@ -79,11 +69,15 @@
                     </div>
                     <div class="form-group">
                         <label asp-for="CustomCSSLink" class="control-label"></label>
-                        <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                        <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank">
+                            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                        </a>
                         <input asp-for="CustomCSSLink" class="form-control" />
                         <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
                     </div>
+
                     <partial name="TemplateEditor" model="@(nameof(Model.Template), "Products")" />
+
                     <div class="form-group">
                         <label asp-for="Template" class="control-label"></label>
                         <textarea asp-for="Template" rows="10" cols="40" class="js-product-template form-control"></textarea>
diff --git a/BTCPayServer/Views/Apps/_ViewImports.cshtml b/BTCPayServer/Views/Apps/_ViewImports.cshtml
index ee3f9960b..0a4a4114e 100644
--- a/BTCPayServer/Views/Apps/_ViewImports.cshtml
+++ b/BTCPayServer/Views/Apps/_ViewImports.cshtml
@@ -1 +1,2 @@
-@using BTCPayServer.Models.AppViewModels
+@using BTCPayServer.Views.Apps
+@using BTCPayServer.Models.AppViewModels
diff --git a/BTCPayServer/Views/Apps/_ViewStart.cshtml b/BTCPayServer/Views/Apps/_ViewStart.cshtml
index 3cda48fd0..ce0623920 100644
--- a/BTCPayServer/Views/Apps/_ViewStart.cshtml
+++ b/BTCPayServer/Views/Apps/_ViewStart.cshtml
@@ -1,6 +1,6 @@
 @using BTCPayServer.Views
 @using BTCPayServer.Views.Apps
 @{
-    ViewBag.MainTitle = "Manage app";
+    ViewBag.CategoryTitle = "Apps";
     ViewData.SetActiveCategory(typeof(AppsNavPages));
 }
diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml b/BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml
index 10b1c7357..678c5c3ad 100644
--- a/BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml
+++ b/BTCPayServer/Views/AppsPublic/PointOfSale/Cart.cshtml
@@ -202,10 +202,8 @@
     <div id="content">
         <div class="p-2 p-sm-4">
             <div class="row">
-                @if (this.TempData.HasStatusMessage())
-                {
-                    <partial name="_StatusMessage" />
-                }
+                <partial name="_StatusMessage" />
+
                 <div class="col-sm-4 col-lg-2 order-sm-last text-right mb-2">
                     <a class="js-cart btn btn-lg btn-outline-primary" href="#">
                         <i class="fa fa-shopping-basket"></i>&nbsp;
diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml b/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml
index fef2e4329..e30ced492 100644
--- a/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml
+++ b/BTCPayServer/Views/AppsPublic/PointOfSale/Light.cshtml
@@ -5,12 +5,12 @@
 
 @if (Context.Request.Query.ContainsKey("simple"))
 {
-    @await Html.PartialAsync("/Views/AppsPublic/PointOfSale/MinimalLight.cshtml", Model)
+    <partial name="/Views/AppsPublic/PointOfSale/MinimalLight.cshtml" model="Model" />
 }
 else
 {
     <noscript>
-        @await Html.PartialAsync("/Views/AppsPublic/PointOfSale/MinimalLight.cshtml", Model)
+        <partial name="/Views/AppsPublic/PointOfSale/MinimalLight.cshtml" model="Model" />
     </noscript>
-    @await Html.PartialAsync("/Views/AppsPublic/PointOfSale/VueLight.cshtml", Model)
+    <partial name="/Views/AppsPublic/PointOfSale/VueLight.cshtml" model="Model" />
 }
diff --git a/BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml b/BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml
index b45bd1b94..6bb47ce6b 100644
--- a/BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml
+++ b/BTCPayServer/Views/AppsPublic/PointOfSale/Static.cshtml
@@ -6,10 +6,8 @@
 
 <div class="container d-flex h-100">
     <div class="justify-content-center align-self-center text-center mx-auto px-2 py-3 w-100 m-auto">
-        @if (TempData.HasStatusMessage())
-        {
-            <partial name="_StatusMessage" />
-        }
+        <partial name="_StatusMessage" />
+
         <h1 class="mb-4">@Model.Title</h1>
         @if (!string.IsNullOrEmpty(Model.Description))
         {
diff --git a/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml b/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml
index a0785c307..41ba94f1c 100644
--- a/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml
+++ b/BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml
@@ -40,12 +40,12 @@
 <body>
     @if (Context.Request.Query.ContainsKey("simple"))
     {
-        @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
+        <partial name="/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml" model="Model" />
     }
     else
     {
         <noscript>
-            @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
+            <partial name="/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml" model="Model" />
 
             <style>
                 /* Hide the below canvas or else user will be staring "Loading..." text when JS is disabled */
@@ -60,8 +60,7 @@
         {
             <canvas id="fireworks"></canvas>
         }
-        @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml", Model)
+        <partial name="/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml" model="Model" />
     }
-
 </body>
 </html>
diff --git a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml
index e6742ff3b..01f30d813 100644
--- a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml
+++ b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethod.cshtml
@@ -1,29 +1,20 @@
-
 @using BTCPayServer.Views.Stores
 @model BTCPayServer.Services.Altcoins.Ethereum.UI.EditEthereumPaymentMethodViewModel
 
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-
     ViewData["NavPartialName"] = "../Stores/_Nav";
-    ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, $"{this.Context.GetRouteValue("cryptoCode")} Settings");
+    ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, $"{Context.GetRouteValue("cryptoCode")} Settings", Context.GetStoreData().StoreName);
 }
 
-
-<partial name="_StatusMessage"/>
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-md-8">
         <div class="alert alert-warning">DO NOT USE THE WALLET TO ACCEPT PAYMENTS OUTSIDE OF THIS STORE.<br/>If you spend funds received on invoices which have not been marked complete yet, the invoice will be marked as unpaid.
         </div>
+        <div asp-validation-summary="All" class="text-danger"></div>
         <form method="post" asp-action="GetStoreEthereumLikePaymentMethod"
-              asp-route-storeId="@this.Context.GetRouteValue("storeId")"
-              asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")"
+              asp-route-storeId="@Context.GetRouteValue("storeId")"
+              asp-route-cryptoCode="@Context.GetRouteValue("cryptoCode")"
               class="mt-4" enctype="multipart/form-data">
 
             <input type="hidden" asp-for="OriginalIndex"/>
@@ -85,8 +76,8 @@
                 <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
 
                 <a class="btn btn-secondary" asp-action="GetStoreEthereumLikePaymentMethods"
-                   asp-route-storeId="@this.Context.GetRouteValue("storeId")"
-                   asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")"
+                   asp-route-storeId="@Context.GetRouteValue("storeId")"
+                   asp-route-cryptoCode="@Context.GetRouteValue("cryptoCode")"
                    asp-controller="EthereumLikeStore">
                     Back to list
                 </a>
diff --git a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml
index 84b92c891..1cf151c83 100644
--- a/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml
+++ b/BTCPayServer/Views/EthereumLikeStore/GetStoreEthereumLikePaymentMethods.cshtml
@@ -5,22 +5,13 @@
 @inject BTCPayNetworkProvider BTCPayNetworkProvider;
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-
-    ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, "Ethereum Settings");
-
+    ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, "Ethereum Settings", Context.GetStoreData().StoreName);
     ViewData["NavPartialName"] = "../Stores/_Nav";
 }
 
-
-<partial name="_StatusMessage"/>
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-md-8">
+        <div asp-validation-summary="All" class="text-danger"></div>
         <div class="form-group">
             <table class="table table-sm table-responsive-md">
                 <thead>
@@ -49,11 +40,10 @@
                         </td>
                         <td class="text-right">
                             <a id="Modify@(item.CryptoCode)" asp-action="GetStoreEthereumLikePaymentMethod"
-                               asp-route-storeId="@this.Context.GetRouteValue("storeId")"
+                               asp-route-storeId="@Context.GetRouteValue("storeId")"
                                asp-route-cryptoCode="@item.CryptoCode">
                                 Modify
                             </a>
-                            
                         </td>
                     </tr>
                 }
@@ -67,7 +57,6 @@
     var chains = BTCPayNetworkProvider.GetAll().OfType<EthereumBTCPayNetwork>().Select(network => network.ChainId).Distinct();
     foreach (var chain in chains)
     {
-        
         <a asp-action="UpdateChainConfig" asp-controller="EthereumConfig" asp-route-chainId="@chain">Configure Web3 for chain @chain</a>
     }
 }
diff --git a/BTCPayServer/Views/Home/RecoverySeedBackup.cshtml b/BTCPayServer/Views/Home/RecoverySeedBackup.cshtml
index b86e2b2b6..588530208 100644
--- a/BTCPayServer/Views/Home/RecoverySeedBackup.cshtml
+++ b/BTCPayServer/Views/Home/RecoverySeedBackup.cshtml
@@ -5,7 +5,7 @@
 }
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
 
 <style>
diff --git a/BTCPayServer/Views/Invoice/CreateInvoice.cshtml b/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
index 7448624a3..5066ba190 100644
--- a/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
+++ b/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
@@ -1,6 +1,6 @@
 @model BTCPayServer.Models.InvoicingModels.CreateInvoiceModel
 @{
-    ViewData["Title"] = "Create an invoice";
+    ViewData.SetActivePageAndTitle(InvoiceNavPages.Create, "Create an invoice");
 }
 <script>
     $(function() {
@@ -12,12 +12,10 @@
 </script>
 <section>
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-        </div>
+        <partial name="_StatusMessage" />
+
+        <h2 class="mb-4">@ViewData["Title"]</h2>
+
         <div class="row">
             <div class="col-lg-12">
                 <form asp-action="CreateInvoice" method="post" id="create-invoice-form">
@@ -69,9 +67,9 @@
                     </div>
                     <div class="form-group">
                         <input type="submit" value="Create" class="btn btn-primary" id="Create" />
+                        <a asp-action="ListInvoices" class="text-muted ml-3">Back to list</a>
                     </div>
                 </form>
-                <a asp-action="ListInvoices">Back to List</a>
             </div>
         </div>
     </div>
diff --git a/BTCPayServer/Views/Invoice/Invoice.cshtml b/BTCPayServer/Views/Invoice/Invoice.cshtml
index 54ba20e78..a1a9d2cf4 100644
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@@ -13,14 +13,7 @@
 
 <section class="invoice-details">
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
+    <partial name="_StatusMessage" />
 
         <div class="row mb-4">
             <h2 class="col-xs-12 col-lg-9 mb-4 mb-lg-0">@ViewData["Title"]</h2>
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index eab82fd66..c793d8edc 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -1,7 +1,6 @@
-@using BTCPayServer.Payments
 @model InvoicesModel
 @{
-    ViewData["Title"] = "Invoices";
+    ViewData.SetActivePageAndTitle(InvoiceNavPages.Index, "Invoices");
     var storeIds = string.Join("", Model.StoreIds.Select(storeId => $",storeid:{storeId}"));
 }
 @section HeadScripts {
@@ -11,31 +10,25 @@
 @Html.HiddenFor(a => a.Count)
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
+    <partial name="_StatusMessage" />
 
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-                <p>Create, search or pay an invoice.</p>
-            </div>
+        <div class="d-sm-flex align-items-center justify-content-between mb-4">
+            <h2 class="mb-0">
+                @ViewData["Title"]
+                <small>
+                    <a href="https://docs.btcpayserver.org/PaymentRequests/" class="ml-1" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
+                </small>
+            </h2>
+            <a id="CreateNewInvoice" asp-action="CreateInvoice" class="btn btn-primary mt-3 mt-sm-0">
+                <span class="fa fa-plus"></span>
+                Create an invoice
+            </a>
         </div>
 
         <div class="row">
-            <div class="col-12 col-sm-4 col-lg-6 mb-3">
-                <a id="CreateNewInvoice" asp-action="CreateInvoice" class="btn btn-primary mb-1">
-                    <span class="fa fa-plus"></span>
-                    Create an invoice
-                </a>
-            </div>
-            <div class="col-12 col-sm-8 col-lg-6 mb-3">
+            <div class="col-12 col-lg-6 mb-5 mb-lg-2 ml-auto">
                 <form asp-action="ListInvoices" method="get">
                     <input type="hidden" asp-for="Count"/>
                     <input asp-for="TimezoneOffset" type="hidden"/>
@@ -184,7 +177,7 @@
 
         @if (Model.Total > 0)
         {
-            <form method="post" id="MassAction" asp-action="MassAction" class="mt-3">
+            <form method="post" id="MassAction" asp-action="MassAction" class="mt-lg-n5">
                 <span class="mr-2">
                     <button class="btn btn-secondary dropdown-toggle  mb-1" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         Actions
diff --git a/BTCPayServer/Views/Invoice/_ViewImports.cshtml b/BTCPayServer/Views/Invoice/_ViewImports.cshtml
index fbea1e3d7..dce5cf528 100644
--- a/BTCPayServer/Views/Invoice/_ViewImports.cshtml
+++ b/BTCPayServer/Views/Invoice/_ViewImports.cshtml
@@ -1 +1,2 @@
 @using BTCPayServer.Services.Invoices
+@using BTCPayServer.Views.Invoice
diff --git a/BTCPayServer/Views/Manage/APIKeys.cshtml b/BTCPayServer/Views/Manage/APIKeys.cshtml
index 6b308322a..dfc06931c 100644
--- a/BTCPayServer/Views/Manage/APIKeys.cshtml
+++ b/BTCPayServer/Views/Manage/APIKeys.cshtml
@@ -4,7 +4,7 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.APIKeys, "Manage your API Keys");
 }
 
-<partial name="_StatusMessage"/>
+<partial name="_StatusMessage" />
 
 <p>
     The <a asp-controller="Home" asp-action="SwaggerDocs" target="_blank">BTCPay Server Greenfield API</a> offers programmatic access to your instance. You can manage your BTCPay
diff --git a/BTCPayServer/Views/Manage/AddApiKey.cshtml b/BTCPayServer/Views/Manage/AddApiKey.cshtml
index fa4c6edcd..84959950b 100644
--- a/BTCPayServer/Views/Manage/AddApiKey.cshtml
+++ b/BTCPayServer/Views/Manage/AddApiKey.cshtml
@@ -7,11 +7,11 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.APIKeys, "Add API Key");
 }
 
-<h4>@ViewData["Title"]</h4>
-<partial name="_StatusMessage"/>
-<p>
-    Generate a new api key to use BTCPay through its API.
-</p>
+<partial name="_StatusMessage" />
+
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
+<p>Generate a new api key to use BTCPay through its API.</p>
 
 <form method="post" asp-action="AddApiKey">
     <div asp-validation-summary="All" class="text-danger"></div>
@@ -109,7 +109,7 @@
 </form>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     <style>
         .remove-btn {
diff --git a/BTCPayServer/Views/Manage/AddU2FDevice.cshtml b/BTCPayServer/Views/Manage/AddU2FDevice.cshtml
index f15ccc2cd..4e31ac05a 100644
--- a/BTCPayServer/Views/Manage/AddU2FDevice.cshtml
+++ b/BTCPayServer/Views/Manage/AddU2FDevice.cshtml
@@ -4,7 +4,6 @@
 }
 
 <form asp-action="AddU2FDevice" method="post" id="registerForm" class="hidden">
-
     <input type="hidden" asp-for="AppId"/>
     <input type="hidden" asp-for="Version"/>
     <input type="hidden" asp-for="Challenge"/>
@@ -12,7 +11,6 @@
     <input type="hidden" asp-for="DeviceResponse"/>
 </form>
 
-
 <div class="card">
     <div class="card-header">
         <h4 class="mb-0">
diff --git a/BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml b/BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml
index 50248070d..70caa2cf2 100644
--- a/BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml
+++ b/BTCPayServer/Views/Manage/AuthorizeAPIKey.cshtml
@@ -5,11 +5,12 @@
 
 @{
     Layout = "_Layout";
-    ViewData["Title"] = $"Authorize {(Model.ApplicationName ?? "Application")}";
+    ViewData["Title"] = $"Authorize {Model.ApplicationName ?? "Application"}";
     var permissions = Permission.ToPermissions(Model.Permissions.Split(';')).GroupBy(permission => permission.Policy);
 }
 
-<partial name="_StatusMessage"/>
+<partial name="_StatusMessage" />
+
 <form method="post" asp-action="AuthorizeAPIKey">
     <input type="hidden" asp-for="RedirectUrl" value="@Model.RedirectUrl"/>
     <input type="hidden" asp-for="Permissions" value="@Model.Permissions"/>
diff --git a/BTCPayServer/Views/Manage/ChangePassword.cshtml b/BTCPayServer/Views/Manage/ChangePassword.cshtml
index 5e06d1a14..588e20e1d 100644
--- a/BTCPayServer/Views/Manage/ChangePassword.cshtml
+++ b/BTCPayServer/Views/Manage/ChangePassword.cshtml
@@ -5,31 +5,26 @@
 
 <partial name="_StatusMessage" />
 
-@if (!this.ViewContext.ModelState.IsValid)
-{
-    <div class="row">
-        <div class="col-md-6">
-            <div asp-validation-summary="All" class="text-danger"></div>
-        </div>
-    </div>
-}
-
 <div class="row">
     <div class="col-md-6">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
             <div class="form-group">
                 <label asp-for="OldPassword"></label>
-                <input asp-for="OldPassword" class="form-control" />
+                <input asp-for="OldPassword" class="form-control"/>
                 <span asp-validation-for="OldPassword" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="NewPassword"></label>
-                <input asp-for="NewPassword" class="form-control" />
+                <input asp-for="NewPassword" class="form-control"/>
                 <span asp-validation-for="NewPassword" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="ConfirmPassword"></label>
-                <input asp-for="ConfirmPassword" class="form-control" />
+                <input asp-for="ConfirmPassword" class="form-control"/>
                 <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
             </div>
             <button type="submit" class="btn btn-primary" id="UpdatePassword">Update password</button>
@@ -38,5 +33,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml b/BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml
index f5fa5ca7b..6271f6ab4 100644
--- a/BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml
+++ b/BTCPayServer/Views/Manage/ConfirmAPIKey.cshtml
@@ -12,7 +12,7 @@
     <partial name="Header" />
 </head>
 <body class="bg-light">
-    <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-dialog modal-dialog-centered min-vh-100">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title w-100 text-center">@ViewData["Title"]</h4>
diff --git a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml b/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml
index 69be42229..ae94eed6a 100644
--- a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml
+++ b/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml
@@ -56,7 +56,7 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
     <script type="text/javascript" src="~/js/qrcode.js" asp-append-version="true"></script>
     <script type="text/javascript">
         new QRCode(document.getElementById("qrCode"),
diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/Manage/Index.cshtml
index 7f0fbbcf1..3e46189e9 100644
--- a/BTCPayServer/Views/Manage/Index.cshtml
+++ b/BTCPayServer/Views/Manage/Index.cshtml
@@ -3,32 +3,28 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.Index, "Profile");
 }
 
+<partial name="_StatusMessage" />)
 
-<partial name="_StatusMessage" />
-
-@if (!this.ViewContext.ModelState.IsValid)
-{
-    <div class="row">
-        <div class="col-md-6">
-            <div asp-validation-summary="All" class="text-danger"></div>
-        </div>
-    </div>
-}
 <form method="post">
+    @if (!ViewContext.ModelState.IsValid)
+    {
+        <div asp-validation-summary="All" class="text-danger"></div>
+    }
+
     <div class="form-row">
         <div class="col-md-6 mb-3">
             <label asp-for="Username"></label>
-            <input asp-for="Username" class="form-control" disabled />
+            <input asp-for="Username" class="form-control" disabled/>
         </div>
     </div>
     <div class="form-row">
         <div class="col-md-6 mb-3">
             <label asp-for="Email"></label>
-            <input asp-for="Email" class="form-control" />
+            <input asp-for="Email" class="form-control"/>
             <span asp-validation-for="Email" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3 d-flex align-items-end">
-            @if(Model.IsEmailConfirmed)
+            @if (Model.IsEmailConfirmed)
             {
                 <span class="badge badge-success p-2 my-1">
                     <span class="fa fa-check"></span>
@@ -45,5 +41,5 @@
 </form>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Manage/NotificationSettings.cshtml b/BTCPayServer/Views/Manage/NotificationSettings.cshtml
index 2ca2ea901..9831f4211 100644
--- a/BTCPayServer/Views/Manage/NotificationSettings.cshtml
+++ b/BTCPayServer/Views/Manage/NotificationSettings.cshtml
@@ -5,7 +5,8 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.Notifications, "Notification preferences");
 }
 
-<partial name="_StatusMessage"/>
+<partial name="_StatusMessage" />
+
 <form method="post" asp-action="NotificationSettings">
     @if (Model.All)
     {
diff --git a/BTCPayServer/Views/Manage/SetPassword.cshtml b/BTCPayServer/Views/Manage/SetPassword.cshtml
index f2991c2bf..14edc279c 100644
--- a/BTCPayServer/Views/Manage/SetPassword.cshtml
+++ b/BTCPayServer/Views/Manage/SetPassword.cshtml
@@ -3,8 +3,10 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.ChangePassword, "Set password");
 }
 
-<h4>Set your password</h4>
 <partial name="_StatusMessage" />
+
+<h4>Set your password</h4>
+
 <p class="text-info">
     You do not have a local username/password for this site. Add a local
     account so you can log in without an external login.
@@ -29,5 +31,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml b/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml
index eb2728da8..8fe0d6c88 100644
--- a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml
+++ b/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml
@@ -83,5 +83,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Manage/_Nav.cshtml b/BTCPayServer/Views/Manage/_Nav.cshtml
index 9ed1fadc2..18caf22a9 100644
--- a/BTCPayServer/Views/Manage/_Nav.cshtml
+++ b/BTCPayServer/Views/Manage/_Nav.cshtml
@@ -1,6 +1,6 @@
 @inject SignInManager<ApplicationUser> SignInManager
 
-    <div class="nav flex-column nav-pills mb-4">
+    <div class="nav flex-column mb-4">
         <a id="@ManageNavPages.Index.ToString()" class="nav-link @ViewData.IsActivePage(ManageNavPages.Index)" asp-action="Index">Profile</a>
         <a id="@ManageNavPages.ChangePassword.ToString()" class="nav-link @ViewData.IsActivePage(ManageNavPages.ChangePassword)" asp-action="ChangePassword">Password</a>
         <a id="@ManageNavPages.TwoFactorAuthentication.ToString()" class="nav-link @ViewData.IsActivePage(ManageNavPages.TwoFactorAuthentication)" asp-action="TwoFactorAuthentication">Two-factor authentication</a>
diff --git a/BTCPayServer/Views/Manage/_ViewStart.cshtml b/BTCPayServer/Views/Manage/_ViewStart.cshtml
index e0aed8e87..5e65af0c3 100644
--- a/BTCPayServer/Views/Manage/_ViewStart.cshtml
+++ b/BTCPayServer/Views/Manage/_ViewStart.cshtml
@@ -2,6 +2,6 @@
 @using BTCPayServer.Views.Manage
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewBag.MainTitle = "Manage your account";
+    ViewBag.CategoryTitle = "Account";
     ViewData.SetActiveCategory(typeof(ManageNavPages));
 }
diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml
index ccd80bdd8..26083137f 100644
--- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml
+++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml
@@ -4,21 +4,13 @@
 
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-
     ViewData["NavPartialName"] = "../Stores/_Nav";
     ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, $"{Model.CryptoCode} Settings");
 }
 
-
-<partial name="_StatusMessage" />
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-md-8">
+        <div asp-validation-summary="All" class="text-danger"></div>
         @if (Model.Summary != null)
         {
             <div class="card">
@@ -31,11 +23,11 @@
             </div>
         }
 
-        @if (!Model.WalletFileFound || Model.Summary.WalletHeight == default(long))
+        @if (!Model.WalletFileFound || Model.Summary.WalletHeight == default)
         {
             <form method="post" asp-action="GetStoreMoneroLikePaymentMethod" 
-                  asp-route-storeId="@this.Context.GetRouteValue("storeId")"
-                  asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")" 
+                  asp-route-storeId="@Context.GetRouteValue("storeId")"
+                  asp-route-cryptoCode="@Context.GetRouteValue("cryptoCode")"
                   class="mt-4" enctype="multipart/form-data">
 
                 <div class="card my-2">
@@ -62,12 +54,12 @@
             </form>
         }
         <form method="post" asp-action="GetStoreMoneroLikePaymentMethod"
-              asp-route-storeId="@this.Context.GetRouteValue("storeId")"
-              asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")" 
+              asp-route-storeId="@Context.GetRouteValue("storeId")"
+              asp-route-cryptoCode="@Context.GetRouteValue("cryptoCode")"
               class="mt-4" enctype="multipart/form-data">
 
             <input type="hidden" asp-for="CryptoCode"/>
-            @if (!Model.WalletFileFound || Model.Summary.WalletHeight == default(long))
+            @if (!Model.WalletFileFound || Model.Summary.WalletHeight == default)
             {
                 <input type="hidden" asp-for="AccountIndex"/>
             }
@@ -90,7 +82,7 @@
                     <div class="input-group my-3">
                         <input type="text" class="form-control" placeholder="New account label" asp-for="NewAccountLabel">
                         <div class="input-group-append">
-                            <button name="command" value="add-account" class="btn btn-secondary"type="submit">Add account</button>
+                            <button name="command" value="add-account" class="btn btn-secondary" type="submit">Add account</button>
                         </div>
                     </div>
 
@@ -107,9 +99,8 @@
                 <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
 
                 <a class="btn btn-secondary" asp-action="GetStoreMoneroLikePaymentMethods"
-
-                   asp-route-storeId="@this.Context.GetRouteValue("storeId")"
-                   asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")"
+                   asp-route-storeId="@Context.GetRouteValue("storeId")"
+                   asp-route-cryptoCode="@Context.GetRouteValue("cryptoCode")"
                    asp-controller="MoneroLikeStore">
                     Back to list
                 </a>
diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
index e263a353d..068153a7a 100644
--- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
+++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
@@ -3,22 +3,13 @@
 
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-
     ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, "Monero Settings");
-
     ViewData["NavPartialName"] = "../Stores/_Nav";
 }
 
-
-<partial name="_StatusMessage"/>
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-md-8">
+        <div asp-validation-summary="All" class="text-danger"></div>
         <div class="form-group">
             <table class="table table-sm table-responsive-md">
                 <thead>
@@ -47,7 +38,7 @@
                         </td>
                         <td class="text-right">
                             <a id="Modify" asp-action="GetStoreMoneroLikePaymentMethod"
-                               asp-route-storeId="@this.Context.GetRouteValue("storeId")"
+                               asp-route-storeId="@Context.GetRouteValue("storeId")"
                                asp-route-cryptoCode="@item.CryptoCode">
                                 Modify
                             </a>
diff --git a/BTCPayServer/Views/Notifications/Index.cshtml b/BTCPayServer/Views/Notifications/Index.cshtml
index 746602948..51b7acf8a 100644
--- a/BTCPayServer/Views/Notifications/Index.cshtml
+++ b/BTCPayServer/Views/Notifications/Index.cshtml
@@ -5,14 +5,8 @@
 
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage"/>
-                </div>
-            </div>
-        }
+        <partial name="_StatusMessage" />
+
         <div class="row">
             <div class="col-lg-12 section-heading">
                 <h2>@ViewData["Title"]</h2>
diff --git a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
index 5e0246e88..80a028e38 100644
--- a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
@@ -3,24 +3,14 @@
 @model BTCPayServer.Models.PaymentRequestViewModels.UpdatePaymentRequestViewModel
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
-    ViewData["Title"] = (string.IsNullOrEmpty(Model.Id) ? "Create" : "Edit") + " Payment Request";
+    ViewData.SetActivePageAndTitle(PaymentRequestsNavPages.Create, (string.IsNullOrEmpty(Model.Id) ? "Create" : "Edit") + " Payment Request");
 }
 <section>
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-        </div>
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
+        <partial name="_StatusMessage" />
+
+        <h2 class="mb-4">@ViewData["Title"]</h2>
+
         <div class="row">
             <div class="col-lg-12">
                 <form method="post" action="@Url.Action("EditPaymentRequest", "PaymentRequest", new { id = Model.Id}, Context.Request.Scheme)">
@@ -86,7 +76,7 @@
                     <div class="form-group">
                         <label asp-for="CustomCSSLink" class="control-label"></label>
                         <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank">
-                            <span class="fa fa-question-circle-o" title="More information..."></span>
+                            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                         </a>
                         <input asp-for="CustomCSSLink" class="form-control" />
                         <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
@@ -100,28 +90,25 @@
                         <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
                         @if (!string.IsNullOrEmpty(Model.Id))
                         {
-                            <a class="btn btn-secondary" target="_blank" asp-action="ViewPaymentRequest" asp-route-id="@this.Context.GetRouteValue("id")" id="@Model.Id" name="ViewAppButton">View</a>
+                            <a class="btn btn-secondary" target="_blank" asp-action="ViewPaymentRequest" asp-route-id="@Context.GetRouteValue("id")" id="@Model.Id" name="ViewAppButton">View</a>
                             <a class="btn btn-secondary"
                                target="_blank"
                                asp-action="ListInvoices"
                                asp-controller="Invoice"
                                asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(Model.Id)}")">Invoices</a>
-                            <a class="btn btn-secondary" asp-route-id="@this.Context.GetRouteValue("id")" asp-action="ClonePaymentRequest" id="@Model.Id">Clone</a>
+                            <a class="btn btn-secondary" asp-route-id="@Context.GetRouteValue("id")" asp-action="ClonePaymentRequest" id="@Model.Id">Clone</a>
                             @if (!Model.Archived)
                             {
-                                <a class="btn btn-secondary" data-toggle="tooltip" title="Archive this payment request so that it does not appear in the payment request list by default" asp-route-id="@this.Context.GetRouteValue("id")" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival">Archive</a>
-
+                                <a class="btn btn-secondary" data-toggle="tooltip" title="Archive this payment request so that it does not appear in the payment request list by default" asp-route-id="@Context.GetRouteValue("id")" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival">Archive</a>
                             }
                             else
                             {
-                                <a class="btn btn-secondary" data-toggle="tooltip" title="Unarchive this payment request" asp-route-id="@this.Context.GetRouteValue("id")" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival">Unarchive</a>
-
+                                <a class="btn btn-secondary" data-toggle="tooltip" title="Unarchive this payment request" asp-route-id="@Context.GetRouteValue("id")" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival">Unarchive</a>
                             }
                         }
-
+                        <a asp-action="GetPaymentRequests" class="text-muted ml-3">Back to list</a>
                     </div>
                 </form>
-                <a asp-action="GetPaymentRequests">Back to List</a>
             </div>
         </div>
     </div>
diff --git a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
index 4ab11b4c1..d391fa18b 100644
--- a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
@@ -6,35 +6,25 @@
 }
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>Payment Requests</h2>
-                <hr class="primary">
-                <p>
-                    Create, search or pay a payment request.
+        <partial name="_StatusMessage" />
+
+        <div class="d-sm-flex align-items-center justify-content-between mb-4">
+            <h2 class="mb-0">
+                @ViewData["Title"]
+                <small>
                     <a href="https://docs.btcpayserver.org/PaymentRequests/" class="ml-1" target="_blank">
                         <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                     </a>
-                </p>
-            </div>
+                </small>
+            </h2>
+            <a asp-action="EditPaymentRequest" class="btn btn-primary mt-3 mt-sm-0" role="button" id="CreatePaymentRequest">
+                <span class="fa fa-plus"></span>
+                Create a payment request
+            </a>
         </div>
 
         <div class="row">
-            <div class="col-12 col-md-4 col-lg-6 mb-3">
-                <a asp-action="EditPaymentRequest" class="btn btn-primary" role="button" id="CreatePaymentRequest">
-                    <span class="fa fa-plus"></span>
-                    Create a payment request
-                </a>
-            </div>
-            <div class="col-12 col-md-8 col-lg-6 mb-3">
+            <div class="col-12 col-lg-6 mb-3 ml-auto">
                 <form asp-action="GetPaymentRequests" method="get">
                     <input type="hidden" asp-for="Count"/>
                     <input type="hidden" asp-for="TimezoneOffset" />
diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
index e3505ea50..75eac31e8 100644
--- a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
@@ -1,7 +1,6 @@
 @using BTCPayServer.Services.Invoices
 @using BTCPayServer.Client.Models
 @model BTCPayServer.Models.PaymentRequestViewModels.ViewPaymentRequestViewModel
-
 @addTagHelper *, BundlerMinifier.TagHelpers
 @inject BTCPayServer.Services.BTCPayServerEnvironment env
 @inject BTCPayServer.HostedServices.CssThemeManager themeManager
@@ -197,7 +196,7 @@
 
         <main class="flex-grow-1 py-4">
             <div class="container">
-                @await Html.PartialAsync("_StatusMessage", new ViewDataDictionary(ViewData){ { "Margin", "mb-4" } })
+                <partial name="_StatusMessage" model="@(new ViewDataDictionary(ViewData){ { "Margin", "mb-4" } })" />
                 <div class="row">
                     <div class="col col-12 col-lg-6 mb-4">
                         <div class="jumbotron h-100 m-0 p-sm-5">
diff --git a/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml b/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml
new file mode 100644
index 000000000..772cccf0d
--- /dev/null
+++ b/BTCPayServer/Views/PaymentRequest/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using BTCPayServer.Views.PaymentRequest
diff --git a/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml
index 64f144d34..d052581d7 100644
--- a/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml
+++ b/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml
@@ -76,7 +76,7 @@
 
         <main class="flex-grow-1 py-4">
             <div class="container">
-                @await Html.PartialAsync("_StatusMessage", new ViewDataDictionary(ViewData){ { "Margin", "mb-4" } })
+                <partial name="_StatusMessage" model="@(new ViewDataDictionary(ViewData){ { "Margin", "mb-4" } })" />
                 @if (!ViewContext.ModelState.IsValid)
                 {
                     @Html.ValidationSummary(string.Empty, new { @class = "alert alert-danger mb-4 pb-0 text-center" })
diff --git a/BTCPayServer/Views/Server/CLightningRestServices.cshtml b/BTCPayServer/Views/Server/CLightningRestServices.cshtml
index 8cd65ee0a..4b90dbf6c 100644
--- a/BTCPayServer/Views/Server/CLightningRestServices.cshtml
+++ b/BTCPayServer/Views/Server/CLightningRestServices.cshtml
@@ -1,45 +1,29 @@
 @model LndServicesViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"C-Lightning {Model.ConnectionType}");
 }
 
-<h4>C-Lightning @Model.ConnectionType</h4>
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+<h2 class="mb-4">@ViewData["Title"]</h2>
 
 <div class="row">
-
     <div class="col-md-8">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <div class="form-group">
             <p>
                 <span>BTCPay exposes Clightning-Rest's service for outside consumption, you will find connection information here.<br /></span>
             </p>
         </div>
 
-        <div class="form-group">
-            <h5>Compatible wallets</h5>
-        </div>
+        <h5>Compatible wallets</h5>
 
-            <div class="row">
-                <div class="col-lg-3 ml-auto text-center">
-                    <a href="https://github.com/ZeusLN/zeus" target="_blank">
-                        <img src="~/img/zeus.jpg" height="100" asp-append-version="true" />
-                    </a>
-                    <p><a href="https://github.com/ZeusLN/zeus" target="_blank">Zeus</a></p>
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
-                </div>
+            <div>
+                <a href="https://github.com/ZeusLN/zeus" target="_blank" class="d-inline-block mr-3 mb-3 text-center">
+                    <img src="~/img/zeus.jpg" width="100" height="100" asp-append-version="true" alt="Zeus" />
+                    <div class="mt-2">Zeus</div>
+                </a>
             </div>
         
         <div class="form-group">
@@ -147,9 +131,9 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
-    @if(Model.QRCode != null)
+    @if (Model.QRCode != null)
     {
         <script type="text/javascript" src="~/js/qrcode.js" asp-append-version="true"></script>
         <script type="text/javascript">
diff --git a/BTCPayServer/Views/Server/ConfiguratorService.cshtml b/BTCPayServer/Views/Server/ConfiguratorService.cshtml
index 5106650d1..cbc0ae30a 100644
--- a/BTCPayServer/Views/Server/ConfiguratorService.cshtml
+++ b/BTCPayServer/Views/Server/ConfiguratorService.cshtml
@@ -1,10 +1,9 @@
 @model LightningWalletServices
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "BTCPay Server Configurator");
 }
 
-<h4>BTCPay Server Configurator</h4>
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["Title"]</h2>
 
 <div class="row">
     <div class="col-md-6">
@@ -28,6 +27,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
-
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml b/BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml
index 6e5622b85..a4d1d5234 100644
--- a/BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml
+++ b/BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml
@@ -2,18 +2,16 @@
 @model BTCPayServer.Controllers.ServerController.CreateTemporaryFileUrlViewModel
 @{
     ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Create temporary file link");
-   
 }
 
+<h2 class="mb-4">@ViewData["Title"]</h2>
 
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-6">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
             <div class="form-group">
                 <label asp-for="IsDownload"></label>
@@ -24,12 +22,12 @@
                 <label asp-for="TimeAmount" class="control-label"></label>
                 <div class="input-group">
 
-                    <input type="number" asp-for="TimeAmount"  class="form-control">
+                    <input type="number" asp-for="TimeAmount" class="form-control">
                     <div class="input-group-append">
-                        <select asp-for="TimeType" asp-items="@Html.GetEnumSelectList< ServerController.CreateTemporaryFileUrlViewModel.TmpFileTimeType>()" class="custom-select"></select>
+                        <select asp-for="TimeType" asp-items="@Html.GetEnumSelectList<ServerController.CreateTemporaryFileUrlViewModel.TmpFileTimeType>()" class="custom-select"></select>
                     </div>
                 </div>
-                
+
                 <span asp-validation-for="TimeAmount" class="text-danger"></span>
                 <span asp-validation-for="TimeType" class="text-danger"></span>
             </div>
@@ -39,5 +37,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/CreateUser.cshtml b/BTCPayServer/Views/Server/CreateUser.cshtml
index 385a3f8bb..ee1c8d221 100644
--- a/BTCPayServer/Views/Server/CreateUser.cshtml
+++ b/BTCPayServer/Views/Server/CreateUser.cshtml
@@ -1,9 +1,9 @@
 @model BTCPayServer.Controllers.RegisterFromAdminViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Users, $"Users - Create account");
+    ViewData.SetActivePageAndTitle(ServerNavPages.Users, "Create account");
 }
 
-<partial name="_StatusMessage"/>
+<h2 class="mb-4">@ViewData["Title"]</h2>
 
 <div class="row">
     <div class="col-md-6">
diff --git a/BTCPayServer/Views/Server/DynamicDnsService.cshtml b/BTCPayServer/Views/Server/DynamicDnsService.cshtml
index dda3470b6..451bb5a5f 100644
--- a/BTCPayServer/Views/Server/DynamicDnsService.cshtml
+++ b/BTCPayServer/Views/Server/DynamicDnsService.cshtml
@@ -1,27 +1,22 @@
 @model BTCPayServer.Models.ServerViewModels.DynamicDnsViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Dynamic DNS Service");
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<h4>Dynamic DNS Service</h4>
-<partial name="_StatusMessage" />
-@if (!this.ViewContext.ModelState.IsValid)
-{
-<div class="row">
-    <div class="col-md-8">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-}
 <div class="row">
     <div class="col-md-8">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
             <div class="form-group">
-                <input type="hidden" asp-for="Modify" />
+                <input type="hidden" asp-for="Modify"/>
                 <div class="form-group">
                     <label asp-for="Settings.ServiceUrl"></label>
-                    <input id="ServiceUrl" asp-for="Settings.ServiceUrl" class="form-control" placeholder="Url" />
+                    <input id="ServiceUrl" asp-for="Settings.ServiceUrl" class="form-control" placeholder="Url"/>
                     <p class="form-text text-muted">
                         Well-known Dynamic DNS providers are:
                         @for (int i = 0; i < Model.KnownServices.Length; i++)
@@ -34,7 +29,7 @@
                     <label asp-for="Settings.Hostname"></label>
                     @if (Model.Modify)
                     {
-                        <input asp-for="Settings.Hostname" class="form-control" readonly placeholder="Hostname" />
+                        <input asp-for="Settings.Hostname" class="form-control" readonly placeholder="Hostname"/>
                         <p class="form-text text-muted">
                             <span>The DNS record has been refreshed: </span>
                             @if (Model.LastUpdated != null)
@@ -45,23 +40,23 @@
                     }
                     else
                     {
-                        <input asp-for="Settings.Hostname" class="form-control" placeholder="Hostname" />
+                        <input asp-for="Settings.Hostname" class="form-control" placeholder="Hostname"/>
                         <span asp-validation-for="Settings.Hostname" class="text-danger"></span>
                     }
                 </div>
                 <div class="form-group">
                     <label asp-for="Settings.Login"></label>
-                    <input asp-for="Settings.Login" class="form-control" placeholder="Login" />
+                    <input asp-for="Settings.Login" class="form-control" placeholder="Login"/>
                 </div>
                 <div class="form-group">
                     <label asp-for="Settings.Password"></label>
-                    <input asp-for="Settings.Password" class="form-control" placeholder="Password" />
+                    <input asp-for="Settings.Password" class="form-control" placeholder="Password"/>
                 </div>
                 @if (Model.Modify)
                 {
                     <div class="form-group">
                         <label asp-for="Settings.Enabled"></label>
-                        <input asp-for="Settings.Enabled" class="form-check-inline" type="checkbox" />
+                        <input asp-for="Settings.Enabled" class="form-check-inline" type="checkbox"/>
                     </div>
                 }
                 <button name="command" class="btn btn-primary" type="submit" value="Save">Save</button>
diff --git a/BTCPayServer/Views/Server/DynamicDnsServices.cshtml b/BTCPayServer/Views/Server/DynamicDnsServices.cshtml
index e25757e6a..6066bf39c 100644
--- a/BTCPayServer/Views/Server/DynamicDnsServices.cshtml
+++ b/BTCPayServer/Views/Server/DynamicDnsServices.cshtml
@@ -1,11 +1,9 @@
 @model BTCPayServer.Models.ServerViewModels.DynamicDnsViewModel[]
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Dynamic DNS Settings");
 }
 
-
-<h4>Dynamic DNS Settings</h4>
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <div class="row">
     <div class="col-md-8">
diff --git a/BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml b/BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml
index 85c606f6d..e1c6570c1 100644
--- a/BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml
+++ b/BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml
@@ -1,21 +1,20 @@
 @model BTCPayServer.Storage.Services.Providers.AmazonS3Storage.Configuration.AmazonS3StorageConfiguration
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Amazon S3");
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Amazon S3 Storage");
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-6">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
             <div class="form-group">
                 <label asp-for="ContainerName"></label>
-                <input class="form-control" asp-for="ContainerName" />
+                <input class="form-control" asp-for="ContainerName"/>
                 <span asp-validation-for="ContainerName" class="text-danger"></span>
             </div>
             <div class="form-group">
@@ -45,16 +44,16 @@
             </div>
             <div class="form-group">
                 <label asp-for="ChunkedUploadThreshold"></label>
-                <input  class="form-control" type="number" asp-for="ChunkedUploadThreshold"/>
+                <input class="form-control" type="number" asp-for="ChunkedUploadThreshold"/>
                 <span asp-validation-for="ChunkedUploadThreshold" class="text-danger"></span>
             </div>
 
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
-            <a asp-action="Storage" asp-route-forceChoice="true" >Change Storage provider</a>
+            <a asp-action="Storage" asp-route-forceChoice="true">Change Storage provider</a>
         </form>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml b/BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml
index 787617bfb..78d20ffc3 100644
--- a/BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml
+++ b/BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml
@@ -1,21 +1,20 @@
 @model BTCPayServer.Storage.Services.Providers.AzureBlobStorage.Configuration.AzureBlobStorageConfiguration
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Azure Blob Storage");
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Azure Blob Storage");
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-6">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
             <div class="form-group">
                 <label asp-for="ContainerName"></label>
-                <input class="form-control" asp-for="ContainerName" />
+                <input class="form-control" asp-for="ContainerName"/>
                 <span asp-validation-for="ContainerName" class="text-danger"></span>
             </div>
             <div class="form-group">
@@ -25,11 +24,11 @@
             </div>
 
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
-            <a asp-action="Storage" asp-route-forceChoice="true" >Change Storage provider</a>
+            <a asp-action="Storage" asp-route-forceChoice="true">Change Storage provider</a>
         </form>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/EditFilesystemStorageProvider.cshtml b/BTCPayServer/Views/Server/EditFilesystemStorageProvider.cshtml
index b1aa00a85..d89c26b3b 100644
--- a/BTCPayServer/Views/Server/EditFilesystemStorageProvider.cshtml
+++ b/BTCPayServer/Views/Server/EditFilesystemStorageProvider.cshtml
@@ -1,21 +1,21 @@
 @model BTCPayServer.Storage.Services.Providers.FileSystemStorage.Configuration.FileSystemStorageConfiguration
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Local Filesystem");
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Local Filesystem Storage");
 }
 
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
 <p>Any uploaded files are being saved on the same machine that hosts BTCPay; please pay attention to your storage space.</p>
 <div class="row">
     <div class="col-lg-6">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <a asp-action="Storage" asp-route-forceChoice="true">Change Storage provider</a>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml b/BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml
index c85b59b5e..ccac5c1f1 100644
--- a/BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml
+++ b/BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml
@@ -1,20 +1,20 @@
 @model BTCPayServer.Storage.Services.Providers.GoogleCloudStorage.Configuration.GoogleCloudStorageConfiguration
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Google Cloud Storage");
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Google Cloud Storage");
 }
 
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
 <div class="row">
     <div class="col-lg-6">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
             <div class="form-group">
                 <label asp-for="ContainerName"></label>
-                <input class="form-control" asp-for="ContainerName" />
+                <input class="form-control" asp-for="ContainerName"/>
                 <span asp-validation-for="ContainerName" class="text-danger"></span>
             </div>
             <div class="form-group">
@@ -34,11 +34,11 @@
             </div>
 
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
-            <a asp-action="Storage" asp-route-forceChoice="true" >Change Storage provider</a>
+            <a asp-action="Storage" asp-route-forceChoice="true">Change Storage provider</a>
         </form>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/Emails.cshtml b/BTCPayServer/Views/Server/Emails.cshtml
index 87d511d58..927f290d9 100644
--- a/BTCPayServer/Views/Server/Emails.cshtml
+++ b/BTCPayServer/Views/Server/Emails.cshtml
@@ -3,5 +3,9 @@
     ViewData.SetActivePageAndTitle(ServerNavPages.Emails);
 }
 
+<partial name="EmailsBody" model="Model" />
+
+@section Scripts {
+    <partial name="_ValidationScriptsPartial" />
+}
 
-<partial name="EmailsBody" model="@Model"/>
diff --git a/BTCPayServer/Views/Server/Files.cshtml b/BTCPayServer/Views/Server/Files.cshtml
index 10962ed70..dfb7c6616 100644
--- a/BTCPayServer/Views/Server/Files.cshtml
+++ b/BTCPayServer/Views/Server/Files.cshtml
@@ -1,16 +1,16 @@
 @model ViewFilesViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Files);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Files, "File Storage");
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<partial name="_StatusMessage" />
-
-<h4>File Storage</h4>
-<div class="form-group">
-    <span>Change your <a asp-action="Services" asp-route-returnurl="@ViewData["ReturnUrl"]">external storage service</a> provider</span>
-    <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-upload-files-to-btcpay" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
-</div>
+<p>
+    Change your <a asp-action="Services" asp-route-returnurl="@ViewData["ReturnUrl"]">external storage service</a> provider.
+    <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-upload-files-to-btcpay" target="_blank">
+        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+    </a>
+</p>
 
 @if (Model.Files.Any())
 {
@@ -81,23 +81,16 @@ else
 
 @if (Model.StorageConfigured)
 {
-    <div class="card">
-        <form asp-action="CreateFile" method="post" enctype="multipart/form-data">
+    <form asp-action="CreateFile" method="post" enctype="multipart/form-data">
+        <h4 class="mt-5 mb-3">Upload File</h4>
 
-            <div class="card-body">
-                <h3 class="header">Upload File</h3>
+        <div class="custom-file mb-3">
+            <input type="file" class="custom-file-input" name="file" id="file" required>
+            <label class="custom-file-label" for="customFile">Choose file</label>
+        </div>
 
-                <div class="custom-file">
-                    <input type="file" class="custom-file-input" name="file" id="file" required>
-                    <label class="custom-file-label" for="customFile">Choose file</label>
-                </div>
-
-            </div>
-            <div class="card-footer">
-                <button class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Upload file</button>
-            </div>
-        </form>
-    </div>
+        <button class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Upload file</button>
+    </form>
 
     @section Scripts {
         <script>
diff --git a/BTCPayServer/Views/Server/LightningChargeServices.cshtml b/BTCPayServer/Views/Server/LightningChargeServices.cshtml
index d6fde539d..0dc9cd875 100644
--- a/BTCPayServer/Views/Server/LightningChargeServices.cshtml
+++ b/BTCPayServer/Views/Server/LightningChargeServices.cshtml
@@ -1,34 +1,28 @@
 @model ChargeServiceViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Lightning charge service");
 }
 
-
-<h4>Lightning charge service</h4>
-<partial name="_StatusMessage" />
-
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <div class="row">
     <div class="col-md-8">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <div class="form-group">
-            <p>
-                <span>Lightning charge is a simple API for invoicing on lightning network, you can use it with several plugins:</span>
-                <ul>
-                    <li><a href="https://github.com/ElementsProject/woocommerce-gateway-lightning" target="_blank">WooCommerce Lightning Gateway</a>: A comprehensive e-commerce application that integrates with stock-management and order-tracking systems</li>
-                    <li><a href="https://github.com/ElementsProject/nanopos" target="_blank">Nanopos</a>: A simple point-of-sale system for fixed-price goods</li>
-                    <li><a href="https://github.com/ElementsProject/filebazaar" target="_blank">FileBazaar</a>: A system for selling files such as documents, images, and videos</li>
-                    <li><a href="https://github.com/ElementsProject/wordpress-lightning-publisher" target="_blank">Lightning Publisher for WordPress</a>: A patronage model for unlocking WordPress blog entries</li>
-                    <li><a href="https://github.com/ElementsProject/paypercall" target="_blank">Paypercall</a>: A programmer’s toolkit for Lightning that enables micropayments for individual API calls</li>
-                    <li><a href="https://github.com/ElementsProject/ifpaytt" target="_blank">Ifpaytt</a>: An extension of paypercall that allows web developers using IFTTT to request payments for service usage</li>
-                    <li><a href="https://github.com/ElementsProject/lightning-jukebox" target="_blank">Lightning Jukebox</a>: A fun demo that reimagines a classic technology for the Lightning Network</li>
-                    <li><a href="https://github.com/ElementsProject/nanotip" target="_blank">Nanotip</a>: The simple tip jar, rebuilt to issue Lightning Network invoices</li>
-                </ul>
-            </p>
+            <p>Lightning charge is a simple API for invoicing on lightning network, you can use it with several plugins:</p>
+            <ul>
+                <li><a href="https://github.com/ElementsProject/woocommerce-gateway-lightning" target="_blank">WooCommerce Lightning Gateway</a>: A comprehensive e-commerce application that integrates with stock-management and order-tracking systems</li>
+                <li><a href="https://github.com/ElementsProject/nanopos" target="_blank">Nanopos</a>: A simple point-of-sale system for fixed-price goods</li>
+                <li><a href="https://github.com/ElementsProject/filebazaar" target="_blank">FileBazaar</a>: A system for selling files such as documents, images, and videos</li>
+                <li><a href="https://github.com/ElementsProject/wordpress-lightning-publisher" target="_blank">Lightning Publisher for WordPress</a>: A patronage model for unlocking WordPress blog entries</li>
+                <li><a href="https://github.com/ElementsProject/paypercall" target="_blank">Paypercall</a>: A programmer’s toolkit for Lightning that enables micropayments for individual API calls</li>
+                <li><a href="https://github.com/ElementsProject/ifpaytt" target="_blank">Ifpaytt</a>: An extension of paypercall that allows web developers using IFTTT to request payments for service usage</li>
+                <li><a href="https://github.com/ElementsProject/lightning-jukebox" target="_blank">Lightning Jukebox</a>: A fun demo that reimagines a classic technology for the Lightning Network</li>
+                <li><a href="https://github.com/ElementsProject/nanotip" target="_blank">Nanotip</a>: The simple tip jar, rebuilt to issue Lightning Network invoices</li>
+            </ul>
         </div>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Server/LightningWalletServices.cshtml b/BTCPayServer/Views/Server/LightningWalletServices.cshtml
index dc90d3f51..4bf423e81 100644
--- a/BTCPayServer/Views/Server/LightningWalletServices.cshtml
+++ b/BTCPayServer/Views/Server/LightningWalletServices.cshtml
@@ -1,11 +1,9 @@
 @model LightningWalletServices
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, Model.WalletName);
 }
 
-
-<h4>@Model.WalletName</h4>
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 @if (Model.ShowQR)
 {
@@ -19,25 +17,22 @@
 }
 
 <div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-
-<div class="row">
-
     <div class="col-md-8">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <div class="form-group">
             <h5>Browser connection</h5>
             <p>
-                <span>You can go to @Model.WalletName from your browser by <a href="@Model.ServiceLink">clicking here</a><br /></span>
+                <span>You can go to @Model.WalletName from your browser by <a href="@Model.ServiceLink">clicking here</a><br/></span>
             </p>
         </div>
 
         <div class="form-group">
             <h5>QR Code connection</h5>
             <p>
-                <span>You can use QR Code to connect to your @Model.WalletName from your mobile.<br /></span>
+                <span>You can use QR Code to connect to your @Model.WalletName from your mobile.<br/></span>
             </p>
         </div>
         <div class="form-group">
@@ -45,7 +40,7 @@
             {
                 <div class="form-group">
                     <form method="get">
-                        <input type="hidden" asp-for="ShowQR" value="true" />
+                        <input type="hidden" asp-for="ShowQR" value="true"/>
                         <button type="submit" class="btn btn-primary">Show Confidential QR Code</button>
                     </form>
                 </div>
@@ -62,7 +57,7 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     @if (Model.ShowQR)
     {
diff --git a/BTCPayServer/Views/Server/ListPlugins.cshtml b/BTCPayServer/Views/Server/ListPlugins.cshtml
index e88ebf16c..3005fa63c 100644
--- a/BTCPayServer/Views/Server/ListPlugins.cshtml
+++ b/BTCPayServer/Views/Server/ListPlugins.cshtml
@@ -88,8 +88,6 @@
     }
 }
 
-<partial name="_StatusMessage"/>
-
 <style>
     .version-switch .nav-link { display: inline; }
     .version-switch .nav-link.active { display: none; }
@@ -118,7 +116,7 @@
 
 @if (Model.Installed.Any())
 {
-    <h3 class="mb-3">Installed Plugins</h3>
+    <h2 class="mb-4">Installed Plugins</h2>
     <div class="row mb-4">
         @foreach (var plugin in Model.Installed)
         {
@@ -235,9 +233,10 @@
         }
     </div>
 }
+
 @if (availableAndNotInstalled.Any())
 {
-    <h3 class="mb-3">Available Plugins</h3>
+    <h2 class="mb-4">Available Plugins</h2>
     <div class="row mb-4">
         @foreach (var pluginT in availableAndNotInstalled)
         {
@@ -250,7 +249,7 @@
                             @plugin.Version
                             @if (pluginT.Item2)
                             {
-                                <div class="badge badge-light ml-2" data-toggle="tooltip" title="This plugin has been recommended to be installed by your deployment method." class="text-nowrap">Recommended <span class="fa fa-question-circle-o"></span></div>
+                                <div class="badge badge-light ml-2" data-toggle="tooltip" title="This plugin has been recommended to be installed by your deployment method." class="text-nowrap">Recommended <span class="fa fa-question-circle-o text-secondary"></span></div>
                             }
                         </h5>
                         <p class="card-text">@plugin.Description</p>
diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/Server/ListUsers.cshtml
index 03a45445f..3c860407a 100644
--- a/BTCPayServer/Views/Server/ListUsers.cshtml
+++ b/BTCPayServer/Views/Server/ListUsers.cshtml
@@ -23,79 +23,68 @@
     var sortByAsc = "Sort by ascending...";
 }
 
-<partial name="_StatusMessage"/>
-
-<div class="row button-row">
-    <div class="col-12 col-sm-4 col-lg-6 mb-3">
-        <a asp-action="CreateUser" class="btn btn-primary" role="button" id="CreateUser">
-            <span class="fa fa-plus"></span> Add User
-        </a>
-    </div>
-
-    <div class="col-12 col-sm-8 col-lg-6 mb-3">
-       <form
-            asp-action="ListUsers"
-            asp-route-sortOrder="@(userEmailSortOrder)"
-        >
-            <div class="input-group">
-                <input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
-                <div class="input-group-append">
-                    <button type="submit" class="btn btn-secondary" title="Search by email">
-                        <span class="fa fa-search"></span> Search
-                    </button>
-                </div>
-            </div>
-            <span asp-validation-for="SearchTerm" class="text-danger"></span>
-        </form>
-    </div>
+<div class="d-flex align-items-center justify-content-between mb-4">
+    <h2 class="mb-0">@ViewData["Title"]</h2>
+    <a asp-action="CreateUser" class="btn btn-primary" role="button" id="CreateUser">
+        <span class="fa fa-plus"></span> Add User
+    </a>
 </div>
-
-<div class="row">
-    <div class="col-lg-9 col-xl-8">
-        <table class="table table-sm">
-            <thead>
-            <tr>
-                <th>
-                    <a
-                        asp-action="ListUsers"
-                        asp-route-sortOrder="@(nextUserEmailSortOrder ?? "asc")"
-                        class="text-nowrap"
-                        title="@(nextUserEmailSortOrder == "desc" ? sortByAsc : sortByDesc)"
-                    >
-                        Email
-                        <span class="fa @(sortIconClass)" />
-                    </a>
-                </th>
-                <th>Created</th>
-                <th>Verified</th>
-                <th class="text-right">Actions</th>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach (var user in Model.Users)
-            {
-                <tr>
-                    <td>@user.Email</td>
-                    <td>@user.Created?.ToBrowserDate()</td>
-                    <td class="text-center">
-                        @if (user.Verified)
-                        {
-                            <span class="text-success fa fa-check"></span>
-                        }
-                        else
-                        {
-                            <span class="text-danger fa fa-times"></span>
-                        }
-                    </td>
-                    <td class="text-right">
-                        <a asp-action="User" asp-route-userId="@user.Id">Edit</a> <span> - </span> <a asp-action="DeleteUser" asp-route-userId="@user.Id">Remove</a>
-                    </td>
-                </tr>
-            }
-            </tbody>
-        </table>
-
-
-        <vc:pager view-model="Model"></vc:pager>
+<form
+    asp-action="ListUsers"
+    asp-route-sortOrder="@(userEmailSortOrder)"
+>
+    <div class="input-group">
+        <input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
+        <div class="input-group-append">
+            <button type="submit" class="btn btn-secondary" title="Search by email">
+                <span class="fa fa-search"></span> Search
+            </button>
+        </div>
     </div>
-</div>
+    <span asp-validation-for="SearchTerm" class="text-danger"></span>
+</form>
+
+<table class="table table-sm">
+    <thead>
+    <tr>
+        <th>
+            <a
+                asp-action="ListUsers"
+                asp-route-sortOrder="@(nextUserEmailSortOrder ?? "asc")"
+                class="text-nowrap"
+                title="@(nextUserEmailSortOrder == "desc" ? sortByAsc : sortByDesc)"
+            >
+                Email
+                <span class="fa @(sortIconClass)" />
+            </a>
+        </th>
+        <th>Created</th>
+        <th>Verified</th>
+        <th class="text-right">Actions</th>
+    </tr>
+    </thead>
+    <tbody>
+    @foreach (var user in Model.Users)
+    {
+        <tr>
+            <td>@user.Email</td>
+            <td>@user.Created?.ToBrowserDate()</td>
+            <td class="text-center">
+                @if (user.Verified)
+                {
+                    <span class="text-success fa fa-check"></span>
+                }
+                else
+                {
+                    <span class="text-danger fa fa-times"></span>
+                }
+            </td>
+            <td class="text-right">
+                <a asp-action="User" asp-route-userId="@user.Id">Edit</a> <span> - </span> <a asp-action="DeleteUser" asp-route-userId="@user.Id">Remove</a>
+            </td>
+        </tr>
+    }
+    </tbody>
+</table>
+
+<vc:pager view-model="Model"></vc:pager>
diff --git a/BTCPayServer/Views/Server/LndSeedBackup.cshtml b/BTCPayServer/Views/Server/LndSeedBackup.cshtml
index 33245f976..b7b6b611d 100644
--- a/BTCPayServer/Views/Server/LndSeedBackup.cshtml
+++ b/BTCPayServer/Views/Server/LndSeedBackup.cshtml
@@ -1,23 +1,14 @@
 @model LndSeedBackupViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "LND Seed Backup");
 }
 
-<h4>LND Seed Backup</h4>
-
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-8 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
-}
+<h2 class="mb-4">@ViewData["Title"]</h2>
 
 @if (Model.IsWalletUnlockPresent)
 {
     <div class="row">
-        <div class="col-md-8">
+        <div class="col-lg-8">
             <div class="form-group">
                 <p>The LND seed backup is useful to recover funds of your LND wallet in case of a corruption of your server.</p>
                 <p>The recovering process is documented by LND on <a href="https://github.com/lightningnetwork/lnd/blob/master/docs/recovery.md">this page</a>.</p>
diff --git a/BTCPayServer/Views/Server/LndServices.cshtml b/BTCPayServer/Views/Server/LndServices.cshtml
index 04f6410d8..3184da836 100644
--- a/BTCPayServer/Views/Server/LndServices.cshtml
+++ b/BTCPayServer/Views/Server/LndServices.cshtml
@@ -1,189 +1,150 @@
 @model LndServicesViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"LND {Model.ConnectionType}");
 }
 
-
-<h4>LND @Model.ConnectionType</h4>
-<partial name="_StatusMessage" />
 <div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-
-<div class="row">
-
     <div class="col-md-8">
-        <div class="form-group">
-            <p>
-                <span>BTCPay exposes LND's @Model.ConnectionType service for outside consumption, you will find connection information here.<br /></span>
-            </p>
+        <h2 class="mb-4">@ViewData["Title"]</h2>
+        <p>
+            BTCPay exposes LND's @Model.ConnectionType service for outside consumption, you will find connection information here.
+        </p>
+
+        <h4 class="mb-3">Compatible wallets</h4>
+
+        <div>
+            @if (Model.Uri == null) // if GRPC
+            {
+                <a href="https://www.pebble.indiesquare.me/" target="_blank" class="d-inline-block mr-3 text-center">
+                    <img src="~/img/pebblewallet.jpg" width="100" height="100" asp-append-version="true" alt="Pebble" />
+                    <div class="mt-2">Pebble</div>
+                </a>
+                <a href="https://zaphq.io/" target="_blank" class="d-inline-block mr-3 text-center">
+                    <img src="~/img/zapwallet.jpg" width="100" height="100" asp-append-version="true" alt="Zap" />
+                    <div class="mt-2">Zap</div>
+                </a>
+            }
+            else
+            {
+                <a href="https://lightningjoule.com/" target="_blank" class="d-inline-block mr-3 mb-3 text-center">
+                    <img src="~/img/joule.png" width="100" height="100" asp-append-version="true" alt="Joule" />
+                    <div class="mt-2">Joule</div>
+                </a>
+                <a href="https://github.com/ZeusLN/zeus" target="_blank" class="d-inline-block mr-3 mb-3 text-center">
+                    <img src="~/img/zeus.jpg" width="100" height="100" asp-append-version="true" alt="Zeus" />
+                    <div class="mt-2">Zeus</div>
+                </a>
+            }
         </div>
 
-        <div class="form-group">
-            <h5>Compatible wallets</h5>
-        </div>
-        @if (Model.Uri == null) // if GRPC
+        <h4 class="mt-5 mb-3">QR Code connection</h4>
+        <p>
+            You can use this QR Code to connect external software to your LND instance.<br/>
+            This QR Code is only valid for 10 minutes.
+        </p>
+
+        @if (Model.QRCode == null)
         {
-            <div class="row">
-                <div class="col-lg-3 ml-auto text-center">
-                    <a href="https://www.pebble.indiesquare.me/" target="_blank">
-                        <img src="~/img/pebblewallet.jpg" height="100" asp-append-version="true" />
-                    </a>
-                    <p><a href="https://www.pebble.indiesquare.me/" target="_blank">Pebble</a></p>
-                </div>
-                <div class="col-lg-3 ml-auto text-center">
-                    <a href="https://zaphq.io/" target="_blank">
-                        <img src="~/img/zapwallet.jpg" height="100" asp-append-version="true" />
-                    </a>
-                    <p><a href="https://zaphq.io/" target="_blank">Zap</a></p>
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
-                </div>
+            <div class="form-group">
+                <form method="post">
+                    <button type="submit" class="btn btn-primary">Show QR Code</button>
+                </form>
             </div>
         }
         else
         {
-            <div class="row">
-                <div class="col-lg-3 ml-auto text-center">
-                    <a href="https://lightningjoule.com/" target="_blank">
-                        <img src="~/img/joule.png" height="100" asp-append-version="true" />
-                    </a>
-                    <p><a href="https://lightningjoule.com/" target="_blank">Joule</a></p>
+            <div class="form-group">
+                <div id="qrCode"></div>
+                <div id="qrCodeData" data-url="@Model.QRCode"></div>
+            </div>
+            <p>See QR Code information by clicking <a href="#detailsQR" data-toggle="collapse">here</a>.</p>
+            <div id="detailsQR" class="collapse">
+                <div class="form-group">
+                    <label>QR Code data</label>
+                    <input asp-for="QRCode" readonly class="form-control"/>
                 </div>
-                <div class="col-lg-3 ml-auto text-center">
-                    <a href="https://github.com/ZeusLN/zeus" target="_blank">
-                        <img src="~/img/zeus.jpg" height="100" asp-append-version="true" />
-                    </a>
-                    <p><a href="https://github.com/ZeusLN/zeus" target="_blank">Zeus</a></p>
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
-                </div>
-                <div class="col-lg-3 mr-auto text-center">
-
+                <div class="form-group">
+                    Click <a href="@Model.QRCodeLink" target="_blank">here</a> to open the configuration file.
                 </div>
             </div>
         }
-        <div class="form-group">
-            <h5>QR Code connection</h5>
-            <p>
-                <span>You can use this QR Code to connect external software to your LND instance.<br /></span>
-                <span>This QR Code is only valid for 10 minutes</span>
-            </p>
-        </div>
-        <div class="form-group">
-            @if (Model.QRCode == null)
+
+        <h4 class="mt-5 mb-3">More details</h4>
+        <p>Alternatively, you can see the settings by clicking <a href="#details" data-toggle="collapse">here</a>.</p>
+
+        <div id="details" class="collapse">
+            @if (Model.Uri == null)
             {
                 <div class="form-group">
-                    <form method="post">
-                        <button type="submit" class="btn btn-primary">Show QR Code</button>
-                    </form>
+                    <label asp-for="Host"></label>
+                    <input asp-for="Host" readonly class="form-control"/>
+                </div>
+                <div class="form-group">
+                    <label asp-for="SSL"></label>
+                    <input asp-for="SSL" disabled type="checkbox" class="form-check-inline"/>
                 </div>
             }
             else
             {
                 <div class="form-group">
-                    <div id="qrCode"></div>
-                    <div id="qrCodeData" data-url="@Model.QRCode"></div>
-                </div>
-                <p>See QR Code information by clicking <a href="#detailsQR" data-toggle="collapse">here</a></p>
-                <div id="detailsQR" class="collapse">
-                    <div class="form-group">
-                        <label>QR Code data</label>
-                        <input asp-for="QRCode" readonly class="form-control" />
-                    </div>
-                    <div class="form-group">
-                        Click <a href="@Model.QRCodeLink" target="_blank">here</a> to open the configuration file.
-                    </div>
+                    <label asp-for="Uri"></label>
+                    <input asp-for="Uri" readonly class="form-control"/>
+                </div>
+            }
+            @if (Model.Macaroon != null)
+            {
+                <div class="form-group">
+                    <label asp-for="Macaroon"></label>
+                    <input asp-for="Macaroon" readonly class="form-control"/>
+                </div>
+            }
+            @if (Model.AdminMacaroon != null)
+            {
+                <div class="form-group">
+                    <label asp-for="AdminMacaroon"></label>
+                    <input asp-for="AdminMacaroon" readonly class="form-control"/>
+                </div>
+            }
+            @if (Model.InvoiceMacaroon != null)
+            {
+                <div class="form-group">
+                    <label asp-for="InvoiceMacaroon"></label>
+                    <input asp-for="InvoiceMacaroon" readonly class="form-control"/>
+                </div>
+            }
+            @if (Model.ReadonlyMacaroon != null)
+            {
+                <div class="form-group">
+                    <label asp-for="ReadonlyMacaroon"></label>
+                    <input asp-for="ReadonlyMacaroon" readonly class="form-control"/>
+                </div>
+            }
+            @if (Model.GRPCSSLCipherSuites != null)
+            {
+                <div class="form-group">
+                    <label asp-for="GRPCSSLCipherSuites"></label>
+                    <input asp-for="GRPCSSLCipherSuites" readonly class="form-control"/>
+                </div>
+            }
+            @if (Model.CertificateThumbprint != null)
+            {
+                <div class="form-group">
+                    <label asp-for="CertificateThumbprint"></label>
+                    <input asp-for="CertificateThumbprint" readonly class="form-control"/>
                 </div>
             }
-
-
-            <div class="form-group">
-                <h5>More details...</h5>
-                <p>Alternatively, you can see the settings by clicking <a href="#details" data-toggle="collapse">here</a></p>
-            </div>
-            <div id="details" class="collapse">
-                @if (Model.Uri == null)
-                {
-                    <div class="form-group">
-                        <label asp-for="Host"></label>
-                        <input asp-for="Host" readonly class="form-control" />
-                    </div>
-                    <div class="form-group">
-                        <label asp-for="SSL"></label>
-                        <input asp-for="SSL" disabled type="checkbox" class="form-check-inline" />
-                    </div>
-                }
-                else
-                {
-                    <div class="form-group">
-                        <label asp-for="Uri"></label>
-                        <input asp-for="Uri" readonly class="form-control" />
-                    </div>
-                }
-                @if (Model.Macaroon != null)
-                {
-                    <div class="form-group">
-                        <label asp-for="Macaroon"></label>
-                        <input asp-for="Macaroon" readonly class="form-control" />
-                    </div>
-                }
-                @if (Model.AdminMacaroon != null)
-                {
-                    <div class="form-group">
-                        <label asp-for="AdminMacaroon"></label>
-                        <input asp-for="AdminMacaroon" readonly class="form-control" />
-                    </div>
-                }
-                @if (Model.InvoiceMacaroon != null)
-                {
-                    <div class="form-group">
-                        <label asp-for="InvoiceMacaroon"></label>
-                        <input asp-for="InvoiceMacaroon" readonly class="form-control" />
-                    </div>
-                }
-                @if (Model.ReadonlyMacaroon != null)
-                {
-                    <div class="form-group">
-                        <label asp-for="ReadonlyMacaroon"></label>
-                        <input asp-for="ReadonlyMacaroon" readonly class="form-control" />
-                    </div>
-                }
-                @if (Model.GRPCSSLCipherSuites != null)
-                {
-                    <div class="form-group">
-                        <label asp-for="GRPCSSLCipherSuites"></label>
-                        <input asp-for="GRPCSSLCipherSuites" readonly class="form-control" />
-                    </div>
-                }
-                @if (Model.CertificateThumbprint != null)
-                {
-                    <div class="form-group">
-                        <label asp-for="CertificateThumbprint"></label>
-                        <input asp-for="CertificateThumbprint" readonly class="form-control" />
-                    </div>
-                }
-            </div>
         </div>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     @if(Model.QRCode != null)
     {
         <script type="text/javascript" src="~/js/qrcode.js" asp-append-version="true"></script>
         <script type="text/javascript">
-        new QRCode(document.getElementById("qrCode"),
-            {
+            new QRCode(document.getElementById("qrCode"), {
                 text: @Safe.Json(Model.QRCode),
                 width: 200,
                 height: 200,
diff --git a/BTCPayServer/Views/Server/Logs.cshtml b/BTCPayServer/Views/Server/Logs.cshtml
index 6f5850a23..760b1eb2e 100644
--- a/BTCPayServer/Views/Server/Logs.cshtml
+++ b/BTCPayServer/Views/Server/Logs.cshtml
@@ -1,9 +1,9 @@
 @model BTCPayServer.Models.ServerViewModels.LogsViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Logs);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Logs, "Logs");
 }
 
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <ul class="list-unstyled">
     @foreach (var file in Model.LogFiles)
@@ -41,5 +41,5 @@
 
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/Maintenance.cshtml b/BTCPayServer/Views/Server/Maintenance.cshtml
index 4b82548c0..b12631eea 100644
--- a/BTCPayServer/Views/Server/Maintenance.cshtml
+++ b/BTCPayServer/Views/Server/Maintenance.cshtml
@@ -1,17 +1,15 @@
 @model BTCPayServer.Models.ServerViewModels.MaintenanceViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Maintenance);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Maintenance, "Maintenance");
 }
 
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <form method="post">
     <div class="row mb-5">
         <div class="col-lg-9 col-xl-8">
-            <div class="form-group">
-                <h5>Change domain name</h5>
-                <span>You can change the domain name of your server by following <a href="https://docs.btcpayserver.org/ChangeDomain" target="_blank">this guide</a></span>
-            </div>
+            <h4 class="mb-3">Change domain name</h4>
+            <p>You can change the domain name of your server by following <a href="https://docs.btcpayserver.org/ChangeDomain" target="_blank">this guide</a>.</p>
 
             <div class="form-group">
                 <div class="form-inline">
@@ -22,28 +20,25 @@
                 </div>
                 <span asp-validation-for="DNSDomain" class="text-danger"></span>
             </div>
-        </div>
-    </div>
-    <div class="row mb-5">
-        <div class="col-lg-9 col-xl-8">
-            <h5>Update</h5>
-            <p class="text-secondary mb-2">Update to the latest version of BTCPay server.</p>
+
+            <h4 class="mt-5 mb-3">Update</h4>
+            <p class="text-secondary">Update to the latest version of BTCPay server.</p>
             <div class="form-group">
                 <div class="input-group">
                     <button name="command" type="submit" class="btn btn-primary" value="update" disabled="@(Model.CanUseSSH ? null : "disabled")">Update</button>
                 </div>
             </div>
             
-            <h5 class="mt-5">Restart</h5>
-            <p class="text-secondary mb-2">Restart BTCPay server and related services.</p>
+            <h4 class="mt-5 mb-3">Restart</h4>
+            <p class="text-secondary">Restart BTCPay server and related services.</p>
             <div class="form-group">
                 <div class="input-group">
                     <button name="command" type="submit" class="btn btn-primary" value="restart" disabled="@(Model.CanUseSSH ? null : "disabled")">Restart</button>
                 </div>
             </div>
 
-            <h5 class="mt-5">Clean</h5>
-            <p class="text-secondary mb-2">Delete unused docker images present on your system.</p>
+            <h4 class="mt-5 mb-3">Clean</h4>
+            <p class="text-secondary">Delete unused docker images present on your system.</p>
             <div class="form-group">
                 <div class="input-group">
                     <button name="command" type="submit" class="btn btn-secondary" value="clean" disabled="@(Model.CanUseSSH ? null : "disabled")">Clean</button>
@@ -54,5 +49,5 @@
 </form>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/P2PService.cshtml b/BTCPayServer/Views/Server/P2PService.cshtml
index 54301126c..92f56174c 100644
--- a/BTCPayServer/Views/Server/P2PService.cshtml
+++ b/BTCPayServer/Views/Server/P2PService.cshtml
@@ -1,11 +1,9 @@
 @model LightningWalletServices
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, Model.WalletName);
 }
 
-
-<h4>@Model.WalletName</h4>
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 @if (Model.ShowQR)
 {
@@ -18,49 +16,31 @@
     </div>
 }
 
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-
 <div class="row">
     <div class="col-md-8">
-        <div class="form-group">
-            <h5>Full node connection</h5>
-            <p>
-                <span>This page exposes information to connect remotely to your full node via the P2P protocol.</span>
-            </p>
-        </div>
-        <div class="form-group">
-            <h5>Compatible wallets</h5>
-        </div>
-        <div class="row">
-            <div class="col-lg-3 ml-auto text-center">
-                <a href="https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" target="_blank">
-                    <img src="~/img/GreenWallet.png" height="100" asp-append-version="true" />
-                </a>
-                <p><a href="https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" target="_blank">Blockstream Green Wallet</a></p>
-            </div>
-            <div class="col-lg-3 mr-auto text-center">
-                <a href="https://www.wasabiwallet.io/" target="_blank">
-                    <img src="~/img/wasabi.png" height="100" asp-append-version="true" />
-                </a>
-                <p><a href="https://www.wasabiwallet.io/" target="_blank">Wasabi Wallet</a> <a href="https://www.reddit.com/r/WasabiWallet/comments/aqlyia/how_to_connect_wasabi_wallet_to_my_own_full/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a></p>
-            </div>
-            <div class="col-lg-3 mr-auto text-center">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
 
-            </div>
-            <div class="col-lg-3 mr-auto text-center">
+        <h4 class="mb-3">Full node connection</h4>
+        <p>This page exposes information to connect remotely to your full node via the P2P protocol.</p>
 
-            </div>
-        </div>
-        <div class="form-group">
-            <h5>QR Code connection</h5>
-            <p>
-                <span>You can use QR Code to connect to @Model.WalletName with compatible wallets.<br /></span>
-            </p>
+        <h4 class="mb-3">Compatible wallets</h4>
+        <div>
+            <a href="https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" target="_blank" class="d-inline-block mr-3 mb-3 text-center">
+                <img src="~/img/GreenWallet.png" width="100" height="100" asp-append-version="true" alt="Blockstream Green" />
+                <div class="mt-2">Blockstream Green</div>
+            </a>
+            <a href="https://www.wasabiwallet.io/" target="_blank" class="d-inline-block mr-3 mb-3 text-center">
+                <img src="~/img/wasabi.png" width="100" height="100" asp-append-version="true" alt="Wasabi Wallet" />
+                <div class="mt-2">Wasabi Wallet</div>
+            </a>
         </div>
+
+        <h4 class="mt-5 mb-3">QR Code connection</h4>
+        <p>You can use QR Code to connect to @Model.WalletName with compatible wallets.</p>
+
         <div class="form-group">
             @if (!Model.ShowQR)
             {
@@ -90,7 +70,7 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     @if (Model.ShowQR)
     {
diff --git a/BTCPayServer/Views/Server/Policies.cshtml b/BTCPayServer/Views/Server/Policies.cshtml
index 143c4889d..0eb6e3090 100644
--- a/BTCPayServer/Views/Server/Policies.cshtml
+++ b/BTCPayServer/Views/Server/Policies.cshtml
@@ -6,7 +6,7 @@
     ViewData.SetActivePageAndTitle(ServerNavPages.Policies);
 }
 
-<partial name="_StatusMessage"/>
+<h2 class="mb-4">@ViewData["Title"]</h2>
 
 @if (!ViewContext.ModelState.IsValid)
 {
@@ -14,18 +14,22 @@
 }
 
 <form method="post">
-    <div class="form-group mb-4">
-        <h5>Existing User Settings</h5>
+    <div class="form-group mb-5">
+        <h4 class="mb-3">Existing User Settings</h4>
         <div class="form-check my-1">
             <input asp-for="AllowLightningInternalNodeForAll" type="checkbox" class="form-check-input"/>
             <label asp-for="AllowLightningInternalNodeForAll" class="form-check-label"></label>
-            <a href="https://docs.btcpayserver.org/FAQ/FAQ-LightningNetwork/#how-many-users-can-use-lightning-network-in-btcpay" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            <a href="https://docs.btcpayserver.org/FAQ/FAQ-LightningNetwork/#how-many-users-can-use-lightning-network-in-btcpay" target="_blank">\
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
             <span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span>
         </div>
         <div class="form-check my-1">
             <input asp-for="AllowHotWalletForAll" type="checkbox" class="form-check-input"/>
             <label asp-for="AllowHotWalletForAll" class="form-check-label"></label>
-            <a href="https://docs.btcpayserver.org/CreateWallet/#requirements-to-create-wallets" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            <a href="https://docs.btcpayserver.org/CreateWallet/#requirements-to-create-wallets" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
             <span asp-validation-for="AllowHotWalletForAll" class="text-danger"></span>
         </div>
         <div class="form-check my-1">
@@ -35,8 +39,8 @@
         </div>
     </div>
 
-    <div class="form-group mb-4">
-        <h5>New User Settings</h5>
+    <div class="form-group mb-5">
+        <h4 class="mb-3">New User Settings</h4>
         <div class="form-check my-1">
             @{
                 var emailSettings = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
@@ -46,7 +50,9 @@
             }
             <input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-input" disabled="@(isEmailConfigured ? null : "disabled")"/>
             <label asp-for="RequiresConfirmedEmail" class="form-check-label"></label>
-            <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-allow-registration-on-my-btcpay-server" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-allow-registration-on-my-btcpay-server" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
             <span asp-validation-for="RequiresConfirmedEmail" class="text-danger"></span>
             @if (!isEmailConfigured)
             {
@@ -68,24 +74,28 @@
         </div>
     </div>
 
-    <div class="form-group mb-4">
-        <h5>Notification Settings</h5>
+    <div class="form-group mb-5">
+        <h4 class="mb-3">Notification Settings</h4>
         <div class="form-check my-1">
             <input asp-for="DisableInstantNotifications" type="checkbox" class="form-check-input"/>
             <label asp-for="DisableInstantNotifications" class="form-check-label"></label>
-            <a href="https://docs.btcpayserver.org/Notifications/#notifications" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            <a href="https://docs.btcpayserver.org/Notifications/#notifications" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
             <span asp-validation-for="DisableInstantNotifications" class="text-danger"></span>
         </div>
         <div class="form-check my-1">
             <input asp-for="DisableStoresToUseServerEmailSettings" type="checkbox" class="form-check-input"/>
             <label asp-for="DisableStoresToUseServerEmailSettings" class="form-check-label"></label>
-            <a href="https://docs.btcpayserver.org/Notifications/#server-emails" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            <a href="https://docs.btcpayserver.org/Notifications/#server-emails" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
             <span asp-validation-for="DisableStoresToUseServerEmailSettings" class="text-danger"></span>
         </div>
     </div>
 
-    <div class="form-group mb-4">
-        <h5>Maintenance Settings</h5>
+    <div class="form-group mb-5">
+        <h4 class="mb-3">Maintenance Settings</h4>
         @if (ViewBag.UpdateUrlPresent)
         {
             <div class="form-check my-1">
@@ -97,12 +107,14 @@
         <div class="form-check my-1">
             <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-input"/>
             <label asp-for="DiscourageSearchEngines" class="form-check-label"></label>
-            <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-hide-my-btcpay-server-from-search-engines" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-hide-my-btcpay-server-from-search-engines" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
             <span asp-validation-for="DiscourageSearchEngines" class="text-danger"></span>
         </div>
     </div>
 
-    <h5>Customization Settings</h5>
+    <h4 class="mb-3">Customization Settings</h4>
 
     <div class="form-group">
         <label asp-for="RootAppId"></label>
diff --git a/BTCPayServer/Views/Server/RPCService.cshtml b/BTCPayServer/Views/Server/RPCService.cshtml
index d3443318d..ad27a53ff 100644
--- a/BTCPayServer/Views/Server/RPCService.cshtml
+++ b/BTCPayServer/Views/Server/RPCService.cshtml
@@ -1,11 +1,9 @@
 @model LightningWalletServices
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, Model.WalletName);
 }
 
-
-<h4>@Model.WalletName</h4>
-<partial name="_StatusMessage" />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 @if (Model.ShowQR)
 {
@@ -18,55 +16,37 @@
     </div>
 }
 
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-
 <div class="row">
     <div class="col-md-8">
-        <div class="form-group">
-            <h5>Full node connection</h5>
-            <p>
-                <span>This page exposes information to connect remotely to your full node via the RPC protocol.</span>
-            </p>
-        </div>
-        <div class="form-group">
-            <h5>Compatible wallets</h5>
-        </div>
-        <div class="row">
-            <div class="col-lg-3 ml-auto text-center">
-                <a href="https://apps.apple.com/us/app/fully-noded/id1436425586" target="_blank">
-                    <img src="~/img/fullynoded.png" height="100" asp-append-version="true" />
-                </a>
-                <p><a href="https://apps.apple.com/us/app/fully-noded/id1436425586" target="_blank">Fully Noded</a></p>
-            </div>
-            <div class="col-lg-3 mr-auto text-center">
-                <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank">
-                    <img src="~/img/Specter.png" height="100" asp-append-version="true" />
-                </a>
-                <p><a href="https://github.com/cryptoadvance/specter-desktop" target="_blank">Specter</a></p>
-            </div>
-            <div class="col-lg-3 mr-auto text-center">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
 
-            </div>
-            <div class="col-lg-3 mr-auto text-center">
+        <h4 class="mb-3">Full node connection</h4>
+        <p>This page exposes information to connect remotely to your full node via the RPC protocol.</p>
 
-            </div>
-        </div>
-        <div class="form-group">
-            <h5>QR Code connection</h5>
-            <p>
-                <span>You can use QR Code to connect to @Model.WalletName with compatible wallets.<br /></span>
-            </p>
+        <h4 class="mb-3">Compatible wallets</h4>
+        <div>
+            <a href="https://apps.apple.com/us/app/fully-noded/id1436425586" target="_blank" class="d-inline-block mr-3 text-center">
+                <img src="~/img/fullynoded.png" width="100" height="100" asp-append-version="true" alt="Fully Noded" />
+                <div class="mt-2">Fully Noded</div>
+            </a>
+            <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank" class="d-inline-block mr-3 text-center">
+                <img src="~/img/specter.png" width="100" height="100" asp-append-version="true" alt="Specter Desktop" />
+                <div class="mt-2">Specter Desktop</div>
+            </a>
         </div>
+
+        <h4 class="mt-5 mb-3">QR Code connection</h4>
+        <p>You can use QR Code to connect to @Model.WalletName with compatible wallets.</p>
+
         <div class="form-group">
             @if (!Model.ShowQR)
             {
                 <div class="form-group">
                     <form method="get">
-                        <input type="hidden" asp-for="ShowQR" value="true" />
+                        <input type="hidden" asp-for="ShowQR" value="true"/>
                         <button type="submit" class="btn btn-primary">Show Confidential QR Code</button>
                     </form>
                 </div>
@@ -81,7 +61,7 @@
                 <div id="detailsQR" class="collapse">
                     <div class="form-group">
                         <label>QR Code data</label>
-                        <input asp-for="ServiceLink" readonly class="form-control" />
+                        <input asp-for="ServiceLink" readonly class="form-control"/>
                     </div>
                 </div>
             }
@@ -90,7 +70,7 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     @if (Model.ShowQR)
     {
diff --git a/BTCPayServer/Views/Server/SSHService.cshtml b/BTCPayServer/Views/Server/SSHService.cshtml
index 7c03b74e3..60159bc72 100644
--- a/BTCPayServer/Views/Server/SSHService.cshtml
+++ b/BTCPayServer/Views/Server/SSHService.cshtml
@@ -1,19 +1,11 @@
 @model BTCPayServer.Models.ServerViewModels.SSHServiceViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "SSH settings");
 }
 
-
-<h4>SSH settings</h4>
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <div class="row">
-
     <div class="col-md-8">
         <div class="form-group">
             <p>
@@ -21,6 +13,10 @@
             </p>
         </div>
 
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
 
         <div class="form-group">
             <div class="form-group">
diff --git a/BTCPayServer/Views/Server/Services.cshtml b/BTCPayServer/Views/Server/Services.cshtml
index 54d8396eb..9230dcf37 100644
--- a/BTCPayServer/Views/Server/Services.cshtml
+++ b/BTCPayServer/Views/Server/Services.cshtml
@@ -1,20 +1,13 @@
 @model BTCPayServer.Models.ServerViewModels.ServicesViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Services");
 }
 
-
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-9 col-xl-8">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <div class="row mb-5">
     <div class="col-lg-9 col-xl-8">
-        <h4>Crypto services exposed by your server</h4>
-
+        <h4 class="mb-3">Crypto services exposed by your server</h4>
         <table class="table table-sm mt-2">
             <thead>
                 <tr>
@@ -50,7 +43,7 @@
 {
     <div class="row mb-5">
         <div class="col-lg-9 col-xl-8">
-            <h4>Other external services</h4>
+            <h4 class="mb-3">Other external services</h4>
 
             <table class="table table-sm mt-2">
                 <thead>
@@ -88,7 +81,7 @@
 {
     <div class="row mb-5">
         <div class="col-lg-9 col-xl-8">
-            <h4>HTTP-based TOR hidden services</h4>
+            <h4 class="mb-3">HTTP-based TOR hidden services</h4>
 
             <table class="table table-sm mt-2">
                 <thead>
@@ -117,7 +110,7 @@
 {
     <div class="row mb-5">
         <div class="col-lg-9 col-xl-8">
-            <h4>Other TOR hidden services</h4>
+            <h4 class="mb-3">Other TOR hidden services</h4>
 
             <table class="table table-sm mt-2">
                 <thead>
@@ -143,7 +136,7 @@
 }
 <div class="row mb-5">
     <div class="col-lg-9 col-xl-8">
-        <h4>External storage services</h4>
+        <h4 class="mb-3">External storage services</h4>
         <p class="text-secondary mb-0">Integrated storage providers to store file uploads from BTCPay Server.</p>
 
         <table class="table table-sm mt-2">
@@ -169,5 +162,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/Storage.cshtml b/BTCPayServer/Views/Server/Storage.cshtml
index ae1f71548..d7a258977 100644
--- a/BTCPayServer/Views/Server/Storage.cshtml
+++ b/BTCPayServer/Views/Server/Storage.cshtml
@@ -1,35 +1,34 @@
 @using BTCPayServer.Storage.Models
 @model BTCPayServer.Storage.ViewModels.ChooseStorageViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Storage");
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<partial name="_StatusMessage" />
 @if (Model.ShowChangeWarning)
 {
     <div class="alert alert-danger">
         If you change your configured storage provider, your current files will become inaccessible. 
     </div>
 }
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+
 <div class="row">
     <div class="col-lg-6">
         <form method="post">
+            @if (!ViewContext.ModelState.IsValid)
+            {
+                <div asp-validation-summary="All" class="text-danger"></div>
+            }
             <div class="form-group">
                 <label asp-for="Provider"></label>
                 <select asp-for="Provider" asp-items="@Html.GetEnumSelectList<StorageProvider>()" class="form-control"></select>
             </div>
-
             <button type="submit" class="btn btn-primary" name="command" value="Save">Next</button>
         </form>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/Theme.cshtml b/BTCPayServer/Views/Server/Theme.cshtml
index ef70f136e..550524a18 100644
--- a/BTCPayServer/Views/Server/Theme.cshtml
+++ b/BTCPayServer/Views/Server/Theme.cshtml
@@ -1,20 +1,19 @@
 @model BTCPayServer.Services.ThemeSettings
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Theme);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Theme, "Theme");
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<partial name="_StatusMessage" />
-<div class="row">
-    <div class="col-lg-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-6">
         <form method="post">
-            <h4>Custom theme</h4>
+            <h4 class="mb-3">Custom theme</h4>
             <p>Select one of our predefined themes. Optionally you can also provide a CSS file that customizes the chosen theme.</p>
+            @if (!ViewContext.ModelState.IsValid)
+            {
+                <div asp-validation-summary="All" class="text-danger"></div>
+            }
             <div class="form-group">
                 <label asp-for="ThemeCssUri"></label>
                 <select asp-for="ThemeCssUri" class="form-control">
@@ -27,14 +26,19 @@
             </div>
             <div class="form-group mb-5">
                 <label asp-for="CustomThemeCssUri"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#1-custom-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                <a href="https://docs.btcpayserver.org/Theme/#1-custom-themes" target="_blank">
+                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                </a>
                 <input asp-for="CustomThemeCssUri" class="form-control" />
                 <span asp-validation-for="CustomThemeCssUri" class="text-danger"></span>
             </div>
-            <h4>Bootstrap theme</h4>
+
+            <h4 class="mb-3">Bootstrap theme</h4>
             <div class="form-group">
                 <label asp-for="BootstrapCssUri"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank">
+                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                </a>
                 <input asp-for="BootstrapCssUri" class="form-control" />
                 <span asp-validation-for="BootstrapCssUri" class="text-danger"></span>
                 <p class="form-text text-muted">
@@ -51,11 +55,12 @@
                     is used on top of Bootstrap
                 </p>
             </div>
+
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
         </form>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Server/User.cshtml b/BTCPayServer/Views/Server/User.cshtml
index 4a50ec4c4..4a97a17d8 100644
--- a/BTCPayServer/Views/Server/User.cshtml
+++ b/BTCPayServer/Views/Server/User.cshtml
@@ -1,21 +1,16 @@
 @model UsersViewModel.UserViewModel
 @{
-    ViewData.SetActivePageAndTitle(ServerNavPages.Users);
+    ViewData.SetActivePageAndTitle(ServerNavPages.Users, Model.Email);
 }
 
-
-<h4>Modify User - @Model.Email</h4>
-<partial name="_StatusMessage" />
-
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <div class="row">
     <div class="col-md-8">
         <form method="post">
             <div class="form-group">
-                <div class="form-check">
-                    <input asp-for="IsAdmin" type="checkbox" class="form-check-input" />
-                    <label asp-for="IsAdmin" class="form-check-label"></label>
-                </div>
+                <label asp-for="IsAdmin">Is admin</label>
+                <input asp-for="IsAdmin" type="checkbox" class="btcpay-toggle ml-2"/>
             </div>
             <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
         </form>
diff --git a/BTCPayServer/Views/Server/_Nav.cshtml b/BTCPayServer/Views/Server/_Nav.cshtml
index be18db802..117df58e1 100644
--- a/BTCPayServer/Views/Server/_Nav.cshtml
+++ b/BTCPayServer/Views/Server/_Nav.cshtml
@@ -1,6 +1,6 @@
 @using BTCPayServer.Configuration
 @inject BTCPayServerOptions BTCPayServerOptions
-<div class="nav flex-column nav-pills mb-4">
+<div class="nav flex-column mb-4">
     <a asp-controller="Server" id="Server-@ServerNavPages.Users" class="nav-link @ViewData.IsActivePage(ServerNavPages.Users)" asp-action="ListUsers">Users</a>
     <a asp-controller="Server" id="Server-@ServerNavPages.Emails" class="nav-link @ViewData.IsActivePage(ServerNavPages.Emails)" asp-action="Emails">Email server</a>
     <a asp-controller="Server" id="Server-@ServerNavPages.Policies" class="nav-link @ViewData.IsActivePage(ServerNavPages.Policies)" asp-action="Policies">Policies</a>
diff --git a/BTCPayServer/Views/Server/_ViewStart.cshtml b/BTCPayServer/Views/Server/_ViewStart.cshtml
index a19c44588..39648ddd7 100644
--- a/BTCPayServer/Views/Server/_ViewStart.cshtml
+++ b/BTCPayServer/Views/Server/_ViewStart.cshtml
@@ -2,6 +2,6 @@
 @using BTCPayServer.Views.Server
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewBag.MainTitle = "Server settings";
+    ViewBag.CategoryTitle = "Server settings";
     ViewData.SetActiveCategory(typeof(ServerNavPages));
 }
diff --git a/BTCPayServer/Views/Shared/Confirm.cshtml b/BTCPayServer/Views/Shared/Confirm.cshtml
index a87dc385e..d734567bd 100644
--- a/BTCPayServer/Views/Shared/Confirm.cshtml
+++ b/BTCPayServer/Views/Shared/Confirm.cshtml
@@ -11,7 +11,7 @@
     <partial name="Header" />
 </head>
 <body class="bg-light">
-    <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-dialog modal-dialog-centered min-vh-100">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title w-100 text-center">@Model.Title</h4>
diff --git a/BTCPayServer/Views/Shared/EmailsBody.cshtml b/BTCPayServer/Views/Shared/EmailsBody.cshtml
index 8f6825da5..873d1d105 100644
--- a/BTCPayServer/Views/Shared/EmailsBody.cshtml
+++ b/BTCPayServer/Views/Shared/EmailsBody.cshtml
@@ -1,35 +1,118 @@
 @model BTCPayServer.Models.ServerViewModels.EmailsViewModel
 
-
 <partial name="_StatusMessage" />
 
 <div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-
-<div class="row row-quick-fill" style="display: none">
-    <div class="col-sm-6">
-        <div class="dropdown quick-fill">
-            <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Quick fill settings for...
-            </button>
-            <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                <a class="dropdown-item" href="" data-Server="smtp.gmail.com" data-Port="587" data-EnableSSL="true">Gmail.com</a>
-                <a class="dropdown-item" href="" data-Server="mail.yahoo.com" data-Port="587" data-EnableSSL="true">Yahoo.com</a>
-                <a class="dropdown-item" href="" data-Server="smtp.mailgun.org" data-Port="587" data-EnableSSL="true">Mailgun</a>
-                <a class="dropdown-item" href="" data-Server="smtp.office365.com" data-Port="587" data-EnableSSL="true">Office365</a>
-                <a class="dropdown-item" href="" data-Server="smtp.sendgrid.net" data-Port="587" data-EnableSSL="true">SendGrid</a>
+    <div class="col-lg-6">
+        <div class="d-flex align-items-center justify-content-between mb-4">
+            <h2 class="mb-0">@ViewData["Title"]</h2>
+            <div class="dropdown quick-fill" style="display: none">
+                <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    Quick fill settings for...
+                </button>
+                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                    <a class="dropdown-item" href="" data-Server="smtp.gmail.com" data-Port="587" data-EnableSSL="true">Gmail.com</a>
+                    <a class="dropdown-item" href="" data-Server="mail.yahoo.com" data-Port="587" data-EnableSSL="true">Yahoo.com</a>
+                    <a class="dropdown-item" href="" data-Server="smtp.mailgun.org" data-Port="587" data-EnableSSL="true">Mailgun</a>
+                    <a class="dropdown-item" href="" data-Server="smtp.office365.com" data-Port="587" data-EnableSSL="true">Office365</a>
+                    <a class="dropdown-item" href="" data-Server="smtp.sendgrid.net" data-Port="587" data-EnableSSL="true">SendGrid</a>
+                </div>
             </div>
         </div>
-        <p></p>
     </div>
 </div>
+
+<form method="post" autocomplete="off">
+    <div class="row">
+        <div class="col-lg-6">
+            @if (!ViewContext.ModelState.IsValid)
+            {
+                <div asp-validation-summary="All" class="text-danger"></div>
+            }
+            <div class="form-group">
+                <label asp-for="Settings.Server"></label>
+                <input asp-for="Settings.Server" class="form-control"/>
+                <span asp-validation-for="Settings.Server" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.Port"></label>
+                <input asp-for="Settings.Port" class="form-control"/>
+                <span asp-validation-for="Settings.Port" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.FromDisplay"></label>
+                <input asp-for="Settings.FromDisplay" class="form-control"/>
+                <small class="form-text text-muted">
+                    Some email providers (like Gmail) don't allow you to set your display name, so this setting may not have any effect.
+                </small>
+                <span asp-validation-for="Settings.FromDisplay" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.From"></label>
+                <input asp-for="Settings.From" class="form-control"/>
+                <span asp-validation-for="Settings.From" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.Login"></label>
+                <input asp-for="Settings.Login" class="form-control"/>
+                <small class="form-text text-muted">
+                    For many email providers (like Gmail) your login is your email address.
+                </small>
+                <span asp-validation-for="Settings.Login" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                @if (!Model.PasswordSet)
+                {
+
+                    <label asp-for="Settings.Password"></label>
+                    <input asp-for="Settings.Password" type="password" class="form-control"/>
+                    <span asp-validation-for="Settings.Password" class="text-danger"></span>
+                }
+                else
+                {
+                    <label asp-for="Settings.Password"></label>
+                    <div class="input-group">
+                        <input value="Configured" type="text" readonly class="form-control"/>
+                        <div class="input-group-append">
+                            <button type="submit" class="btn btn-danger" name="command" value="ResetPassword">Reset</button>
+                        </div>
+                    </div>
+                }
+            </div>
+            <div class="form-group">
+                <div class="form-check">
+                    <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-input"/>
+                    <label asp-for="Settings.EnableSSL" class="form-check-label"></label>
+                </div>
+            </div>
+            <input asp-for="PasswordSet" type="hidden"/>
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
+        </div>
+    </div>
+
+    <hr class="mt-5 mb-4" />
+
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                <p class="form-text text-muted">
+                    If you want to test your settings, enter an email address here and click "Send Test Email".
+                    <strong>Your settings won't be saved</strong>, only a test email will be sent.
+                    <br />
+                    After a successful test, you can click "Save".
+                </p>
+                <label asp-for="TestEmail"></label>
+                <input asp-for="TestEmail" class="form-control" />
+                <span asp-validation-for="TestEmail" class="text-danger"></span>
+            </div>
+            <button type="submit" class="btn btn-secondary" name="command" value="Test">Send Test Email</button>
+        </div>
+    </div>
+</form>
+
 <script>
     $(document).ready(function () {
-        $('.row-quick-fill').show();
-
+        $('.dropdown.quick-fill').show();
         $('.dropdown.quick-fill a').click(function (e) {
             e.preventDefault();
 
@@ -55,94 +138,5 @@
                 }
             }
         });
-
     });
 </script>
-
-<form method="post" autocomplete="off">
-    <div class="row">
-        <div class="col-md-6">
-            <div class="form-group">
-                <label asp-for="Settings.Server"></label>
-                <input asp-for="Settings.Server" class="form-control" />
-                <span asp-validation-for="Settings.Server" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Settings.Port"></label>
-                <input asp-for="Settings.Port" class="form-control" />
-                <span asp-validation-for="Settings.Port" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Settings.FromDisplay"></label>
-                <input asp-for="Settings.FromDisplay" class="form-control" />
-                <small class="form-text text-muted">
-                    Some email providers (like Gmail) don't allow you to set your display name, so this setting may not have any effect.
-                </small>
-                <span asp-validation-for="Settings.FromDisplay" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Settings.From"></label>
-                <input asp-for="Settings.From" class="form-control" />
-                <span asp-validation-for="Settings.From" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Settings.Login"></label>
-                <input asp-for="Settings.Login" class="form-control" />
-                <small class="form-text text-muted">
-                    For many email providers (like Gmail) your login is your email address.
-                </small>
-                <span asp-validation-for="Settings.Login" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                @if (!Model.PasswordSet)
-                {
-
-                    <label asp-for="Settings.Password"></label>
-                    <input asp-for="Settings.Password" type="password" class="form-control" />
-                    <span asp-validation-for="Settings.Password" class="text-danger"></span>
-                }
-                else
-                {
-                    <label asp-for="Settings.Password"></label>
-                    <div class="input-group">
-                        <input value="Configured" type="text" readonly class="form-control" />
-                        <div class="input-group-append">
-                            <button type="submit" class="btn btn-danger" name="command" value="ResetPassword">Reset</button>
-                        </div>
-                    </div>
-                }
-            </div>
-            <div class="form-group">
-                <div class="form-check">
-                    <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-input" />
-                    <label asp-for="Settings.EnableSSL" class="form-check-label"></label>
-                </div>
-            </div>
-            <input asp-for="PasswordSet" type="hidden" />
-            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
-        </div>
-    </div>
-
-    <hr class="mt-5 mb-4" />
-
-    <div class="row">
-        <div class="col-md-6">
-            <div class="form-group">
-                <p class="form-text text-muted">
-                    If you want to test your settings, enter an email address here and click "Send Test Email".
-                    <strong>Your settings won't be saved</strong>, only a test email will be sent.
-                    <br />
-                    After a successful test, you can click "Save".
-                </p>
-                <label asp-for="TestEmail"></label>
-                <input asp-for="TestEmail" class="form-control" />
-                <span asp-validation-for="TestEmail" class="text-danger"></span>
-            </div>
-            <button type="submit" class="btn btn-secondary" name="command" value="Test">Send Test Email</button>
-        </div>
-    </div>
-</form>
-
-@section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
-}
diff --git a/BTCPayServer/Views/Shared/PostRedirect.cshtml b/BTCPayServer/Views/Shared/PostRedirect.cshtml
index b1bb2c2d0..781fc9cf7 100644
--- a/BTCPayServer/Views/Shared/PostRedirect.cshtml
+++ b/BTCPayServer/Views/Shared/PostRedirect.cshtml
@@ -24,7 +24,7 @@
             <input type="hidden" name="@o.Key" value="@o.Value"/>
         }
         <noscript>
-            <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-dialog modal-dialog-centered min-vh-100">
                 <div class="modal-content">
                     <div class="modal-body text-center my-3">
                         <p>
diff --git a/BTCPayServer/Views/Shared/_Layout.cshtml b/BTCPayServer/Views/Shared/_Layout.cshtml
index 50dad035e..54426fa78 100644
--- a/BTCPayServer/Views/Shared/_Layout.cshtml
+++ b/BTCPayServer/Views/Shared/_Layout.cshtml
@@ -13,23 +13,19 @@
 
 <!DOCTYPE html>
 <html lang="en"@(Env.IsDeveloping ? " data-devenv" : "")>
-
 <head>
     <partial name="Header" />
     @await RenderSectionAsync("HeadScripts", false)
     @await RenderSectionAsync("HeaderContent", false)
 </head>
-
 <body id="page-top">
-
-    @{
+@{
         if (ViewBag.AlwaysShrinkNavBar == null)
         {
             ViewBag.AlwaysShrinkNavBar = true;
         }
         var additionalStyle = ViewBag.AlwaysShrinkNavBar ? "navbar-shrink always-shrinked" : "";
     }
-
     <!-- Navigation -->
     <nav class="navbar navbar-expand-lg fixed-top @additionalStyle" id="mainNav">
         <div class="container px-sm-3">
@@ -133,5 +129,4 @@
         }
     </script>
 </body>
-
 </html>
diff --git a/BTCPayServer/Views/Shared/_NavLayout.cshtml b/BTCPayServer/Views/Shared/_NavLayout.cshtml
index d339d1dbd..2edf4b330 100644
--- a/BTCPayServer/Views/Shared/_NavLayout.cshtml
+++ b/BTCPayServer/Views/Shared/_NavLayout.cshtml
@@ -1,44 +1,57 @@
 @{
     Layout = "/Views/Shared/_Layout.cshtml";
     ViewBag.ShowMenu = ViewBag.ShowMenu ?? true;
+    ViewBag.ShowMainTitle = ViewBag.ShowMainTitle ?? true;
+    ViewBag.ShowBreadcrumb = ViewBag.ShowBreadcrumb ?? false;
     if (!ViewData.ContainsKey("NavPartialName"))
     {
         ViewData["NavPartialName"] = "_Nav";
     }
-    var title = $"{(ViewData.ContainsKey("MainTitle") ? $"{ViewData["MainTitle"]}:" : String.Empty)} {ViewData["Title"]}";
 }
 
 <section>
     <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                @if (ViewBag.ShowMenu)
-                {
-                    <h2>@title</h2>
-                    <hr class="primary ml-0">
-                }
-            </div>
-        </div>
-
-        <div>
-            <div class="row">
-                <div class="col-md-3">
-                    @if (ViewBag.ShowMenu)
+        @if (ViewBag.ShowBreadcrumb)
+        {
+            <nav aria-label="breadcrumb" class="mt-n3 mb-4">
+                <ol class="breadcrumb px-0">
+                    @if (!string.IsNullOrEmpty(ViewData["CategoryTitle"] as string))
                     {
-                        @await Html.PartialAsync(ViewData["NavPartialName"].ToString())
+                        <li class="breadcrumb-item" aria-current="page">@ViewData["CategoryTitle"]</li>
                     }
+                    @if (!string.IsNullOrEmpty(ViewData["MainTitle"] as string))
+                    {
+                        <li class="breadcrumb-item" aria-current="page">@ViewData["MainTitle"]</li>
+                    }
+                    @if (!string.IsNullOrEmpty(ViewData["PageTitle"] as string))
+                    {
+                        <li class="breadcrumb-item" aria-current="page">@ViewData["PageTitle"]</li>
+                    }
+                </ol>
+            </nav>
+        }
+        else if (!string.IsNullOrEmpty(ViewData["MainTitle"] as string))
+        {
+            <h2 class="mb-5">@ViewData["MainTitle"]</h2>
+        }
+        <div class="row">
+            @if (ViewBag.ShowMenu)
+            {
+                <div class="col-md-3 ml-n3 ml-md-0">
+                    <partial name="@ViewData["NavPartialName"].ToString()" />
                 </div>
-                <div class="col-md-9">
-                    @RenderBody()
-                </div>
+            }
+            <div class="col-md-9">
+                <partial name="_StatusMessage" />
+                @RenderBody()
             </div>
         </div>
     </div>
 </section>
-@section HeadScripts {
-    @RenderSection("HeadScripts", required: false)
-}
 
-@section Scripts {
-    @RenderSection("Scripts", required: false)
+@section HeadScripts {
+    @await RenderSectionAsync("HeadScripts", false)
+}
+@section Scripts {
+    @await RenderSectionAsync("Scripts", false)
 }
diff --git a/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml b/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml
index 71df8c719..3dad30786 100644
--- a/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml
+++ b/BTCPayServer/Views/Shopify/EditShopifyIntegration.cshtml
@@ -14,9 +14,11 @@
 <form method="post" id="shopifyForm">
     <h4 class="mb-3">
         Shopify
-        <a href="https://docs.btcpayserver.org/Shopify" target="_blank">
-            <span class="fa fa-question-circle-o" title="More information..."></span>
-        </a>
+        <small>
+            <a href="https://docs.btcpayserver.org/Shopify" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
+        </small>
     </h4>
     @if (!shopifyCredsSet)
     {
diff --git a/BTCPayServer/Views/Stores/AddLightningNode.cshtml b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
index ee14bffd9..949019e97 100644
--- a/BTCPayServer/Views/Stores/AddLightningNode.cshtml
+++ b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
@@ -1,12 +1,12 @@
 @model LightningNodeViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Add lightning node");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Lightning node settings", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage" />
+<h4 class="mb-3">@ViewData["PageTitle"]</h4>
 
-<div class="alert alert-warning alert-dismissible mb-5" role="alert">
+<div class="alert alert-warning alert-dismissible my-4" role="alert">
     <p class="mb-0">
         Please understand that the Lightning Network is still under active development and considered experimental.
         Before you proceed, take time to familiarize yourself with the risks.
@@ -122,5 +122,5 @@
 </form>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/CheckoutExperience.cshtml b/BTCPayServer/Views/Stores/CheckoutExperience.cshtml
index 29ab74977..80d6bed9a 100644
--- a/BTCPayServer/Views/Stores/CheckoutExperience.cshtml
+++ b/BTCPayServer/Views/Stores/CheckoutExperience.cshtml
@@ -2,23 +2,16 @@
 @model CheckoutExperienceViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Checkout, "Checkout experience");
-}
-
-<partial name="_StatusMessage" />
-
-@if (!ViewContext.ModelState.IsValid)
-{
-<div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+    ViewData.SetActivePageAndTitle(StoreNavPages.Checkout, "Checkout experience", Context.GetStoreData().StoreName);
 }
 
 <div class="row">
-    <div class="col-md-8">
+    <div class="col-lg-8">
         <form method="post">
+            @if (!ViewContext.ModelState.IsValid)
+            {
+                <div asp-validation-summary="All" class="text-danger"></div>
+            }
             <h4 class="mb-3">Payment</h4>
             @if (Model.PaymentMethods.Any())
             {
@@ -38,7 +31,7 @@
                         var criteria = Model.PaymentMethodCriteria[index];
                         <tr>
                             <td class="border-right-0 border-left-0 pt-3">
-                                <input type="hidden" asp-for="PaymentMethodCriteria[index].PaymentMethod" />
+                                <input type="hidden" asp-for="PaymentMethodCriteria[index].PaymentMethod"/>
                                 @PaymentMethodId.Parse(criteria.PaymentMethod).ToPrettyString()
                             </td>
                             <td class="border-right-0  border-left-0 ">
@@ -49,7 +42,7 @@
 
                             </td>
                             <td class="border-right-0  border-left-0">
-                                <input placeholder="6.15 USD" asp-for="PaymentMethodCriteria[index].Value" class="form-control my-0" style="max-width: 20ch;" />
+                                <input placeholder="6.15 USD" asp-for="PaymentMethodCriteria[index].Value" class="form-control my-0" style="max-width: 20ch;"/>
                             </td>
                         </tr>
                     }
@@ -58,25 +51,25 @@
 
             <div class="form-group">
                 <div class="form-check">
-                    <input asp-for="RequiresRefundEmail" type="checkbox" class="form-check-input" />
+                    <input asp-for="RequiresRefundEmail" type="checkbox" class="form-check-input"/>
                     <label asp-for="RequiresRefundEmail" class="form-check-label"></label>
                 </div>
             </div>
             <div class="form-group">
                 <div class="form-check">
-                    <input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check-input" />
+                    <input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check-input"/>
                     <label asp-for="LightningAmountInSatoshi" class="form-check-label"></label>
                 </div>
             </div>
             <div class="form-group">
                 <div class="form-check">
-                    <input asp-for="LightningPrivateRouteHints" type="checkbox" class="form-check-input" />
+                    <input asp-for="LightningPrivateRouteHints" type="checkbox" class="form-check-input"/>
                     <label asp-for="LightningPrivateRouteHints" class="form-check-label"></label>
                 </div>
             </div>
             <div class="form-group">
                 <div class="form-check">
-                    <input asp-for="OnChainWithLnInvoiceFallback" type="checkbox" class="form-check-input" />
+                    <input asp-for="OnChainWithLnInvoiceFallback" type="checkbox" class="form-check-input"/>
                     <label asp-for="OnChainWithLnInvoiceFallback" class="form-check-label"></label>
                 </div>
             </div>
@@ -94,14 +87,14 @@
             </div>
             <div class="form-group">
                 <div class="form-check">
-                    <input asp-for="ShowRecommendedFee" type="checkbox" class="form-check-input" />
+                    <input asp-for="ShowRecommendedFee" type="checkbox" class="form-check-input"/>
                     <label asp-for="ShowRecommendedFee" class="form-check-label"></label>
                     <p class="form-text text-muted">Fee will be shown for BTC and LTC onchain payments only.</p>
                 </div>
             </div>
             <div class="form-group">
                 <label asp-for="RecommendedFeeBlockTarget"></label>
-                <input asp-for="RecommendedFeeBlockTarget" class="form-control" style="width:8ch" />
+                <input asp-for="RecommendedFeeBlockTarget" class="form-control" style="width:8ch"/>
                 <span asp-validation-for="RecommendedFeeBlockTarget" class="text-danger"></span>
             </div>
 
@@ -112,19 +105,23 @@
             </div>
             <div class="form-group">
                 <label asp-for="HtmlTitle"></label>
-                <input asp-for="HtmlTitle" class="form-control" />
+                <input asp-for="HtmlTitle" class="form-control"/>
                 <span asp-validation-for="HtmlTitle" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="CustomLogo"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
-                <input asp-for="CustomLogo" class="form-control" />
+                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank">
+                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                </a>
+                <input asp-for="CustomLogo" class="form-control"/>
                 <span asp-validation-for="CustomLogo" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="CustomCSS"></label>
-                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
-                <input asp-for="CustomCSS" class="form-control" />
+                <a href="https://docs.btcpayserver.org/Theme/#checkout-page-themes" target="_blank">
+                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                </a>
+                <input asp-for="CustomCSS" class="form-control"/>
                 <span asp-validation-for="CustomCSS" class="text-danger"></span>
                 <p class="form-text text-muted">
                     Bundled Themes:
@@ -151,5 +148,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/CreateToken.cshtml b/BTCPayServer/Views/Stores/CreateToken.cshtml
index d28fceaa2..2033bd636 100644
--- a/BTCPayServer/Views/Stores/CreateToken.cshtml
+++ b/BTCPayServer/Views/Stores/CreateToken.cshtml
@@ -1,14 +1,14 @@
 @model CreateTokenViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Create a new token");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Create a new token", Context.GetStoreData()?.StoreName);
     ViewBag.HidePublicKey = ViewBag.HidePublicKey ?? false;
     ViewBag.ShowStores = ViewBag.ShowStores ?? false;
 }
 
-
 <div class="row">
-    <div class="col-md-6">
+    <div class="col-lg-6">
+        <h4 class="mb-4">@ViewData["PageTitle"]</h4>
         <form method="post">
             <div class="form-group">
                 <label asp-for="Label"></label>
diff --git a/BTCPayServer/Views/Stores/Emails.cshtml b/BTCPayServer/Views/Stores/Emails.cshtml
index 2155c5f75..af8fd1273 100644
--- a/BTCPayServer/Views/Stores/Emails.cshtml
+++ b/BTCPayServer/Views/Stores/Emails.cshtml
@@ -1,8 +1,11 @@
 @model BTCPayServer.Models.ServerViewModels.EmailsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store Email Settings");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Email Settings", Context.GetStoreData().StoreName);
 }
 
+<partial name="EmailsBody" model="Model" />
 
-<partial name="EmailsBody" model="@Model"/>
+@section Scripts {
+    <partial name="_ValidationScriptsPartial" />
+}
diff --git a/BTCPayServer/Views/Stores/GenerateWallet.cshtml b/BTCPayServer/Views/Stores/GenerateWallet.cshtml
index f0e9ca070..dbc952c3c 100644
--- a/BTCPayServer/Views/Stores/GenerateWallet.cshtml
+++ b/BTCPayServer/Views/Stores/GenerateWallet.cshtml
@@ -4,7 +4,7 @@
     var isHotWallet = Model.Method == WalletSetupMethod.HotWallet;
     var type = isHotWallet ? "Hot" : "Watch-Only";
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = $"Create {Model.CryptoCode} {type} Wallet";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, $"Create {Model.CryptoCode} {type} Wallet", Context.GetStoreData().StoreName);
     ViewData.Add(nameof(Model.CanUseHotWallet), Model.CanUseHotWallet);
     ViewData.Add(nameof(Model.CanUseRPCImport), Model.CanUseRPCImport);
     ViewData.Add(nameof(Model.Method), Model.Method);
@@ -18,9 +18,8 @@
 
 <h1 class="text-center">@ViewData["Title"]</h1>
 <br>
-
-@await Html.PartialAsync("_GenerateWalletForm", Model.SetupRequest)
+<partial name="_GenerateWalletForm" model="Model.SetupRequest" />
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml b/BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml
index 699a713f3..95c8ab873 100644
--- a/BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml
+++ b/BTCPayServer/Views/Stores/GenerateWalletOptions.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = $"Generate {Model.CryptoCode} Wallet";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, $"Generate {Model.CryptoCode} Wallet", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
diff --git a/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml b/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
index e4ca6b208..3de0b953b 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = "Confirm addresses";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, "Confirm addresses", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
@@ -104,8 +104,8 @@
 </form>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
-    @await Html.PartialAsync("VaultElements")
+    <partial name="_ValidationScriptsPartial" />
+    <partial name="VaultElements" />
 
     <script src="~/js/vaultbridge.js" type="text/javascript" defer asp-append-version="true"></script>
     <script src="~/js/vaultbridge.ui.js" type="text/javascript" defer asp-append-version="true"></script>
diff --git a/BTCPayServer/Views/Stores/ImportWallet/File.cshtml b/BTCPayServer/Views/Stores/ImportWallet/File.cshtml
index 8dc7e2636..db2cb38dc 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/File.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/File.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = "Import your wallet file";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, "Import your wallet file", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
diff --git a/BTCPayServer/Views/Stores/ImportWallet/Hardware.cshtml b/BTCPayServer/Views/Stores/ImportWallet/Hardware.cshtml
index 9d249a0ff..b62860527 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/Hardware.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/Hardware.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = "Connect your hardware wallet";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, "Connect your hardware wallet", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
@@ -79,8 +79,8 @@
 </form>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
-    @await Html.PartialAsync("VaultElements")
+    <partial name="_ValidationScriptsPartial" />
+    <partial name="VaultElements" />
 
     <script src="~/js/vaultbridge.js" defer asp-append-version="true"></script>
     <script src="~/js/vaultbridge.ui.js" defer asp-append-version="true"></script>
diff --git a/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml b/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml
index 919243c09..8d2355def 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/Scan.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = "Scan QR code";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, "Scan QR code", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
@@ -58,7 +58,7 @@
 
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     <bundle name="wwwroot/bundles/camera-bundle.min.js"></bundle>
     <link href="~/vendor/vue-qrcode-reader/vue-qrcode-reader.css" rel="stylesheet" asp-append-version="true"/>
diff --git a/BTCPayServer/Views/Stores/ImportWallet/Seed.cshtml b/BTCPayServer/Views/Stores/ImportWallet/Seed.cshtml
index 56bd9a525..7387e9fbe 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/Seed.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/Seed.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = "Enter the wallet seed";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, "Enter the wallet seed", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
@@ -23,7 +23,7 @@
         ViewData.Add(nameof(Model.CanUseRPCImport), Model.CanUseRPCImport);
         ViewData.Add(nameof(Model.Method), Model.Method);
 
-        @await Html.PartialAsync("_GenerateWalletForm", Model.SetupRequest)
+        <partial name="_GenerateWalletForm" model="Model.SetupRequest" />
     }
     else
     {
@@ -32,5 +32,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/ImportWallet/Xpub.cshtml b/BTCPayServer/Views/Stores/ImportWallet/Xpub.cshtml
index 9ad4e098c..be2453d26 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/Xpub.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/Xpub.cshtml
@@ -2,7 +2,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = $"Enter your extended public key";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, "Enter your extended public key", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
@@ -15,7 +15,9 @@
     <h1>@ViewData["Title"]</h1>
     <p class="lead text-secondary mt-3">
         This key, also called "xpub", is used to generate individual destination addresses for your invoices.
-        <a href="https://docs.btcpayserver.org/FAQ/FAQ-Wallet/#what-is-a-derivation-scheme" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+        <a href="https://docs.btcpayserver.org/FAQ/FAQ-Wallet/#what-is-a-derivation-scheme" target="_blank">
+            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+        </a>
     </p>
 </header>
 
@@ -108,7 +110,7 @@
 <a id="ToggleAdditional" href="#additional">Show multi-sig examples</a>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     <script type="text/javascript">
         document.getElementById('ToggleAdditional').addEventListener("click", function(e) {
diff --git a/BTCPayServer/Views/Stores/ImportWalletOptions.cshtml b/BTCPayServer/Views/Stores/ImportWalletOptions.cshtml
index af9e2a281..d48e9b38c 100644
--- a/BTCPayServer/Views/Stores/ImportWalletOptions.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWalletOptions.cshtml
@@ -3,7 +3,7 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = $"Import {Model.CryptoCode} Wallet";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, $"Import {Model.CryptoCode} Wallet", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
diff --git a/BTCPayServer/Views/Stores/Integrations.cshtml b/BTCPayServer/Views/Stores/Integrations.cshtml
index 62fdc9b9d..ec586e696 100644
--- a/BTCPayServer/Views/Stores/Integrations.cshtml
+++ b/BTCPayServer/Views/Stores/Integrations.cshtml
@@ -1,49 +1,31 @@
 @model IntegrationsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Integrations, "Integrations");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Integrations, "Integrations", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage"/>
-
-@if (!ViewContext.ModelState.IsValid)
-{
-    <div class="row">
-        <div class="col-md-6">
-            <div asp-validation-summary="All" class="text-danger"></div>
-        </div>
-    </div>
-}
-
-<ul class="list-group mb-3">
-    <vc:ui-extension-point location="store-integrations-list"></vc:ui-extension-point>
-</ul>
-
 <div class="row">
-    <div class="col-12">
-        <h4 class="mb-3 mt-5">
-            Other Integrations
-        </h4>
-        <p>
-            Take a look at documentation for the list of other integrations we support and the directions on how to enable them:
-            <ul>
-                <li>
-                    <a href="https://docs.btcpayserver.org/WooCommerce/" target="_blank">WooCommerce</a>
-                </li>
-                <li>
-                    <a href="https://docs.btcpayserver.org/Drupal/" target="_blank">Drupal</a>
-                </li>
-                <li>
-                    <a href="https://docs.btcpayserver.org/Magento/" target="_blank">Magento</a>
-                </li>
-                <li>
-                    <a href="https://docs.btcpayserver.org/PrestaShop/" target="_blank">PrestaShop</a>
-                </li>
-            </ul>
-        </p>
+    <div class="col-lg-8">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
+
+        <ul class="list-group mb-3">
+            <vc:ui-extension-point location="store-integrations-list"></vc:ui-extension-point>
+        </ul>
+
+        <h4 class="mt-5 mb-3">Other Integrations</h4>
+        <p>Take a look at documentation for the list of other integrations we support and the directions on how to enable them:</p>
+        <ul>
+            <li><a href="https://docs.btcpayserver.org/WooCommerce/" target="_blank">WooCommerce</a></li>
+            <li><a href="https://docs.btcpayserver.org/Drupal/" target="_blank">Drupal</a></li>
+            <li><a href="https://docs.btcpayserver.org/Magento/" target="_blank">Magento</a></li>
+            <li><a href="https://docs.btcpayserver.org/PrestaShop/" target="_blank">PrestaShop</a></li>
+        </ul>
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/ListTokens.cshtml b/BTCPayServer/Views/Stores/ListTokens.cshtml
index 841e428a2..4c62c3de5 100644
--- a/BTCPayServer/Views/Stores/ListTokens.cshtml
+++ b/BTCPayServer/Views/Stores/ListTokens.cshtml
@@ -1,10 +1,9 @@
 @model TokensViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Access Tokens");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Access Tokens", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage" />
 @if (Model.StoreNotConfigured)
 {
     <div class="alert alert-warning alert-dismissible mb-5" role="alert">
@@ -13,15 +12,22 @@
         See <a href="https://docs.btcpayserver.org/WalletSetup/" target="_blank" class="alert-link">this link</a> for more information on how to connect your store and wallet.
     </div>
 }
-<h4>Access token</h4>
+
 <div class="row">
-    <div class="col-md-8">
-        <p>Authorize a public key to access Bitpay compatible Invoice API (<a href="https://support.bitpay.com/hc/en-us/articles/115003001183-How-do-I-pair-my-client-and-create-a-token-">More information</a>)</p>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-8">
-        <a id="CreateNewToken" asp-action="CreateToken" class="btn btn-primary" role="button" asp-route-storeId="@this.Context.GetRouteValue("storeId")"><span class="fa fa-plus"></span> Create a new token</a>
+    <div class="col-lg-8">
+        <div class="d-flex align-items-center justify-content-between mb-3">
+            <h4 class="mb-0">@ViewData["PageTitle"]</h4>
+            <a id="CreateNewToken" asp-action="CreateToken" class="btn btn-primary" role="button" asp-route-storeId="@Context.GetRouteValue("storeId")">
+                <span class="fa fa-plus"></span>
+                Create a new token
+            </a>
+        </div>
+
+        <p>Authorize a public key to access Bitpay compatible Invoice API.
+            <a href="https://support.bitpay.com/hc/en-us/articles/115003001183-How-do-I-pair-my-client-and-create-a-token-" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
+        </p>
 
         @if (Model.Tokens.Any())
         {
@@ -38,26 +44,25 @@
                     <tr>
                         <td>@token.Label</td>
                         <td class="text-right">
-                            <a asp-action="ShowToken" asp-route-storeId="@this.Context.GetRouteValue("storeId")" asp-route-tokenId="@token.Id">See information</a> - <a asp-action="RevokeToken" asp-route-storeId="@this.Context.GetRouteValue("storeId")" asp-route-tokenId="@token.Id">Revoke</a>
+                            <a asp-action="ShowToken" asp-route-storeId="@Context.GetRouteValue("storeId")" asp-route-tokenId="@token.Id">See information</a> - <a asp-action="RevokeToken" asp-route-storeId="@this.Context.GetRouteValue("storeId")" asp-route-tokenId="@token.Id">Revoke</a>
                         </td>
                     </tr>
                 }
                 </tbody>
             </table>
         }
-    </div>
-</div>
-<hr class="my-5" />
-<h4>Legacy API Keys</h4>
-<div class="row">
-    <div class="col-md-8">
-        <p>Alternatively, you can use the invoice API by including the following HTTP Header in your requests:<br /> <code>Authorization: Basic @Model.EncodedApiKey</code> </p>
-    </div>
-</div>
+        else
+        {
+            <p class="text-secondary mt-3">
+                There are no access tokens yet.
+            </p>
+        }
 
-<div class="row">
-    <div class="col-md-8">
-        <form method="post" asp-action="GenerateAPIKey" asp-route-storeId="@this.Context.GetRouteValue("storeId")">
+        <h4 class="mt-5 mb-3">Legacy API Keys</h4>
+        <p>Alternatively, you can use the invoice API by including the following HTTP Header in your requests:</p>
+        <p><code>Authorization: Basic @Model.EncodedApiKey</code></p>
+
+        <form method="post" asp-action="GenerateAPIKey" asp-route-storeId="@Context.GetRouteValue("storeId")">
             <div class="form-group">
                 <label asp-for="ApiKey"></label>
                 <div class="input-group">
diff --git a/BTCPayServer/Views/Stores/ModifyWallet.cshtml b/BTCPayServer/Views/Stores/ModifyWallet.cshtml
index 23c5e70bb..884094a1c 100644
--- a/BTCPayServer/Views/Stores/ModifyWallet.cshtml
+++ b/BTCPayServer/Views/Stores/ModifyWallet.cshtml
@@ -1,7 +1,7 @@
 @model WalletSetupViewModel
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = $"Modify {Model.CryptoCode} Wallet";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, $"Modify {Model.CryptoCode} Wallet");
 }
 
 @section Navbar {
diff --git a/BTCPayServer/Views/Stores/ModifyWebhook.cshtml b/BTCPayServer/Views/Stores/ModifyWebhook.cshtml
index 4a3d74654..52bbc2ba1 100644
--- a/BTCPayServer/Views/Stores/ModifyWebhook.cshtml
+++ b/BTCPayServer/Views/Stores/ModifyWebhook.cshtml
@@ -2,15 +2,13 @@
 @using  BTCPayServer.Client.Models;
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Webhooks, "Webhooks");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Webhooks, "Webhook Settings", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage" />
-
 <div class="row">
-    <div class="col-md-8">
+    <div class="col-lg-8">
         <form method="post">
-            <h4 class="mb-3">Webhooks settings</h4>
+            <h4 class="mb-3">@ViewData["PageTitle"]</h4>
             <div class="form-group">
                 <label asp-for="PayloadUrl">Payload URL</label>
                 <input asp-for="PayloadUrl" class="form-control" />
@@ -136,7 +134,7 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 
     <script type="text/javascript">
         function toggleEventSelector() {
diff --git a/BTCPayServer/Views/Stores/PayButton.cshtml b/BTCPayServer/Views/Stores/PayButton.cshtml
index f9e01ce43..b88bcd5e0 100644
--- a/BTCPayServer/Views/Stores/PayButton.cshtml
+++ b/BTCPayServer/Views/Stores/PayButton.cshtml
@@ -1,13 +1,13 @@
 @model PayButtonViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.PayButton);
-    ViewData["Title"] = "Pay Button";
+    ViewData.SetActivePageAndTitle(StoreNavPages.PayButton, "Pay Button", Context.GetStoreData().StoreName);
 }
 
-<div class="container" id="payButtonCtrl">
+<div id="payButtonCtrl">
     <div class="row">
         <div class="col-lg-7">
+            <h4 class="mb-3">@ViewData["PageTitle"]</h4>
             <div class="form-row">
                 <div class="form-group col-md-8">
                     <label>Price</label>
@@ -42,9 +42,9 @@
             Clicking on the button will redirect customer to checkout.
         </div>
     </div>
-    <hr />
-    <h3>Pay button display options</h3>
-    <br />
+
+    <h4 class="mt-5 mb-3">Pay button display options</h4>
+
     <div class="row">
         <div class="col-lg-7">
             <div class="form-group"  v-if="!srvModel.appIdEndpoint">
@@ -151,18 +151,19 @@
             </div>
         </div>
         <div class="col-lg-5">
-            <h4>Preview</h4>
+            <h5 class="mb-3">Preview</h5>
             <div id="preview"></div>
+
             <div v-show="!srvModel.appIdEndpoint">
-                <h4 class="mt-2">Link</h4>
+                <h5 class="mt-4 mb-3">Link</h5>
                 <span>Alternatively, you can share this link or encode it in a QR code</span>
                 <div id="preview-link"></div>
             </div>
         </div>
     </div>
-    <hr />
-    <h3>Payment Notifications</h3>
-    <br />
+
+    <h4 class="mt-5 mb-3">Payment Notifications</h4>
+
     <div class="row">
         <div class="col-lg-7">
             <div class="form-group">
@@ -196,52 +197,52 @@
             Finally, <i>Browser Redirect</i> defines where BTCPayServer will redirect the customer after purchase is completed.
         </div>
     </div>
-     <h3>Advanced</h3>
-        <br />
-        <div class="row" v-if="!srvModel.appIdEndpoint">
-            <div class="col-lg-7">
-                <div class="form-group">
-                    <label>Checkout Additional Query String</label>
-                    <input name="checkoutQueryString" type="text" class="form-control" placeholder="(optional)"
-                           v-model="srvModel.checkoutQueryString" v-on:change="inputChanges"
-                           :class="{'is-invalid': errors.has('checkoutQueryString') }">
-                    <small class="text-danger">{{ errors.first('checkoutQueryString') }}</small>
-                </div>
-            </div>
-            <div class="col-lg-5">
-                <br />
-                This parameter allows you to specify additional query string parameters that should be appended to the checkout page once the invoice is created. For example, <kbd>lang=da-DK</kbd> would load the checkout page in Danish by default.
 
-            </div>
-        </div>  
-         <div class="row">
-            <div class="col-lg-7">
-                <div class="form-group">
-                    <label>Use App as endpoint</label>
-                    <select v-model="srvModel.appIdEndpoint" v-on:change="inputChanges" class="form-control">
-                        <option value="">Use default pay button endpoint</option>
-                        <option  v-for="app in srvModel.apps" v-bind:value="app.id" >{{app.appName}} ({{app.appType}})</option>
-                    </select>
-                    <small class="text-danger">{{ errors.first('appIdEndpoint') }}</small>
-                </div>
-                <div class="form-group" v-if="srvModel.appIdEndpoint">
-                    <label>App Item/Perk</label>
-                    <input name="appChoiceKey" type="text" class="form-control" placeholder="(optional)"
-                           v-model="srvModel.appChoiceKey" v-on:change="inputChanges"
-                           :class="{'is-invalid': errors.has('appChoiceKey') }">
-                    <small class="text-danger">{{ errors.first('appChoiceKey') }}</small>
-                </div>
-            </div>
-            <div class="col-lg-5">
-                <br />
-                This allows you to link this pay button to an app instead. Some features are disabled due to the different endpoint capabilities. You can set which perk/item this button should be targeting. 
+    <h4 class="mt-5 mb-3">Advanced options</h4>
 
+    <div class="row" v-if="!srvModel.appIdEndpoint">
+        <div class="col-lg-7">
+            <div class="form-group">
+                <label>Checkout Additional Query String</label>
+                <input name="checkoutQueryString" type="text" class="form-control" placeholder="(optional)"
+                       v-model="srvModel.checkoutQueryString" v-on:change="inputChanges"
+                       :class="{'is-invalid': errors.has('checkoutQueryString') }">
+                <small class="text-danger">{{ errors.first('checkoutQueryString') }}</small>
             </div>
         </div>
-    <hr />
-    <br />
+        <div class="col-lg-5">
+            <br />
+            This parameter allows you to specify additional query string parameters that should be appended to the checkout page once the invoice is created. For example, <kbd>lang=da-DK</kbd> would load the checkout page in Danish by default.
+
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-lg-7">
+            <div class="form-group">
+                <label>Use App as endpoint</label>
+                <select v-model="srvModel.appIdEndpoint" v-on:change="inputChanges" class="form-control">
+                    <option value="">Use default pay button endpoint</option>
+                    <option  v-for="app in srvModel.apps" v-bind:value="app.id" >{{app.appName}} ({{app.appType}})</option>
+                </select>
+                <small class="text-danger">{{ errors.first('appIdEndpoint') }}</small>
+            </div>
+            <div class="form-group" v-if="srvModel.appIdEndpoint">
+                <label>App Item/Perk</label>
+                <input name="appChoiceKey" type="text" class="form-control" placeholder="(optional)"
+                       v-model="srvModel.appChoiceKey" v-on:change="inputChanges"
+                       :class="{'is-invalid': errors.has('appChoiceKey') }">
+                <small class="text-danger">{{ errors.first('appChoiceKey') }}</small>
+            </div>
+        </div>
+        <div class="col-lg-5">
+            <br />
+            This allows you to link this pay button to an app instead. Some features are disabled due to the different endpoint capabilities. You can set which perk/item this button should be targeting.
+        </div>
+    </div>
+
+    <h4 class="mt-5 mb-3">Generated code</h4>
 
-    <h3>Generated code</h3>
     <div class="row" v-show="!errors.any()">
         <div class="col-lg-12">
             <pre><code id="mainCode" class="html"></code></pre>
@@ -261,12 +262,9 @@
 @section HeadScripts {
     <link rel="stylesheet" href="~/vendor/highlightjs/default.min.css" asp-append-version="true">
     <script src="~/vendor/highlightjs/highlight.min.js" asp-append-version="true"></script>
-
     <script src="~/vendor/vuejs/vue.js" asp-append-version="true"></script>
     <script src="~/vendor/vuejs-vee-validate/vee-validate.js" asp-append-version="true"></script>
-
     <script src="~/vendor/clipboard.js/clipboard.js" asp-append-version="true"></script>
-
     <script src="~/paybutton/paybutton.js" asp-append-version="true"></script>
 }
 
diff --git a/BTCPayServer/Views/Stores/PayButtonEnable.cshtml b/BTCPayServer/Views/Stores/PayButtonEnable.cshtml
index 6e06a3ff8..d90a587c2 100644
--- a/BTCPayServer/Views/Stores/PayButtonEnable.cshtml
+++ b/BTCPayServer/Views/Stores/PayButtonEnable.cshtml
@@ -1,23 +1,21 @@
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.PayButton, "Pay Button");
+    ViewData.SetActivePageAndTitle(StoreNavPages.PayButton, "Pay Button", Context.GetStoreData().StoreName);
 }
 
-
 <div class="row">
     <div class="col-md-10">
+        <h4 class="mb-3">@ViewData["PageTitle"]</h4>
+        <p>
+            To start using Pay Buttons you need to explicitly turn on this feature.
+            Once you do so, any 3rd party entity will be able to create an invoice on your instance store (via API for example).
+            The POS app is preauthorised and does not need this enabled.
+        </p>
         <form method="post">
-            <div class="form-group">
-                <p>
-                    To start using Pay Buttons you need to explicitly turn on this feature.
-                    Once you do so, any 3rd party entity will be able to create an invoice on your instance store (via API for example).
-                    The POS app is preauthorised and does not need this enabled.
-                </p>
-                @Html.Hidden("EnableStore", true)
-                <button name="command" type="submit" value="save" class="btn btn-lg btn-primary px-4">
-                    Allow outside world to create invoices via API
-                </button>
-            </div>
+            @Html.Hidden("EnableStore", true)
+            <button name="command" type="submit" value="save" class="btn btn-primary">
+                Allow outside world to create invoices via API
+            </button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Stores/Rates.cshtml b/BTCPayServer/Views/Stores/Rates.cshtml
index 5fb53817b..e8869fe42 100644
--- a/BTCPayServer/Views/Stores/Rates.cshtml
+++ b/BTCPayServer/Views/Stores/Rates.cshtml
@@ -1,23 +1,18 @@
 @model BTCPayServer.Models.StoreViewModels.RatesViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Rates, "Rates");
-}
-
-<partial name="_StatusMessage" />
-
-@if (!ViewContext.ModelState.IsValid)
-{
-<div class="row">
-    <div class="col-md-8">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
+    ViewData.SetActivePageAndTitle(StoreNavPages.Rates, "Rates", Context.GetStoreData().StoreName);
 }
 
 <div class="row">
-    <div class="col-md-8">
+    <div class="col-lg-8">
+        <h4 class="mb-3">@ViewData["PageTitle"]</h4>
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <form method="post">
+            <input type="hidden" asp-for="ShowScripting" />
             @if (Model.ShowScripting)
             {
                 <div class="form-group">
@@ -143,7 +138,9 @@
 
                 </div>
                 <div class="form-group">
-                    <label asp-for="Script"></label> <a href="#help" data-toggle="collapse"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                    <label asp-for="Script"></label> <a href="#help" data-toggle="collapse">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
                     <textarea asp-for="Script" rows="20" cols="80" class="form-control"></textarea>
                     <span asp-validation-for="Script" class="text-danger"></span>
                     <a href="#" onclick="$('#Script').val(defaultScript); return false;">Set to default settings</a>
@@ -162,9 +159,9 @@
                         Current Rates source is <a href="@Model.RateSource" target="_blank">@Model.PreferredExchange</a>.
                     </p>
                 </div>
-                <div class="form-group">
-                    <button type="submit" class="btn btn-link" value="scripting-on" name="command">Turn on advanced rate rule scripting</button>
-                </div>
+                <p>
+                    <button type="submit" class="btn btn-link p-0" value="scripting-on" name="command">Turn on advanced rate rule scripting</button>
+                </p>
             }
             <div class="form-group">
                 <label asp-for="Spread"></label>
@@ -176,34 +173,26 @@
                 </div>
                 <span asp-validation-for="Spread" class="text-danger"></span>
             </div>
+            <h4 class="mt-5 mb-3">Testing</h4>
+            <p>Enter currency pairs which you want to test against your rule (eg. <code>DOGE_USD,DOGE_CAD,BTC_CAD,BTC_USD</code>)</p>
             <div class="form-group">
-                <h5>Testing</h5>
-                <span>Enter currency pairs which you want to test against your rule (eg. <code>DOGE_USD,DOGE_CAD,BTC_CAD,BTC_USD</code>)</span>
-                <div class="input-group">
-                    <input placeholder="BTC_USD, BTC_CAD" asp-for="ScriptTest" class="form-control" />
-                    <span class="input-group-btn">
-                        <button name="command" value="Test" type="submit" class="btn btn-primary" title="Test">
-                            <span class="fa fa-vial"></span> Test
-                        </button>
-                    </span>
-                </div>
+                <input placeholder="BTC_USD, BTC_CAD" asp-for="ScriptTest" class="form-control" />
                 <span asp-validation-for="ScriptTest" class="text-danger"></span>
             </div>
+            <button name="command" value="Test" type="submit" class="btn btn-primary" title="Test">Test</button>
+
+            <h4 class="mt-5 mb-3">Default currency pairs</h4>
+            <p>You can query those pairs via REST by querying <a asp-controller="Rate" asp-action="GetRates2" asp-route-storeId="@Model.StoreId" target="_blank">this link</a> without the need to specify currencyPairs.</p>
             <div class="form-group">
-                <h5>Default currency pairs</h5>
-                <span>You can query those pairs via REST by querying <a asp-controller="Rate" asp-action="GetRates2" asp-route-storeId="@Model.StoreId" target="_blank">this link</a> without the need to specify currencyPairs.</span>
-                <div class="input-group">
-                    <input placeholder="BTC_USD, BTC_CAD" asp-for="DefaultCurrencyPairs" class="form-control" />
-                </div>
+                <input placeholder="BTC_USD, BTC_CAD" asp-for="DefaultCurrencyPairs" class="form-control" />
                 <span asp-validation-for="DefaultCurrencyPairs" class="text-danger"></span>
             </div>
             <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
-            <input type="hidden" asp-for="ShowScripting" />
         </form>
     </div>
 </div>
 
 @section Scripts {
     <script type="text/javascript">var defaultScript = @Safe.Json(Model.DefaultScript);</script>
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/RequestPairing.cshtml b/BTCPayServer/Views/Stores/RequestPairing.cshtml
index c59b3f272..229fb2214 100644
--- a/BTCPayServer/Views/Stores/RequestPairing.cshtml
+++ b/BTCPayServer/Views/Stores/RequestPairing.cshtml
@@ -1,47 +1,36 @@
 @model PairingModel
 @{
-    ViewData["Title"] = "Pairing permission";
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Pairing permission", Context.GetStoreData()?.StoreName);
 }
 
-<section>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-                <p>Create and manage store settings.</p>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-4"></div>
-            <div class="col-md-4">
-                <table class="table table-sm table-responsive-md">
-                    <tr>
-                        <th>Label</th>
-                        <td style="text-align:right;">@Model.Label</td>
-                    </tr>
-                    <tr>
-                        <th>SIN</th>
-                        <td style="text-align:right;">@Model.SIN</td>
-                    </tr>
-                </table>
-            </div>
-            <div class="col-md-4"></div>
-        </div>
-        <div class="row">
-            <div class="col-md-4"></div>
-            <div class="col-md-4">
-                <form asp-action="Pair" method="post">
-                    <div class="form-group">
-                        <label asp-for="StoreId"></label>
-                        <select asp-for="StoreId" asp-items="@(new SelectList(Model.Stores,"Id","Name"))" class="form-control"></select>
-                        <span asp-validation-for="StoreId" class="text-danger"></span>
-                    </div>
-                    <input type="hidden" name="pairingCode" value="@Model.Id" />
-                    <button id="ApprovePairing" type="submit" class="btn btn-primary" title="Approve this pairing demand">Approve</button>
-                </form>
-            </div>
-            <div class="col-md-4"></div>
-        </div>
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
+<p class="mb-0">Create and manage store settings.</p>
+
+<div class="row">
+    <div class="col-md-4">
+        <table class="table table-sm removetopborder">
+            <tr>
+                <th>Label</th>
+                <td class="text-right">@Model.Label</td>
+            </tr>
+            <tr>
+                <th>SIN</th>
+                <td class="text-right">@Model.SIN</td>
+            </tr>
+        </table>
     </div>
-</section>
+</div>
+<div class="row">
+    <div class="col-md-4">
+        <form asp-action="Pair" method="post">
+            <div class="form-group">
+                <label asp-for="StoreId"></label>
+                <select asp-for="StoreId" asp-items="@(new SelectList(Model.Stores,"Id","Name"))" class="form-control"></select>
+                <span asp-validation-for="StoreId" class="text-danger"></span>
+            </div>
+            <input type="hidden" name="pairingCode" value="@Model.Id" />
+            <button id="ApprovePairing" type="submit" class="btn btn-primary" title="Approve this pairing demand">Approve</button>
+        </form>
+    </div>
+</div>
diff --git a/BTCPayServer/Views/Stores/SetupWallet.cshtml b/BTCPayServer/Views/Stores/SetupWallet.cshtml
index 805475db4..458108b00 100644
--- a/BTCPayServer/Views/Stores/SetupWallet.cshtml
+++ b/BTCPayServer/Views/Stores/SetupWallet.cshtml
@@ -1,7 +1,7 @@
 @model WalletSetupViewModel
 @{
     Layout = "_LayoutWalletSetup";
-    ViewData["Title"] = $"Setup {Model.CryptoCode} Wallet";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, $"Setup {Model.CryptoCode} Wallet", Context.GetStoreData().StoreName);
 }
 
 @section Navbar {
diff --git a/BTCPayServer/Views/Stores/ShowToken.cshtml b/BTCPayServer/Views/Stores/ShowToken.cshtml
index 0c7b18e0b..a757b17c4 100644
--- a/BTCPayServer/Views/Stores/ShowToken.cshtml
+++ b/BTCPayServer/Views/Stores/ShowToken.cshtml
@@ -1,9 +1,11 @@
 @model BTCPayServer.Security.Bitpay.BitTokenEntity
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Access Tokens");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Access Tokens", Context.GetStoreData().StoreName);
 }
 
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
 <div class="row">
     <div class="col-md-8">
         <h5>Token information</h5>
diff --git a/BTCPayServer/Views/Stores/StoreNavPages.cs b/BTCPayServer/Views/Stores/StoreNavPages.cs
index e20293378..af3bb5003 100644
--- a/BTCPayServer/Views/Stores/StoreNavPages.cs
+++ b/BTCPayServer/Views/Stores/StoreNavPages.cs
@@ -2,6 +2,6 @@ namespace BTCPayServer.Views.Stores
 {
     public enum StoreNavPages
     {
-        ActivePage, Index, Rates, Checkout, Tokens, Users, PayButton, Integrations, Webhooks
+        Index, Create, Rates, Checkout, Tokens, Users, PayButton, Integrations, Wallet, Webhooks, ActivePage
     }
 }
diff --git a/BTCPayServer/Views/Stores/StoreUsers.cshtml b/BTCPayServer/Views/Stores/StoreUsers.cshtml
index 24d31e769..2f7d79ec7 100644
--- a/BTCPayServer/Views/Stores/StoreUsers.cshtml
+++ b/BTCPayServer/Views/Stores/StoreUsers.cshtml
@@ -1,28 +1,23 @@
 @model StoreUsersViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Users, "Manage users");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Users, "Manage users", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage" />
 
-@if (!ViewContext.ModelState.IsValid)
-{
 <div class="row">
-    <div class="col-md-6">
-        <div asp-validation-summary="All" class="text-danger"></div>
-    </div>
-</div>
-}
-<div class="row">
-    <div class="col-md-8">
-        <div class="form-group">
-            <h5>Users</h5>
-            <span>
-                Add access to your store to other users (Guest will not be able to see and modify the store settings)<br />
-                Note that the user must have a registered account on this BTCPay Server.
-            </span>
-        </div>
+    <div class="col-lg-8">
+        <h4 class="mb-3">@ViewData["PageTitle"]</h4>
+        <p>
+            Add access to your store to other users (Guest will not be able to see and modify the store settings)<br/>
+            Note that the user must have a registered account on this BTCPay Server.
+        </p>
+
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
+
         <div class="form-inline">
             <form method="post">
                 <input asp-for="Email" type="text" class="form-control" placeholder="user@example.com">
@@ -36,23 +31,23 @@
         <div class="form-group">
             <table class="table table-sm table-responsive-md">
                 <thead>
-                    <tr>
-                        <th>Email</th>
-                        <th>Role</th>
-                        <th style="text-align:right">Actions</th>
-                    </tr>
+                <tr>
+                    <th>Email</th>
+                    <th>Role</th>
+                    <th style="text-align:right">Actions</th>
+                </tr>
                 </thead>
                 <tbody>
-                    @foreach (var user in Model.Users)
-                    {
-                        <tr>
-                            <td>@user.Email</td>
-                            <td>@user.Role</td>
-                            <td style="text-align:right">
-                                <a asp-action="DeleteStoreUser" asp-route-storeId="@Model.StoreId" asp-route-userId="@user.Id">Remove</a>
-                            </td>
-                        </tr>
-                    }
+                @foreach (var user in Model.Users)
+                {
+                    <tr>
+                        <td>@user.Email</td>
+                        <td>@user.Role</td>
+                        <td style="text-align:right">
+                            <a asp-action="DeleteStoreUser" asp-route-storeId="@Model.StoreId" asp-route-userId="@user.Id">Remove</a>
+                        </td>
+                    </tr>
+                }
                 </tbody>
             </table>
         </div>
diff --git a/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml b/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
index af3680fe8..aca76b750 100644
--- a/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
@@ -2,10 +2,10 @@
 @model UpdateCoinSwitchSettingsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store CoinSwitch Settings");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store CoinSwitch Settings", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage"  />
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <div class="row">
     <div class="col-md-10">
@@ -44,5 +44,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index fcec15e0e..012887e64 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -2,22 +2,15 @@
 @model StoreViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Index, Model.StoreName);
-}
-
-<partial name="_StatusMessage" />
-
-@if (!ViewContext.ModelState.IsValid)
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div asp-validation-summary="All" class="text-danger"></div>
-        </div>
-    </div>
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "General Settings", Context.GetStoreData().StoreName);
 }
 
 <div class="row">
     <div class="col-lg-10 col-xl-9">
+        @if (!ViewContext.ModelState.IsValid)
+        {
+            <div asp-validation-summary="All" class="text-danger"></div>
+        }
         <div class="mb-5">
             <h4 class="mb-3">Wallet</h4>
             @if (Model.HintWallet)
@@ -144,7 +137,7 @@
             </ul>
         </div>
 
-        <form method="post" class="mb-5">
+        <form method="post">
             <h4 class="mb-3">General</h4>
             <div class="form-group">
                 <label asp-for="Id"></label>
@@ -166,20 +159,26 @@
                 <div class="form-check">
                     <input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="form-check-input" />
                     <label asp-for="AnyoneCanCreateInvoice" class="form-check-label"></label>
-                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#allow-anyone-to-create-invoice" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#allow-anyone-to-create-invoice" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
                 </div>
             </div>
             <div class="form-group">
                 <div class="form-check">
                     <input asp-for="PayJoinEnabled" type="checkbox" class="form-check-input" />
                     <label asp-for="PayJoinEnabled" class="form-check-label"></label>
-                    <a href="https://docs.btcpayserver.org/Payjoin/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                    <a href="https://docs.btcpayserver.org/Payjoin/" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
                     <span asp-validation-for="PayJoinEnabled" class="text-danger"></span>
                 </div>
             </div>
             <div class="form-group">
                 <label asp-for="NetworkFeeMode"></label>
-                <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank">
+                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                </a>
                 <select asp-for="NetworkFeeMode" class="form-control">
                     <option value="MultiplePaymentsOnly">... only if the customer makes more than one payment for the invoice</option>
                     <option value="Always">... on every payment</option>
@@ -189,7 +188,9 @@
             <div class="form-group">
                 <div class="mb-2">
                     <label asp-for="InvoiceExpiration" class="d-inline"></label>
-                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#invoice-expires-if-the-full-amount-has-not-been-paid-after-minutes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#invoice-expires-if-the-full-amount-has-not-been-paid-after-minutes" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
                 </div>
                 <div class="input-group">
                     <input asp-for="InvoiceExpiration" class="form-control" style="max-width:10ch;" />
@@ -202,7 +203,9 @@
             <div class="form-group">
                 <div class="mb-2">
                     <label asp-for="MonitoringExpiration" class="d-inline"></label>
-                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#payment-invalid-if-transactions-fails-to-confirm-minutes-after-invoice-expiration" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#payment-invalid-if-transactions-fails-to-confirm-minutes-after-invoice-expiration" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
                 </div>
                 <div class="input-group">
                     <input asp-for="MonitoringExpiration" class="form-control" style="max-width:10ch;" />
@@ -215,7 +218,9 @@
             <div class="form-group">
                 <div class="mb-2">
                     <label asp-for="PaymentTolerance" class="d-inline"></label>
-                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-paid-even-if-the-paid-amount-is-less-than-expected" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+                    <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-paid-even-if-the-paid-amount-is-less-than-expected" target="_blank">
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                    </a>
                 </div>
                 <div class="input-group">
                     <input asp-for="PaymentTolerance" class="form-control" style="max-width:10ch;" />
@@ -229,7 +234,7 @@
                 <div class="mb-2">
                     <label asp-for="SpeedPolicy" class="d-inline"></label>
                     <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank">
-                        <span class="fa fa-question-circle-o" title="More information..."></span>
+                        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                     </a>
                 </div>
                 <script>
@@ -261,7 +266,7 @@
             <button name="command" type="submit" class="btn btn-primary" value="Save" id="Save">Save Store Settings</button>
         </form>
 
-        <h4 class="mb-3">Additional payment methods</h4>
+        <h4 class="mt-5 mb-3">Additional payment methods</h4>
         <div class="table-responsive-md">
             <table class="table table-sm mt-1 mb-5">
                 <thead>
@@ -335,5 +340,5 @@
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/Webhooks.cshtml b/BTCPayServer/Views/Stores/Webhooks.cshtml
index 56956bb44..6b4d0faec 100644
--- a/BTCPayServer/Views/Stores/Webhooks.cshtml
+++ b/BTCPayServer/Views/Stores/Webhooks.cshtml
@@ -1,21 +1,20 @@
 @model WebhooksViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(StoreNavPages.Webhooks, "Webhooks");
+    ViewData.SetActivePageAndTitle(StoreNavPages.Webhooks, "Webhooks", Context.GetStoreData().StoreName);
 }
 
-<partial name="_StatusMessage" />
-
-<h4>Webhooks</h4>
 <div class="row">
-    <div class="col-md-8">
-        <p>Webhooks allows BTCPayServer to send HTTP events related to your store</p>
-    </div>
-</div>
+    <div class="col-lg-8">
+        <div class="d-flex align-items-center justify-content-between mb-3">
+            <h4 class="mb-0">@ViewData["PageTitle"]</h4>
+            <a id="CreateWebhook" asp-action="NewWebhook" class="btn btn-primary" role="button" asp-route-storeId="@Context.GetRouteValue("storeId")">
+                <span class="fa fa-plus"></span>
+                Create a new webhook
+            </a>
+        </div>
+        <p>Webhooks allow BTCPay Server to send HTTP events related to your store to another server.</p>
 
-<div class="row">
-    <div class="col-md-8">
-        <a id="CreateWebhook" asp-action="NewWebhook" class="btn btn-primary" role="button" asp-route-storeId="@this.Context.GetRouteValue("storeId")"><span class="fa fa-plus"></span> Create a new webhook</a>
         @if (Model.Webhooks.Any())
         {
             <table class="table table-sm table-responsive-md">
@@ -38,9 +37,15 @@
                 </tbody>
             </table>
         }
+        else
+        {
+            <p class="text-secondary mt-3">
+                There are no webhooks yet.
+            </p>
+        }
     </div>
 </div>
 
 @section Scripts {
-    @await Html.PartialAsync("_ValidationScriptsPartial")
+    <partial name="_ValidationScriptsPartial" />
 }
diff --git a/BTCPayServer/Views/Stores/_LayoutWalletSetup.cshtml b/BTCPayServer/Views/Stores/_LayoutWalletSetup.cshtml
index ff57f2901..618a89d92 100644
--- a/BTCPayServer/Views/Stores/_LayoutWalletSetup.cshtml
+++ b/BTCPayServer/Views/Stores/_LayoutWalletSetup.cshtml
@@ -1,6 +1,5 @@
 @{
     Layout = "_LayoutSimple";
-    ViewData["Title"] = ViewData["Title"] ?? "Wallet Setup";
 }
 
 @section HeadScripts {
@@ -24,10 +23,7 @@
 
 <div class="row justify-content-md-center mt-5 pt-sm-3 pt-md-0">
     <main class="col-md-10 col-lg-8 col-xl-7">
-        @if (TempData.HasStatusMessage())
-        {
-            <partial name="_StatusMessage"/>
-        }
+        <partial name="_StatusMessage" />
         @RenderBody()
     </main>
 </div>
diff --git a/BTCPayServer/Views/Stores/_Nav.cshtml b/BTCPayServer/Views/Stores/_Nav.cshtml
index 43ae7b24b..236050e30 100644
--- a/BTCPayServer/Views/Stores/_Nav.cshtml
+++ b/BTCPayServer/Views/Stores/_Nav.cshtml
@@ -1,4 +1,4 @@
-<div class="nav flex-column nav-pills mb-4">
+<div class="nav flex-column mb-4">
     <a id="@(nameof(StoreNavPages.Index))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Index)" asp-controller="Stores" asp-action="UpdateStore" asp-route-storeId="@this.Context.GetRouteValue("storeId")">General settings</a>
     <a id="@(nameof(StoreNavPages.Rates))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Rates)" asp-controller="Stores" asp-action="Rates" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Rates</a>
     <a id="@(nameof(StoreNavPages.Checkout))" class="nav-link @ViewData.IsActivePage(StoreNavPages.Checkout)" asp-controller="Stores" asp-action="CheckoutExperience" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Checkout experience</a>
diff --git a/BTCPayServer/Views/Stores/_ViewStart.cshtml b/BTCPayServer/Views/Stores/_ViewStart.cshtml
index a6dad0b9a..c05e6d077 100644
--- a/BTCPayServer/Views/Stores/_ViewStart.cshtml
+++ b/BTCPayServer/Views/Stores/_ViewStart.cshtml
@@ -2,6 +2,6 @@
 @using BTCPayServer.Views.Stores
 
 @{
-    ViewBag.MainTitle = "Manage store";
+    ViewBag.CategoryTitle = "Stores";
     ViewData.SetActiveCategory(typeof(StoreNavPages));
 }
diff --git a/BTCPayServer/Views/UserStores/CreateStore.cshtml b/BTCPayServer/Views/UserStores/CreateStore.cshtml
index 019998cea..068dd0912 100644
--- a/BTCPayServer/Views/UserStores/CreateStore.cshtml
+++ b/BTCPayServer/Views/UserStores/CreateStore.cshtml
@@ -1,18 +1,15 @@
 @model BTCPayServer.Models.StoreViewModels.CreateStoreViewModel
 @{
-    ViewData["Title"] = "Create a new store";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Create, "Create a new store");
 }
 
 <section>
     <div class="container">
+        <partial name="_StatusMessage" />
+
+        <h2 class="mb-4">@ViewData["PageTitle"]</h2>
         <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
+            <div class="col-lg-6">
                 <form asp-action="CreateStore">
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     <div class="form-group">
@@ -22,9 +19,9 @@
                     </div>
                     <div class="form-group">
                         <input type="submit" value="Create" class="btn btn-primary" id="Create" />
+                        <a asp-action="ListStores" class="text-muted ml-3">Back to list</a>
                     </div>
                 </form>
-                <a asp-action="ListStores">Back to List</a>
             </div>
         </div>
     </div>
diff --git a/BTCPayServer/Views/UserStores/ListStores.cshtml b/BTCPayServer/Views/UserStores/ListStores.cshtml
index 543b5b2f9..5ed5b3a32 100644
--- a/BTCPayServer/Views/UserStores/ListStores.cshtml
+++ b/BTCPayServer/Views/UserStores/ListStores.cshtml
@@ -1,6 +1,6 @@
 @model StoresViewModel
 @{
-    ViewData["Title"] = "Stores";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Stores");
     var storeNameSortOrder = (string)ViewData["StoreNameSortOrder"];
     var storeWebsiteSortOrder = (string)ViewData["StoreWebsiteSortOrder"];
     var sortByDesc = "Sort by descending...";
@@ -9,33 +9,18 @@
 
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
-        <div class="row">
-            <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-                <p>Create and manage store settings.</p>
-            </div>
-        </div>
+        <partial name="_StatusMessage" />
 
-        <div class="row button-row">
-            <div class="col-lg-12 mb-3">
-                <a asp-action="CreateStore" class="btn btn-primary" role="button" id="CreateStore"><span class="fa fa-plus"></span> Create a new store</a>
-            </div>
+        <div class="d-sm-flex align-items-center justify-content-between mb-2">
+            <h2 class="mb-0">@ViewData["PageTitle"]</h2>
+            <a asp-action="CreateStore" class="btn btn-primary mt-3 mt-sm-0" role="button" id="CreateStore"><span class="fa fa-plus"></span> Create a new store</a>
         </div>
 
         <div class="row">
             <div class="col-lg-12">
                 @if (Model.Stores.Any())
                 {
-                    <table class="table table-sm table-responsive-md">
+                    <table class="table table-sm">
                         <thead>
                             <tr>
                                 <th>
diff --git a/BTCPayServer/Views/UserStores/_ViewImports.cshtml b/BTCPayServer/Views/UserStores/_ViewImports.cshtml
new file mode 100644
index 000000000..2ee48f0d5
--- /dev/null
+++ b/BTCPayServer/Views/UserStores/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using BTCPayServer.Views.Stores
+@using BTCPayServer.Models.StoreViewModels
diff --git a/BTCPayServer/Views/ViewsRazor.cs b/BTCPayServer/Views/ViewsRazor.cs
index 44157b84f..622861ade 100644
--- a/BTCPayServer/Views/ViewsRazor.cs
+++ b/BTCPayServer/Views/ViewsRazor.cs
@@ -10,10 +10,15 @@ namespace BTCPayServer.Views
         private const string ACTIVE_CATEGORY_KEY = "ActiveCategory";
         private const string ACTIVE_PAGE_KEY = "ActivePage";
 
-        public static void SetActivePageAndTitle<T>(this ViewDataDictionary viewData, T activePage, string title = null)
+        public static void SetActivePageAndTitle<T>(this ViewDataDictionary viewData, T activePage, string title = null, string mainTitle = null)
             where T : IConvertible
         {
+            // Browser Title
             viewData["Title"] = title ?? activePage.ToString();
+            // Breadcrumb
+            viewData["MainTitle"] = mainTitle;
+            viewData["PageTitle"] = title;
+            // Navigation
             viewData[ACTIVE_PAGE_KEY] = activePage;
             SetActiveCategory(viewData, activePage.GetType());
         }
diff --git a/BTCPayServer/Views/Wallets/ListWallets.cshtml b/BTCPayServer/Views/Wallets/ListWallets.cshtml
index ca712a11f..0a4b098ee 100644
--- a/BTCPayServer/Views/Wallets/ListWallets.cshtml
+++ b/BTCPayServer/Views/Wallets/ListWallets.cshtml
@@ -1,24 +1,22 @@
 @model BTCPayServer.Models.WalletViewModels.ListWalletsViewModel
 @{
-    ViewData["Title"] = "Wallets";
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Index, "Wallets");
 }
 
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage" />
-                </div>
-            </div>
-        }
+        <partial name="_StatusMessage" />
 
         <div class="row">
             <div class="col-lg-12 section-heading">
-                <h2>@ViewData["Title"]</h2>
-                <hr class="primary">
-                <p>Connect and manage wallets. <a href="https://docs.btcpayserver.org/Wallet/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a></p>
+                <h2>
+                    @ViewData["Title"]
+                    <small>
+                        <a href="https://docs.btcpayserver.org/Wallet/" target="_blank">
+                            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+                        </a>
+                    </small>
+                </h2>
             </div>
         </div>
 
diff --git a/BTCPayServer/Views/Wallets/NewPullPayment.cshtml b/BTCPayServer/Views/Wallets/NewPullPayment.cshtml
index 0b6de6c66..bd390f4e2 100644
--- a/BTCPayServer/Views/Wallets/NewPullPayment.cshtml
+++ b/BTCPayServer/Views/Wallets/NewPullPayment.cshtml
@@ -1,8 +1,9 @@
 @model NewPullPaymentModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "New pull payment";
+    ViewData.SetActivePageAndTitle(WalletsNavPages.PullPayments, "New pull payment", Context.GetStoreData().StoreName);
 }
+
 <style type="text/css">
     .smMaxWidth {
         max-width: 200px;
@@ -47,19 +48,14 @@
         }
 </style>
 
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-12 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
-}
+<partial name="_StatusMessage" />
 
 <div class="row">
     <div class="col-md-6">
+        <h4 class="mb-3">@ViewData["Title"]</h4>
+
         <form method="post"
-              asp-route-walletId="@this.Context.GetRouteValue("walletId")"
+              asp-route-walletId="@Context.GetRouteValue("walletId")"
               asp-action="NewPullPayment">
             <div class="form-group">
                 <label asp-for="Name" class="control-label"></label>
@@ -81,7 +77,7 @@
             <div class="form-group">
                 <label asp-for="CustomCSSLink" class="control-label"></label>
                 <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank">
-                    <span class="fa fa-question-circle-o" title="More information..."></span>
+                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                 </a>
                 <input asp-for="CustomCSSLink" class="form-control" />
                 <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
@@ -93,6 +89,7 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-primary" id="Create" />
+                <a asp-action="PullPayments" asp-route-walletId="@Context.GetRouteValue("walletId")" class="text-muted ml-3">Back to list</a>
             </div>
         </form>
     </div>
diff --git a/BTCPayServer/Views/Wallets/Payouts.cshtml b/BTCPayServer/Views/Wallets/Payouts.cshtml
index 5b2c54782..2ce5366b5 100644
--- a/BTCPayServer/Views/Wallets/Payouts.cshtml
+++ b/BTCPayServer/Views/Wallets/Payouts.cshtml
@@ -1,33 +1,21 @@
 @model PayoutsModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Manage payouts";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Payouts);
-}
-
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-12 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Payouts, "Manage payouts", Context.GetStoreData().StoreName);
 }
 
 <script type="text/javascript">
     function selectAll(e)
     {
-        var items = document.getElementsByClassName("selection-item");
-        for (var i = 0; i < items.length; i++) {
+        const items = document.getElementsByClassName("selection-item");
+        for (let i = 0; i < items.length; i++) {
             items[i].checked = e.checked;
         }
     }
 </script>
 <form method="post">
+    <h4 class="mb-3">Payouts to process</h4>
     <div class="row button-row">
-        <div class="col">
-            <h4 class="mb-3">Payouts to process</h4>
-        </div>
         @if (Model.WaitingForApproval.Any())
         {
             <div class="col text-right">
@@ -51,7 +39,7 @@
                     </tr>
                     </thead>
                     <tbody>
-                    @for (int i = 0; i < Model.WaitingForApproval.Count; i++)
+                    @for (var i = 0; i < Model.WaitingForApproval.Count; i++)
                     {
                         var pp = Model.WaitingForApproval[i];
                         <tr>
@@ -72,24 +60,20 @@
             }
             else
             {
-                <p class="mb-0">No payout waiting for approval.</p>
+                <p class="text-secondary mb-0">No payout waiting for approval.</p>
             }
         </div>
     </div>
 
-    <hr class="my-4"/>
-
+    <h4 class="mt-5 mb-3">Completed payouts</h4>
     <div class="row">
         <div class="col-md-12">
-            <h4 class="mb-3">Completed payouts</h4>
             @if (Model.Other.Any())
             {
                 <table class="table table-sm table-responsive-lg">
                     <thead class="thead-inverse">
                         <tr>
-                            <th style="min-width: 90px;" class="col-md-auto">
-                                Date
-                            </th>
+                            <th style="min-width: 90px;" class="col-md-auto">Date</th>
                             <th class="text-left">Source</th>
                             <th class="text-left">Destination</th>
                             <th class="text-right">Amount</th>
@@ -97,30 +81,29 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @for (int i = 0; i < Model.Other.Count; i++)
-                        {
-                            var pp = Model.Other[i];
-                            <tr>
-                                <td><span>@pp.Date.ToBrowserDate()</span></td>
-                                <td class="mw-100"><span>@pp.PullPaymentName</span></td>
-                                <td><span>@pp.Destination</span></td>
-                                <td class="text-right"><span>@pp.Amount</span></td>
-                                @if (pp.TransactionLink is null)
-                                {
-                                    <td class="text-right"><span>Cancelled</span></td>
-                                }
-                                else
-                                {
-                                    <td class="text-right"><span><a class="transaction-link" href="@pp.TransactionLink">Link</a></span></td>
-                                }
-                            </tr>
-                        }
+                    @foreach (var pp in Model.Other)
+                    {
+                        <tr>
+                            <td><span>@pp.Date.ToBrowserDate()</span></td>
+                            <td class="mw-100"><span>@pp.PullPaymentName</span></td>
+                            <td><span>@pp.Destination</span></td>
+                            <td class="text-right"><span>@pp.Amount</span></td>
+                            @if (pp.TransactionLink is null)
+                            {
+                                <td class="text-right"><span>Cancelled</span></td>
+                            }
+                            else
+                            {
+                                <td class="text-right"><span><a class="transaction-link" href="@pp.TransactionLink">Link</a></span></td>
+                            }
+                        </tr>
+                    }
                     </tbody>
                 </table>
             }
             else
             {
-                <p class="mb-0">No payout in history.</p>
+                <p class="text-secondary mb-0">No payout in history.</p>
             }
         </div>
     </div>
diff --git a/BTCPayServer/Views/Wallets/PullPayments.cshtml b/BTCPayServer/Views/Wallets/PullPayments.cshtml
index d88a313ce..c118128fd 100644
--- a/BTCPayServer/Views/Wallets/PullPayments.cshtml
+++ b/BTCPayServer/Views/Wallets/PullPayments.cshtml
@@ -1,105 +1,110 @@
 @model PullPaymentsModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.PullPayments);
-    ViewData["Title"] = "Pull payments";
+    ViewData.SetActivePageAndTitle(WalletsNavPages.PullPayments, "Pull payments", Context.GetStoreData().StoreName);
 }
 <style type="text/css">
     .tooltip-inner {
         text-align: left;
     }
 </style>
-@if (TempData.HasStatusMessage())
+
+<div class="d-flex align-items-center justify-content-between mt-n1 mb-3">
+    <h4 class="mb-0">
+        @ViewData["Title"]
+        <small>
+            <a href="https://docs.btcpayserver.org/PullPayments/" target="_blank">
+                <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+            </a>
+        </small>
+    </h4>
+    @if (Model.HasDerivationSchemeSettings)
+    {
+        <a asp-action="NewPullPayment" asp-route-walletId="@Context.GetRouteValue("walletId")" class="btn btn-primary" role="button" id="NewPullPayment">
+            <span class="fa fa-plus"></span> Create a new pull payment
+        </a>
+    }
+</div>
+
+@if (Model.PullPayments.Any())
 {
     <div class="row">
-        <div class="col-md-12 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
-}
-
-@if (Model.HasDerivationSchemeSettings)
-{
-    <div class="row button-row">
-        <div class="col-lg-12">
-            <a asp-action="NewPullPayment"
-               asp-route-walletId="@Context.GetRouteValue("walletId")"
-               class="btn btn-primary" role="button" id="NewPullPayment"><span class="fa fa-plus"></span> Create a new pull payment</a>
-            <a href="https://docs.btcpayserver.org/PullPayments/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
-        </div>
-    </div>
-}
-
-<div class="row">
-    @foreach (var pp in Model.PullPayments)
-    {
-        <script id="tooptip_template_@pp.Id" type="text/template">
-            <span>Awaiting:&nbsp;<span class="float-right">@pp.Progress.Awaiting</span></span>
-            <br />
-            <span>Completed:&nbsp;<span class="float-right">@pp.Progress.Completed</span></span>
-            <br />
-            <span>Limit:&nbsp;<span class="float-right">@pp.Progress.Limit</span></span>
-            @if (pp.Progress.ResetIn != null)
-            {
+        @foreach (var pp in Model.PullPayments)
+        {
+            <script id="tooptip_template_@pp.Id" type="text/template">
+                <span>Awaiting:&nbsp;<span class="float-right">@pp.Progress.Awaiting</span></span>
                 <br />
-                <span>Resets in:&nbsp;<span class="float-right">@pp.Progress.ResetIn</span></span>
-            }
-            @if (pp.Progress.EndIn != null)
-            {
+                <span>Completed:&nbsp;<span class="float-right">@pp.Progress.Completed</span></span>
                 <br />
-                <span>Expires in:&nbsp;<span class="float-right">@pp.Progress.EndIn</span></span>
-            }
-        </script>
-    }
-    <div class="col-md-12">
-        <table class="table table-sm table-responsive-lg">
-            <thead class="thead-inverse">
-                <tr>
-                    <th scope="col">
-                        Start
-                    </th>
-                    <th scope="col">Name</th>
-                    <th scope="col">Refunded</th>
-                    <th scope="col" class="text-right">Actions</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var pp in Model.PullPayments)
+                <span>Limit:&nbsp;<span class="float-right">@pp.Progress.Limit</span></span>
+                @if (pp.Progress.ResetIn != null)
                 {
-                    <tr>
-                        <td>@pp.StartDate.ToBrowserDate()</td>
-                        <td>@pp.Name</td>
-                        <td class="align-middle">
-                            <div class="progress ppProgress" data-pp="@pp.Id" data-toggle="tooltip" data-html="true">
-                                <div class="progress-bar" role="progressbar" aria-valuenow="@pp.Progress.CompletedPercent"
-                                     aria-valuemin="0" aria-valuemax="100" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width:@(pp.Progress.CompletedPercent)%;">
-                                </div>
-                                <div class="progress-bar" role="progressbar" aria-valuenow="@pp.Progress.AwaitingPercent"
-                                     aria-valuemin="0" aria-valuemax="100" style="background-color:orange; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width:@(pp.Progress.AwaitingPercent)%;">
-                                </div>
-                            </div>
-                        </td>
-                        <td class="text-right">
-                            <a asp-action="ViewPullPayment"
-                               asp-controller="PullPayment"
-                               asp-route-pullPaymentId="@pp.Id">View</a> - <a class="pp-payout" asp-action="Payouts"
-                                                                             asp-route-walletId="@this.Context.GetRouteValue("walletId")"
-                                                                             asp-route-pullPaymentId="@pp.Id">Payouts</a> - <a asp-action="ArchivePullPayment"
-                                                                                                                               asp-route-walletId="@this.Context.GetRouteValue("walletId")"
-                                                                                                                               asp-route-pullPaymentId="@pp.Id">Archive</a>
-                        </td>
-                    </tr>
+                    <br />
+                    <span>Resets in:&nbsp;<span class="float-right">@pp.Progress.ResetIn</span></span>
                 }
-            </tbody>
-        </table>
-        <script type="text/javascript">
-            var ppProgresses = document.getElementsByClassName("ppProgress");
-            for (var i = 0; i < ppProgresses.length; i++) {
-                var pp = ppProgresses[i];
-                var ppId = pp.getAttribute("data-pp");
-                var template = document.getElementById("tooptip_template_" + ppId);
-                pp.setAttribute("title", template.innerHTML);
-            }
-        </script>
+                @if (pp.Progress.EndIn != null)
+                {
+                    <br />
+                    <span>Expires in:&nbsp;<span class="float-right">@pp.Progress.EndIn</span></span>
+                }
+            </script>
+        }
+        <div class="col-md-12">
+            <table class="table table-sm table-responsive-lg">
+                <thead class="thead-inverse">
+                    <tr>
+                        <th scope="col">Start</th>
+                        <th scope="col">Name</th>
+                        <th scope="col">Refunded</th>
+                        <th scope="col" class="text-right">Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var pp in Model.PullPayments)
+                    {
+                        <tr>
+                            <td>@pp.StartDate.ToBrowserDate()</td>
+                            <td>@pp.Name</td>
+                            <td class="align-middle">
+                                <div class="progress ppProgress" data-pp="@pp.Id" data-toggle="tooltip" data-html="true">
+                                    <div class="progress-bar" role="progressbar" aria-valuenow="@pp.Progress.CompletedPercent"
+                                         aria-valuemin="0" aria-valuemax="100" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width:@(pp.Progress.CompletedPercent)%;">
+                                    </div>
+                                    <div class="progress-bar" role="progressbar" aria-valuenow="@pp.Progress.AwaitingPercent"
+                                         aria-valuemin="0" aria-valuemax="100" style="background-color:orange; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width:@(pp.Progress.AwaitingPercent)%;">
+                                    </div>
+                                </div>
+                            </td>
+                            <td class="text-right">
+                                <a asp-action="ViewPullPayment"
+                                   asp-controller="PullPayment"
+                                   asp-route-pullPaymentId="@pp.Id">View</a> -
+                                <a class="pp-payout" asp-action="Payouts"
+                                   asp-route-walletId="@Context.GetRouteValue("walletId")"
+                                   asp-route-pullPaymentId="@pp.Id">Payouts</a> -
+                                <a asp-action="ArchivePullPayment"
+                                   asp-route-walletId="@Context.GetRouteValue("walletId")"
+                                   asp-route-pullPaymentId="@pp.Id">Archive</a>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+            <script type="text/javascript">
+                var ppProgresses = document.getElementsByClassName("ppProgress");
+                for (var i = 0; i < ppProgresses.length; i++) {
+                    var pp = ppProgresses[i];
+                    var ppId = pp.getAttribute("data-pp");
+                    var template = document.getElementById("tooptip_template_" + ppId);
+                    pp.setAttribute("title", template.innerHTML);
+                }
+            </script>
+        </div>
     </div>
-</div>
+}
+else
+{
+    <p class="text-secondary mt-3">
+        There are no pull payments yet.
+    </p>
+}
diff --git a/BTCPayServer/Views/Wallets/SignWithSeed.cshtml b/BTCPayServer/Views/Wallets/SignWithSeed.cshtml
index 8ed2e197a..b9bc3e6b4 100644
--- a/BTCPayServer/Views/Wallets/SignWithSeed.cshtml
+++ b/BTCPayServer/Views/Wallets/SignWithSeed.cshtml
@@ -1,33 +1,26 @@
 @model SignWithSeedViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Sign PSBT with an HD private key or mnemonic seed";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Send);
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Send, "Sign PSBT with an HD private key or mnemonic seed", Context.GetStoreData().StoreName);
 }
 
-<h4>Sign PSBT with an HD private key or mnemonic seed</h4>
 <div class="row">
     <div class="col-md-10">
-        <div class="alert alert-warning alert-dismissible" role="alert">
+        <h4 class="mb-3">@ViewData["PageTitle"]</h4>
+
+        <div class="alert alert-warning alert-dismissible my-4" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <p>
-                <span>Before you proceed, please understand the following:</span>
-            </p>
+            <p>Before you proceed, please understand the following:</p>
             <ol>
                 <li>Make sure this BTCPay Server instance <b>belongs to you</b>.</li>
-                <li>Use <b>Chrome's Incognito mode or the Tor Browser</b>, this makes sure no malicious browser plugins are running that could steal your key.</li>
+                <li>Use <b>Incognito mode or the Tor Browser</b> to ensure no malicious browser plugins are running that could steal your key.</li>
             </ol>
-            <p>
-                <span>Else, you are exposing yourself to malicious site owners, or to malicious plugins installed in your browser.</span>
-            </p>
+            <p class="mb-0">Otherwise you are exposing yourself to malicious site owners, or to malicious plugins installed in your browser.</p>
         </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-10">
+
         <div asp-validation-summary="All" class="text-danger"></div>
-        <form method="post" asp-action="SignWithSeed" asp-route-walletId="@this.Context.GetRouteValue("walletId")">
-            <partial name="SigningContext" for="SigningContext" />
+        <form method="post" asp-action="SignWithSeed" asp-route-walletId="@Context.GetRouteValue("walletId")">
+            <partial name="SigningContext" for="SigningContext"/>
             <div class="form-group">
                 <label asp-for="SeedOrKey"></label>
                 <input asp-for="SeedOrKey" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off"/>
@@ -35,7 +28,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Passphrase"></label>
-                <input asp-for="Passphrase" class="form-control" />
+                <input asp-for="Passphrase" class="form-control"/>
                 <span asp-validation-for="Passphrase" class="text-danger"></span>
             </div>
             <button type="submit" class="btn btn-primary">Sign</button>
diff --git a/BTCPayServer/Views/Wallets/WalletPSBT.cshtml b/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
index ee3f28567..b2d04aaf8 100644
--- a/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletPSBT.cshtml
@@ -2,17 +2,11 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "PSBT";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT);
-}
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-10 text-center">
-            <partial name="_StatusMessage"/>
-        </div>
-    </div>
+    ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT, string.IsNullOrEmpty(Model.Decoded) ? "Decode PSBT" : "Decoded PSBT", Context.GetStoreData().StoreName);
 }
+
+<h4 class="mb-3">@ViewData["PageTitle"]</h4>
+
 <div class="row">
     <div class="col-md-10">
         @if (Model.Errors != null && Model.Errors.Count != 0)
@@ -30,7 +24,6 @@
         }
         @if (!string.IsNullOrEmpty(Model.Decoded))
         {
-            <h3>Decoded PSBT</h3>
             <div class="form-group">
                 <form method="post" asp-action="WalletPSBT" asp-route-walletId="@this.Context.GetRouteValue("walletId")">
                     <input type="hidden" asp-for="CryptoCode"/>
@@ -56,7 +49,6 @@
             </div>
             <pre><code class="json">@Model.Decoded</code></pre>
         }
-        <h4 class="mb-3">Decode PSBT</h4>
         <p>You can decode a PSBT by either pasting its content or by uploading the file.</p>
         <form class="form-group" method="post" asp-action="WalletPSBT" asp-route-walletId="@this.Context.GetRouteValue("walletId")" enctype="multipart/form-data">
             <div class="form-group">
diff --git a/BTCPayServer/Views/Wallets/WalletPSBTCombine.cshtml b/BTCPayServer/Views/Wallets/WalletPSBTCombine.cshtml
index 0a607bd0a..f4725eb4e 100644
--- a/BTCPayServer/Views/Wallets/WalletPSBTCombine.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletPSBTCombine.cshtml
@@ -1,15 +1,15 @@
 @model WalletPSBTCombineViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "PSBT";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT);
+    ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT, "Combine PSBT", Context.GetStoreData().StoreName);
 }
 
-<h4>Combine PSBT</h4>
 <div class="row">
     <div class="col-md-10">
+        <h4 class="mb-3">@ViewData["PageTitle"]</h4>
+
         <form class="form-group" method="post" asp-action="WalletPSBTCombine" enctype="multipart/form-data">
-            <input type="hidden" asp-for="OtherPSBT" />
+            <input type="hidden" asp-for="OtherPSBT"/>
             <div class="form-group">
                 <label asp-for="PSBT"></label>
                 <textarea class="form-control" rows="5" asp-for="PSBT"></textarea>
diff --git a/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml b/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml
index 56d3d77e6..a50356c90 100644
--- a/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml
@@ -1,31 +1,27 @@
 @model WalletPSBTReadyViewModel
 @{
     Layout = "../Shared/_Layout.cshtml";
+    ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT, "Review PSBT", Context.GetStoreData().StoreName);
 }
 
 <section>
     <div class="container">
-        @if (TempData.HasStatusMessage())
-        {
-            <div class="row">
-                <div class="col-md-10 text-center">
-                    <partial name="_StatusMessage"/>
-                </div>
-            </div>
-        }
-        @if (Model.GlobalError != null)
-        {
-            <div class="alert alert-danger alert-dismissible" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                <span>@Model.GlobalError</span><br/>
-            </div>
-        }
         <div class="row">
             <div class="col-lg-12 section-heading text-center">
-                <h2>Transaction review</h2>
-                <hr class="primary">
+                <partial name="_StatusMessage" />
+
+                @if (Model.GlobalError != null)
+                {
+                    <div class="alert alert-danger alert-dismissible" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <span>@Model.GlobalError</span><br/>
+                    </div>
+                }
+
+                <h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
                 @if (Model.CanCalculateBalance)
                 {
                     <p>
@@ -38,8 +34,8 @@
                         {
                             <span style="color:red;">@Model.BalanceChange</span>
                         }
-                        , do you want to continue?
                     </p>
+                    <p>Do you want to continue?</p>
                 }
                 else
                 {
@@ -48,9 +44,9 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-lg-3 text-center"></div>
-            <div class="col-lg-6 text-center">
-                <h4 class="text-left">Inputs</h4>
+            <div class="col-lg-3"></div>
+            <div class="col-lg-6">
+                <h4 class="mt-4 mb-n3">Inputs</h4>
                 <table class="table table-sm table-responsive-lg">
                     <thead class="thead-inverse">
                     <tr>
@@ -88,13 +84,13 @@
                     </tbody>
                 </table>
             </div>
-            <div class="col-lg-3 text-center"></div>
+            <div class="col-lg-3"></div>
         </div>
 
         <div class="row">
-            <div class="col-lg-3 text-center"></div>
-            <div class="col-lg-6 text-center">
-                <h4 class="text-left">Outputs</h4>
+            <div class="col-lg-3"></div>
+            <div class="col-lg-6">
+                <h4 class="mt-4 mb-n3">Outputs</h4>
                 <table class="table table-sm table-responsive-lg">
                     <thead class="thead-inverse">
                     <tr>
@@ -122,21 +118,21 @@
                     </tbody>
                 </table>
             </div>
-            <div class="col-lg-3 text-center"></div>
+            <div class="col-lg-3"></div>
         </div>
         @if (Model.FeeRate != null)
         {
             <div class="row">
-                <div class="col-lg-3 text-center"></div>
+                <div class="col-lg-3"></div>
                 <div class="col-lg-6 text-right">
                     <p class="text-muted">Transaction fee rate: <b>@Model.FeeRate</b></p>
                 </div>
-                <div class="col-lg-3 text-center"></div>
+                <div class="col-lg-3"></div>
             </div>
         }
         <div class="row">
             <div class="col-lg-12 text-center">
-                <form method="post" asp-action="WalletPSBTReady" asp-route-walletId="@this.Context.GetRouteValue("walletId")">
+                <form method="post" asp-action="WalletPSBTReady" asp-route-walletId="@Context.GetRouteValue("walletId")">
                     <input type="hidden" asp-for="SigningKey" />
                     <input type="hidden" asp-for="SigningKeyPath" />
                     <partial name="SigningContext" for="SigningContext" />
@@ -152,11 +148,9 @@
                         {
                             <button type="submit" class="btn btn-primary" name="command" value="broadcast">Broadcast it</button>
                         }
-
                         <span> or </span>
                     }
                     <button type="submit" class="btn btn-secondary" name="command" value="analyze-psbt">View PSBT</button>
-
                 </form>
             </div>
         </div>
diff --git a/BTCPayServer/Views/Wallets/WalletReceive.cshtml b/BTCPayServer/Views/Wallets/WalletReceive.cshtml
index 0c4eff51c..297053c22 100644
--- a/BTCPayServer/Views/Wallets/WalletReceive.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletReceive.cshtml
@@ -2,24 +2,16 @@
 @model BTCPayServer.Controllers.WalletReceiveViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Manage wallet";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Receive);
-}
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-12 text-center">
-            <partial name="_StatusMessage"/>
-        </div>
-    </div>
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Receive, $"Receive {Model.CryptoCode}", Context.GetStoreData().StoreName);
 }
+
 <div class="row no-gutters">
     <div class="col-lg-8 mx-auto my-auto">
         <form method="post" asp-action="WalletReceive" class="card text-center">
             <div class="card-body">
                 @if (string.IsNullOrEmpty(Model.Address))
                 {
-                    <h3 class="card-title mb-3">Receive @Model.CryptoCode</h3>
+                    <h3 class="card-title mb-3">@ViewData["PageTitle"]</h3>
                     <button id="generateButton" class="btn btn-lg btn-primary" type="submit" name="command" value="generate-new-address">Generate @Model.CryptoCode address</button>
                 }
                 else
diff --git a/BTCPayServer/Views/Wallets/WalletRescan.cshtml b/BTCPayServer/Views/Wallets/WalletRescan.cshtml
index e21b7d91a..eb0d2b9e6 100644
--- a/BTCPayServer/Views/Wallets/WalletRescan.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletRescan.cshtml
@@ -1,10 +1,11 @@
 @model RescanWalletModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Rescan wallet";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Rescan);
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Rescan, "Rescan wallet", Context.GetStoreData().StoreName);
 }
 
+<h4 class="mb-3">@ViewData["PageTitle"]</h4>
+
 @if (!Model.Ok)
 {
     <div class="row">
@@ -57,12 +58,10 @@ else if (!Model.Progress.HasValue)
         <div class="col-lg-8">
             <p>
                 Scanning the UTXO set allow you to restore the balance of your wallet, but not all the transaction history.
-            </p>
-            <p>
                 This operation will scan the HD Path <b>0/*</b>, <b>1/*</b> and <b>*</b> from a starting index, until no UTXO are found in a whole gap limit.
             </p>
             <p>The batch size make sure the scan do not consume too much RAM at once by rescanning several time with smaller subset of addresses.</p>
-            <p>If you do not understand above, just keep the default values and click on <b>Start Scan</b></p>
+            <p>If you do not understand the above, go with the defaults and start scanning.</p>
         </div>
     </div>
 
diff --git a/BTCPayServer/Views/Wallets/WalletSend.cshtml b/BTCPayServer/Views/Wallets/WalletSend.cshtml
index e17d73cf9..1af3a3288 100644
--- a/BTCPayServer/Views/Wallets/WalletSend.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSend.cshtml
@@ -1,25 +1,17 @@
 @addTagHelper *, BundlerMinifier.TagHelpers
 @using Microsoft.AspNetCore.Mvc.ModelBinding
-@using BTCPayServer.Views
 @model WalletSendModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Manage wallet";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Send);
-}
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-10 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Send, $"Send {Model.CryptoCode}", Context.GetStoreData().StoreName);
 }
+
 <partial name="CameraScanner"/>
 
 <div class="row">
     <div class="@(!Model.InputSelection && Model.Outputs.Count==1? "col-lg-7 transaction-output-form": "col-lg-8")">
-        <form method="post" asp-action="WalletSend" asp-route-walletId="@this.Context.GetRouteValue("walletId")">
+        <h4 class="mb-3">@ViewData["PageTitle"]</h4>
+        <form method="post" asp-action="WalletSend" asp-route-walletId="@Context.GetRouteValue("walletId")">
             <input type="hidden" asp-for="InputSelection" />
             <input type="hidden" asp-for="FiatDivisibility" />
             <input type="hidden" asp-for="CryptoDivisibility" />
@@ -176,7 +168,7 @@
                                 <input asp-for="NoChange" class="form-check-input" />
                                 <label asp-for="NoChange" class="form-check-label"></label>
                                 <a href="https://docs.btcpayserver.org/Wallet/#dont-create-utxo-change" target="_blank">
-                                    <span class="fa fa-question-circle-o" title="More information..."></span>
+                                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                                 </a>
                             </div>
                         </div>                        
@@ -185,7 +177,7 @@
                                 <input asp-for="AlwaysIncludeNonWitnessUTXO" class="form-check-input"/>
                                 <label asp-for="AlwaysIncludeNonWitnessUTXO" class="form-check-label"></label>
                                 <a href="https://medium.com/@@jmacato/wasabi-wallets-advisory-for-trezor-users-7d942c727f92" target="_blank">
-                                    <span class="fa fa-question-circle-o" title="More information..."></span>
+                                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                                 </a>
                             </div>
                         </div>    
@@ -194,7 +186,7 @@
                             <div class="form-group">
                                 <label asp-for="AllowFeeBump"></label>
                                 <a href="https://docs.btcpayserver.org/Wallet/#rbf-replace-by-fee" target="_blank">
-                                    <span class="fa fa-question-circle-o" title="More information..."></span>
+                                    <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                                 </a>
                                 <select asp-for="AllowFeeBump" class="form-control w-auto">
                                     <option value="Maybe">Randomize for higher privacy</option>
diff --git a/BTCPayServer/Views/Wallets/WalletSendVault.cshtml b/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
index 86cc3ec75..efccc35c7 100644
--- a/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
@@ -1,19 +1,11 @@
 @model WalletSendVaultModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Manage wallet";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Send);
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Send, "Sign the transaction with BTCPay Server Vault", Context.GetStoreData().StoreName);
 }
 
-<h4>Sign the transaction with BTCPayServer Vault</h4>
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-10 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
-}
+<h2 class="mb-4">@ViewData["PageTitle"]</h2>
+
 <div id="walletAlert" class="alert alert-danger alert-dismissible" style="display:none;" role="alert">
     <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <span id="alertMessage"></span>
@@ -31,7 +23,6 @@
     </div>
 </div>
 
-
 <partial name="VaultElements" />
 @section Scripts
 {
diff --git a/BTCPayServer/Views/Wallets/WalletSettings.cshtml b/BTCPayServer/Views/Wallets/WalletSettings.cshtml
index dd5d86c16..d12be48e7 100644
--- a/BTCPayServer/Views/Wallets/WalletSettings.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSettings.cshtml
@@ -4,15 +4,10 @@
 @model WalletSettingsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Wallet settings";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Settings);
-}
-@if (TempData.HasStatusMessage())
-{
-    <partial name="_StatusMessage" />
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Settings, "Wallet settings", Context.GetStoreData().StoreName);
 }
 
-<h4 class="mb-3">Additional wallet information</h4>
+<h4 class="mb-3">@ViewData["PageTitle"]</h4>
 
 <div class="row">
     <div class="col-md-8 col-lg-6">
@@ -37,12 +32,12 @@
                     <span asp-validation-for="DerivationSchemeInput" class="text-danger"></span>
                 </div>
             }
-            @for (int i = 0; i < Model.AccountKeys.Count; i++)
+            @for (var i = 0; i < Model.AccountKeys.Count; i++)
             {
-                <hr class="my-4"/>
-<span class="d-flex">
-                <h4 class="mb-3">Account key @i</h4>
-                <button type="button" class="btn btn-link only-for-js mb-2 fa fa-qrcode text-decoration-none" data-wallet="@i" title="Show QR"></button></span>
+                <div class="d-flex mt-5 mb-3">
+                    <h4 class="mb-0">Account key @i</h4>
+                    <button type="button" class="btn btn-link only-for-js mb-2 fa fa-qrcode text-decoration-none" data-wallet="@i" title="Show QR"></button>
+                </div>
                 <div class="form-group">
                     <label asp-for="@Model.AccountKeys[i].AccountKey"></label>
                     <input asp-for="@Model.AccountKeys[i].AccountKey" class="form-control" readonly/>
diff --git a/BTCPayServer/Views/Wallets/WalletSigningMenu.cshtml b/BTCPayServer/Views/Wallets/WalletSigningMenu.cshtml
index a7e945dc8..1d96b26f1 100644
--- a/BTCPayServer/Views/Wallets/WalletSigningMenu.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSigningMenu.cshtml
@@ -1,7 +1,6 @@
 @inject BTCPayNetworkProvider BTCPayNetworkProvider
 @model (string CryptoCode, bool NBXSeedAvailable)
 
-
 <div class="dropdown">
     <button class="btn btn-primary dropdown-toggle" type="button" id="SendMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         Sign with...
diff --git a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml
index c930ddd7e..6b70e12d6 100644
--- a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml
@@ -1,8 +1,7 @@
 @model ListTransactionsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["Title"] = "Manage wallet";
-    ViewData.SetActivePageAndTitle(WalletsNavPages.Transactions);
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Transactions, $"{Model.CryptoCode} Transactions", Context.GetStoreData().StoreName);
 }
 <style type="text/css">
     .smMaxWidth {
@@ -58,40 +57,35 @@
         left: -8px;
     }
 </style>
-@if (TempData.HasStatusMessage())
-{
-    <div class="row">
-        <div class="col-md-12 text-center">
-            <partial name="_StatusMessage" />
-        </div>
-    </div>
-}
-<div class="row">
-    <div class="col-md-12">
-        If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan" asp-route-walletId="@Context.GetRouteValue("walletId")">rescan your wallet</a>. <br />
-        If some transactions appear in BTCPay Server, but are missing on Electrum or another wallet, <a href="https://docs.btcpayserver.org/FAQ/FAQ-Wallet/#missing-payments-in-my-software-or-hardware-wallet">follow those instructions</a>.
-    </div>
-</div>
-@if (Model.Labels.Any())
-{
 
-    <div class="row mt-4">
-        <div class="col-md-12">
-            <div class="d-flex flex-row align-items-start flex-wrap card card-body p-2">
-                <span class="mr-2">Filter by label:</span>
-                @foreach (var label in Model.Labels)
-                {
-                    <a asp-route-labelFilter="@label.Text" class="badge mr-2 my-1 position-relative text-white d-block"
-                       style="background-color: @label.Color;"><span class="text-white">@label.Text</span></a>
-                }
+<h4 class="mb-3">@ViewData["PageTitle"]</h4>
+<p>
+    If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan" asp-route-walletId="@Context.GetRouteValue("walletId")">rescan your wallet</a>.
+    <br/>
+    If some transactions appear in BTCPay Server, but are missing in another wallet, <a href="https://docs.btcpayserver.org/FAQ/FAQ-Wallet/#missing-payments-in-my-software-or-hardware-wallet">follow these instructions</a>.
+</p>
+
+@if (Model.Transactions.Any())
+{
+    @if (Model.Labels.Any())
+    {
+        <div class="row mt-4">
+            <div class="col-md-12">
+                <div class="d-flex flex-row align-items-start flex-wrap card card-body p-2">
+                    <span class="mr-2">Filter by label:</span>
+                    @foreach (var label in Model.Labels)
+                    {
+                        <a asp-route-labelFilter="@label.Text" class="badge mr-2 my-1 position-relative text-white d-block"
+                           style="background-color: @label.Color;"><span class="text-white">@label.Text</span></a>
+                    }
+                </div>
             </div>
         </div>
-    </div>
-}
-<div class="row">
-    <div class="col-md-12">
-        <table class="table table-sm table-responsive-lg">
-            <thead class="thead-inverse">
+    }
+    <div class="row">
+        <div class="col-md-12">
+            <table class="table table-sm table-responsive-lg">
+                <thead class="thead-inverse">
                 <tr>
                     <th style="min-width: 90px;" class="col-md-auto">
                         Date
@@ -104,8 +98,8 @@
                     <th class="text-right">Amount</th>
                     <th class="text-right"></th>
                 </tr>
-            </thead>
-            <tbody>
+                </thead>
+                <tbody>
                 @foreach (var transaction in Model.Transactions)
                 {
                     <tr>
@@ -165,14 +159,14 @@
                             <td style="text-align:right; color:red;" class="text-right">@transaction.Balance</td>
                         }
                         <td class="text-right">
-                            <div class="dropleft d-inline-block" >
+                            <div class="dropleft d-inline-block">
                                 <span class="fa fa-tags cursor-pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
                                 <div class="dropdown-menu">
                                     <form asp-action="ModifyTransaction" method="post"
-                                        asp-route-walletId="@Context.GetRouteValue("walletId")">
-                                        <input type="hidden" name="transactionId" value="@transaction.Id" />
+                                          asp-route-walletId="@Context.GetRouteValue("walletId")">
+                                        <input type="hidden" name="transactionId" value="@transaction.Id"/>
                                         <div class="input-group p-2">
-                                            <input name="addlabel" placeholder="Label name" maxlength="20" type="text" class="form-control form-control-sm" />
+                                            <input name="addlabel" placeholder="Label name" maxlength="20" type="text" class="form-control form-control-sm"/>
                                             <div class="input-group-append">
                                                 <button type="submit" class="btn btn-primary btn-sm"><span class="fa fa-plus"></span></button>
                                             </div>
@@ -206,8 +200,8 @@
                                 }
                                 <div class="dropdown-menu">
                                     <form asp-action="ModifyTransaction" method="post"
-                                        asp-route-walletId="@Context.GetRouteValue("walletId")">
-                                        <input type="hidden" name="transactionId" value="@transaction.Id" />
+                                          asp-route-walletId="@Context.GetRouteValue("walletId")">
+                                        <input type="hidden" name="transactionId" value="@transaction.Id"/>
                                         <div class="input-group p-2">
                                             <textarea name="addcomment" maxlength="200" rows="2" cols="20" class="form-control form-control-sm">@transaction.Comment</textarea>
                                         </div>
@@ -220,8 +214,15 @@
                         </td>
                     </tr>
                 }
-            </tbody>
-        </table>
-        <vc:pager view-model="Model" />
+                </tbody>
+            </table>
+            <vc:pager view-model="Model"/>
+        </div>
     </div>
-</div>
+}
+else
+{
+    <p class="text-secondary mt-3">
+        There are no transactions yet.
+    </p>
+}
diff --git a/BTCPayServer/Views/Wallets/WalletsNavPages.cs b/BTCPayServer/Views/Wallets/WalletsNavPages.cs
index a6cd34866..f6efc8456 100644
--- a/BTCPayServer/Views/Wallets/WalletsNavPages.cs
+++ b/BTCPayServer/Views/Wallets/WalletsNavPages.cs
@@ -2,6 +2,7 @@ namespace BTCPayServer.Views.Wallets
 {
     public enum WalletsNavPages
     {
+        Index,
         Send,
         Transactions,
         Rescan,
diff --git a/BTCPayServer/Views/Wallets/_Nav.cshtml b/BTCPayServer/Views/Wallets/_Nav.cshtml
index 1a851f1f6..3ab497ffc 100644
--- a/BTCPayServer/Views/Wallets/_Nav.cshtml
+++ b/BTCPayServer/Views/Wallets/_Nav.cshtml
@@ -1,23 +1,23 @@
 @inject SignInManager<ApplicationUser> SignInManager
 @inject BTCPayNetworkProvider BtcPayNetworkProvider
 @{
-    var wallet = WalletId.Parse(this.Context.GetRouteValue("walletId").ToString());
+    var wallet = WalletId.Parse(Context.GetRouteValue("walletId").ToString());
     var network = BtcPayNetworkProvider.GetNetwork<BTCPayNetwork>(wallet.CryptoCode);
 }
-<div class="nav flex-column nav-pills mb-4">
-    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Transactions)" asp-action="WalletTransactions" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletTransactions">Transactions</a>
+<div class="nav flex-column mb-4">
+    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Transactions)" asp-action="WalletTransactions" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletTransactions">Transactions</a>
     @if (!network.ReadonlyWallet)
     {
-        <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Send)" asp-action="WalletSend" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletSend">Send</a>
+        <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Send)" asp-action="WalletSend" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletSend">Send</a>
     }
-    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Receive)" asp-action="WalletReceive" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletReceive">Receive</a>
-    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Rescan)" asp-action="WalletRescan" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletRescan">Rescan</a>
-    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.PullPayments)" asp-action="PullPayments" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletPullPayments">Pull payments</a>
-    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Payouts)" asp-action="Payouts" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletPayouts">Payouts</a>
+    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Receive)" asp-action="WalletReceive" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletReceive">Receive</a>
+    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Rescan)" asp-action="WalletRescan" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletRescan">Rescan</a>
+    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.PullPayments)" asp-action="PullPayments" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletPullPayments">Pull payments</a>
+    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Payouts)" asp-action="Payouts" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletPayouts">Payouts</a>
     @if (!network.ReadonlyWallet)
     {
-        <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.PSBT)" asp-action="WalletPSBT" asp-route-walletId="@this.Context.GetRouteValue("walletId")">PSBT</a>
-        <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Settings)" asp-action="WalletSettings" asp-route-walletId="@this.Context.GetRouteValue("walletId")" id="WalletSettings">Settings</a>
+        <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.PSBT)" asp-action="WalletPSBT" asp-route-walletId="@Context.GetRouteValue("walletId")">PSBT</a>
+        <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Settings)" asp-action="WalletSettings" asp-route-walletId="@Context.GetRouteValue("walletId")" id="WalletSettings">Settings</a>
     }
     <vc:ui-extension-point location="wallet-nav" />
 </div>
diff --git a/BTCPayServer/Views/Wallets/_ViewStart.cshtml b/BTCPayServer/Views/Wallets/_ViewStart.cshtml
index 59b9d2c7d..46955f834 100644
--- a/BTCPayServer/Views/Wallets/_ViewStart.cshtml
+++ b/BTCPayServer/Views/Wallets/_ViewStart.cshtml
@@ -1,6 +1,6 @@
 @using BTCPayServer.Views
 @using BTCPayServer.Views.Wallets
 @{
-    ViewBag.MainTitle = "Manage wallet";
+    ViewBag.CategoryTitle = "Wallets";
     ViewData.SetActiveCategory(typeof(WalletsNavPages));
 }
diff --git a/BTCPayServer/wwwroot/img/Specter.png b/BTCPayServer/wwwroot/img/Specter.png
index bbf6f8418..b3736e4ef 100644
Binary files a/BTCPayServer/wwwroot/img/Specter.png and b/BTCPayServer/wwwroot/img/Specter.png differ
diff --git a/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css b/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css
index d1b753fef..22e85cec7 100644
--- a/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css
+++ b/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css
@@ -5893,7 +5893,7 @@ a.close.disabled {
   -ms-flex-pack: end;
   justify-content: flex-end;
   padding: 0.75rem;
-  border-top: 1px solid #dee2e6;
+  border-top: 1px solid var(--btcpay-border-color-medium, var(--btcpay-color-neutral-300));
   border-bottom-right-radius: calc(0.3rem - 1px);
   border-bottom-left-radius: calc(0.3rem - 1px);
 }
diff --git a/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css b/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css
index 0f2982de3..5bfa0bd4f 100644
--- a/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css
+++ b/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css
@@ -51,7 +51,7 @@ hr.light {
 }
 
 #mainNav .navbar-nav > li.nav-item > a.nav-link {
-  font-size: 13px;
+  font-size: 14px;
   font-weight: bold;
   color: var(--btcpay-header-color-link, var(--btcpay-color-neutral-100));
 }
diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css
index 929eedef8..36e63c4e2 100644
--- a/BTCPayServer/wwwroot/main/site.css
+++ b/BTCPayServer/wwwroot/main/site.css
@@ -94,6 +94,20 @@ ul li {
     border-left: 1px solid var(--btcpay-color-white);
 }
 
+.breadcrumb {
+    background-color: transparent;
+    border-radius: 0;
+}
+
+.breadcrumb-item + .breadcrumb-item {
+    padding-left: 1rem;
+}
+
+.breadcrumb-item + .breadcrumb-item::before {
+    color: var(--btcpay-color-neutral-600);
+    content: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNyIgaGVpZ2h0PSIxMCIgdmlld0JveD0iMCAwIDcgMTAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTQuMzg3MzkgNC4zMTYyOFY1LjYyMUwzLjczNDM5IDQuOTY5MjZMNC4zODczOSA0LjMxNzUxVjQuMzE2MjhaTTAuMDAxMjMxMzkgMS4zMDM0OUwxLjMwNTk5IDBMNi4zMTU1NyA1TDEuMzA1OTkgMTBMMCA4LjY5NjUxTDMuNzAxMTMgNUwwIDEuMzAzNDlIMC4wMDEyMzEzOVoiIGZpbGw9IiM4RDhEOEYiLz48L3N2Zz4K");
+}
+
 /* Admin Sidebar Navigation */
 a.nav-link {
     color: var(--btcpay-nav-color-link, var(--btcpay-color-neutral-600));
@@ -110,12 +124,17 @@ a.nav-link:hover {
     margin-left: -1rem;
 }
 
-.nav-pills .nav-link.active,
-.nav-pills .show > .nav-link {
+section .nav .nav-link {
+    margin: .3rem 0;
+    border-left: 2px solid transparent;
+    padding: .2rem 1rem;
+}
+
+section .nav .nav-link.active,
+section .nav .show > .nav-link {
     color: var(--btcpay-nav-color-link-active, var(--btcpay-color-neutral-900));
-    background: var(--btcpay-bg-nav-link-active, var(--btcpay-color-primary-backdrop));
-    font-weight: 500;
-    border-left: 5px solid var(--btcpay-color-primary);
+    font-weight: 700;
+    border-left-color: var(--btcpay-color-primary);
 }
 
 /* Homepage */