diff --git a/resources/views/filament/components/brand.blade.php b/resources/views/filament/components/brand.blade.php
new file mode 100644
index 0000000..513bed6
--- /dev/null
+++ b/resources/views/filament/components/brand.blade.php
@@ -0,0 +1,15 @@
+@php
+    use Eclipse\Core\Services\Registry;
+    use Filament\Facades\Filament;
+
+    $appName = Registry::getSite()->name ?? config('app.name');
+    $hasSpaMode = Filament::getCurrentPanel()->hasSpaMode();
+    
+    $dashboardUrl = '/' . trim(Filament::getCurrentPanel()->getPath(), '/');
+@endphp
+
+<a @if ($hasSpaMode) wire:navigate @endif href="{{ $dashboardUrl }}">
+    <div class="fi-logo flex text-xl font-bold leading-5 tracking-tight text-gray-950 dark:text-white">
+        {{ $appName }}
+    </div>
+</a>
\ No newline at end of file
diff --git a/resources/views/filament/components/my-settings.blade.php b/resources/views/filament/components/my-settings.blade.php
new file mode 100644
index 0000000..7805951
--- /dev/null
+++ b/resources/views/filament/components/my-settings.blade.php
@@ -0,0 +1,17 @@
+@php
+    use Eclipse\Core\Filament\Pages\ManageUserSettings;
+    use Filament\Facades\Filament;
+
+    $navigationIcon = ManageUserSettings::getNavigationIcon();
+    $navigationLabel = ManageUserSettings::getNavigationLabel();
+
+    $hasSpaMode = Filament::getCurrentPanel()->hasSpaMode();
+@endphp
+
+<div class="fi-dropdown-list p-1">
+    <a @if ($hasSpaMode) wire:navigate @endif href="{{ ManageUserSettings::getUrl() }}"
+        class="fi-dropdown-list-item flex w-full items-center gap-2 whitespace-nowrap rounded-md p-2 text-sm transition-colors duration-75 outline-none disabled:pointer-events-none disabled:opacity-70 hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 fi-dropdown-list-item-color-gray fi-color-gray">
+        <x-filament::icon class="fi-dropdown-list-item-icon h-5 w-5 text-gray-400 dark:text-gray-500" icon="{{ $navigationIcon }}" />
+        {{ __($navigationLabel) }}
+    </a>
+</div>
diff --git a/resources/views/filament/components/tenant-menu.blade.php b/resources/views/filament/components/tenant-menu.blade.php
new file mode 100644
index 0000000..2df3b0f
--- /dev/null
+++ b/resources/views/filament/components/tenant-menu.blade.php
@@ -0,0 +1,33 @@
+@php
+    $currentTenant = filament()->getTenant();
+    $currentTenantName = filament()->getTenantName($currentTenant);
+
+    $canSwitchTenants = count(
+        $tenants = array_filter(
+            filament()->getUserTenants(filament()->auth()->user()),
+            fn(\Illuminate\Database\Eloquent\Model $tenant): bool => !$tenant->is($currentTenant),
+        ),
+    );
+@endphp
+<x-filament::dropdown placement="bottom-start" size teleport>
+    <x-slot name="trigger">
+        <button type="button"
+            class="fi-tenant-menu-trigger group flex w-full items-center justify-center gap-x-3 rounded-lg p-2 text-sm font-medium outline-none transition duration-75 hover:bg-gray-100 focus-visible:bg-gray-100 dark:hover:bg-white/5 dark:focus-visible:bg-white/5">
+            <x-filament-panels::avatar.tenant :tenant="$currentTenant" class="shrink-0" />
+
+            <x-filament::icon icon="heroicon-m-chevron-down" alias="panels::tenant-menu.toggle-button"
+                class="ms-auto h-5 w-5 shrink-0 text-gray-400 transition duration-75 group-hover:text-gray-500 group-focus-visible:text-gray-500 dark:text-gray-500 dark:group-hover:text-gray-400 dark:group-focus-visible:text-gray-400" />
+        </button>
+    </x-slot>
+
+    @if ($canSwitchTenants)
+        <x-filament::dropdown.list>
+            @foreach ($tenants as $tenant)
+                <x-filament::dropdown.list.item :href="route('filament.admin.pages.dashboard', ['tenant' => $tenant])" :image="filament()->getTenantAvatarUrl($tenant)" tag="a">
+                    {{ filament()->getTenantName($tenant) }}
+                </x-filament::dropdown.list.item>
+            @endforeach
+        </x-filament::dropdown.list>
+    @endif
+
+</x-filament::dropdown>
diff --git a/src/EclipseServiceProvider.php b/src/EclipseServiceProvider.php
index 1570b56..ffeb8a8 100644
--- a/src/EclipseServiceProvider.php
+++ b/src/EclipseServiceProvider.php
@@ -59,6 +59,7 @@ public function configurePackage(SpatiePackage|Package $package): void
                 'telescope',
                 'themes',
             ])
+            ->hasViews()
             ->hasSettings()
             ->discoversMigrations()
             ->runsMigrations()
diff --git a/src/Filament/Pages/Dashboard.php b/src/Filament/Pages/Dashboard.php
new file mode 100644
index 0000000..370ec88
--- /dev/null
+++ b/src/Filament/Pages/Dashboard.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Eclipse\Core\Filament\Pages;
+
+use Filament\Pages\Dashboard as BasePage;
+
+class Dashboard extends BasePage
+{
+    protected static bool $shouldRegisterNavigation = false;
+}
diff --git a/src/Filament/Pages/ManageUserSettings.php b/src/Filament/Pages/ManageUserSettings.php
index 055d6df..7bd059d 100644
--- a/src/Filament/Pages/ManageUserSettings.php
+++ b/src/Filament/Pages/ManageUserSettings.php
@@ -13,6 +13,8 @@ class ManageUserSettings extends SettingsPage
 
     protected static string $settings = UserSettings::class;
 
