diff --git a/Magewire/Payment/Method/Creditcard.php b/Magewire/Payment/Method/Creditcard.php
deleted file mode 100644
index 4c5acc5..0000000
--- a/Magewire/Payment/Method/Creditcard.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Buckaroo\HyvaCheckout\Magewire\Payment\Method;
-
-use Rakit\Validation\Validator;
-use Magewirephp\Magewire\Component;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Model\Session as SessionCheckout;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Hyva\Checkout\Model\Magewire\Component\EvaluationInterface;
-use Hyva\Checkout\Model\Magewire\Component\EvaluationResultFactory;
-use Hyva\Checkout\Model\Magewire\Component\EvaluationResultInterface;
-use Buckaroo\Magento2\Model\ConfigProvider\Method\Ideal as MethodIdeal;
-use Buckaroo\Magento2\Model\ConfigProvider\Method\Creditcard as MethodConfigProvider;
-
-class Creditcard extends Component\Form implements EvaluationInterface
-{
-    public ?string $cardType = null;
-
-    protected $loader = [
-        'cardType' => 'Saving card type'
-    ];
-
-    protected $rules = [
-        'cardType' => 'required'
-    ];
-
-    protected $messages = [
-        'cardType:required' => 'A card type is required'
-    ];
-
-    protected SessionCheckout $sessionCheckout;
-
-    protected CartRepositoryInterface $quoteRepository;
-
-    protected ScopeConfigInterface $scopeConfig;
-
-    protected MethodConfigProvider $methodConfigProvider;
-
-    public function __construct(
-        Validator $validator,
-        SessionCheckout $sessionCheckout,
-        CartRepositoryInterface $quoteRepository,
-        ScopeConfigInterface $scopeConfig,
-        MethodConfigProvider $methodConfigProvider
-    ) {
-        parent::__construct($validator);
-
-        $this->sessionCheckout = $sessionCheckout;
-        $this->quoteRepository = $quoteRepository;
-        $this->scopeConfig = $scopeConfig;
-        $this->methodConfigProvider = $methodConfigProvider;
-    }
-
-    /**
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    public function mount(): void
-    {
-        $this->cardType  = $this->sessionCheckout
-            ->getQuote()
-            ->getPayment()
-            ->getAdditionalInformation('card_type');
-    }
-
-    /**
-     * Listen for bank cardType been updated.
-     */
-    public function updatedCardType(string $value): ?string
-    {
-        $this->validateOnly();
-        $value = empty($value) ? null : $value;
-
-        try {
-            $quote = $this->sessionCheckout->getQuote();
-            $quote->getPayment()->setAdditionalInformation('card_type', $value);
-
-            $this->quoteRepository->save($quote);
-        } catch (LocalizedException $exception) {
-            $this->dispatchErrorMessage($exception->getMessage());
-        }
-
-        return $value;
-    }
-    public function evaluateCompletion(EvaluationResultFactory $resultFactory): EvaluationResultInterface
-    {
-        if ($this->cardType === null) {
-            return $resultFactory->createErrorMessageEvent()
-                ->withCustomEvent('payment:method:error')
-                ->withMessage('A card type is required');
-        }
-
-        return $resultFactory->createSuccess();
-    }
-
-    public function getIssuers(): array
-    {
-        return $this->methodConfigProvider->formatIssuers();
-    }
-
-    public function displayAsSelect($storeId = null): bool
-    {
-        return $this->scopeConfig->getValue(
-            MethodIdeal::XPATH_IDEAL_SELECTION_TYPE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $storeId
-        ) === '2';
-    }
-}
diff --git a/Plugin/MethodList.php b/Plugin/MethodList.php
index 3134401..67b2d3c 100644
--- a/Plugin/MethodList.php
+++ b/Plugin/MethodList.php
@@ -62,7 +62,6 @@ private function getSvgLogo(string $methodCode): string
             "mrcash" => "svg/bancontact.svg",
             "p24" => "svg/przelewy24.svg",
             "sepadirectdebit" => "svg/sepa-directdebit.svg",
