Index: ps/trunk/binaries/data/mods/public/gui/common/functions_global_object.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/functions_global_object.js	(revision 14771)
+++ ps/trunk/binaries/data/mods/public/gui/common/functions_global_object.js	(revision 14772)
@@ -1,67 +1,74 @@
 /*
 	DESCRIPTION	: Contains global GUI functions, which will later be accessible from every GUI script/file.
 	NOTES		: So far, only the message box-related functions are implemented.
 */
 
 // *******************************************
 // messageBox
 // *******************************************
 // @params:     int mbWidth, int mbHeight, string mbMessage, string mbTitle, int mbMode, arr mbButtonCaptions, function mbBtnCode, var mbCallbackArgs
 // @return:     void
 // @desc:       Displays a new modal message box.
 // *******************************************
 
 
 // We want to pass callback functions for the different buttons in a convenient way.
 // Because passing functions accross compartment boundaries is a pain, we just store them here together with some optional arguments.
 // The messageBox page will return the code of the pressed button and the according function will be called.
 var g_messageBoxBtnFunctions = [];
 var g_messageBoxCallbackArgs = []; 
 
 var g_messageBoxCallbackFunction = function(btnCode)
 {
 	if (btnCode !== undefined && g_messageBoxBtnFunctions[btnCode])
 	{
-		if (g_messageBoxCallbackArgs[btnCode])
-			g_messageBoxBtnFunctions[btnCode](g_messageBoxCallbackArgs[btnCode]);
+		// Cache the variables to make it possible to call a messageBox from a callback function.
+		var callbackFunction = g_messageBoxBtnFunctions[btnCode];
+		var callbackArgs = g_messageBoxCallbackArgs[btnCode]
+		g_messageBoxBtnFunctions  = [];
+		g_messageBoxCallbackArgs = [];
+
+		if (callbackArgs !== undefined)
+			callbackFunction(callbackArgs);
 		else
-			g_messageBoxBtnFunctions[btnCode]();
+			callbackFunction();
+		return;
 	}
 
 	g_messageBoxBtnFunctions  = [];
 	g_messageBoxCallbackArgs = [];
 }
 
 function messageBox (mbWidth, mbHeight, mbMessage, mbTitle, mbMode, mbButtonCaptions, mbBtnCode, mbCallbackArgs)
 {
 	if (g_messageBoxBtnFunctions && g_messageBoxBtnFunctions.length != 0)
 	{
 		warn("A messagebox was called when a previous callback function is still set, aborting!");
 		return;	
 	}
 
 	g_messageBoxBtnFunctions = mbBtnCode;
 	if (mbCallbackArgs)
 		g_messageBoxCallbackArgs = mbCallbackArgs;
 
 	var initData = {
 		width: mbWidth,
 		height: mbHeight,
 		message: mbMessage,
 		title: mbTitle,
 		mode: mbMode,
 		buttonCaptions: mbButtonCaptions,
 	}
 	if (mbBtnCode)
 		initData.callback = "g_messageBoxCallbackFunction";
 		
 
 	Engine.PushGuiPage("page_msgbox.xml", initData);
 }
 
 // ====================================================================
 
 function updateFPS()
 {	
 	Engine.GetGUIObjectByName("fpsCounter").caption = "FPS: " + Engine.GetFPS();
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 14771)
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 14772)
@@ -1,598 +1,618 @@
 const PAUSE = "Pause";
 const RESUME = "Resume";
 
 /*
  * MENU POSITION CONSTANTS
 */
 
 // Menu / panel border size
 const MARGIN = 4;
 
 // Includes the main menu button
 const NUM_BUTTONS = 8;
 
 // Regular menu buttons
 const BUTTON_HEIGHT = 32;
 
 // The position where the bottom of the menu will end up (currently 228)
 const END_MENU_POSITION = (BUTTON_HEIGHT * NUM_BUTTONS) + MARGIN;
 
 // Menu starting position: bottom
 const MENU_BOTTOM = 0;
 
 // Menu starting position: top
 const MENU_TOP = MENU_BOTTOM - END_MENU_POSITION;
 
 // Menu starting position: overall
 const INITIAL_MENU_POSITION = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM;
 
 // Number of pixels per millisecond to move
 const MENU_SPEED = 1.2;
 
 // Trade menu: available resources and step for probability changes
 const RESOURCES = ["food", "wood", "stone", "metal"];
 const STEP = 5;
 
 var isMenuOpen = false;
 var menu;
 
 var isDiplomacyOpen = false;
 var isTradeOpen = false;
 
 // Redefined every time someone makes a tribute (so we can save some data in a closure). Called in input.js handleInputBeforeGui.
 var flushTributing = function() {};
 
 // Ignore size defined in XML and set the actual menu size here
 function initMenuPosition()
 {
 	menu = Engine.GetGUIObjectByName("menu");
 	menu.size = INITIAL_MENU_POSITION;
 }
 
 
 // =============================================================================
 // Overall Menu
 // =============================================================================
 //
 // Slide menu
 function updateMenuPosition(dt)
 {
 	if (isMenuOpen)
 	{
 		var maxOffset = END_MENU_POSITION - menu.size.bottom;
 		if (maxOffset > 0)
 		{
 			var offset = Math.min(MENU_SPEED * dt, maxOffset);
 			var size = menu.size;
 			size.top += offset;
 			size.bottom += offset;
 			menu.size = size;
 		}
 	}
 	else
 	{
 		var maxOffset = menu.size.top - MENU_TOP;
 		if (maxOffset > 0)
 		{
 			var offset = Math.min(MENU_SPEED * dt, maxOffset);
 			var size = menu.size;
 			size.top -= offset;
 			size.bottom -= offset;
 			menu.size = size;
 		}
 	}
 }
 
 // Opens the menu by revealing the screen which contains the menu
 function openMenu()
 {
 	isMenuOpen = true;
 }
 
 // Closes the menu and resets position
 function closeMenu()
 {
 	isMenuOpen = false;
 }
 
 function toggleMenu()
 {
 	if (isMenuOpen == true)
 		closeMenu();
 	else
 		openMenu();
 }
 
 // Menu buttons
 // =============================================================================
 function settingsMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openSettings();
 }
 
 function chatMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openChat();
 }
 
 function diplomacyMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openDiplomacy();
 }
 
 function pauseMenuButton()
 {
 	togglePause();
 }
 
 function resignMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	var btCaptions = ["Yes", "No"];
 	var btCode = [resignGame, resumeGame];
 	messageBox(400, 200, "Are you sure you want to resign?", "Confirmation", 0, btCaptions, btCode);
 }
 
 function exitMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
-	var btCaptions = ["Yes", "No"];
-	var btCode = [leaveGame, resumeGame];
-	messageBox(400, 200, "Are you sure you want to quit?", "Confirmation", 0, btCaptions, btCode);
+	if (g_IsNetworked && g_IsController)
+	{
+		var btCode = [leaveGame, resumeGame];
+		var message = "Are you sure you want to quit? Leaving will disconnect all other players.";
+	}
+	else if (g_IsNetworked && !g_GameEnded)
+	{
+		var btCode = [networkReturnQuestion, resumeGame];
+		var message = "Are you sure you want to quit?";
+	}
+	else
+	{
+		var btCode = [leaveGame, resumeGame];
+		var message = "Are you sure you want to quit?";
+	}
+	messageBox(400, 200, message, "Confirmation", 0, ["Yes", "No"], btCode);
 }
 
