diff --git a/BTCPayServer/Views/Server/Files.cshtml b/BTCPayServer/Views/Server/Files.cshtml
index b6295d45f..2d0144b6c 100644
--- a/BTCPayServer/Views/Server/Files.cshtml
+++ b/BTCPayServer/Views/Server/Files.cshtml
@@ -34,7 +34,7 @@ else
                     <th>Name</th>
                     <th>Timestamp</th>
                     <th>User</th>
-                    <th></th>
+                    <th class="text-end">Actions</th>
                 </tr>
             </thead>
             <tbody>
@@ -44,7 +44,7 @@ else
                         <td>@file.FileName</td>
                         <td>@file.Timestamp.ToBrowserDate()</td>
                         <td>@file.ApplicationUser.UserName</td>
-                        <td>
+                        <td class="text-end">
                             <a asp-action="Files" asp-route-fileId="@file.Id">Get Link</a>
                             - <a asp-action="CreateTemporaryFileUrl" asp-route-fileId="@file.Id">Get Temp Link</a>
                             - <a asp-action="DeleteFile" asp-route-fileId="@file.Id">Remove</a>
diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/Server/ListUsers.cshtml
index 1f3f340b6..7aab4b525 100644
--- a/BTCPayServer/Views/Server/ListUsers.cshtml
+++ b/BTCPayServer/Views/Server/ListUsers.cshtml
@@ -23,24 +23,31 @@
     var sortByAsc = "Sort by ascending...";
 }
 
-<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 class="d-flex flex-wrap align-items-center justify-content-between mb-2">
+    <form asp-action="ListUsers" asp-route-sortOrder="@(userEmailSortOrder)">
+        <div class="input-group mb-2">
+            <input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
+            <button type="submit" class="btn btn-secondary" title="Search by email">
+                <span class="fa fa-search"></span> Search
+            </button>
+        </div>
+        <span asp-validation-for="SearchTerm" class="text-danger"></span>
+    </form>
+    <a asp-action="CreateUser" class="btn btn-primary mb-2" role="button" id="CreateUser">Add User</a>
 </div>
-<form
-    asp-action="ListUsers"
-    asp-route-sortOrder="@(userEmailSortOrder)"
->
-    <div class="input-group">
-        <input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
-        <button type="submit" class="btn btn-secondary" title="Search by email">
-            <span class="fa fa-search"></span> Search
-        </button>
-    </div>
-    <span asp-validation-for="SearchTerm" class="text-danger"></span>
-</form>
+    <form asp-action="ListUsers"
+          asp-route-sortOrder="@(userEmailSortOrder)">
+        <div class="input-group">
+            <input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
+            <button type="submit" class="btn btn-secondary" title="Search by email">
+                <span class="fa fa-search"></span> Search
+            </button>
+        </div>
+        <span asp-validation-for="SearchTerm" class="text-danger"></span>
+    </form>
+    <a asp-action="CreateUser" class="btn btn-primary" role="button" id="CreateUser">Add User</a>
+</div>
+
 
 <table class="table table-sm">
     <thead>
diff --git a/BTCPayServer/Views/Server/Maintenance.cshtml b/BTCPayServer/Views/Server/Maintenance.cshtml
index 59e61743d..fd478f9b3 100644
--- a/BTCPayServer/Views/Server/Maintenance.cshtml
+++ b/BTCPayServer/Views/Server/Maintenance.cshtml
@@ -7,8 +7,8 @@
 
 <form method="post">
     <div class="row mb-5">
-        <div class="col-lg-9 col-xl-8">
-            <h4 class="mb-3">Change domain name</h4>
+        <div class="col-lg-6">
+            <h4 class="mb-3">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="row g-1">
diff --git a/BTCPayServer/Views/Server/Services.cshtml b/BTCPayServer/Views/Server/Services.cshtml
index 26f292b07..4fb4ab799 100644
--- a/BTCPayServer/Views/Server/Services.cshtml
+++ b/BTCPayServer/Views/Server/Services.cshtml
@@ -5,8 +5,7 @@
 
 <h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<div class="row mb-5">
-    <div class="col-lg-9 col-xl-8">
+    <div class="mb-5">
         <h4 class="mb-3">Crypto services exposed by your server</h4>
         <table class="table table-sm mt-2">
             <thead>
@@ -37,107 +36,11 @@
             </tbody>
         </table>
     </div>
