diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js
index 0743d8107..9fd89774a 100644
--- a/public/akaunting-js/generalAction.js
+++ b/public/akaunting-js/generalAction.js
@@ -244,10 +244,13 @@ function runTooltip(tooltipToggleEl) {
 
     function show() {
         // Make the tooltip visible
-        tooltipEl.classList.remove("opacity-0");
-        tooltipEl.classList.add("opacity-100");
-        tooltipEl.classList.remove("invisible");
-        tooltipEl.classList.add("visible"); // Enable the event listeners
+            if (tooltipEl.classList.contains("opacity-100", "visible")) {
+                tooltipEl.classList.remove("opacity-0");
+                tooltipEl.classList.add("opacity-100");
+                tooltipEl.classList.remove("invisible");
+                tooltipEl.classList.add("visible"); 
+            }
+         // Enable the event listeners
 
         popperInstance.setOptions((options) => ({
             ...options,
@@ -265,10 +268,13 @@ function runTooltip(tooltipToggleEl) {
 
     function hide() {
         // Hide the tooltip
-        tooltipEl.classList.remove("opacity-100");
-        tooltipEl.classList.add("opacity-0");
-        tooltipEl.classList.remove("visible");
-        tooltipEl.classList.add("invisible"); // Disable the event listeners
+        if (tooltipEl.classList.contains("opacity-100", "visible")) {
+            tooltipEl.classList.remove("opacity-100");
+            tooltipEl.classList.add("opacity-0");
+            tooltipEl.classList.remove("visible");
+            tooltipEl.classList.add("invisible");
+        }
+        // Disable the event listeners
 
         popperInstance.setOptions((options) => ({
             ...options,
diff --git a/resources/views/components/form/group/invoice_text.blade.php b/resources/views/components/form/group/invoice_text.blade.php
index 9f4126e5e..49f142384 100644
--- a/resources/views/components/form/group/invoice_text.blade.php
+++ b/resources/views/components/form/group/invoice_text.blade.php
@@ -156,8 +156,8 @@
         @if (! empty($remote))
         remote-action="{{ $attributes['remote_action'] }}"
 
-        @if (! empty($attributes['currecny_code']))
-        currency-code="{{ $attributes['currecny_code'] }}"
+        @if (! empty($attributes['currency_code']))
+        currency-code="{{ $attributes['currency_code'] }}"
         @endif
         @endif
 
diff --git a/resources/views/components/form/group/select.blade.php b/resources/views/components/form/group/select.blade.php
index 2802fb0ef..129fac719 100644
--- a/resources/views/components/form/group/select.blade.php
+++ b/resources/views/components/form/group/select.blade.php
@@ -174,8 +174,8 @@
         @if (! empty($remote))
         remote-action="{{ $attributes['remote_action'] }}"
 
-        @if (! empty($attributes['currecny_code']))
-        currency-code="{{ $attributes['currecny_code'] }}"
+        @if (! empty($attributes['currency_code']))
+        currency-code="{{ $attributes['currency_code'] }}"
         @endif
         @endif
 
diff --git a/resources/views/components/form/input/select.blade.php b/resources/views/components/form/input/select.blade.php
index a6b080761..901b942c3 100644
--- a/resources/views/components/form/input/select.blade.php
+++ b/resources/views/components/form/input/select.blade.php
@@ -160,8 +160,8 @@
     @if (! empty($remote))
     remote-action="{{ $attributes['remote_action'] }}"
 
-    @if (! empty($attributes['currecny_code']))
-    currency-code="{{ $attributes['currecny_code'] }}"
+    @if (! empty($attributes['currency_code']))
+    currency-code="{{ $attributes['currency_code'] }}"
     @endif
     @endif
 
diff --git a/resources/views/portal/invoices/preview.blade.php b/resources/views/portal/invoices/preview.blade.php
index 46fbf9f0c..b4630ac93 100644
--- a/resources/views/portal/invoices/preview.blade.php
+++ b/resources/views/portal/invoices/preview.blade.php
@@ -20,7 +20,7 @@
     </x-slot>
 
     <x-slot name="content">
-        <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0">
+        <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-4 lg:space-y-0">
             <div class="w-full lg:w-5/12">
                 @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
                     <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@@ -80,7 +80,7 @@
                                 not-required
                                 form-group-class="invisible"
                                 placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
-                                change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
+                                change="onChangePaymentMethodSigned"
                             />
 
                             <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
@@ -128,7 +128,7 @@
                 @endif
             </div>
 
-            <div class="hidden lg:block w-7/12">
+            <div class="w-full lg:w-7/12">
                 <x-documents.show.template
                     type="invoice"
                     :document="$invoice"
diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php
index b62a1b6ec..fe93d0f9d 100644
--- a/resources/views/portal/invoices/show.blade.php
+++ b/resources/views/portal/invoices/show.blade.php
@@ -18,7 +18,7 @@
     </x-slot>
 
     <x-slot name="content">
-        <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0">
+        <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-4 lg:space-y-0">
             <div class="w-full lg:w-5/12">
                 @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
                     <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@@ -31,7 +31,7 @@
                                         @stack('invoice_{{ $key }}_tab_start')
                                             <div
                                                 x-on:click="active = '{{ $name }}'"
-                                                @click="onChangePaymentMethodSigned('{{ $key }}')"
+                                                @click="onChangePaymentMethod('{{ $key }}')"
                                                 id="tabs-payment-method-{{ $key }}-tab"
                                                 x-bind:class="active != '{{ $name }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
                                                 class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link {{ count($payment_methods) > 3 ? 'swiper-slide': '' }}"
@@ -78,7 +78,7 @@
                                 not-required
                                 form-group-class="invisible"
                                 placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
-                                change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
+                                change="onChangePaymentMethod"
                             />
 
                             <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
@@ -126,7 +126,7 @@
                 @endif
             </div>
 
-            <div class="hidden lg:block w-7/12">
+            <div class="w-full lg:w-7/12">
                 <x-documents.show.template
                     type="invoice"
                     :document="$invoice"
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index a3835c6fe..7c5ec4ddd 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -27,7 +27,7 @@
         </x-slot>
 
         <x-slot name="content">
-            <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-12 lg:space-y-0">
+            <div class="flex flex-col lg:flex-row my-10 lg:space-x-24 rtl:space-x-reverse space-y-4 lg:space-y-0">
                 <div class="w-full lg:w-5/12">
                     @if (! empty($payment_methods) && ! in_array($invoice->status, ['paid', 'cancelled']))
                         <div class="tabs w-full" x-data="{ active: '{{ reset($payment_methods) }}' }">
@@ -87,7 +87,7 @@
                                     not-required
                                     form-group-class="invisible"
                                     placeholder="{{ trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)]) }}"
-                                    change="onChangePaymentMethodSigned('{{ array_key_first($payment_methods) }}')"
+                                    change="onChangePaymentMethodSigned"
                                 />
 
                                 <x-form.input.hidden name="document_id" :value="$invoice->id" v-model="form.document_id" />
@@ -135,7 +135,7 @@
                     @endif
                 </div>
 
-                <div class="hidden lg:block w-7/12">
+                <div class="w-full lg:w-7/12">
                     <x-documents.show.template
                         type="invoice"
                         :document="$invoice"