From b4d16682ce6e83878dd97c3dcb87c43385aa6c42 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 3 May 2015 17:13:50 +0100
Subject: [PATCH] GUI Cleanup from Michael HABARTA.  Part 3/3

---
 Nasal/wildfire.nas                        |    2 +-
 gui/dialogs/joystick-config.xml           |   16 +-
 gui/dialogs/local_weather_tiles.xml       |  821 ++++----
 gui/dialogs/local_weather_winds.xml       |  603 +++---
 gui/dialogs/location-in-air.xml           |  140 +-
 gui/dialogs/location-of-tower.xml         |   30 +-
 gui/dialogs/map-canvas.xml                |   68 +-
 gui/dialogs/map.xml                       |  482 ++---
 gui/dialogs/multiplayer.xml               |    4 +-
 gui/dialogs/radios.xml                    |   31 +-
 gui/dialogs/random-failures.xml           |   18 +-
 gui/dialogs/rembrandt.xml                 | 2164 +++++++++++----------
 gui/dialogs/rendering.xml                 |  150 +-
 gui/dialogs/route-manager.xml             |   96 +-
 gui/dialogs/scenario.xml                  |   44 +-
 gui/dialogs/sound.xml                     |   12 +
 gui/dialogs/stereoscopic-view-options.xml |   20 +-
 gui/dialogs/stopwatch.xml                 |   21 +-
 gui/dialogs/system-failures.xml           |   15 +-
 gui/dialogs/terrasync.xml                 |  623 +++---
 gui/dialogs/weather-configuration.xml     |   90 +-
 gui/dialogs/weather.xml                   |  626 +++---
 gui/menubar.xml                           |    8 +
 23 files changed, 3302 insertions(+), 2782 deletions(-)

diff --git a/Nasal/wildfire.nas b/Nasal/wildfire.nas
index 6fe25a6eb..8ab105db1 100644
--- a/Nasal/wildfire.nas
+++ b/Nasal/wildfire.nas
@@ -1111,7 +1111,7 @@ var dialog = {
         var titlebar = me.dialog.addChild("group");
         titlebar.set("layout", "hbox");
         titlebar.addChild("empty").set("stretch", 1);
-        titlebar.addChild("text").set("label", "Wildfire settings");
+        titlebar.addChild("text").set("label", "Wildfire Settings");
         titlebar.addChild("empty").set("stretch", 1);
         var w = titlebar.addChild("button");
         w.set("pref-width", 16);
diff --git a/gui/dialogs/joystick-config.xml b/gui/dialogs/joystick-config.xml
index 739829a1c..394497275 100644
--- a/gui/dialogs/joystick-config.xml
+++ b/gui/dialogs/joystick-config.xml
@@ -188,37 +188,37 @@ var updateConfig = func() {
 	
 	<text>
 	  <halign>left</halign>
-	  <label>To configure your joystick/yoke/pedals:</label>
+	  <label>  To configure your joystick/yoke/pedals:</label>
   </text>
 
 	<text>
 	  <halign>left</halign>
-	  <label>  1) Select the device your wish to configure from the drop-down.</label>
+	  <label>    1) Select the device your wish to configure from the drop-down.</label>
   </text>
 
 	<text>
 	  <halign>left</halign>
-	  <label>  2) Identify the control you wish to configure by moving the joystick or pressing the button.  The result is shown in the Input column.</label>
+	  <label>    2) Identify the control you wish to configure by moving the joystick or pressing the button.  The result is shown in the Input column.</label>
   </text>
 
 	<text>
 	  <halign>left</halign>
-	  <label>  3) Using the drop-down or dialog button, select what you want the control to do.  "Custom" indicates a manually configured command.</label>
+	  <label>    3) Using the drop-down or dialog button, select what you want the control to do.  "Custom" indicates a manually configured command.</label>
   </text>
 
 	<text>
 	  <halign>left</halign>
-	  <label>  Your selection will take effect immediately.</label>
+	  <label>    Your selection will take effect immediately.</label>
   </text>
   
 	<text>
 	  <halign>left</halign>
-	  <label>  4) Test your control.  Some joystick controls can be "inverted" if you wish the control to take effect in the opposite direction.</label>
+	  <label>    4) Test your control.  Some joystick controls can be "inverted" if you wish the control to take effect in the opposite direction.</label>
   </text>
 
 	<text>
 	  <halign>left</halign>
-	  <label>Your modified joystick configuration is saved automatically.  You can reset the configuration to the default by pressing Reset Configuration.</label>
+	  <label>  Your modified joystick configuration is saved automatically.  You can reset the configuration to the default by pressing Reset Configuration.  </label>
   </text>
   
   <hrule/>
