diff --git a/src/ezgg_lan_manager/assets/img/games/darts.png b/src/ezgg_lan_manager/assets/img/games/darts.png
new file mode 100644
index 0000000..6ced577
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/darts.png differ
diff --git a/src/ezgg_lan_manager/assets/img/games/dota2.png b/src/ezgg_lan_manager/assets/img/games/dota2.png
new file mode 100644
index 0000000..d49817f
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/dota2.png differ
diff --git a/src/ezgg_lan_manager/assets/img/games/golfit.png b/src/ezgg_lan_manager/assets/img/games/golfit.png
new file mode 100644
index 0000000..35ca95c
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/golfit.png differ
diff --git a/src/ezgg_lan_manager/assets/img/games/jenga.png b/src/ezgg_lan_manager/assets/img/games/jenga.png
new file mode 100644
index 0000000..72646c9
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/jenga.png differ
diff --git a/src/ezgg_lan_manager/assets/img/games/neoee.png b/src/ezgg_lan_manager/assets/img/games/neoee.png
new file mode 100644
index 0000000..573df8b
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/neoee.png differ
diff --git a/src/ezgg_lan_manager/assets/img/games/tetris.png b/src/ezgg_lan_manager/assets/img/games/tetris.png
new file mode 100644
index 0000000..01162b0
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/tetris.png differ
diff --git a/src/ezgg_lan_manager/assets/img/games/wikinger_schach.png b/src/ezgg_lan_manager/assets/img/games/wikinger_schach.png
new file mode 100644
index 0000000..bd0ed4e
Binary files /dev/null and b/src/ezgg_lan_manager/assets/img/games/wikinger_schach.png differ
diff --git a/src/ezgg_lan_manager/pages/ManageTournamentsPage.py b/src/ezgg_lan_manager/pages/ManageTournamentsPage.py
index 7071727..b4dceb4 100644
--- a/src/ezgg_lan_manager/pages/ManageTournamentsPage.py
+++ b/src/ezgg_lan_manager/pages/ManageTournamentsPage.py
@@ -70,9 +70,9 @@ class ManageTournamentsPage(Component):
                     Text(tournament.name, style=TextStyle(fill=self.session.theme.background_color, font_size=0.8), justify="left", margin_right=1.5),
                     Text(f"{weekday_to_display_text(tournament.start_time.weekday())[:2]}.{tournament.start_time.strftime('%H:%M')} Uhr", style=TextStyle(fill=start_time_color, font_size=0.8), justify="left", margin_right=1),
                     Spacer(),
-                    Tooltip(anchor=IconButton("material/play_arrow", min_size=2, margin_right=1, on_press=lambda: self.on_start_pressed(tournament.id)), tip="Starten"),
-                    Tooltip(anchor=IconButton("material/cancel_schedule_send", min_size=2, margin_right=1, on_press=lambda: self.on_cancel_pressed(tournament.id)), tip="Absagen"),
-                    Tooltip(anchor=IconButton("material/person_cancel", min_size=2, margin_right=1, on_press=lambda: self.on_remove_participant_pressed(tournament.id)), tip="Spieler entfernen"),
+                    Tooltip(anchor=IconButton("material/play_arrow", min_size=2, margin_right=0.5, on_press=lambda: self.on_start_pressed(tournament.id)), tip="Starten"),
+                    Tooltip(anchor=IconButton("material/cancel_schedule_send", min_size=2, margin_right=0.5, on_press=lambda: self.on_cancel_pressed(tournament.id)), tip="Absagen"),
+                    Tooltip(anchor=IconButton("material/person_cancel", min_size=2, on_press=lambda: self.on_remove_participant_pressed(tournament.id)), tip="Spieler entfernen"),
                     margin=1
                 )
             )
diff --git a/src/ezgg_lan_manager/pages/TournamentDetailsPage.py b/src/ezgg_lan_manager/pages/TournamentDetailsPage.py
index c04c464..042d907 100644
--- a/src/ezgg_lan_manager/pages/TournamentDetailsPage.py
+++ b/src/ezgg_lan_manager/pages/TournamentDetailsPage.py
@@ -175,7 +175,7 @@ class TournamentDetailsPage(Component):
 
             content = Column(
                 Row(
-                    Image(image=from_root(f"src/ezgg_lan_manager/assets/img/games/{self.tournament.game_title.image_name}")),
+                    Image(image=from_root(f"src/ezgg_lan_manager/assets/img/games/{self.tournament.game_title.image_name}"), margin_right=1),
                     Text(
                         text=self.tournament.name,
                         style=TextStyle(
diff --git a/src/ezgg_lan_manager/services/DatabaseService.py b/src/ezgg_lan_manager/services/DatabaseService.py
index c596968..ccbbfc1 100644
--- a/src/ezgg_lan_manager/services/DatabaseService.py
+++ b/src/ezgg_lan_manager/services/DatabaseService.py
@@ -920,7 +920,7 @@ class DatabaseService:
                             format_=self._parse_tournament_format(row["tournament_format"]),
                             start_time=row["start_time"],
                             status=self._parse_tournament_status(row["tournament_status"]),
-                            participants=[Participant(id_=row["user_id"], participant_type=self._parse_participant_type(row["participant_type"]))],
+                            participants=[Participant(id_=row["user_id"], participant_type=self._parse_participant_type(row["participant_type"]))] if row["user_id"] is not None else [],
                             matches=None,  # ToDo: Implement
                             rounds=[],  # ToDo: Implement
                             max_participants=row["max_participants"]