diff --git a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
index ee63ed62e..c5e6b0060 100644
--- a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
+++ b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
@@ -52,7 +52,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
         [Range(double.Epsilon, double.PositiveInfinity, ErrorMessage = "Please provide an amount greater than 0")]
         public decimal Amount { get; set; }
 
-        [Display(Name = "The currency used for payment request. (e.g. BTC, LTC, USD, etc.)")]
+        [Display(Name = "Currency")]
         public string Currency { get; set; }
 
         [Display(Name = "Expiration Date")]
diff --git a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
index 4a8dd7358..ffc899af9 100644
--- a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
@@ -25,17 +25,18 @@
                 <input asp-for="Title" class="form-control" required />
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
-            <div class="form-group">
-                <label asp-for="Amount" class="form-label" data-required></label>
-                <input type="number" step="any" asp-for="Amount" class="form-control" required />
-                <span asp-validation-for="Amount" class="text-danger"></span>
+            <div class="d-flex justify-content-between">
+                <div class="form-group flex-fill me-4">
+                    <label asp-for="Amount" class="form-label" data-required></label>
+                    <input type="number" step="any" asp-for="Amount" class="form-control" required />
+                    <span asp-validation-for="Amount" class="text-danger"></span>
+                </div>
+                <div class="form-group">
+                    <label asp-for="Currency" class="form-label"></label>
+                    <input asp-for="Currency" class="form-control" />
+                    <span asp-validation-for="Currency" class="text-danger"></span>
+                </div>
             </div>
-            <div class="form-group">
-                <label asp-for="Currency" class="form-label"></label>
-                <input asp-for="Currency" class="form-control" />
-                <span asp-validation-for="Currency" class="text-danger"></span>
-            </div>
-
             <div class="form-group form-check">
                 <input asp-for="AllowCustomPaymentAmounts" type="checkbox" class="form-check-input" />
                 <label asp-for="AllowCustomPaymentAmounts" class="form-check-label"></label>
@@ -101,7 +102,9 @@
             </div>
             
             <div class="form-group mt-4">
-                <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
+                <button type="submit" class="btn btn-primary" id="SaveButton">
+                    @(string.IsNullOrEmpty(Model.Id) ? "Create" : "Save")
+                </button>
                 @if (!string.IsNullOrEmpty(Model.Id))
                 {
                     <a class="btn btn-secondary" target="_blank" asp-action="ViewPaymentRequest" asp-route-payReqId="@Model.Id" id="ViewAppButton">View</a>
@@ -120,7 +123,6 @@
                         <a class="btn btn-secondary" data-bs-toggle="tooltip" title="Unarchive this payment request" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival" asp-route-payReqId="@Model.Id">Unarchive</a>
                     }
                 }
-                <a asp-action="GetPaymentRequests" asp-route-storeId="@Model.StoreId" class="btn btn-link px-0 ms-3">Back to list</a>
             </div>
         </div>
     </div>
diff --git a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
index b987930f1..fef58911e 100644
--- a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
@@ -22,14 +22,14 @@
     </a>
 </div>
 
-<div class="row">
-    <div class="col-12 col-lg-6 mb-3 ms-auto">
+<div class="row mb-2">
+    <div class="col col-lg-8 col-xl-6 mr-auto">
         <form asp-action="GetPaymentRequests" method="get">
             <input type="hidden" asp-for="Count"/>
             <input type="hidden" asp-for="TimezoneOffset" />
             <div class="input-group">
-                <input asp-for="SearchTerm" class="form-control" style="width:300px;"/>
-                <button type="submit" class="btn btn-secondary" title="Search invoice">
+                <input asp-for="SearchTerm" class="form-control" />
+                <button type="submit" class="btn btn-secondary text-nowrap" title="Search invoice">
                     <span class="fa fa-search"></span> Search
                 </button>
                 <button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">