diff --git a/app/Listeners/Update/V30/Version308.php b/app/Listeners/Update/V30/Version309.php
similarity index 91%
rename from app/Listeners/Update/V30/Version308.php
rename to app/Listeners/Update/V30/Version309.php
index c0c2fd9f3..07202609a 100644
--- a/app/Listeners/Update/V30/Version308.php
+++ b/app/Listeners/Update/V30/Version309.php
@@ -7,13 +7,13 @@ use App\Events\Install\UpdateFinished as Event;
 use App\Traits\Permissions;
 use Illuminate\Support\Facades\Log;
 
-class Version308 extends Listener
+class Version309 extends Listener
 {
     use Permissions;
 
     const ALIAS = 'core';
 
-    const VERSION = '3.0.8';
+    const VERSION = '3.0.9';
 
     /**
      * Handle the event.
@@ -27,7 +27,7 @@ class Version308 extends Listener
             return;
         }
 
-        Log::channel('stdout')->info('Updating to 3.0.8 version...');
+        Log::channel('stdout')->info('Updating to 3.0.9 version...');
 
         $this->updatePermissions();
 
diff --git a/app/Providers/Event.php b/app/Providers/Event.php
index 3942b3e8f..5b4a64535 100644
--- a/app/Providers/Event.php
+++ b/app/Providers/Event.php
@@ -20,7 +20,7 @@ class Event extends Provider
             'App\Listeners\Update\V30\Version304',
             'App\Listeners\Update\V30\Version305',
             'App\Listeners\Update\V30\Version307',
-            'App\Listeners\Update\V30\Version308',
+            'App\Listeners\Update\V30\Version309',
         ],
         'Illuminate\Auth\Events\Login' => [
             'App\Listeners\Auth\Login',
diff --git a/app/View/Components/Form/Group/Country.php b/app/View/Components/Form/Group/Country.php
index b54a86b17..76f600bda 100644
--- a/app/View/Components/Form/Group/Country.php
+++ b/app/View/Components/Form/Group/Country.php
@@ -15,6 +15,14 @@ class Country extends Form
      */
     public function render()
     {
+        if (empty($this->name)) {
+            $this->name = 'country';
+        }
+
+        if (empty($this->selected) && empty($this->getParentData('model'))) {
+            $this->selected = setting('company.country');
+        }
+
         return view('components.form.group.country');
     }
 }
diff --git a/app/View/Components/Form/Group/PaymentMethod.php b/app/View/Components/Form/Group/PaymentMethod.php
index 6675f145f..9fc45a1b3 100644
--- a/app/View/Components/Form/Group/PaymentMethod.php
+++ b/app/View/Components/Form/Group/PaymentMethod.php
@@ -18,6 +18,10 @@ class PaymentMethod extends Form
      */
     public function render()
     {
+        if (empty($this->name)) {
+            $this->name = 'payment_method';
+        }
+
         $this->payment_methods = Modules::getPaymentMethods();
 
         if (empty($this->selected) && empty($this->getParentData('model'))) {
diff --git a/composer.lock b/composer.lock
index eec933fe5..db0cfd06d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -907,16 +907,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.240.5",
+            "version": "3.240.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "7fb4c933795c5908fe5e2cb32913eed608901195"
+                "reference": "72a4381a59f42720b033865d265aa64c3190cc13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7fb4c933795c5908fe5e2cb32913eed608901195",
-                "reference": "7fb4c933795c5908fe5e2cb32913eed608901195",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/72a4381a59f42720b033865d265aa64c3190cc13",
+                "reference": "72a4381a59f42720b033865d265aa64c3190cc13",
                 "shasum": ""
             },
             "require": {
@@ -995,9 +995,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.240.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.240.8"
             },
-            "time": "2022-10-28T18:17:24+00:00"
+            "time": "2022-11-02T18:44:20+00:00"
         },
         {
             "name": "balping/json-raw-encoder",
@@ -1302,23 +1302,23 @@
         },
         {
             "name": "barryvdh/reflection-docblock",
-            "version": "v2.0.6",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
-                "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16"
+                "reference": "bf44b757feb8ba1734659029357646466ded673e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16",
-                "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16",
+                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e",
+                "reference": "bf44b757feb8ba1734659029357646466ded673e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0,<4.5"
+                "phpunit/phpunit": "^8.5.14|^9"
             },
             "suggest": {
                 "dflydev/markdown": "~1.0",
@@ -1348,9 +1348,9 @@
                 }
             ],
             "support": {
-                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.0.6"
+                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0"
             },
