diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-1-far-apart.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/1-1-far-apart.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-1-far-apart.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/1-1-far-apart.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-2-pedestrians.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/1-2-pedestrians.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-2-pedestrians.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/1-2-pedestrians.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-3-moving-counters.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/1-3-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-3-moving-counters.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/1-3-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-4-bottleneck.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/1-4-bottleneck.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-4-bottleneck.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/1-4-bottleneck.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-5-circle.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/1-5-circle.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-5-circle.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/1-5-circle.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-6-raising-platforms.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/1-6-raising-platforms.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-6-raising-platforms.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/1-6-raising-platforms.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-1-moving-trucks.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/2-1-moving-trucks.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-1-moving-trucks.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/2-1-moving-trucks.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-2-rats.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/2-2-rats.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-2-rats.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/2-2-rats.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-3-separated-conveyors.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/2-3-separated-conveyors.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-3-separated-conveyors.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/2-3-separated-conveyors.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-4-separated-2.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/2-4-separated-2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-4-separated-2.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/2-4-separated-2.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-1-ice.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/3-1-ice.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-1-ice.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/3-1-ice.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-2-separated-moving-counters.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/3-2-separated-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-2-separated-moving-counters.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/3-2-separated-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-3-moving-trucks-2.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/3-3-moving-trucks-2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-3-moving-trucks-2.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/3-3-moving-trucks-2.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-4-ice-moving-platforms.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/3-4-ice-moving-platforms.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-4-ice-moving-platforms.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/3-4-ice-moving-platforms.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-1-moving-counters.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/4-1-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-1-moving-counters.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/4-1-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-2-dark.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/4-2-dark.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-2-dark.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/4-2-dark.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-3-moving-counters.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/4-3-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-3-moving-counters.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/4-3-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-4-moving-counters-separated.layout b/overcooked_simulator/game_content/layouts_archive/overcooked-1/4-4-moving-counters-separated.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-4-moving-counters-separated.layout
rename to overcooked_simulator/game_content/layouts_archive/overcooked-1/4-4-moving-counters-separated.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/godot_test_layout.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/godot_test_layout.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/godot_test_layout.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/godot_test_layout.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/large.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/large.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/large.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/large.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/large_t.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/large_t.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/large_t.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/large_t.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/rot_test.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/rot_test.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/rot_test.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/rot_test.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/split.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/split.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/split.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/split.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/test1.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/test1.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/test1.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/test1.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/test2.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/test2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/test2.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/test2.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/test3.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/test3.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/test3.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/test3.layout
diff --git a/overcooked_simulator/game_content/layouts/test_layouts/test4.layout b/overcooked_simulator/game_content/layouts_archive/test_layouts/test4.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/test_layouts/test4.layout
rename to overcooked_simulator/game_content/layouts_archive/test_layouts/test4.layout
diff --git a/overcooked_simulator/game_server.py b/overcooked_simulator/game_server.py
index f40c14140f83449265987deceaba7c98425fbd25..21fb0db3c8d743271f968736bcf801d7ff6b08c2 100644
--- a/overcooked_simulator/game_server.py
+++ b/overcooked_simulator/game_server.py
@@ -125,6 +125,7 @@ class EnvironmentHandler:
             item_info=environment_config.item_info_config,
             as_files=False,
             env_name=env_id,
+            seed=environment_config.seed
         )
         player_info = {}
         for player_id in range(environment_config.number_players):
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 7af511240459362ce2cac711559b8cc2e67e0da8..6d43a3bfa61e400e7e5f524c5ad8b7f4f1bd813a 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -151,6 +151,11 @@ class PyGameGUI:
             self.window_width_fullscreen,
             self.window_height_fullscreen,
         ) = pygame.display.get_desktop_sizes()[0]
+
+        if self.window_width_fullscreen >= 3840 and self.window_height_fullscreen >= 2160:
+            self.window_width_fullscreen /= 2
+            self.window_height_fullscreen /= 2
+
         self.window_width_windowed = self.min_width
         self.window_height_windowed = self.min_height
         self.kitchen_width = 1
@@ -796,18 +801,21 @@ class PyGameGUI:
 
         self.tutorial_screen_elements = [
             self.tutorial_image,
+            self.quit_button,
             self.continue_button,
         ]
 
         self.pregame_screen_elements = [
             self.recipe_image,
             self.level_name,
+            self.quit_button,
             self.press_a_image,
             self.continue_button,
         ]
 
         self.game_screen_elements = [
             self.orders_label,
+            self.quit_button,
             self.score_label,
             self.timer_label,
             self.wait_players_label,
@@ -815,6 +823,7 @@ class PyGameGUI:
 
         self.postgame_screen_elements = [
             self.conclusion_label,
+            self.quit_button,
             self.next_game_button,
         ]
 
@@ -828,7 +837,7 @@ class PyGameGUI:
             self.fullscreen_button,
             self.quit_button,
             self.retry_button,
-            self.finish_study_button,
+            self.finisseth_study_button,
             self.finished_button,
         ]
 
@@ -862,7 +871,7 @@ class PyGameGUI:
                     max_height=self.window_height * 0.3,
                     max_width=self.window_width * 0.3,
                 )
-                self.set_window_size()
+                # self.set_window_size()
                 self.game_center = (
                     self.window_width - self.game_width / 2 - 20,
                     self.window_height - self.game_height / 2 - 20,
@@ -1046,7 +1055,7 @@ class PyGameGUI:
             environment_config = file.read()
 
         num_players = 1 if tutorial else self.number_players
-        seed = 161616161616
+        seed = 1234
         creation_json = CreateEnvironmentConfig(
             manager_id=self.manager_id,
             number_players=num_players,
@@ -1510,8 +1519,7 @@ class PyGameGUI:
 
                     # Press key instead of mouse button press
                     if (
-                        event.type in [pygame.JOYBUTTONDOWN, pygame.KEYDOWN]
-                        and event.key == pygame.K_SPACE
+                        event.type == pygame.KEYDOWN and event.key == pygame.K_SPACE or (pygame.JOYBUTTONDOWN and (self.joysticks and self.joysticks[0].get_button(0)))
                     ):
                         match self.menu_state:
                             case MenuStates.Start: