diff --git a/gui/dialogs/earthview.xml b/gui/dialogs/earthview.xml
index 695d4d74c..c0717c80f 100644
--- a/gui/dialogs/earthview.xml
+++ b/gui/dialogs/earthview.xml
@@ -2,13 +2,9 @@
 
 <PropertyList>
 
-
-
  <name>earthview</name>
  <layout>vbox</layout>
  <default-padding>3</default-padding>
- <!--<width>150</width>
- <height>50</height>-->
  <modal>false</modal>
 
    <group>
@@ -42,107 +38,115 @@
   <hrule/>
  
   <group>
-  <layout>table</layout>
+    <layout>hbox</layout>
+
+      <!-- gap -->
+      <text>
+        <label> </label>
+      </text>
+
+    <group>
+      <layout>vbox</layout>
+      <checkbox>
+     	  <name>cloudsphere-flag</name>
+        <row>0</row>
+        <col>1</col>
+        <label> Show cloud layer</label>
+        <halign>left</halign>
+        <property>/earthview/cloudsphere-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+  	      <object-name>cloudsphere-flag</object-name>
+         </binding>
+      </checkbox>
+      <checkbox>
+        <enable><property>/earthview/cloudsphere-flag</property></enable>
+        <name>cloud-shadow-flag</name>
+        <row>1</row>
+        <col>1</col>
+        <label> Show cloud shadows</label>
+        <halign>left</halign>
+        <property>/earthview/cloud-shadow-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+  	      <object-name>cloud-shadow-flag</object-name>
+  	      <script>
+  		      if(getprop("/earthview/cloud-shadow-flag")==1) {setprop("/earthview/cloudsphere-angle",0.0);}
+  	      </script>
+        </binding>
+      </checkbox>
+      <checkbox>
+        <row>2</row>
+        <col>1</col>
+        <label> Automatic light scattering</label>
+        <halign>left</halign>
+        <property>/earthview/mrd-flag</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
+
+    </group>
+  </group>
+
+  <group>
+    <layout>hbox</layout>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+    <button>
+      <row>3</row>
+      <col>1</col>
+      <legend>  Start  </legend>
+      <equal>true</equal>
+      <binding>
+        <command>nasal</command>
+        <script>earthview.start()</script>
+      </binding>
+    </button>
  
-   <text>
-   <row>0</row>
-   <col>0</col>
-   <halign>right</halign>
-   <label>Show cloud layer</label>
-   </text>
+    <button>
+      <row>3</row>
+      <col>2</col>
+      <legend>  Stop  </legend>
+      <equal>true</equal>
+      <binding>
+        <command>nasal</command>
+        <script>earthview.stop()</script>
+      </binding>
+    </button>
+    <empty>
+      <stretch>true</stretch>
+    </empty>
 
-   <checkbox>
-   	<name>cloudsphere-flag</name>
-   <row>0</row>
-   <col>1</col>
-   <halign>left</halign>
-   <property>/earthview/cloudsphere-flag</property>
-   <binding>
-     <command>dialog-apply</command>
-	 <object-name>cloudsphere-flag</object-name>
-    </binding>
-    </checkbox>
-	
-   <text>
-   <enable><property>/earthview/cloudsphere-flag</property></enable>
-   <row>1</row>
-   <col>0</col>
-   <halign>right</halign>
-   <label>Show cloud shadows</label>
-   </text>
-
-   <checkbox>
-   <enable><property>/earthview/cloudsphere-flag</property></enable>
-   <name>cloud-shadow-flag</name>
-   <row>1</row>
-   <col>1</col>
-   <halign>left</halign>
-   <property>/earthview/cloud-shadow-flag</property>
-   <binding>
-     <command>dialog-apply</command>
-	 <object-name>cloud-shadow-flag</object-name>
-	 <script>
-		if(getprop("/earthview/cloud-shadow-flag")==1) {setprop("/earthview/cloudsphere-angle",0.0);}
-	</script>
-    </binding>
-    </checkbox>
-	
-   <text>
-   <row>2</row>
-   <col>0</col>
-   <halign>right</halign>
-   <label>Automatic light scattering</label>
-   </text>
-
-   <checkbox>
-   <row>2</row>
-   <col>1</col>
-   <halign>left</halign>
-   <property>/earthview/mrd-flag</property>
-   <binding>
-     <command>dialog-apply</command>
-    </binding>
-    </checkbox>
-  
-   <button>
-   <row>3</row>
-   <col>0</col>
-   <legend>Start</legend>
-   <equal>true</equal>
-   <binding>
-    <command>nasal</command>
-    <script>earthview.start()</script>
-   </binding>
-  </button>
- 
-  <button>
-   <row>3</row>
-   <col>1</col>
-   <legend>Stop</legend>
-   <equal>true</equal>
-   <binding>
-    <command>nasal</command>
-    <script>earthview.stop()</script>
-   </binding>
-  </button>
-  
-  <button>
-   <row>3</row>
-   <col>2</col>
-   <legend>Cancel</legend>
-   <equal>true</equal>
-   <key>Esc</key>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
-  
   </group>
   
+  <group>
+    <layout>hbox</layout>
+    <default-padding>1</default-padding>
+    <!-- gap -->
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+  </group>
+
   <group>
 		<layout>hbox</layout>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
 		<text>
-			<label>Cloudsphere rotation</label>
+			<label>Cloudsphere Rotation</label>
 			<halign>left</halign>
 		</text>
 		<hrule>
@@ -153,6 +157,12 @@
   <group>
 		<layout>hbox</layout>
 		<halign>right</halign>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
 		<text>
 			<enable><not><property>/earthview/cloud-shadow-flag</property></not></enable>
 			<label>Rotation angle</label>
@@ -178,10 +188,25 @@
 		</text>
 	</group>
  
- <group>
+  <group>
+    <layout>hbox</layout>
+    <default-padding>1</default-padding>
+    <!-- gap -->
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+  </group>
+
+  <group>
 		<layout>hbox</layout>
+
+    <!-- gap -->
+    <text>
+      <label></label>
+    </text>
+
 		<text>
-			<label>Atmospheric effects</label>
+			<label>Atmospheric Effects</label>
 			<halign>left</halign>
 		</text>
 		<hrule>
@@ -192,6 +217,12 @@
 	<group>
 		<layout>hbox</layout>
 		<halign>right</halign>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 		<text>
 			<enable><not><property>/earthview/mrd-flag</property></not></enable>
 			<label>Mie factor</label>
@@ -215,11 +246,23 @@
 			<live>true</live>
 			<property>/sim/rendering/mie</property>
 		</text>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 	</group>
 
 	<group>
 		<layout>hbox</layout>
 		<halign>right</halign>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 		<text>
 			<enable><not><property>/earthview/mrd-flag</property></not></enable>
 			<label>Rayleigh factor</label>
@@ -242,11 +285,23 @@
 			<live>true</live>
 			<property>/sim/rendering/rayleigh</property>
 		</text>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 	</group>
 
 	<group>
 		<layout>hbox</layout>
 		<halign>right</halign>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 		<text>
 			<enable><not><property>/earthview/mrd-flag</property></not></enable>
 			<label>Density factor</label>
@@ -269,11 +324,23 @@
 			<live>true</live>
 			<property>/sim/rendering/dome-density</property>
 		</text>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 	</group>
 	
 	<group>
 		<layout>hbox</layout>
 		<halign>right</halign>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 		<text>
 			<label>Visibility</label>
 		</text>
@@ -295,38 +362,45 @@
 			<live>true</live>
 			<property>/environment/visibility-m</property>
 		</text>
+
+    <!-- gap -->
+    <text>
+      <label>  </label>
+    </text>
+
 	</group>
-<!--<button>
-   <x>10</x>
-   <y>10</y>
-   <legend>Start</legend>
-   <equal>true</equal>
-   <binding>
-    <command>nasal</command>
-    <script>earthview.start()</script>
-   </binding>
-  </button>
 
