diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index f88300844c..ec4879ec8f 100644
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -1,233 +1,233 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>
-
-<!DOCTYPE objects SYSTEM "../gui.dtd">
-
-<objects>
-
-  <!--
-  ==========================================
-  - MAIN MENU -
-  ==========================================
-  -->
-
-        <object type="empty" name="PREGAME_GUI" size="0 0 100% 100%" z="1" hidden="false">
-                <action on="Load"><![CDATA[
-                        // Play main 0 A.D. theme when the main menu starts.
-                        curr_music = newRandomSound("music", "theme");
-                        curr_music.loop();
-                ]]></action>
-
-                <object type="image" name="pregame_mainmenu_background_image" sprite="pregame_mainmenu_background" size="0 0 100% 100%" z="100" hidden="false" ghost="true"/>
-
-                <object type="button" name="pregame_mainmenu_sp_button" sprite_over="pregame_mainmenu_spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false"
-                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Want to move some Dudes around or test something? Click here to start a new game on the default map.">
-                        <action on="Press"><![CDATA[
-                                GUIObjectUnhide("pregame_subwindow_bkg");
-                                GUIObjectUnhide("pregame_sp_mapsel");
-                        ]]></action>
-                </object>
-
-                <object type="button" name="pregame_mainmenu_mp_button" sprite_over="pregame_mainmenu_mpbt" size="60.9375% 48.567708333% 74.21875% 66.53645833333%" z="101" hidden="false"
-                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Tired of playing with yourself? Fight against one or more human players in a multiplayer game.">
-                        <action on="Press"><![CDATA[
-                                getGUIObjectByName("pregame_subwindow_bkg").hidden = false;
-                                getGUIObjectByName("pregame_mp_ip").hidden = false;
-                        ]]></action>
-                </object>
-
-                <object type="button" name="pregame_mainmenu_ed_button" sprite_over="pregame_mainmenu_edbt" size="43.65234375% 61.71875% 63.57421875% 82.8125%" z="101" hidden="false"
-                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!">
-                        <action on="Press"><![CDATA[
-                                GUIObjectHide("PREGAME_GUI");
-                                GUIObjectUnhide("ATLAS_GUI");
-                        ]]></action>
-                </object>
-
-                <object type="image" name="pregame_mainmenu_0ad_logo" sprite="pregame_mainmenu_0ad_logo_480x218" size="21.1914062% 3.125% 68.0664062% 31.5104166%" z="102" hidden="false" ghost="true"/>
-
-                <object type="text" name="pregame_mainmenu_versionnumber" size="43% 24% 43%+282 24%+25" z="103" textcolor="237 227 167" font="prospero16" hidden="false" ghost="true">
-                        {buildTime}
-                        <action on="Load"><![CDATA[
-                                this.caption = "Build: " + buildTime(0) + " " + getLanguageID();
-                        ]]></action>
-                </object>
-
-                <object type="button" name="pregame_mainmenu_wfg_logo" sprite="pregame_mainmenu_wfg_logo_256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false"
-                        tooltip_style="pregame_mainmenu_tooltip" tooltip="These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/">
-                        <action on="Press"><![CDATA[
-                                btCode = new Array("GUIObjectHide('mb_main');");
-                                messageBox(420, 420, "[icon=0ad_icon] A.D. - History Is Yours For The Taking\nby Wildfire Games, 2002-2005\n\nVersion 0.1.2 (PASAP II)\n\n" +
-                                "This is a confidental pre-release version of the game!\n\nVisit http://www.wildfiregames.com/0ad/ " +
-                                "to learn more about [icon=0ad_icon] A.D., participate in the community and meet the developers.\n\n", "About [icon=0ad_icon] A.D.", 2, new Array(), btCode);
-                        ]]></action>
-                </object>
-
-                <object type="text" name="pregame_mainmenu_tooltip" sprite="pregame_mainmenu_tooltip_background" size="69% 6.3802% 97.0703125% 28.125%" font="prospero16" textcolor="255 255 255" z="104" hidden="true" ghost="true">tooltipText</object>
-
-                <object type="button" name="exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over" size="100%-18 2 100%-2 18" z="104" hidden="false"
-                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Tired of 0 A.D. ? Click here to leave and reenter the real world.">
-                        <action on="Press"><![CDATA[
-                                btCaptions = new Array("Yes, let me out!", "Nooooo!");
-                                btCode = new Array("exit();", "");
-                                messageBox(400, 200, "Do you really want to quit [icon=0ad_icon] A.D.? This will cause a sudden return to reality.", "Confirmation", 0, btCaptions, btCode);
-                        ]]></action>
-                </object>
-        </object>
-
-        <object type="empty" name="pregame_subwindows" size="0 0 100% 100%" z="1" hidden="false">
-
-                <object type="image" name="pregame_subwindow_bkg" sprite="translucent_background" size="0 0 100% 100%" z="105" hidden="true"/>
-
-                        <object type="button" name="pregame_mp_ip" sprite="0ad_window" z="106" hidden="true">
-                                <action on="Load"><![CDATA[
-                                        setSizeCoord("pregame_mp_ip", crd_pregame_iphost_bkg_x, crd_pregame_iphost_bkg_y, crd_pregame_iphost_bkg_x+crd_pregame_iphost_bkg_width, crd_pregame_iphost_bkg_y+crd_pregame_iphost_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
-                                ]]></action>
-
-                        <object type="button" name="pregame_ip_host_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text_align="center" text_valign="center">
-                                                <action on="Load"><![CDATA[
-                                                        getGUIObjectByName("pregame_ip_host_titlebar").caption = "Direct IP Connect";
-                                                        setSizeCoord("pregame_ip_host_titlebar", crd_pregame_iphost_titlebar_x, crd_pregame_iphost_titlebar_y, crd_pregame_iphost_titlebar_x+crd_pregame_iphost_titlebar_width, crd_pregame_iphost_titlebar_y+crd_pregame_iphost_titlebar_height, mid_screen, mid_screen, mid_screen, mid_screen);
-                                                ]]></action>
-                        </object>
-
-                        <object type="button" name="pregame_ip_host_exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over">
-                                <action on="Load"><![CDATA[
-                                        setSizeCoord("pregame_ip_host_exit_button", crd_pregame_iphost_exit_button_x, crd_pregame_iphost_exit_button_y, crd_pregame_iphost_exit_button_x+crd_pregame_iphost_exit_button_width, crd_pregame_iphost_exit_button_y+crd_pregame_iphost_exit_button_height, mid_screen, mid_screen, mid_screen, mid_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
-                                        getGUIObjectByName("pregame_subwindow_bkg").hidden = true;
-                                        getGUIObjectByName("pregame_mp_ip").hidden = true;
-                                ]]></action>
-                        </object>
-
-                        <object type="text" name="pregame_ip_infotext">
-                                <action on="Load"><![CDATA[
-                                        getGUIObjectByName("pregame_ip_infotext").caption = "You can start a multiplayer game by Direct-IP connect from here. Either \n- enter a map name and click 'Host Game' to host a game or \n- enter an IP and click 'Join Game' to join a game on the entered IP.";
-                                        setSizeCoord("pregame_ip_infotext", crd_pregame_iphost_bkg_x, crd_pregame_iphost_bkg_y, crd_pregame_iphost_bkg_x+crd_pregame_iphost_bkg_width, crd_pregame_iphost_bkg_y+crd_pregame_iphost_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
-                                ]]></action>
-                        </object>
-
-                        <object type="image" name="pregame_mp_ip_divider1" sprite="only_black_border">
-                        <action on="Load"><![CDATA[
-                                setSizeCoord("pregame_mp_ip_divider1", -230, -130, 230, -130, mid_screen, mid_screen, mid_screen, mid_screen);
-                        ]]></action>
-                        </object>
-                        
-                        <!-- PLAYER NAME controls -->
-                        <object type="text" name="pregame_mp_ip_playername_txt" absolute="false" size="45 80 200 100" textcolor="0 0 0">
-                                Player Name (temporary):
-                        </object>
-                        
-                        <object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="255 255 255">
-                                Player
-                        </object>
-                        <!-- END PLAYER NAME controls -->
-
-                        <!-- HOST GAME controls -->
-                        <object type="image" name="pregame_mp_ip_divider2" sprite="only_black_border">
-                        <action on="Load"><![CDATA[
-                                setSizeCoord("pregame_mp_ip_divider2", -230, -75, 230, -75, mid_screen, mid_screen, mid_screen, mid_screen);
-                        ]]></action>
-                        </object>
-
-                        <object type="text" name="pregame_mp_ip_mapname_txt" absolute="false" size="45 130 200 150" textcolor="0 0 0">
-                                Map Name:
-                        </object>
-
-                        <object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="255 255 255">
-                                test01.pmp
-                        </object>
-
-                        <object type="button" name="pregame_mp_ip_host_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center">
-                                Host Game
-                                <action on="Load"><![CDATA[
-                                        setSizeCoord("pregame_mp_ip_host_bt", 50, -60, 150, -30, mid_screen, mid_screen, mid_screen, mid_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
-                                        initMPSessionHost(getGUIObjectByName("pregame_mp_ip_playername").caption, getGUIObjectByName("pregame_mp_ip_host_mapname").caption);
-                                ]]></action>
-                        </object>
-                        <!-- END HOST GAME controls -->
-                        
-                        <!-- JOIN GAME controls -->
-                        <object type="image" name="pregame_mp_ip_divider3" sprite="only_black_border">
-                                <action on="Load"><![CDATA[
-                                        setSizeCoord("pregame_mp_ip_divider3", -230, -20, 230, -20, mid_screen, mid_screen, mid_screen, mid_screen);
-                                ]]></action>
-                        </object>
-
-                        <object type="text" name="pregame_mp_ip_joinip_txt" absolute="false" size="45 190 200 210" textcolor="0 0 0">
-                                IP address:
-                        </object>
-
-                        <object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="255 255 255">
-                                127.0.0.1
-                        </object>
-
-                        <object type="button" name="pregame_mp_ip_join_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center">
-                                Join Game
-                                <action on="Load"><![CDATA[
-                                        setSizeCoord("pregame_mp_ip_join_bt", 50, 0, 150, 30, mid_screen, mid_screen, mid_screen, mid_screen);
-                                ]]></action>
-                                <action on="Press"><![CDATA[
-                                        initMPSessionClient(getGUIObjectByName("pregame_mp_ip_playername").caption, getGUIObjectByName("pregame_mp_ip_joinip").caption);
-                                ]]></action>
-                        </object>
-                        <!-- END JOIN GAME controls -->
-
-                </object>
-                
-                <!-- SINGLEPLAYER TEMPORARY MAP SELECTION DIALOG -->
-                <object type="button" name="pregame_sp_mapsel" sprite="0ad_window" z="106" hidden="true" size="50%-150 50%-90 50%+150 50%+90">
-
-                        <!-- The placement of this titlebar object is VERY hackish (see y-placement), but it doesn't work any other way so far, and this dialog will be temporary anyway -->
-                        <object type="button" name="pregame_sp_mapsel_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text_align="center" text_valign="center" absolute="false" size="50%-130 0%-22 50%+130 0%-14">
-                                Map selection
-                        </object>
-
-                        <object type="text" name="pregame_sp_infotext" absolute="false" size="10 10 290 60">
-                                Type the name of the map you want to start into the box. The name is relative to /data/mods/official/maps/scenarios/.
-                        </object>
-
-                        <object type="text" name="pregame_sp_mapname_txt" absolute="false" textcolor="0 0 0" size="10 90 120 110">
-                                Map Name:
-                        </object>
-
-                        <object type="input" name="pregame_sp_mapname" sprite="only_black" absolute="false" size="130 90 290 110" textcolor="255 255 255">
-                                nm_playercolors.pmp
-                        </object>
-
-                        <object type="button" name="pregame_sp_start_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" absolute="false" size="50%-100 100%-50 50%-10 100%-20">
-                                Start Game
-                                <action on="Press"><![CDATA[
-                                        // Check wheter we have a correct file extension, to avoid crashes
-                                        var mapName = getGUIObjectByName("pregame_sp_mapname").caption;
-                                        var extension = mapName.substring(mapName.length, mapName.length-4);
-                                        
-                                        if(extension != ".pmp") {
-                                                // Add .pmp to the file name - shouldn't help if the name is mistyped, but may be useful in some cases
-                                                mapName =  mapName + ".pmp";
-                                                console.write("Trying to fix the map name (probably missing extension).");
-                                        }
-
-                                        // Set up game
-                                        GUIObjectHide("pregame_subwindow_bkg");
-                                        GUIObjectHide("pregame_sp_mapsel");
-                                        g_GameAttributes.mapFile = mapName;
-                                        startLoadingScreen();
-                                ]]></action>
-                        </object>
-
-                        <object type="button" name="pregame_sp_mapsel_abort_button" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" absolute="false" size="50%+10 100%-50 50%+90 100%-20">
-                                Abort
-                                <action on="Press"><![CDATA[
-                                        GUIObjectHide("pregame_subwindow_bkg");
-                                        GUIObjectHide("pregame_sp_mapsel");
-                                ]]></action>
-                        </object>
-
-                </object>
-
-        </object>
-
-</objects>
+<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>
+
+<!DOCTYPE objects SYSTEM "../gui.dtd">
+
+<objects>
+
+  <!--
+  ==========================================
+  - MAIN MENU -
+  ==========================================
+  -->
+
+        <object type="empty" name="PREGAME_GUI" size="0 0 100% 100%" z="1" hidden="false">
+                <action on="Load"><![CDATA[
+                        // Play main 0 A.D. theme when the main menu starts.
+                        curr_music = newRandomSound("music", "theme");
+                        curr_music.loop();
+                ]]></action>
+
+                <object type="image" name="pregame_mainmenu_background_image" sprite="pregame_mainmenu_background" size="0 0 100% 100%" z="100" hidden="false" ghost="true"/>
+
+                <object type="button" name="pregame_mainmenu_sp_button" sprite_over="pregame_mainmenu_spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false"
+                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Want to move some Dudes around or test something? Click here to start a new game on the default map.">
+                        <action on="Press"><![CDATA[
+                                GUIObjectUnhide("pregame_subwindow_bkg");
+                                GUIObjectUnhide("pregame_sp_mapsel");
+                        ]]></action>
+                </object>
+
+                <object type="button" name="pregame_mainmenu_mp_button" sprite_over="pregame_mainmenu_mpbt" size="60.9375% 48.567708333% 74.21875% 66.53645833333%" z="101" hidden="false"
+                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Tired of playing with yourself? Fight against one or more human players in a multiplayer game.">
+                        <action on="Press"><![CDATA[
+                                getGUIObjectByName("pregame_subwindow_bkg").hidden = false;
+                                getGUIObjectByName("pregame_mp_ip").hidden = false;
+                        ]]></action>
+                </object>
+
+                <object type="button" name="pregame_mainmenu_ed_button" sprite_over="pregame_mainmenu_edbt" size="43.65234375% 61.71875% 63.57421875% 82.8125%" z="101" hidden="false"
+                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!">
+                        <action on="Press"><![CDATA[
+                                GUIObjectHide("PREGAME_GUI");
+                                GUIObjectUnhide("ATLAS_GUI");
+                        ]]></action>
+                </object>
+
+                <object type="image" name="pregame_mainmenu_0ad_logo" sprite="pregame_mainmenu_0ad_logo_480x218" size="21.1914062% 3.125% 68.0664062% 31.5104166%" z="102" hidden="false" ghost="true"/>
+
+                <object type="text" name="pregame_mainmenu_versionnumber" size="43% 24% 43%+282 24%+25" z="103" textcolor="237 227 167" font="prospero16" hidden="false" ghost="true">
+                        {buildTime}
+                        <action on="Load"><![CDATA[
+                                this.caption = "Build: " + buildTime(0) + " " + getLanguageID();
+                        ]]></action>
+                </object>
+
+                <object type="button" name="pregame_mainmenu_wfg_logo" sprite="pregame_mainmenu_wfg_logo_256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false"
+                        tooltip_style="pregame_mainmenu_tooltip" tooltip="These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/">
+                        <action on="Press"><![CDATA[
+                                btCode = new Array("GUIObjectHide('mb_main');");
+                                messageBox(420, 420, "[icon=0ad_icon] A.D. - History Is Yours For The Taking\nby Wildfire Games, 2002-2005\n\nVersion 0.1.2 (PASAP II)\n\n" +
+                                "This is a confidental pre-release version of the game!\n\nVisit http://www.wildfiregames.com/0ad/ " +
+                                "to learn more about [icon=0ad_icon] A.D., participate in the community and meet the developers.\n\n", "About [icon=0ad_icon] A.D.", 2, new Array(), btCode);
+                        ]]></action>
+                </object>
+
+                <object type="text" name="pregame_mainmenu_tooltip" sprite="pregame_mainmenu_tooltip_background" size="69% 6.3802% 97.0703125% 28.125%" font="prospero16" textcolor="255 255 255" z="104" hidden="true" ghost="true">tooltipText</object>
+
+                <object type="button" name="exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over" size="100%-18 2 100%-2 18" z="104" hidden="false"
+                        tooltip_style="pregame_mainmenu_tooltip" tooltip="Tired of 0 A.D. ? Click here to leave and reenter the real world.">
+                        <action on="Press"><![CDATA[
+                                btCaptions = new Array("Yes, let me out!", "Nooooo!");
+                                btCode = new Array("exit();", "");
+                                messageBox(400, 200, "Do you really want to quit [icon=0ad_icon] A.D.? This will cause a sudden return to reality.", "Confirmation", 0, btCaptions, btCode);
+                        ]]></action>
+                </object>
+        </object>
+
+        <object type="empty" name="pregame_subwindows" size="0 0 100% 100%" z="1" hidden="false">
+
+                <object type="image" name="pregame_subwindow_bkg" sprite="translucent_background" size="0 0 100% 100%" z="105" hidden="true"/>
+
+                        <object type="button" name="pregame_mp_ip" sprite="0ad_window" z="106" hidden="true">
+                                <action on="Load"><![CDATA[
+                                        setSizeCoord("pregame_mp_ip", crd_pregame_iphost_bkg_x, crd_pregame_iphost_bkg_y, crd_pregame_iphost_bkg_x+crd_pregame_iphost_bkg_width, crd_pregame_iphost_bkg_y+crd_pregame_iphost_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
+                                ]]></action>
+
+                        <object type="button" name="pregame_ip_host_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text_align="center" text_valign="center">
+                                                <action on="Load"><![CDATA[
+                                                        getGUIObjectByName("pregame_ip_host_titlebar").caption = "Direct IP Connect";
+                                                        setSizeCoord("pregame_ip_host_titlebar", crd_pregame_iphost_titlebar_x, crd_pregame_iphost_titlebar_y, crd_pregame_iphost_titlebar_x+crd_pregame_iphost_titlebar_width, crd_pregame_iphost_titlebar_y+crd_pregame_iphost_titlebar_height, mid_screen, mid_screen, mid_screen, mid_screen);
+                                                ]]></action>
+                        </object>
+
+                        <object type="button" name="pregame_ip_host_exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over">
+                                <action on="Load"><![CDATA[
+                                        setSizeCoord("pregame_ip_host_exit_button", crd_pregame_iphost_exit_button_x, crd_pregame_iphost_exit_button_y, crd_pregame_iphost_exit_button_x+crd_pregame_iphost_exit_button_width, crd_pregame_iphost_exit_button_y+crd_pregame_iphost_exit_button_height, mid_screen, mid_screen, mid_screen, mid_screen);
+                                ]]></action>
+                                <action on="Press"><![CDATA[
+                                        getGUIObjectByName("pregame_subwindow_bkg").hidden = true;
+                                        getGUIObjectByName("pregame_mp_ip").hidden = true;
+                                ]]></action>
+                        </object>
+
+                        <object type="text" name="pregame_ip_infotext">
+                                <action on="Load"><![CDATA[
+                                        getGUIObjectByName("pregame_ip_infotext").caption = "You can start a multiplayer game by Direct-IP connect from here. Either \n- enter a map name and click 'Host Game' to host a game or \n- enter an IP and click 'Join Game' to join a game on the entered IP.";
+                                        setSizeCoord("pregame_ip_infotext", crd_pregame_iphost_bkg_x, crd_pregame_iphost_bkg_y, crd_pregame_iphost_bkg_x+crd_pregame_iphost_bkg_width, crd_pregame_iphost_bkg_y+crd_pregame_iphost_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
+                                ]]></action>
+                        </object>
+
+                        <object type="image" name="pregame_mp_ip_divider1" sprite="only_black_border">
+                        <action on="Load"><![CDATA[
+                                setSizeCoord("pregame_mp_ip_divider1", -230, -130, 230, -130, mid_screen, mid_screen, mid_screen, mid_screen);
+                        ]]></action>
+                        </object>
+                        
+                        <!-- PLAYER NAME controls -->
+                        <object type="text" name="pregame_mp_ip_playername_txt" absolute="false" size="45 80 200 100" textcolor="0 0 0">
+                                Player Name (temporary):
+                        </object>
+                        
+                        <object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="255 255 255">
+                                Player
+                        </object>
+                        <!-- END PLAYER NAME controls -->
+
+                        <!-- HOST GAME controls -->
+                        <object type="image" name="pregame_mp_ip_divider2" sprite="only_black_border">
+                        <action on="Load"><![CDATA[
+                                setSizeCoord("pregame_mp_ip_divider2", -230, -75, 230, -75, mid_screen, mid_screen, mid_screen, mid_screen);
+                        ]]></action>
+                        </object>
+
+                        <object type="text" name="pregame_mp_ip_mapname_txt" absolute="false" size="45 130 200 150" textcolor="0 0 0">
+                                Map Name:
+                        </object>
+
+                        <object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="255 255 255">
+                                test01.pmp
+                        </object>
+
+                        <object type="button" name="pregame_mp_ip_host_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center">
+                                Host Game
+                                <action on="Load"><![CDATA[
+                                        setSizeCoord("pregame_mp_ip_host_bt", 50, -60, 150, -30, mid_screen, mid_screen, mid_screen, mid_screen);
+                                ]]></action>
+                                <action on="Press"><![CDATA[
+                                        initMPSessionHost(getGUIObjectByName("pregame_mp_ip_playername").caption, getGUIObjectByName("pregame_mp_ip_host_mapname").caption);
+                                ]]></action>
+                        </object>
+                        <!-- END HOST GAME controls -->
+                        
+                        <!-- JOIN GAME controls -->
+                        <object type="image" name="pregame_mp_ip_divider3" sprite="only_black_border">
+                                <action on="Load"><![CDATA[
+                                        setSizeCoord("pregame_mp_ip_divider3", -230, -20, 230, -20, mid_screen, mid_screen, mid_screen, mid_screen);
+                                ]]></action>
+                        </object>
+
+                        <object type="text" name="pregame_mp_ip_joinip_txt" absolute="false" size="45 190 200 210" textcolor="0 0 0">
+                                IP address:
+                        </object>
+
+                        <object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="255 255 255">
+                                127.0.0.1
+                        </object>
+
+                        <object type="button" name="pregame_mp_ip_join_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center">
+                                Join Game
+                                <action on="Load"><![CDATA[
+                                        setSizeCoord("pregame_mp_ip_join_bt", 50, 0, 150, 30, mid_screen, mid_screen, mid_screen, mid_screen);
+                                ]]></action>
+                                <action on="Press"><![CDATA[
+                                        initMPSessionClient(getGUIObjectByName("pregame_mp_ip_playername").caption, getGUIObjectByName("pregame_mp_ip_joinip").caption);
+                                ]]></action>
+                        </object>
+                        <!-- END JOIN GAME controls -->
+
+                </object>
+                
+                <!-- SINGLEPLAYER TEMPORARY MAP SELECTION DIALOG -->
+                <object type="button" name="pregame_sp_mapsel" sprite="0ad_window" z="106" hidden="true" size="50%-150 50%-90 50%+150 50%+90">
+
+                        <!-- The placement of this titlebar object is VERY hackish (see y-placement), but it doesn't work any other way so far, and this dialog will be temporary anyway -->
+                        <object type="button" name="pregame_sp_mapsel_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text_align="center" text_valign="center" absolute="false" size="50%-130 0%-22 50%+130 0%-14">
+                                Map selection
+                        </object>
+
+                        <object type="text" name="pregame_sp_infotext" absolute="false" size="10 10 290 60">
+                                Type the name of the map you want to start into the box. The name is relative to /data/mods/official/maps/scenarios/.
+                        </object>
+
+                        <object type="text" name="pregame_sp_mapname_txt" absolute="false" textcolor="0 0 0" size="10 90 120 110">
+                                Map Name:
+                        </object>
+
+                        <object type="input" name="pregame_sp_mapname" sprite="only_black" absolute="false" size="130 90 290 110" textcolor="255 255 255">
+                                ph2
+                        </object>
+
+                        <object type="button" name="pregame_sp_start_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" absolute="false" size="50%-100 100%-50 50%-10 100%-20">
+                                Start Game
+                                <action on="Press"><![CDATA[
+                                        // Check wheter we have a correct file extension, to avoid crashes
+                                        var mapName = getGUIObjectByName("pregame_sp_mapname").caption;
+                                        var extension = mapName.substring(mapName.length, mapName.length-4);
+                                        
+                                        if(extension != ".pmp") {
+                                                // Add .pmp to the file name - shouldn't help if the name is mistyped, but may be useful in some cases
+                                                mapName =  mapName + ".pmp";
+                                                console.write("Trying to fix the map name (probably missing extension).");
+                                        }
+
+                                        // Set up game
+                                        GUIObjectHide("pregame_subwindow_bkg");
+                                        GUIObjectHide("pregame_sp_mapsel");
+                                        g_GameAttributes.mapFile = mapName;
+                                        startLoadingScreen();
+                                ]]></action>
+                        </object>
+
+                        <object type="button" name="pregame_sp_mapsel_abort_button" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" absolute="false" size="50%+10 100%-50 50%+90 100%-20">
+                                Abort
+                                <action on="Press"><![CDATA[
+                                        GUIObjectHide("pregame_subwindow_bkg");
+                                        GUIObjectHide("pregame_sp_mapsel");
+                                ]]></action>
+                        </object>
+
+                </object>
+
+        </object>
+
+</objects>
diff --git a/binaries/data/mods/official/gui/test/7_atlas.xml b/binaries/data/mods/official/gui/test/7_atlas.xml
index b476fe3a8a..a831bdaa63 100644
--- a/binaries/data/mods/official/gui/test/7_atlas.xml
+++ b/binaries/data/mods/official/gui/test/7_atlas.xml
@@ -14,10 +14,9 @@
 
 		<!-- Simply black out the lowest level of the GUI, until such time as we're capable of starting an editor session of a scenario. -->
 		<object type="text" name="ATLAS_GUI_BKG" sprite="black" size="0 0 100% 100%" z="1" ghost="true" hidden="false"/>
-<!--
+
 		<!-- LEFT SELECTION PANE: Context panel along the left-hand side of the screen. -->
 		<object type="empty" name="ATLAS_LEFT_PANE" size="0 0 100% 100%" z="1" hidden="true">
-
 			<!-- LEFT SELECTION PANE BACKGROUND -->
 			<object type="text" name="ATLAS_LEFT_PANE_BKG" sprite="atlas_window_rt_border" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_BKG]); ]]></action></object>
 			<!-- LEFT SELECTION PANE HEADINGS -->
@@ -29,17 +28,9 @@
 			<object type="empty" name="ATLAS_LEFT_PANE_SECTION_MAP" size="0 0 100% 100%" z="1" hidden="true">
 				<object type="empty" name="ATLAS_LEFT_PANE_SECTION_MAP_TYPE_SIZE" size="0 0 100% 100%" z="1" hidden="false">
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_MAP_SIZE_LABEL" style="atlas_label_text" hidden="false">Size<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX",200);
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_TILE_WIDTH_INPUT_BOX",200); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_MAP_TILE_X" style="atlas_label_text" hidden="false">X<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_TILE_X]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX",200);
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_TILE_HEIGHT_INPUT_BOX",200); ]]></action></object>
 					<object type="empty" name="ATLAS_LEFT_PANE_SECTION_MAP_SIZE_RADIO" size="0 0 100% 100%" z="1" hidden="false">
 						<object type="button" name="ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_SMALL" style="atlas_button" hidden="false">Small<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SIZE_BUTTON_SMALL]); ]]></action>
 							<action on="Press"><![CDATA[
@@ -70,11 +61,7 @@
 				</object>
 				<object type="empty" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS" size="0 0 100% 100%" z="1" hidden="false">
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_LABEL" style="atlas_label_text" hidden="false">Players<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX", 4);
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX", 4); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_PLAYER_INPUT_BOX", 1);
@@ -86,11 +73,7 @@
 						]]></action>
 					</object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_LABEL" style="atlas_label_text" hidden="false">Settlements<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX", 2);
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX", 2); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_SETTLEMENT_INPUT_BOX", 1);
@@ -103,11 +86,7 @@
 					</object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_LABEL" style="atlas_label_text" hidden="false">Resources<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_LABEL]); ]]></action></object>
 <!-- NOTE: Needs to be made a drop-down box when this control becomes available (options Low (.5), Normal (0), High (2) ). -->
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX", "Normal");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_MAP_SETTINGS_RESOURCES_COMBO_BOX", "Normal"); ]]></action></object>
 				</object>
 				<object type="empty" name="ATLAS_LEFT_PANE_SECTION_MAP_GENERATE" size="0 0 100% 100%" z="1" hidden="false">
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_LABEL" style="atlas_label_text" hidden="false">Terrain Map<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_LABEL]); ]]></action></object>
@@ -132,17 +111,9 @@
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_ROUGHEN_BUTTON" style="atlas_button" hidden="false">Roughen<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_ROUGHEN_BUTTON]); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_LABEL" style="atlas_label_text" hidden="false">Style<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_LABEL]); ]]></action></object>
 <!-- NOTE: Needs to be made a drop-down box when this control becomes available. -->
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX", "Bumpy");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_STYLE_COMBO_BOX", "Bumpy"); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_LABEL" style="atlas_label_text" hidden="false">Power<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX", "2.1");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX", "2.1"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_POWER_INPUT_BOX", .1, 1);
@@ -154,11 +125,7 @@
 						]]></action>
 					</object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_LABEL" style="atlas_label_text" hidden="false">Scale<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX", "1.0");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX", "1.0"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_SCALE_INPUT_BOX", .1, 1);
