diff --git a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
index ca4133c77..3f53fcb32 100644
--- a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
@@ -18,34 +18,12 @@
 <section>
     <div class="container">
         <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)">
+        <form method="post" action="@Url.Action("EditPaymentRequest", "PaymentRequest", new { id = Model.Id}, Context.Request.Scheme)">
+            <div class="row">
+                <div class="col-lg-6">
                     <input type="hidden" name="Id" value="@Model.Id" />
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-                    <div class="form-group">
-                        <label asp-for="Title" class="form-label" data-required></label>
-                        <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>
-                    <div class="form-group">
-                        <label asp-for="Currency" class="form-label" data-required></label>
-                        <input asp-for="Currency" class="form-control" required />
-                        <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>
-                        <span asp-validation-for="AllowCustomPaymentAmounts" class="text-danger"></span>
-                    </div>
                     <div class="form-group">
                         <label asp-for="StoreId" class="form-label"></label>
                         @if (string.IsNullOrEmpty(Model.Id))
@@ -63,6 +41,32 @@
                         <label asp-for="Email" class="form-label"></label>
                         <input type="email" asp-for="Email" class="form-control" />
                         <span asp-validation-for="Email" class="text-danger"></span>
+                        <p id="PaymentRequestEmailHelpBlock" class="form-text text-muted">
+                            Receive updates for this payment request.
+                        </p>
+                    </div>
+                    <h4 class="mt-5 mb-4">Request Details</h4>
+                    <div class="form-group">
+                        <label asp-for="Title" class="form-label" data-required></label>
+                        <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>
+                    <div class="form-group">
+                        <label asp-for="Currency" class="form-label" data-required></label>
+                        <input asp-for="Currency" class="form-control" required />
+                        <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>
+                        <span asp-validation-for="AllowCustomPaymentAmounts" class="text-danger"></span>
                     </div>
                     <div class="form-group">
                         <label asp-for="ExpiryDate" class="form-label"></label>
@@ -76,11 +80,14 @@
                         </div>
                         <span asp-validation-for="ExpiryDate" class="text-danger"></span>
                     </div>
+                </div>
+                <div class="col-lg-9">
                     <div class="form-group">
                         <label asp-for="Description" class="form-label"></label>
                         <textarea asp-for="Description" class="form-control richtext"></textarea>
                         <span asp-validation-for="Description" class="text-danger"></span>
                     </div>
+                    <h4 class="mt-5 mb-4">Custom Appearance</h4>
                     <div class="form-group">
                         <label asp-for="CustomCSSLink" class="form-label"></label>
                         <a href="https://docs.btcpayserver.org/Theme/#2-bootstrap-themes" target="_blank">
@@ -94,7 +101,7 @@
                         <textarea asp-for="EmbeddedCSS" rows="10" cols="40" class="form-control"></textarea>
                         <span asp-validation-for="EmbeddedCSS" class="text-danger"></span>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group mt-4">
                         <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
                         @if (!string.IsNullOrEmpty(Model.Id))
                         {
@@ -114,10 +121,10 @@
                                 <a class="btn btn-secondary" data-bs-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 ms-3">Back to list</a>
+                        <a asp-action="GetPaymentRequests" class="btn btn-link px-0 ms-3">Back to list</a>
                     </div>
-                </form>
+                </div>
             </div>
-        </div>
+        </form>
     </div>
 </section>