+function networkReturnQuestion()
+{
+	var btCaptions = ["I resign", "I will return"];
+	var btCode = [leaveGame, leaveGame];
+	var btArgs = [false, true];
+	messageBox(400, 200, "Do you want to resign or will you return soon?", "Confirmation", 0, btCaptions, btCode, btArgs);
+}
 
 function openDeleteDialog(selection)
 {
 	closeMenu();
 	closeOpenDialogs();
 
 	var deleteSelectedEntities = function (selectionArg)
 	{
 		Engine.PostNetworkCommand({"type": "delete-entities", "entities": selectionArg});
 	};
 
 	var btCaptions = ["Yes", "No"];
 	var btCode = [deleteSelectedEntities, resumeGame];
 
 	messageBox(400, 200, "Destroy everything currently selected?", "Delete", 0, btCaptions, btCode, [selection, null]);
 }
 
 // Menu functions
 // =============================================================================
 
 function openSave()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	var savedGameData = getSavedGameData();
 	Engine.PushGuiPage("page_savegame.xml", {"savedGameData": savedGameData, "callback": "resumeGame"});
 }
 
 function openSettings()
 {
 	Engine.GetGUIObjectByName("settingsDialogPanel").hidden = false;
 	pauseGame();
 }
 
 function closeSettings(resume)
 {
 	Engine.GetGUIObjectByName("settingsDialogPanel").hidden = true;
 	if (resume)
 		resumeGame();
 }
 
 function openChat()
 {
 	Engine.GetGUIObjectByName("chatInput").focus(); // Grant focus to the input area
 	Engine.GetGUIObjectByName("chatDialogPanel").hidden = false;
 }
 
 function closeChat()
 {
 	Engine.GetGUIObjectByName("chatInput").caption = ""; // Clear chat input
 	Engine.GetGUIObjectByName("chatInput").blur(); // Remove focus
 	Engine.GetGUIObjectByName("chatDialogPanel").hidden = true;
 }
 
 function toggleChatWindow(teamChat)
 {
 	closeSettings();
 
 	var chatWindow = Engine.GetGUIObjectByName("chatDialogPanel");
 	var chatInput = Engine.GetGUIObjectByName("chatInput");
 
 	if (chatWindow.hidden)
 		chatInput.focus(); // Grant focus to the input area
 	else
 	{
 		if (chatInput.caption.length)
 		{
 			submitChatInput();
 			return;
 		}
 		chatInput.caption = ""; // Clear chat input
 	}
 
 	Engine.GetGUIObjectByName("toggleTeamChat").checked = teamChat;
 	chatWindow.hidden = !chatWindow.hidden;
 }
 
 function setDiplomacy(data)
 {
 	Engine.PostNetworkCommand({"type": "diplomacy", "to": data.to, "player": data.player});
 }
 
 function tributeResource(data)
 {
 	Engine.PostNetworkCommand({"type": "tribute", "player": data.player, "amounts":  data.amounts});
 }
 
 function openDiplomacy()
 {
 	if (isTradeOpen)
 		closeTrade();
 	isDiplomacyOpen = true;
 
 	var we = Engine.GetPlayerID();
 	var players = getPlayerData(g_PlayerAssignments);
 
 	// Get offset for one line
 	var onesize = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size;
 	var rowsize = onesize.bottom - onesize.top;
 
 	// We don't include gaia
 	for (var i = 1; i < players.length; i++)
 	{
 		// Apply offset
 		var row = Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]");
 		var size = row.size;
 		size.top = rowsize*(i-1);
 		size.bottom = rowsize*i;
 		row.size = size;
 
 		// Set background colour
 		var playerColor = players[i].color.r+" "+players[i].color.g+" "+players[i].color.b;
 		row.sprite = "colour: "+playerColor + " 32";
 
 		Engine.GetGUIObjectByName("diplomacyPlayerName["+(i-1)+"]").caption = "[color=\"" + playerColor + "\"]" + players[i].name + "[/color]";
 		Engine.GetGUIObjectByName("diplomacyPlayerCiv["+(i-1)+"]").caption = g_CivData[players[i].civ].Name;
 
 		Engine.GetGUIObjectByName("diplomacyPlayerTeam["+(i-1)+"]").caption = (players[i].team < 0) ? "None" : players[i].team+1;
 
 		if (i != we)
 			Engine.GetGUIObjectByName("diplomacyPlayerTheirs["+(i-1)+"]").caption = (players[i].isAlly[we] ? "Ally" : (players[i].isNeutral[we] ? "Neutral" : "Enemy"));
 
 		// Don't display the options for ourself, or if we or the other player aren't active anymore
 		if (i == we || players[we].state != "active" || players[i].state != "active")
 		{
 			// Hide the unused/unselectable options
 			for each (var a in ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
 				Engine.GetGUIObjectByName("diplomacyPlayer"+a+"["+(i-1)+"]").hidden = true;
 			continue;
 		}
 
 		// Tribute
 		for each (var resource in ["food", "wood", "stone", "metal"])
 		{
 			var button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+toTitleCase(resource)+"["+(i-1)+"]");
 			button.onpress = (function(player, resource, button){
 				// Implement something like how unit batch training works. Shift+click to send 500, shift+click+click to send 1000, etc.
 				// Also see input.js (searching for "INPUT_MASSTRIBUTING" should get all the relevant parts).
 				var multiplier = 1;
 				return function() {
 					var isBatchTrainPressed = Engine.HotkeyIsPressed("session.masstribute");
 					if (isBatchTrainPressed)
 					{
 						inputState = INPUT_MASSTRIBUTING;
 						multiplier += multiplier == 1 ? 4 : 5;
 					}
 					var amounts = {
 						"food": (resource == "food" ? 100 : 0) * multiplier,
 						"wood": (resource == "wood" ? 100 : 0) * multiplier,
 						"stone": (resource == "stone" ? 100 : 0) * multiplier,
 						"metal": (resource == "metal" ? 100 : 0) * multiplier,
 					};
 					button.tooltip = formatTributeTooltip(players[player], resource, amounts[resource]);
 					// This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
 					// evil global variable hackery.
 					flushTributing = function() {
 						tributeResource({"player": player, "amounts": amounts});
 						multiplier = 1;
 						button.tooltip = formatTributeTooltip(players[player], resource, 100);
 					};
 					if (!isBatchTrainPressed)
 						flushTributing();
 				};
 			})(i, resource, button);
 			button.hidden = false;
 			button.tooltip = formatTributeTooltip(players[i], resource, 100);
 		}
 
 		// Skip our own teams on teams locked
 		if (players[we].teamsLocked && players[we].team != -1 && players[we].team == players[i].team)
 			continue;
 
 		// Diplomacy settings
 		// Set up the buttons
 		for each (var setting in ["ally", "neutral", "enemy"])
 		{
 			var button = Engine.GetGUIObjectByName("diplomacyPlayer"+toTitleCase(setting)+"["+(i-1)+"]");
 
 			if (setting == "ally")
 			{
 				if (players[we].isAlly[i])
 					button.caption = "x";
 				else
 					button.caption = "";
 			}
 			else if (setting == "neutral")
 			{
 				if (players[we].isNeutral[i])
 					button.caption = "x";
 				else
 					button.caption = "";
 			}
 			else // "enemy"
 			{
 				if (players[we].isEnemy[i])
 					button.caption = "x";
 				else
 					button.caption = "";
 			}
 			
 			button.onpress = (function(e){ return function() { setDiplomacy(e) } })({"player": i, "to": setting});
 			button.hidden = false;
 		}
 	}
 
 	Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
 }
 
 function closeDiplomacy()
 {
 	isDiplomacyOpen = false;
 	Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = true;
 }
 
 function toggleDiplomacy()
 {
 	if (isDiplomacyOpen)
 		closeDiplomacy();
 	else
 		openDiplomacy();
 };
 
 function openTrade()
 {
 	if (isDiplomacyOpen)
 		closeDiplomacy();
 	isTradeOpen = true;
 
 	var updateButtons = function()
 	{
 		for (var res in button)
 		{
 			button[res].label.caption = proba[res] + "%";
 			if (res == selec)
 			{
 				button[res].res.enabled = false;
 				button[res].sel.hidden = false;
 				button[res].up.hidden = true;
 				button[res].dn.hidden = true;
 			}
 			else
 			{
 				button[res].res.enabled = true;
 				button[res].sel.hidden = true;
 				button[res].up.hidden = (proba[res] == 100 || proba[selec] == 0);
 				button[res].dn.hidden = (proba[res] == 0 || proba[selec] == 100);
 			}
 		}
 	}
 
 	var proba = Engine.GuiInterfaceCall("GetTradingGoods");
 	var button = {};
 	var selec = RESOURCES[0];
 	for (var i = 0; i < RESOURCES.length; ++i)
 	{
 		var buttonResource = Engine.GetGUIObjectByName("tradeResource["+i+"]");
 		if (i > 0)
 		{
 			var size = Engine.GetGUIObjectByName("tradeResource["+(i-1)+"]").size;
 			var width = size.right - size.left;
 			size.left += width;
 			size.right += width;
 			Engine.GetGUIObjectByName("tradeResource["+i+"]").size = size;
 		}
 		var resource = RESOURCES[i];
 		proba[resource] = (proba[resource] ? proba[resource] : 0);
 		var buttonResource = Engine.GetGUIObjectByName("tradeResourceButton["+i+"]");
 		var icon = Engine.GetGUIObjectByName("tradeResourceIcon["+i+"]");
 		icon.sprite = "stretched:session/icons/resources/" + resource + ".png";
 		var label = Engine.GetGUIObjectByName("tradeResourceText["+i+"]");
 		var buttonUp = Engine.GetGUIObjectByName("tradeArrowUp["+i+"]");
 		var buttonDn = Engine.GetGUIObjectByName("tradeArrowDn["+i+"]");
 		var iconSel = Engine.GetGUIObjectByName("tradeResourceSelection["+i+"]");
 		button[resource] = { "res": buttonResource, "up": buttonUp, "dn": buttonDn, "label": label, "sel": iconSel };
 
 		buttonResource.onpress = (function(resource){
 			return function() {
 				if (selec == resource)
 					return;
 				selec = resource;
 				updateButtons();
 			}
 		})(resource);
 
 		buttonUp.onpress = (function(resource){
 			return function() {
 				proba[resource] += Math.min(STEP, proba[selec]);
 				proba[selec]    -= Math.min(STEP, proba[selec]);
 				Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				updateButtons();
 			}
 		})(resource);
 
 		buttonDn.onpress = (function(resource){
 			return function() {
 				proba[selec]    += Math.min(STEP, proba[resource]);
 				proba[resource] -= Math.min(STEP, proba[resource]);
 				Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				updateButtons();
 			}
 		})(resource);
 	}
 	updateButtons();
 
 	var traderNumber = Engine.GuiInterfaceCall("GetTraderNumber");
 	var caption = "";
 	var comma = "";
 	if (traderNumber.landTrader.total == 0)
 		caption += "0";
 	else
 	{
 		if (traderNumber.landTrader.trading > 0)
 		{
 			caption += traderNumber.landTrader.trading + " trading"
 			comma = ", ";
 		}
 		if (traderNumber.landTrader.garrisoned > 0)
 		{
 			caption += comma + traderNumber.landTrader.garrisoned + " garrisoned inside ships";
 			comma = ", ";
 		}
 		var inactive = traderNumber.landTrader.total - traderNumber.landTrader.trading - traderNumber.landTrader.garrisoned;
 		if (inactive > 0)
 			caption += comma + "[color=\"orange\"]" + inactive + " inactive[/color]";
 	}
 	Engine.GetGUIObjectByName("landTraders").caption = caption;
 
 	caption = "";
 	comma = "";
 	if (traderNumber.shipTrader.total == 0)
 		caption += "0";
 	else
 	{
 		if (traderNumber.shipTrader.trading > 0)
 		{
 			caption += traderNumber.shipTrader.trading + " trading"
 			comma = ", ";
 		}
 		var inactive = traderNumber.shipTrader.total - traderNumber.shipTrader.trading;
 		if (inactive > 0)
 			caption += comma + "[color=\"orange\"]" + inactive + " inactive[/color]";
 	}
 	Engine.GetGUIObjectByName("shipTraders").caption = caption;
 
 	Engine.GetGUIObjectByName("tradeDialogPanel").hidden = false;
 }
 
 function closeTrade()
 {
 	isTradeOpen = false;
 	Engine.GetGUIObjectByName("tradeDialogPanel").hidden = true;
 }
 
 function toggleTrade()
 {
 	if (isTradeOpen)
 		closeTrade();
 	else
 		openTrade();
 };
 
 function toggleGameSpeed()
 {
 	var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
 	gameSpeed.hidden = !gameSpeed.hidden;
 }
 
 /**
  * Pause the game in single player mode.
  */
 function pauseGame()
 {
 	if (g_IsNetworked)
 		return;
 
 	Engine.GetGUIObjectByName("pauseButtonText").caption = RESUME;
 	Engine.GetGUIObjectByName("pauseOverlay").hidden = false;
 	Engine.SetPaused(true);
 }
 
 function resumeGame()
 {
 	Engine.GetGUIObjectByName("pauseButtonText").caption = PAUSE;
 	Engine.GetGUIObjectByName("pauseOverlay").hidden = true;
 	Engine.SetPaused(false);
 }
 
 function togglePause()
 {
 	closeMenu();
 	closeOpenDialogs();
 
 	var pauseOverlay = Engine.GetGUIObjectByName("pauseOverlay");
 
 	if (pauseOverlay.hidden)
 	{
 		Engine.GetGUIObjectByName("pauseButtonText").caption = RESUME;
 		Engine.SetPaused(true);
 	}
 	else
 	{
 		Engine.SetPaused(false);
 		Engine.GetGUIObjectByName("pauseButtonText").caption = PAUSE;
 	}
 
 	pauseOverlay.hidden = !pauseOverlay.hidden;
 }
 
 function openManual()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	Engine.PushGuiPage("page_manual.xml", {"page": "intro", "callback": "resumeGame"});
 }
 
 function toggleDeveloperOverlay()
 {
 	if (Engine.HasXmppClient() && Engine.IsRankedGame())
 		return;
 
 	var devCommands = Engine.GetGUIObjectByName("devCommands");
 	var text = devCommands.hidden ? "opened." : "closed.";
 	submitChatDirectly("The Developer Overlay was " + text);
 	// Update the options dialog
 	Engine.GetGUIObjectByName("developerOverlayCheckbox").checked = devCommands.hidden;
 	devCommands.hidden = !devCommands.hidden;
 }
 
 function closeOpenDialogs()
 {
 	closeMenu();
 	closeChat();
 	closeDiplomacy();
 	closeTrade();
 	closeSettings(false);
 }
 
 function formatTributeTooltip(player, resource, amount)
 {
 	var playerColor = player.color.r + " " + player.color.g + " " + player.color.b;
 	return "Tribute " + amount + " " + resource + " to [color=\"" + playerColor + "\"]" + player.name +
 		"[/color]. Shift-click to tribute " + (amount < 500 ? 500 : amount + 500) + ".";
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/session.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.js	(revision 14771)
+++ ps/trunk/binaries/data/mods/public/gui/session/session.js	(revision 14772)
@@ -1,1026 +1,1036 @@
 // Network Mode
 var g_IsNetworked = false;
 
 // Is this user in control of game settings (i.e. is a network server, or offline player)
 var g_IsController;
 // Match ID for tracking
 var g_MatchID;
 
 // Cache the basic player data (name, civ, color)
 var g_Players = [];
 // Cache the useful civ data
 var g_CivData = {};
 
 var g_GameSpeeds = {};
 var g_CurrentSpeed;
 
 var g_PlayerAssignments = { "local": { "name": "You", "player": 1 } };
 
 // Cache dev-mode settings that are frequently or widely used
 var g_DevSettings = {
 	controlAll: false
 };
 
 // Whether status bars should be shown for all of the player's units.
 var g_ShowAllStatusBars = false;
 
 // Indicate when one of the current player's training queues is blocked
 // (this is used to support population counter blinking)
 var g_IsTrainingBlocked = false;
 
 // Cache simulation state (updated on every simulation update)
 var g_SimState;
 
 // Cache EntityStates
 var g_EntityStates = {}; // {id:entState}
 
 // Whether the player has lost/won and reached the end of their game
 var g_GameEnded = false;
 
 var g_Disconnected = false; // Lost connection to server
 
 // Holds player states from the last tick
 var g_CachedLastStates = "";
 
 // Colors to flash when pop limit reached
 const DEFAULT_POPULATION_COLOR = "white";
 const POPULATION_ALERT_COLOR = "orange";
 
 // List of additional entities to highlight
 var g_ShowGuarding = false;
 var g_ShowGuarded = false;
 var g_AdditionalHighlight = [];
 
 // for saving the hitpoins of the hero (is there a better way to do that?) 
 // Should be possible with AttackDetection but might be an overkill because it would have to loop
 // always through the list of all ongoing attacks...
 var g_previousHeroHitPoints = undefined;
 
 function GetSimState()
 {
 	if (!g_SimState)
 		g_SimState = Engine.GuiInterfaceCall("GetSimulationState");
 
 	return g_SimState;
 }
 
 function GetEntityState(entId)
 {
 	if (!(entId in g_EntityStates))
 	{
 		var entState = Engine.GuiInterfaceCall("GetEntityState", entId);
 		if (entState)
 			entState.extended = false;
 		g_EntityStates[entId] = entState;
 	}
 
 	return g_EntityStates[entId];
 }
 
 function GetExtendedEntityState(entId)
 {
 	if (entId in g_EntityStates)
 		var entState = g_EntityStates[entId];
 	else
 		var entState = Engine.GuiInterfaceCall("GetEntityState", entId);
 
 	if (!entState || entState.extended)
 		return entState;
 
 	var extension = Engine.GuiInterfaceCall("GetExtendedEntityState", entId);
 	for (var prop in extension)
 		entState[prop] = extension[prop];
 	entState.extended = true;
 	g_EntityStates[entId] = entState;
 
 	return entState;
 }
 
 // Cache TemplateData
 var g_TemplateData = {}; // {id:template}
 
 
 function GetTemplateData(templateName)
 {
 	if (!(templateName in g_TemplateData))
 	{
 		var template = Engine.GuiInterfaceCall("GetTemplateData", templateName);
 		g_TemplateData[templateName] = template;
 	}
 
 	return g_TemplateData[templateName];
 }
 
 // Cache TechnologyData
 var g_TechnologyData = {}; // {id:template}
 
 function GetTechnologyData(technologyName)
 {
 	if (!(technologyName in g_TechnologyData))
 	{
 		var template = Engine.GuiInterfaceCall("GetTechnologyData", technologyName);
 		g_TechnologyData[technologyName] = template;
 	}
 
 	return g_TechnologyData[technologyName];
 }
 
 // Init
 function init(initData, hotloadData)
 {
 	if (initData)
 	{
 		g_IsNetworked = initData.isNetworked; // Set network mode
 		g_IsController = initData.isController; // Set controller mode
 		g_PlayerAssignments = initData.playerAssignments;
 		g_MatchID = initData.attribs.matchID;
 
 		// Cache the player data
 		// (This may be updated at runtime by handleNetMessage)
 		g_Players = getPlayerData(g_PlayerAssignments);
 
 		if (initData.savedGUIData)
 			restoreSavedGameData(initData.savedGUIData);
 
 		Engine.GetGUIObjectByName("gameSpeedButton").hidden = g_IsNetworked;
 	}
 	else // Needed for autostart loading option
 	{
 		g_Players = getPlayerData(null);
 	}
 
 	// Cache civ data
 	g_CivData = loadCivData();
 	g_CivData["gaia"] = { "Code": "gaia", "Name": "Gaia" };
 
 	g_GameSpeeds = initGameSpeeds();
 	g_CurrentSpeed = Engine.GetSimRate();
 	var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
 	gameSpeed.list = g_GameSpeeds.names;
 	gameSpeed.list_data = g_GameSpeeds.speeds;
 	var idx = g_GameSpeeds.speeds.indexOf(g_CurrentSpeed);
 	gameSpeed.selected = idx != -1 ? idx : g_GameSpeeds["default"];
 	gameSpeed.onSelectionChange = function() { changeGameSpeed(+this.list_data[this.selected]); }
 
 	Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[Engine.GetPlayerID()].civ].Emblem;
 	Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[Engine.GetPlayerID()].civ].Name;
 	initMenuPosition(); // set initial position
 
 	// Populate player selection dropdown
 	var playerNames = [];
 	var playerIDs = [];
 	for (var player in g_Players)
 	{
 		playerNames.push(g_Players[player].name);
 		playerIDs.push(player);
 	}
 
 	var viewPlayerDropdown = Engine.GetGUIObjectByName("viewPlayer");
 	viewPlayerDropdown.list = playerNames;
 	viewPlayerDropdown.list_data = playerIDs;
 	viewPlayerDropdown.selected = Engine.GetPlayerID();
 
 	// If in Atlas editor, disable the exit button
 	if (Engine.IsAtlasRunning())
 		Engine.GetGUIObjectByName("menuExitButton").enabled = false;
 
 	if (hotloadData)
 	{
 		g_Selection.selected = hotloadData.selection;
 	}
 	else
 	{
 		// Starting for the first time:
 		var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music;
 		initMusic();
 		global.music.storeTracks(civMusic);
 		global.music.setState(global.music.states.PEACE);
 		playRandomAmbient("temperate");
 	}
 
 	if (Engine.ConfigDB_GetValue("user", "gui.session.timeelapsedcounter") === "true")
 		Engine.GetGUIObjectByName("timeElapsedCounter").hidden = false;
 
 	onSimulationUpdate();
 
 	// Report the performance after 5 seconds (when we're still near
 	// the initial camera view) and a minute (when the profiler will
 	// have settled down if framerates as very low), to give some
 	// extremely rough indications of performance
 	setTimeout(function() { reportPerformance(5); }, 5000);
 	setTimeout(function() { reportPerformance(60); }, 60000);
 }
 
 function selectViewPlayer(playerID)
 {
 	Engine.SetPlayerID(playerID);
 	if (playerID != 0) {
 		Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[playerID].civ].Emblem;
 		Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[playerID].civ].Name;
 	}
 }
 
 function reportPerformance(time)
 {
 	var settings = Engine.GetMapSettings();
 	var data = {
 		time: time,
 		map: settings.Name,
 		seed: settings.Seed, // only defined for random maps
 		size: settings.Size, // only defined for random maps
 		profiler: Engine.GetProfilerState()
 	};
 
 	Engine.SubmitUserReport("profile", 3, JSON.stringify(data));
 }
 
