diff --git a/view/frontend/web/template/payment/buckaroo_magento2_giftcards.html b/view/frontend/web/template/payment/buckaroo_magento2_giftcards.html
index 45f49b48..cf48d768 100644
--- a/view/frontend/web/template/payment/buckaroo_magento2_giftcards.html
+++ b/view/frontend/web/template/payment/buckaroo_magento2_giftcards.html
@@ -8,10 +8,10 @@
                        class="radio"
                        data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
                 <label class="label" data-bind="attr: {'for': getCode()}" >
-                        <!-- ko text: getTitle() --><!-- /ko -->
-                        <!-- ko if: subtext !== null && subtext.length > 0 -->
-                       <p class="bk-description" data-bind="text: subtext, style: subTextStyle"></p>
-                        <!-- /ko -->
+                    <!-- ko text: getTitle() --><!-- /ko -->
+                    <!-- ko if: subtext !== null && subtext.length > 0 -->
+                    <p class="bk-description" data-bind="text: subtext, style: subTextStyle"></p>
+                    <!-- /ko -->
                 </label>
             </div>
             <div class="bk-img-wrap">
@@ -67,131 +67,131 @@
 <!-- ko ifnot: isGiftcardsRedirectMode() -->
 
 <div class="buckaroo_magento2_all_giftcards" data-bind="foreach: { data: allgiftcards, as: 'giftcard', noChildContext: false }">
-<div data-bind="attr: { 'class': 'buckaroo_magento2_all_giftcard payment-method buckaroo_magento2_' + code }, css: {'_active': ($parent.getCode() == $parent.isChecked() && $parent.getGiftcardType() == code)}">
-
-<div class="payment-method-title field choice bk-payment">
-    <div class="bk-payment-wrap">
-        <div class="bk-radio-wrap">
-            <input type="radio"
-               name="payment[method]"
-               class="radio"
-               data-bind="attr: {'id': code, 'data-method': 'buckaroo_magento2_giftcards'}, value: code,  click: $parent.selectGiftCardPaymentMethod.bind($parent, code), checked: $parent.isCheckedGiftCardPaymentMethod.bind($parent, code), visible: $parent.isRadioButtonVisible()"/>
-            <label class="label" data-bind="attr: {'for': code}" >
-                <!-- ko text: title --><!-- /ko -->
-            </label>
-        </div>
-        <div class="bk-img-wrap">
-            <img data-bind="attr: { src: logo }" />
+    <div data-bind="attr: { 'class': 'buckaroo_magento2_all_giftcard payment-method buckaroo_magento2_' + code }, css: {'_active': ($parent.getCode() == $parent.isChecked() && $parent.getGiftcardType() == code)}">
+
+        <div class="payment-method-title field choice bk-payment">
+            <div class="bk-payment-wrap">
+                <div class="bk-radio-wrap">
+                    <input type="radio"
+                           name="payment[method]"
+                           class="radio"
+                           data-bind="attr: {'id': code, 'data-method': 'buckaroo_magento2_giftcards'}, value: code,  click: $parent.selectGiftCardPaymentMethod.bind($parent, code), checked: $parent.isCheckedGiftCardPaymentMethod.bind($parent, code), visible: $parent.isRadioButtonVisible()"/>
+                    <label class="label" data-bind="attr: {'for': code}" >
+                        <!-- ko text: title --><!-- /ko -->
+                    </label>
+                </div>
+                <div class="bk-img-wrap">
+                    <img data-bind="attr: { src: logo }" />
+                </div>
+            </div>
         </div>
-    </div>
-    </div>
 
-    <div class="payment-method-content">
-        <!-- ko foreach: $parent.getRegion('messages') -->
-        <!-- ko template: getTemplate() --><!-- /ko -->
-        <!--/ko-->
-
-        <div class="payment-method-billing-address">
-            <!-- ko foreach: $parent.getRegion($parent.getBillingAddressFormName()) -->
-                    <!-- ko template: getTemplate()--><!-- /ko -->
+        <div class="payment-method-content">
+            <!-- ko foreach: $parent.getRegion('messages') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
-        </div>
 
