diff --git a/lib/core/layout/app_shell.dart b/lib/core/layout/app_shell.dart
index 8936a83..f6dd2cb 100644
--- a/lib/core/layout/app_shell.dart
+++ b/lib/core/layout/app_shell.dart
@@ -143,11 +143,6 @@ class _AppMenuState extends State<AppMenu> {
                             Routes.products,
                             '/master-data/products',
                           ),
-                          _SubMenuItem(
-                            "Staff",
-                            Routes.staff,
-                            '/master-data/staff',
-                          ),
                         ],
                       ),
 
diff --git a/lib/features/settings/settings_screen.dart b/lib/features/settings/settings_screen.dart
index 1194532..505a8ea 100644
--- a/lib/features/settings/settings_screen.dart
+++ b/lib/features/settings/settings_screen.dart
@@ -5,6 +5,7 @@ import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/theme/theme.dart';
 import 'package:flux/features/settings/blocs/settings_cubit.dart';
+import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
 
 class SettingsScreen extends StatelessWidget {
@@ -17,20 +18,53 @@ class SettingsScreen extends StatelessWidget {
       body: ListView(
         padding: const EdgeInsets.all(16),
         children: [
-          _settingsSection('Account', [
+          _settingsSection('Azienda', [
             _settingsTile(
-              icon: Icons.person,
-              title: 'Profilo Utente',
-              subtitle: 'Configura i tuoi dati',
+              title: 'Impostazioni Azienda',
+              icon: Icons.business,
+              subtitle: 'Configura i dati aziendali',
               context: context,
-              onTap: () {},
+              onTap: () => context.pushNamed(Routes.companySettings),
             ),
             const Divider(height: 30),
+            _settingsTile(
+              title: 'Impostazione Negozi',
+              icon: Icons.store,
+              subtitle: 'Crea o configura i negozi',
+              context: context,
+              onTap: () => context.pushNamed(Routes.stores),
+            ),
+            const Divider(height: 30),
+            _settingsTile(
+              title: 'Impostazione Staff / Utenti',
+              icon: Icons.group,
+              subtitle:
+                  'Configura i membri dei negozi o invita nuovi utenti in azienda',
+              context: context,
+              onTap: () => context.pushNamed(Routes.staff),
+            ),
+          ]),
+          const SizedBox(height: 20),
+          _settingsSection('Applicazione', [
             BlocBuilder<SettingsCubit, SettingsState>(
               builder: (context, state) => CheckboxListTile(
                 value: state.isSingleUserMode,
-                title: const Text(
-                  'Modalità utente singolo (dispositivo personale)',
+
+                title: Row(
+                  children: [
+                    const Icon(Icons.person, color: FluxColors.primaryBlue),
+                    const SizedBox(width: 12),
+                    Text(
+                      'Modalità utente singolo (dispositivo personale)',
+                      style: Theme.of(context).textTheme.titleLarge,
+                    ),
+                  ],
+                ),
+                subtitle: Padding(
+                  padding: const EdgeInsets.only(left: 36),
+                  child: Text(
+                    'Utente ${GetIt.I.get<SessionCubit>().state.currentStaffMember?.name ?? 'Nessuno'} selezionato automaticamente',
+                  ),
                 ),
                 onChanged: (value) {
                   context.read<SessionCubit>().setIsSingleUserMode(value!);
@@ -39,16 +73,6 @@ class SettingsScreen extends StatelessWidget {
               ),
             ),
             const Divider(height: 30),
-            _settingsTile(
-              title: 'Impostazioni Azienda',
-              icon: Icons.business,
-              subtitle: 'Configura i dati aziendali',
-              context: context,
-              onTap: () => context.pushNamed(Routes.companySettings),
-            ),
-          ]),
-          const SizedBox(height: 16),
-          _settingsSection('Applicazione', [
             _settingsTile(
               icon: Icons.dark_mode,
               title: 'Tema (FLUX Dark)',