@stack('company_details_start')
                 @if ($textDocumentSubheading)
+                    @stack('subheading_input_start')
                     
                         {{ $textDocumentSubheading }}
                     
+                    @stack('subheading_input_end')
                 @endif
 
                 @if (! $hideCompanyDetails)
@@ -84,7 +88,7 @@
         
             
                 
-                    @stack('invoice_number_input_start')
+                    @stack('document_number_input_start')
                     @if (! $hideDocumentNumber)
                         
                             
@@ -93,10 +97,10 @@
 
                             
 
-                             {{ $document->document_number }} 
+                            {{ $document->document_number }}
                          
                     @endif
-                    @stack('invoice_number_input_end')
+                    @stack('document_number_input_end')
                 
 
              
          
@@ -157,7 +161,7 @@
                     @endif
                 @stack('phone_input_end')
 
-                @stack('email_start')
+                @stack('email_input_start')
                     @if (! $hideContactEmail)
                         
                             {{ $document->contact_email }}
@@ -375,6 +379,7 @@
 
     @if (! $hideFooter)
         @if ($document->footer)
+        @stack('footer_input_start')
             
+        @stack('footer_input_start')
         @endif
     @endif
 
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 @@
     
         
             
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
                         

@@ -20,7 +22,7 @@
                         

                     @endif
                 @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
             
 
          
 
@@ -344,6 +346,7 @@
 
     @if (! $hideFooter)
         @if ($document->footer)
+        @stack('footer_input_start')
             
+        @stack('footer_input_end')
         @endif
     @endif
 
 
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 @@
     
         
             
-                @stack('company_logo_start')
+                @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
                         

@@ -20,7 +22,7 @@
                         

                     @endif
                 @endif
-                @stack('company_logo_end')
+                @stack('company_logo_input_end')
             
 
          
 
@@ -157,7 +159,7 @@
                     @endif
                 @stack('order_number_input_end')
 
-                @stack('invoice_number_input_start')
+                @stack('document_number_input_start')
                     @if (! $hideDocumentNumber)
                         
                             
@@ -169,7 +171,7 @@
                             
                         
                     @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')
             
+        @stack('footer_input_end')
         @endif
     @endif
 
 
\ 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 @@