diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.js b/binaries/data/mods/public/gui/pregame/mainmenu.js
index fd207e073c..25e1647f48 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.js
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.js
@@ -164,9 +164,6 @@ function openMenu(newSubmenu, position, buttonHeight, numButtons)
 
 	// Reveal submenu
 	getGUIObjectByName("submenu").hidden = false;
-
-	// prepare to hide the submenu when the user clicks on the background
-	getGUIObjectByName("submenuScreen").hidden = false;
 }
 
 // Closes the menu and resets position
@@ -184,9 +181,6 @@ function closeMenu()
 
 	// reset main menu panel right border
 	getGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% 100%";
-
-	// hide submenu screen
-	getGUIObjectByName("submenuScreen").hidden = false;
 }
 
 // Sizes right border on main menu panel to match the submenu
@@ -200,18 +194,18 @@ function blendSubmenuIntoMain(topPosition, bottomPosition)
 }
 
 // Reveals submenu
-function openMainMenuSubWindow (windowName)
-{
-	guiUnHide("pgSubWindow");
-	guiUnHide(windowName);
-}
+//function openMainMenuSubWindow (windowName)
+//{
+//	guiUnHide("pgSubWindow");
+//	guiUnHide(windowName);
+//}
 
 // Hides submenu
-function closeMainMenuSubWindow (windowName)
-{
-	guiHide("pgSubWindow");
-	guiHide(windowName);
-}
+//function closeMainMenuSubWindow (windowName)
+//{
+//	guiHide("pgSubWindow");
+//	guiHide(windowName);
+//}
 
 
 
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 02c80bc820..53fea96a0b 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -8,35 +8,34 @@
 
 	<!--
 	==========================================
-	- MAIN MENU - "COMMANDER'S TENT" BACKDROP
+	- MAIN MENU
 	==========================================
 	-->
-
-	<object	type="image" sprite="BackgroundBlack"/>
-
-	<object	name="pg">
-
-		<object	name="backgroundLayer1"
-			type="image"
-			sprite="background-hellenes1-1"
-		/>
-		<object	name="backgroundLayer2"
-			type="image"
-			sprite="background-hellenes1-2"
-		/>
-		<object	name="backgroundLayer3"
-			type="image"
-			sprite="background-hellenes1-3"
-		/>
+	<object	name="mainMenuPage">
 
 		<action on="Tick">
 			onTick();
 		</action>
 
+		<object	name="backgroundLayer1"
+			type="image"
+			sprite="background-hellenes1-1"
+			ghost="true"
+		/>
+		<object	name="backgroundLayer2"
+			type="image"
+			sprite="background-hellenes1-2"
+			ghost="true"
+		/>
+		<object	name="backgroundLayer3"
+			type="image"
+			sprite="background-hellenes1-3"
+			ghost="true"
+		/>
+
 		<!--
 		==========================================
 		- MAIN MENU - STATIC TOOLTIP WINDOW
-		(Put at the top so that it is recognised by those using it.)
 		==========================================
 		-->
 
@@ -45,6 +44,7 @@
 			type="text"
 			hidden="true"
 			size="70% 5% 100% 30%"
+			ghost="true"
 		>tooltipText
 		</object>
 
@@ -130,158 +130,153 @@ Status: $status.
 		</object>
 
 
-                <!--
+		<!--
 		==========================================
 		- SUBMENU
 		==========================================
 		-->
 