@@ -171,11 +138,7 @@
 					</object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INCREMENT_BUTTON" style="atlas_button" hidden="false">Increment<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_INCREMENT_BUTTON]); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_LABEL" style="atlas_label_text" hidden="false">Amount<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX", "1.0");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX", "1.0"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_ELEVATION_AMOUNT_INPUT_BOX", .1, 1);
@@ -194,11 +157,7 @@
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR" sprite="atlas_hline" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEADING_HR]); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE" style="atlas_button" hidden="false">Place Cliff<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_BUTTON_PLACE]); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL" style="atlas_label_text" text_align="left" hidden="false">Height<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX", "3.0");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX", "3.0"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_HEIGHT_INPUT_BOX", .1, 1);
@@ -210,11 +169,7 @@
 						]]></action>
 					</object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_LABEL" style="atlas_label_text" text_align="left" hidden="false">Angle<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX", "65.0");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX", "65.0"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_ANGLE_INPUT_BOX", .1, 1);
@@ -226,11 +181,7 @@
 						]]></action>
 					</object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_LABEL" style="atlas_label_text" text_align="left" hidden="false">Smooth<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX", "1.0");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX", "1.0"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_CLIFF_SMOOTH_INPUT_BOX", .1, 1);
@@ -251,11 +202,6 @@
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE" style="atlas_button" hidden="false">Place Water<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_PLACE]); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_BEAUTIFY" style="atlas_icon_border" cell_id="12" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_BUTTON_BEAUTIFY]); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL" style="atlas_label_text" text_align="left" hidden="false">Depth<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX", "4.0");
-						]]></action>
-					</object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_DEPTH_INPUT_BOX", .1, 1);
@@ -267,32 +213,12 @@
 						]]></action>
 					</object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL" style="atlas_label_text" text_align="left" hidden="false">Colour<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_LABEL]); ]]></action></object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX", "100");
