diff --git a/app/Http/Livewire/Notifications/DiscordSettings.php b/app/Http/Livewire/Notifications/DiscordSettings.php
index 4e68cff66..504b60ac5 100644
--- a/app/Http/Livewire/Notifications/DiscordSettings.php
+++ b/app/Http/Livewire/Notifications/DiscordSettings.php
@@ -17,7 +17,7 @@ class DiscordSettings extends Component
         'model.extra_attributes.discord_webhook' => 'required|url',
     ];
     protected $validationAttributes = [
-        'model.extra_attributes.discord_webhook' => '',
+        'model.extra_attributes.discord_webhook' => 'Discord Webhook',
     ];
 
     public function instantSave()
diff --git a/app/Http/Livewire/Notifications/EmailSettings.php b/app/Http/Livewire/Notifications/EmailSettings.php
index a8240ac70..ae2b9a815 100644
--- a/app/Http/Livewire/Notifications/EmailSettings.php
+++ b/app/Http/Livewire/Notifications/EmailSettings.php
@@ -2,7 +2,10 @@
 
 namespace App\Http\Livewire\Notifications;
 
+use App\Models\InstanceSettings;
 use App\Models\Team;
+use App\Notifications\TestNotification;
+use Illuminate\Support\Facades\Notification;
 use Livewire\Component;
 
 class EmailSettings extends Component
@@ -33,6 +36,22 @@ class EmailSettings extends Component
         'model.extra_attributes.smtp_password' => '',
         'model.extra_attributes.smtp_test_recipients' => '',
     ];
+    public function copySMTP()
+    {
+        $settings = InstanceSettings::get();
+        $this->model->extra_attributes->smtp_active = true;
+        $this->model->extra_attributes->smtp_from_address = $settings->extra_attributes->smtp_from_address;
+        $this->model->extra_attributes->smtp_from_name = $settings->extra_attributes->smtp_from_name;
+        $this->model->extra_attributes->smtp_recipients = $settings->extra_attributes->smtp_recipients;
+        $this->model->extra_attributes->smtp_host = $settings->extra_attributes->smtp_host;
+        $this->model->extra_attributes->smtp_port = $settings->extra_attributes->smtp_port;
+        $this->model->extra_attributes->smtp_encryption = $settings->extra_attributes->smtp_encryption;
+        $this->model->extra_attributes->smtp_username = $settings->extra_attributes->smtp_username;
+        $this->model->extra_attributes->smtp_password = $settings->extra_attributes->smtp_password;
+        $this->model->extra_attributes->smtp_timeout = $settings->extra_attributes->smtp_timeout;
+        $this->model->extra_attributes->smtp_test_recipients = $settings->extra_attributes->smtp_test_recipients;
+        $this->saveModel();
+    }
     public function submit()
     {
         $this->resetErrorBag();
@@ -48,6 +67,10 @@ class EmailSettings extends Component
             session(['currentTeam' => $this->model]);
         }
     }
