diff --git a/resources/views/components/transfers/template/second.blade.php b/resources/views/components/transfers/template/second.blade.php
index b133f54b3..fcc896a32 100644
--- a/resources/views/components/transfers/template/second.blade.php
+++ b/resources/views/components/transfers/template/second.blade.php
@@ -1,4 +1,5 @@
 <div class="print-template">
+    @stack('details_start')
     <table style="width: 100%;">
         <tr>
             <td style="padding:0 0 15px 0;">
@@ -10,6 +11,7 @@
     </table>
 
     <table>
+        @stack('transferred_at_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
                 {{ trans('general.date') }}
@@ -19,7 +21,9 @@
                 <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
             </td>
         </tr>
+        @stack('transferred_at_input_end')
 
+        @stack('payment_method_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
                 {{ trans_choice('general.payment_methods', 1) }}
@@ -33,7 +37,9 @@
                 @endif
             </td>
         </tr>
+        @stack('payment_method_input_end')
 
+        @stack('reference_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
                 {{ trans('general.reference') }}
@@ -43,7 +49,9 @@
                 {{ $transfer->expense_transaction->reference }}
             </td>
         </tr>
+        @stack('reference_input_end')
 
+        @stack('description_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
                 {{ trans('general.description') }}
@@ -53,10 +61,14 @@
                 {{ $transfer->expense_transaction->description }}
             </td>
         </tr>
+        @stack('description_input_end')
     </table>
+    @stack('details_end')
 
+    @stack('from_account_start')
     <table style="width: 100%; margin-top:35px;">
         <tbody>
+            @stack('from_account_id_start')
             <tr>
                 <td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;">
                     <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
@@ -64,6 +76,7 @@
                     </h2>
 
                     <table>
+                        @stack('from_account_name_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('accounts.account_name') }}
@@ -73,9 +86,11 @@
                                 {{ $transfer->expense_account->name }}
                             </td>
                         </tr>
+                        @stack('from_account_name_input_end')
                     </table>
 
                     <table>
+                        @stack('from_account_number_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('accounts.number') }}
@@ -85,9 +100,12 @@
                                 {{ $transfer->expense_account->number}}
                             </td>
                         </tr>
+                        @stack('from_account_number_input_end')
                     </table>
 
+                    @if (! empty($transfer->expense_account->bank_name))
                     <table>
+                        @stack('from_account_bank_name_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('accounts.bank_name') }}
@@ -97,9 +115,13 @@
                                 {{ $transfer->expense_account->bank_name }}
                             </td>
                         </tr>
+                        @stack('from_account_bank_name_input_end')
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->expense_account->bank_phone))
                     <table>
+                        @stack('from_account_phone_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('general.phone') }}
@@ -109,9 +131,13 @@
                                 {{ $transfer->expense_account->bank_phone }}
                             </td>
                         </tr>
+                        @stack('from_account_phone_input_end')
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->expense_account->bank_address))
                     <table>
+                        @stack('from_account_address_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('general.address') }}
@@ -121,14 +147,20 @@
                                 {{ $transfer->expense_account->bank_address }}
                             </td>
                         </tr>
+                        @stack('from_account_address_input_end')
                     </table>
+                    @endif
                 </td>
             </tr>
+            @stack('from_account_id_end')
         </tbody>
     </table>
+    @stack('from_account_end')
 
+    @stack('to_account_start')
     <table style="width: 100%; margin-top:15px;">
         <tbody>
+            @stack('to_account_id_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
                     <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
@@ -136,6 +168,7 @@
                     </h2>
 
                     <table>
+                        @stack('to_account_name_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('accounts.number') }}
@@ -145,9 +178,11 @@
                                 {{ $transfer->income_account->name }}
                             </td>
                         </tr>
+                        @stack('to_account_name_input_end')
                     </table>
 
                     <table>
+                        @stack('to_account_number_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('accounts.number') }}
@@ -157,9 +192,12 @@
                                 {{ $transfer->income_account->number }}
                             </td>
                         </tr>
+                        @stack('to_account_number_input_end')
                     </table>
 
+                    @if (! empty($transfer->income_account->bank_name))
                     <table>
+                        @stack('to_account_bank_name_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('accounts.bank_name') }}
@@ -169,9 +207,13 @@
                                 {{ $transfer->income_account->bank_name }}
                             </td>
                         </tr>
+                        @stack('to_account_bank_name_input_end')
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->income_account->bank_phone))
                     <table>
+                        @stack('to_account_phone_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('general.phone') }}
@@ -181,9 +223,13 @@
                                 {{ $transfer->income_account->bank_phone }}
                             </td>
                         </tr>
+                        @stack('to_account_phone_input_end')
                     </table>
+                    @endif
 
+                    @if (! empty($transfer->income_account->bank_address))
                     <table>
+                        @stack('to_account_address_input_start')
                         <tr>
                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                 {{ trans('general.address') }}
@@ -193,16 +239,23 @@
                                 {{ $transfer->income_account->bank_address }}
                             </td>
                         </tr>
+                        @stack('to_account_address_input_end')
                     </table>
+                    @endif
                 </td>
             </tr>
+            @stack('to_account_id_end')
         </tbody>
     </table>
+    @stack('to_account_end')
 
+    @stack('amount_start')
     <table style="text-align: right;">
+        @stack('amount_table_start')
         <tr>
             <td valign="center" style="width:80%; display:block; float:right;">
                 <table>
+                    @stack('amount_input_start')
                     <tr>
                         <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
                             {{ trans('general.amount') }}
@@ -212,8 +265,11 @@
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
+                    @stack('amount_input_end')
                 </table>
             </td>
         </tr>
+        @stack('amount_table_end')
     </table>
+    @stack('amount_end')
 </div>
diff --git a/resources/views/components/transfers/template/third.blade.php b/resources/views/components/transfers/template/third.blade.php
index 25188a78b..387dbae4f 100644
--- a/resources/views/components/transfers/template/third.blade.php
+++ b/resources/views/components/transfers/template/third.blade.php
@@ -3,8 +3,10 @@
         <tbody>
             <tr>
                 <td style="width: 50%; padding: 0 15px 15px 0;" valign="top">
+                    @stack('from_account_start')
                     <table>
                         <tbody>
+                            @stack('from_account_id_start')
                             <tr>
                                 <td style="padding:0;">
                                     <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
@@ -12,6 +14,7 @@
                                     </h2>
 
                                     <table>
+                                        @stack('from_account_name_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('accounts.account_name') }}
@@ -21,9 +24,11 @@
                                                 {{ $transfer->expense_account->name }}
                                             </td>
                                         </tr>
+                                        @stack('from_account_name_input_end')
                                     </table>
 
                                     <table>
+                                        @stack('from_account_number_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('accounts.number') }}
@@ -33,9 +38,12 @@
                                                 {{ $transfer->expense_account->number}}
                                             </td>
                                         </tr>
+                                        @stack('from_account_number_input_end')
                                     </table>
 
+                                    @if (! empty($transfer->expense_account->bank_name))
                                     <table>
+                                        @stack('from_account_bank_name_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('accounts.bank_name') }}
@@ -45,9 +53,13 @@
                                                 {{ $transfer->expense_account->bank_name }}
                                             </td>
                                         </tr>
+                                        @stack('from_account_bank_name_input_end')
                                     </table>
+                                    @endif
 
+                                    @if (! empty($transfer->expense_account->bank_phone))
                                     <table>
+                                        @stack('from_account_phone_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('general.phone') }}
@@ -57,9 +69,13 @@
                                                 {{ $transfer->expense_account->bank_phone }}
                                             </td>
                                         </tr>
+                                        @stack('from_account_phone_input_end')
                                     </table>
+                                    @endif
 
+                                    @if (! empty($transfer->expense_account->bank_address))
                                     <table>
+                                        @stack('from_account_address_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('general.address') }}
@@ -69,16 +85,22 @@
                                                 {{ $transfer->expense_account->bank_address }}
                                             </td>
                                         </tr>
+                                        @stack('from_account_address_input_end')
                                     </table>
+                                    @endif
                                 </td>
                             </tr>
+                            @stack('from_account_id_end')
                         </tbody>
                     </table>
+                    @stack('from_account_end')
                 </td>
 
                 <td style="width: 50%; padding: 0 0 15px 15px;" valign="top">
+                    @stack('to_account_start')
                     <table>
                         <tbody>
+                            @stack('to_account_id_start')
                             <tr>
                                 <td style="padding:0;">
                                     <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
@@ -86,18 +108,21 @@
                                     </h2>
 
                                     <table>
+                                        @stack('to_account_name_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
-                                                {{ trans('accounts.number') }}
+                                                {{ trans('accounts.account_name') }}
                                             </td>
 
                                             <td style="width:70%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ $transfer->income_account->name }}
                                             </td>
                                         </tr>
+                                        @stack('to_account_name_input_end')
                                     </table>
 
                                     <table>
+                                        @stack('to_account_number_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('accounts.number') }}
@@ -107,9 +132,12 @@
                                                 {{ $transfer->income_account->number }}
                                             </td>
                                         </tr>
+                                        @stack('to_account_number_input_end')
                                     </table>
 
+                                    @if (! empty($transfer->income_account->bank_name))
                                     <table>
+                                        @stack('to_account_bank_name_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('accounts.bank_name') }}
@@ -119,9 +147,13 @@
                                                 {{ $transfer->income_account->bank_name }}
                                             </td>
                                         </tr>
+                                        @stack('to_account_bank_name_input_end')
                                     </table>
+                                    @endif
 
+                                    @if (! empty($transfer->income_account->bank_phone))
                                     <table>
+                                        @stack('to_account_phone_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('general.phone') }}
@@ -131,9 +163,13 @@
                                                 {{ $transfer->income_account->bank_phone }}
                                             </td>
                                         </tr>
+                                        @stack('to_account_phone_input_end')
                                     </table>
+                                    @endif
 
+                                    @if (! empty($transfer->income_account->bank_address))
                                     <table>
+                                        @stack('to_account_address_input_start')
                                         <tr>
                                             <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
                                                 {{ trans('general.address') }}
@@ -143,16 +179,21 @@
                                                 {{ $transfer->income_account->bank_address }}
                                             </td>
                                         </tr>
+                                        @stack('to_account_address_input_end')
                                     </table>
+                                    @endif
                                 </td>
                             </tr>
+                            @stack('to_account_id_end')
                         </tbody>
                     </table>
+                    @stack('to_account_end')
                 </td>
             </tr>
         </tbody>
     </table>
 
+    @stack('details_start')
     <table style="width: 100%; margin-top:15px;">
         <tr>
             <td style="padding:0 0 15px 0;">
@@ -164,6 +205,7 @@
     </table>
 
     <table>
+        @stack('transferred_at_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
                 {{ trans('general.date') }}
@@ -173,7 +215,9 @@
                 <x-date date="{{ $transfer->expense_transaction->paid_at}}" />
             </td>
         </tr>
+        @stack('transferred_at_input_end')
 
+        @stack('payment_method_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
                 {{ trans_choice('general.payment_methods', 1) }}
@@ -187,7 +231,9 @@
                 @endif
             </td>
         </tr>
+        @stack('payment_method_input_end')
 
+        @stack('reference_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
                 {{ trans('general.reference') }}
@@ -197,7 +243,9 @@
                 {{ $transfer->expense_transaction->reference }}
             </td>
         </tr>
+        @stack('reference_input_end')
 
+        @stack('description_input_start')
         <tr>
             <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
                 {{ trans('general.description') }}
@@ -207,12 +255,21 @@
                 {{ $transfer->expense_transaction->description }}
             </td>
         </tr>
-    </table>
+        @stack('description_input_end')
 
+        <tr>
+            <td></td>
+        </tr>
+    </table>
+    @stack('details_end')
+
+    @stack('amount_start')
     <table style="text-align: right;">
+        @stack('amount_table_start')
         <tr>
             <td valign="center" style="width:80%; display:block; float:right;">
                 <table>
+                    @stack('amount_input_start')
                     <tr>
                         <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
                             {{ trans('general.amount') }}
@@ -222,8 +279,11 @@
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
+                    @stack('amount_input_end')
                 </table>
             </td>
         </tr>
+        @stack('amount_table_end')
     </table>
+    @stack('amount_end')
 </div>