diff --git a/app/Http/Livewire/Settings/Email.php b/app/Http/Livewire/Settings/Email.php
index 5d418d73a..5fb7d85ac 100644
--- a/app/Http/Livewire/Settings/Email.php
+++ b/app/Http/Livewire/Settings/Email.php
@@ -19,7 +19,6 @@ class Email extends Component
         'settings.smtp_username' => 'nullable',
         'settings.smtp_password' => 'nullable',
         'settings.smtp_timeout' => 'nullable',
-        'settings.smtp_test_recipients' => 'nullable',
         'settings.smtp_from_address' => 'required|email',
         'settings.smtp_from_name' => 'required',
     ];
@@ -32,7 +31,6 @@ class Email extends Component
         'settings.smtp_encryption' => 'Encryption',
         'settings.smtp_username' => 'Username',
         'settings.smtp_password' => 'Password',
-        'settings.smtp_test_recipients' => 'Test Recipients',
     ];
     public function mount()
     {
diff --git a/resources/views/components/forms/checkbox.blade.php b/resources/views/components/forms/checkbox.blade.php
index 743acfd81..15a486391 100644
--- a/resources/views/components/forms/checkbox.blade.php
+++ b/resources/views/components/forms/checkbox.blade.php
@@ -1,5 +1,5 @@
 <div class="form-control min-w-fit">
-    <label class="flex gap-4 cursor-pointer label">
+    <label class="flex gap-4 px-0 cursor-pointer label">
         <span class="flex gap-2 label-text min-w-fit">
             @if ($label)
                 {{ $label }}
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index 3dc520ebd..0b79f4d17 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -1,7 +1,6 @@
 <div class="w-full">
     @if ($label)
-        <label for="small-input"
-            class="flex items-center gap-1 mb-2 text-sm font-medium text-neutral-400">{{ $label }}
+        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <span class="text-warning">*</span>
             @endif
diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index 708a8d52f..046b48453 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -1,7 +1,6 @@
 <div class="w-full">
     @if ($label)
-        <label for="small-input"
-            class="flex items-center gap-1 mb-2 text-sm font-medium text-neutral-400">{{ $label }}
+        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <span class="text-warning">*</span>
             @endif
diff --git a/resources/views/components/layout-subscription.blade.php b/resources/views/components/layout-subscription.blade.php
index 3feb21628..38647ca6f 100644
--- a/resources/views/components/layout-subscription.blade.php
+++ b/resources/views/components/layout-subscription.blade.php
@@ -34,7 +34,7 @@
         <x-navbar-subscription />
     @endif
 
-    <main class="main">
+    <main class="main max-w-screen-2xl">
         {{ $slot }}
     </main>
     <x-version class="fixed left-2 bottom-1" />
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index 3e3df1a01..d4c045f84 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -6,8 +6,8 @@
                 Save
             </x-forms.button>
         </div>
-        <div class="flex flex-col gap-2">
-            <div class="flex gap-2">
+        <div class="flex flex-col gap-2 pt-4">
+            <div class="flex gap-2 w-96">
                 <x-forms.input id="settings.fqdn" label="Coolify's Domain" />
             </div>
 
diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php
index 4ebb7f94e..06eefe13f 100644
--- a/resources/views/livewire/settings/email.blade.php
+++ b/resources/views/livewire/settings/email.blade.php
@@ -12,30 +12,28 @@
             @endif
         </div>
         <div class="pt-2 pb-4 ">SMTP settings for password resets, invitations, etc.</div>
-        <div class="w-32">
+        <div class="w-32 pb-4">
             <x-forms.checkbox instantSave id="settings.smtp_enabled" label="Enabled" />
         </div>
-        <div class="flex items-end gap-2">
-            <x-forms.input id="settings.smtp_test_recipients" label="Test Recipients"
-                helper="Email list to send a test email to, separated by comma." />
-
-        </div>
-        <div class="flex flex-col w-full gap-2 xl:flex-row">
-            <x-forms.input required id="settings.smtp_host" helper="SMTP Hostname" placeholder="smtp.mailgun.org"
-                label="Host" />
-            <x-forms.input required id="settings.smtp_port" helper="SMTP Port" placeholder="587" label="Port" />
-            <x-forms.input id="settings.smtp_encryption" helper="If SMTP through SSL, set it to 'tls'."
-                placeholder="tls" label="Encryption" />
-        </div>
-        <div class="flex flex-col w-full gap-2 xl:flex-row">
-            <x-forms.input id="settings.smtp_username" helper="SMTP Username" label="SMTP Username" />
-            <x-forms.input id="settings.smtp_password" type="password" helper="SMTP Password" label="SMTP Password" />
-            <x-forms.input id="settings.smtp_timeout" helper="Timeout value for sending emails." label="Timeout" />
-        </div>
-        <div class="flex flex-col w-full gap-2 xl:flex-row">
-            <x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" />
-            <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails."
-                label="From Address" />
+        <div class="flex flex-col gap-4">
+            <div class="flex flex-col w-full gap-2 xl:flex-row">
+                <x-forms.input required id="settings.smtp_host" helper="SMTP Hostname" placeholder="smtp.mailgun.org"
+                    label="Host" />
+                <x-forms.input required id="settings.smtp_port" helper="SMTP Port" placeholder="587" label="Port" />
+                <x-forms.input id="settings.smtp_encryption" helper="If SMTP through SSL, set it to 'tls'."
+                    placeholder="tls" label="Encryption" />
+            </div>
+            <div class="flex flex-col w-full gap-2 xl:flex-row">
+                <x-forms.input id="settings.smtp_username" helper="SMTP Username" label="SMTP Username" />
+                <x-forms.input id="settings.smtp_password" type="password" helper="SMTP Password"
+                    label="SMTP Password" />
+                <x-forms.input id="settings.smtp_timeout" helper="Timeout value for sending emails." label="Timeout" />
+            </div>
+            <div class="flex flex-col w-full gap-2 xl:flex-row">
+                <x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" />
+                <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails."
+                    label="From Address" />
+            </div>
         </div>
     </form>
 </div>