diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index d5fa5bf0890c1b5dbbf1e7c7c97cf33d8ab47630..e184312df493b7fb21ecca766e019db2719a735e 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -5773,6 +5773,8 @@ MonoBehaviour:
   - Quest02
   - Quest03
   - Quest04
+  TimerTextComp: {fileID: 197920025}
+  QuestTextComp: {fileID: 837300820}
 --- !u!4 &1796129603
 Transform:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Shop.unity b/Assets/Scenes/Shop.unity
index af8e4352ef5f1722394a781c98941776c2b0e113..128938fe58b3228023a31927aa685fee2ce51fda 100644
--- a/Assets/Scenes/Shop.unity
+++ b/Assets/Scenes/Shop.unity
@@ -1917,6 +1917,7 @@ GameObject:
   - component: {fileID: 697161331}
   - component: {fileID: 697161330}
   - component: {fileID: 697161329}
+  - component: {fileID: 697161333}
   m_Layer: 5
   m_Name: ShopCanvas
   m_TagString: Untagged
@@ -2009,6 +2010,20 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!114 &697161333
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 697161327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca490b40010d5634fa5994ed44b472be, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  countdownTime: 30
+  countdownShop: {fileID: 709720794}
 --- !u!1 &703827268
 GameObject:
   m_ObjectHideFlags: 0
@@ -2073,7 +2088,6 @@ GameObject:
   - component: {fileID: 709720792}
   - component: {fileID: 709720795}
   - component: {fileID: 709720794}
-  - component: {fileID: 709720793}
   m_Layer: 5
   m_Name: CountdownText
   m_TagString: Untagged
@@ -2097,23 +2111,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -66, y: -48}
+  m_AnchoredPosition: {x: -58, y: -48}
   m_SizeDelta: {x: 130, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &709720793
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 709720791}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c7b6e7c3c78b01d4eb3cc6223c46fc2f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  countdownTime: 30
-  countdownDisplay: {fileID: 709720794}
 --- !u!114 &709720794
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2147,7 +2147,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 30
+  m_Text: 0
 --- !u!222 &709720795
 CanvasRenderer:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Managers/CountdownManager.cs b/Assets/Scripts/Managers/CountdownManager.cs
index f282d4448b59c2ee02e2f1a9bfd6065d1628fc8e..91f500dc24f1c31c5919e889cae3d3995be9a1b8 100644
--- a/Assets/Scripts/Managers/CountdownManager.cs
+++ b/Assets/Scripts/Managers/CountdownManager.cs
@@ -7,16 +7,12 @@ using Nightmare;
 public class CountdownManager : MonoBehaviour {
 
     public int countdownTime;
-    private int countdown;
     public Text countdownDisplay;
     private bool isRunning = false;
     private Coroutine countdownCoroutine;
-    LevelManager lm;
 
     // Start the countdown coroutine if it's set to start automatically
     void Start() {
-        countdown = countdownTime;
-        lm = FindObjectOfType<LevelManager>();
         if (isRunning) {
             StartCountdown();
         }
@@ -32,16 +28,7 @@ public class CountdownManager : MonoBehaviour {
 
         countdownDisplay.text = "0";
         StopCountdown();
-
-        if (countdown == 10)
-        {
-            LoadMenuScene();
-        } 
-        else
-        {
-            lm.AdvanceLevel();
-        }
-
+        LoadMenuScene();
         ResetCountdown();
     }
 
diff --git a/Assets/Scripts/Managers/LevelManager.cs b/Assets/Scripts/Managers/LevelManager.cs
index 752295a7f4166d3ec48a7fd2b9deaf8594044b6a..b07930dc3083931a2d86b9b26e202a916d91a044 100644
--- a/Assets/Scripts/Managers/LevelManager.cs
+++ b/Assets/Scripts/Managers/LevelManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.UI;
 
 namespace Nightmare
 {
@@ -13,6 +14,8 @@ namespace Nightmare
         private PlayerMovement playerMove;
         private Vector3 playerRespawn;
         private CinematicController cinema;
+        [SerializeField] private Text TimerTextComp;
+        [SerializeField] private Text QuestTextComp;
 
         void OnEnable()
         {
@@ -52,6 +55,22 @@ namespace Nightmare
             if (mode != LoadSceneMode.Additive)
                 return;
 
+            // Optionally, make the text component invisible
+            if (scene.name == "Shop")
+            {
+                TimerTextComp.gameObject.SetActive(false);
+                Debug.Log("Setting " + TimerTextComp.gameObject.name + " to inactive.");
+                QuestTextComp.gameObject.SetActive(false);
+                Debug.Log("Setting " + QuestTextComp.gameObject.name + " to inactive.");
+            } 
+            else
+            {
+                TimerTextComp.gameObject.SetActive(true);
+                Debug.Log("Setting " + TimerTextComp.gameObject.name + " to active.");
+                QuestTextComp.gameObject.SetActive(true);
+                Debug.Log("Setting " + QuestTextComp.gameObject.name + " to active.");
+            }
+
             playerMove.transform.position = playerRespawn;
             SceneManager.SetActiveScene(scene);
 
@@ -60,7 +79,14 @@ namespace Nightmare
             currentScene = scene;
 
             // Play realtime cinematic?
-            cinema.StartCinematic(CinematicController.CinematicType.Realtime);
+            if (scene.name != "Shop")
+            {
+                cinema.StartCinematic(CinematicController.CinematicType.Realtime);
+            }
+            else
+            {
+                cinema.StartCinematic(CinematicController.CinematicType.PreRendered);
+            }
         }
 
         private void DisableOldScene()