-						]]></action>
-					</object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX", "255");
-						]]></action>
-					</object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX", "80");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_R_INPUT_BOX", "100"); ]]></action></object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_G_INPUT_BOX", "255"); ]]></action></object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_B_INPUT_BOX", "80");  ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_TINT_BOX" style="atlas_indent" text_align="left" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_COLOUR_TINT_BOX]); ]]></action></object>
-					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL" style="atlas_label_text" text_align="left" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL","Smooth\nRadius");
-						]]></action>
-					</object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX", "4.0");
-						]]></action>
-					</object>
+					<object type="text" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL" style="atlas_label_text" text_align="left" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_LABEL","Smooth\nRadius"); ]]></action></object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX", "4.0"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_TERRAIN_WATER_SMOOTH_INPUT_BOX", .1, 1);
@@ -316,16 +242,8 @@
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR" style="atlas_button" hidden="false">Custom Actor<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ACTOR]); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ENTITY" style="atlas_button" hidden="false">Custom Entity<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_BUTTON_CUSTOM_ENTITY]); ]]></action></object>
 					<object type="text" name="ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG" sprite="atlas_window_grey" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_BKG]); ]]></action></object>
-					<object type="text" name="ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL" style="atlas_label_text" text_align="left" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL","Player");
-						]]></action>
-					</object>
-					<object type="input" name="ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" text_align="right" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX", "1");
-						]]></action>
-					</object>
+					<object type="text" name="ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL" style="atlas_label_text" text_align="left" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_LABEL","Player"); ]]></action></object>
+					<object type="input" name="ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX" sprite="atlas_input_box" style="atlas_label_text" text_align="right" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX]); GUIObjectSetCaption("ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX", "1"); ]]></action></object>
 					<object type="button" name="ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP" sprite="atlas_sheet_updown_button" cell_id="0" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX_UP]); ]]></action>
 						<action on="Press"><![CDATA[
 							GUIObjectModifyCaption("ATLAS_LEFT_PANE_SECTION_OBJECT_LIST_PLAYER_INPUT_BOX", 1, 0);
@@ -346,7 +264,7 @@
 	
 		<!-- BOTTOM SELECTION PANE: Context panel along the bottom of the screen. -->
 		<object type="empty" name="ATLAS_BOTTOM_PANE" size="0 0 100% 100%" z="1" hidden="true">
-
+            
 			<!-- BOTTOM SELECTION BACKGROUND -->
 			<object type="text" name="ATLAS_BOTTOM_PANE_BKG" sprite="atlas_window_rt_border" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_BKG]); ]]></action></object>
 
