diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 5fed51c81..eff0b41fd 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.78</Version>
+		<Version>1.0.1.79</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs
index e9745d637..4aac6b1ab 100644
--- a/BTCPayServer/Controllers/InvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/InvoiceController.UI.cs
@@ -358,7 +358,7 @@ namespace BTCPayServer.Controllers
         [Route("invoices")]
         [Authorize(AuthenticationSchemes = "Identity.Application")]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 20)
+        public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 50)
         {
             var model = new InvoicesModel();
             var filterString = new SearchString(searchTerm);
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index c90bf0870..25382c7ed 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -18,8 +18,10 @@
                 <hr class="primary">
                 <p>Create, search or pay an invoice. (<a href="#help" data-toggle="collapse">Help</a>)</p>
                 <div id="help" class="collapse text-left">
-                    <p>You can search for invoice Id, deposit address, price, order id, store id, any buyer information and any product information.</br>
-                    You can also apply filters to your search by searching for `filtername:value`, here is a list of supported filters</p>
+                    <p>
+                        You can search for invoice Id, deposit address, price, order id, store id, any buyer information and any product information.</br>
+                        You can also apply filters to your search by searching for `filtername:value`, here is a list of supported filters
+                    </p>
                     <ul>
                         <li><b>storeid:id</b> for filtering a specific store</li>
                         <li><b>status:(expired|invalid|complete|confirmed|paid|new)</b> for filtering a specific status</li>
@@ -27,12 +29,16 @@
                 </div>
                 <div class="form-group">
                     <form asp-action="SearchInvoice" method="post">
-                        <input asp-for="SearchTerm" class="form-control" />
+                        <div class="input-group">
+                            <input asp-for="SearchTerm" class="form-control" />
+                            <span class="input-group-btn">
+                                <button type="submit" class="btn btn-primary" title="Search invoice">
+                                    <span class="fa fa-search"></span> Search
+                                </button>
+                            </span>
+                        </div>
                         <input type="hidden" asp-for="Count" />
                         <span asp-validation-for="SearchTerm" class="text-danger"></span>
-                        <button type="submit" class="btn btn-primary" title="Search invoice">
-                            <span class="fa fa-search"></span> Search
-                        </button>
                     </form>
                 </div>
             </div>
@@ -82,13 +88,13 @@
                             }
                             else
                             {
-                                <td >@invoice.Status</td>
+                                <td>@invoice.Status</td>
                             }
                             <td style="text-align:right">@invoice.AmountCurrency</td>
                             <td style="text-align:right">
                                 @if(invoice.Status == "new")
                                 {
-                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span> 
+                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span>
                                 }<a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a>
                             </td>
                         </tr>
diff --git a/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css b/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css
index d130b9d6f..924bc165f 100644
--- a/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css
+++ b/BTCPayServer/wwwroot/vendor/bootstrap4/css/bootstrap.css
@@ -1047,7 +1047,9 @@ pre {
   .table td {
     padding: 0.75rem;
     vertical-align: top;
-    border-top: 1px solid #dee2e6; }
+    border-top: 0px solid #dee2e6;
+    border-bottom: 1px solid #dee2e6;
+  }
   .table thead th {
     vertical-align: bottom;
     border-bottom: 2px solid #dee2e6; }