diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
new file mode 100644
index 0000000..ec147dc
--- /dev/null
+++ b/.github/workflows/sonarqube.yml
@@ -0,0 +1,24 @@
+name: SonarQube Analysis
+
+on:
+    push:
+        branches:
+        - master
+        - develop
+        - "releases/**"
+    pull_request:
+        types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    name: SonarQube Analysis
+    runs-on: ubuntu-latest
+    permissions: read-all
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+      - uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
diff --git a/Magewire/Payment/Method/Afterpay20.php b/Magewire/Payment/Method/Afterpay20.php
index ef8e90a..d0c6e0d 100644
--- a/Magewire/Payment/Method/Afterpay20.php
+++ b/Magewire/Payment/Method/Afterpay20.php
@@ -30,7 +30,7 @@ class Afterpay20 extends Component\Form implements EvaluationInterface
 
     public ?bool $tos = true;
 
-    public ?string $dateOfBirth = null;
+    public string $dateOfBirth = '';
 
     public string $fullName = '';
 
@@ -93,7 +93,7 @@ public function mount(): void
         $this->coc = $payment->getAdditionalInformation('customer_coc');
         $this->phone = $payment->getAdditionalInformation('customer_telephone');
         $this->identificationNumber = $payment->getAdditionalInformation('customer_identificationNumber');
-        $this->dateOfBirth = $payment->getAdditionalInformation('customer_DoB');
+        $this->dateOfBirth = (string)$payment->getAdditionalInformation('customer_DoB');
         $this->fullName = $this->getFullName();
     }
 
@@ -136,6 +136,7 @@ public function updatedCoc(string $value): ?string
             ['coc.digits_between' => 'Invalid COC number']
         );
 
+        $this->updatePaymentField('customer_DoB', '', '');
         $this->updatePaymentField('customer_coc', $value);
         return $value;
     }
@@ -194,9 +195,9 @@ private function getPhoneRules(): array
      *
      * @return void
      */