-<button>
-   <x>50</x>
-   <y>10</y>
-   <legend>Stop</legend>
-   <equal>true</equal>
- <binding>
-    <command>nasal</command>
-    <script>earthview.stop()</script>
-   </binding>
-  </button>
+  <group>
+    <layout>hbox</layout>
+    <default-padding>1</default-padding>
+    <!-- gap -->
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+  </group>
 
- <button>
-   <x>90</x>
-   <y>10</y>
-   <legend>Cancel</legend>
-   <equal>true</equal>
-   <key>Esc</key>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>-->
+  <hrule/>
+
+  <group>
+    <layout>hbox</layout>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+    <button>
+      <legend>Cancel</legend>
+      <equal>true</equal>
+      <key>Esc</key>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>-->
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+  </group>
 
 </PropertyList>
diff --git a/gui/dialogs/environment-settings.xml b/gui/dialogs/environment-settings.xml
index 0f96386ff..55a320280 100644
--- a/gui/dialogs/environment-settings.xml
+++ b/gui/dialogs/environment-settings.xml
@@ -40,16 +40,18 @@
 
   <group>
     <layout>table</layout>
-    
+    <default-padding>5</default-padding>
+
     <text>
       <row>0</row>
       <col>0</col>
-      <label>Ground textures:</label>
-      <halign>right</halign>
+      <label>  Ground Textures:</label>
+      <halign>left</halign>
     </text>
     <combo>
       <row>0</row>
       <col>1</col>
+      <pref-width>90</pref-width>
       <name>season</name>
       <halign>left</halign>
       <live>true</live>
@@ -78,32 +80,38 @@
   
     
   <group>
-    <layout>table</layout>
-    
+    <layout>vbox</layout>
+    <halign>left</halign>
+
     <text>
-      <row>0</row>
-      <col>0</col>
-      <colspan>4</colspan>
-      <halign>left</halign>
-      <label>Ground conditions (requires shaders effects)</label>
+      <label>  Ground conditions (require shader effects)</label>
     </text>
     
-    <checkbox>
-      <row>1</row>
-      <col>0</col>
-      <colspan>4</colspan>
+    <group>
+      <layout>hbox</layout>
       <halign>left</halign>
-      <label>Set maximum snow level from METAR</label>
-      <name>metar-snow</name>
-      <property>/environment/params/metar-updates-snow-level</property>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>metar-snow</object-name>
-      </binding>
-    </checkbox>
-    
+      <text>
+        <label> </label>
+        <halign>left</halign>
+      </text>
+
+      <checkbox>
+        <label> Set maximum snow level from METAR</label>
+        <name>metar-snow</name>
+        <property>/environment/params/metar-updates-snow-level</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>metar-snow</object-name>
+        </binding>
+      </checkbox>
+    </group>
+  </group>
+
+  <group>
+    <layout>table</layout>
+
     <text>
-      <label>Snow line</label>
+      <label>  Snow line</label>
       <halign>left</halign>
       <row>2</row>
       <col>0</col>
@@ -151,7 +159,7 @@
       <enable>
        <property>/sim/rendering/shaders/skydome</property>
       </enable>
-      <label>Snow thickness</label>
+      <label>  Snow thickness</label>
       <halign>left</halign>
       <row>3</row>
       <col>0</col>
@@ -199,7 +207,7 @@
     <enable>
      <property>/sim/rendering/shaders/skydome</property>
      </enable>
-     <label>Ice cover</label>
+     <label>  Ice cover</label>
      <halign>left</halign>
      <row>4</row>
      <col>0</col>
@@ -248,7 +256,7 @@
       <enable>
        <property>/sim/rendering/shaders/skydome</property>
       </enable>
-      <label>Dust cover</label>
+      <label>  Dust cover</label>
       <halign>left</halign>
       <row>5</row>
       <col>0</col>
@@ -295,7 +303,7 @@
       <enable>
        <property>/sim/rendering/shaders/skydome</property>
       </enable>
-      <label>Wetness</label>
+      <label>  Wetness</label>
       <halign>left</halign>
       <row>6</row>
       <col>0</col>
@@ -343,7 +351,7 @@
       <enable>
        <property>/sim/rendering/shaders/skydome</property>
       </enable>
-      <label>Vegetation</label>
+      <label>  Vegetation</label>
       <halign>left</halign>
       <row>7</row>
       <col>0</col>
@@ -391,7 +399,7 @@
       <enable>
        <property>/sim/rendering/shaders/skydome</property>
       </enable>
-      <label>Season (experimental)</label>
+      <label>  Season (experimental)</label>
       <halign>left</halign>
       <row>8</row>
       <col>0</col>
@@ -434,11 +442,11 @@
       <col>3</col>
     </text>
 
- <text>
+    <text>
       <enable>
        <property>/sim/rendering/shaders/skydome</property>
       </enable>
-      <label>Moonlight</label>
+      <label>  Moonlight</label>
       <halign>left</halign>
       <row>9</row>
       <col>0</col>
diff --git a/gui/dialogs/fgcom.xml b/gui/dialogs/fgcom.xml
index a6729e48d..c1832c479 100644
--- a/gui/dialogs/fgcom.xml
+++ b/gui/dialogs/fgcom.xml
@@ -103,13 +103,25 @@
     <button>
       <pref-width>16</pref-width>
       <pref-height>16</pref-height>
-      <border>1</border>
+      <border>2</border>
       <legend>?</legend>
       <binding>
         <command>open-browser</command>
         <path>http://wiki.flightgear.org/FGCom_3.0</path>
       </binding>
     </button>
+
+    <button>
+      <legend/>
+      <key>Esc</key>
+      <pref-width>16</pref-width>
+      <pref-height>16</pref-height>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+
   </group>
   <hrule/>
 
@@ -154,7 +166,7 @@
     <text>
       <row>1</row>
       <col>0</col>
-      <label>Display messages:</label>
+      <label>  Display messages:</label>
       <halign>right</halign>
     </text>
     <checkbox>
@@ -254,7 +266,7 @@
     <text>
       <row>5</row>
       <col>0</col>
-      <label>Speaker Volume:</label>
+      <label>Speaker volume:</label>
       <halign>right</halign>
     </text>
     <slider>
@@ -446,6 +458,18 @@
 
     <text>
       <label>Server</label>
+      <enable>
+        <and>
+          <equals>
+            <property>/sim/fgcom/enabled</property>
+            <value>1</value>
+          </equals>
+          <equals>
+            <property>/sim/fgcom/test</property>
+            <value>0</value>
+          </equals>
+        </and>
+      </enable>
     </text>
 
     <empty>
@@ -455,16 +479,15 @@
 
   <group>
     <layout>table</layout>
-    <halign>left</halign>
-
-
+    <halign>center</halign>
+    <default-padding>10</default-padding>
 
     <combo>
       <name>server</name>
       <row>1</row>
       <col>0</col>
       <colspan>6</colspan>
-      <pref-width>275</pref-width>
+      <pref-width>350</pref-width>
       <editable>false</editable>
       <property>/sim/fgcom/selected-server</property>
       <properties>/sim/gui/dialogs/multiplay/fgcom-servers</properties>
@@ -511,7 +534,7 @@
   <hrule/>
   <group>
     <layout>hbox</layout>
-    <default-padding>10</default-padding>
+    <default-padding>5</default-padding>
     <empty>
       <stretch>true</stretch>
     </empty>
@@ -520,7 +543,6 @@
       <legend>Close</legend>
       <default>true</default>
       <equal>true</equal>
-      <border>1</border>
       <binding>
         <command>dialog-close</command>
       </binding>
diff --git a/gui/dialogs/gps.xml b/gui/dialogs/gps.xml
index 151cb2caf..9840c6091 100644
--- a/gui/dialogs/gps.xml
+++ b/gui/dialogs/gps.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <PropertyList>
+<!-- mhab improve layout
     <width>620</width>
     <height>430</height>
