diff --git a/BTCPayServer/Views/Server/Files.cshtml b/BTCPayServer/Views/Server/Files.cshtml
index 2d0144b6c..37f3ad809 100644
--- a/BTCPayServer/Views/Server/Files.cshtml
+++ b/BTCPayServer/Views/Server/Files.cshtml
@@ -72,23 +72,18 @@ else
                 <li class="list-group-item">
                     @file.FileName
                 </li>
-
                 <li class="list-group-item">
-                    <div class="row px-0 mx-0">
-                        <span class="col-sm-12 col-md-2">Url: </span>
-                        <a class="col-sm-12 col-md-10 text-end" asp-action="GetFile" asp-controller="Storage" asp-route-fileId="@Model.SelectedFileId" target="_blank">
-                            @Url.Action("GetFile", "Storage", new
-                            {
-                                fileId = Model.SelectedFileId
-                            }, Context.Request.Scheme, Context.Request.Host.ToString())
-                        </a>
-                    </div>
+                    <strong>URL:</strong>
+                    <a asp-action="GetFile" asp-controller="Storage" asp-route-fileId="@Model.SelectedFileId" target="_blank">
+                        @Url.Action("GetFile", "Storage", new
+                        {
+                            fileId = Model.SelectedFileId
+                        }, Context.Request.Scheme, Context.Request.Host.ToString())
+                    </a>
                 </li>
-                <li class="list-group-item ">
-                    <div class="row px-0 mx-0">
-                        <span class="col-sm-12 col-md-2">Direct Url: </span>
-                        <a class="col-sm-12 col-md-10 text-end" href="@Model.DirectFileUrl" target="_blank">@Model.DirectFileUrl</a>
-                    </div>
+                <li class="list-group-item">
+                    <strong>Direct URL:</strong>
+                    <a href="@Model.DirectFileUrl" target="_blank">@Model.DirectFileUrl</a>
                 </li>
             </ul>
         </div>
diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/Server/ListUsers.cshtml
index 7aab4b525..4cbf61d0d 100644
--- a/BTCPayServer/Views/Server/ListUsers.cshtml
+++ b/BTCPayServer/Views/Server/ListUsers.cshtml
@@ -35,19 +35,6 @@
     </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>
-    <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/Services.cshtml b/BTCPayServer/Views/Server/Services.cshtml
index 4fb4ab799..53adcb36b 100644
--- a/BTCPayServer/Views/Server/Services.cshtml
+++ b/BTCPayServer/Views/Server/Services.cshtml
@@ -5,37 +5,37 @@
 
 <h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-    <div class="mb-5">
-        <h4 class="mb-3">Crypto services exposed by your server</h4>
-        <table class="table table-sm mt-2">
-            <thead>
-                <tr>
-                    <th>Crypto</th>
-                    <th>Access Type</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.CryptoCode</td>
-                    <td>
-                        <span>@s.DisplayName</span>
-                        @if (s.ConnectionString.IsOnion() == true ||
-                            (s.ConnectionString.IsOnion() == false && this.Context.Request.IsOnion()))
-                        {
-                        <span><img style="display:inline; margin-top:-8px;" src="~/img/icons/Onion_Color.svg" height="20" asp-append-version="true" /></span>
-                        }
-                    </td>
-                    <td style="text-align: right">
-                        <a asp-action="Service" asp-route-serviceName="@s.ServiceName" asp-route-cryptoCode="@s.CryptoCode">See information</a>
-                    </td>
-                </tr>
-            }
-            </tbody>
-        </table>
-    </div>
+<div class="mb-5">
+    <h4 class="mb-3">Crypto services exposed by your server</h4>
+    <table class="table table-sm mt-2">
+        <thead>
+            <tr>
+                <th>Crypto</th>
+                <th>Access Type</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.CryptoCode</td>
+                <td>
+                    <span>@s.DisplayName</span>
+                    @if (s.ConnectionString.IsOnion() == true ||
+                        (s.ConnectionString.IsOnion() == false && Context.Request.IsOnion()))
+                    {
+                        <img style="display:inline; margin-top:-8px;" src="~/img/icons/Onion_Color.svg" height="20" asp-append-version="true" alt="Tor Hidden Service" />
+                    }
+                </td>
+                <td style="text-align: right">
+                    <a asp-action="Service" asp-route-serviceName="@s.ServiceName" asp-route-cryptoCode="@s.CryptoCode">See information</a>
+                </td>
+            </tr>
+        }
+        </tbody>
+    </table>
+</div>
 
 @if (Model.OtherExternalServices.Count != 0 || Model.ExternalServices.Any(service => string.IsNullOrEmpty(service.CryptoCode)))
 {
@@ -76,7 +76,7 @@
 @if (Model.TorHttpServices.Count != 0)
 {
     <div class="mb-5">
-        <h4 class="mb-3">HTTP-based TOR hidden services</h4>
+        <h4 class="mb-3">HTTP-based Tor hidden services</h4>
 
         <table class="table table-sm mt-2">
             <thead>
@@ -103,7 +103,7 @@
 @if (Model.TorOtherServices.Count != 0)
 {
     <div class="mb-5">
-        <h4 class="mb-3">Other TOR hidden services</h4>
+        <h4 class="mb-3">Other Tor hidden services</h4>
 
         <table class="table table-sm mt-2">
             <thead>