diff --git a/app/Livewire/Flow2/ProcessPayment.php b/app/Livewire/Flow2/ProcessPayment.php
index 54e1490e3637..8598357520aa 100644
--- a/app/Livewire/Flow2/ProcessPayment.php
+++ b/app/Livewire/Flow2/ProcessPayment.php
@@ -83,4 +83,4 @@ class ProcessPayment extends Component
 
         return render($this->payment_view, $this->payment_data_payload);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Livewire/Flow2/UnderOverPayment.php b/app/Livewire/Flow2/UnderOverPayment.php
index b703e36cbdc8..31ec54cb6932 100644
--- a/app/Livewire/Flow2/UnderOverPayment.php
+++ b/app/Livewire/Flow2/UnderOverPayment.php
@@ -75,4 +75,4 @@ class UnderOverPayment extends Component
     {
         return render('flow2.under-over-payments');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Livewire/InvoicePay.php b/app/Livewire/InvoicePay.php
index 360bba244cdc..7296786f05bb 100644
--- a/app/Livewire/InvoicePay.php
+++ b/app/Livewire/InvoicePay.php
@@ -150,7 +150,8 @@ class InvoicePay extends Component
         $client = $invite->contact->client;
         $settings = $client->getMergedSettings();
         $this->context['settings'] = $settings;
-
+        $this->context['db'] = $this->db;
+        
         $invoices = Invoice::find($this->transformKeys($this->invoices));
         $invoices = $invoices->filter(function ($i){
             
@@ -166,7 +167,6 @@ class InvoicePay extends Component
         //under-over / payment
 
         //required fields
-
         $this->terms_accepted = !$settings->show_accept_invoice_terms;
         $this->signature_accepted = !$settings->require_invoice_signature;
         $this->under_over_payment = $settings->client_portal_allow_over_payment || $settings->client_portal_allow_under_payment;
diff --git a/resources/views/portal/ninja2020/components/livewire/under-over-payments.blade.php b/resources/views/portal/ninja2020/components/livewire/under-over-payments.blade.php
index a9388675934f..087f3cc38098 100644
--- a/resources/views/portal/ninja2020/components/livewire/under-over-payments.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/under-over-payments.blade.php
@@ -1,6 +1,6 @@
 <div x-data="{ payableInvoices: @entangle('payableInvoices'), errors: @entangle('errors') }" class="px-4 py-5 bg-white sm:gap-4 sm:px-6">
     
-    <dt class="text-sm font-medium leading-5 text-gray-500">
+    <dt class="text-sm font-medium leading-5 text-gray-500 mb-3">
         {{ ctrans('texts.payment_amount') }}
     </dt>
     <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2 flex flex-col">
@@ -8,10 +8,10 @@
 
     <template x-for="(invoice, index) in payableInvoices" :key="index">
             
-        <div class="flex items-center">
+        <div class="flex items-center mb-2">
             <label>
                 <span x-text="'{{ ctrans('texts.invoice') }} ' + invoice.number" class="mt-2"></span>
-                <span>{{ $currency->code }} ({{ $currency->symbol }})</span>
+                <span class="pr-2">{{ $currency->code }} ({{ $currency->symbol }})</span>
                 <input
                     type="text"
                     class="input mt-0 mr-4 relative"