diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index 1ed8a2451..fa1c29630 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -18,12 +18,10 @@ class AdminPanelProvider extends PanelProvider
             ->breadcrumbs(false)
             ->sidebarCollapsibleOnDesktop()
             ->userMenuItems([
-                'profile' => fn (Action $action) => $action->label(auth()->user()->username),
-                Action::make('exitAdmin')
+                Action::make('exit_admin')
                     ->label(fn () => trans('profile.exit_admin'))
                     ->url(fn () => Filament::getPanel('app')->getUrl())
-                    ->icon('tabler-arrow-back')
-                    ->sort(24),
+                    ->icon('tabler-arrow-back'),
             ])
             ->navigationGroups([
                 NavigationGroup::make(fn () => trans('admin/dashboard.server'))
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
index 47fbab894..8f4d56dd0 100644
--- a/app/Providers/Filament/AppPanelProvider.php
+++ b/app/Providers/Filament/AppPanelProvider.php
@@ -16,12 +16,10 @@ class AppPanelProvider extends PanelProvider
             ->breadcrumbs(false)
             ->navigation(false)
             ->userMenuItems([
-                'profile' => fn (Action $action) => $action->label(auth()->user()->username),
-                Action::make('toAdmin')
+                Action::make('to_admin')
                     ->label(trans('profile.admin'))
                     ->url(fn () => Filament::getPanel('admin')->getUrl())
                     ->icon('tabler-arrow-forward')
-                    ->sort(5)
                     ->visible(fn () => auth()->user()->canAccessPanel(Filament::getPanel('admin'))),
             ])
             ->discoverResources(in: app_path('Filament/App/Resources'), for: 'App\\Filament\\App\\Resources');
diff --git a/app/Providers/Filament/PanelProvider.php b/app/Providers/Filament/PanelProvider.php
index 6cad21cda..d845e03e4 100644
--- a/app/Providers/Filament/PanelProvider.php
+++ b/app/Providers/Filament/PanelProvider.php
@@ -5,6 +5,7 @@ namespace App\Providers\Filament;
 use App\Filament\Pages\Auth\Login;
 use App\Filament\Pages\Auth\EditProfile;
 use App\Http\Middleware\LanguageMiddleware;
+use Filament\Actions\Action;
 use Filament\Auth\MultiFactor\App\AppAuthentication;
 use Filament\Auth\MultiFactor\Email\EmailAuthentication;
 use Filament\Http\Middleware\Authenticate;
@@ -34,6 +35,10 @@ abstract class PanelProvider extends BasePanelProvider
             ->topNavigation(fn () => auth()->user()->getCustomization()['top_navigation'] ?? false)
             ->maxContentWidth(config('panel.filament.display-width', 'screen-2xl'))
             ->profile(EditProfile::class, false)
+            ->userMenuItems([
+                'profile' => fn (Action $action) => $action
+                    ->url(fn () => EditProfile::getUrl(panel: 'app')),
+            ])
             ->login(Login::class)
             ->passwordReset()
             ->multiFactorAuthentication([
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index 11b4a7936..04bb9c4ef 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -4,7 +4,6 @@ namespace App\Providers\Filament;
 
 use App\Filament\App\Resources\Servers\Pages\ListServers;
 use App\Filament\Admin\Resources\Servers\Pages\EditServer;
-use App\Filament\Pages\Auth\EditProfile;
 use App\Http\Middleware\Activity\ServerSubject;
 use App\Models\Server;
 use Filament\Actions\Action;
@@ -19,20 +18,17 @@ class ServerPanelProvider extends PanelProvider
         return parent::panel($panel)
             ->id('server')
             ->path('server')
-            ->homeUrl('/')
+            ->homeUrl(fn () => Filament::getPanel('app')->getUrl())
             ->tenant(Server::class)
             ->userMenuItems([
-                'profile' => fn (Action $action) => $action->label(auth()->user()->username)->url(fn () => EditProfile::getUrl(panel: 'app')),
-                Action::make('toServerList')
-                    ->label('Server List')
+                Action::make('to_serverList')
+                    ->label(trans('profile.server_list'))
                     ->icon('tabler-brand-docker')
-                    ->url(fn () => ListServers::getUrl(panel: 'app'))
-                    ->sort(6),
-                Action::make('toAdmin')
+                    ->url(fn () => ListServers::getUrl(panel: 'app')),
+                Action::make('to_admin')
                     ->label(trans('profile.admin'))
                     ->icon('tabler-arrow-forward')
                     ->url(fn () => Filament::getPanel('admin')->getUrl())
-                    ->sort(5)
                     ->visible(fn () => auth()->user()->canAccessPanel(Filament::getPanel('admin'))),
             ])
             ->navigationItems([
diff --git a/lang/en/profile.php b/lang/en/profile.php
index 662f84df1..639b9b917 100644
--- a/lang/en/profile.php
+++ b/lang/en/profile.php
@@ -14,6 +14,7 @@ return [
     'username' => 'Username',
     'admin' => 'Admin',
     'exit_admin' => 'Exit Admin',
+    'server_list' => 'Server List',
     'email' => 'Email',
     'password' => 'Password',
     'current_password' => 'Current Password',