diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart
index cbaee6d..f20fb4e 100644
--- a/lib/presentation/views/main_menu/create_group_view.dart
+++ b/lib/presentation/views/main_menu/create_group_view.dart
@@ -66,7 +66,9 @@ class _CreateGroupViewState extends State<CreateGroupView> {
             Expanded(
               child: PlayerSelection(
                 onChanged: (value) {
-                  selectedPlayers = [...value];
+                  setState(() {
+                    selectedPlayers = [...value];
+                  });
                 },
               ),
             ),
@@ -75,7 +77,8 @@ class _CreateGroupViewState extends State<CreateGroupView> {
               sizeRelativeToWidth: 0.95,
               buttonType: ButtonType.primary,
               onPressed:
-                  (_groupNameController.text.isEmpty || selectedPlayers.isEmpty)
+                  (_groupNameController.text.isEmpty ||
+                      (selectedPlayers.length < 2))
                   ? null
                   : () async {
                       bool success = await db.groupDao.addGroup(
diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart
index 303ea67..5d52ac8 100644
--- a/lib/presentation/views/main_menu/game_history_view.dart
+++ b/lib/presentation/views/main_menu/game_history_view.dart
@@ -27,19 +27,13 @@ class _GameHistoryViewState extends State<GameHistoryView> {
   late final List<Game> skeletonData = List.filled(
     4,
     Game(
-      name: 'Skeleton Game',
+      name: 'Skeleton Gamename',
       group: Group(
-        name: 'Skeleton Group',
-        members: [
-          Player(name: 'Player 1'),
-          Player(name: 'Player 2'),
-          Player(name: 'Player 3'),
-          Player(name: 'Long Name Player 4'),
-          Player(name: 'Player 5'),
-        ],
+        name: 'Groupname',
+        members: List.generate(5, (index) => Player(name: 'Player')),
       ),
-      winner: Player(name: 'Skeleton Player 1'),
-      players: [Player(name: 'Skeleton Player 6')],
+      winner: Player(name: 'Player'),
+      players: [Player(name: 'Player')],
     ),
   );