-function resignGame()
+/**
+ * Resign a player.
+ * @param leaveGameAfterResign If player is quitting after resignation.
+ */
+function resignGame(leaveGameAfterResign)
 {
 	var simState = GetSimState();
 
 	// Players can't resign if they've already won or lost.
 	if (simState.players[Engine.GetPlayerID()].state != "active" || g_Disconnected)
 		return;
 
 	// Tell other players that we have given up and been defeated
 	Engine.PostNetworkCommand({
 		"type": "defeat-player",
 		"playerId": Engine.GetPlayerID()
 	});
 
 	global.music.setState(global.music.states.DEFEAT);
-	resumeGame();
+	
+	// Resume the game if not resigning.
+	if (!leaveGameAfterResign)
+		resumeGame();
 }
 
-function leaveGame()
+/**
+ * Leave the game
+ * @param willRejoin If player is going to be rejoining a networked game.
+ */
+function leaveGame(willRejoin)
 {
 	var extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
 	var playerState = extendedSimState.players[Engine.GetPlayerID()];
 	var mapSettings = Engine.GetMapSettings();
 	var gameResult;
 
 	if (g_Disconnected)
 	{
 		gameResult = "You have been disconnected."
 	}
 	else if (playerState.state == "won")
 	{
 		gameResult = "You have won the battle!";
 	}
 	else if (playerState.state == "defeated")
 	{
 		gameResult = "You have been defeated...";
 	}
 	else // "active"
 	{
-		gameResult = "You have abandoned the game.";
-
-		// Tell other players that we have given up and been defeated
-		Engine.PostNetworkCommand({
-			"type": "defeat-player",
-			"playerId": Engine.GetPlayerID()
-		});
-
 		global.music.setState(global.music.states.DEFEAT);
+		if (willRejoin)
+			gameResult = "You have left the game.";
+		else
+		{
+			gameResult = "You have abandoned the game.";
+			resignGame(true);
+		}
 	}
 
 	stopAmbient();
 	Engine.EndGame();
 
 	if (g_IsController && Engine.HasXmppClient())
 		Engine.SendUnregisterGame();
 
 	Engine.SwitchGuiPage("page_summary.xml", {
 							"gameResult"  : gameResult,
 							"timeElapsed" : extendedSimState.timeElapsed,
 							"playerStates": extendedSimState.players,
 							"players": g_Players,
 							"mapSettings": mapSettings
 						 });
 }
 
 // Return some data that we'll use when hotloading this file after changes
 function getHotloadData()
 {
 	return { selection: g_Selection.selected };
 }
 
 // Return some data that will be stored in saved game files
 function getSavedGameData()
 {
 	var data = {};
 	data.playerAssignments = g_PlayerAssignments;
 	data.groups = g_Groups.groups;
 	// TODO: any other gui state?
 	return data;
 }
 
 function restoreSavedGameData(data)
 {
 	// Clear selection when loading a game
 	g_Selection.reset();
 
 	// Restore control groups
 	for (var groupNumber in data.groups)
 	{
 		g_Groups.groups[groupNumber].groups = data.groups[groupNumber].groups;
 		g_Groups.groups[groupNumber].ents = data.groups[groupNumber].ents;
 	}
 	updateGroups();
 }
 
 var lastTickTime = new Date;
 var lastXmppClientPoll = Date.now();
 
 /**
  * Called every frame.
  */
 function onTick()
 {
 	var now = new Date;
 	var tickLength = new Date - lastTickTime;
 	lastTickTime = now;
 
 	checkPlayerState();
 
 	while (true)
 	{
 		var message = Engine.PollNetworkClient();
 		if (!message)
 			break;
 		handleNetMessage(message);
 	}
 
 	updateCursorAndTooltip();
 
 	// If the selection changed, we need to regenerate the sim display (the display depends on both the
 	// simulation state and the current selection).
 	if (g_Selection.dirty)
 	{
 		g_Selection.dirty = false;
 
 		onSimulationUpdate();
 
 		// Display rally points for selected buildings
 		Engine.GuiInterfaceCall("DisplayRallyPoint", { "entities": g_Selection.toList() });
 	}
 
 	// Run timers
 	updateTimers();
 
 	// Animate menu
 	updateMenuPosition(tickLength);
 
 	// When training is blocked, flash population (alternates colour every 500msec)
 	if (g_IsTrainingBlocked && (Date.now() % 1000) < 500)
 		Engine.GetGUIObjectByName("resourcePop").textcolor = POPULATION_ALERT_COLOR;
 	else
 		Engine.GetGUIObjectByName("resourcePop").textcolor = DEFAULT_POPULATION_COLOR;
 
 	// Clear renamed entities list
 	Engine.GuiInterfaceCall("ClearRenamedEntities");
 
 	// If the lobby is running, wake it up every 10 seconds so we stay connected.
 	if (Engine.HasXmppClient() && (Date.now() - lastXmppClientPoll) > 10000)
 	{
 		Engine.RecvXmppClient();
 		lastXmppClientPoll = Date.now();
 	}
 }
 
 function checkPlayerState()
 {
 	// Once the game ends, we're done here.
 	if (g_GameEnded)
 		return;
 
 	// Send a game report for each player in this game.
 	var m_simState = GetSimState();
 	var playerState = m_simState.players[Engine.GetPlayerID()];
 	var tempStates = "";
 	for each (var player in m_simState.players) {tempStates += player.state + ",";}
 
 	if (g_CachedLastStates != tempStates)
 	{
 		g_CachedLastStates = tempStates;
 		reportGame(Engine.GuiInterfaceCall("GetExtendedSimulationState"));
 	}
 
 	// If the local player hasn't finished playing, we return here to avoid the victory/defeat messages.
 	if (playerState.state == "active")
 		return;
 
 	// We can't resign once the game is over.
 	Engine.GetGUIObjectByName("menuResignButton").enabled = false;
 
 	// Make sure nothing is open to avoid stacking.
 	closeMenu();
 	closeOpenDialogs();
 
 	// Make sure this doesn't run again.
 	g_GameEnded = true;
 
 	if (Engine.IsAtlasRunning())
 	{
 		// If we're in Atlas, we can't leave the game
 		var btCaptions = ["OK"];
 		var btCode = [null];
 		var message = "Press OK to continue";
 	}
 	else
 	{
 		var btCaptions = ["Yes", "No"];
 		var btCode = [leaveGame, null];
 		var message = "Do you want to quit?";
 	}
 
 	if (playerState.state == "defeated")
 	{
 		global.music.setState(global.music.states.DEFEAT);
 		messageBox(400, 200, message, "DEFEATED!", 0, btCaptions, btCode);
 	}
 	else if (playerState.state == "won")
 	{
 		global.music.setState(global.music.states.VICTORY);
 		// TODO: Reveal map directly instead of this silly proxy.
 		if (!Engine.GetGUIObjectByName("devCommandsRevealMap").checked)
 			Engine.GetGUIObjectByName("devCommandsRevealMap").checked = true;
 		messageBox(400, 200, message, "VICTORIOUS!", 0, btCaptions, btCode);
 	}
 
 }
 
 function changeGameSpeed(speed)
 {
 	// For non-networked games only
 	if (!g_IsNetworked)
 	{
 		Engine.SetSimRate(speed);
 		g_CurrentSpeed = speed;
 	}
 }
 
 /**
  * Recomputes GUI state that depends on simulation state or selection state. Called directly every simulation
  * update (see session.xml), or from onTick when the selection has changed.
  */
 function onSimulationUpdate()
 {
 	g_EntityStates = {};
 	g_TemplateData = {};
 	g_TechnologyData = {};
 
 	g_SimState = Engine.GuiInterfaceCall("GetSimulationState");
 
 	// If we're called during init when the game is first loading, there will be no simulation yet, so do nothing
 	if (!g_SimState)
 		return;
 
 	handleNotifications();
 
 	if (g_ShowAllStatusBars)
 		recalculateStatusBarDisplay();
 
 	if (g_ShowGuarding || g_ShowGuarded)
 		updateAdditionalHighlight();
 
 	updateHero();
 	updateGroups();
 	updateDebug();
 	updatePlayerDisplay();
 	updateSelectionDetails();
 	updateResearchDisplay();
 	updateBuildingPlacementPreview();
 	updateTimeElapsedCounter();
 	updateTimeNotifications();	
 
 	// Update music state on basis of battle state.
 	var battleState = Engine.GuiInterfaceCall("GetBattleState", Engine.GetPlayerID());
 	if (battleState)
 		global.music.setState(global.music.states[battleState]);
 	
 }
 
 /**
 * updates a status bar on the GUI
 * nameOfBar: name of the bar
 * points: points to show
 * maxPoints: max points 
 * direction: gets less from (right to left) 0; (top to bottom) 1; (left to right) 2; (bottom to top) 3;
 */
 function updateGUIStatusBar(nameOfBar, points, maxPoints, direction) 
 {
 	// check, if optional direction parameter is valid.
 	if (!direction || !(direction >= 0 && direction < 4))
 		direction = 0;
 
 	// get the bar and update it
 	var statusBar = Engine.GetGUIObjectByName(nameOfBar);
 	if (!statusBar) 
 		return;
 		
 	var healthSize = statusBar.size;
 	var value = 100*Math.max(0, Math.min(1, points / maxPoints));
 	
 	// inverse bar
 	if(direction == 2 || direction == 3) 
 		value = 100 - value;
 
 	if(direction == 0)
 		healthSize.rright = value;
 	else if(direction == 1)
 		healthSize.rbottom = value;
 	else if(direction == 2)
 		healthSize.rleft = value;
 	else if(direction == 3)
 		healthSize.rtop = value;
 	
 	// update bar
 	statusBar.size = healthSize;
 }
 
 
 function updateHero()
 {
 	var simState = GetSimState();
 	var playerState = simState.players[Engine.GetPlayerID()];
 	var unitHeroPanel = Engine.GetGUIObjectByName("unitHeroPanel");
 	var heroButton = Engine.GetGUIObjectByName("unitHeroButton");
 
 	if (!playerState || playerState.heroes.length <= 0)
 	{
 		g_previousHeroHitPoints = undefined;
 		unitHeroPanel.hidden = true;
 		return;
 	}
 
 	var heroImage = Engine.GetGUIObjectByName("unitHeroImage");
 	var heroState = GetExtendedEntityState(playerState.heroes[0]);
 	var template = GetTemplateData(heroState.template);
 	heroImage.sprite = "stretched:session/portraits/" + template.icon;
 	var hero = playerState.heroes[0];
 
 	heroButton.onpress = function()
 	{
 		if (!Engine.HotkeyIsPressed("selection.add"))
 			g_Selection.reset();
 		g_Selection.addList([hero]);
 	};
 	heroButton.ondoublepress = function() { selectAndMoveTo(getEntityOrHolder(hero)); };
 	unitHeroPanel.hidden = false;
 
 	// Setup tooltip
 	var tooltip = "[font=\"serif-bold-16\"]" + template.name.specific + "[/font]";
 	tooltip += "\n[font=\"serif-bold-13\"]Health:[/font] " + heroState.hitpoints + "/" + heroState.maxHitpoints;
 	tooltip += "\n[font=\"serif-bold-13\"]" + (heroState.attack ? heroState.attack.type + " " : "")
 	           + "Attack:[/font] " + damageTypeDetails(heroState.attack);
 	// Show max attack range if ranged attack, also convert to tiles (4m per tile)
 	if (heroState.attack && heroState.attack.type == "Ranged")
 		tooltip += ", [font=\"serif-bold-13\"]Range:[/font] " + Math.round(heroState.attack.maxRange/4);
 
 	tooltip += "\n[font=\"serif-bold-13\"]Armor:[/font] " + damageTypeDetails(heroState.armour);
 	tooltip += "\n" + template.tooltip;
 
 	heroButton.tooltip = tooltip;
 	
 	// update heros health bar
 	updateGUIStatusBar("heroHealthBar", heroState.hitpoints, heroState.maxHitpoints);
 	
 	// define the hit points if not defined
 	if (!g_previousHeroHitPoints)
 		g_previousHeroHitPoints = heroState.hitpoints;
 	
 	// check, if the health of the hero changed since the last update
 	if (heroState.hitpoints < g_previousHeroHitPoints)
 	{	
 		g_previousHeroHitPoints = heroState.hitpoints;
 		// trigger the animation
 		startColorFade("heroHitOverlay", 100, 0, colorFade_attackUnit, true, smoothColorFadeRestart_attackUnit);
 		return;
 	}
 }
 
 
 function updateGroups()
 {
 	var guiName = "Group";
 	g_Groups.update();
 	for (var i = 0; i < 10; i++)
 	{
 		var button = Engine.GetGUIObjectByName("unit"+guiName+"Button["+i+"]");
 		var label = Engine.GetGUIObjectByName("unit"+guiName+"Label["+i+"]").caption = i;
 		if (g_Groups.groups[i].getTotalCount() == 0)
 			button.hidden = true;
 		else
 			button.hidden = false;
 		button.onpress = (function(i) { return function() { performGroup((Engine.HotkeyIsPressed("selection.add") ? "add" : "select"), i); } })(i);
 		button.ondoublepress = (function(i) { return function() { performGroup("snap", i); } })(i);
 		button.onpressright = (function(i) { return function() { performGroup("breakUp", i); } })(i);
 	}
 	var numButtons = i;
 	var rowLength = 1;
 	var numRows = Math.ceil(numButtons / rowLength);
 	var buttonSideLength = Engine.GetGUIObjectByName("unit"+guiName+"Button[0]").size.bottom;
 	var buttonSpacer = buttonSideLength+1;
 	for (var i = 0; i < numRows; i++)
 		layoutButtonRow(i, guiName, buttonSideLength, buttonSpacer, rowLength*i, rowLength*(i+1) );
 }
 
 function updateDebug()
 {
 	var simState = GetSimState();
 	var debug = Engine.GetGUIObjectByName("debug");
 
 	if (Engine.GetGUIObjectByName("devDisplayState").checked)
 	{
 		debug.hidden = false;
 	}
 	else
 	{
 		debug.hidden = true;
 		return;
 	}
 
 	var conciseSimState = deepcopy(simState);
 	conciseSimState.players = "<<<omitted>>>";
 	var text = "simulation: " + uneval(conciseSimState);
 
 	var selection = g_Selection.toList();
 	if (selection.length)
 	{
 		var entState = GetExtendedEntityState(selection[0]);
 		if (entState)
 		{
 			var template = GetTemplateData(entState.template);
 			text += "\n\nentity: {\n";
 			for (var k in entState)
 				text += "  "+k+":"+uneval(entState[k])+"\n";
 			text += "}\n\ntemplate: " + uneval(template);
 		}
 	}
 
 	debug.caption = text;
 }
 
 function updatePlayerDisplay()
 {
 	var simState = GetSimState();
 	var playerState = simState.players[Engine.GetPlayerID()];
 	if (!playerState)
 		return;
 
 	Engine.GetGUIObjectByName("resourceFood").caption = Math.floor(playerState.resourceCounts.food);
 	Engine.GetGUIObjectByName("resourceWood").caption = Math.floor(playerState.resourceCounts.wood);
 	Engine.GetGUIObjectByName("resourceStone").caption = Math.floor(playerState.resourceCounts.stone);
 	Engine.GetGUIObjectByName("resourceMetal").caption = Math.floor(playerState.resourceCounts.metal);
 	Engine.GetGUIObjectByName("resourcePop").caption = playerState.popCount + "/" + playerState.popLimit;
 
 	g_IsTrainingBlocked = playerState.trainingBlocked;
 }
 
 function selectAndMoveTo(ent)
 {
 	var entState = GetEntityState(ent);
 	if (!entState || !entState.position)
 		return;
 
 	g_Selection.reset();
 	g_Selection.addList([ent]);
 
 	var position = entState.position;
 	Engine.CameraMoveTo(position.x, position.z);
 }
 
 function updateResearchDisplay()
 {
 	var researchStarted = Engine.GuiInterfaceCall("GetStartedResearch", Engine.GetPlayerID());
 	if (!researchStarted)
 		return;
 
 	// Set up initial positioning.
 	var buttonSideLength = Engine.GetGUIObjectByName("researchStartedButton[0]").size.right;
 	for (var i = 0; i < 10; ++i)
 	{
 		var button = Engine.GetGUIObjectByName("researchStartedButton[" + i + "]");
 		var size = button.size;
 		size.top = (4 + buttonSideLength) * i;
 		size.bottom = size.top + buttonSideLength;
 		button.size = size;
 	}
 
 	var numButtons = 0;
 	for (var tech in researchStarted)
 	{
 		// Show at most 10 in-progress techs.
 		if (numButtons >= 10)
 			break;
 
 		var template = GetTechnologyData(tech);
 		var button = Engine.GetGUIObjectByName("researchStartedButton[" + numButtons + "]");
 		button.hidden = false;
 		button.tooltip = getEntityNames(template);
 		button.onpress = (function(e) { return function() { selectAndMoveTo(e) } })(researchStarted[tech].researcher);
 
 		var icon = "stretched:session/portraits/" + template.icon;
 		Engine.GetGUIObjectByName("researchStartedIcon[" + numButtons + "]").sprite = icon;
 
 		// Scale the progress indicator.
 		var size = Engine.GetGUIObjectByName("researchStartedProgressSlider[" + numButtons + "]").size;
 
 		// Buttons are assumed to be square, so left/right offsets can be used for top/bottom.
 		size.top = size.left + Math.round(researchStarted[tech].progress * (size.right - size.left));
 		Engine.GetGUIObjectByName("researchStartedProgressSlider[" + numButtons + "]").size = size;
 
 		++numButtons;
 	}
 
 	// Hide unused buttons.
 	for (var i = numButtons; i < 10; ++i)
 		Engine.GetGUIObjectByName("researchStartedButton[" + i + "]").hidden = true;
 }
 
 function updateTimeElapsedCounter()
 {
 	var simState = GetSimState();
 	var speed = g_CurrentSpeed != 1.0 ? " (" + g_CurrentSpeed + "x)" : "";
 	var timeElapsedCounter = Engine.GetGUIObjectByName("timeElapsedCounter");
 	timeElapsedCounter.caption = timeToString(simState.timeElapsed) + speed;
 }
 
 // Toggles the display of status bars for all of the player's entities.
 function recalculateStatusBarDisplay()
 {
 	if (g_ShowAllStatusBars)
 		var entities = Engine.PickFriendlyEntitiesOnScreen(Engine.GetPlayerID());
 	else
 	{
 		var selected = g_Selection.toList();
 		for each (var ent in g_Selection.highlighted)
 			selected.push(ent);
 
 		// Remove selected entities from the 'all entities' array, to avoid disabling their status bars.
 		var entities = Engine.GuiInterfaceCall("GetPlayerEntities").filter(
 				function(idx) { return (selected.indexOf(idx) == -1); }
 		);
 	}
 
 	Engine.GuiInterfaceCall("SetStatusBars", { "entities": entities, "enabled": g_ShowAllStatusBars });
 }
 
 // Update the additional list of entities to be highlighted.
 function updateAdditionalHighlight()
 {
 	var entsAdd = [];    // list of entities units to be highlighted
 	var entsRemove = [];
 	var highlighted = g_Selection.toList();
 	for each (var ent in g_Selection.highlighted)
 		highlighted.push(ent);
 
 	if (g_ShowGuarding)
 	{
 		// flag the guarding entities to add in this additional highlight
 		for each (var sel in g_Selection.selected)
 		{
 			var state = GetEntityState(sel);
 			if (!state.guard || !state.guard.entities.length)
 				continue;
 			for each (var ent in state.guard.entities)
 				if (highlighted.indexOf(ent) == -1 && entsAdd.indexOf(ent) == -1)
 					entsAdd.push(ent);
 		}
 	}
 
 	if (g_ShowGuarded)
 	{
 		// flag the guarded entities to add in this additional highlight
 		for each (var sel in g_Selection.selected)
 		{
 			var state = GetEntityState(sel);
 			if (!state.unitAI || !state.unitAI.isGuarding)
 				continue;
 			var ent = state.unitAI.isGuarding;
 			if (highlighted.indexOf(ent) == -1 && entsAdd.indexOf(ent) == -1)
 				entsAdd.push(ent);
 		}
 	}
 
 	// flag the entities to remove (from the previously added) from this additional highlight
 	for each (var ent in g_AdditionalHighlight)
 	    if (highlighted.indexOf(ent) == -1 && entsAdd.indexOf(ent) == -1 && entsRemove.indexOf(ent) == -1)
 			entsRemove.push(ent);
 
 	_setHighlight(entsAdd   , HIGHLIGHTED_ALPHA, true );
 	_setHighlight(entsRemove, 0                , false);
 	g_AdditionalHighlight = entsAdd;
 }
 
 // Temporarily adding this here
 const AMBIENT_TEMPERATE = "temperate";
 var currentAmbient;
 function playRandomAmbient(type)
 {
 	switch (type)
 	{
 		case AMBIENT_TEMPERATE:
 			// Seem to need the underscore at the end of "temperate" to avoid crash
 			// (Might be caused by trying to randomly load day_temperate.xml)
 //			currentAmbient = newRandomSound("ambient", "temperate_", "dayscape");
 
 			const AMBIENT = "audio/ambient/dayscape/day_temperate_gen_03.ogg";
 			Engine.PlayAmbientSound( AMBIENT, true );
 			break;
 
 		default:
 			Engine.Console_Write("Unrecognized ambient type: " + type);
 			break;
 	}
 }
 
 // Temporarily adding this here
 function stopAmbient()
 {
 	if (currentAmbient)
 	{
 		currentAmbient.free();
 		currentAmbient = null;
 	}
 }
 // Send a report on the game status to the lobby
 function reportGame(extendedSimState)
 {
 	if (!Engine.HasXmppClient())
 		return;
 	// units
 	var unitsClasses = [
 		"total",
 		"Infantry",
 		"Worker",
 		"Female",
 		"Cavalry",
 		"Champion",
 		"Hero",
 		"Ship"
 	];
 	var unitsCountersTypes = [
 		"unitsTrained",
 		"unitsLost",
 		"enemyUnitsKilled"
 	];
 	// buildings
 	var buildingsClasses = [
 		"total",
 		"CivCentre",
 		"House",
 		"Economic",
 		"Outpost",
 		"Military",
 		"Fortress",
 		"Wonder"
 	];
 	var buildingsCountersTypes = [
 		"buildingsConstructed",
 		"buildingsLost",
 		"enemyBuildingsDestroyed"
 	];
 	// resources
 	var resourcesTypes = [
 		"wood",
 		"food",
 		"stone",
 		"metal"
 	];
 	var resourcesCounterTypes = [
 		"resourcesGathered",
 		"resourcesUsed",
 		"resourcesSold",
 		"resourcesBought"
 	];
 
 	var playerStatistics = { };
 
 	// Unit Stats
 	for each (var unitCounterType in unitsCountersTypes)
 	{
 		if (!playerStatistics[unitCounterType])
 			playerStatistics[unitCounterType] = { };
 		for each (var unitsClass in unitsClasses)
 			playerStatistics[unitCounterType][unitsClass] = "";
 	}
 
 	playerStatistics.unitsLostValue = "";
 	playerStatistics.unitsKilledValue = "";
 	// Building stats
 	for each (var buildingCounterType in buildingsCountersTypes)
 	{
 		if (!playerStatistics[buildingCounterType])
 			playerStatistics[buildingCounterType] = { };
 		for each (var buildingsClass in buildingsClasses)
 			playerStatistics[buildingCounterType][buildingsClass] = "";
 	}
 
 	playerStatistics.buildingsLostValue = "";
 	playerStatistics.enemyBuildingsDestroyedValue = "";
 	// Resources
 	for each (var resourcesCounterType in resourcesCounterTypes)
 	{
 		if (!playerStatistics[resourcesCounterType])
 			playerStatistics[resourcesCounterType] = { };
 		for each (var resourcesType in resourcesTypes)
 			playerStatistics[resourcesCounterType][resourcesType] = "";
 	}
 	playerStatistics.resourcesGathered.vegetarianFood = "";
 
 	playerStatistics.tradeIncome = "";
 	// Tribute
 	playerStatistics.tributesSent = "";
 	playerStatistics.tributesReceived = "";
 	// Total	
 	playerStatistics.economyScore = "";
 	playerStatistics.militaryScore = "";
 	playerStatistics.totalScore = "";
 	// Various
 	playerStatistics.treasuresCollected = "";
 	playerStatistics.feminisation = "";
 	playerStatistics.percentMapExplored = "";
 	var mapName = Engine.GetMapSettings().Name;
 	var playerStates = "";
 	var playerCivs = "";
 	var teams = "";
 	var teamsLocked = true;
 
 	// Serialize the statistics for each player into a comma-separated list.
 	for each (var player in extendedSimState.players)
 	{
 		playerStates += player.state + ",";
 		playerCivs += player.civ + ",";
 		teams += player.team + ",";
 		teamsLocked = teamsLocked && player.teamsLocked;
 		for each (var resourcesCounterType in resourcesCounterTypes)
 			for each (var resourcesType in resourcesTypes)
 				playerStatistics[resourcesCounterType][resourcesType] += player.statistics[resourcesCounterType][resourcesType] + ",";
 		playerStatistics.resourcesGathered.vegetarianFood += player.statistics.resourcesGathered.vegetarianFood + ",";
 
 		for each (var unitCounterType in unitsCountersTypes)
 			for each (var unitsClass in unitsClasses)
 				playerStatistics[unitCounterType][unitsClass] += player.statistics[unitCounterType][unitsClass] + ",";
 
 		for each (var buildingCounterType in buildingsCountersTypes)
 			for each (var buildingsClass in buildingsClasses)
 				playerStatistics[buildingCounterType][buildingsClass] += player.statistics[buildingCounterType][buildingsClass] + ",";
 		var total = 0;
 		for each (var res in player.statistics.resourcesGathered)
 			total += res;
 		playerStatistics.economyScore += total + ",";
 		playerStatistics.militaryScore += Math.round((player.statistics.enemyUnitsKilledValue +
 			player.statistics.enemyBuildingsDestroyedValue) / 10)  + ",";
 		playerStatistics.totalScore += (total + Math.round((player.statistics.enemyUnitsKilledValue +
 			player.statistics.enemyBuildingsDestroyedValue) / 10)) + ",";
 		playerStatistics.tradeIncome += player.statistics.tradeIncome + ",";
 		playerStatistics.tributesSent += player.statistics.tributesSent + ",";
 		playerStatistics.tributesReceived += player.statistics.tributesReceived + ",";
 		playerStatistics.percentMapExplored += player.statistics.percentMapExplored + ",";
 		playerStatistics.treasuresCollected += player.statistics.treasuresCollected + ",";
 	}
 
 	// Send the report with serialized data
 	var reportObject = { };
 	reportObject.timeElapsed = extendedSimState.timeElapsed;
 	reportObject.playerStates = playerStates;
 	reportObject.playerID = Engine.GetPlayerID();
 	reportObject.matchID = g_MatchID;
 	reportObject.civs = playerCivs;
 	reportObject.teams = teams;
 	reportObject.teamsLocked = String(teamsLocked);
 	reportObject.mapName = mapName;
 	reportObject.economyScore = playerStatistics.economyScore;
 	reportObject.militaryScore = playerStatistics.militaryScore;
 	reportObject.totalScore = playerStatistics.totalScore;
 	for each (var rct in resourcesCounterTypes)
 	{
 		for each (var rt in resourcesTypes)
 			reportObject[rt+rct.substr(9)] = playerStatistics[rct][rt];
 			// eg. rt = food rct.substr = Gathered rct = resourcesGathered
 	}
 	reportObject.vegetarianFoodGathered = playerStatistics.resourcesGathered.vegetarianFood;
 	for each (var type in unitsClasses)
 	{
 		// eg. type = Infantry (type.substr(0,1)).toLowerCase()+type.substr(1) = infantry
 		reportObject[(type.substr(0,1)).toLowerCase()+type.substr(1)+"UnitsTrained"] = playerStatistics.unitsTrained[type];
 		reportObject[(type.substr(0,1)).toLowerCase()+type.substr(1)+"UnitsLost"] = playerStatistics.unitsLost[type];
 		reportObject["enemy"+type+"UnitsKilled"] = playerStatistics.enemyUnitsKilled[type];
 	}
 	for each (var type in buildingsClasses)
 	{
 		reportObject[(type.substr(0,1)).toLowerCase()+type.substr(1)+"BuildingsConstructed"] = playerStatistics.buildingsConstructed[type];
 		reportObject[(type.substr(0,1)).toLowerCase()+type.substr(1)+"BuildingsLost"] = playerStatistics.buildingsLost[type];
 		reportObject["enemy"+type+"BuildingsDestroyed"] = playerStatistics.enemyBuildingsDestroyed[type];
 	}
 	reportObject.tributesSent = playerStatistics.tributesSent;
 	reportObject.tributesReceived = playerStatistics.tributesReceived;
 	reportObject.percentMapExplored = playerStatistics.percentMapExplored;
 	reportObject.treasuresCollected = playerStatistics.treasuresCollected;
 	reportObject.tradeIncome = playerStatistics.tradeIncome;
 
 	Engine.SendGameReport(reportObject);
 }
 