-            "sofortbanking" => "svg/sofort.svg",
             "emandate" => "emandate.png",
             "pospayment" => "pos.png",
             "transfer" => "svg/sepa-credittransfer.svg",
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 1cb36dc..427e08b 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -4,7 +4,6 @@
         <arguments>
             <argument name="placeOrderServiceList" xsi:type="array">
                 <item name="buckaroo_magento2_belfius" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
-                <item name="buckaroo_magento2_sofortbanking" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_alipay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_wechatpay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_trustly" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
@@ -20,7 +19,6 @@
                 <item name="buckaroo_magento2_klarna" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_klarnain" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_klarnakp" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
-                <item name="buckaroo_magento2_creditcard" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_creditcards" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_afterpay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_afterpay2" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
@@ -41,7 +39,7 @@
             </argument>
         </arguments>
     </type>
-      <type name="Hyva\Checkout\Model\Form\EntityFormFieldFactory">
+    <type name="Hyva\Checkout\Model\Form\EntityFormFieldFactory">
         <arguments>
             <!-- Hide idin customer fields -->
             <argument name="customFields" xsi:type="array">
diff --git a/view/frontend/layout/hyva_checkout_cart_index.xml b/view/frontend/layout/hyva_checkout_cart_index.xml
new file mode 100644
index 0000000..c666006
--- /dev/null
+++ b/view/frontend/layout/hyva_checkout_cart_index.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="buckaroo_magento2.checkout.cart.ideal.fast.checkout" remove="true" />
+    </body>
+</page>
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
index a14b10f..0553026 100644
--- a/view/frontend/layout/hyva_checkout_components.xml
+++ b/view/frontend/layout/hyva_checkout_components.xml
@@ -45,16 +45,6 @@
                 </arguments>
             </block>
 
-            <block name="checkout.payment.method.buckaroo_magento2_creditcard"
-                    as="buckaroo_magento2_creditcard"
-                    template="Buckaroo_HyvaCheckout::component/payment/method/creditcard.phtml">
-                <arguments>
-                    <argument name="magewire" xsi:type="object">
-                        \Buckaroo\HyvaCheckout\Magewire\Payment\Method\Creditcard
-                    </argument>
-                </arguments>
-            </block>
-
              <block name="checkout.payment.method.buckaroo_magento2_afterpay20"
                     as="buckaroo_magento2_afterpay20"
                     template="Buckaroo_HyvaCheckout::component/payment/method/afterpay20.phtml">
@@ -210,6 +200,9 @@
                 class="Buckaroo\HyvaCheckout\Block\Totals\AlreadyPaid"
                 as="buckaroo_already_paid"
                 template="Buckaroo_HyvaCheckout::total-segments/already-paid.phtml"/>
+            <block name="price-summary.total-segment.remaining_amount"
+                as="remaining_amount"
+                template="Buckaroo_HyvaCheckout::checkout/summary/remaining-amount.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/layout/hyva_checkout_index_index.xml b/view/frontend/layout/hyva_checkout_index_index.xml
index 92ce243..9bbb463 100644
--- a/view/frontend/layout/hyva_checkout_index_index.xml
+++ b/view/frontend/layout/hyva_checkout_index_index.xml
@@ -11,4 +11,4 @@
             </block>
         </referenceContainer>
     </body>
