Index: binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/HotkeyButton.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/HotkeyButton.js
@@ -0,0 +1,17 @@
+/**
+ * This class manages the button that allows the player to display the hotkey page.
+ */
+class HotkeyButton
+{
+	constructor()
+	{
+		this.hotkeyButton = Engine.GetGUIObjectByName("hotkeyButton")
+		this.hotkeyButton.onPress = this.onPress.bind(this);
+		this.hotkeyButton.caption = translate("Hotkeys");
+	}
+
+	onPress()
+	{
+		Engine.PushGuiPage("hotkeys/page_hotkeys.xml");
+	}
+}
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/LastSummaryButton.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/LastSummaryButton.js
@@ -0,0 +1,17 @@
+/**
+ * This class manages the button that allows the player to display the replay page.
+ */
+class LastSummaryButton
+{
+	constructor()
+	{
+		this.replayButton = Engine.GetGUIObjectByName("lastSummaryButton")
+		this.replayButton.onPress = this.onPress.bind(this);
+		this.replayButton.caption = translate("Last Summary");
+	}
+
+	onPress()
+	{
+		Engine.PushGuiPage("page_options.xml")
+	}
+}
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/MapBrowserButton.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/MapBrowserButton.js
@@ -0,0 +1,17 @@
+/**
+ * This class manages the button that allows the player to display the map browser page.
+ */
+class MapBrowserButton
+{
+	constructor()
+	{
+		this.mapBrowserButton = Engine.GetGUIObjectByName("mapBrowserButton")
+		this.mapBrowserButton.onPress = this.onPress.bind(this);
+		this.mapBrowserButton.caption = translate("Maps");
+	}
+
+	onPress()
+	{
+		Engine.PushGuiPage("page_mapbrowser.xml");
+	}
+}
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/OptionsButton.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/OptionsButton.js
@@ -0,0 +1,17 @@
+/**
+ * This class manages the button that allows the player to display the options page.
+ */
+class OptionsButton
+{
+	constructor()
+	{
+		this.optionsButton = Engine.GetGUIObjectByName("optionsButton")
+		this.optionsButton.onPress = this.onPress.bind(this);
+		this.optionsButton.caption = translate("Options");
+	}
+
+	onPress()
+	{
+		Engine.PushGuiPage("page_options.xml");
+	}
+}
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/ReplayButton.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Buttons/ReplayButton.js
@@ -0,0 +1,17 @@
+/**
+ * This class manages the button that allows the player to display the replay page.
+ */
+class ReplayButton
+{
+	constructor()
+	{
+		this.replayButton = Engine.GetGUIObjectByName("replayButton")
+		this.replayButton.onPress = this.onPress.bind(this);
+		this.replayButton.caption = translate("Replay");
+	}
+
+	onPress()
+	{
+		Engine.PushGuiPage("page_replaymenu.xml")
+	}
+}
Index: binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.js
@@ -16,10 +16,15 @@
 			"buttons": {
 				"buddyButton": buddyButton,
 				"hostButton": new HostButton(dialog, xmppMessages),
+				"hotkeyButton": new HotkeyButton(),
 				"joinButton": new JoinButton(dialog, gameList),
+				"lastSummaryButton": new LastSummaryButton(),
 				"leaderboardButton": new LeaderboardButton(xmppMessages, leaderboardPage),
+				"mapBrowserButton": new MapBrowserButton(),
+				"optionsButton": new OptionsButton(),
 				"profileButton": new ProfileButton(xmppMessages, profilePage),
-				"quitButton": new QuitButton(dialog, leaderboardPage, profilePage)
+				"quitButton": new QuitButton(dialog, leaderboardPage, profilePage),
+				"replayButton": new ReplayButton()
 			},
 			"panels": {
 				"chatPanel": new ChatPanel(xmppMessages),
@@ -31,7 +36,7 @@
 			},
 			"eventHandlers": {
 				"announcementHandler": new AnnouncementHandler(xmppMessages),
-				"connectionHandler": new ConnectionHandler(xmppMessages),
+				"connectionHandler": new ConnectionHandler(xmppMessages)
 			}
 		};
 