@@ -359,7 +277,7 @@
 			<!-- RIGHT/BOTTOM SELECTION PANE CORNER -->
 			<object type="text" name="ATLAS_RB_CORNER" sprite="atlas_rb_corner_x2" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_RB_CORNER]); ]]></action></object>
 
-			<!-- TERRAIN EDITOR BOTTOM PANE -->
+            <!-- TERRAIN EDITOR BOTTOM PANE -->
 			<object type="empty" name="ATLAS_BOTTOM_PANE_SECTION_TERRAIN" size="0 0 100% 100%" z="1" hidden="false">
 				<object type="empty" name="ATLAS_BOTTOM_PANE_SECTION_TERRAIN_OTHER" size="0 0 100% 100%" z="1" hidden="false">
 					<object type="text" name="ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW" style="atlas_indent" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PREVIEW]); ]]></action></object>
@@ -392,7 +310,7 @@
 								setSizeArray("ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB_" + ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last, Crd[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_TAB.last]]);
 						]]></action>
 					</object>
-					<object type="button" name="ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW" sprite="atlas_global_arrow_rt" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Terrain Palette Right Arrow[font=tahoma10]\nClick to display more terrain palette tabs." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW]); ]]></action>
+					<object type="button" name="ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW" sprite="atlas_global_arrow_rt" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]Terrain Palette Right Arrow[font=tahoma10]\nClick to display more terrain palette tabs." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_TERRAIN_PALETTE_RT_ARROW]); ]]></action>
 						<action on="Press"><![CDATA[
 						]]></action>
 					</object>
@@ -405,17 +323,13 @@
 				<object type="empty" name="ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM" size="0 0 100% 100%" z="1" hidden="false">
 					<object type="text" name="ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL" style="atlas_label_text" text_align="left" hidden="false">Animation<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX_LABEL]); ]]></action></object>
 <!-- NOTE: This will need to be replaced with a combobox when the control becomes available. -->
-					<object type="input" name="ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX]); ]]></action>
-						<action on="Load"><![CDATA[
-							GUIObjectSetCaption("ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX", "idle_a");
-						]]></action>
-					</object>
+					<object type="input" name="ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX" sprite="atlas_input_box" style="atlas_label_text" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX]); GUIObjectSetCaption("ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_COMBO_BOX", "idle_a"); ]]></action></object>
 					<object type="text" name="ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER" style="atlas_indent" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER]); ]]></action></object>
 					<object type="text" name="ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER_LABEL" style="atlas_label_text" hidden="false">Animation Viewer<action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_BOTTOM_PANE_SECTION_OBJECT_ANIM_VIEWER_LABEL]); ]]></action></object>
 				</object>
 			</object>
 		</object>
--->
+
 		<!-- RB: MINIMAP: Displays whole map. Identical functionality to session map, just a little smaller. -->
 		<!-- Later change this to type minimap, no sprite (doesn't do anything if not in simulation mode). -->
 		<object type="text" name="ATLAS_MINIMAP" sprite="atlas_window" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MINIMAP]); ]]></action></object>
