diff --git a/modules/OfflinePayments/Resources/views/show.blade.php b/modules/OfflinePayments/Resources/views/show.blade.php
index a8907ff48..316b3c3d4 100644
--- a/modules/OfflinePayments/Resources/views/show.blade.php
+++ b/modules/OfflinePayments/Resources/views/show.blade.php
@@ -1,16 +1,24 @@
-<h2>{{ $setting['name'] }}</h2>
+<div>
+    <div class="d-none">
+        @if (!empty($setting['name']))
+            <h2>{{ $setting['name'] }}</h2>
+        @endif
 
-@if ($setting['description'])
-    <div class="well well-sm">
-        {{ $setting['description'] }}
+        @if (!empty($setting['description']))
+            <div class="well well-sm">
+                {{ $setting['description'] }}
+            </div>
+        @endif
     </div>
-@endif
+    <br>
 
-<div class="buttons">
-    <div class="float-right">
-        <input type="button" value="{{ trans('offline-payments::general.confirm') }}" id="button-confirm" class="btn btn-success" data-loading-text="{{ trans('offline-payments::general.loading') }}" />
+    <div class="buttons">
+        <div class="pull-right">
+            <input type="button" value="{{ trans('offline-payments::general.confirm') }}" id="button-confirm" class="btn btn-success" data-loading-text="{{ trans('offline-payments::general.loading') }}" />
+        </div>
     </div>
 </div>
+
 <script type="text/javascript"><!--
     $('#button-confirm').on('click', function() {
         $.ajax({
@@ -37,4 +45,4 @@
             }
         });
     });
-    //--></script>
+//--></script>
diff --git a/modules/PaypalStandard/Resources/views/show.blade.php b/modules/PaypalStandard/Resources/views/show.blade.php
index bdd14657d..7248daf36 100644
--- a/modules/PaypalStandard/Resources/views/show.blade.php
+++ b/modules/PaypalStandard/Resources/views/show.blade.php
@@ -1,48 +1,53 @@
 <div>
-    <h2>{{ $setting['name'] }}</h2>
+    <div class="d-none">
+        @if (!empty($setting['name']))
+            <h2>{{ $setting['name'] }}</h2>
+        @endif
 
-    @if($setting['mode'] == 'sandbox')
-        <div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> {{ trans('paypal-standard::general.test_mode') }}</div>
-    @endif
+        @if ($setting['mode'] == 'sandbox')
+            <div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> {{ trans('paypal-standard::general.test_mode') }}</div>
+        @endif
 
-    <div class="well well-sm">
-        {{ trans('paypal-standard::general.description') }}
-    </div>
-
-    <form action="{{ $setting['action'] }}" method="post">
-        <input type="hidden" name="cmd" value="_cart" />
-        <input type="hidden" name="upload" value="1" />
-        <input type="hidden" name="business" value="{{ $setting['email'] }}" />
-        <?php $i = 1; ?>
-        @foreach ($invoice->items as $item)
-            <input type="hidden" name="item_name_{{ $i }}" value="{{ $item->name }}" />
-            <input type="hidden" name="amount_{{ $i }}" value="{{ $item->price }}" />
-            <input type="hidden" name="quantity_{{ $i }}" value="{{ $item->quantity }}" />
-            <?php $i++; ?>
-        @endforeach
-        <input type="hidden" name="currency_code" value="{{ $invoice->currency_code}}" />
-        <input type="hidden" name="first_name" value="{{ $invoice->first_name }}" />
-        <input type="hidden" name="last_name" value="{{ $invoice->last_name }}" />
-        <input type="hidden" name="address1" value="{{ $invoice->customer_address }}" />
-        <input type="hidden" name="address_override" value="0" />
-        <input type="hidden" name="email" value="{{ $invoice->customer_email }}" />
-        <input type="hidden" name="invoice" value="{{ $invoice->id . '-' . $invoice->customer_name }}" />
-        <input type="hidden" name="lc" value="{{ $setting['language'] }}" />
-        <input type="hidden" name="rm" value="2" />
-        <input type="hidden" name="no_note" value="1" />
-        <input type="hidden" name="no_shipping" value="1" />
-        <input type="hidden" name="charset" value="utf-8" />
-        <input type="hidden" name="return" value="{{ route('portal.invoices.paypal-standard.return', $invoice->id) }}" />
-        <input type="hidden" name="notify_url" value="{{ route('portal.invoices.paypal-standard.complete', $invoice->id) }}" />
-        <input type="hidden" name="cancel_return" value="{{ $invoice_url }}" />
-        <input type="hidden" name="paymentaction" value="{{ $setting['transaction'] }}" />
-        <input type="hidden" name="custom" value="{{ $invoice->id }}" />
-        <input type="hidden" name="bn" value="Akaunting_2.0_WPS" />
-
-        <div class="buttons">
-            <div class="float-right">
-                <input type="submit" value="{{ trans('general.confirm') }}" class="btn btn-success" />
-            </div>
+        <div class="well well-sm">
+            {{ trans('paypal-standard::general.description') }}
         </div>
-    </form>
+    </div>
+    <br>
+
+    <div class="buttons">
+        <div class="pull-right">
+            <form action="{{ $setting['action'] }}" method="post">
+                <input type="hidden" name="cmd" value="_cart" />
+                <input type="hidden" name="upload" value="1" />
+                <input type="hidden" name="business" value="{{ $setting['email'] }}" />
+                <?php $i = 1; ?>
+                @foreach ($invoice->items as $item)
+                    <input type="hidden" name="item_name_{{ $i }}" value="{{ $item->name }}" />
+                    <input type="hidden" name="amount_{{ $i }}" value="{{ $item->price }}" />
+                    <input type="hidden" name="quantity_{{ $i }}" value="{{ $item->quantity }}" />
+                    <?php $i++; ?>
+                @endforeach
+                <input type="hidden" name="currency_code" value="{{ $invoice->currency_code}}" />
+                <input type="hidden" name="first_name" value="{{ $invoice->first_name }}" />
+                <input type="hidden" name="last_name" value="{{ $invoice->last_name }}" />
+                <input type="hidden" name="address1" value="{{ $invoice->customer_address }}" />
+                <input type="hidden" name="address_override" value="0" />
+                <input type="hidden" name="email" value="{{ $invoice->customer_email }}" />
+                <input type="hidden" name="invoice" value="{{ $invoice->id . '-' . $invoice->customer_name }}" />
+                <input type="hidden" name="lc" value="{{ $setting['language'] }}" />
+                <input type="hidden" name="rm" value="2" />
+                <input type="hidden" name="no_note" value="1" />
+                <input type="hidden" name="no_shipping" value="1" />
+                <input type="hidden" name="charset" value="utf-8" />
+                <input type="hidden" name="return" value="{{ route('portal.invoices.paypal-standard.return', $invoice->id) }}" />
+                <input type="hidden" name="notify_url" value="{{ route('portal.invoices.paypal-standard.complete', $invoice->id) }}" />
+                <input type="hidden" name="cancel_return" value="{{ $invoice_url }}" />
+                <input type="hidden" name="paymentaction" value="{{ $setting['transaction'] }}" />
+                <input type="hidden" name="custom" value="{{ $invoice->id }}" />
+                <input type="hidden" name="bn" value="Akaunting_2.0_WPS" />
+
+                <input type="submit" value="{{ trans('general.confirm') }}" class="btn btn-success" />
+            </form>
+        </div>
+    </div>
 </div>