diff --git a/Assets/Scripts/Windows/ImageWindow.cs b/Assets/Scripts/Windows/ImageWindow.cs
index 4aefd29..f1b0668 100644
--- a/Assets/Scripts/Windows/ImageWindow.cs
+++ b/Assets/Scripts/Windows/ImageWindow.cs
@@ -17,6 +17,9 @@ namespace InterfaceOff
         
         protected override void OnWindowInstantiation()
         {
+            /* Destroys the Window Close button to stop accidental clicking */
+            Destroy(Components.CloseButtonRectTransform.gameObject);
+            
             /* Lets the player know what to do via text */
             Components.InfoText.text = "Rotate";
             
@@ -40,8 +43,8 @@ namespace InterfaceOff
                 Button button = go.GetComponent<Button>();
                 button.onClick.AddListener(() =>
                 {
+                    /* Updates the rotation of the clicked image */
                     RectTransform rect = button.GetComponent<RectTransform>();
-                    
                     if (!(rect.rotation.eulerAngles.z < 45 && rect.rotation.eulerAngles.z > -45))
                     {
                         Vector3 rot = rect.rotation.eulerAngles;
@@ -50,21 +53,20 @@ namespace InterfaceOff
                         rect.rotation = Quaternion.Euler(rot);
                     }
 
+                    /* Stops further rotation if it is the correct orientation */
                     if (rect.rotation.eulerAngles.z < 45 && rect.rotation.eulerAngles.z > -45)
                     {
                         m_TilesRotatedCorrectly++;
                         button.interactable = false;
                     }
+                    
+                    /* Closes the window if they are all finished */
+                    if (m_TilesRotatedCorrectly == 4)
+                    {
+                        DestroyWindow();
+                    }
                 });
             }
         }
-
-        public override void OnWindowCloseButtonClicked()
-        {
-            if (m_TilesRotatedCorrectly == 4)
-            {
-                DestroyWindow();
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Windows/TriviaWindow.cs b/Assets/Scripts/Windows/TriviaWindow.cs
index 0d3c615..2034a72 100644
--- a/Assets/Scripts/Windows/TriviaWindow.cs
+++ b/Assets/Scripts/Windows/TriviaWindow.cs
@@ -46,6 +46,9 @@ namespace InterfaceOff
 
         protected override void OnWindowInstantiation()
         {
+            /* Destroys the Window Close button to stop accidental clicking */
+            Destroy(Components.CloseButtonRectTransform.gameObject);
+            
             /* Fetches a random question and sets it as the title */
             TriviaQuestion question = Trivia.questions[Random.Range(0, Trivia.questions.Length)];
             Components.InfoText.text = question.question;
diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json
index 2144f6d..34712b4 100644
--- a/ProjectSettings/BurstAotSettings_StandaloneWindows.json
+++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json
@@ -1,16 +1,18 @@
 {
   "MonoBehaviour": {
-    "Version": 3,
+    "Version": 5,
     "EnableBurstCompilation": true,
     "EnableOptimisations": true,
     "EnableSafetyChecks": false,
     "EnableDebugInAllBuilds": false,
-    "UsePlatformSDKLinker": false,
+    "DebugDataKind": 0,
+    "EnableArmv9SecurityFeatures": false,
     "CpuMinTargetX32": 0,
     "CpuMaxTargetX32": 0,
     "CpuMinTargetX64": 0,
     "CpuMaxTargetX64": 0,
     "CpuTargetsX32": 6,
-    "CpuTargetsX64": 72
+    "CpuTargetsX64": 72,
+    "OptimizeFor": 0
   }
 }