Index: code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/DecisionPopup.layout	(revision 6334)
+++ code/branches/presentation2/data/gui/layouts/DecisionPopup.layout	(revision 6335)
@@ -1,79 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
-
 <GUILayout >
-
     <Window Type="DefaultWindow" Name="orxonox/DecisionPopup_RootWindow" >
-
         <Property Name="InheritsAlpha" Value="False" />
-
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
         <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
-
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
             <Property Name="Alpha" Value="0.6" />
-
             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
-
                 <Property Name="Font" Value="BlueHighway-12" />
-
                 <Property Name="Text" Value="Yes" />
-
                 <Property Name="Alpha" Value="0.7" />
-
                 <Property Name="InheritsAlpha" Value="False" />
- 
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
                 <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
-
                 <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
-
             </Window>
-
             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
-
                 <Property Name="Font" Value="BlueHighway-12" />
-
                 <Property Name="Text" Value="No" />
-
                 <Property Name="Alpha" Value="0.8" />
-
                 <Property Name="InheritsAlpha" Value="False" />
- 
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
                 <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
-
                 <Event Name="Clicked" Function="DecisionPopup.button_no"/>
-
             </Window>
-
             <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
-
                 <Property Name="Text" Value="Template text" />
-
                 <Property Name="HorzFormatting" Value="WordWrapCentred" />
-
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
                 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
-
                 <Property Name="InheritsAlpha" Value="False" />
- 
                 <Property Name="Alpha" Value="0.8" />
-
             </Window>
-
         </Window>
-
     </Window>
-
 </GUILayout>
Index: code/branches/presentation2/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/InGameMenu.layout	(revision 6334)
+++ code/branches/presentation2/data/gui/layouts/InGameMenu.layout	(revision 6335)
@@ -1,81 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
-
 <GUILayout >
-
     <Window Type="DefaultWindow" Name="orxonox/InGameMenu_RootWindow" >
-
         <Property Name="InheritsAlpha" Value="False" />
-
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
-
             <Property Name="Font" Value="BlueHighway-12" />
-
             <Property Name="Text" Value="Return to Game" />
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
-
             <Property Name="Alpha" Value="0.7" />
-
             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
-
         </Window>
-
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
-
             <Property Name="Font" Value="BlueHighway-12" />
-
             <Property Name="Text" Value="Main Menu" />
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
-
             <Property Name="Alpha" Value="0.7" />
-
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
-
         </Window>
-
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
-
             <Property Name="Font" Value="BlueHighway-12" />
-
             <Property Name="Text" Value="Settings" />
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
-
             <Property Name="Alpha" Value="0.7" />
-
             <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
-
         </Window>
-
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
-
             <Property Name="Font" Value="BlueHighway-12" />
-
             <Property Name="Text" Value="Quit" />
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-
             <Property Name="Alpha" Value="0.7" />
-
             <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
-
         </Window>
-
     </Window>
-
 </GUILayout>
Index: code/branches/presentation2/data/gui/layouts/InfoPopup.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/InfoPopup.layout	(revision 6334)
+++ code/branches/presentation2/data/gui/layouts/InfoPopup.layout	(revision 6335)
@@ -1,62 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
-
 <GUILayout >
-
     <Window Type="DefaultWindow" Name="orxonox/InfoPopup_RootWindow" >
-
         <Property Name="InheritsAlpha" Value="False" />
-
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
         <Window Type="TaharezLook/StaticImage" Name="orxonox/InfoPopup_Background" >
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
             <Property Name="Alpha" Value="0.7" />
-
             <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
-
                 <Property Name="Font" Value="BlueHighway-12" />
-
                 <Property Name="Text" Value="Close" />
-
                 <Property Name="Alpha" Value="0.7" />
-
                 <Property Name="InheritsAlpha" Value="False" />
- 
-               <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
-
                 <Event Name="Clicked" Function="InfoPopup.close"/>
-
             </Window>
-
             <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
-
                 <Property Name="Text" Value="Template text" />
-
                 <Property Name="TextColours" Value="FF4444FF" />
                 <Property Name="HorzFormatting" Value="WordWrapCentred" />
-
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
                 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
-
                 <Property Name="InheritsAlpha" Value="False" />
- 
                <Property Name="Alpha" Value="0.8" />
-
             </Window>
-
         </Window>
-
     </Window>
-
 </GUILayout>
Index: code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout	(revision 6334)
+++ code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout	(revision 6335)
@@ -1,84 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
-
 <GUILayout >
-
     <Window Type="DefaultWindow" Name="orxonox/KeyBindMenu/Background" >
-
         <Property Name="InheritsAlpha" Value="False" />
-
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-
         <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWindow" >
-
             <Property Name="Text" Value="Keybindings" />
-
             <Property Name="Alpha" Value="0.8" />
-
             <Property Name="InheritsAlpha" Value="False" />
-
             <Property Name="HorzFormatting" Value="HorzCentred" />
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="VertFormatting" Value="TopAligned" />
-
             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-
             <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
-
                 <Property Name="TextColours" Value="FF4444FF" />
-
                 <Property Name="InheritsAlpha" Value="False" />
-
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
                 <Property Name="HorzFormatting" Value="HorzCentred" />
-
                 <Property Name="VertFormatting" Value="TopAligned" />
-
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-
                 <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
-
                     <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-
                     <Property Name="HorzStepSize" Value="0.1" />
-
                     <Property Name="VertStepSize" Value="0.1" />
-
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
                     <Property Name="HorzOverlapSize" Value="0.01" />
-
                     <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
-
                     <Property Name="VertOverlapSize" Value="0.01" />
-
                     <Property Name="HorzScrollPosition" Value="0" />
-
                     <Property Name="VertScrollPosition" Value="0" />
-
                 </Window>
-
             </Window>
-
         </Window>
-
         <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
             <Property Name="Text" Value="Back" />
-
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
-
             <Event Name="Clicked" Function="KeyBindMenu.KeyBindBackButton_clicked"/>
-
         </Window>
-
     </Window>
-
 </GUILayout>