@@ -291,7 +291,7 @@ var updateConfig = func() {
 	    <row>1</row>
 	    <col>0</col>
 	    <halign>right</halign>
-	    <label>Configuration File:</label>
+	    <label>  Configuration File:</label>
     </text>
     
 	  <text>
diff --git a/gui/dialogs/local_weather_tiles.xml b/gui/dialogs/local_weather_tiles.xml
index 24b8c05f3..6dd2693bb 100644
--- a/gui/dialogs/local_weather_tiles.xml
+++ b/gui/dialogs/local_weather_tiles.xml
@@ -39,116 +39,134 @@
   <hrule/>
 
   <group>
-    <layout>vbox</layout>
-      
+    <layout>hbox</layout>
+
+    <!-- gap -->
     <text>
-      <halign>left</halign>
-      <label>General Settings</label>
+      <label></label>
     </text>
-    
-    <group>
-      <layout>table</layout>
-      
-      <text>
-        <row>0</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Tile selection mode</label>
-      </text>
 
-      <combo>
-        <row>0</row>
-        <col>1</col>
-        <halign>left</halign>
-        <pref-width>150</pref-width>
-        <live>true</live>
-        <property>/local-weather/tmp/tile-management</property>
-        <value>single tile</value>
-        <value>repeat tile</value>
-        <value>realistic weather</value>
-        <value>METAR</value>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </combo>
-
-      
-    
-      <text>
-        <row>1</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Altitude offset (ft)</label>
-      </text>
-
-      <input>
-        <row>1</row>
-        <col>1</col>
-        <halign>left</halign>
-        <property>/local-weather/tmp/tile-alt-offset-ft</property>
-      </input>
-      
-      <text>
-        <row>2</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Temperature offset (C)</label>
-      </text>
-
-      <input>
-        <row>2</row>
-        <col>1</col>
-        <halign>left</halign>
-        <property>/local-weather/config/temperature-offset-degc</property>
-      </input>
-
-      <checkbox>
-        <row>3</row>
-        <col>0</col>
-        <halign>left</halign>
-        <label>debug output</label>
-        <property>/local-weather/config/debug-output-flag</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-      <checkbox>
-        <row>3</row>
-        <col>1</col>
-        <halign>left</halign>
-        <label>terrain effects</label>
-        <property>/local-weather/config/detailed-terrain-interaction-flag</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-      <checkbox>
-        <row>3</row>
-        <col>2</col>
-        <halign>left</halign>
-        <label>terrain presampling</label>
-        <property>/local-weather/config/presampling-flag</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-    </group>
-    
-    <hrule/>
-    
-    <text>
-      <halign>left</halign>
-      <label>Wind Settings</label>
-    </text>
-    
     <group>
       <layout>vbox</layout>
-      
+
+      <text>
+        <halign>left</halign>
+        <label>General Settings</label>
+      </text>
+
+      <group>
+        <layout>table</layout>
+
+        <text>
+          <row>0</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Tile Selection Mode</label>
+        </text>
+
+        <combo>
+          <row>0</row>
+          <col>1</col>
+          <halign>left</halign>
+          <pref-width>150</pref-width>
+          <live>true</live>
+          <property>/local-weather/tmp/tile-management</property>
+          <value>single tile</value>
+          <value>repeat tile</value>
+          <value>realistic weather</value>
+          <value>METAR</value>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </combo>
+
+        <text>
+          <row>1</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Altitude Offset (ft)</label>
+        </text>
+
+        <input>
+          <row>1</row>
+          <col>1</col>
+          <halign>left</halign>
+          <property>/local-weather/tmp/tile-alt-offset-ft</property>
+        </input>
+
+        <text>
+          <row>2</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Temperature Offset (C)</label>
+        </text>
+
+        <input>
+          <row>2</row>
+          <col>1</col>
+          <halign>left</halign>
+          <property>/local-weather/config/temperature-offset-degc</property>
+        </input>
+
+        <checkbox>
+          <row>3</row>
+          <col>0</col>
+          <halign>left</halign>
+          <label>Debug Output</label>
+          <property>/local-weather/config/debug-output-flag</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </checkbox>
+
+        <checkbox>
+          <row>3</row>
+          <col>1</col>
+          <halign>left</halign>
+          <label>Terrain Effects</label>
+          <property>/local-weather/config/detailed-terrain-interaction-flag</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </checkbox>
+
+        <checkbox>
+          <row>3</row>
+          <col>2</col>
+          <halign>left</halign>
+          <label>Terrain Presampling</label>
+          <property>/local-weather/config/presampling-flag</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </checkbox>
+
+      </group>
+
+    </group>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+  </group>
+
+  <hrule/>
+    
+  <group>
+    <layout>hbox</layout>
+
+    <group>
+      <layout>vbox</layout>
+
+      <text>
+        <halign>left</halign>
+        <label> Wind Settings</label>
+      </text>
+
       <group>
         <layout>hbox</layout>
-        
+
         <empty>
           <stretch>true</stretch>
         </empty>
@@ -175,21 +193,20 @@
           <label>kts</label>
         </text>
 
-        
         <empty>
           <stretch>true</stretch>
         </empty>
-        
+
       </group>
-      
+
       <group>
         <layout>table</layout>
-            
+
         <text>
           <row>0</row>
           <col>0</col>
           <halign>right</halign>
-          <label>Gust frequency (Hz)</label>
+          <label>Gust Frequency (Hz)</label>
         </text>
 
         <slider>
@@ -218,7 +235,7 @@
           <row>1</row>
           <col>0</col>
           <halign>right</halign>
-          <label>Gust factor</label>
+          <label>Gust Factor</label>
         </text>
 
         <slider>
@@ -242,12 +259,12 @@
           <property>/local-weather/tmp/gust-relative-strength</property>
           <live>true</live>
         </text>
-      
+
         <text>
           <row>2</row>
           <col>0</col>
           <halign>right</halign>
-          <label>Gust direction variation</label>
+          <label>      Gust Direction Variation</label>
         </text>
 
         <slider>
@@ -276,7 +293,7 @@
           <row>3</row>
           <col>0</col>
           <halign>right</halign>
-          <label>Wind model</label>
+          <label>Wind Model</label>
         </text>
 
         <combo>
@@ -296,266 +313,303 @@
         </combo>
       </group>
     </group>
-    
-    <hrule/>
-    
+
+    <!-- gap -->
     <text>
-      <halign>left</halign>
-      <label>Thermic and Visibility Settings</label>
+      <label> </label>
     </text>
-      
-    <group>
-      <layout>table</layout>
 
-      <text>
-        <row>0</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Generate thermals</label>
-      </text>
+  </group>
 
-      <checkbox>
-        <row>0</row>
-        <col>2</col>
-        <halign>left</halign>
-        <property>/local-weather/config/generate-thermal-lift-flag</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-      <text>
-        <row>0</row>
-        <col>3</col>
-        <halign>right</halign>
-        <label>Realistic visibility</label>
-      </text>
-
-      <checkbox>
-        <row>0</row>
-        <col>4</col>
-        <halign>left</halign>
-        <property>/local-weather/config/realistic-visibility-flag</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-     <text>
-        <row>1</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Cloud shadows </label>
-      </text>
-
-      <checkbox>
-        <row>1</row>
-        <col>2</col>
-        <halign>left</halign>
-        <property>/local-weather/config/generate-cloud-shadows</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-    <text>
-        <row>1</row>
-        <col>3</col>
-        <halign>right</halign>
-        <label>(needs ALS shaders)</label>
-      </text>
-
-      <text>
-        <row>2</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Convective conditions</label>
-      </text>
-      
-      <text>
-        <row>2</row>
-        <col>1</col>
-        <halign>right</halign>
-        <label>rough day</label>
-      </text>
-
-      <slider>
-        <row>2</row>
-        <col>2</col>
-        <min>0.3</min>
-        <max>1.5</max>
-        <property>/local-weather/config/thermal-properties</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </slider>
-
-      <text>
-        <row>2</row>
-        <col>3</col>
-        <halign>left</halign>
-        <label>low convection</label>
-      </text>
-
-      <text>
-        <row>3</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Ground haze</label>
-      </text>
-
-      <text>
-        <row>3</row>
-        <col>1</col>
-        <halign>right</halign>
-        <label>thick</label>
-      </text>
-
-      <slider>
-        <row>3</row>
-        <col>2</col>
-        <min>0.1</min>
-        <max>1.0</max>
-        <property>/local-weather/config/ground-haze-factor</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </slider>
-
-      <text>
-        <row>3</row>
-        <col>3</col>
-        <halign>left</halign>
-        <label>thin</label>
-      </text>
-
-      <text>
-        <row>4</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Air pollution</label>
-      </text>
-
-      <text>
-        <row>4</row>
-        <col>1</col>
-        <halign>right</halign>
-        <label>clean</label>
-      </text>
-
-      <slider>
-        <row>4</row>
-        <col>2</col>
-        <min>0.0</min>
-        <max>1.0</max>
-        <property>/environment/air-pollution-norm</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </slider>
-
-      <text>
-        <row>4</row>
-        <col>3</col>
-        <halign>left</halign>
-        <label>smog</label>
-      </text>
-
-      <text>
-        <row>5</row>
-        <col>0</col>
-        <halign>right</halign>
-        <label>Fog properties</label>
-      </text>
-
-      <text>
-        <row>5</row>
-        <col>1</col>
-        <halign>right</halign>
-        <label>smooth</label>
-      </text>
-
-      <slider>
-        <row>5</row>
-        <col>2</col>
-        <min>0.0</min>
-        <max>12.0</max>
-        <property>/environment/fog-structure</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </slider>
-
-      <text>
-        <row>5</row>
-        <col>3</col>
-        <halign>left</halign>
-        <label>structured</label>
-      </text>
-
-      <text>
-        <row>6</row>
-        <col>0</col>
-        <halign>right</halign>
-        <!--<enable>
-          <equals>
-            <property>/local-weather/config/realistic-visibility-flag</property>
-            <value>0</value>
-          </equals>
-        </enable>-->
-        <label>Max. visibility</label>
-      </text>
-
-      <text>
-        <row>6</row>
-        <col>1</col>
-        <halign>right</halign>
-        <label>20 km</label>
-      </text>
-
-      <slider>
-        <row>6</row>
-        <col>2</col>
-        <!--<enable>
-          <equals>
-          <property>/local-weather/config/realistic-visibility-flag</property>
-          <value>0</value>
-          </equals>
-        </enable>-->
-        <min>9.90348</min>
-        <max>12.429216196</max>
-        <property>/local-weather/config/aux-max-vis-range-m</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </slider>
-
-      <text>
-        <row>6</row>
-        <col>3</col>
-        <halign>left</halign>
-        <label>250 km</label>
-      </text>
-
-      <text>
-        <row>6</row>
-        <col>4</col>
-        <halign>left</halign>
-        <!--<enable>
-          <equals>
-            <property>/local-weather/config/realistic-visibility-flag</property>
-            <value>0</value>
-          </equals>
-        </enable>-->
-        <label>12345678</label>
-        <format>%.fm</format>
-        <live>true</live>
-        <property>/local-weather/config/max-vis-range-m</property>
-      </text>
-    </group>
-      
-    <hrule/>
+  <hrule/>
     
+  <group>
+    <layout>hbox</layout>
+
+    <group>
+      <layout>vbox</layout>
+
+      <text>
+        <halign>left</halign>
+        <label> Thermic and Visibility Settings</label>
+      </text>
+
+      <group>
+        <layout>hbox</layout>
+
+        <!-- gap -->
+        <text>
+          <label></label>
+        </text>
+
+        <group>
+          <layout>table</layout>
+
+          <!-- gap -->
+          <text>
+            <row>0</row>
+            <col>0</col>
+            <pref-width>5</pref-width>
+            <label></label>
+          </text>
+
+          <checkbox>
+            <row>0</row>
+            <col>1</col>
+            <halign>left</halign>
+            <property>/local-weather/config/generate-thermal-lift-flag</property>
+            <label> Generate Thermals           </label>
+            <binding>
+              <command>dialog-apply</command>
+            </binding>
+          </checkbox>
+
+          <checkbox>
+            <row>0</row>
+            <col>2</col>
+            <halign>left</halign>
+            <label> Realistic Visibility</label>
+            <property>/local-weather/config/realistic-visibility-flag</property>
+            <binding>
+              <command>dialog-apply</command>
+            </binding>
+          </checkbox>
+
+          <checkbox>
+            <row>1</row>
+            <col>1</col>
+            <halign>left</halign>
+            <label> Cloud Shadows </label>
+            <property>/local-weather/config/generate-cloud-shadows</property>
+            <binding>
+              <command>dialog-apply</command>
+            </binding>
+          </checkbox>
+
+          <text>
+            <row>1</row>
+            <col>2</col>
+            <halign>right</halign>
+            <label> (needs ALS shaders)</label>
+          </text>
+
+          <!-- gap -->
+          <text>
+            <row>1</row>
+            <col>3</col>
+            <label>     </label>
+          </text>
+
+        </group>
+
+      </group>
+
+      <empty><stretch>1</stretch></empty>
+
+      <group>
+        <layout>table</layout>
+
+        <text>
+          <row>2</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label> Convective Conditions:</label>
+        </text>
+
+        <text>
+          <row>2</row>
+          <col>1</col>
+          <halign>right</halign>
+          <label>rough day</label>
+        </text>
+
+        <slider>
+          <row>2</row>
+          <col>2</col>
+          <min>0.3</min>
+          <max>1.5</max>
+          <property>/local-weather/config/thermal-properties</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>2</row>
+          <col>3</col>
+          <halign>left</halign>
+          <label>low convection</label>
+        </text>
+
+        <text>
+          <row>3</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Ground Haze:</label>
+        </text>
+
+        <text>
+          <row>3</row>
+          <col>1</col>
+          <halign>right</halign>
+          <label>thick</label>
+        </text>
+
+        <slider>
+          <row>3</row>
+          <col>2</col>
+          <min>0.1</min>
+          <max>1.0</max>
+          <property>/local-weather/config/ground-haze-factor</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>3</row>
+          <col>3</col>
+          <halign>left</halign>
+          <label>thin</label>
+        </text>
+
+        <text>
+          <row>4</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Air Pollution:</label>
+        </text>
+
+        <text>
+          <row>4</row>
+          <col>1</col>
+          <halign>right</halign>
+          <label>clean</label>
+        </text>
+
+        <slider>
+          <row>4</row>
+          <col>2</col>
+          <min>0.0</min>
+          <max>1.0</max>
+          <property>/environment/air-pollution-norm</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>4</row>
+          <col>3</col>
+          <halign>left</halign>
+          <label>smog</label>
+        </text>
+
+        <text>
+          <row>5</row>
+          <col>0</col>
+          <halign>right</halign>
+          <label>Fog Properties:</label>
+        </text>
+
+        <text>
+          <row>5</row>
+          <col>1</col>
+          <halign>right</halign>
+          <label>smooth</label>
+        </text>
+
+        <slider>
+          <row>5</row>
+          <col>2</col>
+          <min>0.0</min>
+          <max>12.0</max>
+          <property>/environment/fog-structure</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>5</row>
+          <col>3</col>
+          <halign>left</halign>
+          <label>structured</label>
+        </text>
+
+        <text>
+          <row>6</row>
+          <col>0</col>
+          <halign>right</halign>
+          <!--<enable>
+            <equals>
+              <property>/local-weather/config/realistic-visibility-flag</property>
+              <value>0</value>
+            </equals>
+          </enable>-->
+          <label>Max. Visibility:</label>
+        </text>
+
+        <text>
+          <row>6</row>
+          <col>1</col>
+          <halign>right</halign>
+          <label>20 km</label>
+        </text>
+
+        <slider>
+          <row>6</row>
+          <col>2</col>
+          <!--<enable>
+            <equals>
+            <property>/local-weather/config/realistic-visibility-flag</property>
+            <value>0</value>
+            </equals>
+          </enable>-->
+          <min>9.90348</min>
+          <max>12.429216196</max>
+          <property>/local-weather/config/aux-max-vis-range-m</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </slider>
+
+        <text>
+          <row>6</row>
+          <col>3</col>
+          <halign>left</halign>
+          <!--<enable>
+            <equals>
+              <property>/local-weather/config/realistic-visibility-flag</property>
+              <value>0</value>
+            </equals>
+          </enable>-->
+          <label>12345678</label>
+          <format>250 km    %.fm</format>
+          <live>true</live>
+          <property>/local-weather/config/max-vis-range-m</property>
+        </text>
+      </group>
+
+    </group>
+
+    <!-- gap -->
+    <text>
+      <label>    </label>
+    </text>
+
+  </group>
+
+  <hrule/>
+    
+  <group>
+    <layout>hbox</layout>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
     <group>
       <layout>vbox</layout>
 
@@ -563,35 +617,41 @@
         <halign>left</halign>
         <label>Weather Pattern Scales</label>
       </text>
-      
+
       <group>
         <layout>table</layout>
         <halign>center</halign>
 
         <text>
           <row>0</row>
-          <col>1</col>
+          <col>0</col>
+          <label>             </label>
+        </text>
+
+        <text>
+          <row>0</row>
+          <col>2</col>
           <halign>left</halign>
           <label>small</label>
         </text>
 
         <text>
           <row>0</row>
-          <col>2</col>
+          <col>3</col>
           <halign>right</halign>
           <label>large</label>
         </text>
 
         <text>
           <row>1</row>
-          <col>0</col>
+          <col>1</col>
           <halign>right</halign>
           <label>Airmass</label>
         </text>
 
         <slider>
           <row>1</row>
-          <col>1</col>
+          <col>2</col>
           <colspan>2</colspan>
           <halign>fill</halign>
           <min>0.5</min>
@@ -604,14 +664,14 @@
 
         <text>
           <row>2</row>
-          <col>0</col>
+          <col>1</col>
           <halign>right</halign>
-          <label>Cloud patterns</label>
+          <label>     Cloud Patterns</label>
         </text>
 
         <slider>
           <row>2</row>
-          <col>1</col>
+          <col>2</col>
           <colspan>2</colspan>
           <halign>fill</halign>
           <min>0.0</min>
@@ -623,8 +683,13 @@
         </slider>
       </group>
     </group>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
   </group>
-  
+
   <hrule/>
 
   <group>  
@@ -635,7 +700,7 @@
     </empty>
     
     <button>
-      <legend>OK</legend>
+      <legend>  OK  </legend>
       <binding>
         <command>dialog-apply</command>
       </binding>
@@ -654,7 +719,7 @@
     </button>
 
     <button>
-      <legend>Wind Configuration...</legend>
+      <legend>Wind Configuration ...</legend>
       <binding>
         <command>dialog-show</command>
         <dialog-name>local_weather_winds</dialog-name>
diff --git a/gui/dialogs/local_weather_winds.xml b/gui/dialogs/local_weather_winds.xml
index 93df60cd2..84a8ccbad 100644
--- a/gui/dialogs/local_weather_winds.xml
+++ b/gui/dialogs/local_weather_winds.xml
@@ -2,353 +2,354 @@
 
 <PropertyList>
 
- <!-- Weather tiles -->
+  <!-- Weather tiles -->
+  <name>local_weather_winds</name>
+  <modal>false</modal>
+  <resizable>false</resizable>
+  <layout>vbox</layout>
+  <default-padding>3</default-padding>
 
- <name>local_weather_winds</name>
- <width>500</width>
- <height>200</height>
- <modal>false</modal>
+  <!-- Title bar with close button -->
+  <group>
+    <layout>hbox</layout>
+    <default-padding>3</default-padding>
+    <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Wind Configuration</label>
+    </text>
+
+    <empty><stretch>1</stretch></empty>
+
+    <button>
+      <pref-width>16</pref-width>
+      <pref-height>16</pref-height>
+      <legend></legend>
+      <keynum>27</keynum>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+  </group>
+
+  <hrule/>
+
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
+    <text>
+      <label>Specify Aloft Wind Layers:</label>
+    </text>
+
+    <text>
+      <label>          Lat:</label>
+    </text>
+
+    <input>
+       <width>80</width>
+       <property>/local-weather/tmp/ipoint-latitude-deg</property>
+    </input>
 
 
-<text>
-  <x>10</x>
-  <y>170</y>
-  <label>Specify aloft wind layers</label>
-</text>
+    <text>
+     <label>           Lon:</label>
+    </text>
 
-<text>
- <x>220</x>
- <y>170</y>
- <label>lat:</label>
-</text>
+    <input>
+       <width>80</width>
+       <property>/local-weather/tmp/ipoint-longitude-deg</property>
+    </input>
 
-<input>
-   <x>250</x>
-   <y>170</y>
-   <width>80</width>
-   <height>25</height>
-   <property>/local-weather/tmp/ipoint-latitude-deg</property>
-</input>
+  </group>
 
+  <group>
+    <layout>table</layout>
+    <halign>center</halign>
 
-<text>
- <x>340</x>
- <y>170</y>
- <label>lon:</label>
-</text>
+    <text>
+      <row>0</row>
+      <col>0</col>
+      <pref-width>50</pref-width>
+      <label>    </label>
+    </text>
 
-<input>
-   <x>370</x>
-   <y>170</y>
-   <width>80</width>
-   <height>25</height>
-   <property>/local-weather/tmp/ipoint-longitude-deg</property>
-</input>
+    <text>
+      <row>0</row>
+      <col>1</col>
+      <pref-width>50</pref-width>
+      <label>   0 </label>
+    </text>
 
-<group>
-  <x>0</x>
-  <y>140</y>
+    <text>
+      <row>0</row>
+      <col>2</col>
+      <halign>center</halign>
+      <pref-width>50</pref-width>
+      <label>FL50</label>
+    </text>
 
- <text>
-   <x>80</x>
-   <y>0</y>
-   <label>0</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>3</col>
+      <pref-width>50</pref-width>
+      <label>FL100</label>
+    </text>
 
-<text>
-   <x>110</x>
-   <y>0</y>
-   <label>FL50</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>4</col>
+      <pref-width>50</pref-width>
+      <label>FL180</label>
+    </text>
 
-<text>
-   <x>155</x>
-   <y>0</y>
-   <label>FL100</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>5</col>
+      <pref-width>50</pref-width>
+      <label>FL240</label>
+    </text>
 
-<text>
-   <x>200</x>
-   <y>0</y>
-   <label>FL180</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>6</col>
+      <pref-width>50</pref-width>
+      <label>FL300</label>
+    </text>
 
-<text>
-   <x>245</x>
-   <y>0</y>
-   <label>FL240</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>7</col>
+      <pref-width>50</pref-width>
+      <label>FL340</label>
+    </text>
 
-<text>
-   <x>290</x>
-   <y>0</y>
-   <label>FL300</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>8</col>
+      <pref-width>50</pref-width>
+      <label>FL390</label>
+    </text>
 
-<text>
-   <x>335</x>
-   <y>0</y>
-   <label>FL340</label>
-  </text>
+    <text>
+      <row>0</row>
+      <col>9</col>
+      <pref-width>50</pref-width>
+      <label>FL450</label>
+    </text>
 
-<text>
-   <x>380</x>
-   <y>0</y>
-   <label>FL390</label>
-  </text>
+    <text>
+      <row>1</row>
+      <col>0</col>
+      <label>Direction</label>
+    </text>
 
-<text>
-   <x>425</x>
-   <y>0</y>
-   <label>FL450</label>
-  </text>
+    <input>
+      <row>1</row>
+      <col>1</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL0-wind-from-heading-deg</property>
+    </input>
 
-</group>
+    <input>
+      <row>1</row>
+      <col>2</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL50-wind-from-heading-deg</property>
+    </input>
 
-<group>
-  <x>0</x>
-  <y>100</y>
+    <input>
+      <row>1</row>
+      <col>3</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL100-wind-from-heading-deg</property>
+    </input>
 
-<text>
-   <x>5</x>
-   <y>0</y>
-   <label>direction</label>
-  </text>
+    <input>
+      <row>1</row>
+      <col>4</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL180-wind-from-heading-deg</property>
+    </input>
 
-<input>
-   <x>70</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL0-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>1</row>
+      <col>5</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL240-wind-from-heading-deg</property>
+    </input>
 
-<input>
-   <x>115</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL50-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>1</row>
+      <col>6</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL300-wind-from-heading-deg</property>
+    </input>
 
-<input>
-   <x>160</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL100-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>1</row>
+      <col>7</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL340-wind-from-heading-deg</property>
+    </input>
 
-<input>
-   <x>205</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL180-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>1</row>
+      <col>8</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL390-wind-from-heading-deg</property>
+    </input>
 
-<input>
-   <x>250</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL240-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>1</row>
+      <col>9</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL450-wind-from-heading-deg</property>
+    </input>
 
+    <text>
+      <row>2</row>
+      <col>0</col>
+      <label>Speed (kt)</label>
+    </text>
 
-<input>
-   <x>295</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL300-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>2</row>
+      <col>1</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL0-windspeed-kt</property>
+    </input>
 
-<input>
-   <x>340</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL340-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>2</row>
+      <col>2</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL50-windspeed-kt</property>
+    </input>
 
-<input>
-   <x>385</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL390-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>2</row>
+      <col>3</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL100-windspeed-kt</property>
+    </input>
 
-<input>
-   <x>430</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL450-wind-from-heading-deg</property>
-  </input>
+    <input>
+      <row>2</row>
+      <col>4</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL180-windspeed-kt</property>
+    </input>
 
-</group>
+    <input>
+      <row>2</row>
+      <col>5</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL240-windspeed-kt</property>
+    </input>
 
+    <input>
+      <row>2</row>
+      <col>6</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL300-windspeed-kt</property>
+    </input>
 
-<group>
-  <x>0</x>
-  <y>60</y>
+    <input>
+      <row>2</row>
+      <col>7</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL340-windspeed-kt</property>
+    </input>
 
-<text>
-   <x>5</x>
-   <y>0</y>
-   <label>speed (kt)</label>
-  </text>
+    <input>
+      <row>2</row>
+      <col>8</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL390-windspeed-kt</property>
+    </input>
 
-<input>
-   <x>70</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL0-windspeed-kt</property>
-  </input>
+    <input>
+      <row>2</row>
+      <col>9</col>
+      <pref-width>50</pref-width>
+      <property>/local-weather/tmp/FL450-windspeed-kt</property>
+    </input>
 
-<input>
-   <x>115</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL50-windspeed-kt</property>
-  </input>
+  </group>
 
-<input>
-   <x>160</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL100-windspeed-kt</property>
-  </input>
+  <hrule/>
 
-<input>
-   <x>205</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL180-windspeed-kt</property>
-  </input>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
 
-<input>
-   <x>250</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL240-windspeed-kt</property>
-  </input>
+    <empty>
+      <stretch>true</stretch>
+    </empty>
 
-<input>
-   <x>295</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL300-windspeed-kt</property>
-  </input>
+    <button>
+      <legend>  OK  </legend>
+      <!--<default>true</default>-->
+      <equal>true</equal>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
 
-<input>
-   <x>340</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL340-windspeed-kt</property>
-  </input>
+    <button>
+      <legend>Set Waypoint</legend>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+      <binding>
+        <command>nasal</command>
+        <script>
+          if (local_weather.wind_model_flag == 5)
+          {local_weather.set_aloft_wrapper();}
+        </script>
+      </binding>
+    </button>
 
-<input>
-   <x>385</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL390-windspeed-kt</property>
-  </input>
+    <button>
+      <legend>Clear Waypoints</legend>
+      <binding>
+        <command>nasal</command>
+        <script>
+          props.globals.getNode("local-weather/interpolation", 1).removeChildren("wind");
+          setprop("/local-weather/interpolation/ipoint-number",0);
+        </script>
+      </binding>
+    </button>
 
-<input>
-   <x>430</x>
-   <y>0</y>
-   <width>40</width>
-   <height>25</height>
-   <property>/local-weather/tmp/FL450-windspeed-kt</property>
-  </input>
+    <button>
+      <legend>Cancel</legend>
+      <default>true</default>
+      <equal>true</equal>
+      <key>Esc</key>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
 
+    <text>
+      <label>  Waypoints:</label>
+    </text>
 
-</group>
+    <text>
+      <label>MMMM</label>
+      <live>true</live>
+      <property>/local-weather/interpolation/ipoint-number</property>
+    </text>
 
-<group>
-  <x>10</x>
-  <y>10</y>
-
- <button>
-   <x>0</x>
-   <y>0</y>
-   <legend>OK</legend>
-   <!--<default>true</default>-->
-   <equal>true</equal>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
-
- <button>
-   <x>45</x>
-   <y>0</y>
-   <legend>Set waypoint</legend>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-   <binding>
-     <command>nasal</command>
-     <script>
-	if (local_weather.wind_model_flag == 5)	
-	{local_weather.set_aloft_wrapper();}
-	</script>
-   </binding>
- </button>
-
-
-<button>
-   <x>150</x>
-   <y>0</y>
-   <legend>Clear Waypoints</legend>
-   <binding>
-     <command>nasal</command>
-     <script>
-	props.globals.getNode("local-weather/interpolation", 1).removeChildren("wind");
-	setprop("/local-weather/interpolation/ipoint-number",0);
-     </script>
-   </binding>
- </button>
-
-  <button>
-   <x>265</x>
-   <y>0</y>
-   <legend>Cancel</legend>
-   <equal>true</equal>
-   <key>Esc</key>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
-
-<text>
-   <x>360</x>
-   <y>0</y>
-   <label>waypoints:</label>
- </text>
-
-<text>
-   <x>430</x>
-   <y>0</y>
-   <label>0</label>
-   <live>true</live>
-  <property>/local-weather/interpolation/ipoint-number</property>
- </text>
-
-</group>
+  </group>
 
 </PropertyList>
diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index e8329d41e..487369cc7 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -108,7 +108,7 @@
     <text>
       <row>0</row><col>3</col>
       <halign>right</halign>
-      <label>Runway:</label>
+      <label>  Runway:</label>
     </text>
     <input>
       <row>0</row><col>4</col>
@@ -147,7 +147,7 @@
     <text>
       <row>1</row><col>3</col>
       <halign>right</halign>
-      <label>Latitude:</label>
+      <label>  Latitude:</label>
     </text>
     <input>
       <row>1</row><col>4</col>
@@ -248,72 +248,86 @@
   </text>
 
   <group>
-    <layout>table</layout>
-    <text>
-      <row>0</row><col>0</col>
-      <halign>right</halign>
-      <label>Distance (nm):</label>
-      <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
-    </text>
-    <input>
-      <row>0</row><col>1</col>
-      <property>/sim/presets/offset-distance-nm</property>
-      <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
-    </input>
+    <layout>hbox</layout>
 
-    <text>
-      <row>0</row><col>2</col>
-      <halign>right</halign>
-      <label>Azimuth (deg):</label>
-      <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
-    </text>
-    <input>
-      <row>0</row><col>3</col>
-      <property>/sim/presets/offset-azimuth-deg</property>
-      <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
-    </input>
+    <group>
+      <layout>table</layout>
+      <text>
+        <row>0</row><col>0</col>
+        <halign>right</halign>
+        <label>  Distance (nm):</label>
+        <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
+      </text>
+      <input>
+        <row>0</row><col>1</col>
+        <property>/sim/presets/offset-distance-nm</property>
+        <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
+      </input>
 
-    <text>
-      <row>1</row><col>0</col>
-      <halign>right</halign>
-      <label>Altitude (ft):</label>
-    </text>
-    <input>
-      <row>1</row><col>1</col>
-      <property>/sim/presets/altitude-ft</property>
-    </input>
+      <text>
+        <row>0</row><col>2</col>
+        <halign>right</halign>
+        <label>Azimuth (deg):</label>
+        <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
+      </text>
+      <input>
+        <row>0</row><col>3</col>
+        <property>/sim/presets/offset-azimuth-deg</property>
+        <enable><not><property>/sim/gui/dialogs/location-in-air/lonlat</property></not></enable>
+      </input>
 
-    <text>
-      <row>1</row><col>2</col>
-      <halign>right</halign>
-      <label>Glidepath (deg):</label>
-    </text>
-    <input>
-      <row>1</row><col>3</col>
-      <property>/sim/presets/glideslope-deg</property>
-    </input>
+      <text>
+        <row>1</row><col>0</col>
+        <halign>right</halign>
+        <label>Altitude (ft):</label>
+      </text>
+      <input>
+        <row>1</row><col>1</col>
+        <property>/sim/presets/altitude-ft</property>
+      </input>
 
-    <text>
-      <row>2</row><col>0</col>
-      <halign>right</halign>
-      <label>Airspeed (kt):</label>
-    </text>
-    <input>
-      <row>2</row><col>1</col>
-      <property>/sim/presets/airspeed-kt</property>
-    </input>
+      <text>
+        <row>1</row><col>2</col>
+        <halign>right</halign>
+        <label>  Glidepath (deg):</label>
+      </text>
+      <input>
+        <row>1</row><col>3</col>
+        <property>/sim/presets/glideslope-deg</property>
+      </input>
+
+      <text>
+        <row>2</row><col>0</col>
+        <halign>right</halign>
+        <label>Airspeed (kt):</label>
+      </text>
+      <input>
+        <row>2</row><col>1</col>
+        <property>/sim/presets/airspeed-kt</property>
+      </input>
+
+      <text>
+        <row>2</row><col>2</col>
+        <halign>right</halign>
+        <label>Heading (deg):</label>
+        <enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
+      </text>
+      <input>
+        <row>2</row><col>3</col>
+        <enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
+        <property>/sim/presets/heading-deg</property>
+      </input>
+    </group>
+
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
 
-    <text>
-      <row>2</row><col>2</col>
-      <halign>right</halign>
-      <label>Heading (deg):</label>
-      <enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
-    </text>
-    <input>
-      <row>2</row><col>3</col>
-      <enable><not><property>/sim/gui/dialogs/location-in-air/airport</property></not></enable>
-      <property>/sim/presets/heading-deg</property>
-    </input>
   </group>
 
   <hrule/>
diff --git a/gui/dialogs/location-of-tower.xml b/gui/dialogs/location-of-tower.xml
index badabbc96..c8706561c 100644
--- a/gui/dialogs/location-of-tower.xml
+++ b/gui/dialogs/location-of-tower.xml
@@ -6,13 +6,13 @@
 
   <group>
     <layout>hbox</layout>
-	  <empty><stretch>1</stretch></empty>
+      <empty><stretch>1</stretch></empty>
 
     <text>
       <label>Tower Position</label>
     </text>
 
-	  <empty><stretch>1</stretch></empty>
+      <empty><stretch>1</stretch></empty>
 
     <button>
       <pref-width>16</pref-width>
@@ -29,7 +29,7 @@
   <hrule/>
 
   <text>
-    <label>Select position of tower for the Tower Views</label>
+    <label>  Select Position of Tower for the Tower Views  </label>
   </text>
 
   <group>
@@ -50,22 +50,25 @@
     </checkbox>
 
     <text>
-      <row>1</row><col>0</col>
+      <row>1</row>
+      <col>0</col>
       <halign>right</halign>
       <label>Airport ID:</label>
     </text>
     <input>
       <name>airport-id</name>
-      <row>1</row><col>1</col>
+      <row>1</row>
+      <col>1</col>
       <property>/sim/tower/airport-id</property>
-	  <enable>
+      <enable>
         <not>
           <property>/sim/tower/auto-position</property>
         </not>
       </enable>
     </input>
     <empty>
-      <row>0</row><col>3</col>
+      <row>0</row>
+      <col>3</col>
       <stretch>true</stretch>
     </empty>
 
@@ -131,11 +134,12 @@
 
     <button>
       <legend>Preset</legend>
-      <row>4</row><col>0</col>
+      <row>4</row>
+      <col>0</col>
       <!--
         Is there a way in the GUI (other than via a dynamic
-	NASAL dialog) to assign text to the widget rather
-	than to the underlying property and doing an update?
+        NASAL dialog) to assign text to the widget rather
+        than to the underlying property and doing an update?
 
         The way it is now CANCEL doesn't undo PRESET  :-(
       -->
