diff --git a/app/Livewire/Notifications/DiscordSettings.php b/app/Livewire/Notifications/Discord.php
similarity index 91%
rename from app/Livewire/Notifications/DiscordSettings.php
rename to app/Livewire/Notifications/Discord.php
index f5f0d5591..8aad8ccf0 100644
--- a/app/Livewire/Notifications/DiscordSettings.php
+++ b/app/Livewire/Notifications/Discord.php
@@ -6,7 +6,7 @@
 use App\Notifications\Test;
 use Livewire\Component;
 
-class DiscordSettings extends Component
+class Discord extends Component
 {
     public Team $team;
     protected $rules = [
@@ -55,4 +55,8 @@ public function sendTestNotification()
         $this->team?->notify(new Test());
         $this->dispatch('success', 'Test notification sent.');
     }
+    public function render()
+    {
+        return view('livewire.notifications.discord');
+    }
 }
diff --git a/app/Livewire/Notifications/EmailSettings.php b/app/Livewire/Notifications/Email.php
similarity index 98%
rename from app/Livewire/Notifications/EmailSettings.php
rename to app/Livewire/Notifications/Email.php
index a45381b84..343cbda3e 100644
--- a/app/Livewire/Notifications/EmailSettings.php
+++ b/app/Livewire/Notifications/Email.php
@@ -2,13 +2,12 @@
 
 namespace App\Livewire\Notifications;
 
+use Livewire\Component;
 use App\Models\InstanceSettings;
 use App\Models\Team;
 use App\Notifications\Test;
-use Livewire\Component;
-use Log;
 
-class EmailSettings extends Component
+class Email extends Component
 {
     public Team $team;
     public string $emails;
@@ -191,4 +190,8 @@ public function copyFromInstanceSettings()
         }
         $this->dispatch('error', 'Instance SMTP/Resend settings are not enabled.');
     }
+    public function render()
+    {
+        return view('livewire.notifications.email');
+    }
 }
diff --git a/app/Livewire/Notifications/TelegramSettings.php b/app/Livewire/Notifications/Telegram.php
similarity index 93%
rename from app/Livewire/Notifications/TelegramSettings.php
rename to app/Livewire/Notifications/Telegram.php
index 0f581a515..35b868527 100644
--- a/app/Livewire/Notifications/TelegramSettings.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -6,8 +6,9 @@
 use App\Notifications\Test;
 use Livewire\Component;
 
-class TelegramSettings extends Component
+class Telegram extends Component
 {
+
     public Team $team;
     protected $rules = [
         'team.telegram_enabled' => 'nullable|boolean',
@@ -61,4 +62,8 @@ public function sendTestNotification()
         $this->team?->notify(new Test());
         $this->dispatch('success', 'Test notification sent.');
     }
+    public function render()
+    {
+        return view('livewire.notifications.telegram');
+    }
 }
diff --git a/app/Livewire/Team/Notification/Index.php b/app/Livewire/Team/Notification/Index.php
deleted file mode 100644
index 86754d619..000000000
--- a/app/Livewire/Team/Notification/Index.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Livewire\Team\Notification;
-
-use Livewire\Component;
-
-class Index extends Component
-{
-    public function render()
-    {
-        return view('livewire.team.notification.index');
-    }
-}
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 58def1b0e..2a447f95b 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -6,7 +6,7 @@
         </div>
         {{-- <button onclick="changeTheme()">Dark/light</button> --}}
     </div>
-    <div class="px-2 pb-4">
+    <div class="px-2 pt-2 pb-6">
         <livewire:switch-team />
     </div>
     <ul role="list" class="flex flex-col flex-1 gap-y-7">
@@ -96,7 +96,7 @@ class="{{ request()->is('destination*') ? 'menu-item-active menu-item' : 'menu-i
                     <li>
                         <a title="Notifications"
                             class="{{ request()->is('notifications*') ? 'menu-item-active menu-item' : 'menu-item' }}"
-                            href="{{ route('notification.index') }}">
+                            href="{{ route('notification.email') }}">
                             <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
                                 <path fill="none" stroke="currentColor" stroke-linecap="round"
                                     stroke-linejoin="round" stroke-width="2"
