diff --git a/ui/lib/main.dart b/ui/lib/main.dart
index eb7510c..165f4b9 100644
--- a/ui/lib/main.dart
+++ b/ui/lib/main.dart
@@ -102,13 +102,6 @@ class _MyAppState extends ConsumerState<MyApp> {
                 context: context, state: state, child: const ActivityPage()),
           ),
         ]),
-        StatefulShellBranch(routes: [
-          GoRoute(
-            path: SystemPage.route,
-            pageBuilder: (context, state) => buildPageWithDefaultTransition(
-                context: context, state: state, child: const SystemPage()),
-          )
-        ]),
         StatefulShellBranch(routes: [
           GoRoute(
             path: SystemSettingsPage.route,
@@ -118,6 +111,13 @@ class _MyAppState extends ConsumerState<MyApp> {
                 child: const SystemSettingsPage()),
           ),
         ]),
+        StatefulShellBranch(routes: [
+          GoRoute(
+            path: SystemPage.route,
+            pageBuilder: (context, state) => buildPageWithDefaultTransition(
+                context: context, state: state, child: const SystemPage()),
+          )
+        ]),
       ],
     );
 
@@ -168,10 +168,8 @@ class MainSkeleton extends StatefulWidget {
 }
 
 class _MainSkeletonState extends State<MainSkeleton> {
-
   @override
   Widget build(BuildContext context) {
-
     var padding = isSmallScreen(context) ? 5.0 : 20.0;
     return AdaptiveScaffold(
       appBarBreakpoint: Breakpoints.standard,