@@ -153,11 +157,13 @@
       </binding>
     </button>
     <text>
-      <row>4</row><col>1</col>
+      <row>4</row>
+      <col>1</col>
       <property>/sim/presets/airport-id</property>
     </text>
     <empty>
-      <row>4</row><col>3</col>
+      <row>4</row>
+      <col>3</col>
       <stretch>true</stretch>
     </empty>
   </group>
diff --git a/gui/dialogs/map-canvas.xml b/gui/dialogs/map-canvas.xml
index 64753256f..0d3bf8f45 100644
--- a/gui/dialogs/map-canvas.xml
+++ b/gui/dialogs/map-canvas.xml
@@ -4,11 +4,10 @@
     <name>map-canvas</name>
     <layout>vbox</layout>
     <resizable>true</resizable>
+    <!-- mhab -->
+    <default-padding>3</default-padding>
 
     <color>
-        <red type="float">0.41</red>
-        <green type="float">0.4</green>
-        <blue type="float">0.42</blue>
         <alpha type="float">1.0</alpha>
     </color>
 
@@ -19,9 +18,6 @@
             var setTransparency = func(updateDialog){
                 var alpha = (getprop("/sim/gui/dialogs/map-canvas/transparent") or 0);
                 self.getNode("color/alpha").setValue(1-alpha*0.3);
-                self.getNode("color/red").setValue(0.41-alpha*0.2);
-                self.getNode("color/green").setValue(0.4-alpha*0.2);
-                self.getNode("color/blue").setValue(0.42-alpha*0.2);
                 var n = props.Node.new({ "dialog-name": "map-canvas" });
                 if (updateDialog)
                 {
@@ -42,6 +38,7 @@
 
     <group>
         <layout>hbox</layout>
+        <default-padding>1</default-padding>
         <empty><stretch>1</stretch></empty>
 
         <text>
@@ -62,22 +59,27 @@
             </binding>
         </button>
     </group>
+
     <hrule/>
 
     <group>
         <layout>hbox</layout>
         <stretch>true</stretch>
+        <halign>left</halign>
 
         <!-- sidebar -->
         <group>
             <layout>vbox</layout>
+            <stretch>true</stretch>
+            <halign>left</halign>
+
             <text>
                 <label>Display:</label>
             </text>
 
             <checkbox>
                 <label>Airports</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-APT</property>
                 <live>true</live>
                 <binding>
@@ -90,7 +92,7 @@
 
             <checkbox>
                 <label>Fixes</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-FIX</property>
                 <live>true</live>
                 <binding>
@@ -103,7 +105,7 @@
 
             <checkbox>
                 <label>VORs</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-VOR</property>
                 <live>true</live>
                 <binding>
@@ -116,7 +118,7 @@
 
             <checkbox>
                 <label>DMEs</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-DME</property>
                 <live>true</live>
                 <binding>
@@ -129,7 +131,7 @@
 
             <checkbox>
                 <label>NDBs</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-NDB</property>
                 <live>true</live>
                 <binding>
@@ -149,7 +151,7 @@
 
             <checkbox>
                 <label>Traffic</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-TFC</property>
                 <live>true</live>
                 <binding>
@@ -169,7 +171,7 @@
 
             <checkbox>
                 <label>Data</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-data</property>
                 <live>true</live>
                 <binding>
@@ -182,7 +184,7 @@
             
             <checkbox>
                 <label>Flight History</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/draw-FLT</property>
                 <live>true</live>
                 <binding>
@@ -194,14 +196,15 @@
             </checkbox>
  
             <checkbox>
-		<!-- layer only supported if LW/AW is active -->
-		<enable>
-                    <property>/sim/gui/dialogs/metar/mode/local-weather</property>
-                    <value>1</value>
-                 </enable>
-
                 <label>Weather</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
+
+                <!-- layer only supported if LW/AW is active -->
+		            <enable>
+                   <property>/sim/gui/dialogs/metar/mode/local-weather</property>
+                   <value>1</value>
+                </enable>
+
                 <property>/sim/gui/dialogs/map-canvas/draw-WXR</property>
                 <live>true</live>
                 <binding>
@@ -212,14 +215,16 @@
                 </binding>
             </checkbox>
  
-		<!-- layer only supported if tutorial system is active and targets specified-->
-		<!--
+            <!-- layer only supported if tutorial system is active and targets specified-->
+	 <!--
             <checkbox>
-		<enable>
-                    <property>/sim/gui/dialogs/metar/mode/local-weather</property>
-                    <value>1</value>
-                 </enable>
+	              <enable>
+                   <property>/sim/gui/dialogs/metar/mode/local-weather</property>
+                   <value>1</value>
+                </enable>
                 <label>Tutorial Goals</label>
+                <label>Weather</label>
+                <halign>left</halign>
                 <pref-width>100</pref-width>
                 <property>/sim/gui/dialogs/map-canvas/draw-TUT</property>
                 <live>true</live>
@@ -236,7 +241,7 @@
 
             <checkbox>
                 <label>Magnetic Hdgs</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/magnetic-headings</property>
                 <live>true</live>
                 <binding>
@@ -249,7 +254,7 @@
 
             <checkbox>
                 <label>Center on Acft</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/centre-on-aircraft</property>
                 <live>true</live>
                 <binding>
@@ -262,7 +267,7 @@
 
             <checkbox>
                 <label>Aircraft Hdg Up</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/aircraft-heading-up</property>
                 <live>true</live>
                 <binding>
@@ -275,7 +280,7 @@
 
             <checkbox>
                 <label>Transparent</label>
-                <pref-width>100</pref-width>
+                <halign>left</halign>
                 <property>/sim/gui/dialogs/map-canvas/transparent</property>
                 <live>true</live>
                 <binding>
@@ -295,7 +300,6 @@
             <button>
                 <name>close</name>
                 <legend>Close</legend>
-                <pref-width>100</pref-width>
                 <default>true</default>
                 <binding>
                   <command>dialog-close</command>
diff --git a/gui/dialogs/map.xml b/gui/dialogs/map.xml
index 64ababf32..f71c7d378 100644
--- a/gui/dialogs/map.xml
+++ b/gui/dialogs/map.xml
@@ -15,12 +15,15 @@ command interface /autopilot/route-manager/input:
     <name>map</name>
     <layout>vbox</layout>
     <resizable>true</resizable>
+    <!-- mhab -->
+    <default-padding>3</default-padding>
 
     <color>
+<!-- mhab commented out
         <red type="float">0.41</red>
         <green type="float">0.4</green>
         <blue type="float">0.42</blue>
-        <alpha type="float">1.0</alpha>
+-->
         <alpha type="float">1.0</alpha>
     </color>
 
@@ -30,9 +33,10 @@ command interface /autopilot/route-manager/input:
             var setTransparency = func(updateDialog){
                 var alpha = (getprop("/gui/map/transparent") or 0);
                 mapDialog.getNode("color/alpha").setValue(1-alpha*0.3);
-                mapDialog.getNode("color/red").setValue(0.41-alpha*0.2);
-                mapDialog.getNode("color/green").setValue(0.4-alpha*0.2);
-                mapDialog.getNode("color/blue").setValue(0.42-alpha*0.2);
+                # mhab commented out
+                #mapDialog.getNode("color/red").setValue(0.41-alpha*0.2);
+                #mapDialog.getNode("color/green").setValue(0.4-alpha*0.2);
+                #mapDialog.getNode("color/blue").setValue(0.42-alpha*0.2);
                 var n = props.Node.new({ "dialog-name": "map" });
                 if (updateDialog)
                 {
@@ -48,249 +52,279 @@ command interface /autopilot/route-manager/input:
         </close>
     </nasal>
 
-        <group>
-            <layout>hbox</layout>
-            <empty><stretch>1</stretch></empty>
+    <group>
+        <layout>hbox</layout>
+        <default-padding>1</default-padding>
+        <empty><stretch>1</stretch></empty>
 
+        <text>
+            <label>Map</label>
+        </text>
+
+        <empty><stretch>1</stretch></empty>
+
+        <button>
+            <pref-width>16</pref-width>
+            <pref-height>16</pref-height>
+            <legend></legend>
+            <keynum>27</keynum>
+            <border>2</border>
+
+            <binding>
+                <command>dialog-close</command>
+            </binding>
+        </button>
+    </group>
+
+    <hrule/>
+
+    <group>
+        <layout>hbox</layout>
+        <stretch>true</stretch>
+        <halign>left</halign>
+
+        <!-- sidebar -->
+        <group>
+            <layout>vbox</layout>
             <text>
-                <label>Map</label>
+                <label>Display:</label>
             </text>
 
-            <empty><stretch>1</stretch></empty>
+            <checkbox>
+                <label>Fixes</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/draw-fixes</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>Navaids</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/draw-navaids</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+<!--
+            <button>
+                <legend>Airways</legend>
+                <pref-width>100</pref-width>
+            </button>
+-->
+
+            <checkbox>
+                <label>Traffic</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/draw-traffic</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+<!--
+            <button>
+                <legend>Obstacles</legend>
+                <pref-width>100</pref-width>
+            </button>
+-->
+
+            <checkbox>
+                <label>Data</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/draw-data</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>Flight History</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/draw-flight-history</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <empty><stretch>true</stretch></empty>
+
+            <checkbox>
+                <label>Magnetic Hdgs</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/magnetic-headings</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>Center on Acft</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/centre-on-aircraft</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>Aircraft Hdg Up</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/aircraft-heading-up</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <label>Transparent</label>
+                <halign>left</halign>
+<!--
+                <pref-width>100</pref-width>
+-->
+                <property>/gui/map/transparent</property>
+                <live>true</live>
+                <binding>
+                  <command>dialog-apply</command>
+                </binding>
+                <binding>
+                  <command>property-toggle</command>
+                </binding>
+                <binding>
+                    <command>nasal</command>
+                    <script>setTransparency(1);</script>
+                </binding>
+            </checkbox>
+
+            <empty><stretch>true</stretch></empty>
 
             <button>
-                <pref-width>16</pref-width>
-                <pref-height>16</pref-height>
-                <legend></legend>
-                <keynum>27</keynum>
-                <border>2</border>
-
+                <name>close</name>
+                <legend>Close</legend>
+                <pref-width>100</pref-width>
+                <default>true</default>
                 <binding>
-                    <command>dialog-close</command>
+                  <command>dialog-close</command>
                 </binding>
             </button>
+
         </group>
-        <hrule/>
+
+        <vrule/>
 
         <group>
-            <layout>hbox</layout>
+            <layout>vbox</layout>
             <stretch>true</stretch>
 
-            <!-- sidebar -->
+            <map>
+                <!-- <halign>fill</halign> -->
+                <valign>fill</valign>
+                <halign>fill</halign>
+                <stretch>true</stretch>
+                <pref-height>400</pref-height>
+                <pref-width>600</pref-width>
+                <property>/gui/map</property>
+            </map>
+
+            <hrule/>
+
             <group>
-                <layout>vbox</layout>
+                <layout>hbox</layout>
+
+                <button>
+                    <name>zoomout</name>
+                    <legend>-</legend>
+                    <pref-width>22</pref-width>
+                    <pref-height>22</pref-height>
+
+                    <binding>
+                        <command>property-adjust</command>
+                        <property>/gui/map/zoom</property>
+                        <min>0</min>
+                        <step>-1</step>
+                    </binding>
+                </button>
+
                 <text>
-                    <label>Display:</label>
+                    <label>MMM</label>
+                    <format>Zoom %d</format>
+                    <property>/gui/map/zoom</property>
+                    <live>true</live>
                 </text>
 
-                <checkbox>
-                    <label>Fixes</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/draw-fixes</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-
-                <checkbox>
-                    <label>Navaids</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/draw-navaids</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-<!--
                 <button>
-                    <legend>Airways</legend>
-                    <pref-width>100</pref-width>
-                </button>
--->
+                    <name>zoomin</name>
+                    <legend>+</legend>
+                    <pref-width>22</pref-width>
+                    <pref-height>22</pref-height>
 
-                <checkbox>
-                    <label>Traffic</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/draw-traffic</property>
-                    <live>true</live>
                     <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-
-<!--
-                <button>
-                    <legend>Obstacles</legend>
-                    <pref-width>100</pref-width>
-                </button>
--->
-
-                <checkbox>
-                    <label>Data</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/draw-data</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-                
-                <checkbox>
-                    <label>Flight History</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/draw-flight-history</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-                
-                <empty><stretch>true</stretch></empty>
-
-                <checkbox>
-                    <label>Magnetic Hdgs</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/magnetic-headings</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-
-                <checkbox>
-                    <label>Center on Acft</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/centre-on-aircraft</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-
-                <checkbox>
-                    <label>Aircraft Hdg Up</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/aircraft-heading-up</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                </checkbox>
-
-                <checkbox>
-                    <label>Transparent</label>
-                    <pref-width>100</pref-width>
-                    <property>/gui/map/transparent</property>
-                    <live>true</live>
-                    <binding>
-                      <command>dialog-apply</command>
-                    </binding>
-                    <binding>
-                      <command>property-toggle</command>
-                    </binding>
-                    <binding>
-                        <command>nasal</command>
-                        <script>setTransparency(1);</script>
-                    </binding>
-                </checkbox>
-
-                <empty><stretch>true</stretch></empty>
-
-                <button>
-                    <name>close</name>
-                    <legend>Close</legend>
-                    <pref-width>100</pref-width>
-                    <default>true</default>
-                    <binding>
-                      <command>dialog-close</command>
-                    </binding>
-                </button>
-
-            </group>
-
-            <vrule/>
-
-            <group>
-                <layout>vbox</layout>
-                <stretch>true</stretch>
-                
-                <map>
-                    <!-- <halign>fill</halign> -->
-                    <valign>fill</valign>
-                    <halign>fill</halign>
-                    <stretch>true</stretch>
-                    <pref-height>400</pref-height>
-                    <pref-width>600</pref-width>
-                    <property>/gui/map</property>
-                </map>
-            
-                <hrule/>
-                
-                <group>
-                    <layout>hbox</layout>
-                    
-                    <button>
-                        <name>zoomout</name>
-                        <legend>-</legend>
-                        <pref-width>22</pref-width>
-                        <pref-height>22</pref-height>
-
-                        <binding>
-                            <command>property-adjust</command>
-                            <property>/gui/map/zoom</property>
-                            <min>0</min>
-                            <step>-1</step>
-                        </binding>
-                    </button>
-                    
-                    <text>
-                        <label>MMM</label>
-                        <format>Zoom %d</format>
+                        <command>property-adjust</command>
                         <property>/gui/map/zoom</property>
-                        <live>true</live>
-                    </text>
-                    
-                    <button>
-                        <name>zoomin</name>
-                        <legend>+</legend>
-                        <pref-width>22</pref-width>
-                        <pref-height>22</pref-height>
-
-                        <binding>
-                            <command>property-adjust</command>
-                            <property>/gui/map/zoom</property>
-                            <step>1</step>
-                            <max>12</max>
-                        </binding>
-                    </button>
-                </group>
+                        <step>1</step>
+                        <max>12</max>
+                    </binding>
+                </button>
             </group>
-            
         </group>
+
+    </group>
 </PropertyList>
 
diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml
index 96deca33c..e60836ec1 100644
--- a/gui/dialogs/multiplayer.xml
+++ b/gui/dialogs/multiplayer.xml
@@ -121,7 +121,7 @@
         <text>
             <row>0</row>
             <col>0</col>
-            <label>Options:</label>
+            <label>   Options:</label>
             <halign>right</halign>
         </text>
         <checkbox>
@@ -155,7 +155,7 @@
         <text>
           <row>2</row><col>0</col>
           <halign>right</halign>
-          <label>Callsign:</label>
+          <label>   Callsign:</label>
         </text>
         <input>
           <row>2</row><col>1</col>
diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index 3bae7122a..3b3a0b4f2 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -3,7 +3,9 @@
 <PropertyList>
 
   <name>radios</name>
+<!--
   <width>550</width>
+-->
   <modal>false</modal>
 
   <nasal>
@@ -496,17 +498,16 @@
 
   <hrule/>
   <group>
-
     <layout>hbox</layout>
 
     <text>
-      <label>TACAN</label>
+      <label>  TACAN       </label>
     </text>
 
 
     <combo>
       <name>tacan-1</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/tacan/frequencies/selected-channel[1]</property>
@@ -528,7 +529,7 @@
     <!---->
     <combo>
       <name>tacan-2</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/tacan/frequencies/selected-channel[2]</property>
@@ -550,7 +551,7 @@
 
     <combo>
       <name>tacan-3</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/tacan/frequencies/selected-channel[3]</property>
@@ -572,7 +573,7 @@
 
     <combo>
       <name>tacan-4</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/tacan/frequencies/selected-channel[4]</property>
@@ -595,21 +596,25 @@
       </binding>
     </button>
 
+    <text>
+      <label>  </label>
+    </text>
   </group>
   <!-- of TACAN group -->
 
   <!-- transponder controls -->
 
   <hrule/>
+
   <group>
     <layout>hbox</layout>
     <text>
-      <label>Transponder</label>
+      <label>  Transponder</label>
     </text>
 
     <combo>
       <name>Tponder-1</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/transponder/inputs/digit[3]</property>
@@ -629,7 +634,7 @@
     <!-- -->
     <combo>
       <name>Tponder-2</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/transponder/inputs/digit[2]</property>
@@ -648,7 +653,7 @@
     </combo>
     <combo>
       <name>Tponder-3</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/transponder/inputs/digit[1]</property>
@@ -667,7 +672,7 @@
     </combo>
     <combo>
       <name>Tponder-4</name>
-      <pref-width>45</pref-width>
+      <pref-width>55</pref-width>
       <pref-height>25</pref-height>
       <live>true</live>
       <property>/instrumentation/transponder/inputs/digit[0]</property>
@@ -731,6 +736,10 @@
         <command>dialog-apply</command>
       </binding>
     </button>
+
+    <text>
+      <label>  </label>
+    </text>
   </group>
   <!-- Transponder group -->
 
diff --git a/gui/dialogs/random-failures.xml b/gui/dialogs/random-failures.xml
index e302c7e19..49b99cb04 100644
--- a/gui/dialogs/random-failures.xml
+++ b/gui/dialogs/random-failures.xml
@@ -66,7 +66,7 @@
 
   <text>
     <halign>left</halign>
-    <label>Configure MTBF/MCBF for all systems and instruments.</label>
+    <label>  Configure MTBF/MCBF for all systems and instruments.  </label>
   </text>
 
   <hrule></hrule>
@@ -77,6 +77,15 @@
     <valign>top</valign>
     <stretch>true</stretch>
 
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label>  </label>
+      </text>
+    </group>
+
     <group>
       <stretch>true</stretch>
       <layout>vbox</layout>
@@ -198,7 +207,7 @@
 
       <text>
         <halign>center</halign>
-        <label>Mean Cycles Between Failures</label>
+        <label>Mean Cycles Between Failures  </label>
       </text>
 
       <radio>
@@ -315,6 +324,7 @@
 
   <group>
     <layout>hbox</layout>
+    <default-padding>7</default-padding>
 
     <button>
     <legend>OK</legend>
@@ -361,8 +371,4 @@
 
   </group>
 
-  <empty>
-    <pref-height>1</pref-height>
-  </empty>
-
 </PropertyList>
diff --git a/gui/dialogs/rembrandt.xml b/gui/dialogs/rembrandt.xml
index 79b7d0135..3231966ba 100644
--- a/gui/dialogs/rembrandt.xml
+++ b/gui/dialogs/rembrandt.xml
@@ -1,1066 +1,1176 @@
 <?xml version="1.0"?>
 
 <PropertyList>
-	<name>rembrandt</name>
-	<modal>false</modal>
-	<layout>vbox</layout>
-	<padding>20</padding>
+  <name>rembrandt</name>
+  <modal>false</modal>
+  <layout>vbox</layout>
+  <padding>20</padding>
 
-	<group>
-		<layout>hbox</layout>
-		<empty>
-			<stretch>1</stretch>
-		</empty>
+  <group>
+    <layout>hbox</layout>
+    <empty>
+        <stretch>1</stretch>
+    </empty>
 
-		<text>
-			<label>Rembrandt</label>
-		</text>
+    <text>
+      <label>Rembrandt</label>
+    </text>
 
-		<empty>
-			<stretch>1</stretch>
-		</empty>
+    <empty>
+      <stretch>1</stretch>
+    </empty>
 
-		<button>
-			<pref-width>16</pref-width>
-			<pref-height>16</pref-height>
-			<legend></legend>
-			<keynum>27</keynum>
-			<border>2</border>
-			<binding>
-				<command>dialog-close</command>
-			</binding>
-		</button>
-	</group>
+    <button>
+      <pref-width>16</pref-width>
+      <pref-height>16</pref-height>
+      <legend></legend>
+      <keynum>27</keynum>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+  </group>
 
-	<hrule/>
-	
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+  <hrule/>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Bloom</label>
-			<name>bloom</name>
-			<property>/sim/rendering/rembrandt/bloom</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>bloom</object-name>
-			</binding>
-			<enable>
-				<property>/sim/rendering/rembrandt/bloom-buffers</property>
-			</enable>
-		</checkbox>
-		<empty>
-			<pref-width>63</pref-width>
-		</empty>
-		<text>
-			<label>Strength</label>
-			<enable>
-				<and>
-					<property>/sim/rendering/rembrandt/bloom</property>
-					<property>/sim/rendering/rembrandt/bloom-buffers</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>bloom-strength</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.01</step>
-			<property>/sim/rendering/rembrandt/bloom-strength</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>bloom-strength</object-name>
-			</binding>
-			<enable>
-				<and>
-					<property>/sim/rendering/rembrandt/bloom</property>
-					<property>/sim/rendering/rembrandt/bloom-buffers</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>12345678</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/bloom-strength</property>
-			<enable>
-				<and>
-					<property>/sim/rendering/rembrandt/bloom</property>
-					<property>/sim/rendering/rembrandt/bloom-buffers</property>
-				</and>
-			</enable>
-		</text>
-	</group>
-	
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
-		
-		<checkbox>
-			<label>Ambient occlusion</label>
-			<name>occlusion</name>
-			<property>/sim/rendering/rembrandt/ambient-occlusion</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>occlusion</object-name>
-			</binding>
-			<enable>
-				<property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
-			</enable>
-		</checkbox>
-		<empty>
-			<pref-width>-7</pref-width>
-		</empty>
-		<text>
-			<label>Strength</label>
-			<enable>
-				<and>
-					<property>/sim/rendering/rembrandt/ambient-occlusion</property>
-					<property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>ambient-occlusion-strength</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.01</step>
-			<property>/sim/rendering/rembrandt/ambient-occlusion-strength</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>ambient-occlusion-strength</object-name>
-			</binding>
-			<enable>
-				<and>
-					<property>/sim/rendering/rembrandt/ambient-occlusion</property>
-					<property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>12345678</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/ambient-occlusion-strength</property>
-			<enable>
-				<and>
-					<property>/sim/rendering/rembrandt/ambient-occlusion</property>
-					<property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
 
-	<hrule/>
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
-		
-		<checkbox>
-			<halign>left</halign>
-			<label>Shadows</label>
-			<name>shadow</name>
-			<property>/sim/rendering/shadows/enabled</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>shadow</object-name>
-			</binding>
-		</checkbox>
-		<empty>
-			<pref-width>42</pref-width>
-		</empty>
-		<text>
-			<label>Map size</label>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-		</text>
-		<combo>
-			<name>shadow-map-size</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<property>/sim/rendering/shadows/map-size</property>
-			<value>1024</value>
-			<value>2048</value>
-			<value>4096</value>
-			<value>8192</value>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>shadow-map-size</object-name>
-			</binding>
-		</combo>
-		
-	</group>
+    <group>
+      <layout>table</layout>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>right</halign>
-		
-		<text>
-			<label>Filtering</label>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-		</text>
-		<slider>
-			<name>filtering</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<min>1.0</min>
-			<max>3.0</max>
-			<step>1.0</step>
-			<fraction>0.333</fraction>
-			<property>/sim/rendering/shadows/filtering</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>filtering</object-name>
-			</binding>
-		</slider>
-		<text>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<label>12345678</label>
-			<format>%.0f</format>
-			<live>true</live>
-			<property>/sim/rendering/shadows/filtering</property>
-		</text>
-		<empty>
-			<pref-width>222</pref-width>
-		</empty>
-	</group>
+      <checkbox>
+        <row>0</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Bloom</label>
+        <name>bloom</name>
+        <property>/sim/rendering/rembrandt/bloom</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>bloom</object-name>
+        </binding>
+        <enable>
+          <property>/sim/rendering/rembrandt/bloom-buffers</property>
+        </enable>
+      </checkbox>
+      <text>
+        <row>0</row>
+        <col>1</col>
+        <label>Strength</label>
+        <enable>
+          <and>
+            <property>/sim/rendering/rembrandt/bloom</property>
+            <property>/sim/rendering/rembrandt/bloom-buffers</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>0</row>
+        <col>2</col>
+        <name>bloom-strength</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.01</step>
+        <property>/sim/rendering/rembrandt/bloom-strength</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>bloom-strength</object-name>
+        </binding>
+        <enable>
+          <and>
+            <property>/sim/rendering/rembrandt/bloom</property>
+            <property>/sim/rendering/rembrandt/bloom-buffers</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>0</row>
+        <col>3</col>
+        <label>12345678</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/bloom-strength</property>
+        <enable>
+          <and>
+            <property>/sim/rendering/rembrandt/bloom</property>
+            <property>/sim/rendering/rembrandt/bloom-buffers</property>
+          </and>
+        </enable>
+      </text>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>right</halign>
-		
-		<text>
-			<label>Number of cascades</label>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-		</text>
-		<!--<combo>
-			<name>num-cascades</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<property>/sim/rendering/shadows/num-cascades</property>
-			<value>1</value>
-			<value>2</value>
-			<value>3</value>
-			<value>4</value>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>num-cascades</object-name>
-			</binding>
-		</combo>-->
-		<slider>
-			<row>1</row>
-			<col>2</col>
-			<name>filtering</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<min>1.0</min>
-			<max>4.0</max>
-			<step>1.0</step>
-			<fraction>0.25</fraction>
-			<property>/sim/rendering/shadows/num-cascades</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>filtering</object-name>
-			</binding>
-		</slider>
-		<text>
-			<row>1</row>
-			<col>3</col>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<label>12345678</label>
-			<format>%.0f</format>
-			<live>true</live>
-			<property>/sim/rendering/shadows/num-cascades</property>
-		</text>
-		<empty>
-			<pref-width>222</pref-width>
-		</empty>
-	</group>
-	
-	<group>
-		<layout>hbox</layout>
-		<halign>right</halign>
+      <checkbox>
+        <row>1</row>
+        <col>0</col>
+        <label> Ambient occlusion</label>
+        <name>occlusion</name>
+        <property>/sim/rendering/rembrandt/ambient-occlusion</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>occlusion</object-name>
+        </binding>
+        <enable>
+          <property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
+        </enable>
+      </checkbox>
+      <text>
+        <row>1</row>
+        <col>1</col>
+        <label>Strength</label>
+        <enable>
+          <and>
+            <property>/sim/rendering/rembrandt/ambient-occlusion</property>
+            <property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>1</row>
+        <col>2</col>
+        <name>ambient-occlusion-strength</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.01</step>
+        <property>/sim/rendering/rembrandt/ambient-occlusion-strength</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>ambient-occlusion-strength</object-name>
+        </binding>
+        <enable>
+          <and>
+            <property>/sim/rendering/rembrandt/ambient-occlusion</property>
+            <property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>1</row>
+        <col>3</col>
+        <label>12345678</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/ambient-occlusion-strength</property>
+        <enable>
+          <and>
+            <property>/sim/rendering/rembrandt/ambient-occlusion</property>
+            <property>/sim/rendering/rembrandt/ambient-occlusion-buffers</property>
+          </and>
+        </enable>
+      </text>
+    </group>
 
-		<text>
-			<label>Cascades</label>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-		</text>
-		<input>
-			<name>shadow-cascade-1</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<pref-width>50</pref-width>
-			<property>/sim/rendering/shadows/cascade-far-m</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>shadow-cascade-1</object-name>
-			</binding>
-		</input>
-		<input>
-			<name>shadow-cascade-2</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<visible>
-				<greater-than>
-					<property>/sim/rendering/shadows/num-cascades</property>
-					<value>1</value>
-				</greater-than>
-			</visible>
-			<pref-width>50</pref-width>
-			<property>/sim/rendering/shadows/cascade-far-m[1]</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>shadow-cascade-2</object-name>
-			</binding>
-		</input>
-		<input>
-			<name>shadow-cascade-3</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<visible>
-				<greater-than>
-					<property>/sim/rendering/shadows/num-cascades</property>
-					<value>2</value>
-				</greater-than>
-			</visible>
-			<pref-width>50</pref-width>
-			<property>/sim/rendering/shadows/cascade-far-m[2]</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>shadow-cascade-3</object-name>
-			</binding>
-		</input>
-		<input>
-			<name>shadow-cascade-4</name>
-			<enable>
-				<property>/sim/rendering/shadows/enabled</property>
-			</enable>
-			<visible>
-				<greater-than>
-					<property>/sim/rendering/shadows/num-cascades</property>
-					<value>3</value>
-				</greater-than>
-			</visible>
-			<pref-width>50</pref-width>
-			<property>/sim/rendering/shadows/cascade-far-m[3]</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>shadow-cascade-4</object-name>
-			</binding>
-		</input>
-		<empty>
-			<pref-width>147</pref-width>
-		</empty>
-	</group>
+  </group>
 
-	<hrule/>
+  <hrule/>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Night vision</label>
-			<name>night-vision</name>
-			<property>/sim/rendering/rembrandt/night-vision</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>night-vision</object-name>
-			</binding>
-		</checkbox>
-	</group>
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
 
-	<hrule/>
+    <group>
+      <layout>table</layout>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+      <checkbox>
+        <row>0</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Shadows</label>
+        <name>shadow</name>
+        <property>/sim/rendering/shadows/enabled</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>shadow</object-name>
+        </binding>
+      </checkbox>
+      <text>
+        <row>0</row>
+        <col>1</col>
+        <halign>right</halign>
+        <label>Map size</label>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+      </text>
+      <combo>
+        <row>0</row>
+        <col>2</col>
+        <halign>left</halign>
+        <name>shadow-map-size</name>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+        <property>/sim/rendering/shadows/map-size</property>
+        <value>1024</value>
+        <value>2048</value>
+        <value>4096</value>
+        <value>8192</value>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>shadow-map-size</object-name>
+        </binding>
+      </combo>
+      <text>
+        <row>0</row>
+        <col>3</col>
+        <label></label>
+      </text>
+      <empty>
+        <row>0</row>
+        <col>4</col>
+        <stretch>true</stretch>
+      </empty>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Vignette</label>
-			<name>vignette</name>
-			<property>/sim/rendering/rembrandt/cinema/vignette</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>vignette</object-name>
-			</binding>
-			<enable>
-				<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-			</enable>
-		</checkbox>
-		<empty>
-			<pref-width>34</pref-width>
-		</empty>
-		<text>
-			<label>Inner circle</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/vignette</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>inner-circle</name>
-			<min>0.0</min>
-			<max>1.5</max>
-			<step>0.01</step>
-			<property>/sim/rendering/rembrandt/cinema/inner-circle</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>inner-circle</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/vignette</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>12345678</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/inner-circle</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/vignette</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+      <text>
+        <row>1</row>
+        <col>1</col>
+        <halign>right</halign>
+        <label>Filtering</label>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+      </text>
+      <slider>
+        <row>1</row>
+        <col>2</col>
+        <halign>left</halign>
+        <name>filtering</name>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+        <min>1.0</min>
+        <max>3.0</max>
+        <step>1.0</step>
+        <fraction>0.333</fraction>
+        <property>/sim/rendering/shadows/filtering</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>filtering</object-name>
+        </binding>
+      </slider>
+      <text>
+        <row>1</row>
+        <col>3</col>
+        <halign>left</halign>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+        <label>MMMMMMMMMMMMMMM</label>
+        <format>%.0f</format>
+        <live>true</live>
+        <property>/sim/rendering/shadows/filtering</property>
+      </text>
+      <empty>
+        <row>1</row>
+        <col>3</col>
+        <stretch>true</stretch>
+      </empty>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>right</halign>
+      <text>
+        <row>2</row>
+        <col>1</col>
+        <halign>right</halign>
+        <label>Number of cascades</label>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+      </text>
+      <slider>
+        <row>2</row>
+        <col>2</col>
+        <halign>left</halign>
+        <name>filtering</name>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+        <min>1.0</min>
+        <max>4.0</max>
+        <step>1.0</step>
+        <fraction>0.25</fraction>
+        <property>/sim/rendering/shadows/num-cascades</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>filtering</object-name>
+        </binding>
+      </slider>
+      <text>
+        <row>2</row>
+        <col>3</col>
+        <halign>left</halign>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+        <label>MMMMMMMMMMMMMMM</label>
+        <format>%.0f</format>
+        <live>true</live>
+        <property>/sim/rendering/shadows/num-cascades</property>
+      </text>
+      <text>
+        <row>2</row>
+        <col>4</col>
+        <label></label>
+      </text>
+      <empty>
+        <row>2</row>
+        <col>5</col>
+        <stretch>true</stretch>
+      </empty>
 
-		<text>
-			<label>Outer circle</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/vignette</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>outer-circle</name>
-			<min>1.0</min>
-			<max>2.0</max>
-			<step>0.01</step>
-			<property>/sim/rendering/rembrandt/cinema/outer-circle</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>outer-circle</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/vignette</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>12345678</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/outer-circle</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/vignette</property>
-				</and>
-			</enable>
-		</text>
-		<empty>
-			<pref-width>222</pref-width>
-		</empty>
-	</group>
+      <text>
+        <row>3</row>
+        <col>1</col>
+        <halign>right</halign>
+        <label>Cascades</label>
+        <enable>
+          <property>/sim/rendering/shadows/enabled</property>
+        </enable>
+      </text>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+      <group>
+        <layout>hbox</layout>
+        <halign>left</halign>
+        <row>3</row>
+        <col>2</col>
+        <colspan>2</colspan>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Color shift</label>
-			<name>color-shift</name>
-			<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>color-shift</object-name>
-			</binding>
-			<enable>
-				<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-			</enable>
-		</checkbox>
-		<empty>
-			<pref-width>37</pref-width>
-		</empty>
-		<text>
-			<label>Red shift</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>red-shift-r</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/red-shift/x</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>red-shift-r</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/red-shift/x</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>red-shift-g</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/red-shift/y</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>red-shift-g</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/red-shift/y</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>red-shift-b</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/red-shift/z</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>red-shift-b</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/red-shift/z</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+        <input>
+          <halign>left</halign>
+          <name>shadow-cascade-1</name>
+          <enable>
+            <property>/sim/rendering/shadows/enabled</property>
+          </enable>
+          <pref-width>50</pref-width>
+          <property>/sim/rendering/shadows/cascade-far-m</property>
+          <binding>
+            <command>dialog-apply</command>
+            <object-name>shadow-cascade-1</object-name>
+          </binding>
+        </input>
+        <input>
+          <name>shadow-cascade-2</name>
+          <enable>
+            <property>/sim/rendering/shadows/enabled</property>
+          </enable>
+          <visible>
+            <greater-than>
+              <property>/sim/rendering/shadows/num-cascades</property>
+              <value>1</value>
+            </greater-than>
+          </visible>
+          <pref-width>50</pref-width>
+          <property>/sim/rendering/shadows/cascade-far-m[1]</property>
+          <binding>
+            <command>dialog-apply</command>
+            <object-name>shadow-cascade-2</object-name>
+          </binding>
+        </input>
+        <input>
+          <name>shadow-cascade-3</name>
+          <enable>
+            <property>/sim/rendering/shadows/enabled</property>
+          </enable>
+          <visible>
+            <greater-than>
+              <property>/sim/rendering/shadows/num-cascades</property>
+              <value>2</value>
+            </greater-than>
+          </visible>
+          <pref-width>50</pref-width>
+          <property>/sim/rendering/shadows/cascade-far-m[2]</property>
+          <binding>
+            <command>dialog-apply</command>
+            <object-name>shadow-cascade-3</object-name>
+          </binding>
+        </input>
+        <input>
+          <name>shadow-cascade-4</name>
+          <enable>
+            <property>/sim/rendering/shadows/enabled</property>
+          </enable>
+          <visible>
+            <greater-than>
+              <property>/sim/rendering/shadows/num-cascades</property>
+              <value>3</value>
+            </greater-than>
+          </visible>
+          <pref-width>60</pref-width>
+          <property>/sim/rendering/shadows/cascade-far-m[3]</property>
+          <binding>
+            <command>dialog-apply</command>
+            <object-name>shadow-cascade-4</object-name>
+          </binding>
+        </input>
+      </group>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>right</halign>
+      <empty>
+        <row>3</row>
+        <col>3</col>
+        <stretch>true</stretch>
+      </empty>
 
-		<text>
-			<label>Green shift</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>green-shift-r</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/green-shift/x</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>green-shift-r</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/green-shift/x</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>green-shift-g</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/green-shift/y</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>green-shift-g</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/green-shift/y</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>green-shift-b</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/green-shift/z</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>green-shift-b</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/green-shift/z</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+    </group>
+  </group>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>right</halign>
+  <hrule/>
 
-		<text>
-			<label>Blue shift</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>blue-shift-r</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/blue-shift/x</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>blue-shift-r</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/blue-shift/x</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>blue-shift-g</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/blue-shift/y</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>blue-shift-g</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/blue-shift/y</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>blue-shift-b</name>
-			<min>0.0</min>
-			<max>1.0</max>
-			<step>0.004</step>
-			<property>/sim/rendering/rembrandt/cinema/blue-shift/z</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>blue-shift-b</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/blue-shift/z</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Distortion</label>
-			<name>distortion</name>
-			<property>/sim/rendering/rembrandt/cinema/distortion</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>distortion</object-name>
-			</binding>
-			<enable>
-				<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-			</enable>
-		</checkbox>
-		<empty>
-			<pref-width>48</pref-width>
-		</empty>
-		<text>
-			<label>Factors</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>distortion-factor-x</name>
-			<min>-0.5</min>
-			<max>0.5</max>
-			<step>0.01</step>
-			<property>/sim/rendering/rembrandt/cinema/distortion-factor/x</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>distortion-factor-x</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/distortion-factor/x</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>distortion-factor-y</name>
-			<min>-0.5</min>
-			<max>0.5</max>
-			<step>0.01</step>
-			<property>/sim/rendering/rembrandt/cinema/distortion-factor/y</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>distortion-factor-y</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/distortion-factor/y</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>distortion-factor-z</name>
-			<min>0.5</min>
-			<max>1.5</max>
-			<step>0.001</step>
-			<property>/sim/rendering/rembrandt/cinema/distortion-factor/z</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>distortion-factor-z</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>1234</label>
-			<format>%.2f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/distortion-factor/z</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+    <checkbox>
+      <halign>left</halign>
+      <label> Night vision</label>
+      <name>night-vision</name>
+      <property>/sim/rendering/rembrandt/night-vision</property>
+      <binding>
+        <command>dialog-apply</command>
+        <object-name>night-vision</object-name>
+      </binding>
+    </checkbox>
+  </group>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+  <hrule/>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Color fringe</label>
-			<name>color-fringe</name>
-			<property>/sim/rendering/rembrandt/cinema/color-fringe</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>color-fringe</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-				</and>
-			</enable>
-		</checkbox>
-		<empty>
-			<pref-width>42</pref-width>
-		</empty>
-		<text>
-			<label>Factor</label>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-					<property>/sim/rendering/rembrandt/cinema/color-fringe</property>
-				</and>
-			</enable>
-		</text>
-		<slider>
-			<name>color-fringe-factor</name>
-			<min>0.96</min>
-			<max>1.04</max>
-			<step>0.001</step>
-			<property>/sim/rendering/rembrandt/cinema/color-fringe-factor</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>color-fringe-factor</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-					<property>/sim/rendering/rembrandt/cinema/color-fringe</property>
-				</and>
-			</enable>
-		</slider>
-		<text>
-			<label>12345678</label>
-			<format>%.3f</format>
-			<live>true</live>
-			<property>/sim/rendering/rembrandt/cinema/color-fringe-factor</property>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<property>/sim/rendering/rembrandt/cinema/distortion</property>
-					<property>/sim/rendering/rembrandt/cinema/color-fringe</property>
-				</and>
-			</enable>
-		</text>
-	</group>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
 
-	<group>
-		<layout>hbox</layout>
-		<halign>left</halign>
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
 
-		<checkbox>
-			<halign>left</halign>
-			<label>Film wear</label>
-			<name>film-wear</name>
-			<property>/sim/rendering/rembrandt/cinema/film-wear</property>
-			<binding>
-				<command>dialog-apply</command>
-				<object-name>film-wear</object-name>
-			</binding>
-			<enable>
-				<and>
-					<not><property>/sim/rendering/rembrandt/night-vision</property></not>
-					<or>
-						<property>/sim/rendering/rembrandt/cinema/vignette</property>
-						<property>/sim/rendering/rembrandt/cinema/color-shift</property>
-					</or>
-				</and>
-			</enable>
-		</checkbox>
-	</group>
+    <group>
+      <layout>table</layout>
 
-	<hrule/>
+      <checkbox>
+        <row>0</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Vignette</label>
+        <name>vignette</name>
+        <property>/sim/rendering/rembrandt/cinema/vignette</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>vignette</object-name>
+        </binding>
+        <enable>
+          <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+        </enable>
+      </checkbox>
+      <text>
+        <row>0</row>
+        <col>1</col>
+        <label>Inner circle</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/vignette</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>0</row>
+        <col>2</col>
+        <name>inner-circle</name>
+        <min>0.0</min>
+        <max>1.5</max>
+        <step>0.01</step>
+        <property>/sim/rendering/rembrandt/cinema/inner-circle</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>inner-circle</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/vignette</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>0</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/inner-circle</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/vignette</property>
+          </and>
+        </enable>
+      </text>
 
-	<group>
-		<layout>hbox</layout>
+      <text>
+        <row>1</row>
+        <col>1</col>
+        <label>Outer circle</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/vignette</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>1</row>
+        <col>2</col>
+        <name>outer-circle</name>
+        <min>1.0</min>
+        <max>2.0</max>
+        <step>0.01</step>
+        <property>/sim/rendering/rembrandt/cinema/outer-circle</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>outer-circle</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/vignette</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>1</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/outer-circle</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/vignette</property>
+          </and>
+        </enable>
+      </text>
 
-		<button>
-			<legend>Back</legend>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>rendering</dialog-name>
-			</binding>
-			<binding>
-				<command>dialog-close</command>
-			</binding>
-		</button>
-		<button>
-			<legend>Apply</legend>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-		</button>
-		<button>
-			<legend>Close</legend>
-			<default>true</default>
-			<key>Esc</key>
-			<binding>
-				<command>dialog-close</command>
-			</binding>
-		</button>
-	</group>
+      <checkbox>
+        <row>2</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Color shift</label>
+        <name>color-shift</name>
+        <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>color-shift</object-name>
+        </binding>
+        <enable>
+          <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+        </enable>
+      </checkbox>
+      <text>
+        <row>2</row>
+        <col>1</col>
+        <label>Red shift</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>2</row>
+        <col>2</col>
+        <name>red-shift-r</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/red-shift/x</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>red-shift-r</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>2</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/red-shift/x</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>2</row>
+        <col>4</col>
+        <name>red-shift-g</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/red-shift/y</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>red-shift-g</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>2</row>
+        <col>5</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/red-shift/y</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>2</row>
+        <col>6</col>
+        <name>red-shift-b</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/red-shift/z</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>red-shift-b</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>2</row>
+        <col>7</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/red-shift/z</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <empty>
+        <row>2</row>
+        <col>8</col>
+        <stretch>true</stretch>
+      </empty>
+
+      <text>
+        <row>3</row>
+        <col>1</col>
+        <label>Green shift</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>3</row>
+        <col>2</col>
+        <name>green-shift-r</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/green-shift/x</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>green-shift-r</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>3</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/green-shift/x</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>3</row>
+        <col>4</col>
+        <name>green-shift-g</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/green-shift/y</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>green-shift-g</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>3</row>
+        <col>5</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/green-shift/y</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>3</row>
+        <col>6</col>
+        <name>green-shift-b</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/green-shift/z</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>green-shift-b</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>3</row>
+        <col>7</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/green-shift/z</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+
+      <text>
+        <row>4</row>
+        <col>1</col>
+        <label>Blue shift</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>4</row>
+        <col>2</col>
+        <name>blue-shift-r</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/blue-shift/x</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>blue-shift-r</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>4</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/blue-shift/x</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>4</row>
+        <col>4</col>
+        <name>blue-shift-g</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/blue-shift/y</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>blue-shift-g</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>4</row>
+        <col>5</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/blue-shift/y</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>4</row>
+        <col>6</col>
+        <name>blue-shift-b</name>
+        <min>0.0</min>
+        <max>1.0</max>
+        <step>0.004</step>
+        <property>/sim/rendering/rembrandt/cinema/blue-shift/z</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>blue-shift-b</object-name>
+        </binding>
+        <enable>
+            <and>
+                <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+                <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+            </and>
+        </enable>
+      </slider>
+      <text>
+        <row>4</row>
+        <col>7</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/blue-shift/z</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+          </and>
+        </enable>
+      </text>
+
+      <checkbox>
+        <row>5</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Distortion</label>
+        <name>distortion</name>
+        <property>/sim/rendering/rembrandt/cinema/distortion</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>distortion</object-name>
+        </binding>
+        <enable>
+          <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+        </enable>
+      </checkbox>
+      <text>
+        <row>5</row>
+        <col>1</col>
+        <label>Factors</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>5</row>
+        <col>2</col>
+        <name>distortion-factor-x</name>
+        <min>-0.5</min>
+        <max>0.5</max>
+        <step>0.01</step>
+        <property>/sim/rendering/rembrandt/cinema/distortion-factor/x</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>distortion-factor-x</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>5</row>
+        <col>3</col>
+        <halign>left</halign>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/distortion-factor/x</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>5</row>
+        <col>4</col>
+        <name>distortion-factor-y</name>
+        <min>-0.5</min>
+        <max>0.5</max>
+        <step>0.01</step>
+        <property>/sim/rendering/rembrandt/cinema/distortion-factor/y</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>distortion-factor-y</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>5</row>
+        <col>5</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/distortion-factor/y</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>5</row>
+        <col>6</col>
+        <name>distortion-factor-z</name>
+        <min>0.5</min>
+        <max>1.5</max>
+        <step>0.001</step>
+        <property>/sim/rendering/rembrandt/cinema/distortion-factor/z</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>distortion-factor-z</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>5</row>
+        <col>7</col>
+        <label>1234</label>
+        <format>%.2f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/distortion-factor/z</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </text>
+
+      <checkbox>
+        <row>6</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Color fringe</label>
+        <name>color-fringe</name>
+        <property>/sim/rendering/rembrandt/cinema/color-fringe</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>color-fringe</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+          </and>
+        </enable>
+      </checkbox>
+      <text>
+        <row>6</row>
+        <col>1</col>
+        <label>Factor</label>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+            <property>/sim/rendering/rembrandt/cinema/color-fringe</property>
+          </and>
+        </enable>
+      </text>
+      <slider>
+        <row>6</row>
+        <col>2</col>
+        <name>color-fringe-factor</name>
+        <min>0.96</min>
+        <max>1.04</max>
+        <step>0.001</step>
+        <property>/sim/rendering/rembrandt/cinema/color-fringe-factor</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>color-fringe-factor</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+            <property>/sim/rendering/rembrandt/cinema/color-fringe</property>
+          </and>
+        </enable>
+      </slider>
+      <text>
+        <row>6</row>
+        <col>3</col>
+        <label>12345</label>
+        <format>%.3f</format>
+        <live>true</live>
+        <property>/sim/rendering/rembrandt/cinema/color-fringe-factor</property>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <property>/sim/rendering/rembrandt/cinema/distortion</property>
+            <property>/sim/rendering/rembrandt/cinema/color-fringe</property>
+          </and>
+        </enable>
+      </text>
+
+      <checkbox>
+        <row>7</row>
+        <col>0</col>
+        <halign>left</halign>
+        <label> Film wear</label>
+        <name>film-wear</name>
+        <property>/sim/rendering/rembrandt/cinema/film-wear</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>film-wear</object-name>
+        </binding>
+        <enable>
+          <and>
+            <not><property>/sim/rendering/rembrandt/night-vision</property></not>
+            <or>
+              <property>/sim/rendering/rembrandt/cinema/vignette</property>
+              <property>/sim/rendering/rembrandt/cinema/color-shift</property>
+            </or>
+          </and>
+        </enable>
+      </checkbox>
+
+    </group>
+
+  </group>
+
+  <hrule/>
+
+  <group>
+    <layout>hbox</layout>
+    <default-padding>7</default-padding>
+
+    <button>
+      <legend>Back</legend>
+      <binding>
+        <command>dialog-show</command>
+        <dialog-name>rendering</dialog-name>
+      </binding>
+      <binding>
+          <command>dialog-close</command>
+      </binding>
+    </button>
+    <button>
+      <legend>Apply</legend>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </button>
+    <button>
+      <legend>Close</legend>
+      <default>true</default>
+      <key>Esc</key>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+  </group>
 
 </PropertyList>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 23340862a..5736f826e 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -53,6 +53,15 @@
 		<halign>center</halign>
 		<layout>hbox</layout>
 
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
 		<group>
 			<layout>vbox</layout>
 
@@ -218,6 +227,10 @@
 				</binding>
 			</checkbox>
 
+  		<empty>
+  			<stretch>1</stretch>
+  		</empty>
+
 			<group>
 				<layout>hbox</layout>
 				<text>
@@ -330,17 +343,20 @@
 						<object-name>random-vegetation</object-name>
 					</binding>
 				</checkbox>
+<!--
 				<text>
 					<row>4</row>
 					<col>1</col>
-					<label>density</label>
+					<label>Density</label>
 					<enable>
 						<property>/sim/rendering/random-vegetation</property>
 					</enable>
 				</text>
+-->
 				<slider>
 					<row>4</row>
-					<col>2</col>
+					<col>1</col>
+          <halign>left</halign>
 					<name>vegetation-density</name>
 					<min>0</min>
 					<max>10.0</max>
@@ -353,8 +369,9 @@
 				</slider>
 				<text>
 					<row>4</row>
-					<col>3</col>
-					<label>12345678</label>
+					<col>2</col>
+					<label>1234567890   </label>
+          <halign>left</halign>
 					<format>%.1f</format>
 					<live>true</live>
 					<property>/sim/rendering/vegetation-density</property>
@@ -363,11 +380,10 @@
 					</enable>
 				</text>
 
-
 				<checkbox>
-    					<enable>
-    					  <property>/sim/rendering/shaders/skydome</property>
-    					</enable>
+ 					<enable>
+					  <property>/sim/rendering/shaders/skydome</property>
+    			</enable>
 					<row>5</row>
 					<col>0</col>
 					<halign>left</halign>
@@ -381,19 +397,19 @@
 				</checkbox>
 
 				<text>
-    					<enable>
-    					  <property>/sim/rendering/shaders/skydome</property>
-    					</enable>
+    			<enable>
+    				<property>/sim/rendering/shaders/skydome</property>
+    			</enable>
 				 	<row>5</row>
-				  	<col>1</col>
-					<colspan>3</colspan>
-          				<color>
-           			 	 <red>1.0</red>
-          			  	 <green>0.6</green>
-         			   	 <blue>0.6</blue>
-         			 	 </color>
-				  	<label>(needs ALS and antialiasing)</label>
-        			</text>
+				  <col>1</col>
+					<colspan>2</colspan>
+          <color>
+            <red>1.0</red>
+            <green>0.6</green>
+            <blue>0.6</blue>
+         	</color>
+				  <label>(needs ALS and Antialiasing)</label>
+        </text>
 
 			</group>
 
@@ -404,15 +420,33 @@
 
 		</group>
 
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
 		<vrule/>
 
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
 		<group>
 			<layout>vbox</layout>
 
 			<group>
 				<layout>hbox</layout>
 				<text>
-					<label>Shader effects</label>
+					<label>Shader Effects</label>
 					<halign>left</halign>
 				</text>
 				<hrule>
@@ -536,7 +570,7 @@
 			<group>
 				<layout>hbox</layout>
 				<text>
-					<label>Atmospheric effects</label>
+					<label>Atmospheric Effects</label>
 					<halign>left</halign>
 				</text>
 				<hrule>
@@ -658,82 +692,56 @@
 				</text>
 			</group>
 
+      <!-- mhab modified -->
 			<group>
 				<layout>table</layout>
+
 				<group>
-					<layout>hbox</layout>
+					<layout>vbox</layout>
+          <pref-height>35</pref-height>
 					<halign>left</halign>
 					<row>0</row>
 					<col>0</col>
 					<checkbox>
 						<halign>left</halign>
-						<label>Atmospheric light scattering (ALS)</label>
+						<label>Atmospheric Light Scattering (ALS)</label>
 						<name>skydome-scattering</name>
-						<visible>
+						<enable>
 							<not>
 								<property>/sim/rendering/rembrandt/enabled</property>
 							</not>
-						</visible>
+						</enable>
 						<property>/sim/rendering/shaders/skydome</property>
 						<binding>
 							<command>dialog-apply</command>
 							<object-name>skydome-scattering</object-name>
 						</binding>
 					</checkbox>
-					<!--<text>
-						<label>(Experimental)</label>
-						<visible>
-							<not>
-								<property>/sim/rendering/rembrandt/enabled</property>
-							</not>
-						</visible>
-						<color>
-							<red>1.0</red>
-							<green>0.6</green>
-							<blue>0.6</blue>
-						</color>
-					</text>-->
 				</group>
-				<!--<text>
-					<row>1</row>
-					<col>0</col>
-					<label>This disables most effects/shaders.</label>
-					<halign>left</halign>
-					<visible>
-						<not>
-							<property>/sim/rendering/rembrandt/enabled</property>
-						</not>
-					</visible>
-					<color>
-						<red>1.0</red>
-						<green>0.6</green>
-						<blue>0.6</blue>
-					</color>
-				</text>-->
 
 				<group>
 					<layout>hbox</layout>
-					<row>0</row>
+					<row>1</row>
 					<col>0</col>
 
 					<text>
 						<label>Rembrandt</label>
 						<halign>left</halign>
-						<visible>
+						<enable>
 							<property>/sim/rendering/rembrandt/enabled</property>
-						</visible>
+						</enable>
 					</text>
 					<text>
-						<label>(Experimental)</label>
+						<label>(experimental)</label>
 						<halign>left</halign>
 						<color>
 							<red>1.0</red>
 							<green>0.6</green>
 							<blue>0.6</blue>
 						</color>
-						<visible>
+						<enable>
 							<property>/sim/rendering/rembrandt/enabled</property>
-						</visible>
+						</enable>
 					</text>
 					<hrule>
 						<stretch>true</stretch>
@@ -744,11 +752,11 @@
 				</group>
 
 				<button>
-					<row>1</row>
+					<row>2</row>
 					<col>0</col>
-					<visible>
+					<enable>
 						<property>/sim/rendering/rembrandt/enabled</property>
-					</visible>
+					</enable>
 					<legend>Rembrandt Options</legend>
 					<halign>center</halign>
 					<binding>
@@ -769,12 +777,22 @@
 			</empty>
 
 		</group>
+
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
 	</group>
 
 	<hrule/>
 
 	<button>
-		<legend>OK</legend>
+		<legend>  OK  </legend>
         <default>true</default>
         <binding>
             <command>nasal</command>
@@ -830,7 +848,7 @@
         "/sim/rendering/random-buildings",
         "/sim/rendering/random-objects",
         "/sim/rendering/random-vegetation",
-	"/sim/rendering/random-vegetation-shadows",
+        "/sim/rendering/random-vegetation-shadows",
         "/sim/rendering/vegetation-density",
         "/sim/rendering/clouds3d-enable",
         "/sim/rendering/clouds3d-density"];
diff --git a/gui/dialogs/route-manager.xml b/gui/dialogs/route-manager.xml
index 2167917d3..f53b02bdd 100644
--- a/gui/dialogs/route-manager.xml
+++ b/gui/dialogs/route-manager.xml
@@ -301,14 +301,14 @@ command interface /autopilot/route-manager/input:
             <row>0</row>
             <col>0</col>
             <halign>right</halign>
-            <label>Departure:</label>
+            <label> Departure:</label>
         </text>
         <input>
             <row>0</row>
             <col>1</col>
             <halign>left</halign>
             <name>departure-airport</name>
-            <pref-width>60</pref-width>
+            <pref-width>70</pref-width>
             <property>/autopilot/route-manager/departure/airport</property>
             <live>true</live>
             <binding>
@@ -388,7 +388,7 @@ command interface /autopilot/route-manager/input:
             <row>1</row>
             <col>1</col>
             <halign>left</halign>
-            <pref-width>60</pref-width>
+            <pref-width>70</pref-width>
             <name>destination-airport</name>
             <property>/autopilot/route-manager/destination/airport</property>
             <live>true</live>
@@ -450,6 +450,7 @@ command interface /autopilot/route-manager/input:
         <combo>
             <row>1</row>
             <col>6</col>
+            <pref-width>120</pref-width>
             <halign>left</halign>
             <name>approach</name>
             <property>/autopilot/route-manager/destination/approach</property>
@@ -505,7 +506,7 @@ command interface /autopilot/route-manager/input:
         <layout>hbox</layout>
         <text>
             <halign>right</halign>
-            <label>Cruise Speed (kts):</label>
+            <label>  Cruise Speed (kts):</label>
         </text>
         <input>
             <name>cruise-speed</name>
@@ -566,26 +567,44 @@ command interface /autopilot/route-manager/input:
         </text>
     </group>
 
-    <waypointlist>
-        <name>list</name>
-        <halign>fill</halign>
-        <valign>fill</valign>
-        <stretch>true</stretch>
-        <pref-height>150</pref-height>
-        <property>/sim/gui/dialogs/route-manager/selection</property>
-        <binding>
-            <command>dialog-apply</command>
-            <object-name>list</object-name>
-        </binding>
-    </waypointlist>
+    <group>
+        <layout>hbox</layout>
+        <default-padding>2</default-padding>
+
+        <!-- gap -->
+        <text>
+          <label> </label>
+        </text>
+
+        <waypointlist>
+            <name>list</name>
+            <halign>fill</halign>
+            <valign>fill</valign>
+            <stretch>true</stretch>
+            <pref-height>150</pref-height>
+            <property>/sim/gui/dialogs/route-manager/selection</property>
+            <binding>
+                <command>dialog-apply</command>
+                <object-name>list</object-name>
+            </binding>
+        </waypointlist>
+
+        <!-- gap -->
+        <text>
+          <label> </label>
+        </text>
+
+    </group>
 
     <group>
         <layout>hbox</layout>
         <default-padding>4</default-padding>
 
         <text>
-            <label>Waypoint:</label>
+            <label>  Waypoint:</label>
+<!--
             <pref-width>60</pref-width>
+-->
         </text>
 
         <input>
@@ -599,10 +618,12 @@ command interface /autopilot/route-manager/input:
         <button>
             <legend>Add</legend>
             <default>true</default>
+<!--
             <pref-width>70</pref-width>
+-->
             <binding>
                 <command>dialog-apply</command>
-				<object-name>input</object-name>
+                <object-name>input</object-name>
             </binding>
             <binding>
                 <command>nasal</command>
@@ -612,22 +633,28 @@ command interface /autopilot/route-manager/input:
                 <command>dialog-update</command>
             </binding>
         </button>
+
+        <!-- gap -->
+        <text>
+          <label></label>
+        </text>
     </group>
 
     <text>
         <padding>1</padding>
         <label>Format: (airport|fix|nav|lon,lat)[@alt] -- e.g. "KSFO@900"</label>
         <color>
-            <red>0.5</red>
-            <green>0.5</green>
-            <blue>0.5</blue>
+            <red>0.7</red>
+            <green>0.7</green>
+            <blue>0.7</blue>
         </color>
     </text>
 
+    <!-- button field -->
     <group>
         <layout>hbox</layout>
         <halign>fill</halign>
-        <default-padding>6</default-padding>
+        <default-padding>8</default-padding>
 
         <button>
             <legend>Clear List</legend>
@@ -640,6 +667,7 @@ command interface /autopilot/route-manager/input:
 
         <button>
             <legend>Remove</legend>
+            <equal>true</equal>
             <enable>
                 <greater-than>
                 <property>/sim/gui/dialogs/route-manager/selection</property>
@@ -652,13 +680,14 @@ command interface /autopilot/route-manager/input:
             </binding>
         </button>
 
-		<button>
-			<legend>Route</legend>
-			<binding>
-				<command>nasal</command>
-				<script>route()</script>
-			</binding>
-		</button>
+        <button>
+            <legend>Route</legend>
+            <equal>true</equal>
+            <binding>
+              <command>nasal</command>
+              <script>route()</script>
+            </binding>
+        </button>
 <!--
         <button>
             <legend>Auto-route</legend>
@@ -699,9 +728,13 @@ command interface /autopilot/route-manager/input:
         </button>
 
         <empty><stretch>true</stretch></empty>
+        <!-- gap -->
+        <text>
+          <label></label>
+        </text>
 
         <button>
-            <legend>Load...</legend>
+            <legend>Load ...</legend>
             <equal>true</equal>
             <enable>
             <not><property>/autopilot/route-manager/active</property></not>
@@ -712,7 +745,7 @@ command interface /autopilot/route-manager/input:
             </binding>
         </button>
         <button>
-            <legend>Save...</legend>
+            <legend>Save ...</legend>
             <equal>true</equal>
             <binding>
                 <command>nasal</command>
@@ -721,6 +754,7 @@ command interface /autopilot/route-manager/input:
         </button>
         <button>
             <legend>Close</legend>
+            <equal>true</equal>
             <key>Esc</key>
             <binding>
                 <command>dialog-close</command>
diff --git a/gui/dialogs/scenario.xml b/gui/dialogs/scenario.xml
index 84a93ceec..f6a9b5961 100644
--- a/gui/dialogs/scenario.xml
+++ b/gui/dialogs/scenario.xml
@@ -49,17 +49,32 @@
 
   <hrule/>
 
-  <checkbox>
+  <group>
+    <layout>hbox</layout>
     <halign>left</halign>
-    <label>Enable AI traffic</label>
-    <name>enable-ai-traffic</name>
-    <property>/sim/traffic-manager/enabled</property>
-    <live>true</live>
-    <binding>
-        <command>dialog-apply</command>
-        <object-name>enable-ai-traffic</object-name>
-    </binding>
-  </checkbox>
+
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
+    <checkbox>
+      <halign>left</halign>
+      <label>Enable AI traffic</label>
+      <name>enable-ai-traffic</name>
+      <property>/sim/traffic-manager/enabled</property>
+      <live>true</live>
+      <binding>
+          <command>dialog-apply</command>
+          <object-name>enable-ai-traffic</object-name>
+      </binding>
+    </checkbox>
+
+  </group>
 
   <text><label/></text>
 
@@ -72,6 +87,15 @@
   <group>
     <layout>hbox</layout>
 
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
     <group>
       <name>left-column</name>
       <layout>vbox</layout>
diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 647ba4c80..169405138 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -34,6 +34,12 @@
 
   <group>
     <layout>hbox</layout>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
     <text>
     <halign>right</halign>
     <label>Sound Device:</label>
@@ -53,6 +59,12 @@
         <object-name>sound-dialog</object-name>
       </binding>
     </combo>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
   </group>
 
   <hrule/>
diff --git a/gui/dialogs/stereoscopic-view-options.xml b/gui/dialogs/stereoscopic-view-options.xml
index 19e7a1f01..4cc8a64e4 100644
--- a/gui/dialogs/stereoscopic-view-options.xml
+++ b/gui/dialogs/stereoscopic-view-options.xml
@@ -35,12 +35,17 @@
       </binding>
     </button>
   </group>
+
   <hrule/>
 
+  <empty>
+    <stretch>true</stretch>
+  </empty>
+
   <group>
     <layout>hbox</layout>
     <default-padding>1</default-padding>
-    <text><label>Stereo Mode</label></text>
+    <text><label>  Stereo Mode</label></text>
     <empty><stretch>true</stretch></empty>
     <combo>
       <pref-width>250</pref-width>
@@ -60,12 +65,17 @@
         <command>dialog-apply</command>
       </binding>
     </combo>
+    <!-- gap -->
+    <text>
+      <label> </label>
+    </text>
+
   </group>
 
   <group>
     <layout>hbox</layout>
     <default-padding>1</default-padding>
-    <text><label>Screen Distance</label></text>
+    <text><label>  Screen Distance</label></text>
     <empty><stretch>true</stretch></empty>
     <slider>
       <min>0</min>
@@ -86,7 +96,7 @@
   <group>
     <layout>hbox</layout>
     <default-padding>1</default-padding>
-    <text><label>Eye Separation</label></text>
+    <text><label>  Eye Separation</label></text>
     <empty><stretch>true</stretch></empty>
     <slider>
       <min>0</min>
@@ -104,6 +114,10 @@
       </text>
   </group>
 
+  <empty>
+    <stretch>true</stretch>
+  </empty>
+
   <hrule/>
 
   <button>
diff --git a/gui/dialogs/stopwatch.xml b/gui/dialogs/stopwatch.xml
index 95a5fff4f..5a5e51e3f 100644
--- a/gui/dialogs/stopwatch.xml
+++ b/gui/dialogs/stopwatch.xml
@@ -8,9 +8,6 @@
 	<x>-5</x>
 	<y>5</y>
 	<color>
-		<red>0.2</red>
-		<green>0.2</green>
-		<blue>0.2</blue>
 		<alpha>0.7</alpha>
 	</color>
 
@@ -87,7 +84,7 @@
 	</nasal>
 
 	<text>
-		<label>xxxxx000 : 00 : 00.000</label>
+		<label>xxxxx000 : 00 : 00.0</label>
 		<halign>center</halign>
 		<live>true</live>
 		<property>/sim/gui/dialogs/stopwatch-dialog/display</property>
@@ -109,11 +106,7 @@
 		<button>
 			<legend>Start</legend>
 			<equal>true</equal>
-			<pref-width>47</pref-width>
 			<color>
-				<red type="float">0.3</red>
-				<green type="float">0.3</green>
-				<blue type="float">0.3</blue>
 				<alpha type="float">0.8</alpha>
 			</color>
 			<binding>
@@ -125,11 +118,7 @@
 		<button>
 			<legend>Stop</legend>
 			<default>true</default>
-			<pref-width>47</pref-width>
 			<color>
-				<red type="float">0.3</red>
-				<green type="float">0.3</green>
-				<blue type="float">0.3</blue>
 				<alpha type="float">0.8</alpha>
 			</color>
 			<binding>
@@ -141,11 +130,7 @@
 		<button>
 			<legend>Reset</legend>
 			<key>Delete</key>
-			<pref-width>47</pref-width>
 			<color>
-				<red type="float">0.3</red>
-				<green type="float">0.3</green>
-				<blue type="float">0.3</blue>
 				<alpha type="float">0.8</alpha>
 			</color>
 			<binding>
@@ -157,13 +142,9 @@
 		<button>
 			<legend>Close</legend>
 			<color>
-				<red type="float">0.3</red>
-				<green type="float">0.3</green>
-				<blue type="float">0.3</blue>
 				<alpha type="float">0.8</alpha>
 			</color>
 			<key>Esc</key>
-			<pref-width>47</pref-width>
 			<binding>
 				<command>dialog-close</command>
 			</binding>
diff --git a/gui/dialogs/system-failures.xml b/gui/dialogs/system-failures.xml
index 3385bd5de..9ffd1db66 100644
--- a/gui/dialogs/system-failures.xml
+++ b/gui/dialogs/system-failures.xml
@@ -100,7 +100,7 @@
 
   <text>
     <halign>left</halign>
-    <label>Uncheck a system to fail it, or set the Mean Time/Cycles Between Failures.</label>
+    <label>  Uncheck a system to fail it, or set the Mean Time/Cycles Between Failures.  </label>
   </text>
 
   <hrule/>
@@ -187,7 +187,7 @@
         <row>4</row>
         <col>0</col>
         <halign>right</halign>
-        <label>Electrical System</label>
+        <label>  Electrical System</label>
       </text>
 
       <checkbox>
@@ -378,12 +378,23 @@
       </input-template>
 
     </group>
+
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label>  </label>
+      </text>
+    </group>
+
   </group>
 
   <hrule/>
 
   <group>
     <layout>hbox</layout>
+    <default-padding>7</default-padding>
 
     <button>
       <legend>OK</legend>
diff --git a/gui/dialogs/terrasync.xml b/gui/dialogs/terrasync.xml
index c63d82f43..18425b9c6 100644
--- a/gui/dialogs/terrasync.xml
+++ b/gui/dialogs/terrasync.xml
@@ -59,13 +59,15 @@
 
   <group>
     <layout>hbox</layout>
+    <default-padding>4</default-padding>
+
     <empty><stretch>1</stretch></empty>
 
     <text>
       <label>Automatic Download of Scenery and Data</label>
     </text>
 
-	<empty><stretch>1</stretch></empty>
+    <empty><stretch>1</stretch></empty>
 
     <button>
       <pref-width>16</pref-width>
@@ -95,300 +97,351 @@
   <group>
     <layout>vbox</layout>
 
-  <group>
-    <layout>table</layout>
-    <halign>left</halign>
-    <equal>false</equal>
-
-    <checkbox>
-      <name>terrasync-enabled</name>
-      <halign>left</halign>
-      <row>1</row><col>1</col><colspan>3</colspan>
-      <property>/sim/terrasync/enabled</property>
-      <label>Enable automatic download/update</label>
-      <live>true</live>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>terrasync-enabled</object-name>
-      </binding>
-      <enable>
-        <not-equals>
-          <property>/sim/terrasync/scenery-dir</property>
-          <value></value>
-        </not-equals>
-      </enable>
-    </checkbox>
-
-    <checkbox>
-      <name>ai-data-enabled</name>
-      <halign>left</halign>
-      <row>2</row><col>2</col><colspan>2</colspan>
-      <property>/sim/terrasync/ai-data-enabled</property>
-      <label>Download traffic and multi-player aircraft</label>
-      <live>true</live>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>ai-data-enabled</object-name>
-      </binding>
-      <enable>
-        <property>/sim/terrasync/enabled</property>
-      </enable>
-    </checkbox>
-    
-    <checkbox>
-      <name>other-data-enabled</name>
-      <halign>left</halign>
-      <row>3</row><col>2</col><colspan>2</colspan>
-      <property>/sim/terrasync/other-data-enabled</property>
-      <label>Download other data files</label>
-      <live>true</live>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>other-data-enabled</object-name>
-      </binding>
-      <enable>
-        <property>/sim/terrasync/enabled</property>
-      </enable>
-    </checkbox>
-    
-    <text>
-      <name>warning_text</name>
-      <row>4</row>
-      <col>0</col><colspan>4</colspan>
-      <color>
-        <red>1.0</red>
-        <green>0.4</green>
-        <blue>0.4</blue>
-        <alpha>1</alpha>
-      </color>
-      <halign>center</halign>
-      <label/>
-    </text>
-
-  </group>
-
-  <hrule/>
-
-  <group>
-    <layout>hbox</layout>
-    <halign>left</halign>
-    <default-padding>2</default-padding>
-        
-    <button>
-      <legend>Information</legend>
-      <binding>
-        <command>property-assign</command>
-        <property>/sim/gui/dialogs/terrasync/display-mode</property>
-        <value>0</value>
-      </binding>
-    </button>
-            
-    <button>
-      <legend>Log</legend>
-      <binding>
-        <command>property-assign</command>
-        <property>/sim/gui/dialogs/terrasync/display-mode</property>
-        <value>1</value>
-      </binding>
-    </button>
-  </group>            
-    
-  <!-- 'tabbed' group controlled by display-mode property -->
-  <group>  
+    <group>
       <layout>table</layout>
-      <halign>fill</halign>
-      <valign>fill</valign>
-      <default-padding>0</default-padding>
-      
-  <group>
-    <layout>table</layout>
-    <halign>left</halign>
-    <valign>top</valign>
-    <equal>false</equal>
+      <halign>left</halign>
+      <equal>false</equal>
 
-    <row>0</row>
-    <col>0</col>
-    <visible>
-      <equals>
-        <property>/sim/gui/dialogs/terrasync/display-mode</property>
-        <value>0</value>
-      </equals>
-    </visible>
-    
-    <!-- status text is generated by Nasal dynamically -->
-    <text>
-      <row>0</row>
-      <col>0</col>
-      <colspan>2</colspan>
-      
-      <halign>left</halign>
-      <pref-width>200</pref-width>
-      <format>Status: %s</format>
-      <property>/sim/gui/dialogs/terrasync/status</property>
-      <live>true</live>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-    
-    <text>
-      <halign>left</halign>
-      <row>1</row>
-      <col>0</col>
-      <label>KBytes downloaded:</label>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-    <text>
-      <row>1</row>
-      <col>1</col>
-      <format>%d</format>
-      <property>/sim/terrasync/downloaded-kbytes</property>
-      <live>true</live>
-      <halign>right</halign>
-      <stretch>true</stretch>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-    
-    <text>
-      <halign>left</halign>
-      <row>2</row>
-      <col>0</col>
-      <label>Processed elements:</label>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-    <text>
-      <row>2</row>
-      <col>1</col>
-      <format>%s</format>
-      <property>/sim/terrasync/update-count</property>
-      <live>true</live>
-      <stretch>true</stretch>
-      <halign>right</halign>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-
-    <text>
-      <halign>left</halign>
-      <row>3</row>
-      <col>0</col>
-      <label>Processed scenery tiles:</label>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-    <text>
-      <row>3</row>
-      <col>1</col>
-      <format>%s</format>
-      <property>/sim/terrasync/tile-count</property>
-      <live>true</live>
-      <stretch>true</stretch>
-      <halign>right</halign>
-      <color>
-        <red>0.7</red>
-        <green>0.7</green>
-        <blue>0.7</blue>
-        <alpha>1</alpha>
-      </color>
-    </text>
-  </group>
-
-    <loglist>
+      <!-- only for a gap -->
+      <text>
         <row>0</row>
         <col>0</col>
-        
-        <visible>
-          <equals>
-            <property>/sim/gui/dialogs/terrasync/display-mode</property>
-            <value>1</value>
-          </equals>
-        </visible>
-    
-    
-    	<halign>fill</halign>
-    	<valign>fill</valign>
-    	<stretch>true</stretch>
-    	<pref-height>200</pref-height>
-        <pref-height>600</pref-height>
-        <logclass>terrasync</logclass>
-    	<padding>6</padding>
-    </loglist>
-    
+        <halign>center</halign>
+        <label> </label>
+      </text>
+
+      <checkbox>
+        <name>terrasync-enabled</name>
+        <halign>left</halign>
+        <row>0</row>
+        <col>1</col>
+        <colspan>3</colspan>
+        <property>/sim/terrasync/enabled</property>
+        <label>Enable automatic download/update</label>
+        <live>true</live>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>terrasync-enabled</object-name>
+        </binding>
+        <enable>
+          <not-equals>
+            <property>/sim/terrasync/scenery-dir</property>
+            <value></value>
+          </not-equals>
+        </enable>
+      </checkbox>
+
+      <!-- only for a gap -->
+      <text>
+        <row>1</row>
+        <col>1</col>
+        <halign>center</halign>
+        <label>    </label>
+      </text>
+
+      <checkbox>
+        <name>ai-data-enabled</name>
+        <halign>left</halign>
+        <row>1</row>
+        <col>2</col>
+<!--
+        <colspan>2</colspan>
+-->
+        <property>/sim/terrasync/ai-data-enabled</property>
+        <label>Download traffic and multi-player aircraft</label>
+        <live>true</live>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>ai-data-enabled</object-name>
+        </binding>
+        <enable>
+          <property>/sim/terrasync/enabled</property>
+        </enable>
+      </checkbox>
+
+      <checkbox>
+        <name>other-data-enabled</name>
+        <halign>left</halign>
+        <row>2</row>
+        <col>2</col>
+        <colspan>2</colspan>
+        <property>/sim/terrasync/other-data-enabled</property>
+        <label>Download other data files</label>
+        <live>true</live>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>other-data-enabled</object-name>
+        </binding>
+        <enable>
+          <property>/sim/terrasync/enabled</property>
+        </enable>
+      </checkbox>
+
+      <text>
+        <name>warning_text</name>
+        <row>3</row>
+        <col>0</col><colspan>4</colspan>
+        <color>
+          <red>1.0</red>
+          <green>0.4</green>
+          <blue>0.4</blue>
+          <alpha>1</alpha>
+        </color>
+        <halign>center</halign>
+        <label/>
+      </text>
+
+    </group>
+
+    <hrule/>
+
+    <group>
+      <layout>hbox</layout>
+      <halign>left</halign>
+      <default-padding>4</default-padding>
+
+      <!-- only for a gap -->
+      <text>
+        <halign>center</halign>
+        <label> </label>
+      </text>
+
+      <button>
+        <legend>Information</legend>
+        <binding>
+          <command>property-assign</command>
+          <property>/sim/gui/dialogs/terrasync/display-mode</property>
+          <value>0</value>
+        </binding>
+      </button>
+
+      <!-- only for a gap -->
+      <text>
+        <halign>center</halign>
+        <label></label>
+      </text>
+
+      <button>
+        <legend>  Log  </legend>
+        <binding>
+          <command>property-assign</command>
+          <property>/sim/gui/dialogs/terrasync/display-mode</property>
+          <value>1</value>
+        </binding>
+      </button>
+    </group>
+
+    <!-- 'tabbed' group controlled by display-mode property -->
+    <group>
+      <layout>hbox</layout>
+      <halign>left</halign>
+
+      <!-- gap -->
+      <text>
+        <label></label>
+      </text>
+
+      <group>
+        <layout>table</layout>
+        <halign>fill</halign>
+        <valign>fill</valign>
+        <default-padding>0</default-padding>
+
+        <group>
+          <layout>table</layout>
+          <halign>left</halign>
+          <valign>top</valign>
+          <equal>false</equal>
+
+          <row>0</row>
+          <col>0</col>
+          <visible>
+            <equals>
+              <property>/sim/gui/dialogs/terrasync/display-mode</property>
+              <value>0</value>
+            </equals>
+          </visible>
+
+          <!-- status text is generated by Nasal dynamically -->
+          <text>
+            <row>0</row>
+            <col>0</col>
+            <colspan>2</colspan>
+
+            <halign>left</halign>
+            <pref-width>200</pref-width>
+            <format>Status: %s</format>
+            <property>/sim/gui/dialogs/terrasync/status</property>
+            <live>true</live>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+
+          <text>
+            <halign>left</halign>
+            <row>1</row>
+            <col>0</col>
+            <label>KBytes downloaded:</label>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+          <text>
+            <row>1</row>
+            <col>1</col>
+            <format>%d</format>
+            <property>/sim/terrasync/downloaded-kbytes</property>
+            <live>true</live>
+            <halign>right</halign>
+            <stretch>true</stretch>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+
+          <text>
+            <halign>left</halign>
+            <row>2</row>
+            <col>0</col>
+            <label>Processed elements:</label>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+          <text>
+            <row>2</row>
+            <col>1</col>
+            <format>%s</format>
+            <property>/sim/terrasync/update-count</property>
+            <live>true</live>
+            <stretch>true</stretch>
+            <halign>right</halign>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+
+          <text>
+            <halign>left</halign>
+            <row>3</row>
+            <col>0</col>
+            <label>Processed scenery tiles:</label>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+          <text>
+            <row>3</row>
+            <col>1</col>
+            <format>%s</format>
+            <property>/sim/terrasync/tile-count</property>
+            <live>true</live>
+            <stretch>true</stretch>
+            <halign>right</halign>
+            <color>
+              <red>0.7</red>
+              <green>0.7</green>
+              <blue>0.7</blue>
+              <alpha>1</alpha>
+            </color>
+          </text>
+        </group>
+
+        <loglist>
+          <row>0</row>
+          <col>0</col>
+
+          <visible>
+            <equals>
+              <property>/sim/gui/dialogs/terrasync/display-mode</property>
+              <value>1</value>
+            </equals>
+          </visible>
+
+        	<halign>fill</halign>
+        	<valign>fill</valign>
+        	<stretch>true</stretch>
+        	<pref-width>600</pref-width>
+          <pref-height>300</pref-height>
+          <logclass>terrasync</logclass>
+        	<padding>6</padding>
+        </loglist>
+
+      </group>
+
+      <!-- gap -->
+      <text>
+        <label></label>
+      </text>
+
     </group> <!-- end of tabbed group -->
 
-  <hrule/>
+    <hrule/>
 
-  <group>
-    <layout>hbox</layout>
-    <default-padding>10</default-padding>
-    <empty><stretch>true</stretch></empty>
+    <group>
+      <layout>hbox</layout>
+      <default-padding>3</default-padding>
+      <empty><stretch>true</stretch></empty>
 
-    <button>
-      <legend>OK</legend>
-      <border>2</border>
-      <equal>true</equal>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>reinit</command>
-        <subsystem>terrasync</subsystem>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
+      <button>
+        <legend>OK</legend>
+        <border>2</border>
+        <equal>true</equal>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+        <binding>
+          <command>reinit</command>
+          <subsystem>terrasync</subsystem>
+        </binding>
+        <binding>
+          <command>dialog-close</command>
+        </binding>
+      </button>
 
-    <button>
-      <legend>Apply</legend>
-      <equal>true</equal>
-      <border>2</border>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>reinit</command>
-        <subsystem>terrasync</subsystem>
-      </binding>
-    </button>
+      <button>
+        <legend>  Apply  </legend>
+        <equal>true</equal>
+        <border>2</border>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+        <binding>
+          <command>reinit</command>
+          <subsystem>terrasync</subsystem>
+        </binding>
+      </button>
 
-    <button>
-      <legend>Cancel</legend>
-      <border>2</border>
-      <equal>true</equal>
-      <key>Esc</key>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
-    <empty><stretch>true</stretch></empty>
-  </group>
+      <button>
+        <legend>Cancel</legend>
+        <border>2</border>
+        <equal>true</equal>
+        <key>Esc</key>
+        <binding>
+          <command>dialog-close</command>
+        </binding>
+      </button>
+      <empty><stretch>true</stretch></empty>
+    </group>
 
     <visible>
       <property>/sim/terrasync/built-in-svn-available</property>
diff --git a/gui/dialogs/weather-configuration.xml b/gui/dialogs/weather-configuration.xml
index 56e062391..6e213a86e 100644
--- a/gui/dialogs/weather-configuration.xml
+++ b/gui/dialogs/weather-configuration.xml
@@ -44,9 +44,15 @@
     <layout>hbox</layout>
     <default-padding>0</default-padding>
 
+    <!-- gap -->
+    <text>
+      <label> </label>
+    </text>
+
     <!-- Left Column -->
     <group>
       <layout>vbox</layout>
+
       <group>
         <layout>vbox</layout>
         <default-padding>1</default-padding>
@@ -363,7 +369,7 @@
               <name>pressure-sea-level-inhg</name>
               <row>1</row>
               <col>3</col>
-              <pref-width>50</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
               <live>true</live>
               <binding>
@@ -382,6 +388,9 @@
         </group>
       </group>
       <!-- Precipitation End  -->
+      <empty>
+        <stretch>true</stretch>
+      </empty>
     </group>
     <!-- Left Column End -->
 
@@ -401,7 +410,7 @@
         <group>
           <layout>hbox</layout>
           <text>
-            <label>Aloft (All Altitudes ft-AMSL)</label>
+            <label> Aloft (All Altitudes ft-AMSL)</label>
           </text>
           <hrule>
             <stretch>true</stretch>
@@ -410,12 +419,16 @@
 
         <group>
           <layout>hbox</layout>
+          <!-- gap -->
+          <text>
+            <label> </label>
+          </text>
           <group>
             <layout>table</layout>
             <text>
               <row>0</row>
               <col>0</col>
-              <label>Altitude</label>
+              <label>Altitude </label>
             </text>
 
             <text>
@@ -453,7 +466,7 @@
               <name>aloft-4-elevation-ft</name>
               <row>1</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/aloft/entry[4]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -466,7 +479,7 @@
               <name>aloft-4-wind-from-heading-deg</name>
               <row>1</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -479,7 +492,7 @@
               <name>aloft-4-wind-speed-kt</name>
               <row>1</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -492,7 +505,7 @@
               <name>aloft-4-visibility-m</name>
               <row>1</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/aloft/entry[4]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -552,7 +565,7 @@
               <name>aloft-3-elevation-ft</name>
               <row>2</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/aloft/entry[3]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -565,7 +578,7 @@
               <name>aloft-3-wind-from-heading-deg</name>
               <row>2</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -578,7 +591,7 @@
               <name>aloft-3-wind-speed-kt</name>
               <row>2</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -591,7 +604,7 @@
               <name>aloft-3-visibility-m</name>
               <row>2</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/aloft/entry[3]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -651,7 +664,7 @@
               <name>aloft-2-elevation-ft</name>
               <row>3</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/aloft/entry[2]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -664,7 +677,7 @@
               <name>aloft-2-wind-from-heading-deg</name>
               <row>3</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -677,7 +690,7 @@
               <name>aloft-2-wind-speed-kt</name>
               <row>3</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -690,7 +703,7 @@
               <name>aloft-2-visibility-m</name>
               <row>3</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/aloft/entry[2]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -751,7 +764,7 @@
               <name>aloft-1-elevation-ft</name>
               <row>4</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/aloft/entry[1]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -764,7 +777,7 @@
               <name>aloft-1-wind-from-heading-deg</name>
               <row>4</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -777,7 +790,7 @@
               <name>aloft-1-wind-speed-kt</name>
               <row>4</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -790,7 +803,7 @@
               <name>aloft-1-visibility-m</name>
               <row>4</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/aloft/entry[1]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -850,7 +863,7 @@
               <name>aloft-0-elevation-ft</name>
               <row>5</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/aloft/entry[0]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -863,7 +876,7 @@
               <name>aloft-0-wind-from-heading-deg</name>
               <row>5</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -876,7 +889,7 @@
               <name>aloft-0-wind-speed-kt</name>
               <row>5</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -889,7 +902,7 @@
               <name>aloft-0-visibility-m</name>
               <row>5</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/aloft/entry[0]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -962,7 +975,7 @@
         <group>
           <layout>hbox</layout>
           <text>
-            <label>Boundary (All Elevations ft-AGL)</label>
+            <label> Boundary (All Elevations ft-AGL)</label>
           </text>
           <hrule>
             <stretch>true</stretch>
@@ -971,6 +984,10 @@
 
         <group>
           <layout>hbox</layout>
+          <!-- gap -->
+          <text>
+            <label> </label>
+          </text>
           <group>
 
             <layout>table</layout>
@@ -1006,11 +1023,17 @@
               <label>Dewpt (C)</label>
             </text>
 
+            <text>
+              <row>0</row>
+              <col>6</col>
+              <label>Turbulence</label>
+            </text>
+
             <input>
               <name>boundary-1-elevation-ft</name>
               <row>1</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/boundary/entry[1]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -1023,7 +1046,7 @@
               <name>boundary-1-wind-from-heading-deg</name>
               <row>1</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -1036,7 +1059,7 @@
               <name>boundary-1-wind-speed-kt</name>
               <row>1</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -1049,7 +1072,7 @@
               <name>boundary-1-visibility-m</name>
               <row>1</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/boundary/entry[1]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -1109,7 +1132,7 @@
               <name>boundary-0-elevation-ft</name>
               <row>2</row>
               <col>0</col>
-              <pref-width>52</pref-width>
+              <pref-width>70</pref-width>
               <property>/environment/config/boundary/entry[0]/elevation-ft</property>
               <live>true</live>
               <binding>
@@ -1122,7 +1145,7 @@
               <name>boundary-0-wind-from-heading-deg</name>
               <row>2</row>
               <col>1</col>
-              <pref-width>40</pref-width>
+              <pref-width>50</pref-width>
               <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
               <live>true</live>
               <binding>
@@ -1135,7 +1158,7 @@
               <name>boundary-0-wind-speed-kt</name>
               <row>2</row>
               <col>2</col>
-              <pref-width>35</pref-width>
+              <pref-width>45</pref-width>
               <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
               <live>true</live>
               <binding>
@@ -1148,7 +1171,7 @@
               <name>boundary-0-visibility-m</name>
               <row>2</row>
               <col>3</col>
-              <pref-width>55</pref-width>
+              <pref-width>75</pref-width>
               <property>/environment/config/boundary/entry[0]/visibility-m</property>
               <live>true</live>
               <binding>
@@ -1210,6 +1233,9 @@
           </empty>
         </group>
 
+        <empty>
+          <stretch>true</stretch>
+        </empty>
       </group>
       <!-- Boundary  End -->
 
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 771bc76fe..14d15c107 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -332,310 +332,397 @@
   <hrule/>
 
   <group>
-    <layout>vbox</layout>
+    <layout>hbox</layout>
 
-    <text>
-      <halign>left</halign>
-      <label>Select weather engine</label>
-    </text>
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
 
     <group>
-      <layout>hbox</layout>
-      <halign>center</halign>
+      <layout>vbox</layout>
+
+      <text>
+        <halign>left</halign>
+        <label>Select Weather Engine</label>
+      </text>
+
+      <group>
+        <layout>hbox</layout>
+        <halign>left</halign>
+        <group>
+          <layout>table</layout>
+  <!--
+          <pref-width>500</pref-width>
+  -->
+          <radio>
+            <row>0</row>
+            <col>0</col>
+            <halign>left</halign>
+            <name>simple-weather</name>
+            <property>sim/gui/dialogs/metar/mode/global-weather</property>
+            <live>true</live>
+            <label>Basic Weather</label>
+            <binding>
+              <command>property-assign</command>
+              <property>sim/gui/dialogs/metar/mode/global-weather</property>
+              <value>1</value>
+            </binding>
+            <binding>
+              <command>property-assign</command>
+              <property>sim/gui/dialogs/metar/mode/local-weather</property>
+              <value>0</value>
+            </binding>
+            <binding>
+              <command>property-assign</command>
+              <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+              <value>0</value>
+            </binding>
+            <binding>
+              <command>nasal</command>
+              <script>
+                controller.refresh();
+              </script>
+            </binding>
+          </radio>
+          <checkbox>
+            <row>0</row>
+            <col>1</col>
+  					<halign>right</halign>
+            <name>manual-weather-config</name>
+            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+            <label>Manual Configuration</label>
+            <live>true</live>
+            <enable>
+              <property>sim/gui/dialogs/metar/mode/global-weather</property>
+            </enable>
+            <binding>
+              <command>dialog-apply</command>
+              <object-name>manual-weather-config</object-name>
+            </binding>
+            <binding>
+              <command>nasal</command>
+              <script>
+                controller.refresh();
+              </script>
+            </binding>
+          </checkbox>
+
+          <empty>
+            <row>0</row>
+            <col>2</col>
+            <stretch>true</stretch>
+          </empty>
+
+  				<button>
+            <row>0</row>
+            <col>3</col>
+  					<halign>right</halign>
+  <!--
+  					<pref-width>170</pref-width>
+  -->
+  					<legend>Manual Configuration ...</legend>
+  					<enable>
+  						<property>sim/gui/dialogs/metar/mode/manual-weather</property>
+  					</enable>
+  					<binding>
+  						<command>dialog-show</command>
+  						<dialog-name>weather-configuration</dialog-name>
+  					</binding>
+  					<!--<binding>
+  						<command>property-assign</command>
+  						<property>sim/gui/dialogs/metar/mode/manual-weather</property>
+  						<value>1</value>
+  					</binding>-->
+  				</button>
+        </group>
+      </group>
+
+      <textbox>
+        <name>basic description</name>
+        <halign>fill</halign>
+        <stretch>true</stretch>
+  <!--
+        <pref-width>250</pref-width>
+  -->
+        <pref-height>70</pref-height>
+        <slider>15</slider>
+        <editable>false</editable>
+        <wrap>true</wrap>
+        <live>true</live>
+        <top-line>0</top-line>
+        <property>sim/gui/dialogs/metar/description[1]</property>
+      </textbox>
+
+      <group>
+        <layout>hbox</layout>
+        <halign>left</halign>
+        <group>
+          <layout>table</layout>
+  <!--
+          <pref-width>500</pref-width>
+  -->
+          <radio>
+            <row>0</row>
+            <col>0</col>
+            <label>Detailed Weather</label>
+            <halign>left</halign>
+            <name>simple-weather</name>
+            <property>sim/gui/dialogs/metar/mode/local-weather</property>
+            <live>true</live>
+            <binding>
+              <command>property-assign</command>
+              <property>sim/gui/dialogs/metar/mode/local-weather</property>
+              <value>1</value>
+            </binding>
+            <binding>
+              <command>property-assign</command>
+              <property>sim/gui/dialogs/metar/mode/global-weather</property>
+              <value>0</value>
+            </binding>
+            <binding>
+              <command>property-assign</command>
+              <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+              <value>0</value>
+            </binding>
+            <binding>
+              <command>nasal</command>
+              <script>
+                controller.refresh();
+              </script>
+            </binding>
+          </radio>
+
+  				<text>
+            <row>0</row>
+            <col>1</col>
+            <label>                          </label>
+  				</text>
+
+          <empty>
+            <row>0</row>
+            <col>2</col>
+            <stretch>true</stretch>
+          </empty>
+
+  				<button>
+            <row>0</row>
+            <col>3</col>
+  					<legend>  Advanced Settings ...</legend>
+  					<halign>right</halign>
+  <!--
+  					<pref-width>170</pref-width>
+  -->
+  					<enable>
+  						<property>sim/gui/dialogs/metar/mode/local-weather</property>
+  						<value>1</value>
+  					</enable>
+  					<binding>
+  						<command>dialog-show</command>
+  						<dialog-name>local-weather</dialog-name>
+  					</binding>
+  				</button>
+        </group>
+      </group>
+
+      <textbox>
+        <name>advance-description</name>
+        <halign>fill</halign>
+        <stretch>true</stretch>
+  <!--
+        <pref-width>250</pref-width>
+  -->
+        <pref-height>70</pref-height>
+        <slider>15</slider>
+        <editable>false</editable>
+        <wrap>true</wrap>
+        <live>true</live>
+        <top-line>0</top-line>
+        <property>sim/gui/dialogs/metar/description[2]</property>
+      </textbox>
+
+  <!--
       <group>
         <layout>table</layout>
-        <pref-width>500</pref-width>
-        <radio>
-          <row>0</row>
-          <col>0</col>
-          <halign>left</halign>
-          <name>simple-weather</name>
-          <property>sim/gui/dialogs/metar/mode/global-weather</property>
-          <live>true</live>
-          <label>Basic Weather</label>
-          <binding>
-            <command>property-assign</command>
-            <property>sim/gui/dialogs/metar/mode/global-weather</property>
-            <value>1</value>
-          </binding>
-          <binding>
-            <command>property-assign</command>
-            <property>sim/gui/dialogs/metar/mode/local-weather</property>
-            <value>0</value>
-          </binding>
-          <binding>
-            <command>property-assign</command>
-            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
-            <value>0</value>
-          </binding>
-          <binding>
-            <command>nasal</command>
-            <script>
-              controller.refresh();
-            </script>
-          </binding>
-        </radio>
-        <checkbox>
-          <row>0</row>
-          <col>2</col>
-          <name>manual-weather-config</name>
-          <property>sim/gui/dialogs/metar/mode/manual-weather</property>
-          <label>Manually Configure Weather</label>
-          <live>true</live>
-          <enable>
-            <property>sim/gui/dialogs/metar/mode/global-weather</property>
-          </enable>
-          <binding>
-            <command>dialog-apply</command>
-            <object-name>manual-weather-config</object-name>
-          </binding>
-          <binding>
-            <command>nasal</command>
-            <script>
-              controller.refresh();
-            </script>
-          </binding>
-        </checkbox>
-        
-				<button>
-          <row>0</row>
-          <col>3</col>
-					<halign>center</halign>
-					<pref-width>170</pref-width>
-					<legend>Manual Configuration...</legend>
-					<enable>
-						<property>sim/gui/dialogs/metar/mode/manual-weather</property>
-					</enable>
-					<binding>
-						<command>dialog-show</command>
-						<dialog-name>weather-configuration</dialog-name>
-					</binding>
-					<!--<binding>
-						<command>property-assign</command>
-						<property>sim/gui/dialogs/metar/mode/manual-weather</property>
-						<value>1</value>
-					</binding>-->
-				</button>
-        
+
       </group>
+  -->
+      <empty>
+        <stretch>true</stretch>
+      </empty>
+
     </group>
 
-    <textbox>
-      <name>basic description</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>250</pref-width>
-      <pref-height>55</pref-height>
-      <slider>0</slider>
-      <editable>false</editable>
-      <wrap>true</wrap>
-      <live>true</live>
-      <property>sim/gui/dialogs/metar/description[1]</property>
-    </textbox>
-
+    <!-- only for a gap -->
     <group>
-      <layout>hbox</layout>
-      <halign>center</halign>
-      <group>
-        <layout>table</layout>
-        <pref-width>500</pref-width>
-        
-        <radio>
-          <row>0</row>
-          <col>0</col>
-          <halign>left</halign>
-          <name>simple-weather</name>
-          <property>sim/gui/dialogs/metar/mode/local-weather</property>
-          <live>true</live>
-          <label>Detailed Weather</label>
-          <binding>
-            <command>property-assign</command>
-            <property>sim/gui/dialogs/metar/mode/local-weather</property>
-            <value>1</value>
-          </binding>
-          <binding>
-            <command>property-assign</command>
-            <property>sim/gui/dialogs/metar/mode/global-weather</property>
-            <value>0</value>
-          </binding>
-          <binding>
-            <command>property-assign</command>
-            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
-            <value>0</value>
-          </binding>
-          <binding>
-            <command>nasal</command>
-            <script>
-              controller.refresh();
-            </script>
-          </binding>
-        </radio>
-
-				<label>
-          <row>0</row>
-          <col>2</col>
-				</label>
-        
-				<button>
-          <row>0</row>
-          <col>3</col>
-					<halign>right</halign>
-					<pref-width>170</pref-width>
-					<legend>Advanced Settings...</legend>
-					<enable>
-						<property>sim/gui/dialogs/metar/mode/local-weather</property>
-						<value>1</value>
-					</enable>
-					<binding>
-						<command>dialog-show</command>
-						<dialog-name>local-weather</dialog-name>
-					</binding>
-				</button>
-      </group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
     </group>
 
-    <textbox>
-      <name>advance-description</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>250</pref-width>
-      <pref-height>55</pref-height>
-      <slider>0</slider>
-      <editable>false</editable>
-      <wrap>true</wrap>
-      <live>true</live>
-      <property>sim/gui/dialogs/metar/description[2]</property>
-    </textbox>
-
-    <group>
-      <layout>table</layout>
-
-    </group>
-
-    <empty>
-      <stretch>true</stretch>
-    </empty>
-
   </group>
 
-
-
   <hrule/>
 
   <group>
-    <layout>vbox</layout>
+    <layout>hbox</layout>
 
+    <!-- only for a gap -->
     <group>
-      <layout>table</layout>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
       <text>
-        <row>0</row>
-        <col>0</col>
-        <label>Weather Conditions</label>
+        <label> </label>
       </text>
-      <combo>
-        <row>0</row>
-        <col>1</col>
-        <name>source-selection</name>
-        <halign>fill</halign>
-        <stretch>true</stretch>
-        <pref-width>400</pref-width>
-        <property>sim/gui/dialogs/metar/source-selection</property>
-        <enable>
-          <equals>
-            <property>sim/gui/dialogs/metar/mode/manual-weather</property>
-            <value>0</value>
-          </equals>
-        </enable>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>source-selection</object-name>
-        </binding>
-        <binding>
-          <command>dialog-update</command>
-          <object-name>metar-string</object-name>
-        </binding>
-      </combo>
-
     </group>
 
     <group>
-      <layout>hbox</layout>
-      <text>
-        <label>METAR Data</label>
-      </text>
-      <empty>
-        <stretch>true</stretch>
-      </empty>
-      <text>
-        <label>Data is valid</label>
-      </text>
-      <checkbox>
-        <property>/environment/metar/valid</property>
-        <label/>
-        <live>true</live>
-        <enable>
-          <false/>
-        </enable>
-      </checkbox>
-    </group>
+      <layout>vbox</layout>
+      <halign>left</halign>
+
+      <group>
+        <layout>hbox</layout>
+        <halign>left</halign>
+        <group>
+          <layout>table</layout>
+          <text>
+            <row>0</row>
+            <col>0</col>
+            <label>Weather Conditions</label>
+            <halign>left</halign>
+          </text>
+          <text>
+            <row>0</row>
+            <col>1</col>
+            <label>      </label>
+            <halign>left</halign>
+          </text>
+          <combo>
+            <row>0</row>
+            <col>2</col>
+            <name>source-selection</name>
+            <halign>fill</halign>
+            <stretch>true</stretch>
+            <pref-width>300</pref-width>
+            <property>sim/gui/dialogs/metar/source-selection</property>
+            <enable>
+              <equals>
+                <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+                <value>0</value>
+              </equals>
+            </enable>
+            <binding>
+              <command>dialog-apply</command>
+              <object-name>source-selection</object-name>
+            </binding>
+            <binding>
+              <command>dialog-update</command>
+              <object-name>metar-string</object-name>
+            </binding>
+          </combo>
+        </group>
+      </group>
+
+      <group>
+        <layout>hbox</layout>
+        <text>
+          <label>METAR Data</label>
+        </text>
+        <empty>
+          <stretch>true</stretch>
+        </empty>
+        <text>
+          <label>                                              </label>
+        </text>
+        <text>
+          <label>Data is valid</label>
+        </text>
+        <checkbox>
+          <property>/environment/metar/valid</property>
+          <label/>
+          <live>true</live>
+          <enable>
+            <false/>
+          </enable>
+        </checkbox>
+      </group>
+
+      <group>
+        <layout>hbox</layout>
+        <textbox>
+          <name>metar-string</name>
+          <halign>fill</halign>
+          <stretch>true</stretch>
+  <!--
+          <pref-width>250</pref-width>
+  -->
+          <pref-height>70</pref-height>
+          <slider>15</slider>
+          <editable>false</editable>
+          <wrap>true</wrap>
+          <live>true</live>
+          <top-line>0</top-line>
+          <property>sim/gui/dialogs/metar/metar-string</property>
+          <enable>
+            <and>
+              <equals>
+                <property>sim/gui/dialogs/metar/mode/manual-weather</property>
+                <value>0</value>
+              </equals>
+              <equals>
+                <property>sim/gui/dialogs/metar/source-selection</property>
+                <value>Manual input</value>
+              </equals>
+            </and>
+          </enable>
+          <binding>
+            <command>dialog-apply</command>
+            <object-name>metar-string</object-name>
+          </binding>
+        </textbox>
+      </group>
+
+      <group>
+        <layout>hbox</layout>
+        <text>
+          <label>Description</label>
+        </text>
+        <empty>
+          <stretch>true</stretch>
+        </empty>
+      </group>
 
-    <group>
-      <layout>hbox</layout>
       <textbox>
-        <name>metar-string</name>
+        <name>description</name>
         <halign>fill</halign>
         <stretch>true</stretch>
-        <pref-width>250</pref-width>
-        <pref-height>60</pref-height>
-        <editable>true</editable>
+        <pref-width>450</pref-width>
+        <pref-height>100</pref-height>
+        <slider>15</slider>
+        <editable>false</editable>
         <wrap>true</wrap>
-        <live>false</live>
-        <slider>false</slider>
-        <property>sim/gui/dialogs/metar/metar-string</property>
-        <enable>
-          <and>
-            <equals>
-              <property>sim/gui/dialogs/metar/mode/manual-weather</property>
-              <value>0</value>
-            </equals>
-            <equals>
-              <property>sim/gui/dialogs/metar/source-selection</property>
-              <value>Manual input</value>
-            </equals>
-          </and>
-        </enable>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>metar-string</object-name>
-        </binding>
+        <live>true</live>
+        <top-line>0</top-line>
+        <property>sim/gui/dialogs/metar/description[0]</property>
       </textbox>
+
     </group>
 
+    <!-- only for a gap -->
     <group>
-      <layout>hbox</layout>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
       <text>
-        <label>Description</label>
+        <label> </label>
       </text>
-      <empty>
-        <stretch>true</stretch>
-      </empty>
     </group>
 
-    <textbox>
-      <name>description</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>250</pref-width>
-      <pref-height>150</pref-height>
-      <slider>0</slider>
-      <editable>false</editable>
-      <wrap>true</wrap>
-      <live>true</live>
-      <property>sim/gui/dialogs/metar/description[0]</property>
-    </textbox>
-
-
-
   </group>
 
   <hrule/>
@@ -648,6 +735,7 @@
 
     <button>
       <legend>OK</legend>
+      <equal>true</equal>
       <binding>
         <command>dialog-apply</command>
         <object-name>metar-string</object-name>
@@ -665,6 +753,7 @@
 
     <button>
       <legend>Apply</legend>
+      <equal>true</equal>
       <binding>
         <command>dialog-apply</command>
         <object-name>metar-string</object-name>
@@ -679,6 +768,7 @@
 
     <button>
       <legend>Close</legend>
+      <equal>true</equal>
       <default>true</default>
       <key>Esc</key>
       <binding>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 1baac7008..7589a3a2d 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -753,6 +753,14 @@
 			<enabled>false</enabled>
 		</item>
 
+		<item>
+			<name>cycle-gui</name>
+			<binding>
+				<command>nasal</command>
+				<script>gui.nextStyle()</script>
+			</binding>
+		</item>
+
 	</menu>
 
 	<menu>