@@ -472,12 +386,12 @@
 				<action on="Load"><![CDATA[
 					// Seek through ALL menu buttons and set their sizes at once. (So make sure this always goes in the last menu button.)
 					for (ATLAS_MAINBORDER_MENU_BUTTON.last = 1; ATLAS_MAINBORDER_MENU_BUTTON.last <= ATLAS_MAINBORDER_MENU_BUTTON.max; ATLAS_MAINBORDER_MENU_BUTTON.last++)
-						setSizeArray("atlas_mainborder_menu_" + ATLAS_MAINBORDER_MENU_BUTTON.last, Crd[ATLAS_MAINBORDER_MENU_BUTTON[ATLAS_MAINBORDER_MENU_BUTTON.last]]);
+						setSizeArray("ATLAS_MAINBORDER_MENU_" + ATLAS_MAINBORDER_MENU_BUTTON.last, Crd[ATLAS_MAINBORDER_MENU_BUTTON[ATLAS_MAINBORDER_MENU_BUTTON.last]]);
 				]]></action>
 				<action on="Press"><![CDATA[
 				]]></action>
 			</object>
-			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_MAXIMISE_ARROW" sprite="atlas_global_arrow_dn" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Maximise Arrow[font=tahoma10]\nClick to maximise the toolbar." hidden="true"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_MAXIMISE_ARROW]); ]]></action>
+			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_MAXIMISE_ARROW" sprite="atlas_global_arrow_dn" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]Toolbar Maximise Arrow[font=tahoma10]\nClick to maximise the toolbar." hidden="true"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_MAXIMISE_ARROW]); ]]></action>
 				<action on="Press"><![CDATA[
 					atlasMaximiseToolbar();
 				]]></action>
@@ -487,12 +401,12 @@
 		<!-- TOP: TOOLBAR -->
 		<object type="empty" name="ATLAS_MAINBORDER_TOOLBAR" size="0 0 100% 100%" z="1" hidden="false">
 			<object type="text" name="ATLAS_MAINBORDER_TOOLBAR_BKG" sprite="atlas_toolbar_bkg" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_BKG]); ]]></action></object>
-			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW" sprite="atlas_global_arrow_up" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Fully Minimise Arrow[font=tahoma10]\nClick to fully minimise the toolbar." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW]); ]]></action>
+			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW" sprite="atlas_global_arrow_up" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]Toolbar Fully Minimise Arrow[font=tahoma10]\nClick to fully minimise the toolbar." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_FULLY_MINIMISE_ARROW]); ]]></action>
 				<action on="Press"><![CDATA[
 					atlasFullyMinimiseToolbar();
 				]]></action>
 			</object>
-			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_FULLY_MAXIMISE_ARROW" sprite="atlas_global_arrow_dn" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Full Maximise Arrow[font=tahoma10]\nClick to fully maximise the toolbar." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_FULLY_MAXIMISE_ARROW]); ]]></action>
+			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_FULLY_MAXIMISE_ARROW" sprite="atlas_global_arrow_dn" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]Toolbar Full Maximise Arrow[font=tahoma10]\nClick to fully maximise the toolbar." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_FULLY_MAXIMISE_ARROW]); ]]></action>
 				<action on="Press"><![CDATA[
 					atlasFullyMaximiseToolbar();
 				]]></action>
@@ -502,16 +416,111 @@
 		<!-- TOP: TOOLBAR SECOND ROW -->
 		<object type="empty" name="ATLAS_MAINBORDER_TOOLBAR_MAX" size="0 0 100% 100%" z="1" hidden="true">
 			<object type="text" name="ATLAS_MAINBORDER_TOOLBAR_BKG_MAX" sprite="atlas_toolbar_bkg" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_BKG_MAX]); ]]></action></object>
-			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_MINIMISE_ARROW" sprite="atlas_global_arrow_up" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Minimise Arrow[font=tahoma10]\nClick to minimise the toolbar." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_MINIMISE_ARROW]); ]]></action>
+			<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_MINIMISE_ARROW" sprite="atlas_global_arrow_up" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]Toolbar Minimise Arrow[font=tahoma10]\nClick to minimise the toolbar." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_TOOLBAR_MINIMISE_ARROW]); ]]></action>
 				<action on="Press"><![CDATA[
 					atlasMinimiseToolbar();
 				]]></action>
 			</object>
 		</object>
 
+			<object type="empty" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_ROW_1" size="0 0 100% 100%" z="1" hidden="false">
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_1"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_2"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"><action on="Press"><![CDATA[ atlasOpenSectionMenu("none"); ]]></action></object>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_3"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"><action on="Press"><![CDATA[ atlasOpenSectionMenu("ATLAS_LEFT_PANE_SECTION_MAP"); ]]></action></object>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_4"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"><action on="Press"><![CDATA[ atlasOpenSectionMenu("ATLAS_LEFT_PANE_SECTION_TERRAIN"); ]]></action></object>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_5"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"><action on="Press"><![CDATA[ atlasOpenSectionMenu("ATLAS_LEFT_PANE_SECTION_OBJECT"); ]]></action></object>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_6"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_7"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_8"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_9"  tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_10" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_11" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_12" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_13" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_14" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_15" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_16" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_17" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_18" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_19" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_20" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_21" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_22" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_23" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_24" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_25" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_26" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_27" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_28" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_29" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_30" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_31" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_32" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_33" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_34" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_35" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_36" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_37" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_38" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_39" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_40" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+			</object>
+
+			<object type="empty" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_ROW_2" size="0 0 100% 100%" z="1" hidden="true">
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_41" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_42" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_43" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_44" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_45" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_46" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_47" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_48" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_49" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_50" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_51" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_52" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_53" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_54" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_55" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_56" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_57" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_58" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_59" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_60" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_61" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_62" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_63" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_64" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_65" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_66" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_67" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_68" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_69" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_70" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_71" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_72" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_73" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_74" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_75" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_76" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_77" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_78" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_79" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false"/>
+				<object type="button" name="ATLAS_MAINBORDER_TOOLBAR_BUTTON_80" tooltip="[font=tahoma10b]Menu Button[font=tahoma10]\nClick to open this menu." hidden="false">
+					<action on="Load"><![CDATA[
+						// Seek through ALL menu buttons and set their sizes at once. (So make sure this always goes in the last menu button.)
+						for (ATLAS_MAINBORDER_TOOLBAR_BUTTON.last = 1; ATLAS_MAINBORDER_TOOLBAR_BUTTON.last <= ATLAS_MAINBORDER_TOOLBAR_BUTTON.max; ATLAS_MAINBORDER_TOOLBAR_BUTTON.last++)
+						{
+							getGUIObjectByName("ATLAS_MAINBORDER_TOOLBAR_BUTTON_" + ATLAS_MAINBORDER_TOOLBAR_BUTTON.last).sprite = "atlas_sheet_toolbar_button";
+							getGUIObjectByName("ATLAS_MAINBORDER_TOOLBAR_BUTTON_" + ATLAS_MAINBORDER_TOOLBAR_BUTTON.last).cell_id = ATLAS_MAINBORDER_TOOLBAR_BUTTON.last-1;
+							setSizeArray("ATLAS_MAINBORDER_TOOLBAR_BUTTON_" + ATLAS_MAINBORDER_TOOLBAR_BUTTON.last, Crd[ATLAS_MAINBORDER_TOOLBAR_BUTTON[ATLAS_MAINBORDER_TOOLBAR_BUTTON.last]]);
+						}
+					]]></action>
+				</object>
+			</object>
 
 		<!-- LT: LOGO -->
-		<object type="button" name="ATLAS_MAINBORDER_LT_CORNER" sprite="atlas_mainborder_lt_corner" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]0 A.D. Logo[font=tahoma10]\nMmm, nothing like the smell of blatant self-promotion in the morning ... Oh, you can click this to return to the Main Menu too." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_LT_CORNER]); ]]></action>
+		<object type="button" name="ATLAS_MAINBORDER_LT_CORNER" sprite="atlas_mainborder_lt_corner" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]0 A.D. Logo[font=tahoma10]\nMmm, nothing like the smell of blatant self-promotion in the morning ... Oh, you can click this to return to the Main Menu too." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_LT_CORNER]); ]]></action>
 			<action on="Press"><![CDATA[
 				// Jason asked for an exit button to be put here, until we're able to exit via the drop-down File menu.
 				GUIObjectUnhide("PREGAME_GUI");
@@ -524,10 +533,9 @@
 			<!-- RT: INFO WINDOW BACKGROUND -->
 			<object type="text" name="ATLAS_MAINBORDER_RT_CORNER" sprite="atlas_mainborder_rt_corner" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_MAINBORDER_RT_CORNER]); ]]></action></object>
 			<!-- RT: INFO WINDOW BAR -->
-			<object type="text" name="ATLAS_INFO_WINDOW" sprite="atlas_window_white" font="tahoma10" textcolor="0 0 0" text_align="left" text_valign="center" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Info Window[font=tahoma10]\nInformation about the current scenario." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_INFO_WINDOW]); ]]></action>
-				<action on="Load"><![CDATA[
+			<object type="text" name="ATLAS_INFO_WINDOW" sprite="atlas_window_white" font="tahoma10" textcolor="0 0 0" text_align="left" text_valign="center" tooltip_style="ATLAS_TOOLTIP" tooltip="[font=tahoma10b]Info Window[font=tahoma10]\nInformation about the current scenario." hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[ATLAS_INFO_WINDOW]);
 					setInterval(atlasUpdateInfoWindow, 500);
-				]]></action>
+				 ]]></action>
 			</object>
 		</object>
 
diff --git a/binaries/data/mods/official/gui/test/functions_atlas.js b/binaries/data/mods/official/gui/test/functions_atlas.js
index 0fbe7ec6ee..81fb13d752 100755
--- a/binaries/data/mods/official/gui/test/functions_atlas.js
+++ b/binaries/data/mods/official/gui/test/functions_atlas.js
@@ -327,7 +327,7 @@ function atlasFullyMaximiseToolbar()
 	// Extend toolbar to two rows.
 
 	GUIObjectHide("ATLAS_MAINBORDER_TOOLBAR");
-	GUIObjectUnhide("ATLAS_MAINBORDER_TOOLBAR_max");
+	GUIObjectUnhide("ATLAS_MAINBORDER_TOOLBAR_MAX");
 	GUIObjectUnhide("ATLAS_MAINBORDER_TOOLBAR_BUTTON_ROW_1");
 	GUIObjectUnhide("ATLAS_MAINBORDER_TOOLBAR_BUTTON_ROW_2");
 
diff --git a/binaries/data/mods/official/gui/test/functions_atlas_map_creator.js b/binaries/data/mods/official/gui/test/functions_atlas_map_creator.js
index 80c93e240a..e9cb2ec61b 100644
--- a/binaries/data/mods/official/gui/test/functions_atlas_map_creator.js
+++ b/binaries/data/mods/official/gui/test/functions_atlas_map_creator.js
@@ -236,8 +236,8 @@ function initAtlasSectionMapCreator()
 
 	// "Generate!" button.
 	ATLAS_LEFT_PANE_SECTION_GENERATE_BUTTON = addArrayElement(Crd, Crd.last); 
-	Crd[Crd.last-1].rleft	= left_screen;	Crd[Crd.last-1].rtop	= top_screen; 
-	Crd[Crd.last-1].rright	= left_screen;	Crd[Crd.last-1].rbottom	= top_screen; 
+	Crd[Crd.last-1].rleft	= left_screen;	Crd[Crd.last-1].rtop	= bottom_screen; 
+	Crd[Crd.last-1].rright	= left_screen;	Crd[Crd.last-1].rbottom	= bottom_screen; 
 	Crd[Crd.last-1].width	= Crd[ATLAS_LEFT_PANE_SECTION_GENERATE_TERRAIN_MAP_INPUT_BOX].width-ATLAS_LEFT_PANE_SECTION_GENERATE_SPAN-ATLAS_LEFT_PANE_SECTION_GENERATE_SPAN; 
 	Crd[Crd.last-1].height	= Crd[ATLAS_LEFT_PANE_SECTION_GENERATE_BORDER].height-ATLAS_LEFT_PANE_SECTION_GENERATE_SPAN-ATLAS_LEFT_PANE_SECTION_GENERATE_SPAN; 
 	Crd[Crd.last-1].x	= Crd[ATLAS_LEFT_PANE_SECTION_GENERATE_BORDER].x+ATLAS_LEFT_PANE_SECTION_GENERATE_SPAN;
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index 92abfac0a3..e38ff32a02 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -210,3 +210,105 @@ function selected()
 }
 
 // ====================================================================
+
+function FlipGUI(NewGUIType)
+{
+	// Sets the GUI coordinates and graphics so that the panel is either at the top or bottom of the screen.
+
+	switch (NewGUIType)
+	{
+		// Set which GUI to use.
+		case "top":
+		case "bottom":
+		case "none":
+			GUIType=NewGUIType;
+		break;
+		default:
+			// If no type specified, toggle.
+			if (GUIType == "top")
+				GUIType = "bottom";
+			else
+			if (GUIType == "bottom")
+				GUIType = "none";
+			else
+				GUIType = "top";
+		break;
+	}
+
+	if (GUIType != "none")
+	{
+		GUIObjectUnhide("SESSION_GUI");
+		GUIObjectUnhide("always_on");
+
+		// Seek through all sizes created.
+		for (FlipGUILoop = 0; FlipGUILoop <= SizeCoord.last-1; FlipGUILoop++)
+		{
+			// Set each object to the other size.
+			switch (GUIType)
+			{
+				case "top":
+					setSize(SizeCoord[FlipGUILoop].name, SizeCoord[FlipGUILoop].size1);
+					switch (SizeCoord[FlipGUILoop].name){
+						case "session_panel_minimap_segbottom1":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
+						break;
+						case "session_panel_minimap_segbottom2":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
+						break;
+						case "session_panel_minimap_segbottom3":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
+						break;
+						case "session_panel_minimap_segbottom4":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
+						break;
+						case "session_panel_status_bg":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg_top";
+						break;
+						default:
+						break;
+					}
+				break;
+				case "bottom":
+					setSize(SizeCoord[FlipGUILoop].name, SizeCoord[FlipGUILoop].size2);
+					switch (SizeCoord[FlipGUILoop].name){
+						case "session_panel_minimap_segbottom1":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop1";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop1_lit";
+						break;
+						case "session_panel_minimap_segbottom2":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop2";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop2_lit";
+						break;
+						case "session_panel_minimap_segbottom3":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop3";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop3_lit";
+						break;
+						case "session_panel_minimap_segbottom4":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop4";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop4_lit";
+						break;
+						case "session_panel_status_bg":
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg_bottom";
+						break;
+						default:
+						break;
+					}
+				break;
+			}			
+		}
+
+		UpdateGroupPane();
+	}
+	else
+	{
+		GUIObjectHide("SESSION_GUI");
+		GUIObjectHide("always_on");
+	}
+
+	writeConsole("GUI flipped to " + GUIType + ".");
+
+}
diff --git a/binaries/data/mods/official/gui/test/functions_utility_coord.js b/binaries/data/mods/official/gui/test/functions_utility_coord.js
index e44aa39b04..f648e60e17 100644
--- a/binaries/data/mods/official/gui/test/functions_utility_coord.js
+++ b/binaries/data/mods/official/gui/test/functions_utility_coord.js
@@ -133,6 +133,9 @@ function setSizeArray(objectName, objectArrayElement, rleft, rtop, rright, rbott
 		case right_screen:
 			setSizeContainer.x1 = -objectArrayElement.x-objectArrayElement.width;
 		break;
+		case mid_screen:
+			setSizeContainer.x1 = objectArrayElement.x;
+		break;
 	}
 	switch (setSizeContainer.rtop)
 	{
@@ -142,6 +145,9 @@ function setSizeArray(objectName, objectArrayElement, rleft, rtop, rright, rbott
 		case bottom_screen:
 			setSizeContainer.y1 = -objectArrayElement.y-objectArrayElement.height;
 		break;
+		case mid_screen:
+			setSizeContainer.y1 = objectArrayElement.y;
+		break;
 	}
 	switch (setSizeContainer.rright)
 	{
@@ -154,6 +160,9 @@ function setSizeArray(objectName, objectArrayElement, rleft, rtop, rright, rbott
 			else
 				setSizeContainer.x2 = -objectArrayElement.width;				
 		break;
+		case mid_screen:
+			setSizeContainer.x2 = objectArrayElement.x+objectArrayElement.width;
+		break;
 	}
 	switch (setSizeContainer.rbottom)
 	{
@@ -166,6 +175,9 @@ function setSizeArray(objectName, objectArrayElement, rleft, rtop, rright, rbott
 			else
 				setSizeContainer.y2 = -objectArrayElement.height;
 		break;
+		case mid_screen:
+			setSizeContainer.y2 = objectArrayElement.y+objectArrayElement.height;
+		break;
 	}
 
 	// Set appropriate size for dimensions.
@@ -174,104 +186,3 @@ function setSizeArray(objectName, objectArrayElement, rleft, rtop, rright, rbott
 
 // ====================================================================
 
-function FlipGUI(NewGUIType)
-{
-	// Sets the GUI coordinates and graphics so that the panel is either at the top or bottom of the screen.
-
-	switch (NewGUIType)
-	{
-		// Set which GUI to use.
-		case "top":
-		case "bottom":
-		case "none":
-			GUIType=NewGUIType;
-		break;
-		default:
-			// If no type specified, toggle.
-			if (GUIType == "top")
-				GUIType = "bottom";
-			else
-			if (GUIType == "bottom")
-				GUIType = "none";
-			else
-				GUIType = "top";
-		break;
-	}
-
-	if (GUIType != "none")
-	{
-		GUIObjectUnhide("SESSION_GUI");
-		GUIObjectUnhide("always_on");
-
-		// Seek through all sizes created.
-		for (FlipGUILoop = 0; FlipGUILoop <= SizeCoord.last-1; FlipGUILoop++)
-		{
-			// Set each object to the other size.
-			switch (GUIType)
-			{
-				case "top":
-					setSize(SizeCoord[FlipGUILoop].name, SizeCoord[FlipGUILoop].size1);
-					switch (SizeCoord[FlipGUILoop].name){
-						case "session_panel_minimap_segbottom1":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
-						break;
-						case "session_panel_minimap_segbottom2":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
-						break;
-						case "session_panel_minimap_segbottom3":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
-						break;
-						case "session_panel_minimap_segbottom4":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
-						break;
-						case "session_panel_status_bg":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg_top";
-						break;
-						default:
-						break;
-					}
-				break;
-				case "bottom":
-					setSize(SizeCoord[FlipGUILoop].name, SizeCoord[FlipGUILoop].size2);
-					switch (SizeCoord[FlipGUILoop].name){
-						case "session_panel_minimap_segbottom1":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop1";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop1_lit";
-						break;
-						case "session_panel_minimap_segbottom2":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop2";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop2_lit";
-						break;
-						case "session_panel_minimap_segbottom3":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop3";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop3_lit";
-						break;
-						case "session_panel_minimap_segbottom4":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop4";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop4_lit";
-						break;
-						case "session_panel_status_bg":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg_bottom";
-						break;
-						default:
-						break;
-					}
-				break;
-			}			
-		}
-
-		UpdateGroupPane();
-	}
-	else
-	{
-		GUIObjectHide("SESSION_GUI");
-		GUIObjectHide("always_on");
-	}
-
-	writeConsole("GUI flipped to " + GUIType + ".");
-
-}
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index eed6954f01..3a56d5f447 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -89,8 +89,8 @@
                 delay="0"
         />
 
-        <tooltip name="atlas_tooltip"
-                use_object="atlas_tooltip"
+        <tooltip name="ATLAS_TOOLTIP"
+                use_object="ATLAS_TOOLTIP"
                 hide_object="true"
                 delay="0"
 	/>