diff --git a/BTCPayServer/Views/Manage/_Nav.cshtml b/BTCPayServer/Views/Manage/_Nav.cshtml
index 8c613b3c6..fc68d22a2 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">
+<div class="nav flex-column nav-pills 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/Server/_Nav.cshtml b/BTCPayServer/Views/Server/_Nav.cshtml
index 01ce3bda8..843b184ba 100644
--- a/BTCPayServer/Views/Server/_Nav.cshtml
+++ b/BTCPayServer/Views/Server/_Nav.cshtml
@@ -1,4 +1,4 @@
-<div class="nav flex-column nav-pills">
+<div class="nav flex-column nav-pills mb-4">
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Users)" asp-action="ListUsers">Users</a>
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Emails)" asp-action="Emails">Email server</a>
     <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Policies)" asp-action="Policies">Policies</a>
diff --git a/BTCPayServer/Views/Stores/_Nav.cshtml b/BTCPayServer/Views/Stores/_Nav.cshtml
index 8db99112a..2a3fd3755 100644
--- a/BTCPayServer/Views/Stores/_Nav.cshtml
+++ b/BTCPayServer/Views/Stores/_Nav.cshtml
@@ -1,4 +1,4 @@
-<div class="nav flex-column nav-pills">
+<div class="nav flex-column nav-pills 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/Wallets/_Nav.cshtml b/BTCPayServer/Views/Wallets/_Nav.cshtml
index 6236b3ec1..b1af837a3 100644
--- a/BTCPayServer/Views/Wallets/_Nav.cshtml
+++ b/BTCPayServer/Views/Wallets/_Nav.cshtml
@@ -4,7 +4,7 @@
     var wallet = WalletId.Parse( this.Context.GetRouteValue("walletId").ToString());
     var network = BtcPayNetworkProvider.GetNetwork<BTCPayNetwork>(wallet.CryptoCode);
 }
-    <div class="nav flex-column nav-pills">
+    <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>
         @if (!network.ReadonlyWallet)
         {