diff --git a/resources/views/admin/settings/tabs/invoices.blade.php b/resources/views/admin/settings/tabs/invoices.blade.php
index ff097709..1c1b46e6 100644
--- a/resources/views/admin/settings/tabs/invoices.blade.php
+++ b/resources/views/admin/settings/tabs/invoices.blade.php
@@ -7,8 +7,8 @@
         <div class="row">
             <div class="col-md-3 p-3">
                 <!-- Name -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="company-name">{{ __('Company Name') }}:</label>
                         <input x-model="company-name" id="company-name" name="company-name" type="text" required
                             value="{{ config('SETTINGS::INVOICE:COMPANY_NAME') }}"
@@ -16,8 +16,8 @@
                     </div>
                 </div>
                 <!-- address -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control  p-0">
                         <label for="company-address">{{ __('Company Adress') }}:</label>
                         <input x-model="company-address" id="company-address" name="company-address" type="text"
                             value="{{ config('SETTINGS::INVOICE:COMPANY_ADDRESS') }}"
@@ -25,8 +25,8 @@
                     </div>
                 </div>
                 <!-- Phone -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="company-phone">{{ __('Company Phonenumber') }}:</label>
                         <input x-model="company-phone" id="company-phone" name="company-phone" type="text"
                             value="{{ config('SETTINGS::INVOICE:COMPANY_PHONE') }}"
@@ -35,8 +35,8 @@
                 </div>
 
                 <!-- VAT -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="company-vat">{{ __('VAT ID') }}:</label>
                         <input x-model="company-vat" id="company-vat" name="company-vat" type="text"
                             value="{{ config('SETTINGS::INVOICE:COMPANY_VAT') }}"
@@ -47,8 +47,8 @@
 
             <div class="col-md-3 p-3">
                 <!-- email -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="company-mail">{{ __('Company E-Mail Adress') }}:</label>
                         <input x-model="company-mail" id="company-mail" name="company-mail" type="text"
                             value="{{ config('SETTINGS::INVOICE:COMPANY_MAIL') }}"
@@ -56,8 +56,8 @@
                     </div>
                 </div>
                 <!-- website -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="company-web">{{ __('Company Website') }}:</label>
                         <input x-model="company-web" id="company-web" name="company-web" type="text"
                             value="{{ config('SETTINGS::INVOICE:COMPANY_WEBSITE') }}"
@@ -66,8 +66,8 @@
                 </div>
 
                 <!-- prefix -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="invoice-prefix">{{ __('Invoice Prefix') }}:</label>
                         <input x-model="invoice-prefix" id="invoice-prefix" name="invoice-prefix" type="text" required
                             value="{{ config('SETTINGS::INVOICE:PREFIX') }}"
@@ -77,8 +77,8 @@
             </div>
             <div class="col-md-3 p-3">
                 <!-- logo -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="logo">{{ __('Logo') }}:</label>
                         <div class="custom-file mb-3">
                             <input type="file" accept="image/png,image/jpeg,image/jpg" class="custom-file-input"
diff --git a/resources/views/admin/settings/tabs/language.blade.php b/resources/views/admin/settings/tabs/language.blade.php
index 1cd3bbf7..fc77a618 100644
--- a/resources/views/admin/settings/tabs/language.blade.php
+++ b/resources/views/admin/settings/tabs/language.blade.php
@@ -5,66 +5,80 @@
         @method('PATCH')
 
         <div class="row">
-            <div class="col-md-3">
+            <div class="col-md-3 p-3">
                 <div class="form-group">
                     <!-- AVAILABLE LANGUAGES -->
-                    <label for="languages">{{ __('Available languages') }}:</label>
-
-                    <select id="languages" style="width:100%" class="custom-select" name="languages[]" required
-                        multiple="multiple" autocomplete="off">
-                        @foreach (config('app.available_locales') as $lang)
-                            <option value="{{ $lang }}">{{ __($lang) }}</option>
-                        @endforeach
-                    </select>
-
+                    <div class="custom-control mb-3 p-0">
+                        <label for="languages">{{ __('Available languages') }}:</label>
+                        <select id="languages" style="width:100%" class="custom-select" name="languages[]" required
+                            multiple="multiple" autocomplete="off">
+                            @foreach (config('app.available_locales') as $lang)
+                                <option value="{{ $lang }}">{{ __($lang) }}</option>
+                            @endforeach
+                        </select>
+                    </div>
 
                     <!-- DEFAULT LANGUAGE -->