-</page>
\ No newline at end of file
+</page>
diff --git a/view/frontend/templates/checkout/summary/remaining-amount.phtml b/view/frontend/templates/checkout/summary/remaining-amount.phtml
new file mode 100644
index 0000000..24fab35
--- /dev/null
+++ b/view/frontend/templates/checkout/summary/remaining-amount.phtml
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+
+/** @var Template $block */
+/** @var FormatterViewModel $formatterViewModel */
+/** @var ViewModelRegistry $viewModels */
+/** @var Escaper $escaper */
+
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Template;
+use Hyva\Checkout\ViewModel\Checkout\Formatter as FormatterViewModel;
+use Hyva\Theme\Model\ViewModelRegistry;
+
+$formatterViewModel = $viewModels->require(FormatterViewModel::class);
+$segment = $block->getSegment();
+if ($segment['value'] != 0) {
+    ?>
+    <div class="flex gap-4 justify-between border-t border-gray-400 pt-4 mt-4 md:gap-0">
+        <span class="label font-bold text-xl">
+            <?= $block->escapeHtml($segment['title']) ?>
+        </span>
+        <span class="value text-right font-bold">
+            <?= /* @noEscape */ $formatterViewModel->currency($segment['value'] ?? 0) ?>
+        </span>
+    </div>
+    <?php
+}
diff --git a/view/frontend/templates/component/payment/after.phtml b/view/frontend/templates/component/payment/after.phtml
index c0e4feb..e048c9b 100644
--- a/view/frontend/templates/component/payment/after.phtml
+++ b/view/frontend/templates/component/payment/after.phtml
@@ -4,6 +4,7 @@
     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-cloak
     x-bind:class="showModal ? 'flex': 'hidden'">
         <div class="relative w-full max-w-md max-h-full"  @click.outside="close()">
             <!-- Modal content -->
@@ -63,6 +64,30 @@
     </div>
 </div>
 <script>
+    document.addEventListener('DOMContentLoaded', function() {
+        function updatePosition() {
+            // Select the elements by their class names
+            const alreadyPaidElement = document.querySelector('.remaining_amount');
+            const grandTotalElement = document.querySelector('.grand_total');
+
+            // Ensure both elements exist before trying to move them
+            if (alreadyPaidElement && grandTotalElement) {
+                // Move the 'already-paid' block after the 'grand-total' block
+                grandTotalElement.insertAdjacentElement('afterend', alreadyPaidElement);
+            }
+        }
+
+        updatePosition();
+
+        document.querySelectorAll('input[name="payment-method-option"]').forEach((input) => {
+            input.addEventListener('change', function() {
+                setTimeout(function() {
+                    updatePosition();
+                }, 2000);
+            });
+        });
+    });
+
 
     var buckaroo = {
         modal() {
@@ -71,7 +96,7 @@
                 title: '<?= $escaper->escapeHtml(__('Success')); ?>',
                 content: '',
                 showClose: true,
-                buttons:[],
+                buttons: [],
                 close() {
                     this.showModal = false;
                 },
@@ -82,7 +107,7 @@
                             this.showModal = true;
                             Object.keys(event.detail.data).forEach((key) => {
                                 this[key] = event.detail.data[key];
-                            })
+                            });
                         }
                     });
 
@@ -90,7 +115,7 @@
                         this.close();
                     });
                 }
-            }
+            };
         },
         start() {
             const addTask = function() {
@@ -98,12 +123,13 @@
                     if (window.buckarooTask) {
                         await window.buckarooTask();
                     }
-                })
-            }
+                });
+            };
             addTask();
             window.addEventListener('checkout:navigation:success', (event) => {
-                if (event.detail.route === 'payment')
+                if (event.detail.route === 'payment') {
                     addTask();
+                }
             });
 
 