+    public function sendTestNotification()
+    {
+        Notification::send($this->model, new TestNotification);
+    }
     public function instantSave()
     {
         try {
diff --git a/app/Http/Livewire/Notifications/Test.php b/app/Http/Livewire/Notifications/Test.php
deleted file mode 100644
index dadb165f0..000000000
--- a/app/Http/Livewire/Notifications/Test.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Notifications;
-
-use App\Models\Server;
-use App\Models\Team;
-use App\Notifications\TestNotification;
-use Livewire\Component;
-use Notification;
-
-class Test extends Component
-{
-    public Team $model;
-    public function sendTestNotification()
-    {
-        Notification::send($this->model, new TestNotification);
-        $this->emit('saved', 'Test notification sent.');
-    }
-}
diff --git a/resources/views/components/team/navbar.blade.php b/resources/views/components/team/navbar.blade.php
index 9d84d60f3..7bb1bf35d 100644
--- a/resources/views/components/team/navbar.blade.php
+++ b/resources/views/components/team/navbar.blade.php
@@ -2,7 +2,8 @@
     <h1>Team</h1>
     <div class="text-sm breadcrumbs pb-11">
         <ul>
-            <li>{{ session('currentTeam.name') }}</li>
+            <li>Currently Active Team</li>
+            <li class="font-bold">{{ session('currentTeam.name') }}</li>
         </ul>
     </div>
     <nav class="flex items-center gap-4 py-2 border-b-2 border-solid border-coolgray-200">
diff --git a/resources/views/components/use-magic-bar.blade.php b/resources/views/components/use-magic-bar.blade.php
index 042acb14c..970cb96f7 100644
--- a/resources/views/components/use-magic-bar.blade.php
+++ b/resources/views/components/use-magic-bar.blade.php
@@ -1,2 +1,2 @@
-Use the magic
+<br><br>Use the magic
 bar (press <span class="kbd-custom">/</span>) to create a new one.
diff --git a/resources/views/livewire/notifications/discord-settings.blade.php b/resources/views/livewire/notifications/discord-settings.blade.php
index 4e053b965..548a26279 100644
--- a/resources/views/livewire/notifications/discord-settings.blade.php
+++ b/resources/views/livewire/notifications/discord-settings.blade.php
@@ -5,6 +5,10 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
+            <x-forms.button class="text-white normal-case btn btn-xs no-animation btn-primary"
+                wire:click="sendTestNotification">
+                Send Test Notifications
+            </x-forms.button>
         </div>
         <div class="flex flex-col gap-2 xl:flex-row w-96">
             <x-forms.checkbox instantSave id="model.extra_attributes.discord_active" label="Notification Enabled" />
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index 366f51040..a0e1612b8 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -5,6 +5,15 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
+            @if (auth()->user()->isAdmin())
+                <x-forms.button wire:click='copySMTP'>
+                    Copy from Instance Settings
+                </x-forms.button>
+            @endif
+            <x-forms.button class="text-white normal-case btn btn-xs no-animation btn-primary"
+                wire:click="sendTestNotification">
+                Send Test Notifications
+            </x-forms.button>
         </div>
         <div class="flex flex-col w-96">
             <x-forms.checkbox instantSave id="model.extra_attributes.smtp_active" label="Notification Enabled" />
diff --git a/resources/views/livewire/notifications/test.blade.php b/resources/views/livewire/notifications/test.blade.php
deleted file mode 100644
index 1a9175740..000000000
--- a/resources/views/livewire/notifications/test.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="flex items-center gap-2">
-    <h2>Notifications</h2>
-    <x-forms.button class="text-white normal-case  btn btn-xs no-animation btn-primary" wire:click="sendTestNotification">
-        Send Test Notifications
-    </x-forms.button>
-</div>
diff --git a/resources/views/projects.blade.php b/resources/views/projects.blade.php
index 9b0c18b9d..1fc8796d7 100644
--- a/resources/views/projects.blade.php
+++ b/resources/views/projects.blade.php
@@ -16,10 +16,6 @@
                 No project found.
                 <x-use-magic-bar />
             </div>
-            <div>
-                If you do not have a project yet, just create a resource (application, database, etc.) first, it will
-                create a new project for you automatically.
-            </div>
         @endforelse
     </div>
 </x-layout>
diff --git a/resources/views/server/all.blade.php b/resources/views/server/all.blade.php
index 73c86e96f..8249bff58 100644
--- a/resources/views/server/all.blade.php
+++ b/resources/views/server/all.blade.php
@@ -19,10 +19,9 @@
                 </div>
             </a>
         @empty
-            <div class="flex flex-col">
-                <div>Without a server, you won't be able to do much.</div>
-                <div>Let's <a class="text-lg underline text-warning" href="{{ route('server.create') }}">create</a> your
-                    first one.</div>
+            <div>
+                <div>No servers found. Without a server, you won't be able to do much.</div>
+                <x-use-magic-bar />
             </div>
         @endforelse
     </div>
diff --git a/resources/views/team/notifications.blade.php b/resources/views/team/notifications.blade.php
index 43c8a8990..d7dad0f02 100644
--- a/resources/views/team/notifications.blade.php
+++ b/resources/views/team/notifications.blade.php
@@ -1,6 +1,5 @@
 <x-layout>
     <x-team.navbar :team="session('currentTeam')" />
-    {{-- <livewire:notifications.test :model="session('currentTeam')" /> --}}
     <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'email' }" class="flex h-full">
         <div class="flex flex-col gap-4 min-w-fit">
             <a :class="activeTab === 'email' && 'text-white'"