diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php
index 109c50888..8db235238 100644
--- a/resources/views/components/documents/template/classic.blade.php
+++ b/resources/views/components/documents/template/classic.blade.php
@@ -2,9 +2,11 @@
     <div class="row">
         <div class="col-100">
             <div class="text text-dark">
+                @stack('title_input_start')
                 <h3>
                     {{ $textDocumentTitle }}
                 </h3>
+                @stack('title_input_end')
             </div>
         </div>
     </div>
@@ -12,7 +14,7 @@
     <div class="row">
         <div class="col-58">
             <div class="text">
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
                         <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@@ -20,7 +22,7 @@
                         <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                     @endif
                 @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
             </div>
         </div>
 
@@ -28,9 +30,11 @@
             <div class="text right-column">
                 @stack('company_details_start')
                 @if ($textDocumentSubheading)
+                    @stack('subheading_input_start')
                     <p class="text-normal font-semibold">
                         {{ $textDocumentSubheading }}
                     </p>
+                    @stack('subheading_input_end')
                 @endif
 
                 @if (! $hideCompanyDetails)
@@ -84,7 +88,7 @@
         <div class="col-33">
             <div class="invoice-classic-frame ml-1 mt-1" style="border: 1px solid {{ $backgroundColor }}">
                 <div class="invoice-classic-inline-frame text-center" style="border: 1px solid {{ $backgroundColor }}">
-                    @stack('invoice_number_input_start')
+                    @stack('document_number_input_start')
                     @if (! $hideDocumentNumber)
                         <div class="text small-text font-semibold mt-classic">
                             <span>
@@ -93,10 +97,10 @@
 
                             <br>
 
-                            <p class="classic-invoice"> {{ $document->document_number }} </p>
+                            {{ $document->document_number }}
                         </div>
                     @endif
-                    @stack('invoice_number_input_end')
+                    @stack('document_number_input_end')
                 </div>
             </div>
         </div>
@@ -157,7 +161,7 @@
                     @endif
                 @stack('phone_input_end')
 
-                @stack('email_start')
+                @stack('email_input_start')
                     @if (! $hideContactEmail)
                         <p class="small-text">
                             {{ $document->contact_email }}
@@ -375,6 +379,7 @@
 
     @if (! $hideFooter)
         @if ($document->footer)
+        @stack('footer_input_start')
             <div class="row mt-1">
                 <div class="col-100">
                     <div class="text company">
@@ -384,6 +389,7 @@
                     </div>
                 </div>
             </div>
+        @stack('footer_input_start')
         @endif
     @endif
 </div>
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
index df97780ed..d37bb2a1d 100644
--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@@ -2,9 +2,11 @@
     <div class="row">
         <div class="col-100">
             <div class="text text-dark">
+                @stack('title_input_start')
                 <h3>
                     {{ $textDocumentTitle }}
                 </h3>
+                @stack('title_input_end')
             </div>
         </div>
     </div>
@@ -12,7 +14,7 @@
     <div class="row border-bottom-1">
         <div class="col-58">
             <div class="text">
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
                         <img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@@ -20,7 +22,7 @@
                         <img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
                     @endif
                 @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
             </div>
         </div>
 
@@ -344,6 +346,7 @@
 
     @if (! $hideFooter)
         @if ($document->footer)
+        @stack('footer_input_start')
             <div class="row mt-4">
                 <div class="col-100 text-left">
                     <div class="text">
@@ -353,6 +356,7 @@
                     </div>
                 </div>
             </div>
+        @stack('footer_input_end')
         @endif
     @endif
 </div>
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
index 304a0f668..03ce54a80 100644
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@@ -2,9 +2,11 @@
     <div class="row">
         <div class="col-100">
             <div class="text text-dark">
+                @stack('title_input_start')
                 <h3>
                     {{ $textDocumentTitle }}
                 </h3>
+                @stack('title_input_end')
             </div>
         </div>
     </div>
@@ -12,7 +14,7 @@
     <div class="row modern-head pt-2 pb-2 mt-1 bg-{{ $backgroundColor }}" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
         <div class="col-58">
             <div class="text p-modern">
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
                         <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@@ -20,7 +22,7 @@
                         <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                     @endif
                 @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
             </div>
         </div>
 
@@ -157,7 +159,7 @@
                     @endif
                 @stack('order_number_input_end')
 
-                @stack('invoice_number_input_start')
+                @stack('document_number_input_start')
                     @if (! $hideDocumentNumber)
                         <p class="mb-0">
                             <span class="font-semibold spacing">
@@ -169,7 +171,7 @@
                             </span>
                         </p>
                     @endif
-                @stack('invoice_number_input_end')
+                @stack('document_number_input_end')
 
                 @stack('issued_at_input_start')
                     @if (! $hideIssuedAt)
@@ -345,6 +347,7 @@
 
     @if (! $hideFooter)
         @if ($document->footer)
+        @stack('footer_input_start')
             <div class="row mt-7">
                 <div class="col-100 py-top p-modern" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                     <div class="text pl-2">
@@ -354,6 +357,7 @@
                     </div>
                 </div>
             </div>
+        @stack('footer_input_end')
         @endif
     @endif
 </div>
\ No newline at end of file
diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php
index 8017c885f..0814588e7 100644
--- a/resources/views/components/transactions/template/default.blade.php
+++ b/resources/views/components/transactions/template/default.blade.php
@@ -5,13 +5,13 @@
             <tr>
                 @if (! $hideCompanyLogo)
                 <td style="width:20%; padding: 0 0 15px 0;" valign="top">
-                    @stack('company_logo_start')
+                    @stack('company_logo_input_start')
                     @if (!empty($transaction->contact->logo) && !empty($transaction->contact->logo->id))
                         <img src="{{ Storage::url($transaction->contact->logo->id) }}" height="70" width="70" alt="{{ $transaction->contact_name }}" />
                     @else
                         <img src="{{ $logo }}" height="70" width="70" alt="{{ setting('company.name') }}" />
                     @endif
-                    @stack('company_logo_end')
+                    @stack('company_logo_input_end')
                 </td>
                 @endif