Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -23,6 +23,13 @@
  */
 const g_LobbyServer = Engine.ConfigDB_GetValue("user", "lobby.server");
 
+const g_MoreButtons = [
+	{ "text": "Replays", "func": () => Engine.PushGuiPage("page_replaymenu.xml", { "pushedGui": "Lobby" }) },
+	{ "text": "Last Summary", "func": () => lastSummary() },
+	{ "text": "Civilizations", "func": () => Engine.PushGuiPage("page_structree.xml", {}) },
+	{ "text": "Options", "func": () => Engine.PushGuiPage("page_options.xml", { "selectedCategory": 3 }) }
+];
+
 /**
  * Current games will be listed in these colors.
  */
@@ -401,8 +408,30 @@
 	// Get all messages since the login
 	for (let msg of Engine.LobbyGuiPollHistoricMessages())
 		g_NetMessageTypes[msg.type][msg.level](msg);
+	showMoreButtons(false);
+	Engine.GetGUIObjectByName("moreOptionsBarActionHide").onmouseenter = () => showMoreButtons(false);
+	Engine.GetGUIObjectByName("moreOptionsBarActionShow").onmouseenter = () => showMoreButtons(true);
+
+	let size = (1/g_MoreButtons.length)*100;
+
+	for (let i in g_MoreButtons)
+	{
+		let but = Engine.GetGUIObjectByName("moreButtons[" + i + "]");
+		but.hidden = false;
+		but.size = i*size + "%" + (i>0 ? "+3" : "") + " 100%-25 " + ((+i+1)*size) + "%" + (i<g_MoreButtons.length-1 ? "-2" : "") + " 100%";
+		but.caption = g_MoreButtons[i].text;
+		but.onpress = g_MoreButtons[i].func;
+	}
 }
 
+function showMoreButtons(show)
+{
+	Engine.GetGUIObjectByName("moreOptionsBarActionHide").hidden = !show;
+	Engine.GetGUIObjectByName("chatPanel").size = show ? "0 49% 100% 100%-30" : "0 49% 100% 100%"
+	Engine.GetGUIObjectByName("moreButtons").hidden = !show;
+}
+
+
 function updateLobbyColumns()
 {
 	let gameRating = Engine.ConfigDB_GetValue("user", "lobby.columns.gamerating") == "true";
Index: binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -255,15 +255,22 @@
 		</object>
 
 		<object name="chatPanel" size="0 49% 100% 100%" type="image" sprite="ModernDarkBoxGold">
-			<object name="chatText" size="0 0 100% 94%" type="text" style="ChatPanel" font="sans-13"/>
-			<object name="chatInput" size="0 94% 100% 100%" type="input" style="ModernInput" font="sans-13">
+			<object name="chatText" size="0 0 100% 100%-24" type="text" style="ChatPanel" font="sans-13"/>
+			<object name="chatInput" size="0 100%-20 100% 100%" type="input" style="ModernInput" font="sans-13">
 				<action on="Press">submitChatInput();</action>
 				<action on="Tab">
 					autoCompleteNick(this, Engine.GetPlayerList().map(player => player.name));
 				</action>
 			</object>
 		</object>
+		<object name="moreButtons" size="0 100%-30 100% 100%" hidden="true" type="image" z="101" >
+			<repeat count="8">
+				<object name="moreButtons[n]" type="button" style="ModernButtonRed" size="0 100%-25 33%-2 100%" hidden="true" />
+			</repeat>
+		</object>
 	</object>
+	<object name="moreOptionsBarActionHide" type="image" size="0 0 100% 100%-585" z="100" hidden="true" />
+	<object name="moreOptionsBarActionShow" type="image" size="0 100%-20 100% 100%" z="101" />
 
 	<!-- Translucent black background -->
 	<object hidden="true" name="fade" type="image" z="100" sprite="ModernFade"/>
Index: binaries/data/mods/public/gui/options/options.js
===================================================================
--- binaries/data/mods/public/gui/options/options.js
+++ binaries/data/mods/public/gui/options/options.js
@@ -142,7 +142,7 @@
 function init(data, hotloadData)
 {
 	g_HasCallback = hotloadData && hotloadData.callback || data && data.callback;
-	g_SelectedCategory = hotloadData ? hotloadData.selectedCategory : 0;
+	g_SelectedCategory = hotloadData ? hotloadData.selectedCategory : data && data.selectedCategory ? data.selectedCategory : 0;
 
 	g_Options = Engine.ReadJSONFile("gui/options/options.json");
 	translateObjectKeys(g_Options, ["label", "tooltip"]);
Index: binaries/data/mods/public/gui/pregame/mainmenu.js
===================================================================
--- binaries/data/mods/public/gui/pregame/mainmenu.js
+++ binaries/data/mods/public/gui/pregame/mainmenu.js
@@ -18,7 +18,6 @@
 function init(initData, hotloadData)
 {
 	initMusic();
-
 	global.music.setState(global.music.states.MENU);
 
 	// Initialize currentSubmenuType with placeholder to avoid null when switching
Index: binaries/data/mods/public/gui/replaymenu/replay_actions.js
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_actions.js
+++ binaries/data/mods/public/gui/replaymenu/replay_actions.js
@@ -137,6 +137,14 @@
 	loadReplays(selected > -1 ? createReplaySelectionData(g_ReplaysFiltered[selected].directory) : "", true);
 }
 
+function close()
+{
+	if (g_PushedGui)
+		Engine.PopGuiPage();
+	else
+		Engine.SwitchGuiPage("page_pregame.xml")
+}
+
 /**
  * Callback.
  */
Index: binaries/data/mods/public/gui/replaymenu/replay_menu.js
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_menu.js
+++ binaries/data/mods/public/gui/replaymenu/replay_menu.js
@@ -48,6 +48,8 @@
  */
 var g_ReplaysLoaded = false;
 
+var g_PushedGui = false;
+
 /**
  * Initializes globals, loads replays and displays the list.
  */
@@ -69,6 +71,10 @@
 
 	initHotkeyTooltips();
 	displayReplayList();
+
+	g_PushedGui = data && data.pushedGui;
+	if (g_PushedGui)
+		Engine.GetGUIObjectByName("closeButton").caption = g_PushedGui;
 }
 
 /**
Index: binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -235,9 +235,9 @@
 		<object name="bottomPanel" size="25 100%-55 100%-5 100%-25" >
 
 			<!-- Main Menu Button -->
-			<object type="button" style="StoneButton" size="25 0 17%+25 100%">
+			<object name="closeButton" type="button" style="StoneButton" size="25 0 17%+25 100%">
 				<translatableAttribute id="caption">Main Menu</translatableAttribute>
-				<action on="Press">Engine.SwitchGuiPage("page_pregame.xml");</action>
+				<action on="Press">close();</action>
 			</object>
 
 			<!-- Delete Button -->