From 2c3ce94950acbecfa2c0bfb3426b542b0e834d21 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Mon, 15 Nov 2004 00:13:21 +0000
Subject: [PATCH] GUI updated with revised twin-coordinate system (still have
 to make most of the objects use it, though).

This was SVN commit r1318.
---
 .../data/mods/official/gui/test/1_init.xml    |  10 +-
 .../data/mods/official/gui/test/3_session.xml | 482 +++++++++---------
 .../data/mods/official/gui/test/6_global.xml  |  54 ++
 .../official/gui/test/functions_session.js    | 106 ++--
 .../gui/test/functions_session_group_pane.js  | 103 ++++
 .../data/mods/official/gui/test/sprite1.xml   |  14 +-
 .../data/mods/official/gui/test/styles.xml    |   2 +
 7 files changed, 482 insertions(+), 289 deletions(-)
 create mode 100755 binaries/data/mods/official/gui/test/6_global.xml
 create mode 100755 binaries/data/mods/official/gui/test/functions_session_group_pane.js

diff --git a/binaries/data/mods/official/gui/test/1_init.xml b/binaries/data/mods/official/gui/test/1_init.xml
index 016ac0ed3d..ee3c1647f6 100755
--- a/binaries/data/mods/official/gui/test/1_init.xml
+++ b/binaries/data/mods/official/gui/test/1_init.xml
@@ -34,9 +34,11 @@
         <script file="gui/test/functions_atlas.js"><![CDATA[
         ]]></script>
 
-        <script file="gui/test/functions_session.js"><![CDATA[
-                initSession();
-                writeConsole("Loaded GUI functions.");
-        ]]></script>
+	<script file="gui/test/functions_session_group_pane.js"><![CDATA[
+	]]></script>
+
+	<script file="gui/test/functions_session.js"><![CDATA[
+		initSession();
+	]]></script>
 
 </objects>
diff --git a/binaries/data/mods/official/gui/test/3_session.xml b/binaries/data/mods/official/gui/test/3_session.xml
index 3873acd723..656eb6ce67 100755
--- a/binaries/data/mods/official/gui/test/3_session.xml
+++ b/binaries/data/mods/official/gui/test/3_session.xml
@@ -26,558 +26,550 @@
 
 			<object type="text" name="session_group_pane_bg" sprite="tooltip-background" z="60" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"0%+20 0% 100%-20 0%+127",
 					"0%+20 100%-127 100%-20 100%");
 				]]></action>
 			</object>
 			<!-- First row. -->
-			<object type="button" name="session_group_pane_portrait_1" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_1" style="portrait" z="60" hidden="false">1
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
-					"50%-16      32 50%+16      64", 
-					"50%-16 100%-64 50%+16 100%-32");
+					AddSizeGroupPane(this.name, 0, 0);
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_1_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_1_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
-					"50%-16 66 50%+16 70",
-					"50%-16 100%-70 50%+16 100%-66");
+					AddSizeGroupPaneBar(this.name);
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_2" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_2" style="portrait" z="60" hidden="false">2
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
-					"50%-52 32 50%-20 64",
-					"50%-52 100%-64 50%-20 100%-32");
+					AddSizeGroupPane(this.name, 0, 1);
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_2_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_2_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
-					"50%-52 66 50%-20 70",
-					"50%-52 100%-70 50%-20 100%-66");
+					AddSizeGroupPaneBar(this.name);
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_3" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_3" style="portrait" z="60" hidden="false">3
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+20 32 50%+52 64",
-					"50%+20 100%-64 50%+52 100%-32");
+					"50%+20 100%-70 50%+52 100%-38");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_3_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_3_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+20 66 50%+52 70",
-					"50%+20 100%-70 50%+52 100%-66");
+					"50%+20 100%-36 50%+52 100%-32");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_4" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_4" style="portrait" z="60" hidden="false">4
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-88 32 50%-56 64",
-					"50%-88 100%-64 50%-56 100%-32");
+					"50%-88 100%-70 50%-56 100%-38");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_4_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_4_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-88 66 50%-56 70",
-					"50%-88 100%-70 50%-56 100%-66");
+					"50%-88 100%-36 50%-56 100%-32");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_5" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_5" style="portrait" z="60" hidden="false">5
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+56 32 50%+88 64",
-					"50%+56 100%-64 50%+88 100%-32");
+					"50%+56 100%-70 50%+88 100%-38");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_5_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_5_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+56 66 50%+88 70",
-					"50%+56 100%-70 50%+88 100%-66");
+					"50%+56 100%-36 50%+88 100%-32");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_6" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_6" style="portrait" z="60" hidden="false">6
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-124 32 50%-92 64",
-					"50%-124 100%-64 50%-92 100%-32");
+					"50%-124 100%-70 50%-92 100%-38");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_6_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_6_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-124 66 50%-92 70",
-					"50%-124 100%-70 50%-92 100%-66");
+					"50%-124 100%-36 50%-92 100%-32");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_7" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_7" style="portrait" z="60" hidden="false">7
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+92 32 50%+124 64",
-					"50%+92 100%-64 50%+124 100%-32");
+					"50%+92 100%-70 50%+124 100%-38");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_7_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_7_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+92 66 50%+124 70",
-					"50%+92 100%-70 50%+124 100%-66");
+					"50%+92 100%-36 50%+124 100%-32");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_8" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_8" style="portrait" z="60" hidden="false">8
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-160 32 50%-128 64",
-					"50%-160 100%-64 50%-128 100%-32");
+					"50%-160 100%-70 50%-128 100%-38");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_8_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_8_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-160 66 50%-128 70",
-					"50%-160 100%-70 50%-128 100%-66");
+					"50%-160 100%-36 50%-128 100%-32");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_9" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_9" style="portrait" z="60" hidden="false">9
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+128 32 50%+160 64",
 					"50%+128 100%-64 50%+160 100%-32");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_9_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_9_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+128 66 50%+160 70",
 					"50%+128 100%-70 50%+160 100%-66");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_10" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_10" style="portrait" z="60" hidden="false">10
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-196 32 50%-164 64",
 					"50%-196 100%-64 50%-164 100%-32");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_10_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_10_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-196 66 50%-164 70",
 					"50%-196 100%-70 50%-164 100%-66");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_11" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_11" style="portrait" z="60" hidden="false">11
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+164 32 50%+192 64",
 					"50%+164 100%-64 50%+192 100%-32");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_11_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_11_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+164 66 50%+192 70",
 					"50%+164 100%-70 50%+192 100%-66");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_12" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_12" style="portrait" z="60" hidden="false">12
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-232 32 50%-200 64",
 					"50%-232 100%-64 50%-200 100%-32");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_12_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_12_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-232 66 50%-200 70",
 					"50%-232 100%-70 50%-200 100%-66");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_13" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_13" style="portrait" z="60" hidden="false">13
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+200 32 50%+232 64",
 					"50%+200 100%-64 50%+232 100%-32");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_13_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_13_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+200 66 50%+232 70",
 					"50%+200 100%-70 50%+232 100%-66");
 				]]></action>
 			</object>
 
 			<!-- Second row. -->
-			<object type="button" name="session_group_pane_portrait_14" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_14" style="portrait" z="60" hidden="false">14
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-16 78 50%+16 110",
 					"50%-16 100%-110 50%+16 100%-78");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_14_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_14_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-16 112 50%+16 116",
 					"50%-16 100%-116 50%+16 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_15" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_15" style="portrait" z="60" hidden="false">15
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-52 78 50%-20 110",
 					"50%-52 100%-110 50%-20 100%-78");
 				]]></action>
 			</object>
-			<object type="progressbar" name="session_group_pane_portrait_15_bar" style="group_portrait_bar" z="60" hidden="false" >
+			<object type="progressbar" name="session_group_pane_portrait_15_bar" style="group_portrait_bar" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-52 112 50%-20 116",
 					"50%-52 100%-116 50%-20 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_16" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_16" style="portrait" z="60" hidden="false">16
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+20 78 50%+52 110",
 					"50%+20 100%-110 50%+52 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_16_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+20 112 50%+52 116",
 					"50%+20 100%-116 50%+52 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_17" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_17" style="portrait" z="60" hidden="false">17
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-88 78 50%-56 110",
 					"50%-88 100%-110 50%-56 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_17_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-88 112 50%-56 116",
 					"50%-88 100%-116 50%-56 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_18" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_18" style="portrait" z="60" hidden="false">18
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+56 78 50%+88 110",
 					"50%+56 100%-110 50%+88 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_18_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+56 112 50%+88 116",
 					"50%+56 100%-116 50%+88 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_19" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_19" style="portrait" z="60" hidden="false">19
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-124 78 50%-92 110",
 					"50%-124 100%-110 50%-92 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_19_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-124 112 50%-92 116",
 					"50%-124 100%-116 50%-92 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_20" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_20" style="portrait" z="60" hidden="false">20
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+92 78 50%+124 110",
 					"50%+92 100%-110 50%+124 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_20_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+92 112 50%+124 116",
 					"50%+92 100%-116 50%+124 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_21" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_21" style="portrait" z="60" hidden="false">21
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-160 78 50%-128 110",
 					"50%-160 100%-110 50%-128 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_21_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-160 112 50%-128 116",
 					"50%-160 100%-116 50%-128 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_22" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_22" style="portrait" z="60" hidden="false">22
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+128 78 50%+160 110",
 					"50%+128 100%-110 50%+160 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_22_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+128 112 50%+160 116",
 					"50%+128 100%-116 50%+160 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_23" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_23" style="portrait" z="60" hidden="false">23
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-196 78 50%-164 110",
 					"50%-196 100%-110 50%-164 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_23_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-196 112 50%-164 116",
 					"50%-196 100%-116 50%-164 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_24" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_24" style="portrait" z="60" hidden="false">24
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+164 78 50%+192 110",
 					"50%+164 100%-110 50%+192 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_24_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+164 112 50%+192 116",
 					"50%+164 100%-116 50%+192 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_25" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_25" style="portrait" z="60" hidden="false">25
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-232 78 50%-200 110",
 					"50%-232 100%-110 50%-200 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_25_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-232 112 50%-200 116",
 					"50%-232 100%-116 50%-200 100%-112");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_26" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_26" style="portrait" z="60" hidden="false">26
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+200 78 50%+232 110",
 					"50%+200 100%-110 50%+232 100%-78");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_26_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+200 112 50%+232 116",
 					"50%+200 100%-116 50%+232 100%-112");
 				]]></action>
 			</object>
 
 			<!-- Third row. -->
-			<object type="button" name="session_group_pane_portrait_27" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_27" style="portrait" z="60" hidden="false">27
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-16 124 50%+16 156",
 					"50%-16 100%-156 50%+16 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_27_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-16 158 50%+16 162",
 					"50%-16 100%-162 50%+16 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_28" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_28" style="portrait" z="60" hidden="false">28
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-52 124 50%-20 156",
 					"50%-52 100%-156 50%-20 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_28_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-52 158 50%-20 162",
 					"50%-52 100%-162 50%-20 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_29" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_29" style="portrait" z="60" hidden="false">29
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+20 124 50%+52 156",
 					"50%+20 100%-156 50%+52 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_29_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+20 158 50%+52 162",
 					"50%+20 100%-162 50%+52 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_30" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_30" style="portrait" z="60" hidden="false">30
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-88 124 50%-56 156",
 					"50%-88 100%-156 50%-56 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_30_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-88 158 50%-56 162",
 					"50%-88 100%-162 50%-56 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_31" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_31" style="portrait" z="60" hidden="false">31
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+56 124 50%+88 156",
 					"50%+56 100%-156 50%+88 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_31_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+56 158 50%+88 162",
 					"50%+56 100%-162 50%+88 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_32" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_32" style="portrait" z="60" hidden="false">32
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-124 124 50%-92 156",
 					"50%-124 100%-156 50%-92 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_32_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-124 158 50%-92 162",
 					"50%-124 100%-162 50%-92 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_33" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_33" style="portrait" z="60" hidden="false">33
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+92 124 50%+124 156",
 					"50%+92 100%-156 50%+124 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_33_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+92 158 50%+124 162",
 					"50%+92 100%-162 50%+124 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_34" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_34" style="portrait" z="60" hidden="false">34
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-160 124 50%-128 156",
 					"50%-160 100%-156 50%-128 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_34_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-160 158 50%-128 162",
 					"50%-160 100%-162 50%-128 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_35" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_35" style="portrait" z="60" hidden="false">35
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+128 124 50%+160 156",
 					"50%+128 100%-156 50%+160 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_35_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+128 158 50%+160 162",
 					"50%+128 100%-162 50%+160 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_36" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_36" style="portrait" z="60" hidden="false">36
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-196 124 50%-164 156",
 					"50%-196 100%-156 50%-164 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_36_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-196 158 50%-164 162",
 					"50%-196 100%-162 50%-164 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_37" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_37" style="portrait" z="60" hidden="false">37
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+164 124 50%+192 156",
 					"50%+164 100%-156 50%+192 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_37_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+164 158 50%+192 162",
 					"50%+164 100%-162 50%+192 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_38" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_38" style="portrait" z="60" hidden="false">38
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-232 124 50%-200 156",
 					"50%-232 100%-156 50%-200 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_38_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-232 158 50%-200 162",
 					"50%-232 100%-162 50%-200 100%-158");
 				]]></action>
 			</object>
-			<object type="button" name="session_group_pane_portrait_39" style="portrait" z="60" hidden="false">
+			<object type="button" name="session_group_pane_portrait_39" style="portrait" z="60" hidden="false">39
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+200 124 50%+232 156",
 					"50%+200 100%-156 50%+232 100%-124");
 				]]></action>
 			</object>
 			<object type="progressbar" name="session_group_pane_portrait_39_bar" style="group_portrait_bar" z="60" hidden="false" >
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+200 158 50%+232 162",
 					"50%+200 100%-162 50%+232 100%-158");
 				]]></action>
@@ -593,14 +585,14 @@
                         <!-- FOOD icon/background/text-->
                         <object type="text" name="resource_food" sprite="resource_food" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-191 0%+4 50%-171 0%+24", 
 					"50%-191 100%-24 50%-171 100%-4");
 				]]></action>
 			</object>
                         <object type="text" name="resource_food_counter" sprite="resource_counter" z="70" font="prospero16" textcolor="255 255 255" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-171 0%+5 50%-118 0%+24", 
 					"50%-171 100%-24 50%-118 100%-5");
 				]]></action>
@@ -608,7 +600,7 @@
                         <object type="text" name="resource_food_text" font="prospero16" textcolor="255 255 255" z="70" ghost="true" hidden="false">
                                 <action on="Load"><![CDATA[
                                         this.caption = "123,456";
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-175 0%+1 50%-118 0%+10", 
 					"50%-175 100%-28 50%-118 100%-4");
                                 ]]></action>
@@ -618,14 +610,14 @@
                         <!-- icon/background/text -->
                         <object type="text" name="resource_wood" sprite="resource_wood" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-111 0%+4 50%-91 0%+24", 
 					"50%-111 100%-24 50%-91 100%-4");
 				]]></action>
 			</object>
                         <object type="text" name="resource_wood_counter" sprite="resource_counter" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-91 0%+5 50%-38 0%+24", 
 					"50%-91 100%-24 50%-38 100%-5");
 				]]></action>
@@ -633,7 +625,7 @@
                         <object type="text" name="resource_wood_text" font="prospero16" textcolor="255 255 255" z="70" ghost="true" hidden="false">
                                 <action on="Load"><![CDATA[
                                         this.caption = "789,012";
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-95 0%+1 50%-42 0%+10", 
 					"50%-95 100%-28 50%-42 100%-4");
                                 ]]></action>
@@ -643,14 +635,14 @@
                         <!-- icon/background/text -->
                         <object type="text" name="resource_stone" sprite="resource_stone" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-31 0%+4 50%-11 0%+24", 
 					"50%-31 100%-24 50%-11 100%-4");
 				]]></action>
 			</object>
                         <object type="text" name="resource_stone_counter" sprite="resource_counter" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-11 0%+5 50%+42 0%+24", 
 					"50%-11 100%-24 50%+42 100%-5");
 				]]></action>
@@ -658,7 +650,7 @@
                         <object type="text" name="resource_stone_text" font="prospero16" textcolor="255 255 255" z="70" ghost="true" hidden="false">
                                 <action on="Load"><![CDATA[
                                         this.caption = "345,678";
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%-13 0%+1 50%+40 0%+10", 
 					"50%-13 100%-28 50%+40 100%-4");
                                 ]]></action>
@@ -668,14 +660,14 @@
                         <!-- icon/background/text -->
                         <object type="text" name="resource_ore" sprite="resource_ore" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+49 0%+4 50%-29 0%+24", 
 					"50%+49 100%-24 50%-29 100%-4");
 				]]></action>
 			</object>
                         <object type="text" name="resource_ore_counter" sprite="resource_counter" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+69 0%+5 50%+122 0%+24", 
 					"50%+69 100%-24 50%+122 100%-5");
 				]]></action>
@@ -683,7 +675,7 @@
                         <object type="text" name="resource_ore_text" font="prospero16" textcolor="255 255 255" z="70" ghost="true" hidden="false">
                                 <action on="Load"><![CDATA[
                                         this.caption = "910,123";
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+67 0%+1 50%+120 0%+24", 
 					"50%+67 100%-28 50%+120 100%-4");
                                 ]]></action>
@@ -693,14 +685,14 @@
                         <!-- icon/background/text -->
                         <object type="text" name="resource_population" sprite="resource_population" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+129 0%+4 50%+149 0%+24", 
 					"50%+129 100%-24 50%+149 100%-4");
 				]]></action>
 			</object>
                         <object type="text" name="resource_population_counter" sprite="resource_counter_long" z="70" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+149 0%+5 50%+202 0%+24", 
 					"50%+149 100%-24 50%+202 100%-5");
 				]]></action>
@@ -708,7 +700,7 @@
                         <object type="text" name="resource_population_text" font="prospero16" textcolor="255 255 255" z="70" ghost="true" hidden="false">
                                 <action on="Load"><![CDATA[
                                         this.caption = "100/150";
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"50%+147 0%+1 50%+200 0%+24", 
 					"50%+147 100%-28 50%+200 100%-4");
                                 ]]></action>
@@ -725,7 +717,7 @@
 
 			<object type="text" name="session_panel_minimap_bg" sprite="session_panel_minimap_bg" z="60" ghost="true" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-174 0%+2 100% 0%+176", 
 					"100%-174 100%-174 100% 100%-176");
 				]]></action>
@@ -733,7 +725,7 @@
 
 			<object type="minimap" name="session_panel_minimap" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-176 0 100% 176", 
 					"100%-176 100%-176 100% 100%");
 				]]></action>
@@ -741,28 +733,28 @@
 
                         <object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-206 0%+2 100%-174 0%+38", 
 					"100%-206 100%-175 100%-174 100%-129");
 				]]></action>
 			</object>
                         <object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-214 0%+45 100%-174 0%+89", 
 					"100%-214 100%-131 100%-174 100%-87");
 				]]></action>
 			</object>
                         <object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-214 0%+86 100%-174 0%+130", 
 					"100%-214 100%-90 100%-174 100%-46");
 				]]></action>
 			</object>
                         <object type="button" name="session_panel_minimap_segleft4" sprite="session_panel_minimap_segleft4" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-206 0%+127 100%-174 0%+163", 
 					"100%-206 100%-48 100%-174 100%-12");
 				]]></action>
@@ -770,28 +762,28 @@
 
                         <object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-46 0%+173 100%-2 0%+213", 
 					"100%-46 100%-205 100%-2 100%-165");
 				]]></action>
 			</object>
                         <object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-88 0%+173 100%-42 0%+213", 
 					"100%-88 100%-213 100%-42 100%");
 				]]></action>
 			</object>
                         <object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-130 0%+173 100%-84 0%+213", 
 					"100%-130 100%-213 100%-84 100%");
 				]]></action>
 			</object>
                         <object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" z="60" hidden="false">
 				<action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"100%-174 0%+173 100%-130 0%+213", 
 					"100%-174 100%-205 100%-130 100%-165");
 				]]></action>
@@ -807,18 +799,18 @@
 			]]></action>
 
 			<!-- STATUS ORB BACKGROUND -->
-                        <object type="button" name="session_panel_status_bg" sprite="session_panel_status_bg-top" textcolor="255 255 255" text-align="left" text-valign="top" ghost="true" hidden="false">
+                        <object type="button" name="session_panel_status_bg" sprite="session_panel_status_bg-top" textcolor="255 255 255" text-align="left" text-valign="top" z="70" ghost="true" hidden="false">
 			        <action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"0% 0% 0%+184 0%+184", 
 					"0% 100%-184 0%+184 100%");
 				]]></action>
 			</object>
 
 			<!-- SELECTED UNIT LARGE PORTRAIT -->
-			<object type="button" name="session_panel_status_portrait" style="portrait" hidden="false">
+			<object type="button" name="session_panel_status_portrait" style="portrait" z="70" hidden="false">
 			        <action on="Load"><![CDATA[
-					AddSize(this.name,
+					AddSizeString(this.name,
 					"0%+4 0%+116 0%+68 0%+180", 
 					"0%+4 100%-180 0%+68 100%-116");
 					setPortrait(this.name, "unit_dude");
@@ -826,95 +818,95 @@
 			</object>
 
 			<!-- RANK ICON -->
-                        <object type="button" name="session_panel_status_icon_rank" sprite="statistic_rank2" ghost="true" hidden="false">
+                        <object type="button" name="session_panel_status_icon_rank" sprite="statistic_rank2" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_rank",
+					AddSizeString("session_panel_status_icon_rank",
 					"0%+50 0%+44 0%+70 0%+47", 
 					"0%+50 100%-180 0%+70 100%-160");
                                 ]]></action>
                         </object>
 
 			<!-- HITPOINTS BAR -->
-			<object type="progressbar" name="session_panel_status_icon_hp_bar" style="group_portrait_bar" sprite-background="back-bar" ghost="true" hidden="false">
+			<object type="progressbar" name="session_panel_status_icon_hp_bar" style="group_portrait_bar" sprite-background="back-bar" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_hp_bar",
+					AddSizeString("session_panel_status_icon_hp_bar",
 					"0%+6 0%+147 0%+66 0%+160", 
 					"0%+6 100%-114 0%+66 100%-108");
                                 ]]></action>
 			</object>
 
 			<!-- EXPERIENCE BAR -->
-			<object type="progressbar" name="session_panel_status_icon_exp_bar" style="up_bar" sprite-background="back-bar" ghost="true" hidden="false">
+			<object type="progressbar" name="session_panel_status_icon_exp_bar" style="up_bar" sprite-background="back-bar" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_exp_bar",
+					AddSizeString("session_panel_status_icon_exp_bar",
 					"0%+6 0%+147 0%+66 0%+160", 
 					"0%+6 100%-106 0%+66 100%-98");
                                 ]]></action>
 			</object>
 
 			<!-- HITPOINTS TEXT -->
-                        <object type="button" name="session_panel_status_icon_hp_text" font="verdana10" textcolor="0 255 0" text-align="center" text-valign="bottom" ghost="true" hidden="false">
+                        <object type="button" name="session_panel_status_icon_hp_text" font="verdana10" textcolor="0 255 0" text-align="center" text-valign="bottom" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_hp_text",
+					AddSizeString("session_panel_status_icon_hp_text",
 					"0%+46 0%+148 0%+146 0%+161", 
 					"0%+46 100%-110 0%+146 100%-104");
                                 ]]></action>
                         </object>
 
 			<!-- EXPERIENCE TEXT -->
-                        <object type="button" name="session_panel_status_icon_exp_text" font="verdana10" textcolor="255 255 0" text-align="center" text-valign="bottom" ghost="true" hidden="false">
+                        <object type="button" name="session_panel_status_icon_exp_text" font="verdana10" textcolor="255 255 0" text-align="center" text-valign="bottom" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_exp_text",
+					AddSizeString("session_panel_status_icon_exp_text",
 					"0%+46 0%+148 0%+146 0%+161", 
 					"0%+46 100%-102 0%+146 100%-94");
 					getGUIObjectByName("session_panel_status_icon_exp_text").caption = "100/200";
                                 ]]></action>
                         </object>
 
-                        <object type="button" name="session_panel_status_icon_hp" sprite="statistic_hp" ghost="true" hidden="true">
+                        <object type="button" name="session_panel_status_icon_hp" sprite="statistic_hp" ghost="true" z="70" hidden="true">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_hp",
+					AddSizeString("session_panel_status_icon_hp",
 					"0%+75 0%+125 0%+95 0%+145", 
 					"0%+75 100%-57 0%+95 100%-37");
                                 ]]></action>
                         </object>
 
 			<!-- NAME TEXT -->
-			<object type="text" name="session_panel_status_name1" font="verdana10" textcolor="200 200 200" ghost="true" hidden="false">
+			<object type="text" name="session_panel_status_name1" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
 			        <action on="Load"><![CDATA[
-					AddSize("session_panel_status_name1",
+					AddSizeString("session_panel_status_name1",
 					"0%+2 0%+4 0%+254 0%+27", 
 					"0%+2 100%-60 0%+254 100%-37");
 				]]></action>
 			</object>
 
-			<object type="text" name="session_panel_status_name2" font="verdana12" textcolor="255 255 255" ghost="true" hidden="false">
+			<object type="text" name="session_panel_status_name2" font="verdana12" textcolor="255 255 255" ghost="true" z="70" hidden="false">
 			        <action on="Load"><![CDATA[
-					AddSize("session_panel_status_name2",
+					AddSizeString("session_panel_status_name2",
 					"0%+2 0%+19 0%+254 0%+42", 
 					"0%+2 100%-45 0%+254 100%-22");
 				]]></action>
 			</object>
-			<object type="text" name="session_panel_status_name3" font="verdana10" textcolor="200 200 200" ghost="true" hidden="false">
+			<object type="text" name="session_panel_status_name3" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
 			        <action on="Load"><![CDATA[
-					AddSize("session_panel_status_name3",
+					AddSizeString("session_panel_status_name3",
 					"0%+2 0%+34 0%+254 0%+59", 
 					"0%+2 100%-28 0%+254 100%-17");
 				]]></action>
 			</object>
 
 			<!-- STATUS ORB STATISTICS AND ICONS (Experience, Hitpoints, Supply, Garrison) -->
-                        <object type="button" name="session_panel_status_icon_supply" sprite="resource_food" textcolor="252 148 78" text-align="center" text-valign="center" ghost="true" hidden="false">
+                        <object type="button" name="session_panel_status_icon_supply" sprite="resource_food" textcolor="252 148 78" text-align="center" text-valign="center" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_supply",
+					AddSizeString("session_panel_status_icon_supply",
 					"0%+135 0%+65 0%+150 0%+130", 
 					"0%+135 100%-110 0%+150 100%-45");
                                         getGUIObjectByName("session_panel_status_icon_supply").caption = "1575";
                                 ]]></action>
                         </object>
-                        <object type="button" name="session_panel_status_icon_garrison" sprite="statistic_garrison" textcolor="100 100 255" text-align="center" text-valign="center" ghost="true" hidden="false">
+                        <object type="button" name="session_panel_status_icon_garrison" sprite="statistic_garrison" textcolor="100 100 255" text-align="center" text-valign="center" ghost="true" z="70" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_icon_garrison",
+					AddSizeString("session_panel_status_icon_garrison",
 					"0%+126 0%+65 0%+141 0%+130", 
 					"0%+126 100%-160 0%+141 100%-95");
                                         getGUIObjectByName("session_panel_status_icon_garrison").caption = "23/30";
@@ -922,88 +914,88 @@
                         </object>
 
 			<!-- PRIMARY COMMAND BUTTONS (arcs the Status Orb) -->
-			<object type="button" name="session_panel_status_command_pri_1" style="portrait" textcolor="255 255 255" z="60" hidden="false">1
+			<object type="button" name="session_panel_status_command_pri_1" style="portrait" textcolor="255 255 255" z="70" hidden="false">1
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_1",
+					AddSizeString("session_panel_status_command_pri_1",
 					"0 184 32 216", 
 					"0 100%-216 32 100%-184");
                                 ]]></action>
 			</object>
-			<object type="button" name="session_panel_status_command_pri_2" style="portrait" textcolor="255 255 255" z="60" hidden="false">2
+			<object type="button" name="session_panel_status_command_pri_2" style="portrait" textcolor="255 255 255" z="70" hidden="false">2
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_2",
+					AddSizeString("session_panel_status_command_pri_2",
 					"32 184 64 216", 
 					"32 100%-216 64 100%-184");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_3" style="portrait" textcolor="255 255 255" z="60" hidden="false">3
+			<object type="button" name="session_panel_status_command_pri_3" style="portrait" textcolor="255 255 255" z="70" hidden="false">3
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_3",
+					AddSizeString("session_panel_status_command_pri_3",
 					"65 184 97 216", 
 					"65 100%-216 97 100%-184");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_4" style="portrait" textcolor="255 255 255" z="60" hidden="false">4
+			<object type="button" name="session_panel_status_command_pri_4" style="portrait" textcolor="255 255 255" z="70" hidden="false">4
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_4",
+					AddSizeString("session_panel_status_command_pri_4",
 					"97 180 129 212", 
 					"97 100%-212 129 100%-180");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_5" style="portrait" textcolor="255 255 255" z="60" hidden="false">5
+			<object type="button" name="session_panel_status_command_pri_5" style="portrait" textcolor="255 255 255" z="70" hidden="false">5
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_5",
+					AddSizeString("session_panel_status_command_pri_5",
 					"128 168 160 200", 
 					"128 100%-200 160 100%-168");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_6" style="portrait" textcolor="255 255 255" z="60" hidden="false">6
+			<object type="button" name="session_panel_status_command_pri_6" style="portrait" textcolor="255 255 255" z="70" hidden="false">6
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_6",
+					AddSizeString("session_panel_status_command_pri_6",
 					"154 148 186 180", 
 					"154 100%-180 186 100%-148");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_7" style="portrait" textcolor="255 255 255" z="60" hidden="false">7
+			<object type="button" name="session_panel_status_command_pri_7" style="portrait" textcolor="255 255 255" z="70" hidden="false">7
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_7",
+					AddSizeString("session_panel_status_command_pri_7",
 					"172 121 204 153", 
 					"172 100%-153 204 100%-121");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_8" style="portrait" textcolor="255 255 255" z="60" hidden="false">8
+			<object type="button" name="session_panel_status_command_pri_8" style="portrait" textcolor="255 255 255" z="70" hidden="false">8
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_8",
+					AddSizeString("session_panel_status_command_pri_8",
 					"184 90 216 122", 
 					"184 100%-122 216 100%-90");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_9" style="portrait" textcolor="255 255 255" z="60" hidden="false">9
+			<object type="button" name="session_panel_status_command_pri_9" style="portrait" textcolor="255 255 255" z="70" hidden="false">9
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_9",
+					AddSizeString("session_panel_status_command_pri_9",
 					"183 57 215 89", 
 					"183 100%-89 215 100%-57");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_10" style="portrait" textcolor="255 255 255" z="60" hidden="false">10
+			<object type="button" name="session_panel_status_command_pri_10" style="portrait" textcolor="255 255 255" z="70" hidden="false">10
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_10",
+					AddSizeString("session_panel_status_command_pri_10",
 					"171 26 203 58", 
 					"171 100%-58 203 100%-26");
                                 ]]></action>
 			</object>
 
-			<object type="button" name="session_panel_status_command_pri_11" style="portrait" textcolor="255 255 255" z="60" hidden="false">11
+			<object type="button" name="session_panel_status_command_pri_11" style="portrait" textcolor="255 255 255" z="70" hidden="false">11
                                 <action on="Load"><![CDATA[
-					AddSize("session_panel_status_command_pri_11",
+					AddSizeString("session_panel_status_command_pri_11",
 					"150 0 182 32", 
 					"150 100%-32 182 100%");
                                 ]]></action>
@@ -1022,14 +1014,14 @@
 
 			<object type="button" name="session_team_tray_1" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_1",
+					AddSizeString("session_team_tray_1",
 					"100%-32 200 100% 232", 
 					"100%-32 100%-488 100% 100%-456");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_1_num" textcolor="255 255 255" ghost="true" hidden="false">1
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_1_num",
+					AddSizeString("session_team_tray_1_num",
 					"100%-20 200 100% 220", 
 					"100%-20 100%-488 100% 100%-468");
                                 ]]></action>
@@ -1037,14 +1029,14 @@
 
 			<object type="button" name="session_team_tray_2" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_2",
+					AddSizeString("session_team_tray_2",
 					"100%-32 232 100% 264", 
 					"100%-32 100%-456 100% 100%-424");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_2_num" textcolor="255 255 255" ghost="true" hidden="false">2
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_2_num",
+					AddSizeString("session_team_tray_2_num",
 					"100%-20 232 100% 252", 
 					"100%-20 100%-456 100% 100%-436");
                                 ]]></action>
@@ -1052,14 +1044,14 @@
 
 			<object type="button" name="session_team_tray_3" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_3",
+					AddSizeString("session_team_tray_3",
 					"100%-32 264 100% 296", 
 					"100%-32 100%-424 100% 100%-392");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_3_num" textcolor="255 255 255" ghost="true" hidden="false">3
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_3_num",
+					AddSizeString("session_team_tray_3_num",
 					"100%-20 264 100% 284", 
 					"100%-20 100%-424 100% 100%-304");
                                 ]]></action>
@@ -1067,14 +1059,14 @@
 
 			<object type="button" name="session_team_tray_4" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_4",
+					AddSizeString("session_team_tray_4",
 					"100%-32 296 100% 328", 
 					"100%-32 100%-392 100% 100%-360");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_4_num" textcolor="255 255 255" ghost="true" hidden="false">4
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_4_num",
+					AddSizeString("session_team_tray_4_num",
 					"100%-20 296 100% 316", 
 					"100%-20 100%-392 100% 100%-372");
                                 ]]></action>
@@ -1082,14 +1074,14 @@
 
 			<object type="button" name="session_team_tray_5" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_5",
+					AddSizeString("session_team_tray_5",
 					"100%-32 328 100% 360", 
 					"100%-32 100%-360 100% 100%-328");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_5_num" textcolor="255 255 255" ghost="true" hidden="false">5
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_5_num",
+					AddSizeString("session_team_tray_5_num",
 					"100%-20 328 100% 348", 
 					"100%-20 100%-360 100% 100%-340");
                                 ]]></action>
@@ -1097,14 +1089,14 @@
 
 			<object type="button" name="session_team_tray_6" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_6",
+					AddSizeString("session_team_tray_6",
 					"100%-32 360 100% 392", 
 					"100%-32 100%-328 100% 100%-296");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_6_num" textcolor="255 255 255" ghost="true" hidden="false">6
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_6_num",
+					AddSizeString("session_team_tray_6_num",
 					"100%-20 360 100% 380", 
 					"100%-20 100%-328 100% 100%-308");
                                 ]]></action>
@@ -1112,14 +1104,14 @@
 
 			<object type="button" name="session_team_tray_7" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_7",
+					AddSizeString("session_team_tray_7",
 					"100%-32 392 100% 424", 
 					"100%-32 100%-296 100% 100%-264");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_7_num" textcolor="255 255 255" ghost="true" hidden="false">7
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_7_num",
+					AddSizeString("session_team_tray_7_num",
 					"100%-20 392 100% 412", 
 					"100%-20 100%-296 100% 100%-276");
                                 ]]></action>
@@ -1127,14 +1119,14 @@
 
 			<object type="button" name="session_team_tray_8" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_8",
+					AddSizeString("session_team_tray_8",
 					"100%-32 424 100% 456", 
 					"100%-32 100%-264 100% 100%-232");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_8_num" textcolor="255 255 255" ghost="true" hidden="false">8
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_8_num",
+					AddSizeString("session_team_tray_8_num",
 					"100%-20 424 100% 444", 
 					"100%-20 100%-264 100% 100%-244");
                                 ]]></action>
@@ -1142,14 +1134,14 @@
 
 			<object type="button" name="session_team_tray_9" style="portrait" textcolor="255 255 255" hidden="false">
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_9",
+					AddSizeString("session_team_tray_9",
 					"100%-32 456 100% 488", 
 					"100%-32 100%-232 100% 100%-200");
                                 ]]></action>
 			</object>
 			<object type="text" name="session_team_tray_9_num" textcolor="255 255 255" ghost="true" hidden="false">9
                                 <action on="Load"><![CDATA[
-					AddSize("session_team_tray_9_num",
+					AddSizeString("session_team_tray_9_num",
 					"100%-20 456 100% 476", 
 					"100%-20 100%-232 100% 100%-212");
                                 ]]></action>
@@ -1175,7 +1167,7 @@
                 <!-- FPS COUNTER -->
                 <object type="text" name="FPS_Counter" z="100" hotkey="fps.toggle" textcolor="200 200 0" font="verdana16" ghost="true" hidden="false">
                         <action on="Load"><![CDATA[
-				AddSize("FPS_Counter",
+				AddSizeString("FPS_Counter",
 				"18 100%-35 200 100%", 
 				"18 0%      200 0%+35");
                         ]]></action>
diff --git a/binaries/data/mods/official/gui/test/6_global.xml b/binaries/data/mods/official/gui/test/6_global.xml
new file mode 100755
index 0000000000..e033dd8029
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/6_global.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>
+
+<!DOCTYPE objects SYSTEM "../gui.dtd">
+
+<objects>
+
+	<!--
+	==========================================
+	 - GLOBAL OBJECTS -
+	==========================================
+	-->
+
+	<object type="empty" name="always_on" hotkey="alwayson.toggle" size="0 0 100% 100%" z="1" hidden="false">
+		<action on="Press"><![CDATA[
+			GUIObjectToggle("always_on");
+		]]></action>
+
+		<object type="button" name="exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="100%-18 2 100%-2 18" z="1000" hidden="false">
+			<action on="Press"><![CDATA[
+				exit();
+			]]></action>
+
+			<!--  START temporary code
+			This code only applies to the main menu, I don't know how it'll behave ingame. It is temporary and should be removed as soon as we got proper tooltip support implemented. -->
+			<action on="MouseEnter"><![CDATA[
+				tooltipObject = getGUIObjectByName("pregame-mainmenu-tooltip");
+				tooltipObject.caption = "Tired of 0 A.D. ? Click here to leave and reenter the real world.";
+				GUIObjectUnhide("pregame-mainmenu-tooltip");
+			]]></action>
+			<action on="MouseLeave"><![CDATA[
+				GUIObjectHide("pregame-mainmenu-tooltip");
+			]]></action>
+			<!-- END temporary code -->
+		</object>
+
+		<!-- TEMPORARY END GAME BUTTON; REMOVE WHEN GAME MENU IMPLEMENTED; BUTTON IS OUTSIDE OF pregame_gui IN ORDER TO BE VISIBLE DURING GAME -->
+
+		<object type="button" name="End_Game_Button" sprite="sprite1" sprite-over="sprite1-over" sprite-pressed="sprite1-pressed" z="105" textcolor="0 0 0" text-align="center" text-valign="center" hidden="true">End Game
+			<action on="Load"><![CDATA[
+				AddSizeString(this.name,
+				"100%-150 100%-53 100%-30 100%-32", 
+				"100%-150 0%+32 100%-30 0%+53");
+			]]></action>
+			<action on="Press"><![CDATA[
+				endGame();
+				GUIObjectHide("session_gui");
+				GUIObjectHide("End_Game_Button");
+				GUIObjectUnhide("pregame_gui");
+			]]></action>
+		</object> 
+
+	</object>
+
+</objects>
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index ffa744fd99..30fd45b5d5 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -1,10 +1,48 @@
 function initSession()
 {
 	GUIType="bottom";
-	GUIStyleName = new Array();
-	GUIStyleSize1 = new Array();
-	GUIStyleSize2 = new Array();
-	GUIStyle_Last = 0;
+
+	// Coord-style size table.
+	SizeCoord = new Array();
+	SizeCoord.last = 0;
+
+	// Standard portrait widths.
+	crd_portrait_lrg_width = 64;
+	crd_portrait_lrg_height = 64;
+	crd_portrait_sml_width = 32;
+	crd_portrait_sml_height = 32;
+
+	initGroupPane();
+}
+
+// ====================================================================
+
+function AddSizeCoord(objectName, left1, top1, right1, bottom1, rleft1, rtop1, rright1, rbottom1, left2, top2, right2, bottom2, rleft2, rtop2, rright2, rbottom2)
+{
+	// Used to store the two GUI style sizes for an object on creation (specified as coordinates).
+	// Used later by FlipGUI() to switch the objects to a new set of positions.
+
+	SizeCoord[SizeCoord.last] = new Object();
+	SizeCoord[SizeCoord.last].name = objectName;
+	SizeCoord[SizeCoord.last].size1 = new GUISize(left1, top1, right1, bottom1, rleft1, rtop1, rright1, rbottom1);
+	SizeCoord[SizeCoord.last].size2 = new GUISize(left2, top2, right2, bottom2, rleft2, rtop2, rright2, rbottom2);
+
+	SizeCoord.last++; // Increment counter for next entry.
+}
+
+// ====================================================================
+
+function AddSizeString(objectName, size1, size2)
+{
+	// Used to store the two GUI style sizes for an object on creation (specified as strings).
+	// Used later by FlipGUI() to switch the objects to a new set of positions.
+
+	SizeCoord[SizeCoord.last] = new Object();
+	SizeCoord[SizeCoord.last].name = objectName;
+	SizeCoord[SizeCoord.last].size1 = size1;
+	SizeCoord[SizeCoord.last].size2 = size2;
+
+	SizeCoord.last++; // Increment counter for next entry.
 }
 
 // ====================================================================
@@ -33,7 +71,7 @@ function setPortrait(objectName, portraitString)
 
 function setSize(objectName, sizeString)
 {
-	// Use this function as a shortcut to change the size of a GUI control. 
+	// Use this function as a shortcut to change the size of a GUI control, specifying a size string. 
 
         // Get GUI object
         GUIObject = getGUIObjectByName(objectName);
@@ -101,7 +139,12 @@ function getObjectInfo()
 
 		// Update portrait
 		if (selection[0].traits.id.icon)
-			setPortrait("session_panel_status_portrait", selection[0].traits.id.icon);
+		{
+			if (selection[0].traits.id.icon_cell)
+				setPortrait("session_panel_status_portrait", selection[0].traits.id.icon + "_" + selection[0].traits.id.icon_cell);
+			else
+				setPortrait("session_panel_status_portrait", selection[0].traits.id.icon);
+		}
 
 		// Update hitpoints
 		if (selection[0].traits.health.curr & selection[0].traits.health.hitpoints)
@@ -122,7 +165,7 @@ function getObjectInfo()
 			// Best solution would be to base this off a "new entities selected" instead of an on-tick.
 			if (
 				// getGUIObjectByName("session_group_pane").hidden == true || 
-				selection.length != MultipleEntitiesSelected)
+				selection.length != getGlobal().MultipleEntitiesSelected)
 			{
 
 				// Reveal Group Pane.
@@ -147,10 +190,10 @@ function getObjectInfo()
 					switch (GUIType)
 					{
 						case "top":
-							setSize("session_group_pane_bg", GUIStyleSize1[FlipGUILoop]);
+							setSize("session_group_pane_bg", SizeCoord[FlipGUILoop].size1);
 						break;
 						case "bottom":
-							setSize("session_group_pane_bg", GUIStyleSize2[FlipGUILoop]);
+							setSize("session_group_pane_bg", SizeCoord[FlipGUILoop].size2);
 						break;
 					}
 				}
@@ -204,22 +247,7 @@ function getObjectInfo()
 			getGUIObjectByName("session_group_pane").hidden = true;
 		}
         }
-}
 
-// ====================================================================
-
-function AddSize(objectName, objectSize1, objectSize2)
-{
-	// Used to store the two GUI style sizes for an object on creation.
-	// Used later by FlipGUI() to switch the objects to a new set of positions.
-
-	GUIStyleName[GUIStyle_Last] = objectName;
-	GUIStyleSize1[GUIStyle_Last] = objectSize1;
-	GUIStyleSize2[GUIStyle_Last] = objectSize2;
-
-//	writeConsole("Added " + GUIStyle_Last + ": " + GUIStyleName[GUIStyle_Last] + " (" + GUIStyleSize1[GUIStyle_Last] + ", " + GUIStyleSize2[GUIStyle_Last] + ").");
-
-	GUIStyle_Last++; // Increment counter for next entry.
 }
 
 // ====================================================================
@@ -254,50 +282,50 @@ function FlipGUI(NewGUIType)
 		GUIObjectUnhide("always_on");
 
 		// Seek through all sizes created.
-		for (FlipGUILoop = 0; FlipGUILoop < GUIStyle_Last; FlipGUILoop++)
+		for (FlipGUILoop = 0; FlipGUILoop < SizeCoord.last; FlipGUILoop++)
 		{
 			// Set each object to the other size.
 			switch (GUIType)
 			{
 				case "top":
-					setSize(GUIStyleName[FlipGUILoop], GUIStyleSize1[FlipGUILoop]);
-					switch (GUIStyleName[FlipGUILoop]){
+					setSize(SizeCoord[FlipGUILoop].name, SizeCoord[FlipGUILoop].size1);
+					switch (SizeCoord[FlipGUILoop].name){
 						case "session_panel_minimap_segbottom1":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
 						break;
 						case "session_panel_minimap_segbottom2":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
 						break;
 						case "session_panel_minimap_segbottom3":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
 						break;
 						case "session_panel_minimap_segbottom4":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = GUIStyleName[FlipGUILoop];
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
 						break;
 						case "session_panel_status_bg":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_status_bg-top";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg-top";
 						break;
 						default:
 						break;
 					}
 				break;
 				case "bottom":
-					setSize(GUIStyleName[FlipGUILoop], GUIStyleSize2[FlipGUILoop]);
-					switch (GUIStyleName[FlipGUILoop]){
+					setSize(SizeCoord[FlipGUILoop].name, SizeCoord[FlipGUILoop].size2);
+					switch (SizeCoord[FlipGUILoop].name){
 						case "session_panel_minimap_segbottom1":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop1";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop1";
 						break;
 						case "session_panel_minimap_segbottom2":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop2";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop2";
 						break;
 						case "session_panel_minimap_segbottom3":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop3";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop3";
 						break;
 						case "session_panel_minimap_segbottom4":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_minimap_segtop4";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop4";
 						break;
 						case "session_panel_status_bg":
-							getGUIObjectByName(GUIStyleName[FlipGUILoop]).sprite = "session_panel_status_bg-bottom";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg-bottom";
 						break;
 						default:
 						break;
diff --git a/binaries/data/mods/official/gui/test/functions_session_group_pane.js b/binaries/data/mods/official/gui/test/functions_session_group_pane.js
new file mode 100755
index 0000000000..d85129c445
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_session_group_pane.js
@@ -0,0 +1,103 @@
+function initGroupPane()
+{
+	// Populate the table of Group Pane portrait coordinates.
+
+	// Group Pane table.
+	crd_grppane_prt_col = new Array();
+	crd_grppane_prt_col.last = 0; 	// Last size added.
+	crd_grppane_prt_col.style = 2; 	// Style length.
+	crd_grppane_prt_row = new Array();
+	crd_grppane_prt_row_bar = new Array();
+	crd_grppane_prt_row.last = 0; 	// Last size added.
+	crd_grppane_prt_row.style = 2; 	// Style length.
+
+	// Build table of group pane coordinates.
+	initGroupPaneTable();
+}
+
+// ====================================================================
+
+function initGroupPaneTable()
+{
+	AddGroupPaneRow(0, 32, 		100, -70);	// Row 0
+	AddGroupPaneCol(50, -16, 	50, -16);	// Col 0
+	AddGroupPaneCol(50, -52, 	50, -52);	// Col 1
+}
+
+// ====================================================================
+
+function AddGroupPaneCol(rleft1, left1, rleft2, left2)
+{
+	// Add a set of column coordinates to the Group Pane table.
+
+	crd_grppane_prt_col[crd_grppane_prt_col.last] = new Array();
+
+	style=0;
+	crd_grppane_prt_col[crd_grppane_prt_col.last][style] = new Array(); 
+	crd_grppane_prt_col[crd_grppane_prt_col.last][style].size = new GUISize(left1, 0, left1 + crd_portrait_sml_width, 0, rleft1, 0, rleft1, 0);
+
+	style=1;
+	crd_grppane_prt_col[crd_grppane_prt_col.last][style] = new Array(); 
+	crd_grppane_prt_col[crd_grppane_prt_col.last][style].size = new GUISize(left2, 0, left2 + crd_portrait_sml_width, 0, rleft2, 0, rleft2, 0);
+
+	crd_grppane_prt_col.last++; // Increment array.
+}
+
+// ====================================================================
+
+function AddGroupPaneRow(rtop1, top1, rtop2, top2)
+{
+	// Add a set of row coordinates to the Group Pane table.
+
+	crd_grppane_prt_row[crd_grppane_prt_row.last] = new Array();
+
+	style=0;
+	crd_grppane_prt_row[crd_grppane_prt_row.last][style] = new Array();
+	crd_grppane_prt_row[crd_grppane_prt_row.last][style].size = new GUISize(0, top1, 0, top1 + crd_portrait_sml_height, 0, rtop1, 0, rtop1);
+
+	style=1;
+	crd_grppane_prt_row[crd_grppane_prt_row.last][style] = new Array();
+	crd_grppane_prt_row[crd_grppane_prt_row.last][style].size = new GUISize(0, top2, 0, top2 + crd_portrait_sml_height, 0, rtop2, 0, rtop2);
+
+	crd_grppane_prt_row.last++; // Increment array.
+}
+
+// ====================================================================
+
+function AddSizeGroupPane(objectName, row, col)
+{
+	// Used to store the two GUI style sizes for an object on creation.
+	// This is a special method that uses the group pane table to specify values.
+	// Used later by FlipGUI() to switch the objects to a new set of positions.
+
+	SizeCoord[SizeCoord.last] = new Object();
+	SizeCoord[SizeCoord.last].name = objectName;
+
+	style = 0; // Set top GUI style.
+	size_col = crd_grppane_prt_col[col][style].size;
+	size_row = crd_grppane_prt_row[row][style].size;
+	SizeCoord[SizeCoord.last].size1 = new GUISize(size_col.left, size_row.top, size_col.right, size_row.bottom, size_col.rleft, size_row.rtop, size_col.rright, size_row.rbottom);
+
+	style = 1; // Set bottom GUI style.
+	size_col = crd_grppane_prt_col[col][style].size;
+	size_row = crd_grppane_prt_row[row][style].size;
+	SizeCoord[SizeCoord.last].size2 = new GUISize(size_col.left, size_row.top, size_col.right, size_row.bottom, size_col.rleft, size_row.rtop, size_col.rright, size_row.rbottom);
+
+	SizeCoord.last++; // Increment counter for next entry.
+}
+
+// ====================================================================
+
+function AddSizeGroupPaneBar(objectName)
+{
+	// Create a health bar for the last group pane portrait created.
+
+	var size1 = SizeCoord[SizeCoord.last-1].size1;
+	var size2 = SizeCoord[SizeCoord.last-1].size2;
+
+	AddSizeCoord(objectName,
+		size1.left, size1.bottom+2, size1.right, size1.bottom+6, size1.rleft, size1.rtop, size1.rright, size1.rbottom, 
+		size2.left, size2.bottom+2, size2.right, size2.bottom+6, size2.rleft, size2.rtop, size2.rright, size2.rbottom);
+}
+
+// ====================================================================
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index eb61f22c1c..9b723b4564 100755
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -296,7 +296,7 @@
 
         	<!--
         	==========================================
-        	ENTITY PORTRAITS
+        	ENTITY SINGLE PORTRAITS
         	==========================================
         	-->
 
@@ -366,6 +366,18 @@
                         <image texture="ui_portrait_structure_heleho_64-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
 
+        	<!--
+        	==========================================
+        	ENTITY SHEET PORTRAITS
+        	==========================================
+        	-->
+                <sprite name="ui_portrait_sheet_rome_1_64">
+                        <image texture="ui_portrait_sheet_rome_64.png" real-texture-placement="0 0 64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                </sprite>
+                <sprite name="ui_portrait_sheet_rome_2_64">
+                        <image texture="ui_portrait_sheet_rome_64.png" real-texture-placement="64 0 128 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                </sprite>
+
         <!--
         ==========================================
         TEMPORARY IMAGES
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index 0e100260b8..331185f7c3 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -29,6 +29,8 @@
 		sprite-over="ui_portrait_default_64-lit"
 		sprite-disabled="ui_portrait_default_64-grey"
 		tooltip-style="session-tooltip" 
+		text-align="right"
+		textcolor="255 255 255"
 	/>
 
 	<!-- Entity progress bar. -->