diff --git a/app/Livewire/NotificationStreams/Forms/CreateNotificationStream.php b/app/Livewire/NotificationStreams/Forms/CreateNotificationStream.php
index 8d67b8ac..3eee9b5a 100644
--- a/app/Livewire/NotificationStreams/Forms/CreateNotificationStream.php
+++ b/app/Livewire/NotificationStreams/Forms/CreateNotificationStream.php
@@ -45,13 +45,14 @@ public function submit(): RedirectResponse|Redirector
             'user_id' => $user->getAttribute('id'),
         ]);
 
-        Toaster::success(__('Notification stream has been added.'));
+        Toaster::success('Notification stream has been added.');
 
         return Redirect::route('notification-streams.index');
     }
 
     public function render(): View
     {
-        return view('livewire.notification-streams.forms.create-notification-stream');
+        return view('livewire.notification-streams.forms.create-notification-stream')
+            ->layout('components.layouts.account-app');
     }
 }
diff --git a/app/Livewire/NotificationStreams/Forms/UpdateNotificationStream.php b/app/Livewire/NotificationStreams/Forms/UpdateNotificationStream.php
index 3f7b489b..eedb2069 100644
--- a/app/Livewire/NotificationStreams/Forms/UpdateNotificationStream.php
+++ b/app/Livewire/NotificationStreams/Forms/UpdateNotificationStream.php
@@ -49,7 +49,7 @@ public function submit(): RedirectResponse|Redirector
             'receive_failed_backup_notifications' => $this->form->failed_notification ? now() : null,
         ]);
 
-        Toaster::success(__('Notification stream has been updated.'));
+        Toaster::success('Notification stream has been updated.');
 
         return Redirect::route('notification-streams.index');
     }
@@ -58,6 +58,6 @@ public function render(): View
     {
         return view('livewire.notification-streams.forms.update-notification-stream', [
             'notificationStream' => $this->notificationStream,
-        ]);
+        ])->layout('components.layouts.account-app');
     }
 }
diff --git a/app/Livewire/NotificationStreams/Index.php b/app/Livewire/NotificationStreams/Index.php
index 01f5a3d6..8a6f36e0 100644
--- a/app/Livewire/NotificationStreams/Index.php
+++ b/app/Livewire/NotificationStreams/Index.php
@@ -11,6 +11,7 @@ class Index extends Component
 {
     public function render(): View
     {
-        return view('livewire.notification-streams.index');
+        return view('livewire.notification-streams.index')
+            ->layout('components.layouts.account-app');
     }
 }
diff --git a/resources/views/account/partials/sidebar.blade.php b/resources/views/account/partials/sidebar.blade.php
index 65793c3b..4f617666 100644
--- a/resources/views/account/partials/sidebar.blade.php
+++ b/resources/views/account/partials/sidebar.blade.php
@@ -17,7 +17,7 @@
             </x-sidebar-nav-link>
         </li>
         <li class="flex-1 lg:flex-initial">
-            <x-sidebar-nav-link :href="route('notification-streams.index')" :active="request()->routeIs('notification-streams.index')" wire:navigate>
+            <x-sidebar-nav-link :href="route('notification-streams.index')" :active="request()->routeIs('notification-streams.*')" wire:navigate>
                 <span class="flex flex-col lg:flex-row items-center justify-center lg:justify-start py-2 lg:py-1.5">
                     @svg('heroicon-o-bell', 'h-6 w-6 lg:h-5 lg:w-5 lg:mr-2')
                     <span class="text-xs mt-1 lg:mt-0 lg:text-sm">{{ __('Notifications') }}</span>
diff --git a/resources/views/components/layouts/account-app.blade.php b/resources/views/components/layouts/account-app.blade.php
new file mode 100644
index 00000000..843701f2
--- /dev/null
+++ b/resources/views/components/layouts/account-app.blade.php
@@ -0,0 +1,6 @@
+@section('title', $header )
+<x-account-wrapper pageTitle=" {{ $header }}">
+    <div class="py-4 sm:py-6">
+        {{ $slot }}
+    </div>
+</x-account-wrapper>