diff --git a/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab b/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab
index fe44658..f0f5f8b 100644
--- a/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab	
+++ b/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab	
@@ -245,7 +245,7 @@ MonoBehaviour:
   m_MinValue: 2
   m_MaxValue: 8
   m_WholeNumbers: 1
-  m_Value: 4
+  m_Value: 3
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -605,7 +605,7 @@ RectTransform:
   - {fileID: 7578302057580157030}
   - {fileID: 9062548758054197003}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -792,7 +792,7 @@ MonoBehaviour:
   m_MinValue: 2
   m_MaxValue: 8
   m_WholeNumbers: 1
-  m_Value: 2
+  m_Value: 3
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2796,7 +2796,7 @@ PrefabInstance:
     - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9,
         type: 3}
       propertyPath: m_Text
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4326,7 +4326,7 @@ PrefabInstance:
     - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9,
         type: 3}
       propertyPath: m_Text
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
diff --git a/Assets/Engine/Runtime/Measurements/Measure.cs b/Assets/Engine/Runtime/Measurements/Measure.cs
index b9d5ad7..e724a92 100644
--- a/Assets/Engine/Runtime/Measurements/Measure.cs
+++ b/Assets/Engine/Runtime/Measurements/Measure.cs
@@ -18,7 +18,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Measurements
         /// </summary>
         public static bool Store { get; set; }
         public static bool PreferLessPlayed => GameControl.Instance.preferLessPlayed.Value;
-        public static int PuzzlesSolved => _currentSession.PuzzlesSolved.Count;
+        public static int PuzzlesSolved { get; private set; }
         
         private static Dictionary<int, PuzzleMeasurement> _runningMeasurements;
         private static Session _currentSession;
@@ -97,6 +97,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Measurements
                 PuzzleStorage.Instance.EndMeasurement(_currentSession, puzzle, measurement);
             }
             _runningMeasurements.Remove(puzzle.Id);
+            PuzzlesSolved++;
             
             Logger.Log($"Solved {puzzle} with measurement {measurement}", LogType.Measuring);
         }
diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity
index ac27b82..5138005 100644
--- a/Assets/Scenes/PuzzleTest.unity
+++ b/Assets/Scenes/PuzzleTest.unity
@@ -1127,11 +1127,21 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2536345795331795879, guid: ecbf9ce952d5f38458b8237a4483c562,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2536345795331795879, guid: ecbf9ce952d5f38458b8237a4483c562,
         type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2536345795331795879, guid: ecbf9ce952d5f38458b8237a4483c562,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2702596707407149509, guid: ecbf9ce952d5f38458b8237a4483c562,
         type: 3}
       propertyPath: m_AnchorMax.x
@@ -1217,6 +1227,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7871291356846442061, guid: ecbf9ce952d5f38458b8237a4483c562,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7871291356846442061, guid: ecbf9ce952d5f38458b8237a4483c562,
         type: 3}
       propertyPath: m_AnchorMax.y
diff --git a/Assets/Station46/Modules/End Terminal/Scripts/EndTerminal.cs b/Assets/Station46/Modules/End Terminal/Scripts/EndTerminal.cs
index 1072a67..48db653 100644
--- a/Assets/Station46/Modules/End Terminal/Scripts/EndTerminal.cs	
+++ b/Assets/Station46/Modules/End Terminal/Scripts/EndTerminal.cs	
@@ -22,7 +22,7 @@ namespace Station46.Modules.End_Terminal.Scripts
                 var currentText = text.text;
                 currentText = value == 1
                     ? currentText.Replace("beacons", "beacon")
-                    : currentText.Replace("beacon", "beacons");
+                    : currentText.Replace("beacon\n", "beacons\n");
                 text.text = value + currentText[currentText.IndexOf(' ')..];
             }
         }
diff --git a/Assets/Station46/Player/Station 46 XR Origin.prefab b/Assets/Station46/Player/Station 46 XR Origin.prefab
index 899d49f..3a9252b 100644
--- a/Assets/Station46/Player/Station 46 XR Origin.prefab	
+++ b/Assets/Station46/Player/Station 46 XR Origin.prefab	
@@ -411,6 +411,11 @@ PrefabInstance:
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4030784069082873397, guid: c84e0198f66a41b4294f6e8e585192a4,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4030784069082873397, guid: c84e0198f66a41b4294f6e8e585192a4,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -421,11 +426,21 @@ PrefabInstance:
       propertyPath: sphereFollow
       value: 
       objectReference: {fileID: 5693385846897636622}
+    - target: {fileID: 8790639548517127135, guid: c84e0198f66a41b4294f6e8e585192a4,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8790639548517127135, guid: c84e0198f66a41b4294f6e8e585192a4,
         type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8790639548517127135, guid: c84e0198f66a41b4294f6e8e585192a4,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9173203979188240829, guid: c84e0198f66a41b4294f6e8e585192a4,
         type: 3}
       propertyPath: m_AnchorMax.x
diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset
index 98eecd0..0aac20a 100644
--- a/Assets/Test Assets/Test Theme.asset	
+++ b/Assets/Test Assets/Test Theme.asset	
@@ -34,3 +34,4 @@ MonoBehaviour:
   puzzleCount: {x: 1, y: 1}
   puzzleTypes:
   - {fileID: 11400000, guid: 010a967ecaf566041a0e12459806bd04, type: 2}
+  - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2}