@@ -377,59 +403,24 @@
         },
         giftcards($el) {
             return Object.assign(hyva.formValidation($el), {
-                card: '',
+                card:'',
                 pin: '',
                 cardNumber: '',
-                canSubmit: false,
-
-                async update() {
-                    await this.$wire.getRemainingAmount();
-                },
-                listenToUpdate(){
-                    this.$wire.on('remainingAmount', async (response) => {
-                        this.updateGrandTotal(response);
-                    })
-                },
+                canSubmit:false,
                 async formValid() {
-                    try {
-                        await this.validate();
-                    } catch (error) {
-                        return false;
-                    }
-                    return true;
+                        try {
+                            await this.validate();
+                        } catch (error) {
+                            return false;
+                        }
+                        return true;
                 },
-
                 async submit() {
-                    if (!await this.formValid()) {
+                    if(!await this.formValid()) {
                         return;
                     }
                     await this.$wire.applyGiftcard(this.card, this.cardNumber, this.pin);
                 },
-
-                listenToSubmit() {
-                    this.$wire.on('giftcard_response', async (response) => {
-                        if (response.error) {
-                            this.displayError(response.error);
-                        } else if (response.remainder_amount === undefined) {
-                            this.displayError(response.message);
-                        } else if (response.remainder_amount == 0) {
-                            this.canSubmit = true;
-                            await hyvaCheckout.order.place();
-                        } else if (response.remainder_amount != 0) {
-                            this.displaySuccess(response);
-                            this.updateGrandTotal(response.remainder_amount_currency);
-                        }
-                    })
-                },
-                updateGrandTotal(remainder_amount_currency) {
-                    const grandTotalElement = document.querySelector('.grand_total .value');
-                    grandTotalElement.textContent = remainder_amount_currency
-
-                    setTimeout(function () {
-                        grandTotalElement.textContent = remainder_amount_currency
-
-                    }, 2000);
-                },
                 displaySuccess(response) {
                     window.dispatchEvent(new CustomEvent('buckaroo-modal-show', {
                         detail: {
@@ -444,7 +435,6 @@
                         }
                     }));
                 },
-
                 displayError(message) {
                     window.dispatchEvent(new CustomEvent('buckaroo-modal-show', {
                         detail: {
@@ -455,18 +445,33 @@
                         }
                     }));
                 },
-
+                listenToSubmit() {
+                    this.$wire.on('giftcard_response', async (response) => {
+                        if (response.error) {
+                            this.displayError(response.error);
+                        } else if(response.remainder_amount === undefined) {
+                            this.displayError(response.message);
+                        } else if (response.remainder_amount == 0) {
+                            this.canSubmit = true;
+                            await hyvaCheckout.order.place();
+                        } else if (response.remainder_amount != 0) {
+                            this.displaySuccess(response);
+                        }
+                        setTimeout(function () {
+                            updatePosition();
+                        }, 2000);
+                    })
+                },
                 register() {
                     this.listenToSubmit();
-                    this.update();
-                    this.listenToUpdate();
                     window.buckarooTask = async () => {
-                        if (!this.canSubmit) {
+                        if(!this.canSubmit) {
                             await this.submit();
                         }
                     };
                 },
-            });
+
+            })
         },
         mrCash($el) {
             return Object.assign(hyva.formValidation($el), {
diff --git a/view/frontend/templates/component/payment/method/creditcard.phtml b/view/frontend/templates/component/payment/method/creditcard.phtml
deleted file mode 100644
index f7d46e8..0000000
--- a/view/frontend/templates/component/payment/method/creditcard.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/** @var Escaper $escaper */
-/** @var \Buckaroo\HyvaCheckout\Magewire\Checkout\Payment\Method\Creditcard $magewire */
-use Magento\Framework\Escaper;
-
-$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>
-            <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"]) ?>">
-                        <?= $escaper->escapeHtml($issuer["name"]) ?>
-                    </option>
-                <?php
-                }
-                ?>
-            </select>
-        <?php } else { ?>
-            <p><?=  $escaper->escapeHtml(__('Select a Credit Card or Debit Card:')); ?></p>
-            <?php
-            foreach ($issuers as $issuer) {
-            ?>
-                <div class="flex flex-row flex-grow gap-x-2 items-center">
-                    <input
-                    type="radio"
-                    name="issuer"
-                    wire:model="cardType"
-                    id="bk_credicard_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
-                    value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
-                    />
-                    <label
-                    for="bk_credicard_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
-                    class="flex flex-row flex-grow gap-x-2 items-center">
-                        <img src="<?= $escaper->escapeUrl($issuer["img"]) ?>"
-                        alt="<?= $issuer["name"] ?>"
-                        style="max-height:25px;"
-                        />
-                        <?=  $escaper->escapeHtml($issuer["name"]) ?>
-                    </label>
-                </div>
-            <?php
-            }
-            ?>
-        <?php } ?>
-    </div>
-</div>