lib/presentation/views/main_menu/create_game/choose_game_view.dart

@@ -35,13 +35,24 @@ class _ChooseGameViewState extends State<ChooseGameView> {
       appBar: AppBar(
         backgroundColor: CustomTheme.backgroundColor,
         scrolledUnderElevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios),
+          onPressed: () {
+            Navigator.of(
+              context,
+            ).pop(selectedGameIndex == -1 ? null : selectedGameIndex);
+          },
+        ),
         title: const Text(
           'Choose Game',
           style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
         ),
         centerTitle: true,
       ),
-      body: Column(
+      body: Container(
+        decoration: CustomTheme.standardBoxDecoration,
+        padding: const EdgeInsets.all(10),
+        child: Column(
           children: [
             CustomSearchBar(
               controller: searchBarController,
@@ -61,10 +72,6 @@ class _ChooseGameViewState extends State<ChooseGameView> {
                       setState(() {
                         selectedGameIndex = index;
                       });
-                    Future.delayed(const Duration(milliseconds: 500), () {
-                      if (!context.mounted) return;
-                      Navigator.of(context).pop(selectedGameIndex);
-                    });
                     },
                   );
                 },
@@ -72,6 +79,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
             ),
           ],
         ),
+      ),
     );
   }
 }

lib/presentation/views/main_menu/create_game/choose_group_view.dart

@@ -33,6 +33,16 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
       appBar: AppBar(
         backgroundColor: CustomTheme.backgroundColor,
         scrolledUnderElevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios),
+          onPressed: () {
+            Navigator.of(context).pop(
+              selectedGroupIndex == -1
+                  ? null
+                  : widget.groups[selectedGroupIndex],
+            );
+          },
+        ),
         title: const Text(
           'Choose Group',
           style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
@@ -46,12 +56,11 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
           return GestureDetector(
             onTap: () {
               setState(() {
+                if (selectedGroupIndex == index) {
+                  selectedGroupIndex = -1;
+                } else {
                   selectedGroupIndex = index;
-              });
+                }
-
-              Future.delayed(const Duration(milliseconds: 500), () {
-                if (!context.mounted) return;
-                Navigator.of(context).pop(widget.groups[index]);
               });
             },
             child: GroupTile(

lib/presentation/views/main_menu/create_game/choose_ruleset_view.dart

@@ -36,6 +36,16 @@ class _ChooseRulesetViewState extends State<ChooseRulesetView> {
         appBar: AppBar(
           backgroundColor: CustomTheme.backgroundColor,
           scrolledUnderElevation: 0,
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios),
+            onPressed: () {
+              Navigator.of(context).pop(
+                selectedRulesetIndex == -1
+                    ? null
+                    : widget.rulesets[selectedRulesetIndex].$1,
+              );
+            },
+          ),
           title: const Text(
             'Choose Ruleset',
             style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
@@ -49,11 +59,11 @@ class _ChooseRulesetViewState extends State<ChooseRulesetView> {
             return TitleDescriptionListTile(
               onPressed: () async {
                 setState(() {
+                  if (selectedRulesetIndex == index) {
+                    selectedRulesetIndex = -1;
+                  } else {
                     selectedRulesetIndex = index;
-                });
+                  }
-                Future.delayed(const Duration(milliseconds: 500), () {
-                  if (!context.mounted) return;
-                  Navigator.of(context).pop(widget.rulesets[index].$1);
                 });
               },
               title: widget.rulesets[index].$2,