-    <div class="payment-method-second-col billing-address-form">
-        <form method="post"
-              data-role="$parent.save"
-              data-bind="$parent.submit:$parent.save,
-              mageInit: { 'validation': [] },
-              attr: {'data-hasrequired': $t('* Required Fields')}">
-            <fieldset class="fieldset payment styled">
-
-                <div class="fieldset card_front width-100">
-
-                    <div class="field required width-100" >
-                        <label class="label" for="buckaroo_magento2_giftcards_cardnumber"> <span data-bind="i18n: 'Card number:'"> </span> </label>
-                        <div class="control">
-                            <input type="text"
-                                   class="input-text field buckaroo_magento2_giftcards_input"
-                                   name="payment[buckaroo_magento2_giftcards][cardnumber]"
-                                   data-bind="
-                        valueUpdate: 'blur',
-                        value: $parent.CardNumber,
-                        textInput: $parent.CardNumber(),
-                        attr: { 'data-card': code, 'id': 'buckaroo_magento2_giftcards_cardnumber_' + code, 'data-validate': JSON.stringify({ 'required': true, '$parent.validateCardNumber': true }) },
-                        event: { blur: $parent.checkValidness }">
-                        </div>
-                    </div>
-
-                <div class="fieldset width-100">
-
-                    <div class="magnet_stripe width-100"></div>
-
-                    <div class="field required card_security width-100" >
-                        <label class="label width-65-l" for="buckaroo_magento2_giftcards_pin"> <span data-bind="i18n: 'PIN / Security code:'"> </span> </label>
-                        <div class="control card-info-input width-25-l">
-                            <input type="text"
-                                   class="input-text field buckaroo_magento2_giftcards_input"
-                                   name="payment[buckaroo_magento2_giftcards][pin]"
-                                   data-bind="
-                        valueUpdate: 'blur',
-                        value: $parent.Pin,
-                        textInput: $parent.Pin(),
-                        attr: { 'id': 'buckaroo_magento2_giftcards_pin_' + code, 'data-validate': JSON.stringify({ 'required': true, '$parent.validatePin': true }) },
-                        event: { blur: $parent.checkValidness }">
-                        </div>
-                        <div class="card_info width-10">
-                              <div class="popup">
+            <div class="payment-method-billing-address">
+                <!-- ko foreach: $parent.getRegion($parent.getBillingAddressFormName()) -->
+                <!-- ko template: getTemplate()--><!-- /ko -->
+                <!--/ko-->
+            </div>
+
+            <div class="payment-method-second-col billing-address-form">
+                <form method="post"
+                      data-role="$parent.save"
+                      data-bind="$parent.submit:$parent.save,
+                  mageInit: { 'validation': [] },
+                  attr: {'data-hasrequired': $t('* Required Fields')}">
+                    <fieldset class="fieldset payment styled">
+
+                        <div class="fieldset card_front width-100">
+
+                            <div class="field required width-100" >
+                                <label class="label" for="buckaroo_magento2_giftcards_cardnumber"> <span data-bind="i18n: 'Card number:'"> </span> </label>
+                                <div class="control">
+                                    <input type="text"
+                                           class="input-text field buckaroo_magento2_giftcards_input"
+                                           name="payment[buckaroo_magento2_giftcards][cardnumber]"
+                                           data-bind="
+                            valueUpdate: 'blur',
+                            value: $parent.CardNumber,
+                            textInput: $parent.CardNumber(),
+                            attr: { 'data-card': code, 'id': 'buckaroo_magento2_giftcards_cardnumber_' + code, 'data-validate': JSON.stringify({ 'required': true, '$parent.validateCardNumber': true }) },
+                            event: { blur: $parent.checkValidness }">
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
 