-    private function updatePaymentField(string $name, $value): void
+    private function updatePaymentField(string $name, $value, $default = null): void
     {
-        $value = empty($value) ? null : $value;
+        $value = empty($value) ? $default : $value;
 
         try {
             $quote = $this->sessionCheckout->getQuote();
diff --git a/Magewire/Payment/Method/Giftcards.php b/Magewire/Payment/Method/Giftcards.php
index a4cd20d..331620c 100644
--- a/Magewire/Payment/Method/Giftcards.php
+++ b/Magewire/Payment/Method/Giftcards.php
@@ -67,10 +67,11 @@ public function mount(): void
 
     public function evaluateCompletion(EvaluationResultFactory $resultFactory): EvaluationResultInterface
     {
-        if ($this->canSubmit === false) {
+
+        if ($this->canSubmit === false && !$this->isRedirect()) {
             return $resultFactory->createErrorMessageEvent()
                 ->withCustomEvent('payment:method:error')
-                ->withMessage('Cannot complete payment with voucher');
+                ->withMessage('Cannot complete payment with giftcards');
         }
 
         return $resultFactory->createSuccess();
diff --git a/Magewire/Payment/Method/PayPerEmail.php b/Magewire/Payment/Method/PayPerEmail.php
index fa9140a..ac99729 100644
--- a/Magewire/Payment/Method/PayPerEmail.php
+++ b/Magewire/Payment/Method/PayPerEmail.php
@@ -69,7 +69,8 @@ public function __construct(
      */
     public function mount(): void
     {
-        $payment = $this->getPayment();
+        $quote = $this->getQuote();
+        $payment = $quote->getPayment();
 
         $firstName = $payment->getAdditionalInformation('customer_billingFirstName');
         $lastName = $payment->getAdditionalInformation('customer_billingLastName');
@@ -77,7 +78,7 @@ public function mount(): void
         $email = $payment->getAdditionalInformation('customer_email');
         $this->gender = $payment->getAdditionalInformation('customer_gender');
 
-        $billingAddress = $this->getBillingAddress();
+        $billingAddress = $quote->getBillingAddress();
 
         if ($firstName === null) {
             $firstName = $billingAddress->getFirstname();
@@ -103,6 +104,7 @@ public function mount(): void
         $this->lastName = $lastName;
         $this->middleName = $middleName;
         $this->email = $email;
+        $this->quoteRepository->save($quote);
     }
 
 
@@ -139,24 +141,26 @@ public function hydrateEmail()
     }
 
     /**
-     * Get payment from quote
+     * Get billing address from quote
      *
-     * @return Payment
+     * @return Address
      */
-    private function getPayment()
+    private function getBillingAddress(): Address
     {
-        return $this->sessionCheckout->getQuote()->getPayment();
+        return $this->sessionCheckout->getQuote()->getBillingAddress();
     }
+
     /**
-     * Get billing address from quote
+     * Get payment from quote
      *
-     * @return Address
+     * @return Payment
      */
-    private function getBillingAddress(): Address
+    private function getPayment()
     {
-        return $this->sessionCheckout->getQuote()->getBillingAddress();
+        return $this->sessionCheckout->getQuote()->getPayment();
     }
 
+
     /**
      * Validate single field with rules
      *
diff --git a/Model/Form/Eav/Customer/Idin.php b/Model/Form/Eav/Customer/Hide.php
similarity index 89%
rename from Model/Form/Eav/Customer/Idin.php
rename to Model/Form/Eav/Customer/Hide.php
index 01d54a2..ab72044 100644
--- a/Model/Form/Eav/Customer/Idin.php
+++ b/Model/Form/Eav/Customer/Hide.php
@@ -6,7 +6,7 @@
 
 use Hyva\Checkout\Model\Form\EntityField\EavAttributeField;
 
-class Idin extends EavAttributeField
+class Hide extends EavAttributeField
 {
     public function canRender(): bool
     {
diff --git a/Model/Magewire/Payment/PlaceOrderService.php b/Model/Magewire/Payment/PlaceOrderService.php
index c63f693..253d43d 100644
--- a/Model/Magewire/Payment/PlaceOrderService.php
+++ b/Model/Magewire/Payment/PlaceOrderService.php
@@ -49,4 +49,4 @@ private function hasRedirect(): bool
         $response = $this->getResponse();
         return !empty($response->RequiredAction->RedirectURL);
     }
-}
\ No newline at end of file
+}
diff --git a/Model/Validation/Rules/Iban.php b/Model/Validation/Rules/Iban.php
index f31d6ae..20cf248 100644
--- a/Model/Validation/Rules/Iban.php
+++ b/Model/Validation/Rules/Iban.php
@@ -41,7 +41,7 @@ public function check($value): bool
                $checksum %= 97;
            }
 
-           return ((98 - $checksum) == $check);
+           return (98 - $checksum) == $check;
        } else {
            return false;
        }
diff --git a/README.md b/README.md
index fc310e0..763929e 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@
 
 # Buckaroo Magento Hyva Checkout
 
+## Requirements
+
+Buckaroo Magento 2 plugin version 1.46 or heigher
+Hyvä Checkout version 1.1.3 or heigher
+
 ## Installation
 ```
 mkdir app/code/Buckaroo
@@ -11,7 +16,7 @@ cd app/code/Buckaroo
 git clone https://github.com/buckaroo-it/Magento2_Hyva_Checkout.git
 mv Magento2_Hyva_Checkout HyvaCheckout
 cd HyvaCheckout
-git checkout 1.0.0-RC1
+git checkout 1.0.0
 php bin/magento module:enable Buckaroo_HyvaCheckout
 php bin/magento setup:upgrade
 php bin/magento setup:static-content:deploy
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index e2e7895..a0c18c6 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -41,8 +41,9 @@
         <arguments>
             <!-- Hide idin customer fields -->
             <argument name="customFields" xsi:type="array">
-                <item name="buckaroo_idin_iseighteenorolder" xsi:type="string">\Buckaroo\HyvaCheckout\Model\Form\Eav\Customer\Idin</item>
-                <item name="buckaroo_idin" xsi:type="string">\Buckaroo\HyvaCheckout\Model\Form\Eav\Customer\Idin</item>
+                <item name="buckaroo_idin_iseighteenorolder" xsi:type="string">\Buckaroo\HyvaCheckout\Model\Form\Eav\Customer\Hide</item>
+                <item name="buckaroo_idin" xsi:type="string">\Buckaroo\HyvaCheckout\Model\Form\Eav\Customer\Hide</item>
+                <item name="buckaroo_last_paybybank_issuer" xsi:type="string">\Buckaroo\HyvaCheckout\Model\Form\Eav\Customer\Hide</item>
             </argument>
         </arguments>
     </type>
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
new file mode 100644
index 0000000..e69de29
diff --git a/i18n/es_ES.csv b/i18n/es_ES.csv
new file mode 100644
index 0000000..e69de29
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
new file mode 100644
index 0000000..b629c34
--- /dev/null
+++ b/i18n/fr_FR.csv
@@ -0,0 +1,7 @@
+"MM/YY","MM/AA"
+"Expiration:","Expiration :"
+"Billing Middle Name:","Deuxième prénom (facturation):"
+"Select giftcard issuer:","Sélectionner l'émetteur de la carte-cadeau:"
+"PIN / Security code:","Code PIN / Code de sécurité:"
+"Please select issuer","Veuillez sélectionner l'émetteur:"
+"Voucher code:","Code du bon d'achat:"
\ No newline at end of file
diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv
new file mode 100644
index 0000000..9c8fa18
--- /dev/null
+++ b/i18n/nl_BE.csv
@@ -0,0 +1,7 @@
+"MM/YY","MM/JJ"
+"Expiration:","Vervaldatum:"
+"Billing Middle Name:","Tussenvoegsel voor facturatienaam:"
+"Select giftcard issuer:","Selecteer Cadeaukaart:"
+"PIN / Security code:","PIN-/beveiligingscode:"
+"Please select issuer","Selecteer de uitgever"
+"Voucher code:","Voucher code:"
\ No newline at end of file
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
new file mode 100644
index 0000000..9c8fa18
--- /dev/null
+++ b/i18n/nl_NL.csv
@@ -0,0 +1,7 @@
+"MM/YY","MM/JJ"
+"Expiration:","Vervaldatum:"
+"Billing Middle Name:","Tussenvoegsel voor facturatienaam:"
+"Select giftcard issuer:","Selecteer Cadeaukaart:"
+"PIN / Security code:","PIN-/beveiligingscode:"
+"Please select issuer","Selecteer de uitgever"
+"Voucher code:","Voucher code:"
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000..4b10ff8
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,9 @@
+# Unique key for the project
+sonar.projectKey=Hyva-Checkout
+
+# Display name and version for the SonarQube UI
+sonar.projectName=Hyva Checkout
+sonar.projectVersion=1.0
+
+# Path to the source code, relative to the sonar-project.properties file
+sonar.sources=.
\ No newline at end of file
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
index 44e7300..69f5457 100644
--- a/view/frontend/layout/hyva_checkout_components.xml
+++ b/view/frontend/layout/hyva_checkout_components.xml
@@ -3,12 +3,6 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
 >
     <body>
-        <referenceContainer name="checkout.payment.methods.before">
-             <block name="checkout.payment.method.buckaroo_before_payments"
-                    as="buckaroo_before_payments"
-                    template="Buckaroo_HyvaCheckout::component/payment/before.phtml">
-            </block>
-        </referenceContainer>
         <referenceBlock name="checkout.payment.methods">
             <!-- Payment Renderer: iDEAL -->
             <block name="checkout.payment.method.buckaroo_magento2_ideal"
diff --git a/view/frontend/layout/hyva_checkout_index_index.xml b/view/frontend/layout/hyva_checkout_index_index.xml
new file mode 100644
index 0000000..92ce243
--- /dev/null
+++ b/view/frontend/layout/hyva_checkout_index_index.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      layout="checkout"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
+>
+    <body>
+        <referenceContainer name="hyva.checkout.api-v1.after">
+             <block name="checkout.buckaroo_after_api-v1"
+                    as="buckaroo_after_api-v1"
+                    template="Buckaroo_HyvaCheckout::component/payment/after.phtml">
+            </block>
+        </referenceContainer>
+    </body>
+</page>
\ No newline at end of file
diff --git a/view/frontend/templates/component/payment/before.phtml b/view/frontend/templates/component/payment/after.phtml
similarity index 66%
rename from view/frontend/templates/component/payment/before.phtml
rename to view/frontend/templates/component/payment/after.phtml
index af96475..0210427 100644
--- a/view/frontend/templates/component/payment/before.phtml
+++ b/view/frontend/templates/component/payment/after.phtml
@@ -1,17 +1,106 @@
+<div class="bk-modal-wrap" x-data="{
+    showModal: false,
+    title: '<?= $escaper->escapeHtml(__('Success')); ?>',
+    content: '',
+    showClose: true,
+    buttons:[],
+    close() {
+        this.showModal = false;
+    },
+    initModal() {
+        buckarooStart();
+        window.addEventListener('buckaroo-modal-show', (event) => {
+            if(event.detail.data) {
+                this.showModal = true;
+                Object.keys(event.detail.data).forEach((key) => {
+                    this[key] = event.detail.data[key];
+                })
+            }
+        })
+
+        window.addEventListener('buckaroo-modal-hide', () => {
+            this.close();
+        })
+    }
+}" x-init="initModal()">
+    <div
+    id="bk-modal"
+    tabindex="-1"
+    aria-hidden="true"
+    class="fixed top-0 left-0 right-0 z-50 justify-center w-full p-4 items-center overflow-x-hidden overflow-y-auto md:inset-0 max-h-full h-full"
+    x-bind:class="showModal ? 'flex': 'hidden'">
+        <div class="relative w-full max-w-md max-h-full"  @click.outside="close()">
+            <!-- Modal content -->
+            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+                <!-- Modal header -->
+                <div class="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">
+                    <h3 class="text-xl font-semibold text-gray-900 dark:text-white" x-text="title">
+                    </h3>
+                    <button
+                        type="button"
+                        @click="close()"
+                        class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
+                        data-modal-hide="defaultModal"
+                    >
+                        <svg
+                            aria-hidden="true"
+                            class="w-5 h-5"
+                            fill="currentColor"
+                            viewBox="0 0 20 20"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                            <path
+                                fill-rule="evenodd"
+                                d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+                                clip-rule="evenodd">
+                            </path>
+                        </svg>
+                        <span class="sr-only">Close modal</span>
+                    </button>
+                </div>
+                <!-- Modal body -->
+                <div class="p-6 space-y-6">
+                    <p class="text-base leading-relaxed text-gray-500 dark:text-gray-400" x-html="content">
+                    </p>
+                </div>
+                <!-- Modal footer -->
+
+                <div class="flex items-center p-2 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
+                    <template x-if="Array.isArray(buttons)">
+                        <template x-for="(button, index) in buttons" :key="index">
+                            <button
+                                @click="typeof button.action === 'function' ? button.action() : close()"
+                                type="button"
+                                class="btn btn primary"
+                                x-text="button.label"
+                            ></button>
+                        </template>
+                    </template>
+                    <template x-if="showClose">
+                        <button @click="close()" type="button" class="btn btn primary">
+                            <?= $escaper->escapeHtml(__('Close')); ?>
+                        </button>
+                    </template>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
-    let buckarooTask;
-    window.addEventListener("buckaroo-add-task", (event) => {
-        if (event.detail.buckarooTask) {
-            buckarooTask = event.detail.buckarooTask;
+    function buckarooStart() {
+        const addTask = function() {
+            hyvaCheckout.navigation.addTask(async () => {
+                if (window.buckarooTask) {
+                    await window.buckarooTask();
+                }
+            })
         }
-    });
+        addTask();
+        window.addEventListener('checkout:navigation:success', (event) => {
+            if (event.detail.route === 'payment')
+                addTask();
+        });
 
-    document.addEventListener("DOMContentLoaded", () => {
-        hyvaCheckout.navigation.addTask(async () => {
-            if (buckarooTask) {
-                await buckarooTask();
-            }
-        })
 
         function buckaroo_load_sdk() {
             return new Promise(resolve => {
@@ -25,7 +114,7 @@
         }
 
         buckaroo_load_sdk().then(() => {
-
+            window.buckarooCseHasLoaded = true;
             hyva.formValidation.addRule('bk-validateCardNumber', (value) => {
                 if (!BuckarooClientSideEncryption.V001.validateCardNumber(value.replace(/\s+/g, ''))) {
                     return '<?= $escaper->escapeJs(__('Please enter a valid creditcard number.')) ?>';
@@ -34,7 +123,10 @@
             });
 
             hyva.formValidation.addRule('bk-validateCardCvc', (value, options, field, context) => {
-                if (!BuckarooClientSideEncryption.V001.validateCvc(value, context.determineIssuer(context.cardNumber))) {
+                if (!BuckarooClientSideEncryption.V001.validateCvc(
+                        value,
+                        context.determineIssuer(context.cardNumber)
+                    )) {
                     return '<?= $escaper->escapeJs(__('Please enter a valid Cvc number.')) ?>';
                 };
                 return true;
@@ -81,66 +173,5 @@
                 buckarooTask = undefined;
             }
         })
-    });
-</script>
-<div class="bk-modal-wrap" x-data="{
-    showModal: false,
-    title: '<?= $escaper->escapeHtml(__('Success')); ?>',
-    content: '',
-    showClose: true,
-    buttons:[],
-    close() {
-        this.showModal = false;
-    },
-    initModal() {
-        window.addEventListener('buckaroo-modal-show', (event) => {
-            console.log(event);
-            if(event.detail.data) {
-                this.showModal = true;
-                Object.keys(event.detail.data).forEach((key) => {
-                    this[key] = event.detail.data[key];
-                })
-            }
-        })
-
-        window.addEventListener('buckaroo-modal-hide', () => {
-            this.close();
-        })
     }
-}" x-init="initModal()">
-    <div id="bk-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-50 justify-center w-full p-4 items-center overflow-x-hidden overflow-y-auto md:inset-0 max-h-full h-full" x-bind:class="showModal ? 'flex': 'hidden'">
-        <div class="relative w-full max-w-md max-h-full"  @click.outside="close()">
-            <!-- Modal content -->
-            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
-                <!-- Modal header -->
-                <div class="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">
-                    <h3 class="text-xl font-semibold text-gray-900 dark:text-white" x-text="title">
-                    </h3>
-                    <button type="button" @click="close()" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" data-modal-hide="defaultModal">
-                        <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                            <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
-                        </svg>
-                        <span class="sr-only">Close modal</span>
-                    </button>
-                </div>
-                <!-- Modal body -->
-                <div class="p-6 space-y-6">
-                    <p class="text-base leading-relaxed text-gray-500 dark:text-gray-400" x-html="content">
-                    </p>
-                </div>
-                <!-- Modal footer -->
-                
-                <div class="flex items-center p-2 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
-                    <template x-if="Array.isArray(buttons)">
-                        <template x-for="(button, index) in buttons" :key="index">
-                            <button @click="typeof button.action === 'function' ? button.action() : close()" type="button" class="btn btn primary" x-text="button.label"></button>
-                        </template>
-                    </template>
-                    <template x-if="showClose">
-                        <button @click="close()" type="button" class="btn btn primary"><?= $escaper->escapeHtml(__('Close')); ?></button>
-                    </template>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/view/frontend/templates/component/payment/method/afterpay.phtml b/view/frontend/templates/component/payment/method/afterpay.phtml
index b91f1e4..34d6062 100644
--- a/view/frontend/templates/component/payment/method/afterpay.phtml
+++ b/view/frontend/templates/component/payment/method/afterpay.phtml
@@ -21,7 +21,13 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_afterpay_dob">
+            <input
+                type="date"
+                x-data
+                value="<?= $magewire->dateOfBirth ?>"
+                @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+                id="buckaroo_afterpay_dob"
+            >
             <?php if ($magewire->hasError('dateOfBirth')) : ?>
                 <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
@@ -47,8 +53,15 @@ use Magento\Framework\Escaper;
     <?php if ($magewire->showBusinessSelector()) {
     ?>
         <div class="flex flex-col gap-y-2 field field-reserved">
-            <label for="buckaroo_magento2_afterpay_selectedBusiness"><?= $escaper->escapeHtml(__('Business Model:')); ?></label>
-            <select name="issuer" id="buckaroo_magento2_afterpay_selectedBusiness" wire:model="selectedBusiness" class="form-select">
+            <label for="buckaroo_magento2_afterpay_selectedBusiness">
+                <?= $escaper->escapeHtml(__('Business Model:')); ?>
+            </label>
+            <select
+                name="issuer"
+                id="buckaroo_magento2_afterpay_selectedBusiness"
+                wire:model="selectedBusiness"
+                class="form-select"
+            >
                 <option value="1"><?= $escaper->escapeHtml(__('B2C - Business to Consumer')) ?></option>
                 <option value="2"><?= $escaper->escapeHtml(__('B2B - Business to Business')) ?></option>
             </select>
@@ -59,7 +72,7 @@ use Magento\Framework\Escaper;
     ?>
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay_iban">
-                <?= $escaper->escapeHtml(__( 'Bank Account Number:')); ?>
+                <?= $escaper->escapeHtml(__('Bank Account Number:')); ?>
                 <span class="text-red">*</span>
             </label>
             <input type="text" wire:model.lazy="iban" id="buckaroo_afterpay_iban">
@@ -99,10 +112,14 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay_tos"><?= $escaper->escapeHtml(__('Terms and Conditions:')); ?></label>
         <div class="flex flex-row gap-x-2">
             <input class="mt-1" type="checkbox" wire:model.lazy="tos" id="buckaroo_afterpay_tos">
-            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>"><?= $escaper->escapeHtml(__('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')) ?></a>
+            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>">
+                <?= $escaper->escapeHtml(
+                    __('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')
+                ) ?>
+            </a>
         </div>
         <?php if ($magewire->hasError('tos')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/afterpay20.phtml b/view/frontend/templates/component/payment/method/afterpay20.phtml
index 85bb73b..793dfd8 100644
--- a/view/frontend/templates/component/payment/method/afterpay20.phtml
+++ b/view/frontend/templates/component/payment/method/afterpay20.phtml
@@ -11,7 +11,12 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay20_tos_fullname">
             <?= $escaper->escapeHtml(__('Billing Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="fullName" disabled id="buckaroo_afterpay20_tos_fullname" class="bg-gray-200">
+        <input
+            type="text"
+            wire:model.lazy="fullName"
+            disabled id="buckaroo_afterpay20_tos_fullname"
+            class="bg-gray-200"
+        >
     </div>
 
     <?php if ($magewire->showBirth()) {
@@ -21,7 +26,12 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="date" x-data value="<?=$magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_afterpay20_dob">
+            <input type="date"
+                x-data
+                value="<?=$magewire->dateOfBirth ?>"
+                @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+                id="buckaroo_afterpay20_dob"
+            >
             <?php if ($magewire->hasError('dateOfBirth')): ?>
                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
@@ -80,7 +90,11 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay20_tos"><?= $escaper->escapeHtml(__('Terms and Conditions:')); ?></label>
         <div class="flex flex-row gap-x-2">
             <input class="mt-1" type="checkbox" wire:model.lazy="tos" id="buckaroo_afterpay20_tos">
-            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>"><?= $escaper->escapeHtml(__('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')) ?></a>
+            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>">
+                <?= $escaper->escapeHtml(
+                    __('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')
+                ) ?>
+            </a>
         </div>
         <?php if ($magewire->hasError('tos')): ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
diff --git a/view/frontend/templates/component/payment/method/applepay.phtml b/view/frontend/templates/component/payment/method/applepay.phtml
index e3687d3..1e229c8 100644
--- a/view/frontend/templates/component/payment/method/applepay.phtml
+++ b/view/frontend/templates/component/payment/method/applepay.phtml
@@ -86,16 +86,10 @@ use Magento\Framework\Escaper;
         this.config = this.$wire.get('config');
         this.loadSdk().then(async () => {
             this.canDisplay = await BuckarooApplePay.checkPaySupport();
-            const v = async () => {
-                if(this.canDisplay) {
-                    await this.beginPayment(); 
-                } 
+            window.buckarooTask = async () => {
+                if(this.canDisplay)
+                    await this.beginPayment();
             };
-            window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                detail: {
-                    buckarooTask: v
-                }
-            }));
         });
     }
 }" x-init="register()" novalidate>
@@ -104,4 +98,4 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Place Order')) ?>
         </button>
     </template>
-</form>
\ No newline at end of file
+</form>
diff --git a/view/frontend/templates/component/payment/method/billink.phtml b/view/frontend/templates/component/payment/method/billink.phtml
index eed7c65..c625951 100644
--- a/view/frontend/templates/component/payment/method/billink.phtml
+++ b/view/frontend/templates/component/payment/method/billink.phtml
@@ -38,7 +38,12 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_billink_dob">
+        <input
+            type="date"
+            x-data
+            value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+            id="buckaroo_billink_dob"
+        >
         <?php if ($magewire->hasError('dateOfBirth')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
         <?php endif; ?>
@@ -89,10 +94,15 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_billink_tos"><?= $escaper->escapeHtml(__('Terms and Conditions:')); ?></label>
         <div class="flex flex-row gap-x-2">
             <input class="mt-1" type="checkbox" wire:model.lazy="tos" id="buckaroo_billink_tos">
-            <a class="grow" href="https://www.billink.nl/app/uploads/2021/05/Gebruikersvoorwaarden-Billink_V11052021.pdf"><?= $escaper->escapeHtml(__('Accept terms of use')) ?></a>
+            <a
+                class="grow"
+                href="https://www.billink.nl/app/uploads/2021/05/Gebruikersvoorwaarden-Billink_V11052021.pdf"
+            >
+                <?= $escaper->escapeHtml(__('Accept terms of use')) ?>
+            </a>
         </div>
         <?php if ($magewire->hasError('tos')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/creditcard.phtml b/view/frontend/templates/component/payment/method/creditcard.phtml
index 1e0e0f6..aa34d35 100644
--- a/view/frontend/templates/component/payment/method/creditcard.phtml
+++ b/view/frontend/templates/component/payment/method/creditcard.phtml
@@ -11,13 +11,14 @@ $issuers = $magewire->getIssuers();
 <div class="col-span-6">
     <div class="flex flex-col gap-y-2">
         <?php if ($magewire->displayAsSelect()) { ?>
-            <label for="buckaroo_magento2_creditcard_issuer"><?= $escaper->escapeHtml(__('Select a Credit Card or Debit Card:')); ?></label>
+            <label for="buckaroo_magento2_creditcard_issuer">
+                <?= $escaper->escapeHtml(__('Select a Credit Card or Debit Card:')); ?>
+            </label>
             <select name="issuer" id="buckaroo_magento2_creditcard_issuer" wire:model="cardType" class="form-select">
                 <?php
                 foreach ($issuers as $issuer) {
                 ?>
-                    <option 
-                    value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
+                    <option value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
                         <?= $escaper->escapeHtml($issuer["name"]) ?>
                     </option>
                 <?php
@@ -40,8 +41,7 @@ $issuers = $magewire->getIssuers();
                     <label
                     for="bk_credicard_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
                     class="flex flex-row grow gap-x-2 items-center">
-                        <img 
-                        src="<?= $escaper->escapeUrl($issuer["img"]) ?>"
+                        <img src="<?= $escaper->escapeUrl($issuer["img"]) ?>"
                         alt="<?= $issuer["name"] ?>"
                         style="max-height:25px;"
                         />
@@ -53,4 +53,4 @@ $issuers = $magewire->getIssuers();
             ?>
         <?php } ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/creditcards.phtml b/view/frontend/templates/component/payment/method/creditcards.phtml
index fc621cd..88a5976 100644
--- a/view/frontend/templates/component/payment/method/creditcards.phtml
+++ b/view/frontend/templates/component/payment/method/creditcards.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\Escaper;
 
     <form x-data="Object.assign(hyva.formValidation($el), {
                     issuerImages: [],
-                    cseHasLoaded: false,
+                    cseHasLoaded: window.buckarooCseHasLoaded,
                     cardHolder: '',
                     cardNumber: '',
                     cardExpiration: '',
@@ -50,18 +50,16 @@ use Magento\Framework\Escaper;
                             }
                             return true;
                         }
-                        const v = async () => {
+                        window.buckarooTask = async () => {
                             const isValid = await formValid();
                             if (this.cseHasLoaded && isValid) {
                                 const encryptedCardData = await this.saveEncryptedData();
-                                await this.$wire.updatedEncryptedData(encryptedCardData, this.determineIssuer(this.cardNumber));
+                                await this.$wire.updatedEncryptedData(
+                                    encryptedCardData,
+                                    this.determineIssuer(this.cardNumber)
+                                );
                             }
                         };
-                        window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                            detail: {
-                                buckarooTask: v
-                            }
-                        }));
 
                     },
                     getIssuerImage: function() {
@@ -117,7 +115,12 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Name on card:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="text" x-model="cardHolder" data-validate='{"bk-validateCardHolderName": true}' @change="onChange" id="buckaroo_creditcards_card_holder" name="buckaroo_creditcards_card_holder" placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>" />
+            <input type="text"
+            x-model="cardHolder"
+            data-validate='{"bk-validateCardHolderName": true}'
+            @change="onChange" id="buckaroo_creditcards_card_holder"
+            name="buckaroo_creditcards_card_holder"
+            placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>" />
         </div>
 
         <div class="flex flex-col gap-y-2 field field-reserved">
@@ -126,9 +129,18 @@ use Magento\Framework\Escaper;
                 <span class="text-red">*</span>
             </label>
             <div class="relative w-full">
-                <input type="text" class="w-full" maxlength="23" x-model="cardNumber" data-validate='{"bk-validateCardNumber": true}' @change="onChange" id="buckaroo_creditcards_card_number" name="buckaroo_creditcards_card_number" placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>" />
+                <input
+                    type="text"
+                    class="w-full"
+                    maxlength="23"
+                    x-model="cardNumber"
+                    data-validate='{"bk-validateCardNumber": true}'
+                    @change="onChange" id="buckaroo_creditcards_card_number"
+                    name="buckaroo_creditcards_card_number"
+                    placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>"
+                />
                 <div class="absolute inset-y-0 right-3 flex items-center pr-3">
-                    <img :src="getIssuerImage()" style="height: 100%;padding: 10px 0;">
+                    <img :src="getIssuerImage()" :alt="cardNumber" style="height: 100%;padding: 10px 0;">
                 </div>
 
             </div>
@@ -140,7 +152,14 @@ use Magento\Framework\Escaper;
                         <?= $escaper->escapeHtml(__('Expiration:')); ?>
                         <span class="text-red">*</span>
                     </label>
-                    <input type="text" maxlength="5" x-model="cardExpiration" data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}' @change="onChange" id="buckaroo_creditcards_card_expiration" name="buckaroo_creditcards_card_expiration" placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>" />
+                    <input type="text"
+                        maxlength="5"
+                        x-model="cardExpiration"
+                        data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}'
+                        @change="onChange" id="buckaroo_creditcards_card_expiration"
+                        name="buckaroo_creditcards_card_expiration"
+                        placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>"
+                    />
                 </div>
 
                 <div class="flex flex-col w-5/12">
@@ -148,7 +167,15 @@ use Magento\Framework\Escaper;
                         <?= $escaper->escapeHtml(__('CVC / CVV:')); ?>
                         <span class="text-red">*</span>
                     </label>
-                    <input type="text" x-model="cardCvc" maxlength="4" data-validate='{"bk-validateCardCvc": true}' @change="onChange" id="buckaroo_creditcards_card_cvc" name="buckaroo_creditcards_card_cvc" placeholder="<?= $escaper->escapeHtml(__('123')); ?>" />
+                    <input
+                        type="text"
+                        x-model="cardCvc"
+                        maxlength="4"
+                        data-validate='{"bk-validateCardCvc": true}'
+                        @change="onChange" id="buckaroo_creditcards_card_cvc"
+                        name="buckaroo_creditcards_card_cvc"
+                        placeholder="<?= $escaper->escapeHtml(__('123')); ?>"
+                    />
                 </div>
             </div>
         </div>
diff --git a/view/frontend/templates/component/payment/method/giftcards.phtml b/view/frontend/templates/component/payment/method/giftcards.phtml
index 330dbb9..20ad199 100644
--- a/view/frontend/templates/component/payment/method/giftcards.phtml
+++ b/view/frontend/templates/component/payment/method/giftcards.phtml
@@ -55,7 +55,6 @@ if (!$magewire->isRedirect()) {
         },
         listenToSubmit() {
             this.$wire.on('giftcard_response', async (response) => {
-                console.log(response);
                 if (response.error) {
                     this.displayError(response.error);
                 } else if(response.remainder_amount === undefined) {
@@ -67,27 +66,29 @@ if (!$magewire->isRedirect()) {
                     this.displaySuccess(response);
                 }
             })
-        },   
+        },
         register() {
             this.listenToSubmit();
-            const v = async () => {
+            window.buckarooTask = async () => {
                 if(!this.canSubmit) {
                     await this.submit();
                 }
             };
-            window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                detail: {
-                    buckarooTask: v
-                }
-            }));
-
         },
 
     })" x-init="register()" novalidate>
 
             <div class="flex flex-col gap-y-2 field field-reserved">
-                <label for="buckaroo_giftcard_issuer"><?= $escaper->escapeHtml(__('Select giftcard issuer:')); ?></label>
-                <select name="issuer" id="buckaroo_giftcard_issuer" x-model="card" data-validate='{"required": true}'  class="form-select">
+                <label for="buckaroo_giftcard_issuer">
+                    <?= $escaper->escapeHtml(__('Select giftcard issuer:')); ?>
+                </label>
+                <select
+                    name="issuer"
+                    id="buckaroo_giftcard_issuer"
+                    x-model="card"
+                    data-validate='{"required": true}'
+                    class="form-select"
+                >
                     <option value=""><?= $escaper->escapeHtml(__('Please select issuer')); ?></option>
                     <?php
                     foreach ($magewire->getGiftcardIssuers() as $issuer) {
@@ -107,17 +108,35 @@ if (!$magewire->isRedirect()) {
                     <?= $escaper->escapeHtml(__('Card number:')); ?>
                     <span class="text-red">*</span>
                 </label>
-                <input type="text" x-model="cardNumber" data-validate='{"required": true}' @change="onChange" id="buckaroo_giftcard_card_number" name="buckaroo_giftcard_number" />
+                <input
+                    type="text"
+                    x-model="cardNumber"
+                    data-validate='{"required": true}'
+                    @change="onChange"
+                    id="buckaroo_giftcard_card_number"
+                    name="buckaroo_giftcard_number"
+                />
             </div>
             <div class="flex flex-col gap-y-2 field field-reserved">
                 <label for="buckaroo_giftcard_pin">
                     <?= $escaper->escapeHtml(__('PIN / Security code:')); ?>
                     <span class="text-red">*</span>
                 </label>
-                <input type="text" x-model="pin" data-validate='{"required": true}' @change="onChange" id="buckaroo_giftcard_pin" name="buckaroo_giftcard_pin" />
+                <input
+                    type="text"
+                    x-model="pin"
+                    data-validate='{"required": true}'
+                    @change="onChange"
+                    id="buckaroo_giftcard_pin"
+                    name="buckaroo_giftcard_pin"
+                />
             </div>
-            <button type="button" @click="submit" class="btn btn-primary"><?= $escaper->escapeHtml(__('Apply Gift Card')); ?></button>
+            <button type="button" @click="submit" class="btn btn-primary">
+            <?= $escaper->escapeHtml(__('Apply Gift Card')); ?>
+        </button>
         </form>
     </div>
 <?php
+} else {
+    echo "<div></div>";
 }
diff --git a/view/frontend/templates/component/payment/method/giropay.phtml b/view/frontend/templates/component/payment/method/giropay.phtml
index 238a042..9018652 100644
--- a/view/frontend/templates/component/payment/method/giropay.phtml
+++ b/view/frontend/templates/component/payment/method/giropay.phtml
@@ -15,9 +15,14 @@ $genders = $magewire->getGenderList();
             <?= $escaper->escapeHtml(__('BIC Number')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="bic" id="buckaroo_giropay_bic" placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="bic"
+            id="buckaroo_giropay_bic"
+            placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>"
+        >
         <?php if ($magewire->hasError('bic')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('bic')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/ideal.phtml b/view/frontend/templates/component/payment/method/ideal.phtml
index 8a0a398..2fff4b8 100644
--- a/view/frontend/templates/component/payment/method/ideal.phtml
+++ b/view/frontend/templates/component/payment/method/ideal.phtml
@@ -16,8 +16,7 @@ $issuers = $magewire->getIssuers();
                 <?php
                 foreach ($issuers as $issuer) {
                 ?>
-                    <option 
-                    value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
+                    <option value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
                         <?= $escaper->escapeHtml($issuer["name"]) ?>
                     </option>
                 <?php
@@ -40,7 +39,7 @@ $issuers = $magewire->getIssuers();
                     <label
                     for="bk_ideal_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
                     class="flex flex-row grow gap-x-2 items-center">
-                        <img 
+                        <img
                         src="<?= $escaper->escapeUrl($magewire->getImageUrl($issuer["imgName"])) ?>"
                         alt="<?= $issuer["name"] ?>"
                         style="max-height:25px;"
@@ -53,4 +52,4 @@ $issuers = $magewire->getIssuers();
             ?>
         <?php } ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/in3.phtml b/view/frontend/templates/component/payment/method/in3.phtml
index 394d764..81951c2 100644
--- a/view/frontend/templates/component/payment/method/in3.phtml
+++ b/view/frontend/templates/component/payment/method/in3.phtml
@@ -11,7 +11,13 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_capayablein3_tos_fullname">
             <?= $escaper->escapeHtml(__('Billing Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="fullName" disabled id="buckaroo_capayablein3_tos_fullname" class="bg-gray-200">
+        <input
+            type="text"
+            wire:model.lazy="fullName"
+            disabled
+            id="buckaroo_capayablein3_tos_fullname"
+            class="bg-gray-200"
+        >
     </div>
 
     <div class="flex flex-col gap-y-2 field field-reserved">
@@ -19,7 +25,13 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_capayablein3_dob">
+        <input
+            type="date"
+            x-data
+            value="<?= $magewire->dateOfBirth ?>"
+            @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+            id="buckaroo_capayablein3_dob"
+        >
         <?php if ($magewire->hasError('dateOfBirth')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
         <?php endif; ?>
@@ -40,4 +52,4 @@ use Magento\Framework\Escaper;
         </div>
     <?php
     } ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/klarna.phtml b/view/frontend/templates/component/payment/method/klarna.phtml
index e761de9..e64236b 100644
--- a/view/frontend/templates/component/payment/method/klarna.phtml
+++ b/view/frontend/templates/component/payment/method/klarna.phtml
@@ -25,4 +25,4 @@ $genders = $magewire->getGenderList();
             ?>
         </select>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/mrcash.phtml b/view/frontend/templates/component/payment/method/mrcash.phtml
index 1979877..c1be663 100644
--- a/view/frontend/templates/component/payment/method/mrcash.phtml
+++ b/view/frontend/templates/component/payment/method/mrcash.phtml
@@ -11,7 +11,7 @@ use Magento\Framework\Escaper;
     <?php if ($magewire->showClientSideEncryption()) {
     ?>
         <form x-data="Object.assign(hyva.formValidation($el), {
-                    cseHasLoaded: false,
+                    cseHasLoaded: window.buckarooCseHasLoaded,
                     cardHolder: '',
                     cardNumber: '',
                     cardExpiration: '',
@@ -48,19 +48,13 @@ use Magento\Framework\Escaper;
                             }
                             return true;
                         }
-                        const v = async () => {
+                        window.buckarooTask = async () => {
                             const isValid = await formValid();
                             if (this.cseHasLoaded && isValid) {
                                 const encryptedCardData = await this.saveEncryptedData();
                                 await this.$wire.updatedEncryptedData(encryptedCardData);
                             }
                         };
-                        window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                            detail: {
-                                buckarooTask: v
-                            }
-                        }));
-
                     }
                 })" x-init="register()" novalidate>
             <div class="flex flex-col gap-y-2 field field-reserved">
@@ -68,7 +62,15 @@ use Magento\Framework\Escaper;
                     <?= $escaper->escapeHtml(__('Name on card:')); ?>
                     <span class="text-red">*</span>
                 </label>
-                <input type="text" x-model="cardHolder" data-validate='{"bk-validateCardHolderName": true}' @change="onChange" id="buckaroo_mrcash_card_holder" name="buckaroo_mrcash_card_holder" placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>" />
+                <input
+                    type="text"
+                    x-model="cardHolder"
+                    data-validate='{"bk-validateCardHolderName": true}'
+                    @change="onChange"
+                    id="buckaroo_mrcash_card_holder"
+                    name="buckaroo_mrcash_card_holder"
+                    placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>"
+                />
             </div>
 
             <div class="field field-reserved">
@@ -78,7 +80,15 @@ use Magento\Framework\Escaper;
                             <?= $escaper->escapeHtml(__('Card number:')); ?>
                             <span class="text-red">*</span>
                         </label>
-                        <input type="text" x-model="cardNumber" data-validate='{"bk-validateCardNumber": true}' @change="onChange" id="buckaroo_mrcash_card_number" name="buckaroo_mrcash_card_number" placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>" />
+                        <input
+                            type="text"
+                            x-model="cardNumber"
+                            data-validate='{"bk-validateCardNumber": true}'
+                            @change="onChange"
+                            id="buckaroo_mrcash_card_number"
+                            name="buckaroo_mrcash_card_number"
+                            placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>"
+                        />
                     </div>
 
                     <div class="flex flex-col gap-y-2  w-4/12">
@@ -86,11 +96,20 @@ use Magento\Framework\Escaper;
                             <?= $escaper->escapeHtml(__('Expiration:')); ?>
                             <span class="text-red">*</span>
                         </label>
-                        <input type="text" maxlength="5" x-model="cardExpiration" data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}' @change="onChange" id="buckaroo_mrcash_card_expiration" name="buckaroo_mrcash_card_expiration" placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>" />
+                        <input
+                            type="text"
+                            maxlength="5"
+                            x-model="cardExpiration"
+                            data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}'
+                            @change="onChange"
+                            id="buckaroo_mrcash_card_expiration"
+                            name="buckaroo_mrcash_card_expiration"
+                            placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>"
+                        />
                     </div>
                 </div>
             </div>
         </form>
     <?php
     } ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/payperemail.phtml b/view/frontend/templates/component/payment/method/payperemail.phtml
index a5807ac..d105b2d 100644
--- a/view/frontend/templates/component/payment/method/payperemail.phtml
+++ b/view/frontend/templates/component/payment/method/payperemail.phtml
@@ -32,7 +32,12 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Billing First Name:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="firstName" id="buckaroo_paypermail_first_name" placeholder="<?= $escaper->escapeHtml(__('John')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="firstName"
+            id="buckaroo_paypermail_first_name"
+            placeholder="<?= $escaper->escapeHtml(__('John')); ?>"
+        >
         <?php if ($magewire->hasError('firstName')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('firstName')) ?></div>
         <?php endif; ?>
@@ -42,7 +47,12 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_paypermail_middle_name">
             <?= $escaper->escapeHtml(__('Billing Middle Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="middleName" id="buckaroo_paypermail_middle_name" placeholder="<?= $escaper->escapeHtml(__('S')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="middleName"
+            id="buckaroo_paypermail_middle_name"
+            placeholder="<?= $escaper->escapeHtml(__('S')); ?>"
+        >
     </div>
 
     <div class="flex flex-col gap-y-2 field field-reserved">
@@ -50,7 +60,12 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Billing Last Name:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="lastName" id="buckaroo_paypermail_last_name" placeholder="<?= $escaper->escapeHtml(__('Doe')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="lastName"
+            id="buckaroo_paypermail_last_name"
+            placeholder="<?= $escaper->escapeHtml(__('Doe')); ?>"
+        >
         <?php if ($magewire->hasError('lastName')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('lastName')) ?></div>
         <?php endif; ?>
@@ -61,9 +76,14 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Email:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="email" id="buckaroo_paypermail_email" placeholder="<?= $escaper->escapeHtml(__('email@example.com')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="email"
+            id="buckaroo_paypermail_email"
+            placeholder="<?= $escaper->escapeHtml(__('email@example.com')); ?>"
+        >
         <?php if ($magewire->hasError('email')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('email')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/sepaDirect.phtml b/view/frontend/templates/component/payment/method/sepaDirect.phtml
index 08b8a89..c795244 100644
--- a/view/frontend/templates/component/payment/method/sepaDirect.phtml
+++ b/view/frontend/templates/component/payment/method/sepaDirect.phtml
@@ -37,7 +37,12 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('BIC Number')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="text" wire:model.lazy="bic" id="buckaroo_sepa_direct_bic" placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>">
+            <input
+                type="text"
+                wire:model.lazy="bic"
+                id="buckaroo_sepa_direct_bic"
+                placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>"
+            >
             <?php if ($magewire->hasError('bic')) : ?>
                 <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('bic')) ?></div>
             <?php endif; ?>
@@ -46,4 +51,4 @@ use Magento\Framework\Escaper;
     }
     ?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/tinka.phtml b/view/frontend/templates/component/payment/method/tinka.phtml
index f1362d2..17bb733 100644
--- a/view/frontend/templates/component/payment/method/tinka.phtml
+++ b/view/frontend/templates/component/payment/method/tinka.phtml
@@ -11,7 +11,13 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay20_tos_fullname">
             <?= $escaper->escapeHtml(__('Billing Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="fullName" disabled id="buckaroo_afterpay20_tos_fullname" class="bg-gray-200">
+        <input
+            type="text"
+            wire:model.lazy="fullName"
+            disabled
+            id="buckaroo_afterpay20_tos_fullname"
+            class="bg-gray-200"
+        >
     </div>
 
     <?php if ($magewire->showBirth()) {
@@ -21,7 +27,13 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_afterpay20_dob">
+            <input
+                type="date"
+                x-data
+                value="<?= $magewire->dateOfBirth ?>"
+                @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+                id="buckaroo_afterpay20_dob"
+            >
             <?php if ($magewire->hasError('dateOfBirth')) : ?>
                 <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
@@ -45,4 +57,4 @@ use Magento\Framework\Escaper;
     } ?>
 
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/voucher.phtml b/view/frontend/templates/component/payment/method/voucher.phtml
index 47b7d40..5cf9d1d 100644
--- a/view/frontend/templates/component/payment/method/voucher.phtml
+++ b/view/frontend/templates/component/payment/method/voucher.phtml
@@ -72,17 +72,11 @@ use Magento\Framework\Escaper;
             }));
         },
         register() {
-            const v = async () => {
+            window.buckarooTask = async () => {
                 if(!this.canSubmit) {
                     await this.submit();
                 }
             };
-            window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                detail: {
-                    buckarooTask: v
-                }
-            }));
-
         },
 
     })" x-init="register()" novalidate>
@@ -91,10 +85,20 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Voucher code:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="text" x-model="code" data-validate='{"required": true}' @change="onChange" id="buckaroo_voucher_code" name="buckaroo_voucher_code" placeholder="<?= $escaper->escapeHtml(__('1A2B-3C4D-6E7F-8G9H-1I2J')); ?>" />
+            <input
+                type="text"
+                x-model="code"
+                data-validate='{"required": true}'
+                @change="onChange"
+                id="buckaroo_voucher_code"
+                name="buckaroo_voucher_code"
+                placeholder="<?= $escaper->escapeHtml(__('1A2B-3C4D-6E7F-8G9H-1I2J')); ?>"
+            />
         </div>
-        <button type="button" @click="submit" class="btn btn-primary"><?= $escaper->escapeHtml(__('Apply Voucher')); ?></button>
+        <button type="button" @click="submit" class="btn btn-primary">
+            <?= $escaper->escapeHtml(__('Apply Voucher')); ?>
+        </button>
     </form>
 
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/total-segments/empty.phtml b/view/frontend/templates/total-segments/empty.phtml
index 784da93..a766f11 100644
--- a/view/frontend/templates/total-segments/empty.phtml
+++ b/view/frontend/templates/total-segments/empty.phtml
@@ -1,4 +1,2 @@
 <?php
 declare(strict_types=1);
-
-?>
\ No newline at end of file