diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php
index 6fdf581b6ba9..837f5a8f3cb5 100644
--- a/app/PaymentDrivers/Stripe/ACH.php
+++ b/app/PaymentDrivers/Stripe/ACH.php
@@ -88,7 +88,7 @@ class ACH
             $client_gateway_token->save();
         }
 
-        return redirect()->route('client.payment_methods.verification', ['id' => $client_gateway_token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
+        return redirect()->route('client.payment_methods.verification', ['payment_method' => $client_gateway_token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
     }
 
     public function verificationView(ClientGatewayToken $token)
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index 9deed999d228..272170a8a657 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -421,7 +421,7 @@ class StripePaymentDriver extends BaseDriver
             $response = $stripe->paymentMethods->detach($token->token);
         } catch (\Exception $e) {
             SystemLogger::dispatch([
-                'server_response' => $response, 'data' => request()->all(),
+                'server_response' => $e->getMessage(), 'data' => request()->all(),
             ], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client);
         }
     }
diff --git a/resources/js/clients/payment_methods/authorize-ach.js b/resources/js/clients/payments/stripe-ach.js
similarity index 95%
rename from resources/js/clients/payment_methods/authorize-ach.js
rename to resources/js/clients/payments/stripe-ach.js
index 911b2713cc2f..0b38bdf6a6d0 100644
--- a/resources/js/clients/payment_methods/authorize-ach.js
+++ b/resources/js/clients/payments/stripe-ach.js
@@ -77,8 +77,8 @@ class AuthorizeACH {
 
     handle() {
         document
-            .getElementById('token-form')
-            .addEventListener('submit', (e) => this.handleSubmit(e));
+            .getElementById('save-button')
+            .addEventListener('click', (e) => this.handleSubmit(e));
     }
 }
 
diff --git a/resources/js/clients/payments/alipay.js b/resources/js/clients/payments/stripe-alipay.js
similarity index 100%
rename from resources/js/clients/payments/alipay.js
rename to resources/js/clients/payments/stripe-alipay.js
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
index a73bcb11eccd..e18885f25900 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
@@ -1,127 +1,75 @@
-@extends('portal.ninja2020.layout.app')
-@section('meta_title', ctrans('texts.ach'))
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'ACH (Stripe)', 'card_title' => 'ACH (Stripe)'])
 
-@push('head')
+@section('gateway_head')
     <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
-@endpush
+@endsection
+
+@section('gateway_content')
+    @if(session()->has('ach_error'))
+        <div class="alert alert-failure mb-4">
+            <p>{{ session('ach_error') }}</p>
+        </div>
+    @endif
 
-@section('body')
     <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::BANK_TRANSFER]) }}" method="post" id="server_response">
         @csrf
+       
         <input type="hidden" name="company_gateway_id" value="{{ $gateway->id }}">
         <input type="hidden" name="gateway_type_id" value="2">
         <input type="hidden" name="gateway_response" id="gateway_response">
         <input type="hidden" name="is_default" id="is_default">
     </form>
