diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f378c31309175c16c3d417a42f0a5539af4e87..b4779d76b5a4903cf33c387c40d1496d588a2af1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 ### Removed
 
 ### Fixed
+- Fixed config values of serving not ordered meals
 
 ### Security
 
diff --git a/cooperative_cuisine/configs/environment_config.yaml b/cooperative_cuisine/configs/environment_config.yaml
index 0030701e4d38ba5d3470c2c9bdf05dd0e66cfdff..c8bd892ed7ae9bca35030d51d47549b9f5d906c0 100644
--- a/cooperative_cuisine/configs/environment_config.yaml
+++ b/cooperative_cuisine/configs/environment_config.yaml
@@ -80,7 +80,8 @@ orders:
         b: 45
     sample_on_serving: false
     # Sample the delay for the next order only after a meal was served.
-  serving_not_ordered_meals: true
+
+  serving_not_ordered_meals: null
   # can meals that are not ordered be served / dropped on the serving window
 
 
@@ -91,6 +92,7 @@ player_config:
   restricted_view: False
   view_angle: 70
   view_range: 4  # in grid units, can be "null"
+  movement_stops_interact: false
 
 effect_manager:
   FireManager:
diff --git a/cooperative_cuisine/configs/study/study_config.yaml b/cooperative_cuisine/configs/study/study_config.yaml
index 9943f08c72e78d18060953aa7d8dabed0cd2866a..5ca377327c3a7255f3c1824f53b63091bb3c9490 100644
--- a/cooperative_cuisine/configs/study/study_config.yaml
+++ b/cooperative_cuisine/configs/study/study_config.yaml
@@ -14,7 +14,7 @@ levels:
         dirty_plates: 0
         return_dirty: true
       orders:
-        serving_not_ordered_meals: false
+        serving_not_ordered_meals: null
         meals:
           all: false
           list:
@@ -29,7 +29,7 @@ levels:
             func: uniform
             kwargs:
               a: 18
-              b: 28
+              b: 24
 
       hook_callbacks:
         orders:
@@ -58,7 +58,7 @@ levels:
         dirty_plates: 0
         return_dirty: true
       orders:
-        serving_not_ordered_meals: false
+        serving_not_ordered_meals: null
         meals:
           all: false
           list:
@@ -74,7 +74,7 @@ levels:
             func: uniform
             kwargs:
               a: 18
-              b: 28
+              b: 24
       hook_callbacks:
         orders:
           hooks: [ completed_order ]
@@ -106,7 +106,7 @@ levels:
         dirty_plates: 0
         return_dirty: true
       orders:
-        serving_not_ordered_meals: false
+        serving_not_ordered_meals: null
         meals:
           all: false
           list:
@@ -149,7 +149,7 @@ levels:
         dirty_plates: 0
         return_dirty: true
       orders:
-        serving_not_ordered_meals: false
+        serving_not_ordered_meals: null
         meals:
           all: false
           list:
@@ -160,13 +160,13 @@ levels:
         order_gen_kwargs:
           order_duration_random_func:
             kwargs:
-              a: 50
-              b: 60
+              a: 58
+              b: 64
           sample_on_dur_random_func:
             func: uniform
             kwargs:
-              a: 22
-              b: 24
+              a: 24
+              b: 26
       hook_callbacks:
         orders:
           hooks: [ completed_order ]
@@ -198,7 +198,7 @@ levels:
 #        dirty_plates: 0
 #        return_dirty: true
 #      orders:
-#        serving_not_ordered_meals: false
+#        serving_not_ordered_meals: null
 #        meals:
 #          all: false
 #          list:
diff --git a/cooperative_cuisine/configs/tutorial_env_config.yaml b/cooperative_cuisine/configs/tutorial_env_config.yaml
index 15a9fc6dde4672cb7b0c40b9a875c8f20195ba50..9adb48a0739b08a9f422910b934f4ac566a61b6a 100644
--- a/cooperative_cuisine/configs/tutorial_env_config.yaml
+++ b/cooperative_cuisine/configs/tutorial_env_config.yaml
@@ -75,7 +75,7 @@ orders:
         b: 20
     sample_on_serving: false
     # Sample the delay for the next order only after a meal was served.
-  serving_not_ordered_meals: true
+  serving_not_ordered_meals: null
   # can meals that are not ordered be served / dropped on the serving window
 
 player_config:
@@ -85,6 +85,8 @@ player_config:
   restricted_view: False
   view_angle: 70
   view_range: 4  # in grid units, can be "null"
+  movement_stops_interact: false
+
 
 effect_manager:
   FireManager:
diff --git a/cooperative_cuisine/player.py b/cooperative_cuisine/player.py
index 81226bfceadd3782a207d5f2de3e59c573f5155f..37614737ac9210935a9fb358dd980f766467ceb8 100644
--- a/cooperative_cuisine/player.py
+++ b/cooperative_cuisine/player.py
@@ -44,6 +44,8 @@ class PlayerConfig:
     """Angle of the players view if restricted."""
     view_range: float | None = None
     """Range of the players view if restricted. In grid units."""
+    movement_stops_interact: bool = True
+    """If the player moves, the interaction with the counter stops."""
 
 
 class Player:
@@ -108,7 +110,7 @@ class Player:
         function of the environment"""
         self.current_movement = move_vector
         self.movement_until = move_until
-        if self.interacting:
+        if self.player_config.movement_stops_interact and self.interacting:
             self.perform_interact_stop()
 
     def move_abs(self, new_pos: npt.NDArray[float]):
diff --git a/cooperative_cuisine/pygame_2d_vis/gui.py b/cooperative_cuisine/pygame_2d_vis/gui.py
index 2b38b49e32ed12fbdaa5785bf1b08d90cf4a3537..a7cc171ca2f00207fd5ad481ae2ba67edcea88a9 100644
--- a/cooperative_cuisine/pygame_2d_vis/gui.py
+++ b/cooperative_cuisine/pygame_2d_vis/gui.py
@@ -1089,6 +1089,7 @@ class PyGameGUI:
 
         self.end_screen_elements = [
             final_text_container,
+            self.quit_button
         ]
 
     def show_screen_elements(self, elements: list[pygame_gui.core.UIElement]):