Index: binaries/data/mods/public/gui/pregame/mainmenu.xml
===================================================================
--- binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -241,6 +241,24 @@
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
+					<translatableAttribute id="caption">Replays</translatableAttribute>
+					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
+					<action on="Press">
+						closeMenu();
+						Engine.SwitchGuiPage("page_replaymenu.xml", {
+							"replaySelectionData": {
+								"filters": {
+									"singleplayer": "Singleplayer"
+						}}});
+					</action>
+				</object>
+
+				<object
+					type="button"
+					style="StoneButtonFancy"
+					size="0 96 100% 124"
+					tooltip_style="pgToolTip"
+				>
 					<translatableAttribute id="caption">Load Game</translatableAttribute>
 					<translatableAttribute id="tooltip">Click here to load a saved game.</translatableAttribute>
 					<action on="Press">
@@ -248,7 +266,6 @@
 						Engine.PushGuiPage("page_loadgame.xml", { "type": "offline" });
 					</action>
 				</object>
-
 			</object>
 
 			<!-- submenuMultiplayer -->
@@ -292,6 +309,24 @@
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
+					<translatableAttribute id="caption">Replays</translatableAttribute>
+					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
+					<action on="Press">
+						closeMenu();
+						Engine.SwitchGuiPage("page_replaymenu.xml", {
+							"replaySelectionData": {
+								"filters": {
+									"singleplayer": "Multiplayer"
+						}}});
+					</action>
+				</object>
+
+				<object
+					type="button"
+					style="StoneButtonFancy"
+					size="0 96 100% 124"
+					tooltip_style="pgToolTip"
+				>
 					<translatableAttribute id="caption">Game Lobby</translatableAttribute>
 					<translatableAttribute id="tooltip">Launch the multiplayer lobby.</translatableAttribute>
 					<action on="Press">
@@ -306,10 +341,10 @@
 						}
 					</action>
 				</object>
-				</object>
+			</object>
 
-			<!-- submenuToolsAndOptions -->
-			<object name="submenuToolsAndOptions"
+			<!-- submenuOptions -->
+			<object name="submenuOptions"
 				type="image"
 				size="0 4 100%-4 100%-4"
 				tooltip_style="pgToolTip"
@@ -344,36 +379,9 @@
 				</object>
 
 				<object
-					type="button"
-					style="StoneButtonFancy"
-					size="0 64 100% 92"
-					tooltip_style="pgToolTip"
-				>
-					<translatableAttribute id="caption">Replays</translatableAttribute>
-					<translatableAttribute id="tooltip">Playback previous games.</translatableAttribute>
-					<action on="Press">
-						closeMenu();
-						Engine.SwitchGuiPage("page_replaymenu.xml");
-					</action>
-				</object>
-
-				<object
-					style="StoneButtonFancy"
-					type="button"
-					size="0 96 100% 124"
-					tooltip_style="pgToolTip"
-				>
-					<translatableAttribute id="caption">Scenario Editor</translatableAttribute>
-					<translatableAttribute id="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;.</translatableAttribute>
-					<action on="Press">
-						pressedScenarioEditorButton();
-					</action>
-				</object>
-
-				<object
 					style="StoneButtonFancy"
 					type="button"
-					size="0 128 100% 156"
+					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Welcome Screen</translatableAttribute>
@@ -389,7 +397,7 @@
 				<object
 					style="StoneButtonFancy"
 					type="button"
-					size="0 160 100% 188"
+					size="0 96 100% 124"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Mod Selection</translatableAttribute>
@@ -465,7 +473,7 @@
 					<translatableAttribute id="tooltip">Challenge the computer player to a single player match.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
-						openMenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 3);
+						openMenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 4);
 					</action>
 				</object>
 
@@ -480,22 +488,36 @@
 					<translatableAttribute id="tooltip">Fight against one or more human players in a multiplayer game.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
-						openMenu("submenuMultiplayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 3);
+						openMenu("submenuMultiplayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 4);
 					</action>
 				</object>
 
-				<!-- TOOLS AND OPTIONS BUTTON -->
+				<!-- SCENARIO EDITOR BUTTON -->
 				<object
 					style="StoneButtonFancy"
 					type="button"
 					size="4 100 100%-4 128"
 					tooltip_style="pgToolTip"
 				>
-					<translatableAttribute id="caption">Tools &amp; Options</translatableAttribute>
-					<translatableAttribute id="tooltip">Game options and scenario design tools.</translatableAttribute>
+					<translatableAttribute id="caption">Scenario Editor</translatableAttribute>
+					<translatableAttribute id="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;.</translatableAttribute>
+					<action on="Press">
+						pressedScenarioEditorButton();
+					</action>
+				</object>
+
+				<!-- OPTIONS BUTTON -->
+				<object
+					style="StoneButtonFancy"
+					type="button"
+					size="4 132 100%-4 160"
+					tooltip_style="pgToolTip"
+				>
+					<translatableAttribute id="caption">Options</translatableAttribute>
+					<translatableAttribute id="tooltip">Game options.</translatableAttribute>
 					<action on="Press">
 						closeMenu();
-						openMenu("submenuToolsAndOptions", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 6);
+						openMenu("submenuOptions", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 4);
 					</action>
 				</object>
 
@@ -503,7 +525,7 @@
 				<object
 					type="button"
 					style="StoneButtonFancy"
-					size="4 132 100%-4 160"
+					size="4 164 100%-4 192"
 					tooltip_style="pgToolTip"
 				>
 					<translatableAttribute id="caption">Exit</translatableAttribute>
@@ -513,7 +535,7 @@
 			</object>
 
 			<!-- PRE-RELEASE INFO -->
-			<object size="8 100%-400 100%-8 100%-100"
+			<object size="8 100%-390 100%-8 100%-100"
 				type="image"
 				style="TranslucentPanelThinBorder"
 			>
Index: binaries/data/mods/public/gui/replaymenu/replay_filters.js
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_filters.js
+++ binaries/data/mods/public/gui/replaymenu/replay_filters.js
@@ -23,19 +23,19 @@
  */
 function initFilters(filters)
 {
-	Engine.GetGUIObjectByName("compatibilityFilter").checked = !filters || filters.compatibility;
+	Engine.GetGUIObjectByName("compatibilityFilter").checked = !filters || !("compatibility" in filters) || filters.compatibility;
 
 	if (filters && filters.playernames)
 		Engine.GetGUIObjectByName("playersFilter").caption = filters.playernames;
 
-	initDateFilter(filters && filters.date);
-	initMapSizeFilter(filters && filters.mapSize);
-	initMapNameFilter(filters && filters.mapName);
-	initPopCapFilter(filters && filters.popCap);
-	initDurationFilter(filters && filters.duration);
-	initSingleplayerFilter(filters && filters.singleplayer);
-	initVictoryConditionFilter(filters && filters.victoryCondition);
-	initRatedGamesFilter(filters && filters.ratedGames);
+	initDateFilter(filters && filters.date || undefined);
+	initMapSizeFilter(filters && filters.mapSize || undefined);
+	initMapNameFilter(filters && filters.mapName || undefined);
+	initPopCapFilter(filters && filters.popCap || undefined);
+	initDurationFilter(filters && filters.duration || undefined);
+	initSingleplayerFilter(filters && filters.singleplayer || undefined);
+	initVictoryConditionFilter(filters && filters.victoryCondition || undefined);
+	initRatedGamesFilter(filters && filters.ratedGames || undefined);
 }
 
 /**