Index: ps/trunk/binaries/data/mods/public/gui/session/session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.xml	(revision 14771)
+++ ps/trunk/binaries/data/mods/public/gui/session/session.xml	(revision 14772)
@@ -1,1362 +1,1361 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
     <script file="gui/common/functions_civinfo.js"/>
     <script file="gui/common/functions_utility.js" />
     <script file="gui/common/functions_global_object.js" />
     <script file="gui/common/music.js"/>
     <script file="gui/common/timer.js"/>
 	<script file="gui/common/colorFades.js"/>
     <script file="gui/session/session.js"/>
     <script file="gui/session/selection.js"/>
     <script file="gui/session/placement.js"/>
     <script file="gui/session/input.js"/>
     <script file="gui/session/menu.js"/>
     <script file="gui/session/selection_details.js"/>
     <script file="gui/session/unit_commands.js"/>
     <script file="gui/session/messages.js"/>
     <script file="gui/session/utility_functions.js"/>
 
     <object name="sn" hotkey="session.gui.toggle">
 	<action on="Tick">
 	    onTick();
 	</action>
 
 	<action on="SimulationUpdate">
 	    onSimulationUpdate();
 	</action>
 
 	<action on="Press">
 	    this.hidden = !this.hidden;
 	</action>
 
 	<!-- ================================  ================================ -->
 	<!-- HOTKEYS (For some reason, they won't work properly unless outside menu) -->
 	<!-- ================================  ================================ -->
 
 	<!-- Exit button Hotkey  -->
 	<!--
 		<action on="Press"><![CDATA[
 			messageBox(400, 200, "Do you really want to quit?", "Confirmation", 0,
 				["Yes", "No!"], [leaveGame, null]);
 		]]></action>
 	-->
 
 	<object hotkey="leave">
 	    <action on="Press">closeOpenDialogs();</action>
 	</object>
 
 	<!-- Chat: Depending on the current state, it either opens message window or closes message window / posts message -->
 	<object hotkey="chat">
 	    <action on="Press">toggleChatWindow();</action>
 	</object>
 
 	<!-- Team Chat: Does the same as the above, but sets the window up to only send messages to teammates. -->
 	<object hotkey="teamchat">
 	    <action on="Press">toggleChatWindow(true);</action>
 	</object>
 
 	<!-- Menu -->
 	<object hotkey="menu.toggle">
 	    <action on="Press">openMenu();</action>
 	</object>
 
 	<!-- Unit silhouettes -->
 	<object hotkey="silhouettes">
 	    <action on="Press">
 		var newSetting = !Engine.Renderer_GetSilhouettesEnabled();
 		Engine.Renderer_SetSilhouettesEnabled(newSetting);
 		Engine.GetGUIObjectByName("silhouettesCheckbox").checked = newSetting;
 	    </action>
 	</object>
 
 	<!-- Sky -->
 	<object hotkey="showsky">
 	    <action on="Press">
 		var newSetting =  !Engine.Renderer_GetShowSkyEnabled();
 		Engine.Renderer_SetShowSkyEnabled(newSetting);
 	    </action>
 	</object>
 
 	<!-- Pause -->
 	<object hotkey="pause">
 	    <action on="Press">togglePause();</action>
 	</object>
 
 	<!-- Quicksave/load -->
 	<object hotkey="quicksave">
 	    <action on="Press">Engine.QuickSave();</action>
 	</object>
 	<object hotkey="quickload">
 	    <action on="Press">Engine.QuickLoad();</action>
 	</object>
 
 	<!-- Delete button Hotkey (For some reason it won't work when the console is visible -->
 	<object hotkey="session.kill">
 	    <action on="Press">performCommand(g_Selection.toList()[0], "delete");</action>
 	</object>
 
 	<!-- camera.follow mode - follow the first unit in the selection -->
 	<object hotkey="camera.follow">
 	    <action on="Press">setCameraFollow(g_Selection.toList()[0]);</action>
 	</object>
 
 	<!-- Camera jumping - press a hotkey to mark a position and another hotkey to jump back there -->
 	<object hotkey="camera.jump.1">
 		<action on="Press">jumpCamera(1);</action>
 	</object>
 
 	<object hotkey="camera.jump.2">
 		<action on="Press">jumpCamera(2);</action>
 	</object>
 
 	<object hotkey="camera.jump.3">
 		<action on="Press">jumpCamera(3);</action>
 	</object>
 
 	<object hotkey="camera.jump.4">
 		<action on="Press">jumpCamera(4);</action>
 	</object>
 
 	<object hotkey="camera.jump.5">
 		<action on="Press">jumpCamera(5);</action>
 	</object>
 
 	<object hotkey="camera.jump.6">
 		<action on="Press">jumpCamera(6);</action>
 	</object>
 
 	<object hotkey="camera.jump.7">
 		<action on="Press">jumpCamera(7);</action>
 	</object>
 
 	<object hotkey="camera.jump.8">
 		<action on="Press">jumpCamera(8);</action>
 	</object>
 
 	<object hotkey="camera.jump.9">
 		<action on="Press">jumpCamera(9);</action>
 	</object>
 
 	<object hotkey="camera.jump.10">
 		<action on="Press">jumpCamera(10);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.1">
 		<action on="Press">setJumpCamera(1);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.2">
 		<action on="Press">setJumpCamera(2);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.3">
 		<action on="Press">setJumpCamera(3);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.4">
 		<action on="Press">setJumpCamera(4);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.5">
 		<action on="Press">setJumpCamera(5);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.6">
 		<action on="Press">setJumpCamera(6);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.7">
 		<action on="Press">setJumpCamera(7);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.8">
 		<action on="Press">setJumpCamera(8);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.9">
 		<action on="Press">setJumpCamera(9);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.10">
 		<action on="Press">setJumpCamera(10);</action>
 	</object>
 	
 	<!-- Stop the selected units -->
 	<object hotkey="session.stop">
 	    <action on="Press">stopUnits(g_Selection.toList());</action>
 	</object>
 	
 	<!-- queue first unit in the training queue  -->
 	<object hotkey="session.queueunit.1">
 	    <action on="Press">addTrainingByPosition(0);</action>
 	</object>
 
 	<!-- queue 2nd unit in the training queue  -->
 	<object hotkey="session.queueunit.2">
 	    <action on="Press">addTrainingByPosition(1);</action>
 	</object>
 
 	<!-- queue 3rd unit in the training queue  -->
 	<object hotkey="session.queueunit.3">
 	    <action on="Press">addTrainingByPosition(2);</action>
 	</object>
 
 	<!-- queue 4th unit in the training queue  -->
 	<object hotkey="session.queueunit.4">
 	    <action on="Press">addTrainingByPosition(3);</action>
 	</object>
 	
 	<!-- queue 5th unit in the training queue  -->
 	<object hotkey="session.queueunit.5">
 	    <action on="Press">addTrainingByPosition(4);</action>
 	</object>
 
 	<!-- queue 6th unit in the training queue  -->
 	<object hotkey="session.queueunit.6">
 	    <action on="Press">addTrainingByPosition(5);</action>
 	</object>
 
 	<!-- queue 7th unit in the training queue  -->
 	<object hotkey="session.queueunit.7">
 	    <action on="Press">addTrainingByPosition(6);</action>
 	</object>
 
 		<!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
 	<object hotkey="selection.idlewarrior">
 	    <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship", "Dog"]);</action>
 	</object>
 
 	<!-- Unselect any selected entities -->
 	<object hotkey="selection.cancel">
 	    <action on="Press">clearSelection()</action>
 	</object>
 	<!-- ================================  ================================ -->
 	<!-- Developer / Debug items -->
 	<!-- ================================  ================================ -->
 
 	<!-- Debug text -->
 	<object name="debug"
 		type="text"
 		size="0 70 80% 100%"
 		ghost="true"
 		textcolor="yellow"
 		font="mono-stroke-10"
 		/>
 
 	<!-- Dev/cheat commands -->
 	<object name="devCommands" size="100%-156 50%-88 100%-8 50%+104" type="image" sprite="devCommandsBackground" z="40"
 		hidden="true" hotkey="session.devcommands.toggle">
 		<action on="Press">toggleDeveloperOverlay();</action>
 
 	    <object size="0 0 100%-18 16" type="text" style="devCommandsText">Control all units</object>
 	    <object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="StoneCrossBox">
 		<action on="Press">
 		    g_DevSettings.controlAll = this.checked;
 		    Engine.PostNetworkCommand( {"type": "control-all", "flag": this.checked} );
 		</action>
 	    </object>
 
 	    <object size="0 16 100%-18 32" type="text" style="devCommandsText">Change perspective</object>
 	    <object size="100%-16 16 100% 32" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GetGUIObjectByName("viewPlayer").hidden = !this.checked;</action>
 	    </object>
 
 	    <object size="0 32 100%-18 48" type="text" style="devCommandsText">Display selection state</object>
 	    <object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="StoneCrossBox"/>
 
 	    <object size="0 48 100%-18 64" type="text" style="devCommandsText">Pathfinder overlay</object>
 	    <object size="100%-16 48 100% 64" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetPathfinderDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 64 100%-18 80" type="text" style="devCommandsText">Obstruction overlay</object>
 	    <object size="100%-16 64 100% 80" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetObstructionDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 80 100%-18 96" type="text" style="devCommandsText">Unit motion overlay</object>
 	    <object size="100%-16 80 100% 96" type="checkbox" style="StoneCrossBox">
 		<action on="Press">g_Selection.SetMotionDebugOverlay(this.checked);</action>
 	    </object>
 
 	    <object size="0 96 100%-18 112" type="text" style="devCommandsText">Range overlay</object>
 	    <object size="100%-16 96 100% 112" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetRangeDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 112 100%-18 128" type="text" style="devCommandsText">Bounding box overlay</object>
 	    <object size="100%-16 112 100% 128" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.SetBoundingBoxDebugOverlay(this.checked);</action>
 	    </object>
 
 	    <object size="0 128 100%-18 144" type="text" style="devCommandsText">Restrict camera</object>
 	    <object size="100%-16 128 100% 144" type="checkbox" style="StoneCrossBox" checked="true">
 			<action on="Press">
 				Engine.GameView_SetConstrainCameraEnabled(this.checked);
 				// Make selection more durable at the expense of speed if unchecked.
 				if (this.checked)
 					SELECTION_SEARCH_RADIUS -= 200;
 				else
 					SELECTION_SEARCH_RADIUS += 200; 
 			</action>
 	    </object>
 
 	    <object size="0 144 100%-18 160" type="text" style="devCommandsText">Reveal map</object>
 	    <object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="StoneCrossBox">
 		<action on="Load">this.checked = Engine.GuiInterfaceCall("IsMapRevealed");</action>
 		<action on="Press">Engine.PostNetworkCommand({"type": "reveal-map", "enable": this.checked});</action>
 	    </object>
 
 	    <object size="0 160 100%-18 176" type="text" style="devCommandsText">Enable time warp</object>
 	    <object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="StoneCrossBox">
 		<action on="Press">
         if (this.checked)
           messageBox(500, 250, "Note: time warp mode is a developer option, and not intended\nfor use over long periods of time. Using it incorrectly may\ncause the game to run out of memory or crash.", "Time warp mode", 2);
         Engine.EnableTimeWarpRecording(this.checked ? 10 : 0);</action>
 	    </object>
 
 	    <object size="0 176 100%-18 192" type="text" style="devCommandsText">Promote selected units</object>
 	    <object size="100%-16 176 100% 192" type="button" style="StoneCrossBox">
 		<action on="Press">Engine.PostNetworkCommand({"type": "promote", "entities": g_Selection.toList()});</action>
 	    </object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Time elapsed counter -->
 	<!-- ================================  ================================ -->
 	
 	<object size="100%-120 45 100%-10 65" type="text" name="timeElapsedCounter" style="SettingsText" hotkey="timeelapsedcounter.toggle" hidden="true">
 	    <action on="Press">this.hidden = !this.hidden;</action>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Pause Overlay -->
 	<!-- ================================  ================================ -->
 	<object type="button"
 		name="pauseOverlay"
 		size="0 0 100% 100%"
 		tooltip_style="sessionToolTip"
 		hidden="true"
 		z="0"
 	>
 	    <object size="0 0 100% 100%" type="image" sprite="devCommandsBackground" ghost="true" z="0"/>
 	    <object size="50%-128 50%-20 50%+128 50%+20" type="text" style="PauseText" ghost="true" z="0">Game Paused</object>
 	    <object size="50%-128 50%+20 50%+128 50%+30" type="text" style="PauseMessageText" ghost="true" z="0">Click to Resume Game</object>
 	    <action on="Press">togglePause();</action>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Notification Area -->
 	<!-- ================================  ================================ -->
 	<object name="notificationPanel" type="image" size="50%-300 60 50%+300 120" ghost="true">
 	    <object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
 	</object>
 	<object name="timeNotificationPanel" type="image" size="100%-600 60 100%-20 120" ghost="true">
 	    <object name="timeNotificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
 	</object>
 
 
 	<!-- ================================  ================================ -->
 	<!-- Chat -->
 	<!-- ================================  ================================ -->
 
 	<!-- Chat panel -->
 	<object name="chatPanel" size="0 130 100% 100%-240" type="image" ghost="true">
 	    <object name="chatText" size="3 1 100%-1 100%-1" type="text" style="chatPanel" ghost="true"/>
 	</object>
 
 	<!-- Chat window -->
 	<object name="chatDialogPanel" size="50%-180 50%-48 50%+180 50%+36" type="image" hidden="true" sprite="genericPanel">
 	    <object name="chatInput" size="16 12 100%-16 36" type="input" style="StoneInput" max_length="80">
 		<action on="Press">submitChatInput();</action>
 	    </object>
 
 	    <object size="16 100%-40 30%+16 100%-12" type="button" style="StoneButton">
 		Send
 		<action on="Press">submitChatInput();</action>
 	    </object>
 
 	    <object size="30%+24 100%-40 60%+24 100%-12" type="button" style="StoneButton">
 		Cancel
 		<action on="Press">closeChat();</action>
 	    </object>
 	    <object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="StoneCrossBox"/>
 	    <object size="60%+48 100%-40 100% 100%-12" type="text"  style="LeftLabelText">
 		Team Only
 	    </object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Diplomacy Window -->
 	<!-- ================================  ================================ -->
 	<object name="diplomacyDialogPanel"
 		size="50%-300 50%-200 50%+300 50%+150"
 		type="image"
 		hidden="true"
 		sprite="StoneDialog"
 	>
 		<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Diplomacy</object>
 
 		<object name="diplomacyHeader" size="32 32 100%-32 64">
 			<object name="diplomacyHeaderName" size="0 0 150 100%" type="text" style="chatPanel" ghost="true" caption="Name"/>
 			<object name="diplomacyHeaderCiv" size="150 0 250 100%" type="text" style="chatPanel" ghost="true" caption="Civilization"/>
 			<object name="diplomacyHeaderTeam" size="250 0 300 100%" type="text" style="chatPanel" ghost="true" caption="Team"/>
 			<object name="diplomacyHeaderTheirs" size="300 0 360 100%" type="text" style="chatPanel" ghost="true" caption="Theirs"/>
 			<object name="diplomacyHeaderAlly" size="100%-180 0 100%-160 100%" type="text" style="chatPanel" caption="A" tooltip="Ally" tooltip_style="sessionToolTipBold"/>
 			<object name="diplomacyHeaderNeutral" size="100%-160 0 100%-140 100%" type="text" style="chatPanel" caption="N" tooltip="Neutral" tooltip_style="sessionToolTipBold"/>
 			<object name="diplomacyHeaderEnemy" size="100%-140 0 100%-120 100%" type="text" style="chatPanel" caption="E" tooltip="Enemy" tooltip_style="sessionToolTipBold"/>
 			<object name="diplomacyHeaderTribute" size="100%-110 0 100% 100%" type="text" style="chatPanel" caption="Tribute"/>
 		</object>
 
 		<object size="32 64 100%-32 384">
 			<repeat count="16">
 				<object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="false">
 					<object name="diplomacyPlayerName[n]" size="0 0 150 100%" type="text" style="chatPanel" ghost="true"/>
 					<object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="chatPanel" ghost="true"/>
 					<object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="chatPanel" ghost="true"/>
 					<object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="chatPanel" ghost="true"/>
 
 					<!-- Diplomatic stance - selection -->
 					<object name="diplomacyPlayerAlly[n]" size="100%-180 0 100%-160 100%" type="button" style="StoneButton" hidden="true"/>
 					<object name="diplomacyPlayerNeutral[n]" size="100%-160 0 100%-140 100%" type="button" style="StoneButton" hidden="true"/>
 					<object name="diplomacyPlayerEnemy[n]" size="100%-140 0 100%-120 100%" type="button" style="StoneButton" hidden="true"/>
 
 					<!-- Tribute -->
 					<object name="diplomacyPlayerTributeFood[n]" size="100%-110 0 100%-90 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeFoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
 					</object>
 					<object name="diplomacyPlayerTributeWood[n]" size="100%-90 0 100%-70 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeWoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
 					</object>
 					<object name="diplomacyPlayerTributeStone[n]" size="100%-70 0 100%-50 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeStoneImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
 					</object>
 					<object name="diplomacyPlayerTributeMetal[n]" size="100%-50 0 100%-30 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeMetalImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
 					</object>
 				</object>
 			</repeat>
 		</object>
 
 		<object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
 		    Close
 		    <action on="Press">closeDiplomacy();</action>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Trade Window -->
 	<!-- ================================  ================================ -->
 	<object name="tradeDialogPanel"
 		size="50%-250 50%-130 50%+250 50%+100"
 		type="image"
 		hidden="true"
 		sprite="ModernDialog"
 	>
 		<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Trade</object>
 
 		<!-- Trading goods -->
 		<object name="tradeGoods" size="20 50 100%-20 82">
 			<object name="tradeHeader" size="0 0 180 100%" type="text" style="ModernLabelText" text_align="left" ghost="true" caption="Trading goods selection:"/>
 
 			<object size="180 0 100% 100%">
 				<repeat count="4">
 					<object name="tradeResource[n]" size="0 0 58 32">
 						<object name="tradeResourceButton[n]" size="4 0 36 100%" type="button" style="StoneButton">
 							<object name="tradeResourceIcon[n]" type="image" ghost="true"/>
 							<object name="tradeResourceSelection[n]" type="image" sprite="stretched:session/icons/corners.png" ghost="true"/>
 							<object name="tradeResourceText[n]" type="text" style="ModernLabelText" ghost="true"/>
 						</object>
 						<object name="tradeArrowUp[n]" size="36 0 52 50%" type="button" style="iconButton">
 							<object type="image" ghost="true" sprite="wheatArrowUp"/>
 						</object>
 						<object name="tradeArrowDn[n]" size="36 50% 52 100%" type="button" style="iconButton">
 							<object type="image" ghost="true" sprite="wheatArrowDn"/>
 						</object>
 					</object>
 				</repeat>
 				<object name="tradeHelp" size="100%-24 4 100% 28" enabled="false" type="button" style="StoneButton" tooltip_style="sessionToolTipBold" tooltip="Select one goods as origin of the changes, \nthen use the arrows of the target goods to make the changes.">
 					<object size="20% 15% 80% 75%" type="image" ghost="true" sprite="iconInfoWhite"/>
 				</object>
 			</object>
 		</object>
 
 		<object name="tradeStatistics" size="20 120 100%-20 168">
 			<object                    size="0   0   130   50%" type="text" style="ModernLabelText" text_align="left" ghost="true" caption="Traders:"/>
 			<object name="landTraders" size="130 0   100%  50%" type="text" style="ModernLabelText" text_align="left" ghost="true" />
 			<object                    size="0   50% 130  100%" type="text" style="ModernLabelText" text_align="left" ghost="true" caption = "Merchant ships:"/>
 			<object name="shipTraders" size="130 50% 100% 100%" type="text" style="ModernLabelText" text_align="left" ghost="true" />
 		</object>
 
 		<object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
 		    Close
 		    <action on="Press">closeTrade();</action>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Settings Window -->
 	<!-- ================================  ================================ -->
 		<object name="settingsDialogPanel"
 			style="StoneDialog"
 			type="image"
 			size="50%-180 50%-225 50%+180 50%+225"
 			hidden="true"
 			z="200"
 			>
 			<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Settings</object>
 			
 			<object style="TranslucentPanelThinBorder"
 				type="image"
 				size="32 32 100%-32 100%-70"
 				>
 				<!-- Settings / shadows -->
 				<object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
 				<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetShadowsEnabled();</action>
 					<action on="Press">Engine.Renderer_SetShadowsEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Shadow PCF -->
 				<object size="0 35 100%-80 60" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
 				<object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetShadowPCFEnabled();</action>
 					<action on="Press">Engine.Renderer_SetShadowPCFEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Water Normals -->
 				<object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Water - HQ Waviness</object>
 				<object name="waterNormalCheckox" size="100%-56 65 100%-30 90"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterNormalEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterNormalEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Real Depth -->
 				<object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Water - Use Actual Depth</object>
 				<object name="waterRealDepthCheckbox" size="100%-56 90 100%-30 115"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterRealDepthEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterRealDepthEnabled(this.checked);</action>
 				</object>
 
 				<!-- Settings / Reflection -->
 				<object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Water - Enable Reflections</object>
 				<object name="waterReflectionCheckbox" size="100%-56 115 100%-30 140"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterReflectionEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterReflectionEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Refraction -->
 				<object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Water - Enable Refraction</object>
 				<object name="waterRefractionCheckbox" size="100%-56 140 100%-30 165"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterRefractionEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterRefractionEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Foam -->
 				<object size="0 160 100%-80 185" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Foam</object>
 				<object name="waterFoamCheckbox" size="100%-56 165 100%-30 190"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterFoamEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterFoamEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Waves -->
 				<object size="0 185 100%-80 210" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Waves</object>
 				<object name="waterCoastalWavesCheckbox" size="100%-56 190 100%-30 215"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterCoastalWavesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterCoastalWavesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Shadows -->
 				<object size="0 210 100%-80 235" type="text" style="RightLabelText" ghost="true">Water - Use Surface Shadows</object>
 				<object name="waterShadowsCheckbox" size="100%-56 215 100%-30 240"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">if (Engine.Renderer_GetWaterShadowEnabled()) this.checked = true; else this.checked = false;</action>
 					<action on="Press">Engine.Renderer_SetWaterShadowEnabled(this.checked);</action>
 				</object>
 
 				<!-- Settings / Particles -->
 				<object size="0 235 100%-80 260" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
 				<object name="particlesCheckbox" size="100%-56 240 100%-30 265" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetParticlesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetParticlesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Unit Silhouettes -->
 				<object size="0 260 100%-80 285" type="text" style="RightLabelText" ghost="true">Enable Unit Silhouettes</object>
 				<object name="silhouettesCheckbox" size="100%-56 265 100%-30 290" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetSilhouettesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetSilhouettesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Music-->
 				<object size="0 285 100%-80 310" type="text" style="RightLabelText" ghost="true">Enable Music</object>
 				<object name="musicCheckbox" size="100%-56 290 100%-30 315" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
 				</object>
 				
 				<!-- Settings / Dev Overlay -->
 				<object size="0 310 100%-80 335" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
 				<object name="developerOverlayCheckbox" size="100%-56 315 100%-30 340" type="checkbox" style="StoneCrossBox" checked="false">
 					<action on="Load"><![CDATA[
 						if (Engine.HasXmppClient() && Engine.IsRankedGame())
 							this.enabled = false;
 					]]></action>
 					<action on="Press">toggleDeveloperOverlay();</action>
 				</object>
 			</object>
 			
 			<!-- Close button -->
 			<object type="button"
 				style="StoneButton"
 				size="50%-64 100%-52 50%+64 100%-24"
 				tooltip_style="sessionToolTip"
 				>
 				Close
 				<action on="Press">closeSettings(true);</action>
 			</object>
 		</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Top Panel  -->
 	<!-- ================================  ================================ -->
 	<object name="topPanel"
 		type="image"
 		sprite="topPanel"
 		size="-3 0 100%+3 36"
 	>
 	    <!-- ================================  ================================ -->
 	    <!-- Player resource bar -->
 	    <!-- ================================  ================================ -->
 	    <object
 		size="10 0 45% 100%"
 	    >
 		<!-- Food -->
 		<object size="0 0 90 100%" type="image" style="resourceCounter" tooltip="Food" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceFood"/>
 		</object>
 
 		<!-- Wood -->
 		<object size="90 0 180 100%" type="image" style="resourceCounter" tooltip="Wood" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceWood"/>
 		</object>
 
 		<!-- Stone -->
 		<object size="180 0 270 100%" type="image" style="resourceCounter" tooltip="Stone" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceStone"/>
 		</object>
 
 		<!-- Metal -->
 		<object size="270 0 360 100%"  type="image" style="resourceCounter" tooltip="Metal" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceMetal"/>
 		</object>
 
 		<!-- Population -->
 		<object size="360 0 450 100%" type="image" style="resourceCounter" tooltip="Population (current / limit)" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 34" type="image" sprite="stretched:session/icons/resources/population.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourcePop"/>
 		</object>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Civ Icon -->
 	    <!-- ================================  ================================ -->
 	    <object size="50%-48 -26 50%+48 70" name="civIcon" type="image" tooltip_style="sessionToolTipBold"/>
 
 	    <!-- Switch the view perspective to another player's (largely for AI development) -->
 	    <object size="50%+50 5 50%+150 100%-5" name="viewPlayer" type="dropdown" hidden="true" style="StoneDropDown" tooltip_style="sessionToolTipBold" tooltip="Choose player to view">
 		<action on="SelectionChange">selectViewPlayer(this.selected);</action>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Phase -->
 	    <!-- ================================  ================================ -->
 	    <!--<object size="50%+50 4 50%+300 100%-2" name="PhaseTitleBar" type="text" font="serif-bold-stroke-14" textcolor="white"> Death Match :: Village Phase</object>-->
 
 
 	    <!-- ================================  ================================ -->
 	    <!-- ALPHA LABELS (alpha, build time, revision) -->
 	    <!-- ================================  ================================ -->
 
 	    <!-- Displays Alpha name and number -->
 	    <object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="CenteredLabelText" text_valign="top" ghost="true">
 		ALPHA XV : Osiris<!-- IMPORTANT: remember to update pregame/mainmenu.xml in sync with this -->
 
 		<!-- Displays build date and revision number-->
 		<object size="50%-128 0 50%+128 100%-2" name="Engine.BuildTimeLabel" type="text" style="BuildNameText" ghost="true">
 		    <action on="Load">this.caption = Engine.BuildTime(0) + " (" + Engine.BuildTime(2) + ")"</action>
 		</object>
 	    </object>
 
 		<!-- ================================  ================================ -->
 	    <!-- Game Speed Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		name="gameSpeedButton"
 		size="100%-258 4 100%-230 32"
 		style="iconButton"
 		tooltip_style="sessionToolTip"
 		tooltip="Game speed"
 	    >
 			<object size="5 5 100%-5 100%-5" type="image" sprite="stretched:session/icons/resources/time_small.png" ghost="true"/>
 			<action on="Press">
 				toggleGameSpeed();
 			</action>
 	    </object>
 
 		<object size="100%-380 40 100%-230 65" name="gameSpeed" type="dropdown" buffer_zone="5" style="StoneDropDown" hidden="true" tooltip="Choose game speed" tooltip_style="sessionToolTip"/>
 		
 	    <!-- ================================  ================================ -->
 	    <!-- Diplomacy Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		name="diplomacyButton1"
 		size="100%-226 4 100%-198 32"
 		style="iconButton"
 		tooltip_style="sessionToolTip"
 		tooltip="Diplomacy"
 	    >
 		<!-- TODO make the button less ugly -->
 		<object size="0 0 100% 100%" name="diplomacyButtonImage" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
 		<action on="Press">
 		    toggleDiplomacy();
 		</action>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Trade Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		name="tradeButton1"
 		size="100%-194 4 100%-166 32"
 		style="iconButton"
 		tooltip_style="sessionToolTip"
 		tooltip="Trade"
 	    >
 		<!-- TODO make the button less ugly -->
 		<object size="0 0 100% 100%" name="tradeButtonImage" type="image" sprite="stretched:session/icons/economics.png" ghost="true"/>
 		<action on="Press">
 		    toggleTrade();
 		</action>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Menu Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		    name="menuButton"
 		    size="100%-164 4 100%-8 32"
 		    style="StoneButtonFancy"
 		    tooltip_style="sessionToolTip"
 		    z="70"
 	    >
 		<!-- This object covers up the text on the menu
 		buttons as they slide by so that you don't see
 		them on top of the main menu button -->
 		<object size="0 -4 100% 0" type="image" sprite="horizontalThinBorder" ghost="true"/>
 
 		<object size="50%-32 50%-16 50%+32 50%+16" type="image" sprite="menuButton" ghost="true">MENU</object>
 		<action on="Press">
 		    toggleMenu();
 		</action>
 	    </object> <!-- END OF MENU BUTTON -->
 	</object> <!-- END OF TOP PANEL -->
 
 	<!-- ================================  ================================ -->
 	<!-- Menu -->
 	<!-- ================================  ================================ -->
 	<object name="menu"
 		style="StonePanelThinBorder"
 		type="image"
 		hidden="false"
 		z="40"
 	>
 	    <object size="4 36 100%-4 50%+20">
+		
+			<!-- Manual button -->
+			<object type="button"
+				name="manualButton"
+				style="StoneButtonFancy"
+				size="0 0 100% 28"
+				tooltip_style="sessionToolTip"
+			>
+				Manual
+				<action on="Press">openManual();</action>
+			</object>
+			
+			<!-- Chat button -->
+			<object type="button"
+				name="chatButton"
+				style="StoneButtonFancy"
+				size="0 32 100% 60"
+				tooltip_style="sessionToolTip"
+			>
+				Chat
+				<action on="Press">chatMenuButton();</action>
+			</object>
 
-		<!-- Settings button -->
-		<object type="button"
-			name="settingsButton"
-			style="StoneButtonFancy"
-			size="0 0 100% 28"
-			tooltip_style="sessionToolTip"
-		>
-		    Settings
-		    <action on="Press">settingsMenuButton();</action>
-		</object>
-
-
-		<!-- Save game button -->
-		<object type="button"
-			name="saveGameButton"
-			style="StoneButtonFancy"
-			size="0 32 100% 60"
-			tooltip_style="sessionToolTip"
-		>
-		    Save
-		    <action on="Press">
-			openSave();
-		    </action>
-		</object>
-
-		<!-- Chat button -->
-		<object type="button"
-			name="chatButton"
-			style="StoneButtonFancy"
-			size="0 64 100% 92"
-			tooltip_style="sessionToolTip"
-		>
-		    Chat
-		    <action on="Press">chatMenuButton();</action>
-		</object>
-
-		<!-- Resign button -->
-		<object type="button"
-			name="menuResignButton"
-			style="StoneButtonFancy"
-			size="0 96 100% 124"
-			tooltip_style="sessionToolTip"
-		>
-		    Resign
-		    <action on="Press">resignMenuButton();</action>
-		</object>
-
-		<!-- Exit button -->
-		<object type="button"
-			name="menuExitButton"
-			style="StoneButtonFancy"
-			size="0 128 100% 156"
-			tooltip_style="sessionToolTip"
-		>
-		    Exit
-		    <action on="Press">exitMenuButton();</action>
-		</object>
-
-		<!-- Pause / Resume Button -->
-		<object type="button"
-			name="pauseButton"
-			style="StoneButtonFancy"
-			size="0 160 100% 188"
-			tooltip_style="sessionToolTip"
-		>
-		    <object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">Pause</object>
-		    <action on="Press">togglePause();</action>
-		</object>
+			<!-- Save game button -->
+			<object type="button"
+				name="saveGameButton"
+				style="StoneButtonFancy"
+				size="0 64 100% 92"
+				tooltip_style="sessionToolTip"
+			>
+				Save
+				<action on="Press">
+				openSave();
+				</action>
+			</object>
+			
+			<!-- Settings button -->
+			<object type="button"
+				name="settingsButton"
+				style="StoneButtonFancy"
+				size="0 96 100% 124"
+				tooltip_style="sessionToolTip"
+			>
+				Settings
+				<action on="Press">settingsMenuButton();</action>
+			</object>
 
-		<!-- Manual button -->
-		<object type="button"
-			name="manualButton"
-			style="StoneButtonFancy"
-			size="0 192 100% 220"
-			tooltip_style="sessionToolTip"
-		>
-			Manual
-			<action on="Press">openManual();</action>
-		</object>
+			<!-- Pause / Resume Button -->
+			<object type="button"
+				name="pauseButton"
+				style="StoneButtonFancy"
+				size="0 128 100% 156"
+				tooltip_style="sessionToolTip"
+			>
+				<object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">Pause</object>
+				<action on="Press">togglePause();</action>
+			</object>
+			
+			<!-- Resign button -->
+			<object type="button"
+				name="menuResignButton"
+				style="StoneButtonFancy"
+				size="0 160 100% 188"
+				tooltip_style="sessionToolTip"
+			>
+				Resign
+				<action on="Press">resignMenuButton();</action>
+			</object>
+			
+			<!-- Exit button -->
+			<object type="button"
+				name="menuExitButton"
+				style="StoneButtonFancy"
+				size="0 192 100% 220"
+				tooltip_style="sessionToolTip"
+			>
+				Exit
+				<action on="Press">exitMenuButton();</action>
+			</object>
 		</object>
 	</object>
 
 	<!-- In-progress research -->
 	<object size="100%-50 85 100%-10 100%-200">
 		<repeat count="10">
 			<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
 				<object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
 				<object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37"/>
 			</object>
 		</repeat>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Hero Selection -->
 	<!-- ================================  ================================ -->
 <object
 		name="unitHeroPanel"
 		size="0 36 50 93"
 		hidden="true"
 	>
 		<object name="unitHeroButton" size="0 0 50 50" type="button" style="iconButton" 
 			tooltip_style="sessionToolTip" tooltip="Attack and Armor"
 		>
 			<object name="unitHeroImage" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
 			<object name="heroHitOverlay" hidden="true" type="image" ghost="true" size="5 5 100%-5 100%-5"/> 
 		</object>
 		<!-- Hero Health bar -->
 		<object size="3 100%-7 100%-3 100%-2" name="heroHealthSection" ghost="true">
 			<object size="0 0 100% 5" name="heroHealth" type="image" ghost="true">
 				<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				<object type="image" sprite="healthBackground" ghost="true"/> 
 				<object type="image" sprite="healthForeground" ghost="true" name="heroHealthBar"/> 
 				<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 			</object>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Unit Selection Groups -->
 	<!-- ================================  ================================ -->
 	<object
 		name="unitGroupPanel"
 		size="0% 50%-216 0%+36 50%+144"
 	>
 		<repeat count="10">
 			<object name="unitGroupButton[n]" size="0 0 36 36" type="button" hidden="false" style="iconButton" tooltip_style="sessionToolTipBottomBold"
 				tooltip="Click to select grouped units, double-click to focus the grouped units and right-click to disband the group."
 			>
 				<object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
 				<object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
 			</object>
 		</repeat>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Information tooltip -->
 	<!-- Follows the mouse around if 'independent' is set to 'true'. -->
 	<!-- ================================  ================================ -->
 	<object name="informationTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Building placement info tooltip -->
 	<!-- ================================  ================================ -->
 	<object name="placementTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- ================================  ================================ -->
 	<!-- START of BOTTOM PANEL -->
 	<!-- ================================  ================================ -->
 
 	<object size="50%-512 100%-180 50%+512 100%">
 
 	<!-- ================================  ================================ -->
 	<!-- Minimap -->
 	<!-- ================================  ================================ -->
 	<object
 		name="minimapPanel"
 		size="0 100%-212 212 100%"
 		type="image"
 		sprite="mapPanel"
 		z="20"
 	>
 		<object name="minimap"
 			type="minimap"
 			size="8 8 100%-8 100%-8"
 		>
 			<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
 		</object>
 
 		<object name="minimapOverlay" size="4 4 100%-4 100%-4" type="image" sprite="stretched:session/minimap_circle_modern.png" ghost="true"/>
 
 		<!-- Idle Worker Button -->
 		<object size="100%-36 100%-36 100%-5 100%-5">
 			<!-- TODO: should highlight the button if there's non-zero idle workers -->
 			<object name="idle-overlay" size="-85 -85 100% 100%" type="image" sprite="stretched:session/minimap-idle.png" ghost="true"/>
 			<!-- Since we don't support non-rectangular buttons, we approximate the area using 3 rectangles TODO: Make this cleaner -->
 			<object type="button"
 				tooltip_style="sessionToolTip"
 				tooltip="Find idle worker"
 				hotkey="selection.idleworker"
 			>
 				<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
 			</object>
 			<object type="button"
 				tooltip_style="sessionToolTip"
 				tooltip="Find idle worker"
 				size="15 -15 100% 0"
 			>
 				<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
 			</object>
 			<object type="button"
 				tooltip_style="sessionToolTip"
 				tooltip="Find idle worker"
 				size="-15 15 0 100%"
 			>
 				<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
 			</object>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Supplemental Details Panel (Left of Selection Details) -->
 	<!-- ================================  ================================ -->
 	<object size="50%-304 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="supplementalDetailsPanel" z="20">
 
 		<object name="unitFormationPanel" size="24 12 100% 100%">
 			<object size="0 0 100% 100%">
 				<repeat count="16">
 					<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
 						<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 						<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
 					</object>
 				</repeat>
 			</object>
 		</object>
 
 		<object name="unitGarrisonPanel" size="24 12 100% 100%">
 			<object size="0 0 100% 100%">
 				<repeat count="12">
 					<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
 						<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 						<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
 					</object>
 				</repeat>
 			</object>
 		</object>
 
 		<object name="unitBarterPanel" 
 			size="6 36 100% 100%"
 			hidden="true"
 		>
 		    <object ghost="true" style="resourceText" type="text" size="0 0 100% 20">Exchange resources:</object>
 		    <object size="0 32 100% 78">
 			<repeat count="4">
 			    <object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
 				<object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitBarterSellUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
 				<object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 				<object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		    <object size="0 78 100% 124">
 			<repeat count="4">
 			    <object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
 				<object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitBarterBuyUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
 				<object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<!-- Stance Selection -->
 		<object name="unitStancePanel"
 			style="TranslucentPanel"
 			size="4 100%-43 100%-4 100%-4"
 			type="text"
 		>
 		    <object size="1 2 100% 100%">
 			<repeat count="5">
 			    <object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 				<object name="unitStanceSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Selection Details Panel (Middle) -->
 	    <!-- ================================  ================================ -->
 	    <object name="selectionDetails"
 		    type="image"
 		    sprite="selectionDetailsPanel"
 		    size="50%-114 100%-205 50%+114 100%"
 		    hidden="false"
 	    >
 		<!-- Unit details for Single Unit -->
 		<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
 		    
 		    <!-- Stats Bars -->
 		    <object size= "2 0 100%-2 98" type="image" tooltip_style="sessionToolTip">
 			
 			<object size="0 8 100% 60" type="image" sprite="edgedPanelShader">
 			    <!-- Health bar -->
 			    <object size="88 0 100% 24" name="healthSection">
 				<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">Health:</object>
 				<object size="0 0 100% 16" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 16 100% 23" name="health" type="image">
 				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				    <object type="image" sprite="healthBackground" ghost="true"/>
 				    <object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
 				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
 			    </object>
 
 			    <!-- Stamina bar -->
 			    <object size="88 28 100% 52" name="staminaSection">
 				<object size="0 0 100% 16" name="staminaLabel" type="text" style="StatsTextLeft" ghost="true">Stamina:</object>
 				<object size="0 0 100% 16" name="staminaStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 16 100% 23" name="stamina" type="image">
 				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				    <object type="image" sprite="staminaBackground" ghost="true"/>
 				    <object type="image" sprite="staminaForeground" ghost="true" name="staminaBar"/>
 				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
 			    </object>
 
 			    <!-- Resource bar -->
 			    <object size="88 28 100% 52" name="resourceSection">
 				<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
 				<object size="0 0 100% 16" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 16 100% 23" name="resources" type="image">
 				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				    <object type="image" sprite="resourceBackground" ghost="true"/>
 				    <object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
 				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
 			    </object>
 			</object>
 			
 			<object size="0 60 100% 96" type="image" sprite="edgedPanelShader">
 			    <!-- Attack and Armor -->
 			    <object size="90 -2 126 34" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip="Attack and Armor" tooltip_style="sessionToolTip"/>
 
 			    <!-- Resource carrying icon/counter -->
 			    <!-- Used also for number of gatherers/builders -->
 			    <object size="100%-98 -2 100%-28 34" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
 			    <object size="100%-36 -2 100% 34" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
 			</object>
 			
 			<!-- Big unit icon -->
 			<object size="-8 -8 88 88" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
 			    <object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
 			
 			    <!-- Experience bar -->
 			    <object size="2 2 6 100%-2" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
 				<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				<object type="image" sprite="experienceBackground" ghost="true"/>
 				<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
 				<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 			    </object>
 			
 			    <object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip="Rank" tooltip_style="sessionToolTip"/>
 			</object>
 		    </object>
 		    
 		    <!-- Names (this must come before the attack and armor icon to avoid clipping issues) -->
 		    <object size="2 96 100%-2 100%-36" name="statsArea" type="image" sprite="edgedPanelShader">
 			
 			<!-- These images are used to clip off the top and bottom of the civ icon -->
 			<object z="30" size="0 -5 100% 40" ghost="true" type="image" sprite="remove"/>
 			<object z="30" size="0 100%-5 100% 100%+40" ghost="true" type="image" sprite="remove"/>
 			
 			<object z="30" size="0 2 100% 45" ghost="true">
 			    <!-- Specific Name -->
 			    <object size="0 0 100% 20" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
 
 			    <!-- Generic Name -->
 			    <object size="0 15 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 			</object>
 			
 			<!-- Player Name and Civ -->
 			<object size="0 40 100% 100%">
 			    <object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
 			    <object size="0 0 100% 100%" name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
 			    <object size="0 0 100% 100%" type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
 			    
 			    <!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
 			    <object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
 			</object>
 		    </object>
 
 		</object>
 
 		<!-- Unit details for Multiple Units -->
 		<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
 
 		    <object name="unitSelectionPanel"
 			    size="20 12 100%-20 100%"
 		    >
 			<object size="0 0 100% 100%">
 			    <repeat count="16">
 				<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBold" z="100">
 				    <object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 				    <object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
 				    <object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
 				    </object>
 				</object>
 			    </repeat>
 			</object>
 		    </object>
 
 		    <!-- Total -->
 		    <object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
 			<object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits"/>
 		    </object>
 
 		    <!-- Stats Bars -->
 		    <object size= "100%-38 50 100%-18 100%-44" type="image" tooltip_style="sessionToolTip">
 			<!-- Health bar -->
 			<object size="4 0 11 100%" type="image" name="healthMultiple" tooltip="Hitpoints" tooltip_style="sessionToolTip">
 			    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 			    <object type="image" sprite="healthBackground" ghost="true"/>
 			    <object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
 			    <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 			</object>
 
 			<!-- Stamina bar -->
 			<object size="15 0 22 100%" type="image" name="staminaMultiple" tooltip="Stamina" tooltip_style="sessionToolTipBold">
 			    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 			    <object type="image" sprite="staminaBackground" ghost="true"/>
 			    <object type="image" sprite="staminaForeground" ghost="true" name="staminaBarMultiple"/>
 			    <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 			</object>
 		    </object>
 		</object>
 
 		<!-- Unit Commands -->
 		<object name="unitCommandPanel"
 			size="0 100%-36 100% 100%-4"
 			type="image"
 			z="30"
 		>
 		    <object size="0 1 100% 100%">
 			<repeat count="6">
 			    <object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
 				<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
 				<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<!-- shading for unit commands area -->
 		<object z="50" size="4 100%-36 100%-4 100%-4" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
 
 	    </object> <!-- END OF SELECTION DETAILS -->
 
 	    <!-- ================================  ================================ -->
 	    <!-- Commands Panel (Right of Selection Details) -->
 	    <!-- ================================  ================================ -->
 	    <object name="unitCommands"
 		    type="image"
 		    sprite="unitCommandsPanel"
 		    size="50%+110 100%-170 50%+512 100%"
 		    hidden="false"
 		    z="20"
 	    >
 		<object name="unitConstructionPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="24">
 			    <object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitConstructionUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitResearchPanel"
 			size="10 100%-102 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="16">
 			    <object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
 				<object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
 			    </object>
 			</repeat>
 			<repeat count="8">
 			    <object name="unitResearchPair[n]" hidden="true" size="0 0 46 92">
 				<object name="unitResearchPairIcon[n]" type="image" ghost="true" size="8 38 38 54" sprite="stretched:session/icons/vertical_pair.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitTrainingPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="24">
 			    <object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitTrainingUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
 				<object name="unitTrainingCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitTradingPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="4">
 			    <object name="unitTradingButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitTradingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitTradingSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitQueuePanel"
 			size="4 -56 100% 0"
 			type="image"
 			sprite="queuePanelShader"
 		>
 		    <object size="-4 -2 52 54" type="image" sprite="stretched:session/icons/production.png" tooltip_style="sessionToolTipBottom" tooltip="Production queue">
 			<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
 		    </object>
 
 		    <object size="48 6 100% 100%">
 			<repeat count="16">
 			    <object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
 				<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
 				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
 				<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitGatePanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="8">
 			    <object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 				<object name="unitGateUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
     
     <object name="unitPackPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="8">
 			    <object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 	    </object> <!-- END OF UNIT COMMANDS -->
 
 	</object><!-- END OF BOTTOM PANEL -->
 
     </object> <!-- END OF SN OBJECT -->
 
     <!-- ================================  ================================ -->
     <!-- Selection bandbox -->
     <!-- ================================  ================================ -->
     <object name="bandbox" type="image" sprite="bandbox" ghost="true" hidden="true" z="200"/>
 
     <!-- ================================  ================================ -->
     <!-- Network status -->
     <!-- ================================  ================================ -->
     <object name="netStatus" type="text" style="netStatus" z="100" hidden="true">
 	<object type="button"
 		name="disconnectedExitButton"
 		style="StoneButton"
 		size="50%-84 50%+128 50%+84 50%+160"
 		tooltip_style="sessionToolTip"
 	>
 	    <object size="0 0 100% 100%" type="text" style="CenteredButtonText" name="disconnectedExitButtonText" ghost="true">Exit</object>
 	    <action on="Press">leaveGame()</action>
 	</object>
 
     </object>
 
 </objects>