diff --git a/resources/views/components/documents/show/template.blade.php b/resources/views/components/documents/show/template.blade.php
index d93973bc2..dddf6c1e5 100644
--- a/resources/views/components/documents/show/template.blade.php
+++ b/resources/views/components/documents/show/template.blade.php
@@ -1,143 +1,142 @@
 <div class="p-7 shadow-2xl rounded-2xl">
-    @if ($documentTemplate)
-        @switch($documentTemplate)
-            @case('classic')
-                <x-documents.template.classic
-                    type="{{ $type }}"
-                    :document="$document"
-                    document-template="{{ $documentTemplate }}"
-                    logo="{{ $logo }}"
-                    background-color="{{ $backgroundColor }}"
-                    hide-footer="{{ $hideFooter }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-order-number="{{ $hideOrderNumber }}"
-                    hide-document-number="{{ $hideDocumentNumber }}"
-                    hide-issued-at="{{ $hideIssuedAt }}"
-                    hide-due-at="{{ $hideDueAt }}"
-                    text-contact-info="{{ $textContactInfo }}"
-                    text-issued-at="{{ $textIssuedAt }}"
-                    text-document-number="{{ $textDocumentNumber }}"
-                    text-due-at="{{ $textDueAt }}"
-                    text-order-number="{{ $textOrderNumber }}"
-                    text-document-title="{{ $textDocumentTitle }}"
-                    text-document-subheading="{{ $textDocumentSubheading }}"
-                    hide-items="{{ $hideItems }}"
-                    hide-name="{{ $hideName }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-quantity="{{ $hideQuantity }}"
-                    hide-price="{{ $hidePrice }}"
-                    hide-amount="{{ $hideAmount }}"
-                    hide-note="{{ $hideNote }}"
-                    text-items="{{ $textItems }}"
-                    text-quantity="{{ $textQuantity }}"
-                    text-price="{{ $textPrice }}"
-                    text-amount="{{ $textAmount }}"
-                />
-                @break
-            @case('modern')
-                <x-documents.template.modern
-                    type="{{ $type }}"
-                    :document="$document"
-                    document-template="{{ $documentTemplate }}"
-                    logo="{{ $logo }}"
-                    background-color="{{ $backgroundColor }}"
-                    hide-footer="{{ $hideFooter }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-order-number="{{ $hideOrderNumber }}"
-                    hide-document-number="{{ $hideDocumentNumber }}"
-                    hide-issued-at="{{ $hideIssuedAt }}"
-                    hide-due-at="{{ $hideDueAt }}"
-                    text-contact-info="{{ $textContactInfo }}"
-                    text-issued-at="{{ $textIssuedAt }}"
-                    text-document-number="{{ $textDocumentNumber }}"
-                    text-due-at="{{ $textDueAt }}"
-                    text-order-number="{{ $textOrderNumber }}"
-                    text-document-title="{{ $textDocumentTitle }}"
-                    text-document-subheading="{{ $textDocumentSubheading }}"
-                    hide-items="{{ $hideItems }}"
-                    hide-name="{{ $hideName }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-quantity="{{ $hideQuantity }}"
-                    hide-price="{{ $hidePrice }}"
-                    hide-amount="{{ $hideAmount }}"
-                    hide-note="{{ $hideNote }}"
-                    text-items="{{ $textItems }}"
-                    text-quantity="{{ $textQuantity }}"
-                    text-price="{{ $textPrice }}"
-                    text-amount="{{ $textAmount }}"
-                />
-                @break
-            @default
-                <x-documents.template.ddefault
-                    type="{{ $type }}"
-                    :document="$document"
-                    document-template="{{ $documentTemplate }}"
-                    logo="{{ $logo }}"
-                    background-color="{{ $backgroundColor }}"
-                    hide-footer="{{ $hideFooter }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-order-number="{{ $hideOrderNumber }}"
-                    hide-document-number="{{ $hideDocumentNumber }}"
-                    hide-issued-at="{{ $hideIssuedAt }}"
-                    hide-due-at="{{ $hideDueAt }}"
-                    text-contact-info="{{ $textContactInfo }}"
-                    text-issued-at="{{ $textIssuedAt }}"
-                    text-document-number="{{ $textDocumentNumber }}"
-                    text-due-at="{{ $textDueAt }}"
-                    text-order-number="{{ $textOrderNumber }}"
-                    text-document-title="{{ $textDocumentTitle }}"
-                    text-document-subheading="{{ $textDocumentSubheading }}"
-                    hide-items="{{ $hideItems }}"
-                    hide-name="{{ $hideName }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-quantity="{{ $hideQuantity }}"
-                    hide-discount="{{ $hideDiscount }}"
-                    hide-price="{{ $hidePrice }}"
-                    hide-amount="{{ $hideAmount }}"
-                    hide-note="{{ $hideNote }}"
-                    text-items="{{ $textItems }}"
-                    text-quantity="{{ $textQuantity }}"
-                    text-price="{{ $textPrice }}"
-                    text-amount="{{ $textAmount }}"
-                />
-        @endswitch
-    @else
-        @include($documentTemplate)
-    @endif
+    @switch($documentTemplate)
+        @case('classic')
+            <x-documents.template.classic
+                type="{{ $type }}"
+                :document="$document"
+                document-template="{{ $documentTemplate }}"
+                logo="{{ $logo }}"
+                background-color="{{ $backgroundColor }}"
+                hide-footer="{{ $hideFooter }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-order-number="{{ $hideOrderNumber }}"
+                hide-document-number="{{ $hideDocumentNumber }}"
+                hide-issued-at="{{ $hideIssuedAt }}"
+                hide-due-at="{{ $hideDueAt }}"
+                text-contact-info="{{ $textContactInfo }}"
+                text-issued-at="{{ $textIssuedAt }}"
+                text-document-number="{{ $textDocumentNumber }}"
+                text-due-at="{{ $textDueAt }}"
+                text-order-number="{{ $textOrderNumber }}"
+                text-document-title="{{ $textDocumentTitle }}"
+                text-document-subheading="{{ $textDocumentSubheading }}"
+                hide-items="{{ $hideItems }}"
+                hide-name="{{ $hideName }}"
+                hide-description="{{ $hideDescription }}"
+                hide-quantity="{{ $hideQuantity }}"
+                hide-price="{{ $hidePrice }}"
+                hide-amount="{{ $hideAmount }}"
+                hide-note="{{ $hideNote }}"
+                text-items="{{ $textItems }}"
+                text-quantity="{{ $textQuantity }}"
+                text-price="{{ $textPrice }}"
+                text-amount="{{ $textAmount }}"
+            />
+            @break
+        @case('modern')
+            <x-documents.template.modern
+                type="{{ $type }}"
+                :document="$document"
+                document-template="{{ $documentTemplate }}"
+                logo="{{ $logo }}"
+                background-color="{{ $backgroundColor }}"
+                hide-footer="{{ $hideFooter }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-order-number="{{ $hideOrderNumber }}"
+                hide-document-number="{{ $hideDocumentNumber }}"
+                hide-issued-at="{{ $hideIssuedAt }}"
+                hide-due-at="{{ $hideDueAt }}"
+                text-contact-info="{{ $textContactInfo }}"
+                text-issued-at="{{ $textIssuedAt }}"
+                text-document-number="{{ $textDocumentNumber }}"
+                text-due-at="{{ $textDueAt }}"
+                text-order-number="{{ $textOrderNumber }}"
+                text-document-title="{{ $textDocumentTitle }}"
+                text-document-subheading="{{ $textDocumentSubheading }}"
+                hide-items="{{ $hideItems }}"
+                hide-name="{{ $hideName }}"
+                hide-description="{{ $hideDescription }}"
+                hide-quantity="{{ $hideQuantity }}"
+                hide-price="{{ $hidePrice }}"
+                hide-amount="{{ $hideAmount }}"
+                hide-note="{{ $hideNote }}"
+                text-items="{{ $textItems }}"
+                text-quantity="{{ $textQuantity }}"
+                text-price="{{ $textPrice }}"
+                text-amount="{{ $textAmount }}"
+            />
+            @break
+        @case('default')
+            <x-documents.template.ddefault
+                type="{{ $type }}"
+                :document="$document"
+                document-template="{{ $documentTemplate }}"
+                logo="{{ $logo }}"
+                background-color="{{ $backgroundColor }}"
+                hide-footer="{{ $hideFooter }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-order-number="{{ $hideOrderNumber }}"
+                hide-document-number="{{ $hideDocumentNumber }}"
+                hide-issued-at="{{ $hideIssuedAt }}"
+                hide-due-at="{{ $hideDueAt }}"
+                text-contact-info="{{ $textContactInfo }}"
+                text-issued-at="{{ $textIssuedAt }}"
+                text-document-number="{{ $textDocumentNumber }}"
+                text-due-at="{{ $textDueAt }}"
+                text-order-number="{{ $textOrderNumber }}"
+                text-document-title="{{ $textDocumentTitle }}"
+                text-document-subheading="{{ $textDocumentSubheading }}"
+                hide-items="{{ $hideItems }}"
+                hide-name="{{ $hideName }}"
+                hide-description="{{ $hideDescription }}"
+                hide-quantity="{{ $hideQuantity }}"
+                hide-discount="{{ $hideDiscount }}"
+                hide-price="{{ $hidePrice }}"
+                hide-amount="{{ $hideAmount }}"
+                hide-note="{{ $hideNote }}"
+                text-items="{{ $textItems }}"
+                text-quantity="{{ $textQuantity }}"
+                text-price="{{ $textPrice }}"
+                text-amount="{{ $textAmount }}"
+            />
+            @break
+        @default
+            @include($documentTemplate)
+    @endswitch
 </div>