-                <!-- submenu screen (hides submenu when clicked -->
-                <object name="submenuScreen"
-                        type="button"
-                        size="0 0 100% 100%"
-                        hidden="true"
-                >
-                        <action on="Press">
-                                closeMenu();
-                        </action>
-                </object>
+		<!-- hide submenu when user clicks on the background -->
+		<object	name="subMenuScreen" type="button">
+			<action on="Press">
+				closeMenu();
+			</action>
+		</object>
 
-                <!-- submenu -->
-                <object name="submenu"
-                        type="image"
-                        style="SubmenuPanel"
-                        size="60 50%-100 300 50%+100"
-                        hidden="true"
-                >
-                        <!-- submenuSinglePlayer -->
-                        <object name="submenuSinglePlayer"
-                                type="image"
-                                size="0 4 100%-4 100%-4"
-                                tooltip_style="pgToolTip"
-                                tooltip="The 0 A.D. Game Manual."
-                                hidden="true"
-                        >
-                                <object name="subMenuSinglePlayerButton"
-                                        type="button"
-                                        style="StoneButtonFancy"
-                                        size="0 0 100% 28"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Click here to start a new single player game."
-                                >
-                                        Matches
-                                        <action on="Press">
-                                                closeMenu();
-                                                Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" });
-                                        </action>
-                                </object>
+		<!-- submenu -->
+		<object name="submenu"
+			type="image"
+			style="SubmenuPanel"
+			size="60 50%-100 300 50%+100"
+			hidden="true"
+		>
+			<!-- submenuSinglePlayer -->
+			<object name="submenuSinglePlayer"
+				type="image"
+				size="0 4 100%-4 100%-4"
+				tooltip_style="pgToolTip"
+				tooltip="The 0 A.D. Game Manual."
+				hidden="true"
+			>
+				<object name="subMenuSinglePlayerButton"
+					type="button"
+					style="StoneButtonFancy"
+					size="0 0 100% 28"
+					tooltip_style="pgToolTip"
+					tooltip="Click here to start a new single player game."
+				>
+					Matches
+					<action on="Press">
+						closeMenu();
+						Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" });
+					</action>
+				</object>
 
-                                <object name="subMenuCampaignButton"
-                                        type="button"
-                                        style="StoneButtonFancy"
-                                        size="0 32 100% 60"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Relive history through historical military campaigns. [NOT YET IMPLEMENTED]"
-                                        enabled="false"
-                                >
-                                        Campaigns
-                                        <action on="Press">
-                                                closeMenu();
-                                                <![CDATA[
-                                                        // Open Campaigns window.
-                                                        // NOT IMPLEMENTED YET
-                                                ]]>
-                                        </action>
-                                </object>
-                        </object>
+				<object name="subMenuCampaignButton"
+					type="button"
+					style="StoneButtonFancy"
+					size="0 32 100% 60"
+					tooltip_style="pgToolTip"
+					tooltip="Relive history through historical military campaigns. [NOT YET IMPLEMENTED]"
+					enabled="false"
+				>
+					Campaigns
+					<action on="Press">
+					closeMenu();
+						<![CDATA[
+							// Open Campaigns window.
+							// NOT IMPLEMENTED YET
+						]]>
+					</action>
+				</object>
+			</object>
 
-                        <!-- submenuMultiplayer -->
-                        <object name="submenuMultiplayer"
-                                      type="image"
-                                      size="0 4 100%-4 100%-4"
-                                      tooltip_style="pgToolTip"
-                                      tooltip="The 0 A.D. Game Manual"
-                                      hidden="true"
-                        >
-                                <object name="subMenuMultiplayerJoinButton"
-                                        type="button"
-                                        style="StoneButtonFancy"
-                                        size="0 0 100% 28"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Joining an existing multiplayer game."
-                                >
-                                        Join Game
-                                        <action on="Press">
-                                                closeMenu();
-                                                // Open Multiplayer connection window with join option.
-                                                Engine.PushGuiPage("page_gamesetup_mp.xml", "join");
-                                        </action>
-                                </object>
+			<!-- submenuMultiplayer -->
+			<object name="submenuMultiplayer"
+				type="image"
+				size="0 4 100%-4 100%-4"
+				tooltip_style="pgToolTip"
+				tooltip="The 0 A.D. Game Manual"
+				hidden="true"
+			>
+				<object name="subMenuMultiplayerJoinButton"
+					type="button"
+					style="StoneButtonFancy"
+					size="0 0 100% 28"
+					tooltip_style="pgToolTip"
+					tooltip="Joining an existing multiplayer game."
+				>
+					Join Game
+					<action on="Press">
+						closeMenu();
+						// Open Multiplayer connection window with join option.
+						Engine.PushGuiPage("page_gamesetup_mp.xml", "join");
+					</action>
+				</object>
 
-                                <object name="subMenuMultiplayerHostButton"
-                                        type="button"
-                                        style="StoneButtonFancy"
-                                        size="0 32 100% 60"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Host a multiplayer game."
-                                >
-                                        Host Game
-                                        <action on="Press">
-                                                closeMenu();
-                                                // Open Multiplayer connection window with host option.
-                                                Engine.PushGuiPage("page_gamesetup_mp.xml", "host");
-                                        </action>
-                                </object>
+				<object name="subMenuMultiplayerHostButton"
+					type="button"
+					style="StoneButtonFancy"
+					size="0 32 100% 60"
+					tooltip_style="pgToolTip"
+					tooltip="Host a multiplayer game."
+				>
+					Host Game
+					<action on="Press">
+						closeMenu();
+						// Open Multiplayer connection window with host option.
+						Engine.PushGuiPage("page_gamesetup_mp.xml", "host");
+					</action>
+				</object>
+			</object>
 
-                        </object>
+			<!-- submenuToolsAndOptions -->
+			<object name="submenuToolsAndOptions"
+				type="image"
+				size="0 4 100%-4 100%-4"
+				tooltip_style="pgToolTip"
+				tooltip="The 0 A.D. Game Manual"
+				hidden="true"
+			>
+				<object name="submenuOptionsButton"
+					style="StoneButtonFancy"
+					type="button"
+					size="0 0 100% 28"
+					tooltip_style="pgToolTip"
+					tooltip="Adjust game settings. [NOT YET IMPLEMENTED]"
+					enabled="false"
+				>
+					Options
+					<action on="Press">
+						closeMenu();
+						<![CDATA[
+							// Open Options window.
+							Engine.PushGuiPage("page_options.xml");
+						]]>
+					</action>
+				</object>
 
-                        <!-- submenuToolsAndOptions -->
-                        <object name="submenuToolsAndOptions"
-                                type="image"
-                                size="0 4 100%-4 100%-4"
-                                tooltip_style="pgToolTip"
-                                tooltip="The 0 A.D. Game Manual"
-                                hidden="true"
-                        >
-                                <object name="submenuOptionsButton"
-                                        style="StoneButtonFancy"
-                                        type="button"
-                                        size="0 0 100% 28"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Adjust game settings. [NOT YET IMPLEMENTED]"
-                                        enabled="false"
-                                >
-                                        Options
-                                        <action on="Press">
-                                                closeMenu();
-                                                <![CDATA[
-                                                        // Open Options window.
-                                                        Engine.PushGuiPage("page_options.xml");
-                                                ]]>
-                                        </action>
-                                </object>
-
-                                <object name="submenuEditorButton"
-                                        style="StoneButtonFancy"
-                                        type="button"
-                                        size="0 32 100% 60"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Open the Atlas Scenario Editor in a new window. You can run this more reliably by starting the game with the command-line argument &quot;-editor&quot;."
-                                >
-                                        Scenario Editor
-                                        <action on="Press">
-                                                closeMenu();
-                                                <![CDATA[
-                                                // Start Atlas
-                                                        if (Engine.AtlasIsAvailable())
-                                                                Engine.RestartInAtlas();
-                                                        else
-                                                                messageBox(400, 200, "The scenario editor is not available or failed to load.", "Error", 2);
-                                                ]]>
-                                        </action>
-                                </object>
-                        </object>
-                </object><!-- end of submenu -->
+				<object name="submenuEditorButton"
+					style="StoneButtonFancy"
+					type="button"
+					size="0 32 100% 60"
+					tooltip_style="pgToolTip"
+					tooltip="Open the Atlas Scenario Editor in a new window. You can run this more reliably by starting the game with the command-line argument &quot;-editor&quot;."
+				>
+					Scenario Editor
+					<action on="Press">
+						closeMenu();
+						<![CDATA[
+							// Start Atlas
+							if (Engine.AtlasIsAvailable())
+							Engine.RestartInAtlas();
+							else
+							messageBox(400, 200, "The scenario editor is not available or failed to load.", "Error", 2);
+						]]>
+					</action>
+				</object>
+			</object>
+		</object><!-- end of submenu -->
 
 
 		<!--
@@ -290,135 +285,135 @@ Status: $status.
 		==========================================
 		-->
 		<object name="mainMenu"
-                        type="image"
+			type="image"
 			style="MainMenuPanel"
 			size="60 -2 300 100%+2"
-                        z="50"
-                >
-                        <!-- These are used to make the right side blend in with the submenu -->
-                        <object	name="MainMenuPanelRightBorderTop"
-                                type="image"
-                                sprite="MainMenuPanelRightBorder"
-                                ghost="true"
-                                size="100%-2 0 100% 100%"
-                        />
-                        <object	name="MainMenuPanelRightBorderBottom"
-                                type="image"
-                                sprite="MainMenuPanelRightBorder"
-                                ghost="true"
-                                size="100%-2 0 100% 100%"
-                        />
+			z="50"
+		>
+			<!-- These are used to make the right side blend in with the submenu -->
+			<object	name="MainMenuPanelRightBorderTop"
+				type="image"
+				sprite="MainMenuPanelRightBorder"
+				ghost="true"
+				size="100%-2 0 100% 100%"
+			/>
+			<object	name="MainMenuPanelRightBorderBottom"
+				type="image"
+				sprite="MainMenuPanelRightBorder"
+				ghost="true"
+				size="100%-2 0 100% 100%"
+			/>
 
-                        <object	name="productLogo"
-                                type="image"
-                                sprite="productLogo"
-                                ghost="true"
-                                size="50%-110 30 50%+110 130"
-                        />
+			<object	name="productLogo"
+				type="image"
+				sprite="productLogo"
+				ghost="true"
+				size="50%-110 30 50%+110 130"
+			/>
 
-                        <object name="mainMenuButtons"
-                                type="image"
-                                size="8 156 100%-8 356"
-                                ghost="false"
-                        >
-                                <!-- LEARN TO PLAY BUTTON -->
+			<object name="mainMenuButtons"
+				type="image"
+				size="8 156 100%-8 356"
+				ghost="false"
+			>
+				<!-- LEARN TO PLAY BUTTON -->
 				<object name="menuLearnToPlayButton"
-                                      type="button"
-                                      style="StoneButtonFancy"
-                                      size="4 4 100%-4 32"
-                                      tooltip_style="pgToolTip"
-                                      tooltip="The 0 A.D. Game Manual"
+					type="button"
+					style="StoneButtonFancy"
+					size="4 4 100%-4 32"
+					tooltip_style="pgToolTip"
+					tooltip="The 0 A.D. Game Manual"
 				>
-                                        Learn To Play
-                                        <action on="Press">
-                                                closeMenu();
-                                                <![CDATA[
-                                                        Engine.PushGuiPage("page_manual.xml", { "page": "intro" });
-                                                ]]>
-                                        </action>
-                               </object>
+					Learn To Play
+					<action on="Press">
+						closeMenu();
+						<![CDATA[
+							Engine.PushGuiPage("page_manual.xml", { "page": "intro" });
+						]]>
+					</action>
+				</object>
 
-                               <!-- SINGLEPLAYER BUTTON -->
-                               <object name="menuSinglePlayerButton"
-                                       style="StoneButtonFancy"
-                                       type="button"
-                                       size="4 36 100%-4 64"
-                                       tooltip_style="pgToolTip"
-                                       tooltip="Challenge the computer player to a single player match."
-                                >
-                                        Single Player
-                                        <action on="Press">
-                                                closeMenu();
-                                                openMenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
-                                        </action>
-                                </object>
+				<!-- SINGLEPLAYER BUTTON -->
+				<object name="menuSinglePlayerButton"
+					style="StoneButtonFancy"
+					type="button"
+					size="4 36 100%-4 64"
+					tooltip_style="pgToolTip"
+					tooltip="Challenge the computer player to a single player match."
+				>
+					Single Player
+					<action on="Press">
+						closeMenu();
+						openMenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
+					</action>
+				</object>
 
-                                <!-- MULTIPLAYER BUTTON -->
-                                <object	name="menuMultiplayerButton"
-                                        style="StoneButtonFancy"
-                                        type="button"
-                                        size="4 68 100%-4 96"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Fight against one or more human players in a multiplayer game."
-                                >
-                                        Multiplayer
-                                        <action on="Press">
-                                                closeMenu();
-                                                openMenu("submenuMultiplayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
-                                        </action>
-                                </object>
+				<!-- MULTIPLAYER BUTTON -->
+				<object	name="menuMultiplayerButton"
+					style="StoneButtonFancy"
+					type="button"
+					size="4 68 100%-4 96"
+					tooltip_style="pgToolTip"
+					tooltip="Fight against one or more human players in a multiplayer game."
+				>
+					Multiplayer
+					<action on="Press">
+						closeMenu();
+						openMenu("submenuMultiplayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
+					</action>
+				</object>
 
-                                <!-- TOOLS AND OPTIONS BUTTON -->
-                                <object name="menuToolsAndOptionsButton"
-                                        style="StoneButtonFancy"
-                                        type="button"
-                                        size="4 100 100%-4 128"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Game options and scenario design tools."
-                                >
-                                        Tools <![CDATA[&]]> Options
-                                        <action on="Press">
-                                                closeMenu();
-                                                openMenu("submenuToolsAndOptions", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
-                                        </action>
-                                </object>
+				<!-- TOOLS AND OPTIONS BUTTON -->
+				<object name="menuToolsAndOptionsButton"
+					style="StoneButtonFancy"
+					type="button"
+					size="4 100 100%-4 128"
+					tooltip_style="pgToolTip"
+					tooltip="Game options and scenario design tools."
+				>
+					Tools <![CDATA[&]]> Options
+					<action on="Press">
+						closeMenu();
+						openMenu("submenuToolsAndOptions", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2);
+					</action>
+				</object>
 
-                                <!-- HISTORY BUTTON -->
-                                <object name="menuHistoryButton"
-                                        style="StoneButtonFancy"
-                                        type="button"
-                                        size="4 132 100%-4 160"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Learn about the six civilizations featured in 0 A.D."
-                                >
-                                        History
-                                        <action on="Press">
-                                                closeMenu();
-                                                <![CDATA[
-                                                        Engine.PushGuiPage("page_civinfo.xml");
-                                                ]]>
-                                        </action>
-                                </object>
+				<!-- HISTORY BUTTON -->
+				<object name="menuHistoryButton"
+					style="StoneButtonFancy"
+					type="button"
+					size="4 132 100%-4 160"
+					tooltip_style="pgToolTip"
+					tooltip="Learn about the six civilizations featured in 0 A.D."
+				>
+					History
+					<action on="Press">
+						closeMenu();
+						<![CDATA[
+							Engine.PushGuiPage("page_civinfo.xml");
+						]]>
+					</action>
+				</object>
 
-                                <!-- EXIT BUTTON -->
-                                <object name="menuExitButton"
-                                        type="button"
-                                        style="StoneButtonFancy"
-                                        size="4 164 100%-4 192"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Exit Game"
-                                >
-                                        Exit
-                                        <action on="Press">
-                                                closeMenu();
-                                                <![CDATA[
-                                                        var btCaptions = ["Yes", "No"];
-                                                        var btCode = [exit, null];
-                                                        messageBox(400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
-                                                ]]>
-                                        </action>
-                                </object>
-                        </object>
+				<!-- EXIT BUTTON -->
+				<object name="menuExitButton"
+					type="button"
+					style="StoneButtonFancy"
+					size="4 164 100%-4 192"
+					tooltip_style="pgToolTip"
+					tooltip="Exit Game"
+				>
+					Exit
+					<action on="Press">
+						closeMenu();
+						<![CDATA[
+							var btCaptions = ["Yes", "No"];
+							var btCode = [exit, null];
+							messageBox(400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
+						]]>
+					</action>
+				</object>
+			</object>
 
 			<!-- PRE-RELEASE INFO -->
 			<object size="8 100%-340 100%-8 100%-100"
@@ -444,8 +439,8 @@ Get involved at: wildfiregames.com/0ad
 				<!-- CONTACT METHODS -->
 				<object type="button"
 					style="StoneButton"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Click to open wildfiregames.com/0ad in your web browser."
+					tooltip_style="pgToolTip"
+					tooltip="Click to open wildfiregames.com/0ad in your web browser."
 					size="8 100%-36 50%-4 100%-8"
 				>
 					Website
@@ -458,8 +453,8 @@ Get involved at: wildfiregames.com/0ad
 
 				<object type="button"
 					style="StoneButton"
-                                        tooltip_style="pgToolTip"
-                                        tooltip="Click to chat in IRC. (#0ad at webchat.quakenet.org)"
+					tooltip_style="pgToolTip"
+					tooltip="Click to chat in IRC. (#0ad at webchat.quakenet.org)"
 					size="50%+4 100%-36 100%-8 100%-8"
 				>
 					IRC
@@ -474,38 +469,37 @@ Get involved at: wildfiregames.com/0ad
 			<!-- LOGO AND BUILD VERSION -->
 			<object
 				size="4 100%-84 100%-4 100%-56"
-                                ghost="true"
+				ghost="true"
 			>
 
 				<!-- COMPANY LOGO -->
 				<object	name="companyLogo"
 					type="image"
 					sprite="companyLogo"
-                                        ghost="true"
-                                        size="50%-16 0 50%+16 32"
+					ghost="true"
+					size="50%-16 0 50%+16 32"
 				/>
 
 				<!-- COMPANY NAME -->
 				<object type="text"
 				        style="MediumTitleText"
-                                        ghost="true"
-                                        size="50%-128 32 50%+128 48"
+					ghost="true"
+					size="50%-128 32 50%+128 48"
 				>WILDFIRE GAMES</object>
 			</object>
 
-	      		<!-- VERSION -->
+			<!-- VERSION -->
 			<object name="versionNumber"
 				type="text"
-			       	style="MediumTitleText"
-			       	ghost="true"
+				style="MediumTitleText"
+				ghost="true"
 				size="50%-128 100%-36 50%+128 100%"
 			>
 				<action on="Load"><![CDATA[
 					this.caption = "Build: " + buildTime(0) + " - " + buildTime(2);
 				]]></action>
 			</object>
-
-                </object>
+		</object>