diff --git a/LiveSplit.WormsWMD.asl b/LiveSplit.WormsWMD.asl
index d4eadb4..ba8f737 100755
--- a/LiveSplit.WormsWMD.asl
+++ b/LiveSplit.WormsWMD.asl
@@ -13,7 +13,6 @@ startup {
     settings.Add("challenge_missions", true, "Challenge Missions");
 
     settings.CurrentDefaultParent = "challenge_missions";
-	
     settings.Add("FE.Header.Challenge01", true, "Jetpack to Work!");
     settings.Add("FE.Header.Challenge02", true, "I'm gonna Mech you Mine");
     settings.Add("FE.Header.Challenge03", true, "Don't be Greedy!");
@@ -24,23 +23,23 @@ startup {
     settings.Add("FE.Header.Challenge08", true, "Mi Pun Chu");
     settings.Add("FE.Header.Challenge09", true, "Tanked Up");
     settings.Add("FE.Header.Challenge10", true, "Ice Spy");
-
-    // Add extra missions to the settings (Edit Layout > Scriptable Autosplitter)
     settings.CurrentDefaultParent = null;
 
+    // Add extra missions to the settings (Edit Layout > Scriptable Autosplitter)
     settings.Add("extra_missions", true, "Extra Missions");
 
+    settings.CurrentDefaultParent = "extra_missions";
     settings.Add("FE.Header.Carentan1", true, "War of the Worms");
     settings.Add("FE.Header.Carentan2", true, "Downfall");
     settings.Add("FE.Header.Carentan3", true, "Château de Gâteau");
     settings.Add("FE.Header.Carentan4", true, "Grieving Private Survivor");
     settings.Add("FE.Header.Carentan5", true, "Final Fury");
-
-    // Add bonus missions to the settings (Edit Layout > Scriptable Autosplitter)
     settings.CurrentDefaultParent = null;
 
+    // Add bonus missions to the settings (Edit Layout > Scriptable Autosplitter)
     settings.Add("bonus_missions", true, "Bonus Missions");
 
+    settings.CurrentDefaultParent = "bonus_missions";
     settings.Add("FE.Header.Bonus01", true, "Cool As Ice");
     settings.Add("FE.Header.Bonus02", true, "Operation Alcatraz");
     settings.Add("FE.Header.Bonus03", true, "Steeple Jack");
@@ -51,22 +50,24 @@ startup {
 }
 
 start {
-    // Check if the selected challenge mission is the first mission and the game is not paused
-    if (current.SelectedChallengeMission.ToString() == "FE.Header.Challenge01" && !current.MenuOrPaused) {
-        print(current.SelectedChallengeMission.ToString());        
-        return settings["FE.Header.Challenge01"];
-    }
+    if (!current.MenuOrPaused) {
+        if (current.SelectedChallengeMission.ToString() == "FE.Header.Challenge01") {
+            // Selected challenge mission is the first mission and the game is not paused
+            print(current.SelectedChallengeMission.ToString());        
+            return settings["FE.Header.Challenge01"];
+        }
 
-    // Check if the selected extra mission is the first mission and the game is not paused
-    if (current.SelectedExtraMission.ToString() == "FE.Header.Carentan1" && !current.MenuOrPaused) {
-        print(current.SelectedExtraMission.ToString());        
-        return settings["FE.Header.Carentan1"];
-    }
+        if (current.SelectedExtraMission.ToString() == "FE.Header.Carentan1") {
+            // Selected extra mission is the first mission and the game is not paused
+            print(current.SelectedExtraMission.ToString());        
+            return settings["FE.Header.Carentan1"];
+        }
 
-    // Check if the selected bonus mission is the first mission and the game is not paused
-    if (current.SelectedBonusMission.ToString() == "FE.Header.Bonus01" && !current.MenuOrPaused) {
-        print(current.SelectedBonusMission.ToString());        
-        return settings["FE.Header.Bonus01"];
+        if (current.SelectedBonusMission.ToString() == "FE.Header.Bonus01") {
+            // Selected bonus mission is the first mission and the game is not paused
+            print(current.SelectedBonusMission.ToString());        
+            return settings["FE.Header.Bonus01"];
+        }
     }
 }