\ No newline at end of file
diff --git a/resources/views/components/transactions/show/template.blade.php b/resources/views/components/transactions/show/template.blade.php
index d37f1813d..61c623878 100644
--- a/resources/views/components/transactions/show/template.blade.php
+++ b/resources/views/components/transactions/show/template.blade.php
@@ -1,69 +1,68 @@
 <div class="p-7 shadow-2xl rounded-2xl">
-    @if ($transactionTemplate)
-        @switch($transactionTemplate)
-            @case('classic')
-                @break
-            @case('modern')
-                @break
-            @default
-                <x-transactions.template.ddefault
-                    type="{{ $type }}"
-                    :transaction="$transaction"
-                    :payment_methods="$payment_methods"
-                    transaction-template="{{ $transactionTemplate }}"
-                    logo="{{ $logo }}"
-                    hide-company="{{ $hideCompany }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-content-title="{{ $hideContentTitle }}"
-                    hide-number="{{ $hideNumber }}"
-                    hide-paid-at="{{ $hidePaidAt }}"
-                    hide-account="{{ $hideAccount }}"
-                    hide-category="{{ $hideCategory }}"
-                    hide-payment-methods="{{ $hidePaymentMethods }}"
-                    hide-reference="{{ $hideReference }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-amount="{{ $hideAmount }}"
-                    text-content-title="{{ $textContentTitle }}"
-                    text-number="{{ $textNumber }}"
-                    text-paid-at="{{ $textPaidAt }}"
-                    text-account="{{ $textAccount }}"
-                    text-category="{{ $textCategory }}"
-                    text-payment-methods="{{ $textPaymentMethods }}"
-                    text-reference="{{ $textReference }}"
-                    text-description="{{ $textDescription }}"
-                    text-paid-by="{{ $textPaidBy }}"
-                    hide-contact="{{ $hideContact }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-related="{{ $hideRelated }}"
-                    hide-related-document-number="{{ $hideRelatedDocumentNumber }}"
-                    hide-related-contact="{{ $hideRelatedContact }}"
-                    hide-related-document-date="{{ $hideRelatedDocumentDate }}"
-                    hide-related-document-amount="{{ $hideRelatedDocumentAmount }}"
-                    hide-related-amount="{{ $hideRelatedAmount }}"
-                    text-related-transaction="{{ $textRelatedTransansaction }}"
-                    text-related-document-number="{{ $textRelatedDocumentNumber }}"
-                    text-related-contact="{{ $textRelatedContact }}"
-                    text-related-document-date="{{ $textRelatedDocumentDate }}"
-                    text-related-document-amount="{{ $textRelatedDocumentAmount }}"
-                    text-related-amount="{{ $textRelatedAmount }}"
-                    route-document-show="{{ $routeDocumentShow }}"
-                />
-        @endswitch
-    @else
-        @include($transactionTemplate)
-    @endif
-
+    @switch($transactionTemplate)
+        @case('classic')
+            @break
+        @case('modern')
+            @break
+        @case('default')
+            <x-transactions.template.ddefault
+                type="{{ $type }}"
+                :transaction="$transaction"
+                :payment_methods="$payment_methods"
+                transaction-template="{{ $transactionTemplate }}"
+                logo="{{ $logo }}"
+                hide-company="{{ $hideCompany }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-content-title="{{ $hideContentTitle }}"
+                hide-number="{{ $hideNumber }}"
+                hide-paid-at="{{ $hidePaidAt }}"
+                hide-account="{{ $hideAccount }}"
+                hide-category="{{ $hideCategory }}"
+                hide-payment-methods="{{ $hidePaymentMethods }}"
+                hide-reference="{{ $hideReference }}"
+                hide-description="{{ $hideDescription }}"
+                hide-amount="{{ $hideAmount }}"
+                text-content-title="{{ $textContentTitle }}"
+                text-number="{{ $textNumber }}"
+                text-paid-at="{{ $textPaidAt }}"
+                text-account="{{ $textAccount }}"
+                text-category="{{ $textCategory }}"
+                text-payment-methods="{{ $textPaymentMethods }}"
+                text-reference="{{ $textReference }}"
+                text-description="{{ $textDescription }}"
+                text-paid-by="{{ $textPaidBy }}"
+                hide-contact="{{ $hideContact }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-related="{{ $hideRelated }}"
+                hide-related-document-number="{{ $hideRelatedDocumentNumber }}"
+                hide-related-contact="{{ $hideRelatedContact }}"
+                hide-related-document-date="{{ $hideRelatedDocumentDate }}"
+                hide-related-document-amount="{{ $hideRelatedDocumentAmount }}"
+                hide-related-amount="{{ $hideRelatedAmount }}"
+                text-related-transaction="{{ $textRelatedTransansaction }}"
+                text-related-document-number="{{ $textRelatedDocumentNumber }}"
+                text-related-contact="{{ $textRelatedContact }}"
+                text-related-document-date="{{ $textRelatedDocumentDate }}"
+                text-related-document-amount="{{ $textRelatedDocumentAmount }}"
+                text-related-amount="{{ $textRelatedAmount }}"
+                route-document-show="{{ $routeDocumentShow }}"
+            />
+            @break
+        @default
+            @include($transactionTemplate)
+    @endswitch
+    
     <akaunting-connect-transactions
         :show="connect.show"
         :transaction="connect.transaction"