-                    <label for="defaultLanguage">{{ __('Default language') }}: <i data-toggle="popover"
+
+                    <div class="custom-control mb-3 p-0">
+                        <label for="defaultLanguage">{{ __('Default language') }}:
+                            <i data-toggle="popover" data-trigger="hover"
+                                data-content="{{ __('The fallback Language, if something goes wrong') }}"
+                                class="fas fa-info-circle"></i>
+                        </label>
+
+                        <select id="defaultLanguage" style="width:100%" class="custom-select" name="defaultLanguage"
+                            required autocomplete="off">
+                            <option value="{{ config('SETTINGS::LOCALE:DEFAULT') }}" selected>
+                                {{ __(config('SETTINGS::LOCALE:DEFAULT')) }}</option>
+                            @foreach (config('app.available_locales') as $lang)
+                                <option value="{{ $lang }}">{{ __($lang) }}</option>
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <div class="custom-control mb-3 p-0">
+                        <!--DATATABLE LANGUAGE -->
+                        <label for="datatable-language">{{ __('Datable language') }} <i data-toggle="popover"
+                                data-trigger="hover"
+                                data-content="{{ __('The Language of the Datatables. Grab the Language-Codes from here') }} https://datatables.net/plug-ins/i18n/"
+                                class="fas fa-info-circle"></i></label>
+                        <input x-model="datatable-language" id="datatable-language" name="datatable-language"
+                            type="text" required value="{{ config('SETTINGS::LOCALE:DATATABLES') }}"
+                            class="form-control @error('datatable-language') is-invalid @enderror">
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="col-md-3 p-3">
+
+                <!-- AUTO TRANSLATE -->
+                <div class="form-group">
+                    <input value="true" id="autotranslate" name="autotranslate"
+                        {{ config('SETTINGS::LOCALE:DYNAMIC') == 'true' ? 'checked' : '' }} type="checkbox">
+                    <label for="autotranslate">{{ __('Auto-translate') }} <i data-toggle="popover"
                             data-trigger="hover"
-                            data-content="{{ __('The fallback Language, if something goes wrong') }}"
+                            data-content="{{ __('If this is checked, the Dashboard will translate itself to the Clients language, if available') }}"
                             class="fas fa-info-circle"></i></label>
 
-                    <select id="defaultLanguage" style="width:100%" class="custom-select" name="defaultLanguage"
-                        required autocomplete="off">
-                        <option value="{{ config('SETTINGS::LOCALE:DEFAULT') }}" selected>
-                            {{ __(config('SETTINGS::LOCALE:DEFAULT')) }}</option>
-                        @foreach (config('app.available_locales') as $lang)
-                            <option value="{{ $lang }}">{{ __($lang) }}</option>
-                        @endforeach
-                    </select>
-                </div>
+                    <br />
 
-                <!--DATATABLE LANGUAGE -->
-                <label for="datatable-language">{{ __('Datable language') }} <i data-toggle="popover"
-                        data-trigger="hover"
-                        data-content="{{ __('The Language of the Datatables. Grab the Language-Codes from here') }} https://datatables.net/plug-ins/i18n/"
-                        class="fas fa-info-circle"></i></label>
-                <input x-model="datatable-language" id="datatable-language" name="datatable-language" type="text"
-                    required value="{{ config('SETTINGS::LOCALE:DATATABLES') }}"
-                    class="form-control @error('datatable-language') is-invalid @enderror">
+                    <!-- CLIENTS CAN CHANGE -->
+                    <input value="true" id="canClientChangeLanguage" name="canClientChangeLanguage"
+                        {{ config('SETTINGS::LOCALE:CLIENTS_CAN_CHANGE') == 'true' ? 'checked' : '' }}
+                        type="checkbox">
+                    <label for="canClientChangeLanguage">{{ __('Let the Client change the Language') }} <i
+                            data-toggle="popover" data-trigger="hover"
+                            data-content="{{ __('If this is checked, Clients will have the ability to manually change their Dashboard language') }}"
+                            class="fas fa-info-circle"></i></label>
+
+                </div>
             </div>
         </div>
