diff --git a/app/Jobs/Quote/CreateQuotePdf.php b/app/Jobs/Quote/CreateQuotePdf.php
index 4e94cd81c4d9..c7493e77a081 100644
--- a/app/Jobs/Quote/CreateQuotePdf.php
+++ b/app/Jobs/Quote/CreateQuotePdf.php
@@ -19,6 +19,7 @@ use App\Models\ClientContact;
 use App\Models\Company;
 use App\Models\Design;
 use App\Models\Invoice;
+use App\Services\PdfMaker\Design as PdfMakerDesign;
 use App\Services\PdfMaker\PdfMaker as PdfMakerService;
 use App\Utils\HtmlEngine;
 use App\Utils\PhantomJS\Phantom;
@@ -82,17 +83,12 @@ class CreateQuotePdf implements ShouldQueue
         $quote_design_id = $this->quote->design_id ? $this->quote->design_id : $this->decodePrimaryKey($this->quote->client->getSetting('quote_design_id'));
 
         $design = Design::find($quote_design_id);
-
         $html = new HtmlEngine(null, $this->invitation, 'quote');
 
-        $design_namespace = 'App\Services\PdfMaker\Designs\\'.$design->name;
-
-        $design_class = new $design_namespace();
-
-        $pdf_variables = json_decode(json_encode($this->quote->company->settings->pdf_variables), 1);
+        $template = new PdfMakerDesign(strtolower($design->name));
 
         $state = [
-            'template' => $design_class->elements([
+            'template' => $template->elements([
                 'client' => $this->quote->client,
                 'entity' => $this->quote,
                 'pdf_variables' => (array) $this->quote->company->settings->pdf_variables,
@@ -107,7 +103,7 @@ class CreateQuotePdf implements ShouldQueue
         $maker = new PdfMakerService($state);
 
         $maker
-            ->design($design_namespace)
+            ->design($template)
             ->build();
 
         //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
diff --git a/resources/views/portal/ninja2020/invoices/payment.blade.php b/resources/views/portal/ninja2020/invoices/payment.blade.php
index 0a1838e0336c..9cd24264dd4b 100644
--- a/resources/views/portal/ninja2020/invoices/payment.blade.php
+++ b/resources/views/portal/ninja2020/invoices/payment.blade.php
@@ -2,18 +2,18 @@
 @section('meta_title', ctrans('texts.pay_now'))
 
 @push('head')
-    <meta name="show-invoice-terms" content="{{ $settings->show_accept_invoice_terms ? true : false }}">
-    <meta name="require-invoice-signature" content="{{ $settings->require_invoice_signature ? true : false }}">
-    <script src="https://cdn.jsdelivr.net/npm/signature_pad@2.3.2/dist/signature_pad.min.js"></script>
+<meta name="show-invoice-terms" content="{{ $settings->show_accept_invoice_terms ? true : false }}">
+<meta name="require-invoice-signature" content="{{ $settings->require_invoice_signature ? true : false }}">
+<script src="https://cdn.jsdelivr.net/npm/signature_pad@2.3.2/dist/signature_pad.min.js"></script>
 @endpush
 
 @section('body')
-    <form action="{{ route('client.payments.process') }}" method="post" id="payment-form">
-        @csrf
-        <input type="hidden" name="company_gateway_id" id="company_gateway_id">
-        <input type="hidden" name="payment_method_id" id="payment_method_id">
-        <input type="hidden" name="signature">
-    
+<form action="{{ route('client.payments.process') }}" method="post" id="payment-form">
+    @csrf
+    <input type="hidden" name="company_gateway_id" id="company_gateway_id">
+    <input type="hidden" name="payment_method_id" id="payment_method_id">
+    <input type="hidden" name="signature">
+
     <div class="container mx-auto">
         <div class="grid grid-cols-6 gap-4">
             <div class="col-span-6 md:col-start-2 md:col-span-4">
@@ -21,112 +21,111 @@
                     <div class="flex justify-end mb-2">
                         <!-- Pay now button -->
                         @if(count($payment_methods) > 0)
-                            <div x-data="{ open: false }" @keydown.window.escape="open = false" @click.away="open = false"
-                                class="relative inline-block text-left">
-                                <div>
-                                    <div class="rounded-md shadow-sm">
-                                        <button @click="open = !open" type="button"
-                                                class="inline-flex justify-center w-full rounded-md border border-gray-300 px-4 py-2 bg-white text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-50 active:text-gray-800 transition ease-in-out duration-150">
-                                            {{ ctrans('texts.pay_now') }}
-                                            <svg class="-mr-1 ml-2 h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
-                                                <path fill-rule="evenodd"
-                                                    d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
-                                                    clip-rule="evenodd"/>
-                                            </svg>
-                                        </button>
-                                    </div>
+                        <div x-data="{ open: false }" @keydown.window.escape="open = false" @click.away="open = false" class="relative inline-block text-left">
+                            <div>
+                                <div class="rounded-md shadow-sm">
+                                    <button @click="open = !open" type="button" class="inline-flex justify-center w-full px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition duration-150 ease-in-out bg-white border border-gray-300 rounded-md hover:text-gray-500 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-50 active:text-gray-800">
+                                        {{ ctrans('texts.pay_now') }}
+                                        <svg class="w-5 h-5 ml-2 -mr-1" fill="currentColor" viewBox="0 0 20 20">
+                                            <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
+                                        </svg>
+                                    </button>
                                 </div>
-                                <div x-show="open" class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
-                                    <div class="rounded-md bg-white shadow-xs">
-                                        <div class="py-1">
-                                            @foreach($payment_methods as $payment_method)
-                                                <a data-turbolinks="false" href="#" @click="{ open = false }"
-                                                data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}"
-                                                data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}"
-                                                class="dropdown-gateway-button block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">
-                                                    {{ $payment_method['label'] }}
-                                                </a>
-                                            @endforeach
-                                        </div>
+                            </div>
+                            <div x-show="open" class="absolute right-0 w-56 mt-2 origin-top-right rounded-md shadow-lg">
+                                <div class="bg-white rounded-md shadow-xs">
+                                    <div class="py-1">
+                                        @foreach($payment_methods as $payment_method)
+                                        <a data-turbolinks="false" href="#" @click="{ open = false }" data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}" data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 dropdown-gateway-button hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">
+                                            {{ $payment_method['label'] }}
+                                        </a>
+                                        @endforeach
                                     </div>
                                 </div>
                             </div>
+                        </div>
                         @else
-                            <span class="inline-flex items-center text-sm">
-                                <span>{{ ctrans('texts.to_pay_invoices') }} &nbsp;</span>
-                                <a class="button-link" href="{{ route('client.payment_methods.index') }}">{{ ctrans('texts.add_payment_method_first') }}.</a>
-                            </span>
+                        <span class="inline-flex items-center text-sm">
+                            <span>{{ ctrans('texts.to_pay_invoices') }} &nbsp;</span>
+                            <a class="button-link" href="{{ route('client.payment_methods.index') }}">{{ ctrans('texts.add_payment_method_first') }}.</a>
+                        </span>
                         @endif
                     </div>
                 </div>
 
                 @foreach($invoices as $key => $invoice)
-                    <input type="hidden" name="payable_invoices[{{$key}}][invoice_id]" value="{{ $invoice->hashed_id }}">
-                    <div class="bg-white shadow overflow-hidden sm:rounded-lg mb-4">
-                        <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                            <h3 class="text-lg leading-6 font-medium text-gray-900">
-                                {{ ctrans('texts.invoice') }}
-                                <a class="button-link"
-                                   href="{{ route('client.invoice.show', $invoice->hashed_id) }}">
-                                    (#{{ $invoice->number }})
-                                </a>
-                            </h3>
-                            <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500" translate>
-                            </p>
-                        </div>
-                        <div>
-                            <dl>
-                                <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.invoice_number') }}
-                                    </dt>
-                                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{ $invoice->number }}
-                                    </dd>
-                                </div>
-                                <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.due_date') }}
-                                    </dt>
-                                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{ $invoice->due_date }}
-                                    </dd>
-                                </div>
-                                <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.additional_info') }}
-                                    </dt>
-                                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        @if($invoice->po_number)
-                                            {{ $invoice->po_number }}
-                                        @elseif($invoice->public_notes)
-                                            {{ $invoice->public_notes }}
-                                        @else
-                                            {{ $invoice->date}}
-                                        @endif
-                                    </dd>
-                                </div>
-                                <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.amount') }}
-                                    </dt>
-                                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        <!-- App\Utils\Number::formatMoney($invoice->amount, $invoice->client) -->
-                                        <input type="text" name="payable_invoices[{{$key}}][amount]" value="{{ $invoice->partial > 0 ? $invoice->partial : $invoice->balance }}">
-                                    </dd>
-                                </div>
-                            </dl>
-                        </div>
+                <input type="hidden" name="payable_invoices[{{$key}}][invoice_id]" value="{{ $invoice->hashed_id }}">
+                <div class="mb-4 overflow-hidden bg-white shadow sm:rounded-lg">
+                    <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
+                        <h3 class="text-lg font-medium leading-6 text-gray-900">
+                            {{ ctrans('texts.invoice') }}
+                            <a class="button-link" href="{{ route('client.invoice.show', $invoice->hashed_id) }}">
+                                (#{{ $invoice->number }})
+                            </a>
+                        </h3>
                     </div>
+                    <div>
+                        <dl>
+                            @if(!empty($invoice->number) && !is_null($invoice->number))
+                            <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                                <dt class="text-sm font-medium leading-5 text-gray-500">
+                                    {{ ctrans('texts.invoice_number') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ $invoice->number }}
+                                </dd>
+                            </div>
+                            @endif
+
+                            @if(!empty($invoice->due_date) && !is_null($invoice->due_date))
+                            <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                                <dt class="text-sm font-medium leading-5 text-gray-500">
+                                    {{ ctrans('texts.due_date') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ $invoice->due_date }}
+                                </dd>
+                            </div>
+                            @endif
+
+                            <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                                <dt class="text-sm font-medium leading-5 text-gray-500">
+                                    {{ ctrans('texts.additional_info') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    @if($invoice->po_number)
+                                    {{ $invoice->po_number }}
+                                    @elseif($invoice->public_notes)
+                                    {{ $invoice->public_notes }}
+                                    @else
+                                    {{ $invoice->date}}
+                                    @endif
+                                </dd>
+                            </div>
+
+                            @if(!empty($invoice->amount) && !is_null($invoice->amount))
+                            <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                                <dt class="text-sm font-medium leading-5 text-gray-500">
+                                    {{ ctrans('texts.amount') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    <!-- App\Utils\Number::formatMoney($invoice->amount, $invoice->client) -->
+                                    <input type="text" name="payable_invoices[{{$key}}][amount]" value="{{ $invoice->partial > 0 ? $invoice->partial : $invoice->balance }}">
+                                </dd>
+                            </div>
+                            @endif
+                        </dl>
+                    </div>
+                </div>
                 @endforeach
             </div>
         </div>
     </div>
-    </form>
-    @include('portal.ninja2020.invoices.includes.terms')
-    @include('portal.ninja2020.invoices.includes.signature')
+</form>
+@include('portal.ninja2020.invoices.includes.terms')
+@include('portal.ninja2020.invoices.includes.signature')
 @endsection
 
 @push('footer')
-    <script src="{{ asset('js/clients/invoices/payment.js') }}"></script>
-@endpush
+<script src="{{ asset('js/clients/invoices/payment.js') }}"></script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/payment_methods/show.blade.php b/resources/views/portal/ninja2020/payment_methods/show.blade.php
index e39a2c468406..5d7f624d3a4a 100644
--- a/resources/views/portal/ninja2020/payment_methods/show.blade.php
+++ b/resources/views/portal/ninja2020/payment_methods/show.blade.php
@@ -3,27 +3,31 @@
 
 @section('body')
     <div class="container mx-auto">
-        <div class="bg-white shadow overflow-hidden sm:rounded-lg">
+        <div class="overflow-hidden bg-white shadow sm:rounded-lg">
             <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                <h3 class="text-lg leading-6 font-medium text-gray-900">
+                <h3 class="text-lg font-medium leading-6 text-gray-900">
                     {{ ctrans("texts.{$payment_method->gateway_type->alias}") }}
                 </h3>
-                <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500" translate>
+                <p class="max-w-2xl mt-1 text-sm leading-5 text-gray-500" translate>
                     {{ ctrans('texts.payment_method_details') }}
                 </p>
             </div>
             <div>
                 <dl>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
+                    @if(!empty($payment_method->gateway_type->name) && !is_null($payment_method->gateway_type->name))
+                    <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                        <dt class="text-sm font-medium leading-5 text-gray-500">
                             {{ ctrans('texts.payment_type') }}
                         </dt>
                         <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                             {{ ucfirst($payment_method->gateway_type->name) }}
                         </dd>
                     </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
+                    @endif
+
+                    @if(!empty($payment_method->meta) && !is_null($payment_method->meta))
+                    <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                        <dt class="text-sm font-medium leading-5 text-gray-500">
                             {{ ctrans('texts.type') }}
                         </dt>
                         <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
@@ -31,33 +35,44 @@
                             {{ optional($payment_method->meta)->scheme }}
                         </dd>
                     </div>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
+                    @endif
+
+                    @if(!empty($payment_method->meta->last4) && !is_null($payment_method->meta->last4))
+                    <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                        <dt class="text-sm font-medium leading-5 text-gray-500">
                             {{ ctrans('texts.card_number') }}
                         </dt>
                         <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                             **** {{ ucfirst($payment_method->meta->last4) }}
                         </dd>
                     </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
+                    @endif
+                    
+                    @if(!empty($payment_method->created_at) && !is_null($payment_method->created_at))
+                    <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                        <dt class="text-sm font-medium leading-5 text-gray-500">
                             {{ ctrans('texts.date_created') }}
                         </dt>
                         <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                             {{ $payment_method->formatDateTimestamp($payment_method->created_at, auth()->user()->client->date_format()) }}
                         </dd>
                     </div>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
+                    @endif
+
+                    @if(!empty($payment_method->is_default) && !is_null($payment_method->is_default))
+                    <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                        <dt class="text-sm font-medium leading-5 text-gray-500">
                             {{ ctrans('texts.default') }}
                         </dt>
                         <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                             {{ $payment_method->is_default ? ctrans('texts.yes') : ctrans('texts.no') }}
                         </div>
                     </div>
+                    @endif
+                    
                     @isset($payment_method->meta->exp_month)
-                        <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                        <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm font-medium leading-5 text-gray-500">
                                 {{ ctrans('texts.expires') }}
                             </dt>
                             <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
@@ -68,14 +83,14 @@
                 </dl>
             </div>
         </div>
-        <div class="bg-white shadow sm:rounded-lg mb-4 mt-4" translate>
+        <div class="mt-4 mb-4 bg-white shadow sm:rounded-lg" translate>
             <div class="px-4 py-5 sm:p-6">
                 <div class="sm:flex sm:items-start sm:justify-between">
                     <div>
-                        <h3 class="text-lg leading-6 font-medium text-gray-900">
+                        <h3 class="text-lg font-medium leading-6 text-gray-900">
                             {{ ctrans('texts.remove')}}
                         </h3>
-                        <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
+                        <div class="max-w-xl mt-2 text-sm leading-5 text-gray-500">
                             <p>
                                 {{ ctrans('texts.permanently_remove_payment_method') }}
                             </p>
diff --git a/resources/views/portal/ninja2020/payments/show.blade.php b/resources/views/portal/ninja2020/payments/show.blade.php
index 494189757277..167138e02208 100644
--- a/resources/views/portal/ninja2020/payments/show.blade.php
+++ b/resources/views/portal/ninja2020/payments/show.blade.php
@@ -2,87 +2,100 @@
 @section('meta_title', ctrans('texts.payment'))
 
 @section('body')
-    <div class="container mx-auto">
-        <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-            <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                <h3 class="text-lg leading-6 font-medium text-gray-900">
-                    {{ ctrans('texts.payment') }}
-                </h3>
-                <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500" translate>
-                    {{ ctrans('texts.payment_details') }}
-                </p>
-            </div>
-            <div>
-                <dl>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.payment_date') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ $payment->clientPaymentDate() }}
-                        </dd>
-                    </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.transaction_reference') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ $payment->transaction_reference }}
-                        </dd>
-                    </div>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.method') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ optional($payment->type)->name }}
-                        </dd>
-                    </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.amount') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ $payment->formattedAmount() }}
-                        </dd>
-                    </div>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.status') }}
-                        </dt>
-                        <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {!! \App\Models\Payment::badgeForStatus($payment->status_id) !!}
-                        </div>
-                    </div>
-                </dl>
-            </div>
+<div class="container mx-auto">
+    <div class="overflow-hidden bg-white shadow sm:rounded-lg">
+        <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
+            <h3 class="text-lg font-medium leading-6 text-gray-900">
+                {{ ctrans('texts.payment') }}
+            </h3>
+            <p class="max-w-2xl mt-1 text-sm leading-5 text-gray-500" translate>
+                {{ ctrans('texts.payment_details') }}
+            </p>
         </div>
-        <div class="bg-white shadow overflow-hidden sm:rounded-lg mt-4">
-            <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                <h3 class="text-lg leading-6 font-medium text-gray-900">
-                    {{ ctrans('texts.invoices') }}
-                </h3>
-                <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
-                    {{ ctrans('texts.list_of_payment_invoices') }}
-                </p>
-            </div>
-            <div>
-                <dl>
-                    @foreach($payment->invoices as $invoice)
-                        <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm leading-5 font-medium text-gray-500">
-                                {{ ctrans('texts.invoice_number') }}
-                            </dt>
-                            <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                <a class="button-link"
-                                   href="{{ route('client.invoice.show', ['invoice' => $invoice->hashed_id])}}">
-                                    {{ $invoice->number }}
-                                </a>
-                            </div>
-                        </div>
-                    @endforeach
-                </dl>
-            </div>
+        <div>
+            <dl>
+                @if(!empty($payment->clientPaymentDate()) && !is_null($payment->clientPaymentDate()))
+                <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                    <dt class="text-sm font-medium leading-5 text-gray-500">
+                        {{ ctrans('texts.payment_date') }}
+                    </dt>
+                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                        {{ $payment->clientPaymentDate() }}
+                    </dd>
+                </div>
+                @endif
+
+                @if(!empty($payment->transaction_reference) && !is_null($payment->transaction_reference))
+                <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                    <dt class="text-sm font-medium leading-5 text-gray-500">
+                        {{ ctrans('texts.transaction_reference') }}
+                    </dt>
+                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                        {{ $payment->transaction_reference }}
+                    </dd>
+                </div>
+                @endif
+
+                @if(!empty(optional($payment->type)->name) && !is_null(optional($payment->type)->name))
+                <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                    <dt class="text-sm font-medium leading-5 text-gray-500">
+                        {{ ctrans('texts.method') }}
+                    </dt>
+                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                        {{ optional($payment->type)->name }}
+                    </dd>
+                </div>
+                @endif
+                
+                @if(!empty($payment->formattedAmount()) && !is_null($payment->formattedAmount()))
+                <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                    <dt class="text-sm font-medium leading-5 text-gray-500">
+                        {{ ctrans('texts.amount') }}
+                    </dt>
+                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                        {{ $payment->formattedAmount() }}
+                    </dd>
+                </div>
+                @endif
+
+                @if(!empty($payment->status_id) && !is_null($payment->status_id))
+                <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                    <dt class="text-sm font-medium leading-5 text-gray-500">
+                        {{ ctrans('texts.status') }}
+                    </dt>
+                    <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                        {!! \App\Models\Payment::badgeForStatus($payment->status_id) !!}
+                    </div>
+                </div>
+                @endif
+            </dl>
         </div>
     </div>
-@endsection
+    <div class="mt-4 overflow-hidden bg-white shadow sm:rounded-lg">
+        <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
+            <h3 class="text-lg font-medium leading-6 text-gray-900">
+                {{ ctrans('texts.invoices') }}
+            </h3>
+            <p class="max-w-2xl mt-1 text-sm leading-5 text-gray-500">
+                {{ ctrans('texts.list_of_payment_invoices') }}
+            </p>
+        </div>
+        <div>
+            <dl>
+                @foreach($payment->invoices as $invoice)
+                <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                    <dt class="text-sm font-medium leading-5 text-gray-500">
+                        {{ ctrans('texts.invoice_number') }}
+                    </dt>
+                    <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                        <a class="button-link" href="{{ route('client.invoice.show', ['invoice' => $invoice->hashed_id])}}">
+                            {{ $invoice->number }}
+                        </a>
+                    </div>
+                </div>
+                @endforeach
+            </dl>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file