+    protected static bool $shouldRegisterNavigation = false;
+
     public function form(Form $form): Form
     {
         return $form
diff --git a/src/Providers/AdminPanelProvider.php b/src/Providers/AdminPanelProvider.php
index a1efd52..00071a8 100644
--- a/src/Providers/AdminPanelProvider.php
+++ b/src/Providers/AdminPanelProvider.php
@@ -7,6 +7,7 @@
 use BezhanSalleh\FilamentShield\Middleware\SyncShieldTenant;
 use DutchCodingCompany\FilamentDeveloperLogins\FilamentDeveloperLoginsPlugin;
 use Eclipse\Common\Providers\GlobalSearchProvider;
+use Eclipse\Core\Filament\Pages\Dashboard;
 use Eclipse\Core\Filament\Pages\EditProfile;
 use Eclipse\Core\Filament\Pages\Tools\HealthCheckResults;
 use Eclipse\Core\Models\Locale;
@@ -20,7 +21,6 @@
 use Filament\Navigation\NavigationGroup;
 use Filament\Navigation\NavigationItem;
 use Filament\Notifications\Livewire\Notifications;
-use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\SpatieLaravelTranslatablePlugin;
@@ -29,6 +29,7 @@
 use Filament\Support\Enums\Platform;
 use Filament\Support\Enums\VerticalAlignment;
 use Filament\Support\Facades\FilamentView;
+use Filament\View\PanelsRenderHook;
 use Filament\Widgets;
 use Hasnayeen\Themes\Http\Middleware\SetTheme;
 use Hasnayeen\Themes\ThemesPlugin;
@@ -41,6 +42,7 @@
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Illuminate\View\View;
 use pxlrbt\FilamentEnvironmentIndicator\EnvironmentIndicatorPlugin;
 use pxlrbt\FilamentSpotlight\SpotlightPlugin;
 use ShuvroRoy\FilamentSpatieLaravelHealth\FilamentSpatieLaravelHealthPlugin;
@@ -58,6 +60,8 @@ public function panel(Panel $panel): Panel
             $localeIds = [config('app.locale', 'en')];
         }
 
+        $hasTenantMenu = config('eclipse.multi_site', false);
+
         $panel
             ->default()
             ->id('admin')
@@ -71,7 +75,9 @@ public function panel(Panel $panel): Panel
                 'gray' => Color::Slate,
             ])
             ->topNavigation()
-            ->brandName(fn () => Registry::getSite()->name)
+            ->brandLogo(
+                fn (): View => view('eclipse::filament.components.brand')
+            )
             ->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
             ->discoverResources(in: $package_src.'Filament/Resources', for: 'Eclipse\\Core\\Filament\\Resources')
             ->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
@@ -79,7 +85,7 @@ public function panel(Panel $panel): Panel
             ->discoverClusters(in: app_path('Filament/Clusters'), for: 'App\\Filament\\Clusters')
             ->discoverClusters(in: $package_src.'Filament/Clusters', for: 'Eclipse\\Core\\Filament\\Clusters')
             ->pages([
-                Pages\Dashboard::class,
+                Dashboard::class,
             ])
             ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
             ->globalSearch(GlobalSearchProvider::class)
@@ -95,7 +101,8 @@ public function panel(Panel $panel): Panel
                 SyncShieldTenant::class,
                 SetTheme::class,
             ], isPersistent: true)
-            ->tenantMenu(config('eclipse.multi_site', false))
+            // ->tenantMenu(config('eclipse.multi_site', false))
+            ->tenantMenu(false)
             ->widgets([
                 Widgets\AccountWidget::class,
                 Widgets\FilamentInfoWidget::class,
@@ -156,16 +163,28 @@ public function panel(Panel $panel): Panel
                     ->hidden(fn (): bool => ! config('log-viewer.enabled', false) || ! auth()->user()->hasRole('super_admin')),
             ])
             ->databaseNotifications()
-            ->unsavedChangesAlerts();
+            ->unsavedChangesAlerts()
+            ->renderHook(
+                PanelsRenderHook::USER_MENU_PROFILE_AFTER,
+                fn () => view('eclipse::filament.components.my-settings')
+            );
+
+        if ($hasTenantMenu) {
+            $panel->renderHook(
+                PanelsRenderHook::GLOBAL_SEARCH_END,
+                fn () => view('eclipse::filament.components.tenant-menu')
+            );
+        }
 
         // If the Pro version of the Spotlight plugin is installed, use that, otherwise use the free version
         if (class_exists(\pxlrbt\FilamentSpotlightPro\SpotlightPlugin::class)) {
             /** @noinspection PhpFullyQualifiedNameUsageInspection */
-            $panel->plugin(\pxlrbt\FilamentSpotlightPro\SpotlightPlugin::make()
-                ->registerItems([
-                    \pxlrbt\FilamentSpotlightPro\SpotlightProviders\RegisterResources::make(),
-                ])
-                ->hotkeys(['¸'])
+            $panel->plugin(
+                \pxlrbt\FilamentSpotlightPro\SpotlightPlugin::make()
+                    ->registerItems([
+                        \pxlrbt\FilamentSpotlightPro\SpotlightProviders\RegisterResources::make(),
+                    ])
+                    ->hotkeys(['¸'])
             );
         } else {
             $panel->plugin(SpotlightPlugin::make());