-
-        <!-- AUTO TRANSLATE -->
-        <div class="form-group">
-            <input value="true" id="autotranslate" name="autotranslate"
-                {{ config('SETTINGS::LOCALE:DYNAMIC') == 'true' ? 'checked' : '' }} type="checkbox">
-            <label for="autotranslate">{{ __('Auto-translate') }} <i data-toggle="popover" data-trigger="hover"
-                    data-content="{{ __('If this is checked, the Dashboard will translate itself to the Clients language, if available') }}"
-                    class="fas fa-info-circle"></i></label>
-
-            <br />
-
-            <!-- CLIENTS CAN CHANGE -->
-            <input value="true" id="canClientChangeLanguage" name="canClientChangeLanguage"
-                {{ config('SETTINGS::LOCALE:CLIENTS_CAN_CHANGE') == 'true' ? 'checked' : '' }} type="checkbox">
-            <label for="canClientChangeLanguage">{{ __('Let the Client change the Language') }} <i
-                    data-toggle="popover" data-trigger="hover"
-                    data-content="{{ __('If this is checked, Clients will have the ability to manually change their Dashboard language') }}"
-                    class="fas fa-info-circle"></i></label>
-
+        <div class="row">
+            <button class="btn btn-primary mt-3 ml-3">{{ __('Submit') }}</button>
         </div>
-        <button class="btn btn-primary">{{ __('Save') }}</button>
     </form>
 </div>
 
diff --git a/resources/views/admin/settings/tabs/misc.blade.php b/resources/views/admin/settings/tabs/misc.blade.php
index 2d82d647..f0d65a6c 100644
--- a/resources/views/admin/settings/tabs/misc.blade.php
+++ b/resources/views/admin/settings/tabs/misc.blade.php
@@ -6,14 +6,15 @@
 
         <div class="row">
             <!-- DISCORD -->
-            <div class="col-md-3 p-3">
-                <div class="row mb-3">
+            <div class="col-md-3 px-3">
+                <div class="row mb-2">
                     <div class="col text-center">
                         <h1>Discord</h1>
                     </div>
                 </div>
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="discord-client-id">{{ __('Discord Client-ID') }}:</label>
                         <input x-model="discord-client-id" id="discord-client-id" name="discord-client-id" type="text"
                             value="{{ config('SETTINGS::DISCORD:CLIENT_ID') }}"
@@ -21,8 +22,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="discord-client-secret">{{ __('Discord Client-Secret') }}:</label>
                         <input x-model="discord-client-secret" id="discord-client-secret" name="discord-client-secret"
                             type="text" value="{{ config('SETTINGS::DISCORD:CLIENT_SECRET') }}"
@@ -30,8 +31,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="discord-client-secret">{{ __('Discord Bot-Token') }}:</label>
                         <input x-model="discord-bot-token" id="discord-bot-token" name="discord-bot-token" type="text"
                             value="{{ config('SETTINGS::DISCORD:BOT_TOKEN') }}"
@@ -39,8 +40,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="discord-client-secret">{{ __('Discord Guild-ID') }}:</label>
                         <input x-model="discord-guild-id" id="discord-guild-id" name="discord-guild-id" type="number"
                             value="{{ config('SETTINGS::DISCORD:GUILD_ID') }}"
@@ -48,8 +49,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="discord-invite-url">{{ __('Discord Invite-URL') }}:</label>
                         <input x-model="discord-invite-url" id="discord-invite-url" name="discord-invite-url"
                             type="text" value="{{ config('SETTINGS::DISCORD:INVITE_URL') }}"
@@ -57,8 +58,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="discord-role-id">{{ __('Discord Role-ID') }}:</label>
                         <input x-model="discord-role-id" id="discord-role-id" name="discord-role-id" type="number"
                             value="{{ config('SETTINGS::DISCORD:ROLE_ID') }}"
@@ -68,11 +69,8 @@
 
             </div>
         </div>
-
-
         <div class="row">
             <button class="btn btn-primary mt-3 ml-3">{{ __('Submit') }}</button>
-
         </div>
     </form>
 </div>