-            "time": "2018-12-13T10:34:14+00:00"
+            "time": "2022-10-31T15:35:43+00:00"
         },
         {
             "name": "bkwld/cloner",
@@ -4858,16 +4858,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.37.0",
+            "version": "v9.38.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330"
+                "reference": "abf198e443e06696af3f356b44de67c0fa516107"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/0c9675abf6d966e834b2ebeca3319f524e07a330",
-                "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/abf198e443e06696af3f356b44de67c0fa516107",
+                "reference": "abf198e443e06696af3f356b44de67c0fa516107",
                 "shasum": ""
             },
             "require": {
@@ -5040,7 +5040,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-10-25T15:43:46+00:00"
+            "time": "2022-11-01T14:05:55+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -13247,16 +13247,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.14.5",
+            "version": "2.14.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
+                "reference": "f7948baaa0330277c729714910336383286305da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
-                "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da",
+                "reference": "f7948baaa0330277c729714910336383286305da",
                 "shasum": ""
             },
             "require": {
@@ -13306,7 +13306,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.14.5"
+                "source": "https://github.com/filp/whoops/tree/2.14.6"
             },
             "funding": [
                 {
@@ -13314,7 +13314,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-07T12:00:00+00:00"
+            "time": "2022-11-02T16:23:29+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
diff --git a/resources/lang/bg-BG/modules.php b/resources/lang/bg-BG/modules.php
index 85a423a43..d7a97439b 100644
--- a/resources/lang/bg-BG/modules.php
+++ b/resources/lang/bg-BG/modules.php
@@ -36,7 +36,7 @@ return [
     'install'               => 'Инсталирай',
     'buy_now'               => 'Купете сега',
     'get_api_key'           => '<a href=":url" target="_blank">Натиснете тук</a> за да получите вашия API ключ.',
-    'no_apps'               => 'Все още няма приложения в тази категория.',
+    'no_apps'               => 'Вижте най-професионалните приложения за вашия бизнес и ги вземете на най-добра цена.',
     'become_developer'      => 'Вие сте разработчик? <a href=":url" target="_blank">Тук</a> може да научите как да създадете приложение и да стартирате продажби днес!',
     'recommended_apps'      => 'Препоръчани Добавки',
     'can_not_install'       => 'Месечните абонаменти са налични само за Cloud service. <a href="https://akaunting.com/upgrade-to-yearly" target="_blank">Научете повече.</a>',
diff --git a/resources/lang/da-DK/email_templates.php b/resources/lang/da-DK/email_templates.php
index 32f331482..150f9ee35 100644
--- a/resources/lang/da-DK/email_templates.php
+++ b/resources/lang/da-DK/email_templates.php
@@ -29,6 +29,11 @@ return [
         'body'          => 'Hej,<br /><br />Baseret på den tilbagevendende faktura til {customer_name} er fakturanr. <strong>{invoice_number}</strong> automatisk blevet genereret.<br /><br />Du kan se fakturaoplysningerne på følgende link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br / ><br />Med venlig hilsen<br />{company_name}',
     ],
 
+    'invoice_view_admin' => [
+        'subject'       => 'Faktura {invoice_number} set',
+        'body'          => 'Hej,<br /><br />{customer_name} har set faktura <strong>{invoice_number}</strong>.<br /><br />Du kan se fakturaoplysninger fra følgende link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Venlig hilsen,<br />{company_name}',
+    ],
+
     'invoice_payment_customer' => [
         'subject'       => 'Betaling for faktura nr. {invoice_number} er modtaget',
         'body'          => 'Kære {customer_name},<br /><br />Tak for din betaling. Find betalingsdetaljerne herunder:<br /><br />-------------------------------------------------<br /><br />Antal: <strong>{transaction_total}<br /></strong>Dato: <strong>{transaction_paid_date}</strong><br />Fakturanummer: <strong>{invoice_number}<br /><br /></strong>-------------------------------------------------<br /><br />Du kan altid se betalingsdetaljerne på dette link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Har du spørgsmål, er du velkommen til at kontakte os.<br /><br />Med venlig hilsen,<br />{company_name}',
@@ -49,13 +54,13 @@ return [
         'body'          => 'Hej,<br /><br /> Baseret på {vendor_name}\'s tilbagevendende betaling, er faktura nummer <strong>{bill_number}</strong> automatisk genereret.<br /><br />Du kan se fakturadetaljerne på dette link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Med venlig hilsen,<br />{company_name}',
     ],
 
-    'revenue_new_customer' => [
-        'subject'       => '{revenue_date} betaling oprettet',
-        'body'          => 'Kære {customer_name},<br /><br />Vi har forberedt følgende betaling. <br /><br />Du kan se betalingsdetaljerne på følgende link: <a href="{revenue_guest_link}">{revenue_date}</a>.<br /><br />Du er velkommen til at kontakte os, hvis du har spørgsmål til betalingen.<br /><br />Venlig hilsen,<br />{company_name}',
+    'payment_received_customer' => [
+        'subject'       => 'Din kvittering fra {company_name}',
+        'body'          => 'Kære {contact_name},<br /><br />Tak for betalingen. <br /><br />Du kan se betalingsoplysningerne fra følgende link: <a href="{payment_guest_link}">{payment_date}</a>.<br /><br />Du er velkommen til at kontakte os med spørgsmål.<br /><br />Med venlig hilsen,<br />{company_name}',
     ],
 
-    'payment_new_vendor' => [
-        'subject'       => '{revenue_date} betaling oprettet',
+    'payment_made_vendor' => [
+        'subject'       => 'Betaling foretaget af {company_name}',
         'body'          => 'Kære {vendor_name},<br /><br />Vi har forberedt følgende betaling. <br /><br />Du kan se betalingsdetaljerne på følgende link: <a href="{payment_admin_link}">{payment_date}</a>.<br /><br />Du er velkommen til at kontakte os, hvis du har spørgsmål.<br /><br />Venlig hilsen,<br />{company_name}
 ',
     ],
diff --git a/resources/lang/da-DK/errors.php b/resources/lang/da-DK/errors.php
index 53349e54e..0d117be6b 100644
--- a/resources/lang/da-DK/errors.php
+++ b/resources/lang/da-DK/errors.php
@@ -19,5 +19,7 @@ return [
         '404'       => 'Vi kunne ikke finde siden du kikkede efter.',
         '500'       => 'Vi vil arbejde på at fixe dette straks.',
         'record'    => 'Vi kunne ikke finde det, du ledte efter.',
+        'amount'    => 'Denne side indeholder ugyldige beløb! Kontakt venligst systemadministratoren.',
     ],
+
 ];
diff --git a/resources/lang/da-DK/footer.php b/resources/lang/da-DK/footer.php
index ada0a85dc..6b2e63387 100644
--- a/resources/lang/da-DK/footer.php
+++ b/resources/lang/da-DK/footer.php
@@ -6,5 +6,8 @@ return [
     'powered'               => 'Drevet af Akaunting',
     'link'                  => 'https://akaunting.com',
     'software'              => 'Gratis regnskabsprogram',
+    'powered_by'            => 'Drevet af',
+    'tag_line'              => 'Send fakturaer, spor udgifter, og automatiser regnskab med Akaunting. :get_started_url',
+    'get_started'           => 'Kom I Gang',
 
 ];
diff --git a/resources/lang/de-DE/auth.php b/resources/lang/de-DE/auth.php
index bc1b3934a..69a107349 100644
--- a/resources/lang/de-DE/auth.php
+++ b/resources/lang/de-DE/auth.php
@@ -39,6 +39,7 @@ return [
     'error' => [
         'self_delete'       => 'Fehler: Sie können sich nicht selbst löschen!',
         'self_disable'      => 'Fehler: Sie können Ihr Profil nicht selbst löschen!',
+        'unassigned'        => 'Fehler: Die Firma :company muss mindestens einem Benutzer zugeordnet sein.',
         'no_company'        => 'Fehler: Ihrem Konto wurde kein Unternehmen zugewiesen. Bitte kontaktieren Sie den Systemadministrator.',
     ],
 
diff --git a/resources/lang/de-DE/bills.php b/resources/lang/de-DE/bills.php
index 4aaee5ba5..b86da0e6b 100644
--- a/resources/lang/de-DE/bills.php
+++ b/resources/lang/de-DE/bills.php
@@ -19,7 +19,7 @@ return [
     'total'                 => 'Gesamt',
 
     'item_name'             => 'Artikel-Name|Artikel-Namen',
-    'recurring_bills'       => 'Wiederkehrende Rechnung|Wiederkehrende Rechnungen',
+    'recurring_bills'       => 'Wiederkehrende Rechnung(-en)',
 
     'show_discount'         => ':discount% Rabatt',
     'add_discount'          => 'füge Rabatt hinzu',
diff --git a/resources/lang/de-DE/transactions.php b/resources/lang/de-DE/transactions.php
index 1a5c853ce..7b3ff6944 100644
--- a/resources/lang/de-DE/transactions.php
+++ b/resources/lang/de-DE/transactions.php
@@ -6,7 +6,7 @@ return [
     'payment_made'          => 'Zahlung erfolgt',
     'paid_by'               => 'Bezahlt von',
     'paid_to'               => 'Bezahlt am',
-    'related_invoice'       => 'Zugehörige Rechnung (Einnahme)',
+    'related_invoice'       => 'Zugehörige Rechnung',
     'related_bill'          => 'Zugehörige Rechnung (Ausgabe)',
     'recurring_income'      => 'Wiederkehrende Einnahmen',
     'recurring_expense'     => 'Wiederkehrende Ausgaben',
@@ -24,6 +24,8 @@ return [
         'create_recurring'  => ':user hat diese wiederkehrende Transaktion am :date erstellt',
         'schedule'          => 'Wiederhole alle :interval :frequency seit :date',
         'children'          => ':count Transaktionen wurden automatisch erstellt',
+        'transfer_headline' => 'Von :from_account an :to_account',
+        'transfer_desc'     => 'Am :date erstellte Überweisung',
     ],
 
     'share' => [
diff --git a/resources/lang/en-GB/portal.php b/resources/lang/en-GB/portal.php
index a0ea4a0b1..c4c3fb6b2 100644
--- a/resources/lang/en-GB/portal.php
+++ b/resources/lang/en-GB/portal.php
@@ -12,6 +12,7 @@ return [
     'see_all_details'       => 'See all account details',
     'all_payments'          => 'Login to view all payments',
     'received_date'         => 'Received Date',
+    'redirect_description'  => 'You will be redirected to the :name website to make the payment.',
 
     'last_payment'          => [
         'title'             => 'Last Payment Made',
diff --git a/resources/lang/ro-RO/general.php b/resources/lang/ro-RO/general.php
index a8c8ead90..36adf863c 100644
--- a/resources/lang/ro-RO/general.php
+++ b/resources/lang/ro-RO/general.php
@@ -151,7 +151,7 @@ return [
     'duplicate'             => 'Duplicat',
     'unpaid'                => 'Neplatit',
     'paid'                  => 'Platit',
-    'overdue'               => 'Intarziat',
+    'overdue'               => 'Întârziate',
     'partially'             => 'Partial',
     'partially_paid'        => 'Platit Partial',
     'export'                => 'Export',
@@ -208,7 +208,7 @@ return [
     'client_portal'         => 'Portal Client',
     'issue_date'            => 'Data eliberării',
     'due_date'              => 'Data scadentă',
-    'open'                  => 'Deschide',
+    'open'                  => 'Deschise',
     'invite'                => 'Invită',
     'common'                => 'Comun',
     'api'                   => 'API',
diff --git a/resources/lang/ro-RO/reports.php b/resources/lang/ro-RO/reports.php
index 32cf21b15..aae73ec1c 100644
--- a/resources/lang/ro-RO/reports.php
+++ b/resources/lang/ro-RO/reports.php
@@ -9,7 +9,7 @@ return [
     'this_quarter'                  => 'Trimistrul acesta',
     'previous_quarter'              => 'Trimestrul anterior',
     'last_12_months'                => 'Ultimele 12 luni',
-    'profit_loss'                   => 'Profit & Pierdere',
+    'profit_loss'                   => 'Profit și Pierderi',
     'income_summary'                => 'Rezumat Venituri',
     'expense_summary'               => 'Rezumat Cheltuieli',
     'income_expense_summary'        => 'Venituri vs. Cheltuieli',
diff --git a/resources/lang/ro-RO/widgets.php b/resources/lang/ro-RO/widgets.php
index a2a77fc60..2ce53cb09 100644
--- a/resources/lang/ro-RO/widgets.php
+++ b/resources/lang/ro-RO/widgets.php
@@ -5,7 +5,7 @@ return [
     'receivables'               => 'Creanțe',
     'payables'                  => 'Sume datorate',
     'cash_flow'                 => 'Fluxul de numerar',
-    'profit_loss'               => 'Profit & Pierderi',
+    'profit_loss'               => 'Profit și Pierderi',
     'expenses_by_category'      => 'Cheltuieli pe categorii',
     'account_balance'           => 'Soldul contului',
     'bank_feeds'                => 'Conectează conturile bancare',
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/form/group/country.blade.php b/resources/views/components/form/group/country.blade.php
index 4b7dc4732..587be1f97 100644
--- a/resources/views/components/form/group/country.blade.php
+++ b/resources/views/components/form/group/country.blade.php
@@ -2,7 +2,7 @@
     name="country"
     label="{!! trans_choice('general.countries', 1) !!}"
     :options="trans('countries')"
-    :selected="setting('company.country')"
+    :selected="$selected"
     required="{{ $required }}"
     not-required="{{ $notRequired }}"
     model="form.country"
diff --git a/resources/views/components/payment_method/redirect.blade.php b/resources/views/components/payment_method/redirect.blade.php
index 1abd6d80c..b87001873 100644
--- a/resources/views/components/payment_method/redirect.blade.php
+++ b/resources/views/components/payment_method/redirect.blade.php
@@ -1,20 +1,17 @@
-<div>
-    @if (!empty($setting['name']))
-        <h2>{{ $setting['name'] }}</h2>
-    @endif  
-    @if (!empty($setting['description']))
-        <div>{{ $setting['description'] }}</div>
-    @endif
-    <br>
-    <div class="buttons">
-        <div class="pull-right">
-            <x-form id="redirect-form" :url="$confirm_url">
-                <button @click="onRedirectConfirm" type="button" id="button-confirm" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100">
-                    <span>
-                        {{ trans('general.confirm') }}
-                    </span>
-                </button>
-            </x-form>
-        </div>
-    </div>
+{{ trans('portal.redirect_description', ['name' => $setting['name']]) }}
+
+<div class="mt-3">
+    <x-form id="redirect-form" :url="$confirm_url">
+        <x-button
+            id="button-confirm"
+            kind="primary"
+            override="class"
+            class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100"
+            @click="onRedirectConfirm"
+        >
+            <span>
+                {{ trans('general.confirm') }}
+            </span>
+        </x-button>
+    </x-form>
 </div>
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