diff --git a/resources/views/components/notification/navbar.blade.php b/resources/views/components/notification/navbar.blade.php
new file mode 100644
index 000000000..e5f42fd12
--- /dev/null
+++ b/resources/views/components/notification/navbar.blade.php
@@ -0,0 +1,18 @@
+<div class="pb-6">
+    <h1>Notifications</h1>
+    <div class="subtitle">Get notified about your infrastructure.</div>
+    <nav class="navbar-main">
+        <a class="{{ request()->routeIs('notification.email') ? 'dark:text-white' : '' }}"
+            href="{{ route('notification.email') }}">
+            <button>Email</button>
+        </a>
+        <a class="{{ request()->routeIs('notification.telegram') ? 'dark:text-white' : '' }}"
+            href="{{ route('notification.telegram') }}">
+            <button>Telegram</button>
+        </a>
+        <a class="{{ request()->routeIs('notification.discord') ? 'dark:text-white' : '' }}"
+            href="{{ route('notification.discord') }}">
+            <button>Discord</button>
+        </a>
+    </nav>
+</div>
diff --git a/resources/views/components/notifications/navbar.blade.php b/resources/views/components/notifications/navbar.blade.php
deleted file mode 100644
index a5b3f3337..000000000
--- a/resources/views/components/notifications/navbar.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    <h1>Notifications</h1>
-    <div class="subtitle">Get notified about your infrastructure.</div>
-</div>
diff --git a/resources/views/components/security/navbar.blade.php b/resources/views/components/security/navbar.blade.php
index ab2af7cf0..26d8372da 100644
--- a/resources/views/components/security/navbar.blade.php
+++ b/resources/views/components/security/navbar.blade.php
@@ -2,7 +2,7 @@
     <h1>Security</h1>
     <div class="subtitle">Security related settings.</div>
 
-    <nav class="navbar-main">
+    <nav class="pt-2 navbar-main">
         <a  href="{{ route('security.private-key.index') }}">
             <button>Private Keys</button>
         </a>
diff --git a/resources/views/livewire/layout-popups.blade.php b/resources/views/livewire/layout-popups.blade.php
index 7b3112f84..69de58da2 100644
--- a/resources/views/livewire/layout-popups.blade.php
+++ b/resources/views/livewire/layout-popups.blade.php
@@ -57,7 +57,7 @@ class="text-white underline">/subscription</a> to update your subscription or re
                     highly recommended to enable at least
                     one
                     notification channel to receive important alerts.<br>Visit <a
-                        href="{{ route('notification.index') }}" class="text-white underline">/notification</a> to
+                        href="{{ route('notification.email') }}" class="text-white underline">/notification</a> to
                     enable notifications.</span>
         </x-slot:description>
         <x-slot:button-text @click="disableNotification()">
diff --git a/resources/views/livewire/notifications/discord-settings.blade.php b/resources/views/livewire/notifications/discord.blade.php
similarity index 93%
rename from resources/views/livewire/notifications/discord-settings.blade.php
rename to resources/views/livewire/notifications/discord.blade.php
index 4bb1d15b4..03cd0bb54 100644
--- a/resources/views/livewire/notifications/discord-settings.blade.php
+++ b/resources/views/livewire/notifications/discord.blade.php
@@ -1,5 +1,6 @@
 <div>
-    <form wire:submit='submit' class="flex flex-col">
+    <x-notification.navbar />
+    <form wire:submit='submit' class="flex flex-col gap-4">
         <div class="flex items-center gap-2">
             <h2>Discord</h2>
             <x-forms.button type="submit">
@@ -12,7 +13,7 @@
                 </x-forms.button>
             @endif
         </div>
-        <div class="w-48">
+        <div class="w-32">
             <x-forms.checkbox instantSave id="team.discord_enabled" label="Enabled" />
         </div>
         <x-forms.input type="password"
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email.blade.php
similarity index 97%
rename from resources/views/livewire/notifications/email-settings.blade.php
rename to resources/views/livewire/notifications/email.blade.php
index 811aa4232..9a89057a7 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email.blade.php
@@ -1,5 +1,6 @@
 <div>