Index: binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/LobbyPage.xml
@@ -16,20 +16,20 @@
 		<object name="lobbyPanels" size="0 40 100% 100%-20">
 
 			<object name="leftPanel" size="20 0 20% 100%+20">
-				<object size="0 0 100% 100%-315">
+				<object size="0 0 100% 100%-335">
 					<include file="gui/lobby/LobbyPage/PlayerList.xml"/>
 				</object>
-				<object size="0 100%-310 100% 100%-104">
+				<object size="0 100%-330 100% 100%-112">
 					<include file="gui/lobby/LobbyPage/ProfilePanel.xml"/>
 				</object>
 				<object size="0 100%-98 100% 100%">
-					<object name="toggleBuddyButton" type="button" style="ModernButtonRed" size="0 0 100% 25"/>
-					<object name="leaderboardButton" type="button" style="ModernButtonRed" size="0 27 100% 52"/>
-					<object name="profileButton" type="button" style="ModernButtonRed" size="0 54 100% 79"/>
+					<object name="toggleBuddyButton" type="button" style="ModernButtonRed" size="0 100%-110 100% 100%-80"/>
+					<object name="leaderboardButton" type="button" style="ModernButtonRed" size="0 100%-80 100% 100%-50"/>
+					<object name="profileButton" type="button" style="ModernButtonRed" size="0 100%-50 100% 100%-20"/>
 				</object>
 			</object>
 
-			<object name="middlePanel" size="20%+5 0 100%-255 100%">
+			<object name="middlePanel" size="20%+5 0 100%-255 100%-30">
 				<object size="0 0 100% 24">
 					<include file="gui/lobby/LobbyPage/GameListFilters.xml"/>
 				</object>
@@ -39,6 +39,11 @@
 				<object size="0 49% 100% 100%">
 					<include file="gui/lobby/LobbyPage/Chat/ChatPanel.xml"/>
 				</object>
+				<object name="hotkeyButton" size="0% 100% 20% 100%+30" type="button" style="ModernButtonRed"/>
+				<object name="lastSummaryButton" size="20% 100% 40% 100%+30" type="button" style="ModernButtonRed"/>
+				<object name="mapBrowserButton" size="40% 100% 60% 100%+30" type="button" style="ModernButtonRed"/>
+				<object name="optionsButton" size="60% 100% 80% 100%+30" type="button" style="ModernButtonRed"/>
+				<object name="replayButton" size="80% 100% 100% 100%+30" type="button" style="ModernButtonRed"/>
 			</object>
 
 			<object name="rightPanel" size="100%-250 0 100%-20 100%">
@@ -48,9 +53,9 @@
 				<object  name="subjectPanel">
 					<include file="gui/lobby/LobbyPage/Subject.xml"/>
 				</object>
-				<object name="joinButton" size="0 100%-79 100% 100%-54" type="button" style="ModernButtonRed"/>
-				<object name="hostButton" size="0 100%-52 100% 100%-27" type="button" style="ModernButtonRed"/>
-				<object name="leaveButton" size="0 100%-25 100% 100%" type="button" style="ModernButtonRed"/>
+				<object name="joinButton" size="0 100%-90 100% 100%-60" type="button" style="ModernButtonRed"/>
+				<object name="hostButton" size="0 100%-60 100% 100%-30" type="button" style="ModernButtonRed"/>
+				<object name="leaveButton" size="0 100%-30 100% 100%" type="button" style="ModernButtonRed"/>
 			</object>
 
 		</object>
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
@@ -158,6 +158,16 @@
 	else
 		deleteReplay();
 }
+
+function closeReplay()
+{
+	if (Engine.HasXmppClient())
+	{
+		Engine.StopXmppClient()
+		Engine.SwitchGuiPage("page_pregame.xml")
+	}
+	return Engine.SwitchGuiPage("page_pregame.xml");
+}
 /**
  * Shows a confirmation dialog and deletes the selected replay from the disk in case.
  */
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
@@ -225,7 +225,7 @@
 			<!-- Main Menu Button -->
 			<object 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">closeReplay();</action>
 			</object>
 
 			<!-- Delete Button -->