-    <div class="container mx-auto">
-        <div class="grid grid-cols-6 gap-4">
-            <div class="col-span-6 md:col-start-2 md:col-span-4">
-                <div class="alert alert-failure mb-4" hidden id="errors"></div>
-                @if(session()->has('ach_error'))
-                <div class="alert alert-failure mb-4">
-                    <p>{{ session('ach_error') }}</p>
-                </div>
-                @endif
-                <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-                    <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                        <h3 class="text-lg leading-6 font-medium text-gray-900">
-                            {{ ctrans('texts.ach') }}
-                        </h3>
-                        <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
-                            {{ ctrans('texts.authorize_for_future_use') }}. {{ ctrans('texts.ach_verification_delay_help') }}
-                        </p>
-                    </div>
-                    <div>
-                        <dl>
-                            <form action="#" method="post" id="token-form">
-                                <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex items-center">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500 mr-4">
-                                        {{ ctrans('texts.account_holder_type') }}
-                                    </dt>
-                                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2 flex">
-                                        <span class="flex items-center mr-4">
-                                            <input class="form-radio mr-2" type="radio" value="individual" name="account-holder-type" checked>
-                                            <span>{{ __('texts.individual_account') }}</span>
-                                        </span>
-                                        <span class="flex items-center">
-                                            <input class="form-radio mr-2" type="radio" value="company" name="account-holder-type">
-                                            <span>{{ __('texts.company_account') }}</span>
-                                        </span>
-                                    </dd>
-                                </div>
-                                <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex-col md:flex-row items-center">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.account_holder_name') }}
-                                    </dt>
-                                    <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        <input class="input w-full" id="account-holder-name" type="text" placeholder="{{ ctrans('texts.name') }}" required>
-                                    </dd>
-                                </div>
-                                <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex-col md:flex-row items-center">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.country') }}
-                                    </dt>
-                                    <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        <select name="countries" id="country" class="form-select input w-full" required>
-                                            @foreach($countries as $country)
-                                                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
-                                            @endforeach
-                                        </select>
-                                    </dd>
-                                </div>
-                                <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex-col md:flex-row items-center">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.currency') }}
-                                    </dt>
-                                    <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        <select name="currencies" id="currency" class="form-select input w-full">
-                                            @foreach($currencies as $currency)
-                                                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->name }})</option>
-                                            @endforeach
-                                        </select>
-                                    </dd>
-                                </div>
-                                <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex-col md:flex-row items-center">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.routing_number') }}
-                                    </dt>
-                                    <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        <input class="input w-full" id="routing-number" type="text" required>
-                                    </dd>
-                                </div>
-                                <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex-col md:flex-row items-center">
-                                    <dt class="text-sm leading-5 font-medium text-gray-500">
-                                        {{ ctrans('texts.account_number') }}
-                                    </dt>
-                                    <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                        <input class="input w-full" id="account-number" type="text" required>
-                                    </dd>
-                                </div>
-                                <div class="bg-gray-50 px-4 py-5 sm:grid  sm:px-6 flex-col md:flex-row items-center">
-                                    <span class="text-sm leading-5 font-medium text-gray-500">
-                                        <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
-                                        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->user()->company->email]) }}</label>
-                                    </span>
-                                </div>
-                                <div class="bg-white px-4 py-5 flex justify-end">
-                                    <button type="submit" class="button button-primary bg-primary" id="save-button">
-                                        <svg class="animate-spin h-5 w-5 text-white hidden" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                                            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                                            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-                                        </svg>
-                                        <span>{{ __('texts.save') }}</span>
-                                    </button>
-                                </div>
-                            </form>
-                        </dl>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+
+    <div class="alert alert-failure mb-4" hidden id="errors"></div>
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_holder_type')])
+        <span class="flex items-center mr-4">
+            <input class="form-radio mr-2" type="radio" value="individual" name="account-holder-type" checked>
+            <span>{{ __('texts.individual_account') }}</span>
+        </span>
+        <span class="flex items-center">
+            <input class="form-radio mr-2" type="radio" value="company" name="account-holder-type">
+            <span>{{ __('texts.company_account') }}</span>
+        </span>
+    @endcomponent
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_holder_name')])
+        <input class="input w-full" id="account-holder-name" type="text" placeholder="{{ ctrans('texts.name') }}" required>
+    @endcomponent
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
+        <select name="countries" id="country" class="form-select input w-full" required>
+            @foreach($countries as $country)
+                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
+            @endforeach
+        </select>
+    @endcomponent
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.currency')])
+        <select name="currencies" id="currency" class="form-select input w-full">
+            @foreach($currencies as $currency)
+                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->name }})</option>
+            @endforeach
+        </select>
+    @endcomponent
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.routing_number')])
+        <input class="input w-full" id="routing-number" type="text" required>
+    @endcomponent
+    
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_number')])
+        <input class="input w-full" id="account-number" type="text" required>
+    @endcomponent
+
+    @component('portal.ninja2020.components.general.card-element-single')
+        <input type="checkbox" class="form-checkbox mr-1" id="accept-terms" required>
+        <label for="accept-terms" class="cursor-pointer">{{ ctrans('texts.ach_authorization', ['company' => auth()->user()->company->present()->name, 'email' => auth()->user()->company->email]) }}</label>
+    @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.pay_now', ['id' => 'save-button'])
 @endsection
 
-@push('footer')
+@section('gateway_footer')
     <script src="https://js.stripe.com/v3/"></script>
-    <script src="{{ asset('js/clients/payment_methods/authorize-ach.js') }}"></script>
-@endpush 
+    <script src="{{ asset('js/clients/payments/stripe-ach.js') }}"></script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php
index 2c964d717ace..3b4375b502d1 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/verify.blade.php
@@ -6,7 +6,7 @@
         <div class="grid grid-cols-6 gap-4">
             <div class="col-span-6 md:col-start-2 md:col-span-4">
                 @if(session()->has('error'))
-                <div class="alert alert-failure mb-4">{{ session('error') }}</div>
+                    <div class="alert alert-failure mb-4">{{ session('error') }}</div>
                 @endif
                 <div class="bg-white shadow overflow-hidden sm:rounded-lg">
                     <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
@@ -51,4 +51,30 @@
             </div>
         </div>
     </div>
+@endsection
+
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'ACH (Verification)', 'card_title' => 'ACH (Verification)'])
+
+@section('gateway_content')
+    @if(session()->has('error'))
+        <div class="alert alert-failure mb-4">{{ session('error') }}</div>
+    @endif
+
+    <form method="POST">
+        @csrf
+        <input type="hidden" name="customer" value="{{ $token->gateway_customer_reference }}">
+        <input type="hidden" name="source" value="{{ $token->meta->id }}">
+
+        @component('portal.ninja2020.components.general.card-element', ['title' => '#1 ' . ctrans('texts.amount')])
+            <input type="text" name="transactions[]" class="w-full input" required>
+        @endcomponent
+
+        @component('portal.ninja2020.components.general.card-element', ['title' => '#2 ' . ctrans('texts.amount')])
+            <input type="text" name="transactions[]" class="w-full input" required>
+        @endcomponent
+    
+        @component('portal.ninja2020.gateways.includes.pay_now', ['type' => 'submit'])
+            {{ ctrans('texts.complete_verification')}}
+        @endcomponent
+    </form>
 @endsection
\ No newline at end of file