diff --git a/assets/translations/en.json b/assets/translations/en.json
index c1512a695a6f4dce50e4b0f15dd8022db3d79c02..a5dcb35a747d072bca03a4db544bcb524ec9e0aa 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -1,6 +1,9 @@
 {
   "app_name": "Snake",
 
+  "page_home": "Home",
+  "page_game": "Game",
+
   "settings_title": "Settings",
   "settings_label_theme": "Theme mode",
 
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
index a3385d5aa978a400a411837f75fb7c83f02607a7..17e7775d497f745632c1834fc0dff33acbaac517 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -1,6 +1,9 @@
 {
   "app_name": "Serpent",
 
+  "page_home": "Accueil",
+  "page_game": "Jeu",
+
   "settings_title": "Réglages",
   "settings_label_theme": "Thème de couleurs",
 
diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/20.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/20.txt b/fastlane/metadata/android/fr-FR/changelogs/20.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/20.txt
@@ -0,0 +1 @@
+Harmonisation des applications en Activity.
diff --git a/lib/common/config/activity_page.dart b/lib/common/config/activity_page.dart
new file mode 100644
index 0000000000000000000000000000000000000000..241f8bfdf66d406278a41afd6a9f8913a8ca7bcb
--- /dev/null
+++ b/lib/common/config/activity_page.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/ui/pages/game.dart';
+import 'package:snake/common/ui/pages/parameters.dart';
+
+class ActivityPageItem {
+  final String code;
+  final Icon icon;
+  final Widget page;
+
+  const ActivityPageItem({
+    required this.code,
+    required this.icon,
+    required this.page,
+  });
+}
+
+class ActivityPage {
+  static const bool displayBottomNavBar = false;
+
+  static const indexHome = 0;
+  static const pageHome = ActivityPageItem(
+    code: 'page_home',
+    icon: Icon(UniconsLine.home),
+    page: PageParameters(),
+  );
+
+  static const indexGame = 1;
+  static const pageGame = ActivityPageItem(
+    code: 'page_game',
+    icon: Icon(UniconsLine.star),
+    page: PageGame(),
+  );
+
+  static const Map<int, ActivityPageItem> items = {
+    indexHome: pageHome,
+    indexGame: pageGame,
+  };
+
+  static int defaultPageIndex = indexHome;
+
+  static bool isIndexAllowed(int pageIndex) {
+    return items.keys.contains(pageIndex);
+  }
+
+  static Widget getWidget(int pageIndex) {
+    return items[pageIndex]?.page ?? pageHome.page;
+  }
+}
diff --git a/lib/common/config/screen.dart b/lib/common/config/screen.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e9cecc5bb43eaba160e0c1e7d7d255cb7ed032ab
--- /dev/null
+++ b/lib/common/config/screen.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/ui/screens/about.dart';
+import 'package:snake/common/ui/screens/activity.dart';
+import 'package:snake/common/ui/screens/settings.dart';
+
+class ScreenItem {
+  final String code;
+  final Icon icon;
+  final Widget screen;
+
+  const ScreenItem({
+    required this.code,
+    required this.icon,
+    required this.screen,
+  });
+}
+
+class Screen {
+  static const indexActivity = 0;
+  static const screenActivity = ScreenItem(
+    code: 'screen_activity',
+    icon: Icon(UniconsLine.home),
+    screen: ScreenActivity(),
+  );
+
+  static const indexSettings = 1;
+  static const screenSettings = ScreenItem(
+    code: 'screen_settings',
+    icon: Icon(UniconsLine.setting),
+    screen: ScreenSettings(),
+  );
+
+  static const indexAbout = 2;
+  static const screenAbout = ScreenItem(
+    code: 'screen_about',
+    icon: Icon(UniconsLine.info_circle),
+    screen: ScreenAbout(),
+  );
+
+  static Map<int, ScreenItem> items = {
+    indexActivity: screenActivity,
+    indexSettings: screenSettings,
+    indexAbout: screenAbout,
+  };
+
+  static bool isIndexAllowed(int screenIndex) {
+    return items.keys.contains(screenIndex);
+  }
+
+  static Widget getWidget(int screenIndex) {
+    return items[screenIndex]?.screen ?? screenActivity.screen;
+  }
+}
diff --git a/lib/common/cubit/nav/nav_cubit_pages.dart b/lib/common/cubit/nav/nav_cubit_pages.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0491ae51877267c65ad0d5b3d088aca1fb69fc5e
--- /dev/null
+++ b/lib/common/cubit/nav/nav_cubit_pages.dart
@@ -0,0 +1,33 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/config/activity_page.dart';
+
+class NavCubitPage extends HydratedCubit<int> {
+  NavCubitPage() : super(0);
+
+  void updateIndex(int index) {
+    if (ActivityPage.isIndexAllowed(index)) {
+      emit(index);
+    } else {
+      emit(ActivityPage.indexHome);
+    }
+  }
+
+  void goToPageHome() {
+    updateIndex(ActivityPage.indexHome);
+  }
+
+  void goToPageGame() {
+    updateIndex(ActivityPage.indexGame);
+  }
+
+  @override
+  int fromJson(Map<String, dynamic> json) {
+    return ActivityPage.indexHome;
+  }
+
+  @override
+  Map<String, dynamic>? toJson(int state) {
+    return <String, int>{'index': state};
+  }
+}
diff --git a/lib/common/cubit/nav/nav_cubit_screens.dart b/lib/common/cubit/nav/nav_cubit_screens.dart
new file mode 100644
index 0000000000000000000000000000000000000000..279d23ae7945386690947a2c6b620ba9cdfacd84
--- /dev/null
+++ b/lib/common/cubit/nav/nav_cubit_screens.dart
@@ -0,0 +1,37 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/config/screen.dart';
+
+class NavCubitScreen extends HydratedCubit<int> {
+  NavCubitScreen() : super(0);
+
+  void updateIndex(int index) {
+    if (Screen.isIndexAllowed(index)) {
+      emit(index);
+    } else {
+      goToScreenActivity();
+    }
+  }
+
+  void goToScreenActivity() {
+    emit(Screen.indexActivity);
+  }
+
+  void goToScreenSettings() {
+    emit(Screen.indexSettings);
+  }
+
+  void goToScreenAbout() {
+    emit(Screen.indexAbout);
+  }
+
+  @override
+  int fromJson(Map<String, dynamic> json) {
+    return Screen.indexActivity;
+  }
+
+  @override
+  Map<String, dynamic>? toJson(int state) {
+    return <String, int>{'index': state};
+  }
+}
diff --git a/lib/common/ui/nav/bottom_nav_bar.dart b/lib/common/ui/nav/bottom_nav_bar.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bd591e330ec1a4cf4ad3d35f86a145e40d6b2438
--- /dev/null
+++ b/lib/common/ui/nav/bottom_nav_bar.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/config/activity_page.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+
+class BottomNavBar extends StatelessWidget {
+  const BottomNavBar({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.only(top: 1, right: 4, left: 4),
+      elevation: 4,
+      shadowColor: Theme.of(context).colorScheme.shadow,
+      color: Theme.of(context).colorScheme.surfaceContainerHighest,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.only(
+          topLeft: Radius.circular(16),
+          topRight: Radius.circular(16),
+        ),
+      ),
+      child: BlocBuilder<NavCubitPage, int>(builder: (BuildContext context, int state) {
+        final List<BottomNavigationBarItem> items = [];
+
+        ActivityPage.items.forEach((int pageIndex, ActivityPageItem item) {
+          items.add(BottomNavigationBarItem(
+            icon: item.icon,
+            label: tr(item.code),
+          ));
+        });
+
+        return BottomNavigationBar(
+          currentIndex: state,
+          onTap: (int index) => BlocProvider.of<NavCubitPage>(context).updateIndex(index),
+          type: BottomNavigationBarType.fixed,
+          elevation: 0,
+          backgroundColor: Colors.transparent,
+          selectedItemColor: Theme.of(context).colorScheme.primary,
+          unselectedItemColor: Theme.of(context).textTheme.bodySmall!.color,
+          items: items,
+        );
+      }),
+    );
+  }
+}
diff --git a/lib/ui/widgets/global_app_bar.dart b/lib/common/ui/nav/global_app_bar.dart
similarity index 60%
rename from lib/ui/widgets/global_app_bar.dart
rename to lib/common/ui/nav/global_app_bar.dart
index 9acf625f8ec00d67343381d0ece973e0f3647c1c..f60e246e8efbe2c7fd5730748dc28a2b6b62fb36 100644
--- a/lib/ui/widgets/global_app_bar.dart
+++ b/lib/common/ui/nav/global_app_bar.dart
@@ -1,30 +1,33 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/config/menu.dart';
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/cubit/nav_cubit.dart';
-import 'package:snake/models/game/game.dart';
+import 'package:snake/common/config/screen.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/models/activity/activity.dart';
 
 class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
   const GlobalAppBar({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        return BlocBuilder<NavCubit, int>(
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        return BlocBuilder<NavCubitScreen, int>(
           builder: (BuildContext context, int pageIndex) {
-            final Game currentGame = gameState.currentGame;
+            final Activity currentActivity = activityState.currentActivity;
 
             final List<Widget> menuActions = [];
 
-            if (currentGame.isRunning && !currentGame.isFinished) {
+            if (currentActivity.isRunning && !currentActivity.isFinished) {
               menuActions.add(StyledButton(
                 color: Colors.red,
                 onPressed: () {},
                 onLongPress: () {
-                  BlocProvider.of<GameCubit>(context).quitGame();
+                  BlocProvider.of<ActivityCubit>(context).quitActivity();
+                  BlocProvider.of<NavCubitPage>(context).goToPageHome();
                 },
                 child: const Image(
                   image: AssetImage('assets/ui/button_back.png'),
@@ -32,38 +35,38 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
                 ),
               ));
             } else {
-              if (pageIndex == Menu.indexGame) {
+              if (pageIndex == Screen.indexActivity) {
                 // go to Settings page
                 menuActions.add(ElevatedButton(
                   onPressed: () {
-                    BlocProvider.of<NavCubit>(context).goToSettingsPage();
+                    BlocProvider.of<NavCubitScreen>(context).goToScreenSettings();
                   },
                   style: ElevatedButton.styleFrom(
                     shape: const CircleBorder(),
                   ),
-                  child: Menu.menuItemSettings.icon,
+                  child: Screen.screenSettings.icon,
                 ));
 
                 // go to About page
                 menuActions.add(ElevatedButton(
                   onPressed: () {
-                    BlocProvider.of<NavCubit>(context).goToAboutPage();
+                    BlocProvider.of<NavCubitScreen>(context).goToScreenAbout();
                   },
                   style: ElevatedButton.styleFrom(
                     shape: const CircleBorder(),
                   ),
-                  child: Menu.menuItemAbout.icon,
+                  child: Screen.screenAbout.icon,
                 ));
               } else {
                 // back to Home page
                 menuActions.add(ElevatedButton(
                   onPressed: () {
-                    BlocProvider.of<NavCubit>(context).goToGamePage();
+                    BlocProvider.of<NavCubitScreen>(context).goToScreenActivity();
                   },
                   style: ElevatedButton.styleFrom(
                     shape: const CircleBorder(),
                   ),
-                  child: Menu.menuItemGame.icon,
+                  child: Screen.screenActivity.icon,
                 ));
               }
             }
diff --git a/lib/ui/layouts/game_layout.dart b/lib/common/ui/pages/game.dart
similarity index 66%
rename from lib/ui/layouts/game_layout.dart
rename to lib/common/ui/pages/game.dart
index bcc75b0e39ca695f579c37edb70103898ad97aa4..ad14d14c90b909a3a0648c97f372620e2f6d9271 100644
--- a/lib/ui/layouts/game_layout.dart
+++ b/lib/common/ui/pages/game.dart
@@ -1,21 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/models/game/game.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/models/activity/activity.dart';
 import 'package:snake/ui/game/game_bottom.dart';
 import 'package:snake/ui/game/game_end.dart';
 import 'package:snake/ui/game/game_top.dart';
 import 'package:snake/ui/widgets/game/game_board.dart';
 
-class GameLayout extends StatelessWidget {
-  const GameLayout({super.key});
+class PageGame extends StatelessWidget {
+  const PageGame({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
         return Container(
           alignment: AlignmentDirectional.topCenter,
@@ -30,7 +30,7 @@ class GameLayout extends StatelessWidget {
               const SizedBox(height: 8),
               const GameBottomWidget(),
               const Expanded(child: SizedBox.shrink()),
-              currentGame.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
+              currentActivity.isFinished ? const GameEndWidget() : const SizedBox.shrink(),
             ],
           ),
         );
diff --git a/lib/common/ui/pages/parameters.dart b/lib/common/ui/pages/parameters.dart
new file mode 100644
index 0000000000000000000000000000000000000000..92b8320af247ac0be3ea095a018169b24bff4b39
--- /dev/null
+++ b/lib/common/ui/pages/parameters.dart
@@ -0,0 +1,148 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/ui/parameters/parameter_widget.dart';
+
+import 'package:snake/config/default_activity_settings.dart';
+import 'package:snake/config/default_global_settings.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/cubit/settings/settings_activity_cubit.dart';
+import 'package:snake/cubit/settings/settings_global_cubit.dart';
+import 'package:snake/models/activity/activity.dart';
+import 'package:snake/ui/widgets/actions/button_delete_saved_game.dart';
+import 'package:snake/ui/widgets/actions/button_game_start_new.dart';
+import 'package:snake/ui/widgets/actions/button_resume_saved_game.dart';
+
+class PageParameters extends StatelessWidget {
+  const PageParameters({super.key});
+
+  final double separatorHeight = 8.0;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
+
+        final List<Widget> lines = [];
+
+        // Game settings
+        for (String code in DefaultActivitySettings.availableParameters) {
+          lines.add(Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: buildParametersLine(
+              code: code,
+              isGlobal: false,
+            ),
+          ));
+
+          lines.add(SizedBox(height: separatorHeight));
+        }
+
+        lines.add(Expanded(
+          child: SizedBox(height: separatorHeight),
+        ));
+
+        if (currentActivity.canBeResumed == false) {
+          // Start new game
+          lines.add(
+            const AspectRatio(
+              aspectRatio: 3,
+              child: StartNewGameButton(),
+            ),
+          );
+        } else {
+          // Resume game
+          lines.add(const AspectRatio(
+            aspectRatio: 3,
+            child: ResumeSavedGameButton(),
+          ));
+          // Delete saved game
+          lines.add(SizedBox.square(
+            dimension: MediaQuery.of(context).size.width / 5,
+            child: const DeleteSavedGameButton(),
+          ));
+        }
+
+        lines.add(SizedBox(height: separatorHeight));
+
+        // Global settings
+        for (String code in DefaultGlobalSettings.availableParameters) {
+          lines.add(Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: buildParametersLine(
+              code: code,
+              isGlobal: true,
+            ),
+          ));
+
+          lines.add(SizedBox(height: separatorHeight));
+        }
+
+        return Column(
+          children: lines,
+        );
+      },
+    );
+  }
+
+  List<Widget> buildParametersLine({
+    required String code,
+    required bool isGlobal,
+  }) {
+    final List<Widget> parameterButtons = [];
+
+    final List<String> availableValues = isGlobal
+        ? DefaultGlobalSettings.getAvailableValues(code)
+        : DefaultActivitySettings.getAvailableValues(code);
+
+    if (availableValues.length <= 1) {
+      return [];
+    }
+
+    for (String value in availableValues) {
+      final Widget parameterButton = BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
+        builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
+          return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
+            builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
+              final ActivitySettingsCubit activitySettingsCubit =
+                  BlocProvider.of<ActivitySettingsCubit>(context);
+              final GlobalSettingsCubit globalSettingsCubit =
+                  BlocProvider.of<GlobalSettingsCubit>(context);
+
+              final String currentValue = isGlobal
+                  ? globalSettingsCubit.getParameterValue(code)
+                  : activitySettingsCubit.getParameterValue(code);
+
+              final bool isSelected = (value == currentValue);
+
+              final double displayWidth = MediaQuery.of(context).size.width;
+              final double itemWidth = displayWidth / availableValues.length - 4;
+
+              return SizedBox.square(
+                dimension: itemWidth,
+                child: ParameterWidget(
+                  code: code,
+                  value: value,
+                  isSelected: isSelected,
+                  size: itemWidth,
+                  activitySettings: activitySettingsState.settings,
+                  globalSettings: globalSettingsState.settings,
+                  onPressed: () {
+                    isGlobal
+                        ? globalSettingsCubit.setParameterValue(code, value)
+                        : activitySettingsCubit.setParameterValue(code, value);
+                  },
+                ),
+              );
+            },
+          );
+        },
+      );
+
+      parameterButtons.add(parameterButton);
+    }
+
+    return parameterButtons;
+  }
+}
diff --git a/lib/ui/parameters/parameter_painter.dart b/lib/common/ui/parameters/parameter_painter.dart
similarity index 87%
rename from lib/ui/parameters/parameter_painter.dart
rename to lib/common/ui/parameters/parameter_painter.dart
index 5a2a0cc218c340574741ef9ccaabdf5eb8234666..b9788f2de085082b01893979282a6772143faa45 100644
--- a/lib/ui/parameters/parameter_painter.dart
+++ b/lib/common/ui/parameters/parameter_painter.dart
@@ -3,22 +3,22 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/config/default_game_settings.dart';
+import 'package:snake/config/default_activity_settings.dart';
 import 'package:snake/config/default_global_settings.dart';
-import 'package:snake/models/settings/settings_game.dart';
+import 'package:snake/models/settings/settings_activity.dart';
 import 'package:snake/models/settings/settings_global.dart';
 
 class ParameterPainter extends CustomPainter {
   const ParameterPainter({
     required this.code,
     required this.value,
-    required this.gameSettings,
+    required this.activitySettings,
     required this.globalSettings,
   });
 
   final String code;
   final String value;
-  final GameSettings gameSettings;
+  final ActivitySettings activitySettings;
   final GlobalSettings globalSettings;
 
   @override
@@ -28,10 +28,10 @@ class ParameterPainter extends CustomPainter {
 
     // content
     switch (code) {
-      case DefaultGameSettings.parameterCodeDifficultyLevel:
+      case DefaultActivitySettings.parameterCodeDifficultyLevel:
         paintDifficultyLevelParameterItem(canvas, canvasSize);
         break;
-      case DefaultGameSettings.parameterCodeBoardSize:
+      case DefaultActivitySettings.parameterCodeBoardSize:
         paintBoardSizeParameterItem(canvas, canvasSize);
         break;
       case DefaultGlobalSettings.parameterCodeSkin:
@@ -87,19 +87,19 @@ class ParameterPainter extends CustomPainter {
     final List<dynamic> stars = [];
 
     switch (value) {
-      case DefaultGameSettings.difficultyLevelValueEasy:
+      case DefaultActivitySettings.difficultyLevelValueEasy:
         stars.add([0.5, 0.5]);
         break;
-      case DefaultGameSettings.difficultyLevelValueMedium:
+      case DefaultActivitySettings.difficultyLevelValueMedium:
         stars.add([0.3, 0.5]);
         stars.add([0.7, 0.5]);
         break;
-      case DefaultGameSettings.difficultyLevelValueHard:
+      case DefaultActivitySettings.difficultyLevelValueHard:
         stars.add([0.3, 0.3]);
         stars.add([0.7, 0.3]);
         stars.add([0.5, 0.7]);
         break;
-      case DefaultGameSettings.difficultyLevelValueNightmare:
+      case DefaultActivitySettings.difficultyLevelValueNightmare:
         stars.add([0.3, 0.3]);
         stars.add([0.7, 0.3]);
         stars.add([0.3, 0.7]);
@@ -147,16 +147,16 @@ class ParameterPainter extends CustomPainter {
     int gridWidth = 1;
 
     switch (value) {
-      case DefaultGameSettings.boardSizeValueSmall:
+      case DefaultActivitySettings.boardSizeValueSmall:
         gridWidth = 2;
         break;
-      case DefaultGameSettings.boardSizeValueMedium:
+      case DefaultActivitySettings.boardSizeValueMedium:
         gridWidth = 3;
         break;
-      case DefaultGameSettings.boardSizeValueLarge:
+      case DefaultActivitySettings.boardSizeValueLarge:
         gridWidth = 4;
         break;
-      case DefaultGameSettings.boardSizeValueExtra:
+      case DefaultActivitySettings.boardSizeValueExtra:
         gridWidth = 5;
         break;
       default:
diff --git a/lib/ui/parameters/parameter_widget.dart b/lib/common/ui/parameters/parameter_widget.dart
similarity index 79%
rename from lib/ui/parameters/parameter_widget.dart
rename to lib/common/ui/parameters/parameter_widget.dart
index 26e506b47bbb0c8277294478ace367c572c88fd8..ec76a8335f9fa39d95f104150278f08a1f278b5d 100644
--- a/lib/ui/parameters/parameter_widget.dart
+++ b/lib/common/ui/parameters/parameter_widget.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/config/default_game_settings.dart';
+import 'package:snake/common/ui/parameters/parameter_painter.dart';
+
+import 'package:snake/config/default_activity_settings.dart';
 import 'package:snake/config/default_global_settings.dart';
-import 'package:snake/models/settings/settings_game.dart';
+import 'package:snake/models/settings/settings_activity.dart';
 import 'package:snake/models/settings/settings_global.dart';
-import 'package:snake/ui/parameters/parameter_painter.dart';
 
 class ParameterWidget extends StatelessWidget {
   const ParameterWidget({
@@ -14,7 +15,7 @@ class ParameterWidget extends StatelessWidget {
     required this.value,
     required this.isSelected,
     required this.size,
-    required this.gameSettings,
+    required this.activitySettings,
     required this.globalSettings,
     required this.onPressed,
   });
@@ -23,7 +24,7 @@ class ParameterWidget extends StatelessWidget {
   final String value;
   final bool isSelected;
   final double size;
-  final GameSettings gameSettings;
+  final ActivitySettings activitySettings;
   final GlobalSettings globalSettings;
   final VoidCallback onPressed;
 
@@ -37,10 +38,10 @@ class ParameterWidget extends StatelessWidget {
     Widget content = const SizedBox.shrink();
 
     switch (code) {
-      case DefaultGameSettings.parameterCodeDifficultyLevel:
+      case DefaultActivitySettings.parameterCodeDifficultyLevel:
         content = getDifficultyLevelParameterItem();
         break;
-      case DefaultGameSettings.parameterCodeBoardSize:
+      case DefaultActivitySettings.parameterCodeBoardSize:
         content = getBoardSizeParameterItem();
         break;
       case DefaultGlobalSettings.parameterCodeSkin:
@@ -79,16 +80,16 @@ class ParameterWidget extends StatelessWidget {
     Color backgroundColor = Colors.grey;
 
     switch (value) {
-      case DefaultGameSettings.difficultyLevelValueEasy:
+      case DefaultActivitySettings.difficultyLevelValueEasy:
         backgroundColor = Colors.green;
         break;
-      case DefaultGameSettings.difficultyLevelValueMedium:
+      case DefaultActivitySettings.difficultyLevelValueMedium:
         backgroundColor = Colors.orange;
         break;
-      case DefaultGameSettings.difficultyLevelValueHard:
+      case DefaultActivitySettings.difficultyLevelValueHard:
         backgroundColor = Colors.red;
         break;
-      case DefaultGameSettings.difficultyLevelValueNightmare:
+      case DefaultActivitySettings.difficultyLevelValueNightmare:
         backgroundColor = Colors.purple;
         break;
       default:
@@ -104,7 +105,7 @@ class ParameterWidget extends StatelessWidget {
         painter: ParameterPainter(
           code: code,
           value: value,
-          gameSettings: gameSettings,
+          activitySettings: activitySettings,
           globalSettings: globalSettings,
         ),
         isComplex: true,
@@ -116,16 +117,16 @@ class ParameterWidget extends StatelessWidget {
     Color backgroundColor = Colors.grey;
 
     switch (value) {
-      case DefaultGameSettings.boardSizeValueSmall:
+      case DefaultActivitySettings.boardSizeValueSmall:
         backgroundColor = Colors.green;
         break;
-      case DefaultGameSettings.boardSizeValueMedium:
+      case DefaultActivitySettings.boardSizeValueMedium:
         backgroundColor = Colors.orange;
         break;
-      case DefaultGameSettings.boardSizeValueLarge:
+      case DefaultActivitySettings.boardSizeValueLarge:
         backgroundColor = Colors.red;
         break;
-      case DefaultGameSettings.boardSizeValueExtra:
+      case DefaultActivitySettings.boardSizeValueExtra:
         backgroundColor = Colors.purple;
         break;
       default:
@@ -141,7 +142,7 @@ class ParameterWidget extends StatelessWidget {
         painter: ParameterPainter(
           code: code,
           value: value,
-          gameSettings: gameSettings,
+          activitySettings: activitySettings,
           globalSettings: globalSettings,
         ),
         isComplex: true,
@@ -161,7 +162,7 @@ class ParameterWidget extends StatelessWidget {
         painter: ParameterPainter(
           code: code,
           value: value,
-          gameSettings: gameSettings,
+          activitySettings: activitySettings,
           globalSettings: globalSettings,
         ),
         isComplex: true,
diff --git a/lib/ui/screens/page_about.dart b/lib/common/ui/screens/about.dart
similarity index 93%
rename from lib/ui/screens/page_about.dart
rename to lib/common/ui/screens/about.dart
index ab73e304b8138295f6669330b928e0d1d0263565..f7a14a9a7e574a7b6f9ed181f38d08ba8c2285fe 100644
--- a/lib/ui/screens/page_about.dart
+++ b/lib/common/ui/screens/about.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-class PageAbout extends StatelessWidget {
-  const PageAbout({super.key});
+class ScreenAbout extends StatelessWidget {
+  const ScreenAbout({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/common/ui/screens/activity.dart b/lib/common/ui/screens/activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c01876ec50196853c23ec4de3fb1e08de6e60c04
--- /dev/null
+++ b/lib/common/ui/screens/activity.dart
@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/common/config/activity_page.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+
+class ScreenActivity extends StatelessWidget {
+  const ScreenActivity({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<NavCubitPage, int>(
+      builder: (BuildContext context, int pageIndex) {
+        return ActivityPage.getWidget(pageIndex);
+      },
+    );
+  }
+}
diff --git a/lib/ui/screens/page_settings.dart b/lib/common/ui/screens/settings.dart
similarity index 87%
rename from lib/ui/screens/page_settings.dart
rename to lib/common/ui/screens/settings.dart
index 50964ef462b6e3e411347cab4e966afb0f505008..7981b1c6becc4f5b925c3058b05423750d80f62e 100644
--- a/lib/ui/screens/page_settings.dart
+++ b/lib/common/ui/screens/settings.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-class PageSettings extends StatelessWidget {
-  const PageSettings({super.key});
+class ScreenSettings extends StatelessWidget {
+  const ScreenSettings({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4f4a5360c05e55b5bd422783785b51c7220d382b
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+  static const String appTitle = 'Snake';
+}
diff --git a/lib/config/default_game_settings.dart b/lib/config/default_activity_settings.dart
similarity index 91%
rename from lib/config/default_game_settings.dart
rename to lib/config/default_activity_settings.dart
index d281ea1e861324687fb282f5a4e661105a37e939..ac809ef109af307d423655013e332fd30c6bb65e 100644
--- a/lib/config/default_game_settings.dart
+++ b/lib/config/default_activity_settings.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-class DefaultGameSettings {
+class DefaultActivitySettings {
   // available game parameters codes
   static const String parameterCodeDifficultyLevel = 'difficultyLevel';
   static const String parameterCodeBoardSize = 'boardSize';
@@ -41,9 +41,9 @@ class DefaultGameSettings {
   static List<String> getAvailableValues(String parameterCode) {
     switch (parameterCode) {
       case parameterCodeDifficultyLevel:
-        return DefaultGameSettings.allowedDifficultyLevelValues;
+        return DefaultActivitySettings.allowedDifficultyLevelValues;
       case parameterCodeBoardSize:
-        return DefaultGameSettings.allowedBoardSizeValues;
+        return DefaultActivitySettings.allowedBoardSizeValues;
     }
 
     printlog('Did not find any available value for game parameter "$parameterCode".');
diff --git a/lib/config/menu.dart b/lib/config/menu.dart
deleted file mode 100644
index cfc465573fcfff6188cdd6ea9a91545b64637d2f..0000000000000000000000000000000000000000
--- a/lib/config/menu.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/ui/screens/page_about.dart';
-import 'package:snake/ui/screens/page_game.dart';
-import 'package:snake/ui/screens/page_settings.dart';
-
-class MenuItem {
-  final Icon icon;
-  final Widget page;
-
-  const MenuItem({
-    required this.icon,
-    required this.page,
-  });
-}
-
-class Menu {
-  static const indexGame = 0;
-  static const menuItemGame = MenuItem(
-    icon: Icon(UniconsLine.home),
-    page: PageGame(),
-  );
-
-  static const indexSettings = 1;
-  static const menuItemSettings = MenuItem(
-    icon: Icon(UniconsLine.setting),
-    page: PageSettings(),
-  );
-
-  static const indexAbout = 2;
-  static const menuItemAbout = MenuItem(
-    icon: Icon(UniconsLine.info_circle),
-    page: PageAbout(),
-  );
-
-  static Map<int, MenuItem> items = {
-    indexGame: menuItemGame,
-    indexSettings: menuItemSettings,
-    indexAbout: menuItemAbout,
-  };
-
-  static bool isIndexAllowed(int pageIndex) {
-    return items.keys.contains(pageIndex);
-  }
-
-  static Widget getPageWidget(int pageIndex) {
-    return items[pageIndex]?.page ?? menuItemGame.page;
-  }
-
-  static int itemsCount = Menu.items.length;
-}
diff --git a/lib/cubit/activity/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..3868df3c372361ac2d45773e6bb5339ee54e6120
--- /dev/null
+++ b/lib/cubit/activity/activity_cubit.dart
@@ -0,0 +1,160 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/models/activity/activity.dart';
+import 'package:snake/models/settings/settings_activity.dart';
+import 'package:snake/models/settings/settings_global.dart';
+
+part 'activity_state.dart';
+
+class ActivityCubit extends HydratedCubit<ActivityState> {
+  ActivityCubit()
+      : super(ActivityState(
+          currentActivity: Activity.createEmpty(),
+        ));
+
+  void updateState(Activity activity) {
+    emit(ActivityState(
+      currentActivity: activity,
+    ));
+  }
+
+  void refresh() {
+    final Activity activity = Activity(
+      // Settings
+      activitySettings: state.currentActivity.activitySettings,
+      globalSettings: state.currentActivity.globalSettings,
+      // State
+      isRunning: state.currentActivity.isRunning,
+      isStarted: state.currentActivity.isStarted,
+      isFinished: state.currentActivity.isFinished,
+      animationInProgress: state.currentActivity.animationInProgress,
+      // Base data
+      snake: state.currentActivity.snake,
+      board: state.currentActivity.board,
+      boardSize: state.currentActivity.boardSize,
+      // Game data
+      score: state.currentActivity.score,
+      gameWon: state.currentActivity.gameWon,
+    );
+    // game.dump();
+
+    updateState(activity);
+  }
+
+  void startNewActivity({
+    required ActivitySettings activitySettings,
+    required GlobalSettings globalSettings,
+  }) {
+    final Activity newActivity = Activity.createNew(
+      // Settings
+      activitySettings: activitySettings,
+      globalSettings: globalSettings,
+    );
+
+    newActivity.dump();
+
+    updateState(newActivity);
+    updateGameIsRunning(true);
+
+    startSnake();
+
+    refresh();
+  }
+
+  void quitActivity() {
+    state.currentActivity.isRunning = false;
+    refresh();
+  }
+
+  void resumeSavedActivity() {
+    state.currentActivity.isRunning = true;
+    refresh();
+  }
+
+  void deleteSavedActivity() {
+    state.currentActivity.isRunning = false;
+    state.currentActivity.isFinished = true;
+    refresh();
+  }
+
+  void startSnake() async {
+    int speed = 500;
+
+    while (!state.currentActivity.isFinished && state.currentActivity.isRunning) {
+      moveSnake();
+      await Future.delayed(Duration(milliseconds: speed));
+
+      // speed up
+      speed -= 1;
+
+      if (speed == 0) {
+        state.currentActivity.isFinished = true;
+        state.currentActivity.gameWon = true;
+        refresh();
+      }
+    }
+  }
+
+  void turnLeft() {
+    state.currentActivity.turnLeft();
+    refresh();
+  }
+
+  void turnRight() {
+    state.currentActivity.turnRight();
+    refresh();
+  }
+
+  void moveSnake([bool enlarge = false]) {
+    state.currentActivity.moveSnake(enlarge);
+    refresh();
+  }
+
+  void increaseScore() {
+    state.currentActivity.score++;
+    refresh();
+  }
+
+  void updateAnimationInProgress(bool inProgress) {
+    state.currentActivity.animationInProgress = inProgress;
+    refresh();
+  }
+
+  void updateGameIsRunning(bool gameIsRunning) {
+    state.currentActivity.isRunning = gameIsRunning;
+    refresh();
+  }
+
+  void updateGameIsStarted(bool gameIsStarted) {
+    state.currentActivity.isStarted = gameIsStarted;
+    refresh();
+  }
+
+  void updateGameIsFinished(bool gameIsFinished) {
+    state.currentActivity.isFinished = gameIsFinished;
+    refresh();
+  }
+
+  void updateGameWon(bool gameWon) {
+    state.currentActivity.gameWon = gameWon;
+    refresh();
+  }
+
+  @override
+  ActivityState? fromJson(Map<String, dynamic> json) {
+    final Activity currentActivity = json['currentActivity'] as Activity;
+
+    return ActivityState(
+      currentActivity: currentActivity,
+    );
+  }
+
+  @override
+  Map<String, dynamic>? toJson(ActivityState state) {
+    return <String, dynamic>{
+      'currentActivity': state.currentActivity,
+    };
+  }
+}
diff --git a/lib/cubit/activity/activity_state.dart b/lib/cubit/activity/activity_state.dart
new file mode 100644
index 0000000000000000000000000000000000000000..887b45e4255fd7de1cc7744569d82a38a66602f2
--- /dev/null
+++ b/lib/cubit/activity/activity_state.dart
@@ -0,0 +1,15 @@
+part of 'activity_cubit.dart';
+
+@immutable
+class ActivityState extends Equatable {
+  const ActivityState({
+    required this.currentActivity,
+  });
+
+  final Activity currentActivity;
+
+  @override
+  List<dynamic> get props => <dynamic>[
+        currentActivity,
+      ];
+}
diff --git a/lib/cubit/game_cubit.dart b/lib/cubit/game_cubit.dart
deleted file mode 100644
index 88d029b7b4935c5614038ef0e06e727d29f49b49..0000000000000000000000000000000000000000
--- a/lib/cubit/game_cubit.dart
+++ /dev/null
@@ -1,160 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/models/game/game.dart';
-import 'package:snake/models/settings/settings_game.dart';
-import 'package:snake/models/settings/settings_global.dart';
-
-part 'game_state.dart';
-
-class GameCubit extends HydratedCubit<GameState> {
-  GameCubit()
-      : super(GameState(
-          currentGame: Game.createEmpty(),
-        ));
-
-  void updateState(Game game) {
-    emit(GameState(
-      currentGame: game,
-    ));
-  }
-
-  void refresh() {
-    final Game game = Game(
-      // Settings
-      gameSettings: state.currentGame.gameSettings,
-      globalSettings: state.currentGame.globalSettings,
-      // State
-      isRunning: state.currentGame.isRunning,
-      isStarted: state.currentGame.isStarted,
-      isFinished: state.currentGame.isFinished,
-      animationInProgress: state.currentGame.animationInProgress,
-      // Base data
-      snake: state.currentGame.snake,
-      board: state.currentGame.board,
-      boardSize: state.currentGame.boardSize,
-      // Game data
-      score: state.currentGame.score,
-      gameWon: state.currentGame.gameWon,
-    );
-    // game.dump();
-
-    updateState(game);
-  }
-
-  void startNewGame({
-    required GameSettings gameSettings,
-    required GlobalSettings globalSettings,
-  }) {
-    final Game newGame = Game.createNew(
-      // Settings
-      gameSettings: gameSettings,
-      globalSettings: globalSettings,
-    );
-
-    newGame.dump();
-
-    updateState(newGame);
-    updateGameIsRunning(true);
-
-    startSnake();
-
-    refresh();
-  }
-
-  void quitGame() {
-    state.currentGame.isRunning = false;
-    refresh();
-  }
-
-  void resumeSavedGame() {
-    state.currentGame.isRunning = true;
-    refresh();
-  }
-
-  void deleteSavedGame() {
-    state.currentGame.isRunning = false;
-    state.currentGame.isFinished = true;
-    refresh();
-  }
-
-  void startSnake() async {
-    int speed = 500;
-
-    while (!state.currentGame.isFinished && state.currentGame.isRunning) {
-      moveSnake();
-      await Future.delayed(Duration(milliseconds: speed));
-
-      // speed up
-      speed -= 1;
-
-      if (speed == 0) {
-        state.currentGame.isFinished = true;
-        state.currentGame.gameWon = true;
-        refresh();
-      }
-    }
-  }
-
-  void turnLeft() {
-    state.currentGame.turnLeft();
-    refresh();
-  }
-
-  void turnRight() {
-    state.currentGame.turnRight();
-    refresh();
-  }
-
-  void moveSnake([bool enlarge = false]) {
-    state.currentGame.moveSnake(enlarge);
-    refresh();
-  }
-
-  void increaseScore() {
-    state.currentGame.score++;
-    refresh();
-  }
-
-  void updateAnimationInProgress(bool inProgress) {
-    state.currentGame.animationInProgress = inProgress;
-    refresh();
-  }
-
-  void updateGameIsRunning(bool gameIsRunning) {
-    state.currentGame.isRunning = gameIsRunning;
-    refresh();
-  }
-
-  void updateGameIsStarted(bool gameIsStarted) {
-    state.currentGame.isStarted = gameIsStarted;
-    refresh();
-  }
-
-  void updateGameIsFinished(bool gameIsFinished) {
-    state.currentGame.isFinished = gameIsFinished;
-    refresh();
-  }
-
-  void updateGameWon(bool gameWon) {
-    state.currentGame.gameWon = gameWon;
-    refresh();
-  }
-
-  @override
-  GameState? fromJson(Map<String, dynamic> json) {
-    final Game currentGame = json['currentGame'] as Game;
-
-    return GameState(
-      currentGame: currentGame,
-    );
-  }
-
-  @override
-  Map<String, dynamic>? toJson(GameState state) {
-    return <String, dynamic>{
-      'currentGame': state.currentGame,
-    };
-  }
-}
diff --git a/lib/cubit/game_state.dart b/lib/cubit/game_state.dart
deleted file mode 100644
index 00e211668c3269255926939324355792abd61c41..0000000000000000000000000000000000000000
--- a/lib/cubit/game_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'game_cubit.dart';
-
-@immutable
-class GameState extends Equatable {
-  const GameState({
-    required this.currentGame,
-  });
-
-  final Game currentGame;
-
-  @override
-  List<dynamic> get props => <dynamic>[
-        currentGame,
-      ];
-}
diff --git a/lib/cubit/nav_cubit.dart b/lib/cubit/nav_cubit.dart
deleted file mode 100644
index 3e8f08d7d1fe82177099a21c7f279379dd2574d1..0000000000000000000000000000000000000000
--- a/lib/cubit/nav_cubit.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/config/menu.dart';
-
-class NavCubit extends HydratedCubit<int> {
-  NavCubit() : super(0);
-
-  void updateIndex(int index) {
-    if (Menu.isIndexAllowed(index)) {
-      emit(index);
-    } else {
-      goToGamePage();
-    }
-  }
-
-  void goToGamePage() {
-    emit(Menu.indexGame);
-  }
-
-  void goToSettingsPage() {
-    emit(Menu.indexSettings);
-  }
-
-  void goToAboutPage() {
-    emit(Menu.indexAbout);
-  }
-
-  @override
-  int fromJson(Map<String, dynamic> json) {
-    return Menu.indexGame;
-  }
-
-  @override
-  Map<String, dynamic>? toJson(int state) {
-    return <String, int>{'pageIndex': state};
-  }
-}
diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0c61f888620d77485396452e8e644947ed391766
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_cubit.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/config/default_activity_settings.dart';
+import 'package:snake/models/settings/settings_activity.dart';
+
+part 'settings_activity_state.dart';
+
+class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> {
+  ActivitySettingsCubit()
+      : super(ActivitySettingsState(settings: ActivitySettings.createDefault()));
+
+  void setValues({
+    String? difficultyLevel,
+    String? boardSize,
+  }) {
+    emit(
+      ActivitySettingsState(
+        settings: ActivitySettings(
+          difficultyLevel: difficultyLevel ?? state.settings.difficultyLevel,
+          parameterSize: boardSize ?? state.settings.parameterSize,
+        ),
+      ),
+    );
+  }
+
+  String getParameterValue(String code) {
+    switch (code) {
+      case DefaultActivitySettings.parameterCodeDifficultyLevel:
+        return ActivitySettings.getLevelValueFromUnsafe(state.settings.difficultyLevel);
+      case DefaultActivitySettings.parameterCodeBoardSize:
+        return ActivitySettings.getSizeValueFromUnsafe(state.settings.parameterSize);
+    }
+
+    return '';
+  }
+
+  void setParameterValue(String code, String value) {
+    final String difficultyLevel =
+        (code == DefaultActivitySettings.parameterCodeDifficultyLevel)
+            ? value
+            : getParameterValue(DefaultActivitySettings.parameterCodeDifficultyLevel);
+    final String boardSize = (code == DefaultActivitySettings.parameterCodeBoardSize)
+        ? value
+        : getParameterValue(DefaultActivitySettings.parameterCodeBoardSize);
+
+    setValues(
+      difficultyLevel: difficultyLevel,
+      boardSize: boardSize,
+    );
+  }
+
+  @override
+  ActivitySettingsState? fromJson(Map<String, dynamic> json) {
+    final String difficultyLevel =
+        json[DefaultActivitySettings.parameterCodeDifficultyLevel] as String;
+    final String boardSize = json[DefaultActivitySettings.parameterCodeBoardSize] as String;
+
+    return ActivitySettingsState(
+      settings: ActivitySettings(
+        difficultyLevel: difficultyLevel,
+        parameterSize: boardSize,
+      ),
+    );
+  }
+
+  @override
+  Map<String, dynamic>? toJson(ActivitySettingsState state) {
+    return <String, dynamic>{
+      DefaultActivitySettings.parameterCodeDifficultyLevel: state.settings.difficultyLevel,
+      DefaultActivitySettings.parameterCodeBoardSize: state.settings.parameterSize,
+    };
+  }
+}
diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2b2de42011634e81ae9e6f8bcaa1577f239c778b
--- /dev/null
+++ b/lib/cubit/settings/settings_activity_state.dart
@@ -0,0 +1,15 @@
+part of 'settings_activity_cubit.dart';
+
+@immutable
+class ActivitySettingsState extends Equatable {
+  const ActivitySettingsState({
+    required this.settings,
+  });
+
+  final ActivitySettings settings;
+
+  @override
+  List<dynamic> get props => <dynamic>[
+        settings,
+      ];
+}
diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings/settings_global_cubit.dart
similarity index 100%
rename from lib/cubit/settings_global_cubit.dart
rename to lib/cubit/settings/settings_global_cubit.dart
diff --git a/lib/cubit/settings_global_state.dart b/lib/cubit/settings/settings_global_state.dart
similarity index 100%
rename from lib/cubit/settings_global_state.dart
rename to lib/cubit/settings/settings_global_state.dart
diff --git a/lib/cubit/settings_game_cubit.dart b/lib/cubit/settings_game_cubit.dart
deleted file mode 100644
index 949337bd70b87d4b993383d7b3e70f1def4c4a9f..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_cubit.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/config/default_game_settings.dart';
-import 'package:snake/models/settings/settings_game.dart';
-
-part 'settings_game_state.dart';
-
-class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
-  GameSettingsCubit() : super(GameSettingsState(settings: GameSettings.createDefault()));
-
-  void setValues({
-    String? difficultyLevel,
-    String? boardSize,
-  }) {
-    emit(
-      GameSettingsState(
-        settings: GameSettings(
-          difficultyLevel: difficultyLevel ?? state.settings.difficultyLevel,
-          parameterSize: boardSize ?? state.settings.parameterSize,
-        ),
-      ),
-    );
-  }
-
-  String getParameterValue(String code) {
-    switch (code) {
-      case DefaultGameSettings.parameterCodeDifficultyLevel:
-        return GameSettings.getLevelValueFromUnsafe(state.settings.difficultyLevel);
-      case DefaultGameSettings.parameterCodeBoardSize:
-        return GameSettings.getSizeValueFromUnsafe(state.settings.parameterSize);
-    }
-
-    return '';
-  }
-
-  void setParameterValue(String code, String value) {
-    final String difficultyLevel = (code == DefaultGameSettings.parameterCodeDifficultyLevel)
-        ? value
-        : getParameterValue(DefaultGameSettings.parameterCodeDifficultyLevel);
-    final String boardSize = (code == DefaultGameSettings.parameterCodeBoardSize)
-        ? value
-        : getParameterValue(DefaultGameSettings.parameterCodeBoardSize);
-
-    setValues(
-      difficultyLevel: difficultyLevel,
-      boardSize: boardSize,
-    );
-  }
-
-  @override
-  GameSettingsState? fromJson(Map<String, dynamic> json) {
-    final String difficultyLevel =
-        json[DefaultGameSettings.parameterCodeDifficultyLevel] as String;
-    final String boardSize = json[DefaultGameSettings.parameterCodeBoardSize] as String;
-
-    return GameSettingsState(
-      settings: GameSettings(
-        difficultyLevel: difficultyLevel,
-        parameterSize: boardSize,
-      ),
-    );
-  }
-
-  @override
-  Map<String, dynamic>? toJson(GameSettingsState state) {
-    return <String, dynamic>{
-      DefaultGameSettings.parameterCodeDifficultyLevel: state.settings.difficultyLevel,
-      DefaultGameSettings.parameterCodeBoardSize: state.settings.parameterSize,
-    };
-  }
-}
diff --git a/lib/cubit/settings_game_state.dart b/lib/cubit/settings_game_state.dart
deleted file mode 100644
index 5acd85b44ba541e1c5e9c26af1c4be26a385b9ed..0000000000000000000000000000000000000000
--- a/lib/cubit/settings_game_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_game_cubit.dart';
-
-@immutable
-class GameSettingsState extends Equatable {
-  const GameSettingsState({
-    required this.settings,
-  });
-
-  final GameSettings settings;
-
-  @override
-  List<dynamic> get props => <dynamic>[
-        settings,
-      ];
-}
diff --git a/lib/main.dart b/lib/main.dart
index f3265bdc290cbdfe5463bd1c305df9601f5a4bb9..961049862d4a1598557d56a30532f7fac09358a0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,11 +4,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:snake/config/application_config.dart';
 import 'package:snake/config/default_global_settings.dart';
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/cubit/nav_cubit.dart';
-import 'package:snake/cubit/settings_game_cubit.dart';
-import 'package:snake/cubit/settings_global_cubit.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/cubit/settings/settings_activity_cubit.dart';
+import 'package:snake/cubit/settings/settings_global_cubit.dart';
 import 'package:snake/ui/skeleton.dart';
 
 void main() async {
@@ -46,17 +49,30 @@ class MyApp extends StatelessWidget {
 
     return MultiBlocProvider(
       providers: [
-        BlocProvider<NavCubit>(create: (context) => NavCubit()),
+        // default providers
+        BlocProvider<NavCubitPage>(
+          create: (context) => NavCubitPage(),
+        ),
+        BlocProvider<NavCubitScreen>(
+          create: (context) => NavCubitScreen(),
+        ),
         BlocProvider<ApplicationThemeModeCubit>(
-            create: (context) => ApplicationThemeModeCubit()),
-        BlocProvider<GameCubit>(create: (context) => GameCubit()),
-        BlocProvider<GlobalSettingsCubit>(create: (context) => GlobalSettingsCubit()),
-        BlocProvider<GameSettingsCubit>(create: (context) => GameSettingsCubit()),
+          create: (context) => ApplicationThemeModeCubit(),
+        ),
+        BlocProvider<ActivityCubit>(
+          create: (context) => ActivityCubit(),
+        ),
+        BlocProvider<GlobalSettingsCubit>(
+          create: (context) => GlobalSettingsCubit(),
+        ),
+        BlocProvider<ActivitySettingsCubit>(
+          create: (context) => ActivitySettingsCubit(),
+        ),
       ],
       child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
         builder: (BuildContext context, ApplicationThemeModeState state) {
           return MaterialApp(
-            title: 'Snake',
+            title: ApplicationConfig.appTitle,
             home: const SkeletonScreen(),
 
             // Theme stuff
diff --git a/lib/models/game/game.dart b/lib/models/activity/activity.dart
similarity index 79%
rename from lib/models/game/game.dart
rename to lib/models/activity/activity.dart
index f47274765cc983ef83a70ad1100191f4ff74785f..31b9cce3edbb2603faf8518d31c8c9c5bcd10d09 100644
--- a/lib/models/game/game.dart
+++ b/lib/models/activity/activity.dart
@@ -1,16 +1,16 @@
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/models/game/board.dart';
-import 'package:snake/models/game/cell.dart';
-import 'package:snake/models/game/cell_location.dart';
-import 'package:snake/models/game/snake.dart';
-import 'package:snake/models/settings/settings_game.dart';
+import 'package:snake/models/activity/board.dart';
+import 'package:snake/models/activity/cell.dart';
+import 'package:snake/models/activity/cell_location.dart';
+import 'package:snake/models/activity/snake.dart';
+import 'package:snake/models/settings/settings_activity.dart';
 import 'package:snake/models/settings/settings_global.dart';
 
-class Game {
-  Game({
+class Activity {
+  Activity({
     // Settings
-    required this.gameSettings,
+    required this.activitySettings,
     required this.globalSettings,
 
     // State
@@ -30,7 +30,7 @@ class Game {
   });
 
   // Settings
-  final GameSettings gameSettings;
+  final ActivitySettings activitySettings;
   final GlobalSettings globalSettings;
 
   // State
@@ -48,50 +48,51 @@ class Game {
   int score;
   bool gameWon;
 
-  factory Game.createEmpty() {
-    final GameSettings defaultGameSettings = GameSettings.createDefault();
+  factory Activity.createEmpty() {
+    final ActivitySettings defaultActivitySettings = ActivitySettings.createDefault();
     final GlobalSettings defaultGlobalSettings = GlobalSettings.createDefault();
 
-    return Game(
+    return Activity(
       // Settings
-      gameSettings: defaultGameSettings,
+      activitySettings: defaultActivitySettings,
       globalSettings: defaultGlobalSettings,
       // Base data
-      snake: Snake.create(defaultGameSettings),
-      board: Board.createEmpty(defaultGameSettings),
-      boardSize: defaultGameSettings.boardSize,
+      snake: Snake.create(defaultActivitySettings),
+      board: Board.createEmpty(defaultActivitySettings),
+      boardSize: defaultActivitySettings.boardSize,
     );
   }
 
-  factory Game.createNew({
-    GameSettings? gameSettings,
+  factory Activity.createNew({
+    ActivitySettings? activitySettings,
     GlobalSettings? globalSettings,
   }) {
-    final GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
+    final ActivitySettings newActivitySettings =
+        activitySettings ?? ActivitySettings.createDefault();
     final GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
 
-    Game newGame = Game(
+    Activity newActivity = Activity(
       // Settings
-      gameSettings: newGameSettings,
+      activitySettings: newActivitySettings,
       globalSettings: newGlobalSettings,
       // State
       isRunning: true,
       // Base data
-      snake: Snake.create(newGameSettings),
-      board: Board.createEmpty(newGameSettings),
-      boardSize: newGameSettings.boardSize,
+      snake: Snake.create(newActivitySettings),
+      board: Board.createEmpty(newActivitySettings),
+      boardSize: newActivitySettings.boardSize,
       // Game data
       score: 0,
     );
-    newGame.computeBoard();
+    newActivity.computeBoard();
 
-    return newGame;
+    return newActivity;
   }
 
   bool get canBeResumed => isStarted && !isFinished;
 
   void computeBoard() {
-    Board newBoard = Board.createEmpty(gameSettings);
+    Board newBoard = Board.createEmpty(activitySettings);
 
     // Add snake
     for (int i = 0; i < snake.cells.length - 1; i++) {
@@ -225,9 +226,9 @@ class Game {
     printlog('');
     printlog('## Current game dump:');
     printlog('');
-    printlog('$Game:');
+    printlog('$Activity:');
     printlog('  Settings');
-    gameSettings.dump();
+    activitySettings.dump();
     globalSettings.dump();
     printlog('  State');
     printlog('    isRunning: $isRunning');
@@ -244,13 +245,13 @@ class Game {
 
   @override
   String toString() {
-    return '$Game(${toJson()})';
+    return '$Activity(${toJson()})';
   }
 
   Map<String, dynamic>? toJson() {
     return <String, dynamic>{
       // Settings
-      'gameSettings': gameSettings.toJson(),
+      'activitySettings': activitySettings.toJson(),
       'globalSettings': globalSettings.toJson(),
       // State
       'isRunning': isRunning,
diff --git a/lib/models/game/board.dart b/lib/models/activity/board.dart
similarity index 70%
rename from lib/models/game/board.dart
rename to lib/models/activity/board.dart
index c4cfd2dc3269d36fd4e6e797d6f8e69d7c2314e2..910eaf0014ddb86f0a8666681b3adba10cb428c8 100644
--- a/lib/models/game/board.dart
+++ b/lib/models/activity/board.dart
@@ -1,6 +1,6 @@
-import 'package:snake/models/game/cell.dart';
-import 'package:snake/models/game/cell_location.dart';
-import 'package:snake/models/settings/settings_game.dart';
+import 'package:snake/models/activity/cell.dart';
+import 'package:snake/models/activity/cell_location.dart';
+import 'package:snake/models/settings/settings_activity.dart';
 
 typedef BoardCells = List<List<Cell>>;
 
@@ -11,9 +11,9 @@ class Board {
     required this.cells,
   });
 
-  factory Board.createEmpty(GameSettings gameSettings) {
-    final int boardSizeHorizontal = gameSettings.boardSize;
-    final int boardSizeVertical = gameSettings.boardSize;
+  factory Board.createEmpty(ActivitySettings activitySettings) {
+    final int boardSizeHorizontal = activitySettings.boardSize;
+    final int boardSizeVertical = activitySettings.boardSize;
 
     BoardCells cells = [];
     for (int rowIndex = 0; rowIndex < boardSizeVertical; rowIndex++) {
diff --git a/lib/models/game/cell.dart b/lib/models/activity/cell.dart
similarity index 100%
rename from lib/models/game/cell.dart
rename to lib/models/activity/cell.dart
diff --git a/lib/models/game/cell_location.dart b/lib/models/activity/cell_location.dart
similarity index 100%
rename from lib/models/game/cell_location.dart
rename to lib/models/activity/cell_location.dart
diff --git a/lib/models/game/snake.dart b/lib/models/activity/snake.dart
similarity index 73%
rename from lib/models/game/snake.dart
rename to lib/models/activity/snake.dart
index 2f8598ca27b5a21802398fca34042d77f7e70317..169be630a66623c94581cf520ea64cf9dbc10146 100644
--- a/lib/models/game/snake.dart
+++ b/lib/models/activity/snake.dart
@@ -1,5 +1,5 @@
-import 'package:snake/models/game/cell_location.dart';
-import 'package:snake/models/settings/settings_game.dart';
+import 'package:snake/models/activity/cell_location.dart';
+import 'package:snake/models/settings/settings_activity.dart';
 
 typedef SnakeCells = List<CellLocation>;
 
@@ -15,12 +15,12 @@ class Snake {
     required this.direction,
   });
 
-  factory Snake.create(GameSettings gameSettings) {
+  factory Snake.create(ActivitySettings activitySettings) {
     // Default init snake size: 3
 
     // ~ center cell:
-    final int middleColumn = gameSettings.boardSize ~/ 2;
-    final int middleRow = gameSettings.boardSize ~/ 2;
+    final int middleColumn = activitySettings.boardSize ~/ 2;
+    final int middleRow = activitySettings.boardSize ~/ 2;
 
     SnakeCells cells = [
       CellLocation.go(middleRow, middleColumn),
diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart
new file mode 100644
index 0000000000000000000000000000000000000000..464f9e65fa082c1969ce878d7788b82cc42698ab
--- /dev/null
+++ b/lib/models/settings/settings_activity.dart
@@ -0,0 +1,68 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
+import 'package:snake/config/default_activity_settings.dart';
+
+class ActivitySettings {
+  String difficultyLevel;
+  String parameterSize;
+
+  ActivitySettings({
+    required this.difficultyLevel,
+    required this.parameterSize,
+  });
+
+  static String getLevelValueFromUnsafe(String level) {
+    if (DefaultActivitySettings.allowedDifficultyLevelValues.contains(level)) {
+      return level;
+    }
+
+    return DefaultActivitySettings.defaultDifficultyLevelValue;
+  }
+
+  static String getSizeValueFromUnsafe(String size) {
+    if (DefaultActivitySettings.allowedBoardSizeValues.contains(size)) {
+      return size;
+    }
+
+    return DefaultActivitySettings.defaultBoardSizeValue;
+  }
+
+  factory ActivitySettings.createDefault() {
+    return ActivitySettings(
+      difficultyLevel: DefaultActivitySettings.defaultDifficultyLevelValue,
+      parameterSize: DefaultActivitySettings.defaultBoardSizeValue,
+    );
+  }
+
+  int getBoardSizeFromParameter(String parameterSize) {
+    const Map<String, int> values = {
+      DefaultActivitySettings.boardSizeValueSmall: 12,
+      DefaultActivitySettings.boardSizeValueMedium: 20,
+      DefaultActivitySettings.boardSizeValueLarge: 30,
+      DefaultActivitySettings.boardSizeValueExtra: 40,
+    };
+    return values[parameterSize] ??
+        getBoardSizeFromParameter(DefaultActivitySettings.defaultBoardSizeValue);
+  }
+
+  int get boardSize => getBoardSizeFromParameter(parameterSize);
+
+  void dump() {
+    printlog('$ActivitySettings:');
+    printlog('  ${DefaultActivitySettings.parameterCodeDifficultyLevel}: $difficultyLevel');
+    printlog('  ${DefaultActivitySettings.parameterCodeBoardSize}: $parameterSize');
+    printlog('');
+  }
+
+  @override
+  String toString() {
+    return '$ActivitySettings(${toJson()})';
+  }
+
+  Map<String, dynamic>? toJson() {
+    return <String, dynamic>{
+      DefaultActivitySettings.parameterCodeDifficultyLevel: difficultyLevel,
+      DefaultActivitySettings.parameterCodeBoardSize: parameterSize,
+    };
+  }
+}
diff --git a/lib/models/settings/settings_game.dart b/lib/models/settings/settings_game.dart
deleted file mode 100644
index 81a35ce040276da4351ee0c73026cddb8563df86..0000000000000000000000000000000000000000
--- a/lib/models/settings/settings_game.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/config/default_game_settings.dart';
-
-class GameSettings {
-  String difficultyLevel;
-  String parameterSize;
-
-  GameSettings({
-    required this.difficultyLevel,
-    required this.parameterSize,
-  });
-
-  static String getLevelValueFromUnsafe(String level) {
-    if (DefaultGameSettings.allowedDifficultyLevelValues.contains(level)) {
-      return level;
-    }
-
-    return DefaultGameSettings.defaultDifficultyLevelValue;
-  }
-
-  static String getSizeValueFromUnsafe(String size) {
-    if (DefaultGameSettings.allowedBoardSizeValues.contains(size)) {
-      return size;
-    }
-
-    return DefaultGameSettings.defaultBoardSizeValue;
-  }
-
-  factory GameSettings.createDefault() {
-    return GameSettings(
-      difficultyLevel: DefaultGameSettings.defaultDifficultyLevelValue,
-      parameterSize: DefaultGameSettings.defaultBoardSizeValue,
-    );
-  }
-
-  int getBoardSizeFromParameter(String parameterSize) {
-    const Map<String, int> values = {
-      DefaultGameSettings.boardSizeValueSmall: 12,
-      DefaultGameSettings.boardSizeValueMedium: 20,
-      DefaultGameSettings.boardSizeValueLarge: 30,
-      DefaultGameSettings.boardSizeValueExtra: 40,
-    };
-    return values[parameterSize] ??
-        getBoardSizeFromParameter(DefaultGameSettings.defaultBoardSizeValue);
-  }
-
-  int get boardSize => getBoardSizeFromParameter(parameterSize);
-
-  void dump() {
-    printlog('$GameSettings:');
-    printlog('  ${DefaultGameSettings.parameterCodeDifficultyLevel}: $difficultyLevel');
-    printlog('  ${DefaultGameSettings.parameterCodeBoardSize}: $parameterSize');
-    printlog('');
-  }
-
-  @override
-  String toString() {
-    return '$GameSettings(${toJson()})';
-  }
-
-  Map<String, dynamic>? toJson() {
-    return <String, dynamic>{
-      DefaultGameSettings.parameterCodeDifficultyLevel: difficultyLevel,
-      DefaultGameSettings.parameterCodeBoardSize: parameterSize,
-    };
-  }
-}
diff --git a/lib/ui/game/game_bottom.dart b/lib/ui/game/game_bottom.dart
index 4c1f5f3be598c1e57948f7eac32160df621ef402..f996ec35fe6efbb4c552b9ab3bb5885da8660d74 100644
--- a/lib/ui/game/game_bottom.dart
+++ b/lib/ui/game/game_bottom.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/models/game/game.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/models/activity/activity.dart';
 import 'package:snake/ui/widgets/game/controller_bar.dart';
 
 class GameBottomWidget extends StatelessWidget {
@@ -10,11 +10,11 @@ class GameBottomWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
-        return !currentGame.isFinished ? const ControllerBar() : const SizedBox.shrink();
+        return !currentActivity.isFinished ? const ControllerBar() : const SizedBox.shrink();
       },
     );
   }
diff --git a/lib/ui/game/game_end.dart b/lib/ui/game/game_end.dart
index 3570e2d937fbb3ff70deeb730815efd0d675151a..261ff2b74b2c6c3f9a3aca0dec5fa99d9276c940 100644
--- a/lib/ui/game/game_end.dart
+++ b/lib/ui/game/game_end.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/models/game/game.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/models/activity/activity.dart';
 import 'package:snake/ui/widgets/actions/button_game_quit.dart';
 
 class GameEndWidget extends StatelessWidget {
@@ -10,13 +10,13 @@ class GameEndWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
         final Image decorationImage = Image(
           image: AssetImage(
-              currentGame.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
+              currentActivity.gameWon ? 'assets/ui/game_win.png' : 'assets/ui/game_fail.png'),
           fit: BoxFit.fill,
         );
 
@@ -34,7 +34,7 @@ class GameEndWidget extends StatelessWidget {
                   ),
                   Column(
                     children: [
-                      currentGame.animationInProgress == true
+                      currentActivity.animationInProgress == true
                           ? decorationImage
                           : const QuitGameButton()
                     ],
diff --git a/lib/ui/layouts/parameters_layout.dart b/lib/ui/layouts/parameters_layout.dart
deleted file mode 100644
index abcda70a8a6ab9cf0e2d384fd909855ae116d9b8..0000000000000000000000000000000000000000
--- a/lib/ui/layouts/parameters_layout.dart
+++ /dev/null
@@ -1,141 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/config/default_game_settings.dart';
-import 'package:snake/config/default_global_settings.dart';
-import 'package:snake/cubit/settings_game_cubit.dart';
-import 'package:snake/cubit/settings_global_cubit.dart';
-import 'package:snake/ui/parameters/parameter_widget.dart';
-import 'package:snake/ui/widgets/actions/button_delete_saved_game.dart';
-import 'package:snake/ui/widgets/actions/button_game_start_new.dart';
-import 'package:snake/ui/widgets/actions/button_resume_saved_game.dart';
-
-class ParametersLayout extends StatelessWidget {
-  const ParametersLayout({super.key, required this.canResume});
-
-  final bool canResume;
-
-  final double separatorHeight = 8.0;
-
-  @override
-  Widget build(BuildContext context) {
-    final List<Widget> lines = [];
-
-    // Game settings
-    for (String code in DefaultGameSettings.availableParameters) {
-      lines.add(Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: buildParametersLine(
-          code: code,
-          isGlobal: false,
-        ),
-      ));
-
-      lines.add(SizedBox(height: separatorHeight));
-    }
-
-    lines.add(Expanded(
-      child: SizedBox(height: separatorHeight),
-    ));
-
-    if (canResume == false) {
-      // Start new game
-      lines.add(
-        const AspectRatio(
-          aspectRatio: 3,
-          child: StartNewGameButton(),
-        ),
-      );
-    } else {
-      // Resume game
-      lines.add(const AspectRatio(
-        aspectRatio: 3,
-        child: ResumeSavedGameButton(),
-      ));
-      // Delete saved game
-      lines.add(SizedBox.square(
-        dimension: MediaQuery.of(context).size.width / 5,
-        child: const DeleteSavedGameButton(),
-      ));
-    }
-
-    lines.add(SizedBox(height: separatorHeight));
-
-    // Global settings
-    for (String code in DefaultGlobalSettings.availableParameters) {
-      lines.add(Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: buildParametersLine(
-          code: code,
-          isGlobal: true,
-        ),
-      ));
-
-      lines.add(SizedBox(height: separatorHeight));
-    }
-
-    return Column(
-      children: lines,
-    );
-  }
-
-  List<Widget> buildParametersLine({
-    required String code,
-    required bool isGlobal,
-  }) {
-    final List<Widget> parameterButtons = [];
-
-    final List<String> availableValues = isGlobal
-        ? DefaultGlobalSettings.getAvailableValues(code)
-        : DefaultGameSettings.getAvailableValues(code);
-
-    if (availableValues.length <= 1) {
-      return [];
-    }
-
-    for (String value in availableValues) {
-      final Widget parameterButton = BlocBuilder<GameSettingsCubit, GameSettingsState>(
-        builder: (BuildContext context, GameSettingsState gameSettingsState) {
-          return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
-            builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
-              final GameSettingsCubit gameSettingsCubit =
-                  BlocProvider.of<GameSettingsCubit>(context);
-              final GlobalSettingsCubit globalSettingsCubit =
-                  BlocProvider.of<GlobalSettingsCubit>(context);
-
-              final String currentValue = isGlobal
-                  ? globalSettingsCubit.getParameterValue(code)
-                  : gameSettingsCubit.getParameterValue(code);
-
-              final bool isSelected = (value == currentValue);
-
-              final double displayWidth = MediaQuery.of(context).size.width;
-              final double itemWidth = displayWidth / availableValues.length - 4;
-
-              return SizedBox.square(
-                dimension: itemWidth,
-                child: ParameterWidget(
-                  code: code,
-                  value: value,
-                  isSelected: isSelected,
-                  size: itemWidth,
-                  gameSettings: gameSettingsState.settings,
-                  globalSettings: globalSettingsState.settings,
-                  onPressed: () {
-                    isGlobal
-                        ? globalSettingsCubit.setParameterValue(code, value)
-                        : gameSettingsCubit.setParameterValue(code, value);
-                  },
-                ),
-              );
-            },
-          );
-        },
-      );
-
-      parameterButtons.add(parameterButton);
-    }
-
-    return parameterButtons;
-  }
-}
diff --git a/lib/ui/screens/page_game.dart b/lib/ui/screens/page_game.dart
deleted file mode 100644
index 369640c846bfa968efae17a7075a098ad148c68d..0000000000000000000000000000000000000000
--- a/lib/ui/screens/page_game.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/models/game/game.dart';
-import 'package:snake/ui/layouts/game_layout.dart';
-import 'package:snake/ui/layouts/parameters_layout.dart';
-
-class PageGame extends StatelessWidget {
-  const PageGame({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
-
-        return currentGame.isRunning
-            ? const GameLayout()
-            : ParametersLayout(canResume: currentGame.canBeResumed);
-      },
-    );
-  }
-}
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index 21fcfb0ced9d372100ef0023a1838bd372fa7839..fb38e85fdf9657ee277f068891576abbf1228b92 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -1,34 +1,37 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/config/menu.dart';
-import 'package:snake/cubit/nav_cubit.dart';
-import 'package:snake/ui/widgets/global_app_bar.dart';
+import 'package:snake/common/config/activity_page.dart';
+import 'package:snake/common/config/screen.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:snake/common/ui/nav/global_app_bar.dart';
+import 'package:snake/common/ui/nav/bottom_nav_bar.dart';
 
 class SkeletonScreen extends StatelessWidget {
   const SkeletonScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: const GlobalAppBar(),
-      extendBodyBehindAppBar: false,
-      body: Material(
-        color: Theme.of(context).colorScheme.surface,
-        child: BlocBuilder<NavCubit, int>(
-          builder: (BuildContext context, int pageIndex) {
-            return Padding(
+    return BlocBuilder<NavCubitScreen, int>(
+      builder: (BuildContext context, int screenIndex) {
+        return Scaffold(
+          appBar: const GlobalAppBar(),
+          extendBodyBehindAppBar: false,
+          body: Material(
+            color: Theme.of(context).colorScheme.surface,
+            child: Padding(
               padding: const EdgeInsets.only(
                 top: 8,
                 left: 2,
                 right: 2,
               ),
-              child: Menu.getPageWidget(pageIndex),
-            );
-          },
-        ),
-      ),
-      backgroundColor: Theme.of(context).colorScheme.surface,
+              child: Screen.getWidget(screenIndex),
+            ),
+          ),
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          bottomNavigationBar: ActivityPage.displayBottomNavBar ? const BottomNavBar() : null,
+        );
+      },
     );
   }
 }
diff --git a/lib/ui/widgets/actions/button_delete_saved_game.dart b/lib/ui/widgets/actions/button_delete_saved_game.dart
index 82b516a106cd8dd07cd2c5c6da322c9efb2345ce..e285d5065b5a2e0fc11c262aa5ed43833973be62 100644
--- a/lib/ui/widgets/actions/button_delete_saved_game.dart
+++ b/lib/ui/widgets/actions/button_delete_saved_game.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
 
 class DeleteSavedGameButton extends StatelessWidget {
   const DeleteSavedGameButton({super.key});
@@ -11,7 +11,7 @@ class DeleteSavedGameButton extends StatelessWidget {
     return StyledButton(
       color: Colors.grey,
       onPressed: () {
-        BlocProvider.of<GameCubit>(context).deleteSavedGame();
+        BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
       },
       child: const Image(
         image: AssetImage('assets/ui/button_delete_saved_game.png'),
diff --git a/lib/ui/widgets/actions/button_game_quit.dart b/lib/ui/widgets/actions/button_game_quit.dart
index df6f6fd642f0dfb35bdcdd8db3e384e0f019c9aa..d3d92547d7e22fdff76b05ab8cdcd9c4add29285 100644
--- a/lib/ui/widgets/actions/button_game_quit.dart
+++ b/lib/ui/widgets/actions/button_game_quit.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:snake/cubit/activity/activity_cubit.dart';
 
 class QuitGameButton extends StatelessWidget {
   const QuitGameButton({super.key});
@@ -11,7 +13,8 @@ class QuitGameButton extends StatelessWidget {
     return StyledButton(
       color: Colors.red,
       onPressed: () {
-        BlocProvider.of<GameCubit>(context).quitGame();
+        BlocProvider.of<ActivityCubit>(context).quitActivity();
+        BlocProvider.of<NavCubitPage>(context).goToPageHome();
       },
       child: const Image(
         image: AssetImage('assets/ui/button_back.png'),
diff --git a/lib/ui/widgets/actions/button_game_start_new.dart b/lib/ui/widgets/actions/button_game_start_new.dart
index 6dbdfb5087618c03d93be0d452f51a82c2a003b5..c03c038c585aa61686ee910c0a2922e785d997e7 100644
--- a/lib/ui/widgets/actions/button_game_start_new.dart
+++ b/lib/ui/widgets/actions/button_game_start_new.dart
@@ -1,26 +1,29 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/cubit/settings_game_cubit.dart';
-import 'package:snake/cubit/settings_global_cubit.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/cubit/settings/settings_activity_cubit.dart';
+import 'package:snake/cubit/settings/settings_global_cubit.dart';
 
 class StartNewGameButton extends StatelessWidget {
   const StartNewGameButton({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameSettingsCubit, GameSettingsState>(
-      builder: (BuildContext context, GameSettingsState gameSettingsState) {
+    return BlocBuilder<ActivitySettingsCubit, ActivitySettingsState>(
+      builder: (BuildContext context, ActivitySettingsState activitySettingsState) {
         return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
           builder: (BuildContext context, GlobalSettingsState globalSettingsState) {
             return StyledButton(
               color: Colors.blue,
               onPressed: () {
-                BlocProvider.of<GameCubit>(context).startNewGame(
-                  gameSettings: gameSettingsState.settings,
+                BlocProvider.of<ActivityCubit>(context).startNewActivity(
+                  activitySettings: activitySettingsState.settings,
                   globalSettings: globalSettingsState.settings,
                 );
+                BlocProvider.of<NavCubitPage>(context).goToPageGame();
               },
               child: const Image(
                 image: AssetImage('assets/ui/button_start.png'),
diff --git a/lib/ui/widgets/actions/button_resume_saved_game.dart b/lib/ui/widgets/actions/button_resume_saved_game.dart
index a9cb9c078958c075e5029f690886c4228c5dae3e..257a00bfe46d9455f392ac28d6ebc34269e5ee7b 100644
--- a/lib/ui/widgets/actions/button_resume_saved_game.dart
+++ b/lib/ui/widgets/actions/button_resume_saved_game.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
+import 'package:snake/common/cubit/nav/nav_cubit_pages.dart';
+
+import 'package:snake/cubit/activity/activity_cubit.dart';
 
 class ResumeSavedGameButton extends StatelessWidget {
   const ResumeSavedGameButton({super.key});
@@ -11,7 +13,8 @@ class ResumeSavedGameButton extends StatelessWidget {
     return StyledButton(
       color: Colors.blue,
       onPressed: () {
-        BlocProvider.of<GameCubit>(context).resumeSavedGame();
+        BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
+        BlocProvider.of<NavCubitPage>(context).goToPageGame();
       },
       child: const Image(
         image: AssetImage('assets/ui/button_resume_game.png'),
diff --git a/lib/ui/widgets/game/cell.dart b/lib/ui/widgets/game/cell.dart
index c81a87c7a44d09c47fbab07611d7c4b2db272627..e2588da075c8e3b2914027e37058e284cd81f22d 100644
--- a/lib/ui/widgets/game/cell.dart
+++ b/lib/ui/widgets/game/cell.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/models/game/cell.dart';
-import 'package:snake/models/game/game.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/models/activity/cell.dart';
+import 'package:snake/models/activity/activity.dart';
 
 class CellWidget extends StatelessWidget {
   const CellWidget({
@@ -15,11 +15,11 @@ class CellWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
-        final String skin = currentGame.globalSettings.skin;
+        final String skin = currentActivity.globalSettings.skin;
         final String cellValueCode = getCellValueAsset(cellValue);
         final String imageAsset = 'assets/skins/${skin}_$cellValueCode.png';
 
diff --git a/lib/ui/widgets/game/controller_bar.dart b/lib/ui/widgets/game/controller_bar.dart
index 6bcb7d5a15707e637bc01253bf85af12730336a9..640d61a1766336d5158b9f93611c3f7c68a1df8f 100644
--- a/lib/ui/widgets/game/controller_bar.dart
+++ b/lib/ui/widgets/game/controller_bar.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
 
 class ControllerBar extends StatelessWidget {
   const ControllerBar({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
         return Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           crossAxisAlignment: CrossAxisAlignment.center,
@@ -17,21 +17,21 @@ class ControllerBar extends StatelessWidget {
             StyledButton(
               color: Colors.orange,
               onPressed: () {
-                BlocProvider.of<GameCubit>(context).turnLeft();
+                BlocProvider.of<ActivityCubit>(context).turnLeft();
               },
               child: Text('<'),
             ),
             StyledButton(
               color: Colors.red,
               onPressed: () {
-                BlocProvider.of<GameCubit>(context).moveSnake(true);
+                BlocProvider.of<ActivityCubit>(context).moveSnake(true);
               },
               child: Text('+'),
             ),
             StyledButton(
               color: Colors.orange,
               onPressed: () {
-                BlocProvider.of<GameCubit>(context).turnRight();
+                BlocProvider.of<ActivityCubit>(context).turnRight();
               },
               child: Text('>'),
             ),
diff --git a/lib/ui/widgets/game/game_board.dart b/lib/ui/widgets/game/game_board.dart
index 45f2d59ee9765fe13871c57fa236ac48d4d75cf5..802225e8f3ce31a618f2d48eab980eda59388da2 100644
--- a/lib/ui/widgets/game/game_board.dart
+++ b/lib/ui/widgets/game/game_board.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
-import 'package:snake/models/game/cell_location.dart';
-import 'package:snake/models/game/game.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
+import 'package:snake/models/activity/cell_location.dart';
+import 'package:snake/models/activity/activity.dart';
 import 'package:snake/ui/widgets/game/cell.dart';
 
 class GameBoardWidget extends StatelessWidget {
@@ -11,9 +11,9 @@ class GameBoardWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
-        final Game currentGame = gameState.currentGame;
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
+        final Activity currentActivity = activityState.currentActivity;
 
         final Color borderColor = Theme.of(context).colorScheme.onSurface;
 
@@ -33,15 +33,15 @@ class GameBoardWidget extends StatelessWidget {
               Table(
                 defaultColumnWidth: const IntrinsicColumnWidth(),
                 children: [
-                  for (int row = 0; row < currentGame.boardSize; row++)
+                  for (int row = 0; row < currentActivity.boardSize; row++)
                     TableRow(
                       children: [
-                        for (int col = 0; col < currentGame.boardSize; col++)
+                        for (int col = 0; col < currentActivity.boardSize; col++)
                           Column(
                             children: [
                               CellWidget(
-                                cellValue:
-                                    currentGame.board.getCellValue(CellLocation.go(row, col)),
+                                cellValue: currentActivity.board
+                                    .getCellValue(CellLocation.go(row, col)),
                               )
                             ],
                           ),
diff --git a/lib/ui/widgets/indicators/indicator_score.dart b/lib/ui/widgets/indicators/indicator_score.dart
index 3dd3ea59dc6ee772ab1753aaa9d20dc2fd15ba72..746b8834b830a75635d62cbbada3537c1152289e 100644
--- a/lib/ui/widgets/indicators/indicator_score.dart
+++ b/lib/ui/widgets/indicators/indicator_score.dart
@@ -1,20 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:snake/cubit/game_cubit.dart';
+import 'package:snake/cubit/activity/activity_cubit.dart';
 
 class ScoreIndicator extends StatelessWidget {
   const ScoreIndicator({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<GameCubit, GameState>(
-      builder: (BuildContext context, GameState gameState) {
+    return BlocBuilder<ActivityCubit, ActivityState>(
+      builder: (BuildContext context, ActivityState activityState) {
         const Color baseColor = Color.fromARGB(255, 218, 218, 218);
         final Color outlineColor = baseColor.darken();
 
         return OutlinedText(
-          text: gameState.currentGame.score.toString(),
+          text: activityState.currentActivity.score.toString(),
           fontSize: 70,
           textColor: baseColor,
           outlineColor: outlineColor,
diff --git a/pubspec.lock b/pubspec.lock
index 011ee2e27741f0e29cbc4b4aac803190885ffbae..5f7d30f1d27f049d10d751142b1e10ef2a65d726 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -245,10 +245,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   path_provider_android:
     dependency: transitive
     description:
@@ -442,10 +442,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a"
+      sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.0"
+    version: "5.7.2"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 637b555a025e135646bc4fe9d78e1db46e3aa4cd..47427eb3a54f875e8179eab5befb99bf9a1dc148 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: snake game
 
 publish_to: "none"
 
-version: 0.4.0+19
+version: 0.5.0+20
 
 environment:
   sdk: "^3.0.0"