diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 5cf8ad89c..c5f2c78aa 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -75,9 +75,9 @@
                                 </button>
 
                                 @{
-                                    var storeIds = String.Join(
+                                    var storeIds = string.Join(
                                         "",
-                                        Model.StoreIds.Select(storeId => string.Format(",storeid:{0}", storeId))
+                                        Model.StoreIds.Select(storeId => $",storeid:{storeId}")
                                     );
                                 }
 
@@ -116,7 +116,7 @@
                     </div>
                     <div class="modal-body">
                         <div class="form-group row">
-                            <label for="staticEmail" class="col-sm-3 col-form-label">Start Date</label>
+                            <label for="dtpStartDate" class="col-sm-3 col-form-label">Start Date</label>
                             <div class="col-sm-9">
                                 <div class="input-group">
                                     <input id="dtpStartDate" class="form-control flatdtpicker" type="datetime-local"
@@ -273,7 +273,7 @@
                             </tr>
                             <tr id="invoice_@invoice.InvoiceId" style="display:none;">
                                 <td colspan="99">
-                                    <div style="margin-left: 15px; margin-bottom: 0px;">
+                                    <div style="margin-left: 15px; margin-bottom: 0;">
                                         <partial name="InvoicePaymentsPartial" model="invoice.Details" />
                                     </div>
                                 </td>
@@ -284,13 +284,13 @@
                 <nav aria-label="..." class="w-100">
                     <ul class="pagination float-left">
                         <li class="page-item @(Model.Skip == 0 ? "disabled" : null)">
-                            <a class="page-link" tabindex="-1" href="@listInvoices(-1, Model.Count)">&laquo;</a>
+                            <a class="page-link" tabindex="-1" href="@ListInvoices(-1, Model.Count)">&laquo;</a>
                         </li>
                         <li class="page-item disabled">
-                            <span class="page-link">@(Model.Skip + 1) to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span>
+                            <span class="page-link">@Model.Skip to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span>
                         </li>
                         <li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")">
-                            <a class="page-link" href="@listInvoices(1, Model.Count)">&raquo;</a>
+                            <a class="page-link" href="@ListInvoices(1, Model.Count)">&raquo;</a>
                         </li>
                     </ul>
                     <ul class="pagination float-right">
@@ -298,27 +298,31 @@
                             <span class="page-link">Page Size:</span>
                         </li>
                         <li class="page-item @(Model.Count == 50 ? "active" : null)">
-                            <a class="page-link" href="@listInvoices(0, 50)">50</a>
+                            <a class="page-link" href="@ListInvoices(0, 50)">50</a>
                         </li>
                         <li class="page-item @(Model.Count == 100 ? "active" : null)">
-                            <a class="page-link" href="@listInvoices(0, 100)">100</a>
+                            <a class="page-link" href="@ListInvoices(0, 100)">100</a>
                         </li>
                         <li class="page-item @(Model.Count == 250 ? "active" : null)">
-                            <a class="page-link" href="@listInvoices(0, 250)">250</a>
+                            <a class="page-link" href="@ListInvoices(0, 250)">250</a>
                         </li>
                         <li class="page-item @(Model.Count == 500 ? "active" : null)">
-                            <a class="page-link" href="@listInvoices(0, 500)">500</a>
+                            <a class="page-link" href="@ListInvoices(0, 500)">500</a>
                         </li>
                     </ul>
                 </nav>
                 @{
-                    string listInvoices(int prevNext, int count)
+                    string ListInvoices(int prevNext, int count)
                     {
                         var skip = Model.Skip;
                         if (prevNext == -1)
+                        {
                             skip = Math.Max(0, Model.Skip - Model.Count);
+                        }
                         else if (prevNext == 1)
+                        {
                             skip = Model.Skip + count;
+                        }
 
                         var act = Url.Action("ListInvoices", new
                         {