-    <form wire:submit='submit' class="flex flex-col">
+    <x-notification.navbar />
+    <form wire:submit='submit' class="flex flex-col gap-4">
         <div class="flex items-center gap-2">
             <h2>Email</h2>
             <x-forms.button type="submit">
@@ -24,7 +25,7 @@
     </form>
     @if (isCloud())
         @if ($this->sharedEmailEnabled)
-            <div class="w-64 pb-4">
+            <div class="w-64 py-4">
                 <x-forms.checkbox instantSave="instantSaveInstance" id="team.use_instance_email_settings"
                     label="Use Hosted Email Service" />
             </div>
diff --git a/resources/views/livewire/notifications/telegram-settings.blade.php b/resources/views/livewire/notifications/telegram.blade.php
similarity index 96%
rename from resources/views/livewire/notifications/telegram-settings.blade.php
rename to resources/views/livewire/notifications/telegram.blade.php
index 2d6efc3c6..7c8f420fa 100644
--- a/resources/views/livewire/notifications/telegram-settings.blade.php
+++ b/resources/views/livewire/notifications/telegram.blade.php
@@ -1,5 +1,6 @@
 <div>
-    <form wire:submit='submit' class="flex flex-col">
+    <x-notification.navbar />
+    <form wire:submit='submit' class="flex flex-col gap-4">
         <div class="flex items-center gap-2">
             <h2>Telegram</h2>
             <x-forms.button type="submit">
@@ -12,7 +13,7 @@
                 </x-forms.button>
             @endif
         </div>
-        <div class="w-48">
+        <div class="w-32">
             <x-forms.checkbox instantSave id="team.telegram_enabled" label="Enabled" />
         </div>
         <div class="flex gap-2">
diff --git a/resources/views/livewire/team/notification/index.blade.php b/resources/views/livewire/team/notification/index.blade.php
deleted file mode 100644
index c3241788f..000000000
--- a/resources/views/livewire/team/notification/index.blade.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<div>
-    <x-notifications.navbar />
-    <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'"
-                @click.prevent="activeTab = 'email'; window.location.hash = 'email'" href="#">Email</a>
-            <a :class="activeTab === 'Telegram' && 'text-white'"
-                @click.prevent="activeTab = 'telegram'; window.location.hash = 'telegram'" href="#">Telegram</a>
-            <a :class="activeTab === 'discord' && 'text-white'"
-                @click.prevent="activeTab = 'discord'; window.location.hash = 'discord'" href="#">Discord</a>
-        </div>
-        <div class="w-full pl-8">
-            <div x-cloak x-show="activeTab === 'email'" class="h-full">
-                <livewire:notifications.email-settings />
-            </div>
-            <div x-cloak x-show="activeTab === 'telegram'" class="h-full">
-                <livewire:notifications.telegram-settings />
-            </div>
-            <div x-cloak x-show="activeTab === 'discord'">
-                <livewire:notifications.discord-settings />
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/routes/web.php b/routes/web.php
index c79777d44..735f6138d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,9 +21,12 @@
 use App\Livewire\Settings\License as SettingsLicense;
 use App\Livewire\Profile\Index as ProfileIndex;
 
+use App\Livewire\Notifications\Email as NotificationEmail;
+use App\Livewire\Notifications\Telegram as NotificationTelegram;
+use App\Livewire\Notifications\Discord as NotificationDiscord;
+
 use App\Livewire\Team\Index as TeamIndex;
 use App\Livewire\Team\Create as TeamCreate;
-use App\Livewire\Team\Notification\Index as TeamNotificationIndex;
 
 use App\Livewire\Team\Storage\Index as TeamStorageIndex;
 use App\Livewire\Team\Storage\Create as TeamStorageCreate;
@@ -125,7 +128,9 @@
         Route::get('/{tag_name}', TagsShow::class)->name('tags.show');
     });
     Route::prefix('notifications')->group(function () {
-        Route::get('/', TeamNotificationIndex::class)->name('notification.index');
+        Route::get('/email', NotificationEmail::class)->name('notification.email');
+        Route::get('/telegram', NotificationTelegram::class)->name('notification.telegram');
+        Route::get('/discord', NotificationDiscord::class)->name('notification.discord');
     });
     Route::prefix('team')->group(function () {
         Route::get('/', TeamIndex::class)->name('team.index');