-</div>
 
 @if (Model.OtherExternalServices.Count != 0 || Model.ExternalServices.Any(service => string.IsNullOrEmpty(service.CryptoCode)))
 {
-    <div class="row mb-5">
-        <div class="col-lg-9 col-xl-8">
-            <h4 class="mb-3">Other external services</h4>
-
-            <table class="table table-sm mt-2">
-                <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th style="text-align: right">Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                @foreach (var s in Model.ExternalServices.Where(service => string.IsNullOrEmpty(service.CryptoCode)))
-                {
-                    <tr>
-                        <td>@s.DisplayName</td>
-                        <td style="text-align: right">
-                            <a asp-action="Service" asp-route-serviceName="@s.ServiceName">See information</a>
-                        </td>
-                    </tr>
-                }
-                @foreach (var s in Model.OtherExternalServices)
-                {
-                    <tr>
-                        <td>@s.Name</td>
-                        <td style="text-align: right">
-                            <a href="@s.Link" target="_blank">See information</a>
-                        </td>
-                    </tr>
-                }
-                </tbody>
-            </table>
-        </div>
-    </div>
-}
-
-@if (Model.TorHttpServices.Count != 0)
-{
-    <div class="row mb-5">
-        <div class="col-lg-9 col-xl-8">
-            <h4 class="mb-3">HTTP-based TOR hidden services</h4>
-
-            <table class="table table-sm mt-2">
-                <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th style="text-align: right">Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                @foreach (var s in Model.TorHttpServices)
-                {
-                    <tr>
-                        <td>@s.Name</td>
-                        <td style="text-align: right">
-                            <a href="@s.Link" target="_blank">See information</a>
-                        </td>
-                    </tr>
-                }
-                </tbody>
-            </table>
-        </div>
-    </div>
-}
-
-@if (Model.TorOtherServices.Count != 0)
-{
-    <div class="row mb-5">
-        <div class="col-lg-9 col-xl-8">
-            <h4 class="mb-3">Other TOR hidden services</h4>
-
-            <table class="table table-sm mt-2">
-                <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th>URL</th>
-                    </tr>
-                </thead>
-                <tbody>
-                @foreach (var s in Model.TorOtherServices)
-                {
-                    <tr>
-                        <td>@s.Name</td>
-                        <td style="word-wrap: anywhere;">
-                            <code>@s.Link</code>
-                        </td>
-                    </tr>
-                }
-                </tbody>
-            </table>
-        </div>
-    </div>
-}
-<div class="row mb-5">
-    <div class="col-lg-9 col-xl-8">
-        <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>
+    <div class="mb-5">
+        <h4 class="mb-3">Other external services</h4>
 
         <table class="table table-sm mt-2">
             <thead>
@@ -147,18 +50,105 @@
                 </tr>
             </thead>
             <tbody>
-            @foreach (var s in Model.ExternalStorageServices)
+            @foreach (var s in Model.ExternalServices.Where(service => string.IsNullOrEmpty(service.CryptoCode)))
+            {
+                <tr>
+                    <td>@s.DisplayName</td>
+                    <td style="text-align: right">
+                        <a asp-action="Service" asp-route-serviceName="@s.ServiceName">See information</a>
+                    </td>
+                </tr>
+            }
+            @foreach (var s in Model.OtherExternalServices)
             {
                 <tr>
                     <td>@s.Name</td>
                     <td style="text-align: right">
-                        <a href="@s.Link">Edit</a>
+                        <a href="@s.Link" target="_blank">See information</a>
                     </td>
                 </tr>
             }
             </tbody>
         </table>
     </div>
+}
+
+@if (Model.TorHttpServices.Count != 0)
+{
+    <div class="mb-5">
+        <h4 class="mb-3">HTTP-based TOR hidden services</h4>
+
+        <table class="table table-sm mt-2">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th style="text-align: right">Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+            @foreach (var s in Model.TorHttpServices)
+            {
+                <tr>
+                    <td>@s.Name</td>
+                    <td style="text-align: right">
+                        <a href="@s.Link" target="_blank">See information</a>
+                    </td>
+                </tr>
+            }
+            </tbody>
+        </table>
+    </div>
+}
+
+@if (Model.TorOtherServices.Count != 0)
+{
+    <div class="mb-5">
+        <h4 class="mb-3">Other TOR hidden services</h4>
+
+        <table class="table table-sm mt-2">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>URL</th>
+                </tr>
+            </thead>
+            <tbody>
+            @foreach (var s in Model.TorOtherServices)
+            {
+                <tr>
+                    <td>@s.Name</td>
+                    <td style="word-wrap: anywhere;">
+                        <code>@s.Link</code>
+                    </td>
+                </tr>
+            }
+            </tbody>
+        </table>
+    </div>
+}
+<div class="mb-5">
+    <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">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th style="text-align: right">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+        @foreach (var s in Model.ExternalStorageServices)
+        {
+            <tr>
+                <td>@s.Name</td>
+                <td style="text-align: right">
+                    <a href="@s.Link">Edit</a>
+                </td>
+            </tr>
+        }
+        </tbody>
+    </table>
 </div>
 
 @section PageFootContent {
diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css
index 2d99f9962..e610c130c 100644
--- a/BTCPayServer/wwwroot/main/site.css
+++ b/BTCPayServer/wwwroot/main/site.css
@@ -76,6 +76,7 @@
     margin: .3rem 0;
     border-left: 2px solid transparent;
     padding: .2rem 1rem;
+    font-weight: var(--btcpay-font-weight-semibold);
 }
 
 #sideNav .nav-link.active,
@@ -91,7 +92,7 @@
     margin-bottom: 1rem;
 }
 
-.social-row {
+.social-row {   
     margin: 2rem 0;
 }