-                <div class="field width-100">
-                    <span data-bind="i18n: 'Please make sure all fields are filled in correctly before proceeding.' "></span>
-                    <span class="apply-gift-card action primary" data-bind="
-                        click: $parent.applyGiftcard.bind($parent),
-                        i18n: 'Apply Gift Card',
-                        attr: { 'id': 'buckaroo_magento2_giftcards_submit_' + code }
-                        css: {disabled: $parent.buttoncheck()}">
-                    </span>
-                </div>
+                            <div class="fieldset width-100">
+
+                                <div class="magnet_stripe width-100"></div>
+
+                                <div class="field required card_security width-100" >
+                                    <label class="label width-65-l" for="buckaroo_magento2_giftcards_pin"> <span data-bind="i18n: 'PIN / Security code:'"> </span> </label>
+                                    <div class="control card-info-input width-25-l">
+                                        <input type="text"
+                                               class="input-text field buckaroo_magento2_giftcards_input"
+                                               name="payment[buckaroo_magento2_giftcards][pin]"
+                                               data-bind="
+                            valueUpdate: 'blur',
+                            value: $parent.Pin,
+                            textInput: $parent.Pin(),
+                            attr: { 'id': 'buckaroo_magento2_giftcards_pin_' + code, 'data-validate': JSON.stringify({ 'required': true, '$parent.validatePin': true }) },
+                            event: { blur: $parent.checkValidness }">
+                                    </div>
+                                    <div class="card_info width-10">
+                                        <div class="popup">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
 
-                </div>
-            </fieldset>
-        </form>
-    </div>
+                            <div class="field width-100">
+                                <span data-bind="i18n: 'Please make sure all fields are filled in correctly before proceeding.' "></span>
+                                <span class="apply-gift-card action primary" data-bind="
+                            click: $parent.applyGiftcard.bind($parent),
+                            i18n: 'Apply Gift Card',
+                            attr: { 'id': 'buckaroo_magento2_giftcards_submit_' + code }
+                            css: {disabled: $parent.buttoncheck()}">
+                        </span>
+                            </div>
 
-        <div class="checkout-agreements-block">
-            <!-- ko foreach: $parents[1].getRegion('before-place-order') -->
-                    <!-- ko template: getTemplate() --><!-- /ko -->
-            <!--/ko-->
-        </div>
+                        </div>
+                    </fieldset>
+                </form>
+            </div>
 
-        <div class="actions-toolbar">
-            <div class="primary">
-                <button id="button-action-checkout-giftcards"
-                        class="action primary checkout"
-                        type="submit"
-                        data-bind="
-                        click: $parent.placeOrder.bind($parent),
-                        attr: {title: $t('Place Order')},
-                        enable: ($parent.getCode() == $parent.isChecked()),
-                        css: {disabled: !$parent.buttoncheck()}
-                        "
-                        disabled>
-                    <span data-bind="i18n: 'Place Order'"></span>
-                </button>
+            <div class="checkout-agreements-block">
+                <!-- ko foreach: $parents[1].getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
             </div>
-        </div>
 
-        <!-- ko if: $parent.payWithBaseCurrency() -->
-        <div class="buckaroo_magento2_currency-notification">
-            <span data-bind="text: $parent.getPayWithBaseCurrencyText()"></span>
+            <div class="actions-toolbar">
+                <div class="primary">
+                    <button id="button-action-checkout-giftcards"
+                            class="action primary checkout"
+                            type="submit"
+                            data-bind="
+                            click: $parent.placeOrder.bind($parent),
+                            attr: {title: $t('Place Order')},
+                            enable: ($parent.getCode() == $parent.isChecked()),
+                            css: {disabled: !$parent.buttoncheck()}
+                            "
+                            disabled>
+                        <span data-bind="i18n: 'Place Order'"></span>
+                    </button>
+                </div>
+            </div>
+
+            <!-- ko if: $parent.payWithBaseCurrency() -->
+            <div class="buckaroo_magento2_currency-notification">
+                <span data-bind="text: $parent.getPayWithBaseCurrencyText()"></span>
+            </div>
+            <!--/ko-->
         </div>
-        <!--/ko-->
     </div>
 </div>
-</div>
 
 <div data-bind='afterRender: checkForPayments'> </div>
 <!-- /ko -->