+-->
     <modal>false</modal>
     <nasal>
         <open><![CDATA[
@@ -147,6 +149,7 @@
     </nasal>
     <name>gps</name>
     <layout>vbox</layout>
+    <default-padding>3</default-padding>
     <group>
       <layout>hbox</layout>
       <empty><stretch>1</stretch></empty>
@@ -172,9 +175,35 @@
     <!-- show current state -->
     <group>
         <layout>table</layout>
+
+        <!-- only to get a gap to left border -->
+        <text>
+          <row>0</row>
+          <col>0</col>
+          <label> </label>
+          <halign>left</halign>
+        </text>
+
+        <!-- only to get a gap between  row 1-3 -->
+        <text>
+          <row>0</row>
+          <col>2</col>
+          <label> </label>
+          <halign>left</halign>
+        </text>
+
+        <!-- only to get a gap between row 3-5 -->
+        <text>
+          <row>0</row>
+          <col>4</col>
+          <label> </label>
+          <halign>left</halign>
+        </text>
+
         <text>
             <row>0</row>
-            <col>0</col>
+            <col>1</col>
+            <halign>left</halign>
             <label>MMMM</label>
             <format>Mode: %s</format>
             <property>/instrumentation/gps/mode</property>
@@ -188,8 +217,9 @@
                 </equals>
             </visible>
             <row>0</row>
-            <col>1</col>
+            <col>2</col>
             <label>MMM</label>
+            <halign>left</halign>
             <format>Current Route Wp: %03d</format>
             <property>/autopilot/route-manager/current-wp</property>
             <live>true</live>
@@ -204,80 +234,90 @@
                 </not>
             </visible>
             <row>0</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMM</label>
-            <format>Desired Course: %5.1f*</format>
+            <halign>left</halign>
+            <format>Desired course: %5.1f*</format>
             <property>/instrumentation/gps/desired-course-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>0</row>
-            <col>2</col>
+            <col>5</col>
             <label>MMM</label>
+            <halign>left</halign>
             <format>Xtrack: %5.2fnm</format>
             <property>/instrumentation/gps/wp/wp[1]/course-error-nm</property>
             <live>true</live>
         </text>
         <text>
             <row>1</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Longitude: %6.3f</format>
             <property>/instrumentation/gps/indicated-longitude-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>1</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Latitude: %6.3f</format>
             <property>/instrumentation/gps/indicated-latitude-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>1</row>
-            <col>2</col>
+            <col>5</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Altitude: %6.0fft</format>
             <property>/instrumentation/gps/indicated-altitude-ft</property>
             <live>true</live>
         </text>
         <text>
             <row>2</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMM</label>
+            <halign>left</halign>
             <format>Groundspeed: %4.0fkts</format>
             <property>/instrumentation/gps/indicated-ground-speed-kt</property>
             <live>true</live>
         </text>
         <text>
             <row>2</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMM</label>
+            <halign>left</halign>
             <format>Track: %3.0f*</format>
             <property>/instrumentation/gps/indicated-track-magnetic-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>2</row>
-            <col>2</col>
+            <col>5</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>VS: %4.0ffpm</format>
             <property>/instrumentation/gps/indicated-vertical-speed</property>
             <live>true</live>
         </text>
         <text>
             <row>3</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMM</label>
+            <halign>left</halign>
             <format>Odometer: %4.1fnm</format>
             <property>/instrumentation/gps/odometer</property>
             <live>true</live>
         </text>
         <text>
             <row>3</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMMM</label>
+            <halign>left</halign>
             <format>RAIM: %3.2f</format>
             <property>/instrumentation/gps/raim</property>
             <live>true</live>
@@ -285,41 +325,46 @@
         <!-- mode dependent properties -->
         <text>
             <row>4</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Ident: %s</format>
             <property>/instrumentation/gps/wp/wp[1]/ID</property>
             <live>true</live>
         </text>
         <text>
             <row>4</row>
-            <col>1</col>
+            <col>3</col>
             <colspan>2</colspan>
             <label>MMMMMMMMMMM</label>
+            <halign>left</halign>
             <format>Name: %s</format>
             <property>/instrumentation/gps/wp/wp[1]/name</property>
             <live>true</live>
         </text>
         <text>
             <row>5</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Longitude: %6.3f</format>
             <property>/instrumentation/gps/wp/wp[1]/longitude-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>5</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Latitude: %6.3f</format>
             <property>/instrumentation/gps/wp/wp[1]/latitude-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>5</row>
-            <col>2</col>
+            <col>5</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Altitude: %6.0fft</format>
             <property>/instrumentation/gps/wp/wp[1]/altitude-ft</property>
             <live>true</live>
@@ -327,24 +372,27 @@
         <!-- distance / bearing info -->
         <text>
             <row>6</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Bearing: %3.0f</format>
             <property>/instrumentation/gps/wp/wp[1]/bearing-mag-deg</property>
             <live>true</live>
         </text>
         <text>
             <row>6</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Distance: %5.2fnm</format>
             <property>/instrumentation/gps/wp/wp[1]/distance-nm</property>
             <live>true</live>
         </text>
         <text>
             <row>6</row>
-            <col>2</col>
+            <col>5</col>
             <label>MMMMMMMM</label>
+            <halign>left</halign>
             <format>TTW: %s</format>
             <property>/instrumentation/gps/wp/wp[1]/TTW</property>
             <live>true</live>
@@ -357,8 +405,9 @@
                 </equals>
             </visible>
             <row>7</row>
-            <col>0</col>
+            <col>1</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Leg Course: %3.0f</format>
             <property>/instrumentation/gps/wp/leg-mag-course-deg</property>
             <live>true</live>
@@ -371,8 +420,9 @@
                 </equals>
             </visible>
             <row>7</row>
-            <col>1</col>
+            <col>3</col>
             <label>MMMMMM</label>
+            <halign>left</halign>
             <format>Leg Distance: %5.1fnm</format>
             <property>/instrumentation/gps/wp/leg-distance-nm</property>
             <live>true</live>
@@ -386,8 +436,9 @@
                 <property>/instrumentation/gps/to-flag</property>
             </visible>
             <row>7</row>
-            <col>0</col>
+            <col>1</col>
             <label>TO</label>
+            <halign>left</halign>
         </text>
         <text>
             <visible>
@@ -398,14 +449,26 @@
                 <property>/instrumentation/gps/from-flag</property>
             </visible>
             <row>7</row>
-            <col>0</col>
+            <col>1</col>
             <label>FROM</label>
+            <halign>left</halign>
         </text>
+
+        <!-- only to get a gap to right border -->
+        <text>
+          <row>0</row>
+          <col>6</col>
+          <label> </label>
+          <halign>left</halign>
+        </text>
+
     </group>
+
     <hrule/>
+
     <!--  ident text field, type combo, next/prev paging buttons
 		nearest and search buttons
-	-->
+	  -->
     <group>
         <layout>hbox</layout>
         <valign>fill</valign>
@@ -414,11 +477,16 @@
             <group>
                 <layout>hbox</layout>
                 <valign>fill</valign>
+                <halign>left</halign>
                 <text>
-                    <label>Type:</label>
+                    <label>     Type:</label>
+                    <halign>left</halign>
+<!--
                     <pref-width>80</pref-width>
+-->
                 </text>
                 <combo>
+                    <pref-width>100</pref-width>
                     <name>searchType</name>
                     <property>/sim/gui/dialogs/gps/search-type</property>
                     <value>any</value>
@@ -439,8 +507,11 @@
                 <layout>hbox</layout>
                 <valign>fill</valign>
                 <text>
-                    <label>Search:</label>
+                    <label>  Search:</label>
+                    <halign>left</halign>
+<!--
                     <pref-width>80</pref-width>
+-->
                 </text>
                 <input>
                     <name>search-query</name>
@@ -453,10 +524,20 @@
                         <command>dialog-apply</command>
                     </binding>
                 </input>
+                <!-- only to get a gap -->
+                <text>
+                  <label> </label>
+                  <halign>left</halign>
+                </text>
             </group>
             <group>
                 <layout>hbox</layout>
                 <valign>fill</valign>
+                <!-- only to get a gap -->
+                <text>
+                  <label> </label>
+                  <halign>left</halign>
+                </text>
                 <button>
                     <legend>Search</legend>
                     <binding>
@@ -493,129 +574,159 @@
                 </empty>
             </group>
         </group>
+
         <vrule/>
+
         <group>
             <visible>
                 <property>/sim/gui/dialogs/gps/scratch/valid</property>
             </visible>
-            <layout>table</layout>
-            <text>
-                <row>0</row>
-                <col>0</col>
-                <label>MMMMMM</label>
-                <format>Ident: %s</format>
-                <property>/instrumentation/gps/scratch/ident</property>
-                <live>true</live>
-            </text>
-            <text>
-                <row>0</row>
-                <col>1</col>
-                <colspan>2</colspan>
-                <label>MMMMMMMMMMM</label>
-                <format>Name: %s</format>
-                <property>/instrumentation/gps/scratch/name</property>
-                <live>true</live>
-            </text>
-            <text>
-                <row>1</row>
-                <col>0</col>
-                <label>MMMMMM</label>
-                <format>Lon: %6.3f</format>
-                <property>/instrumentation/gps/scratch/longitude-deg</property>
-                <live>true</live>
-            </text>
-            <text>
-                <row>1</row>
-                <col>1</col>
-                <label>MMMMMM</label>
-                <format>Lat: %6.3f</format>
-                <property>/instrumentation/gps/scratch/latitude-deg</property>
-                <live>true</live>
-            </text>
-            <text>
-                <row>1</row>
-                <col>2</col>
-                <label>MMMMMM</label>
-                <format>Alt: %6.0fft</format>
-                <property>/instrumentation/gps/scratch/altitude-ft</property>
-                <live>true</live>
-            </text>
-            <!-- distance / bearing info -->
-            <text>
-                <row>2</row>
-                <col>0</col>
-                <label>MMMMMM</label>
-                <format>Bearing: %3.0f</format>
-                <property>/sim/gui/dialogs/gps/scratch-mag-bearing-deg</property>
-                <live>true</live>
-            </text>
-            <text>
-                <row>2</row>
-                <col>1</col>
-                <label>MMMMMM</label>
-                <format>Distance: %5.1fnm</format>
-                <property>/sim/gui/dialogs/gps/scratch-distance-nm</property>
-                <live>true</live>
-            </text>
-            <!-- navaid info -->
-            <text>
+            <layout>vbox</layout>
+
+            <group>
                 <visible>
-                    <equals>
-                        <property>/instrumentation/gps/scratch/type</property>
-                        <value>vor</value>
-                    </equals>
+                    <property>/sim/gui/dialogs/gps/scratch/valid</property>
                 </visible>
-                <row>3</row>
-                <col>0</col>
-                <label>MMMMMM</label>
-                <format>Frequency: %5.1fMhz</format>
-                <property>/instrumentation/gps/scratch/frequency-mhz</property>
-                <live>true</live>
-            </text>
-            <text>
+                <layout>table</layout>
+                <text>
+                    <row>0</row>
+                    <col>0</col>
+                    <halign>left</halign>
+                    <label>MMMMMM</label>
+                    <format>Ident: %s</format>
+                    <property>/instrumentation/gps/scratch/ident</property>
+                    <live>true</live>
+                </text>
+                <text>
+                    <row>0</row>
+                    <col>1</col>
+                    <pref-width>250</pref-width>
+                    <colspan>2</colspan>
+                    <halign>left</halign>
+                    <label>MMMMMM</label>
+                    <format>Name: %s</format>
+                    <property>/instrumentation/gps/scratch/name</property>
+                    <live>true</live>
+                </text>
+                <text>
+                    <row>1</row>
+                    <col>0</col>
+                    <halign>left</halign>
+                    <label>MMMMMMMM</label>
+                    <format>Lon: %6.3f</format>
+                    <property>/instrumentation/gps/scratch/longitude-deg</property>
+                    <live>true</live>
+                </text>
+                <text>
+                    <row>1</row>
+                    <col>1</col>
+                    <halign>left</halign>
+                    <label>MMMMMMM</label>
+                    <format>Lat: %6.3f</format>
+                    <property>/instrumentation/gps/scratch/latitude-deg</property>
+                    <live>true</live>
+                </text>
+                <text>
+                    <row>1</row>
+                    <col>2</col>
+                    <halign>left</halign>
+                    <label>MMMMMM</label>
+                    <format>Alt: %6.0fft</format>
+                    <property>/instrumentation/gps/scratch/altitude-ft</property>
+                    <live>true</live>
+                </text>
+                <!-- gap -->
+                <text>
+                    <row>1</row>
+                    <col>3</col>
+                    <halign>left</halign>
+                    <label> </label>
+                </text>
+                <!-- distance / bearing info -->
+                <text>
+                    <row>2</row>
+                    <col>0</col>
+                    <halign>left</halign>
+                    <label>MMMMMM</label>
+                    <format>Bearing: %3.0f</format>
+                    <property>/sim/gui/dialogs/gps/scratch-mag-bearing-deg</property>
+                    <live>true</live>
+                </text>
+                <text>
+                    <row>2</row>
+                    <col>1</col>
+                    <halign>left</halign>
+                    <label>MMMMMM</label>
+                    <format>Distance: %5.1fnm</format>
+                    <property>/sim/gui/dialogs/gps/scratch-distance-nm</property>
+                    <live>true</live>
+                </text>
+                <!-- navaid info -->
+                <text>
+                    <visible>
+                        <equals>
+                            <property>/instrumentation/gps/scratch/type</property>
+                            <value>vor</value>
+                        </equals>
+                    </visible>
+                    <row>3</row>
+                    <col>0</col>
+                    <halign>left</halign>
+                    <label>MMMMMMMMMM</label>
+                    <format>Frequency: %5.1fMhz</format>
+                    <property>/instrumentation/gps/scratch/frequency-mhz</property>
+                    <live>true</live>
+                </text>
+                <text>
+                    <visible>
+                        <equals>
+                            <property>/instrumentation/gps/scratch/type</property>
+                            <value>ndb</value>
+                        </equals>
+                    </visible>
+                    <row>3</row>
+                    <col>0</col>
+                    <halign>left</halign>
+                    <label>MMMMMMMMM</label>
+                    <format>Frequency: %5.1fKhz</format>
+                    <property>/instrumentation/gps/scratch/frequency-khz</property>
+                    <live>true</live>
+                </text>
+            </group>
+            <group>
                 <visible>
-                    <equals>
-                        <property>/instrumentation/gps/scratch/type</property>
-                        <value>ndb</value>
-                    </equals>
+                    <property>/sim/gui/dialogs/gps/scratch/valid</property>
                 </visible>
-                <row>3</row>
-                <col>0</col>
-                <label>MMMMMM</label>
-                <format>Frequency: %5.1fKhz</format>
-                <property>/instrumentation/gps/scratch/frequency-khz</property>
-                <live>true</live>
-            </text>
-            <!-- prev/next buttons -->
-            <button>
-                <enable>
-                    <greater-than>
-                        <property>/sim/gui/dialogs/gps/scratch-index</property>
-                        <value>0</value>
-                    </greater-than>
-                </enable>
-                <row>5</row>
-                <col>0</col>
-                <legend>Prev</legend>
-                <key>left</key>
-                <binding>
-                    <command>nasal</command>
-                    <script>doScratchPrevious()</script>
-                </binding>
-            </button>
-            <button>
-                <enable>
-                    <property>/sim/gui/dialogs/gps/scratch-has-next</property>
-                </enable>
-                <row>5</row>
-                <col>1</col>
-                <legend>Next</legend>
-                <key>right</key>
-                <binding>
-                    <command>nasal</command>
-                    <script>doScratchNext()</script>
-                </binding>
-            </button>
+                <layout>hbox</layout>
+                <!-- prev/next buttons -->
+                <button>
+                    <enable>
+                        <greater-than>
+                            <property>/sim/gui/dialogs/gps/scratch-index</property>
+                            <value>0</value>
+                        </greater-than>
+                    </enable>
+                    <halign>left</halign>
+                    <legend>Prev</legend>
+                    <key>left</key>
+                    <binding>
+                        <command>nasal</command>
+                        <script>doScratchPrevious()</script>
+                    </binding>
+                </button>
+                <button>
+                    <enable>
+                        <property>/sim/gui/dialogs/gps/scratch-has-next</property>
+                    </enable>
+                    <halign>left</halign>
+                    <legend>Next</legend>
+                    <key>right</key>
+                    <binding>
+                        <command>nasal</command>
+                        <script>doScratchNext()</script>
+                    </binding>
+                </button>
+            </group>
         </group>
     </group>
     <hrule/>
@@ -652,8 +763,10 @@
                     <value>obs</value>
                 </equals>
             </visible>
+<!--
             <pref-width>100</pref-width>
-            <label>MMM</label>
+-->
+            <label>MMMMMMMMMMM</label>
             <format>Selected Course: %03d*</format>
             <property>/instrumentation/gps/selected-course-deg</property>
             <live>true</live>
diff --git a/gui/dialogs/hud.xml b/gui/dialogs/hud.xml
index 7d894ef2a..6154cb2bf 100644
--- a/gui/dialogs/hud.xml
+++ b/gui/dialogs/hud.xml
@@ -29,32 +29,50 @@
 
 	<hrule/>
 
-	<checkbox>
-		<label>Enable 3D</label>
-		<halign>left</halign>
-		<property>/sim/hud/enable3d[1]</property>
-		<binding>
-			<command>dialog-apply</command>
-		</binding>
-	</checkbox>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
 
-	<checkbox>
-		<label>Transparent</label>
-		<halign>left</halign>
-		<property>/sim/hud/color/transparent</property>
-		<binding>
-			<command>dialog-apply</command>
-		</binding>
-	</checkbox>
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
 
-	<checkbox>
-		<label>Antialiased</label>
-		<halign>left</halign>
-		<property>/sim/hud/color/antialiased</property>
-		<binding>
-			<command>dialog-apply</command>
-		</binding>
-	</checkbox>
+    <group>
+      <layout>vbox</layout>
+      <halign>left</halign>
+    	<checkbox>
+    		<label>Enable 3D</label>
+    		<halign>left</halign>
+    		<property>/sim/hud/enable3d[1]</property>
+    		<binding>
+    			<command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+
+    	<checkbox>
+    		<label>Transparent</label>
+    		<halign>left</halign>
+    		<property>/sim/hud/color/transparent</property>
+    		<binding>
+    			<command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+
+    	<checkbox>
+    		<label>Antialiased</label>
+    		<halign>left</halign>
+    		<property>/sim/hud/color/antialiased</property>
+    		<binding>
+    			<command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+    </group>
+  </group>
 
 	<hrule/>
 
@@ -63,49 +81,64 @@
 		<halign>center</halign>
 	</text>
 
-	<group>
-		<layout>vbox</layout>
-		<radio>
-			<halign>left</halign>
-			<property>/sim/gui/dialogs/hud/lon-lat-format-0</property>
-			<value>0</value>
-			<live>true</live>
-			<label>Decimal degrees</label>
-			<binding>
-				<command>nasal</command>
-				<script>set_radio(0);</script>
-			</binding>
-		</radio>
-		<radio>
-			<halign>left</halign>
-			<property>/sim/gui/dialogs/hud/lon-lat-format-1</property>
-			<value>1</value>
-			<label>Degrees, minutes</label>
-			<live>true</live>
-			<binding>
-				<command>nasal</command>
-				<script>set_radio(1);</script>
-			</binding>
-		</radio>
-		<radio>
-			<halign>left</halign>
-			<property>/sim/gui/dialogs/hud/lon-lat-format-2</property>
-			<value>2</value>
-			<live>true</live>
-			<label>Degrees, minutes, seconds</label>
-			<binding>
-				<command>nasal</command>
-				<script>set_radio(2);</script>
-			</binding>
-		</radio>
+  <group>
+    <layout>hbox</layout>
+    <halign>left</halign>
+
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
+  	<group>
+  		<layout>vbox</layout>
+  		<radio>
+  			<halign>left</halign>
+  			<property>/sim/gui/dialogs/hud/lon-lat-format-0</property>
+  			<value>0</value>
+  			<live>true</live>
+  			<label>Decimal degrees</label>
+  			<binding>
+  				<command>nasal</command>
+  				<script>set_radio(0);</script>
+  			</binding>
+  		</radio>
+  		<radio>
+  			<halign>left</halign>
+  			<property>/sim/gui/dialogs/hud/lon-lat-format-1</property>
+  			<value>1</value>
+  			<label>Degrees, minutes</label>
+  			<live>true</live>
+  			<binding>
+  				<command>nasal</command>
+  				<script>set_radio(1);</script>
+  			</binding>
+  		</radio>
+  		<radio>
+  			<halign>left</halign>
+  			<property>/sim/gui/dialogs/hud/lon-lat-format-2</property>
+  			<value>2</value>
+  			<live>true</live>
+  			<label>Degrees, minutes, seconds </label>
+  			<binding>
+  				<command>nasal</command>
+  				<script>set_radio(2);</script>
+  			</binding>
+  		</radio>
+  	</group>
 	</group>
 
 	<hrule/>
 
 	<group>
 		<layout>hbox</layout>
+
 		<text>
-			<label>Alpha:</label>
+			<label>  Alpha:</label>
 		</text>
 
 		<empty><stretch>true</stretch></empty>
@@ -117,13 +150,18 @@
 				<command>dialog-apply</command>
 			</binding>
 		</slider>
+
+		<text>
+			<label>  </label>
+		</text>
+
 	</group>
 
 	<group>
 		<name>devel-stuff</name>
 		<layout>hbox</layout>
 		<text>
-			<label>Clamp:</label>
+			<label>  Clamp:</label>
 		</text>
 
 		<empty><stretch>true</stretch></empty>
@@ -135,6 +173,11 @@
 				<command>dialog-apply</command>
 			</binding>
 		</slider>
+
+		<text>
+			<label>  </label>
+		</text>
+
 	</group>
 
 	<hrule><name>devel-stuff</name></hrule>
@@ -142,7 +185,7 @@
 	<group>
 		<layout>hbox</layout>
 		<text>
-			<label>Brightness:</label>
+			<label>  Brightness:</label>
 		</text>
 
 		<empty><stretch>true</stretch></empty>
@@ -155,13 +198,18 @@
 				<command>dialog-apply</command>
 			</binding>
 		</slider>
+
+		<text>
+			<label>  </label>
+		</text>
+
 	</group>
 
 	<group>
 		<name>devel-stuff</name>
 		<layout>hbox</layout>
 		<text>
-			<label>Red:</label>
+			<label>  Red:</label>
 		</text>
 
 		<empty><stretch>true</stretch></empty>
@@ -178,13 +226,18 @@
 				<blue>0.5</blue>
 			</color>
 		</slider>
+
+		<text>
+			<label>  </label>
+		</text>
+
 	</group>
 
 	<group>
 		<name>devel-stuff</name>
 		<layout>hbox</layout>
 		<text>
-			<label>Green:</label>
+			<label>  Green:</label>
 		</text>
 
 		<empty><stretch>true</stretch></empty>
@@ -201,13 +254,18 @@
 				<blue>0.5</blue>
 			</color>
 		</slider>
+
+		<text>
+			<label>  </label>
+		</text>
+
 	</group>
 
 	<group>
 		<name>devel-stuff</name>
 		<layout>hbox</layout>
 		<text>
-			<label>Blue:</label>
+			<label>  Blue:</label>
 		</text>
 
 		<empty><stretch>true</stretch></empty>
@@ -224,6 +282,11 @@
 				<blue>1.0</blue>
 			</color>
 		</slider>
+
+		<text>
+			<label>  </label>
+		</text>
+
 	</group>
 
   <hrule/>
@@ -240,7 +303,7 @@
 	<nasal>
 		<open><![CDATA[
 			gui.enable_widgets(cmdarg(), "devel-stuff", getprop("/sim/gui/devel-widgets"));
-			var radios = cmdarg().getChildren("group")[1].getChildren("radio");
+			var radios = cmdarg().getChildren("group")[2].getChildren("group")[1].getChildren("radio");
 			var set_radio = func(n) {
 				for (var i = 0; i < size(radios); i +=1) {
 					var prop = radios[i].getChild("property").getValue();
diff --git a/gui/dialogs/input-config.xml b/gui/dialogs/input-config.xml
index 5887b413c..c822205ae 100644
--- a/gui/dialogs/input-config.xml
+++ b/gui/dialogs/input-config.xml
@@ -2,6 +2,7 @@
 
 <PropertyList>
   <name>input-config</name>
+  <default-padding>3</default-padding>
 
   <nasal>
     <open>
@@ -26,12 +27,13 @@
   <modal>false</modal>
   <layout>vbox</layout>
 
+  <!-- start group 1 -->
   <group>
     <layout>hbox</layout>
     <empty><stretch>1</stretch></empty>
 
     <text>
-      <label>Input Options</label>
+      <label>Mouse Input Options</label>
     </text>
 
     <empty><stretch>1</stretch></empty>
@@ -50,79 +52,136 @@
 
   <hrule/>
 
-    <group>
-      <halign>center</halign>
-      <valign>top</valign>
+  <!-- start group 2 -->
+  <group>
+    <halign>left</halign>
+    <valign>top</valign>
+    <layout>table</layout>
 
-      <layout>table</layout>
+    <!-- gap to left border -->
+    <text>
+      <halign>left</halign>
+      <label> </label>
+      <row>0</row>
+      <col>0</col>
+    </text>
 
-      <group>
-          <pref-width>600</pref-width>
-          <row>0</row>
-          <col>0</col>
-          <colspan>2</colspan>
+    <text>
+      <halign>left</halign>
+      <label>Pressing TAB cycles the mouse mode through different behaviours </label>
+      <row>0</row>
+      <col>1</col>
+    </text>
+    <text>
+      <label>normal / flight-controls / view direction</label>
+      <row>1</row>
+      <col>1</col>
+    </text>
 
-          <layout>vbox</layout>
+    <text>
+      <halign>left</halign>
+      <label> </label>
+      <row>2</row>
+      <col>1</col>
+    </text>
 
-          <text>
-              <halign>left</halign>
-              <label>Pressing TAB cycles the mouse between different behaviours - normal, flight-controls and look.</label>
-          </text>
-          <text>
-              <halign>left</halign>
-              <label>The right-mouse button can be used in two different ways:</label>
-          </text>
-     </group>
+    <text>
+      <halign>left</halign>
+      <label>The right-mouse button can be used in two different ways:</label>
+      <row>3</row>
+      <col>1</col>
+    </text>
 
+  <!-- end group 2 -->
+  </group>
 
-      <text>
-          <label>Press and hold right mouse to look around</label>
-          <halign>right</halign>
-          <row>1</row>
-          <col>0</col>
-      </text>
-      <radio>
-          <row>1</row>
-          <col>1</col>
-          <property>/sim/gui/dialogs/input-config/right-mouse-look</property>
-          <live>true</live>
-          <binding>
-              <command>nasal</command>
-              <script>rightMouseMode("look")</script>
-          </binding>
-      </radio>
+  <!-- start group 3 -->
+  <group>
+    <halign>left</halign>
+    <valign>top</valign>
+    <layout>table</layout>
 
-      <text>
-          <label>Click right mouse to cycle mouse behaviour</label>
-          <halign>right</halign>
-          <row>2</row>
-          <col>0</col>
-      </text>
-      <radio>
-          <row>2</row>
-          <col>1</col>
-          <property>/sim/gui/dialogs/input-config/right-mouse-cycle</property>
-          <live>true</live>
-          <binding>
-              <command>nasal</command>
-              <script>rightMouseMode("cycle")</script>
-          </binding>
-      </radio>
+    <!-- gap to left border -->
+    <text>
+      <halign>left</halign>
+      <label>   </label>
+      <row>0</row>
+      <col>0</col>
+    </text>
 
-      <checkbox>
-          <row>3</row>
-          <col>0</col>
-          <colspan>2</colspan>
+    <radio>
+      <halign>left</halign>
+      <label> Press and hold right mouse to look around</label>
+      <property>/sim/gui/dialogs/input-config/right-mouse-look</property>
+      <live>true</live>
+      <binding>
+        <command>nasal</command>
+        <script>rightMouseMode("look")</script>
+      </binding>
+      <row>0</row>
+      <col>1</col>
+    </radio>
+
+    <radio>
+      <halign>left</halign>
+      <label> Click right mouse to cycle mouse behaviour</label>
+      <property>/sim/gui/dialogs/input-config/right-mouse-cycle</property>
+      <live>true</live>
+      <binding>
+        <command>nasal</command>
+        <script>rightMouseMode("cycle")</script>
+      </binding>
+      <row>1</row>
+      <col>1</col>
+    </radio>
+
+    <!-- empty line before next -->
+    <text>
+      <row>3</row>
+      <col>0</col>
+      <label> </label>
+      <halign>left</halign>
+    </text>
+
+  <!-- end group 3 -->
+  </group>
+
+  <!-- start group 4 -->
+  <group>
+
+    <halign>left</halign>
+    <valign>top</valign>
+    <layout>table</layout>
+
+    <!-- gap to left border -->
+    <text>
         <halign>left</halign>
-        <label>Disable flight-controls via mouse</label>
-        <property>/sim/mouse/skip-flight-controls-mode</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </checkbox>
+        <label>   </label>
+        <row>0</row>
+        <col>0</col>
+    </text>
 
+    <checkbox>
+      <halign>left</halign>
+      <label> Disable flight-controls via mouse</label>
+      <property>/sim/mouse/skip-flight-controls-mode</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+      <row>0</row>
+      <col>1</col>
+    </checkbox>
 
-    </group>
+    <!-- empty line before next -->
+    <text>
+      <row>1</row>
+      <col>0</col>
+      <label> </label>
+      <halign>left</halign>
+    </text>
+
+  <!-- end group 4 -->
+  </group>
 
   <hrule/>
 
diff --git a/gui/dialogs/instrument-failures.xml b/gui/dialogs/instrument-failures.xml
index 8e67cc9d9..7af81ab52 100644
--- a/gui/dialogs/instrument-failures.xml
+++ b/gui/dialogs/instrument-failures.xml
@@ -34,317 +34,331 @@
     <layout>hbox</layout>
     <halign>left</halign>
     <text>
-      <label>Uncheck an instrument to fail it, or set the Mean Time Between Failures.</label>
+      <label>  Uncheck an instrument to fail it, or set the Mean Time Between Failures.  </label>
     </text>
   </group>
 
   <hrule/>
 
-  <group>
-    <layout>table</layout>
-    <halign>center</halign>
-    <text>
-      <row>0</row>
-      <col>0</col>
-      <label>Instrument</label>
-    </text>
-    <text>
-      <row>0</row>
-      <col>2</col>
-      <label>MTBF (sec)</label>
-    </text>
-
-    <text>
-      <row>0</row>
-      <col>3</col>
-      <label>  </label>
-    </text>
-    <text>
-      <row>0</row>
-      <col>4</col>
-      <label>Instrument</label>
-    </text>
-    <text>
-      <row>0</row>
-      <col>6</col>
-      <label>MTBF (sec)</label>
-    </text>
-
-    <text>
-      <row>1</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>Nav 1 CDI</label>
-    </text>
-
-    <checkbox>
-      <row>1</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/nav[0]/cdi/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>1</row>
-      <col>2</col>
-      <width>80</width>
-      <height>20</height>
-      <property>/sim/failure-manager/instrumentation/nav[0]/cdi/mtbf</property>
-    </input>
-
-    <text>
-      <row>1</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>Nav 2 CDI</label>
-    </text>
-
-    <checkbox>
-      <row>1</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/nav[1]/cdi/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>1</row>
-      <col>6</col>
-      <width>80</width>
-      <height>20</height>
-      <property>/sim/failure-manager/instrumentation/nav[1]/cdi/mtbf</property>
-    </input>
-
-    <text>
-      <row>2</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>Nav 1 GS</label>
-    </text>
-
-    <checkbox>
-      <row>2</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/nav[0]/gs/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>2</row>
-      <col>2</col>
-      <property>/sim/failure-manager/instrumentation/nav[0]/gs/mtbf</property>
-    </input>
-
-    <text>
-      <row>2</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>Nav 2 GS</label>
-    </text>
-
-    <checkbox>
-      <row>2</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/nav[1]/gs/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>2</row>
-      <col>6</col>
-      <property>/sim/failure-manager/instrumentation/nav[1]/gs/mtbf</property>
-    </input>
-
-    <text>
-      <row>3</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>DME</label>
-    </text>
-
-    <checkbox>
-      <row>3</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/dme/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>3</row>
-      <col>2</col>
-      <property>/sim/failure-manager/instrumentation/dme/mtbf</property>
-    </input>
-
-    <text>
-      <row>3</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>ADF</label>
-    </text>
-
-    <checkbox>
-      <row>3</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/adf/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>3</row>
-      <col>6</col>
-      <property>/sim/failure-manager/instrumentation/adf/mtbf</property>
-    </input>
-
-    <text>
-      <row>4</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>Airspeed Indicator</label>
-    </text>
-
-    <checkbox>
-      <row>4</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/airspeed-indicator/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>4</row>
-      <col>2</col>
-      <property>/sim/failure-manager/instrumentation/airspeed-indicator/mtbf</property>
-    </input>
-
-    <text>
-      <row>4</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>Attitude Indicator</label>
-    </text>
-
-    <checkbox>
-      <row>4</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/attitude-indicator/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>4</row>
-      <col>6</col>
-      <property>/sim/failure-manager/instrumentation/attitude-indicator/mtbf</property>
-    </input>
-
-    <text>
-      <row>5</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>Altimeter</label>
-    </text>
-
-    <checkbox>
-      <row>5</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/altimeter/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>5</row>
-      <col>2</col>
-      <property>/sim/failure-manager/instrumentation/altimeter/mtbf</property>
-    </input>
-
-    <text>
-      <row>5</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>Turn Indicator</label>
-    </text>
-
-    <checkbox>
-      <row>5</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/turn-indicator/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>5</row>
-      <col>6</col>
-      <property>/sim/failure-manager/instrumentation/turn-indicator/mtbf</property>
-    </input>
-
-    <text>
-      <row>6</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>Slip/Skid Ball</label>
-    </text>
-
-    <checkbox>
-      <row>6</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/slip-skid-ball/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>6</row>
-      <col>2</col>
-      <property>/sim/failure-manager/instrumentation/slip-skid-ball/mtbf</property>
-    </input>
-
-    <text>
-      <row>6</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>Heading Indicator</label>
-    </text>
-
-    <checkbox>
-      <row>6</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/heading-indicator/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>6</row>
-      <col>6</col>
-      <property>/sim/failure-manager/instrumentation/heading-indicator/mtbf</property>
-    </input>
-
-    <text>
-      <row>7</row>
-      <col>0</col>
-      <halign>right</halign>
-      <label>Vertical Speed Ind.</label>
-    </text>
-
-    <checkbox>
-      <row>7</row>
-      <col>1</col>
-      <property>/sim/failure-manager/instrumentation/vertical-speed-indicator/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>7</row>
-      <col>2</col>
-      <property>/sim/failure-manager/instrumentation/vertical-speed-indicator/mtbf</property>
-    </input>
-
-    <text>
-      <row>7</row>
-      <col>4</col>
-      <halign>right</halign>
-      <label>Magnetic Compass</label>
-    </text>
-
-    <checkbox>
-      <row>7</row>
-      <col>5</col>
-      <property>/sim/failure-manager/instrumentation/magnetic-compass/serviceable</property>
-    </checkbox>
-
-    <input>
-      <row>7</row>
-      <col>6</col>
-      <property>/sim/failure-manager/instrumentation/magnetic-compass/mtbf</property>
-    </input>
-  </group>
-
-  <hrule/>
-
   <group>
     <layout>hbox</layout>
+
+    <group>
+      <layout>table</layout>
+      <halign>center</halign>
+      <text>
+        <row>0</row>
+        <col>0</col>
+        <label>Instrument</label>
+      </text>
+      <text>
+        <row>0</row>
+        <col>2</col>
+        <label>MTBF (sec)</label>
+      </text>
+
+      <text>
+        <row>0</row>
+        <col>3</col>
+        <label>  </label>
+      </text>
+      <text>
+        <row>0</row>
+        <col>4</col>
+        <label>Instrument</label>
+      </text>
+      <text>
+        <row>0</row>
+        <col>6</col>
+        <label>MTBF (sec)</label>
+      </text>
+
+      <text>
+        <row>1</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Nav 1 CDI</label>
+      </text>
+
+      <checkbox>
+        <row>1</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/nav[0]/cdi/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>1</row>
+        <col>2</col>
+        <width>80</width>
+        <height>20</height>
+        <property>/sim/failure-manager/instrumentation/nav[0]/cdi/mtbf</property>
+      </input>
+
+      <text>
+        <row>1</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>Nav 2 CDI</label>
+      </text>
+
+      <checkbox>
+        <row>1</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/nav[1]/cdi/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>1</row>
+        <col>6</col>
+        <width>80</width>
+        <height>20</height>
+        <property>/sim/failure-manager/instrumentation/nav[1]/cdi/mtbf</property>
+      </input>
+
+      <text>
+        <row>2</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Nav 1 GS</label>
+      </text>
+
+      <checkbox>
+        <row>2</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/nav[0]/gs/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>2</row>
+        <col>2</col>
+        <property>/sim/failure-manager/instrumentation/nav[0]/gs/mtbf</property>
+      </input>
+
+      <text>
+        <row>2</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>Nav 2 GS</label>
+      </text>
+
+      <checkbox>
+        <row>2</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/nav[1]/gs/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>2</row>
+        <col>6</col>
+        <property>/sim/failure-manager/instrumentation/nav[1]/gs/mtbf</property>
+      </input>
+
+      <text>
+        <row>3</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>DME</label>
+      </text>
+
+      <checkbox>
+        <row>3</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/dme/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>3</row>
+        <col>2</col>
+        <property>/sim/failure-manager/instrumentation/dme/mtbf</property>
+      </input>
+
+      <text>
+        <row>3</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>ADF</label>
+      </text>
+
+      <checkbox>
+        <row>3</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/adf/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>3</row>
+        <col>6</col>
+        <property>/sim/failure-manager/instrumentation/adf/mtbf</property>
+      </input>
+
+      <text>
+        <row>4</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>  Airspeed Indicator</label>
+      </text>
+
+      <checkbox>
+        <row>4</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/airspeed-indicator/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>4</row>
+        <col>2</col>
+        <property>/sim/failure-manager/instrumentation/airspeed-indicator/mtbf</property>
+      </input>
+
+      <text>
+        <row>4</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>Attitude Indicator</label>
+      </text>
+
+      <checkbox>
+        <row>4</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/attitude-indicator/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>4</row>
+        <col>6</col>
+        <property>/sim/failure-manager/instrumentation/attitude-indicator/mtbf</property>
+      </input>
+
+      <text>
+        <row>5</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Altimeter</label>
+      </text>
+
+      <checkbox>
+        <row>5</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/altimeter/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>5</row>
+        <col>2</col>
+        <property>/sim/failure-manager/instrumentation/altimeter/mtbf</property>
+      </input>
+
+      <text>
+        <row>5</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>Turn Indicator</label>
+      </text>
+
+      <checkbox>
+        <row>5</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/turn-indicator/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>5</row>
+        <col>6</col>
+        <property>/sim/failure-manager/instrumentation/turn-indicator/mtbf</property>
+      </input>
+
+      <text>
+        <row>6</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>Slip/Skid Ball</label>
+      </text>
+
+      <checkbox>
+        <row>6</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/slip-skid-ball/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>6</row>
+        <col>2</col>
+        <property>/sim/failure-manager/instrumentation/slip-skid-ball/mtbf</property>
+      </input>
+
+      <text>
+        <row>6</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>Heading Indicator</label>
+      </text>
+
+      <checkbox>
+        <row>6</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/heading-indicator/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>6</row>
+        <col>6</col>
+        <property>/sim/failure-manager/instrumentation/heading-indicator/mtbf</property>
+      </input>
+
+      <text>
+        <row>7</row>
+        <col>0</col>
+        <halign>right</halign>
+        <label>  Vertical Speed Ind.</label>
+      </text>
+
+      <checkbox>
+        <row>7</row>
+        <col>1</col>
+        <property>/sim/failure-manager/instrumentation/vertical-speed-indicator/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>7</row>
+        <col>2</col>
+        <property>/sim/failure-manager/instrumentation/vertical-speed-indicator/mtbf</property>
+      </input>
+
+      <text>
+        <row>7</row>
+        <col>4</col>
+        <halign>right</halign>
+        <label>Magnetic Compass</label>
+      </text>
+
+      <checkbox>
+        <row>7</row>
+        <col>5</col>
+        <property>/sim/failure-manager/instrumentation/magnetic-compass/serviceable</property>
+      </checkbox>
+
+      <input>
+        <row>7</row>
+        <col>6</col>
+        <property>/sim/failure-manager/instrumentation/magnetic-compass/mtbf</property>
+      </input>
+    </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>
       <default>true</default>
diff --git a/gui/dialogs/instruments.xml b/gui/dialogs/instruments.xml
index 9f4f0a68f..03d24c497 100644
--- a/gui/dialogs/instruments.xml
+++ b/gui/dialogs/instruments.xml
@@ -53,7 +53,7 @@
       <row>0</row>
       <col>0</col>
       <halign>right</halign>
-      <label>QNH setting:</label>
+      <label>  QNH Setting:</label>
     </text>
 
     <group>
@@ -124,7 +124,7 @@
       <row>1</row>
       <col>0</col>
       <halign>right</halign>
-      <label>ALT setting:</label>
+      <label>ALT Setting:</label>
     </text>
 
     <group>
@@ -221,13 +221,19 @@
           <command>dialog-update</command>
         </binding>
       </button>
+
+      <!-- only for a gap -->
+      <text>
+        <label>  </label>
+      </text>
+
     </group>
 
     <text>
       <row>2</row>
       <col>0</col>
       <halign>right</halign>
-      <label>HI offset:</label>
+      <label>HI Offset:</label>
     </text>
 
     <group>
@@ -322,6 +328,12 @@
           <command>dialog-update</command>
         </binding>
       </button>
+
+      <!-- only for a gap -->
+      <text>
+        <label>  </label>
+      </text>
+
     </group>
   </group>
 
diff --git a/gui/dialogs/jetways.xml b/gui/dialogs/jetways.xml
index 6518ea1e4..c578a983c 100644
--- a/gui/dialogs/jetways.xml
+++ b/gui/dialogs/jetways.xml
@@ -21,7 +21,7 @@
 		    {
 		   list ~= apt ~ " ";
 		    }
-		   aptlist.setValue(list == "" ? "No airports loaded" : "Loaded airports: " ~ list);
+		   aptlist.setValue(list == "" ? " No airports loaded" : " Loaded airports: " ~ list);
 		   }
 		  settimer(update, UPDATE_PERIOD);
 		  };
@@ -57,74 +57,92 @@
 
 	<hrule />
 
-	<checkbox>
-		<halign>left</halign>
-		<label>Enable animated jetways</label>
-		<property>/nasal/jetways/enabled</property>
-		<live type="bool">true</live>
-		<binding>
-			<command>dialog-apply</command>
-		</binding>
-	</checkbox>
-	<checkbox>
-		<halign>left</halign>
-		<label>Connect to multiplayer aircraft</label>
-		<property>/sim/jetways/interact-with-multiplay</property>
-		<live type="bool">true</live>
-		<enable>
-			<property>/nasal/jetways/enabled</property>
-		</enable>
-		<binding>
-		        <command>dialog-apply</command>
-		</binding>
-	</checkbox>
-	<checkbox>
-		<halign>left</halign>
-		<label>Enable jetway editor</label>
-		<property>/nasal/jetways_edit/enabled</property>
-		<live type="bool">true</live>
-		<enable>
-			<property>/nasal/jetways/enabled</property>
-		</enable>
-		<binding>
-		        <command>dialog-apply</command>
-		</binding>
-	</checkbox>
-	<checkbox>
-		<halign>left</halign>
-		<label>Debug mode</label>
-		<property>/sim/jetways/debug</property>
-		<live type="bool">true</live>
-		<enable>
-			<property>/nasal/jetways/enabled</property>
-		</enable>
-		<binding>
-		        <command>dialog-apply</command>
-		</binding>
-	</checkbox>
+  <group>
+    <layout>hbox</layout>
 
-	<group>
-		<layout>hbox</layout>
-		<button>
-			<legend>Open editor</legend>
-			<enable>
-				<and>
-					<property>/nasal/jetways/enabled</property>
-					<property>/nasal/jetways_edit/enabled</property>
-				</and>
-			</enable>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>jetways-adjust</dialog-name>
-			</binding>
-		</button>
-	</group>
+    <!-- only for a gap -->
+    <group>
+      <layout>vbox</layout>
+      <default-padding>1</default-padding>
+      <text>
+        <label> </label>
+      </text>
+    </group>
+
+    <group>
+      <layout>vbox</layout>
+
+    	<checkbox>
+    		<halign>left</halign>
+    		<label>Enable animated jetways</label>
+    		<property>/nasal/jetways/enabled</property>
+    		<live type="bool">true</live>
+    		<binding>
+    			<command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+    	<checkbox>
+    		<halign>left</halign>
+    		<label>Connect to multiplayer aircraft</label>
+    		<property>/sim/jetways/interact-with-multiplay</property>
+    		<live type="bool">true</live>
+    		<enable>
+    			<property>/nasal/jetways/enabled</property>
+    		</enable>
+    		<binding>
+    		        <command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+    	<checkbox>
+    		<halign>left</halign>
+    		<label>Enable jetway editor</label>
+    		<property>/nasal/jetways_edit/enabled</property>
+    		<live type="bool">true</live>
+    		<enable>
+    			<property>/nasal/jetways/enabled</property>
+    		</enable>
+    		<binding>
+    		        <command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+    	<checkbox>
+    		<halign>left</halign>
+    		<label>Debug mode</label>
+    		<property>/sim/jetways/debug</property>
+    		<live type="bool">true</live>
+    		<enable>
+    			<property>/nasal/jetways/enabled</property>
+    		</enable>
+    		<binding>
+    		        <command>dialog-apply</command>
+    		</binding>
+    	</checkbox>
+
+    	<group>
+    		<layout>hbox</layout>
+    		<button>
+    			<legend>Open editor</legend>
+    			<enable>
+    				<and>
+    					<property>/nasal/jetways/enabled</property>
+    					<property>/nasal/jetways_edit/enabled</property>
+    				</and>
+    			</enable>
+    			<binding>
+    				<command>dialog-show</command>
+    				<dialog-name>jetways-adjust</dialog-name>
+    			</binding>
+    		</button>
+    	</group>
+
+    </group>
+  </group>
 
 	<hrule />
 
 	<text>
 		<halign>left</halign>
-		<label>No airports loaded</label>
+		<label> No airports loaded</label>
 		<property>/sim/gui/dialogs/jetways/loaded-airports</property>
 		<live type="bool">true</live>
 	</text>