diff --git a/resources/views/admin/settings/tabs/payment.blade.php b/resources/views/admin/settings/tabs/payment.blade.php
index cb2f1685..063c9e47 100644
--- a/resources/views/admin/settings/tabs/payment.blade.php
+++ b/resources/views/admin/settings/tabs/payment.blade.php
@@ -7,14 +7,14 @@
         <div class="row">
             {{-- PayPal --}}
             <div class="col-md-3 px-3">
-                <div class="row mb-3">
+                <div class="row mb-2">
                     <div class="col text-center">
                         <h1>PayPal</h1>
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="paypal-client-id">{{ __('PayPal Client-ID') }}:</label>
                         <input x-model="paypal-client-id" id="paypal-client-id" name="paypal-client-id" type="text"
                             value="{{ config('SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID') }}"
@@ -22,8 +22,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="paypal-client-secret">{{ __('PayPal Secret-Key') }}:</label>
                         <input x-model="paypal-client-secret" id="paypal-client-secret" name="paypal-client-secret"
                             type="text" value="{{ config('SETTINGS::PAYMENTS:PAYPAL:SECRET') }}"
@@ -32,8 +32,8 @@
                 </div>
 
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="paypal-sandbox-id">{{ __('PayPal Sandbox Client-ID') }}:</label>
                         <small class="text-muted">({{ __('optional') }})</small>
                         <input x-model="paypal-sandbox-id" id="paypal-sandbox-id" name="paypal-sandbox-id" type="text"
@@ -42,8 +42,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="paypal-sandbox-secret">{{ __('PayPal Sandbox Secret-Key') }}:</label>
                         <small class="text-muted">({{ __('optional') }})</small>
                         <input x-model="paypal-sandbox-secret" id="paypal-sandbox-secret" name="paypal-sandbox-secret"
@@ -56,21 +56,21 @@
             {{-- Stripe --}}
             <div class="col-md-3 px-3">
 
-                <div class="row mb-3">
+                <div class="row mb-2">
                     <div class="col text-center">
                         <h1>Stripe</h1>
                     </div>
                 </div>
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="stripe-secret">{{ __('Stripe Secret-Key') }}:</label>
                         <input x-model="stripe-secret" id="stripe-secret" name="stripe-secret" type="text"
                             value="{{ config('SETTINGS::PAYMENTS:STRIPE:SECRET') }}"
                             class="form-control @error('stripe-secret') is-invalid @enderror">
                     </div>
                 </div>
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="stripe-endpoint-secret">{{ __('Stripe Endpoint-Secret-Key') }}:</label>
                         <input x-model="stripe-endpoint-secret" id="stripe-endpoint-secret"
                             name="stripe-endpoint-secret" type="text"
@@ -79,8 +79,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="stripe-test-secret">{{ __('Stripe Test Secret-Key') }}:</label>
                         <small class="text-muted">({{ __('optional') }})</small>
                         <input x-model="stripe-test-secret" id="stripe-test-secret" name="stripe-test-secret"
@@ -89,8 +89,8 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <label for="stripe-endpoint-test-secret">{{ __('Stripe Test Endpoint-Secret-Key') }}:</label>
                         <small class="text-muted">({{ __('optional') }})</small>
                         <input x-model="stripe-endpoint-test-secret" id="stripe-endpoint-test-secret"
@@ -99,8 +99,8 @@
                             class="form-control @error('stripe-endpoint-test-secret') is-invalid @enderror">
                     </div>
                 </div>
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <div class="col m-0 p-0 d-flex justify-content-between align-items-center">
                             <label for="stripe-methods">{{ __('Payment Methods') }}:</label>
                             <i data-toggle="popover" data-trigger="hover" data-html="true"
@@ -116,14 +116,14 @@
 
             {{-- Other --}}
             <div class="col-md-3 px-3">
-                <div class="row mb-3">
+                <div class="row mb-2">
                     <div class="col text-center">
                         <h1>Other</h1>
                     </div>
                 </div>
                 <!-- Tax -->
-                <div class="form-group">
-                    <div class="custom-control mb-3 p-0">
+                <div class="form-group mb-3">
+                    <div class="custom-control p-0">
                         <div class="col m-0 p-0 d-flex justify-content-between align-items-center">
                             <label for="sales_tax">{{ __('Tax Value in %') }}:</label>
                             <i data-toggle="popover" data-trigger="hover" data-html="true"