diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml
index fda87ccb0..07d25ce9d 100644
--- a/gui/dialogs/AIcarrier.xml
+++ b/gui/dialogs/AIcarrier.xml
@@ -4,20 +4,33 @@
     <name>AIcarrier</name>
     <modal>false</modal>
     <layout>vbox</layout>
-    
+
 
     <!-- AI Carrier options -->
 
-    <text>
-        <halign>left</halign>
-        <label>AI Carrier</label>
-        <color>
-            <red>0.9</red>
-            <green>0.9</green>
-            <blue>0.9</blue>
-            <alpha>1</alpha>
-        </color>
-    </text>
+    <group>
+      <layout>hbox</layout>
+      <empty><stretch>1</stretch></empty>
+
+      <text>
+        <label>AI Carrier Controls</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>
@@ -170,6 +183,8 @@
         </empty>
     </group>
 
+    <hrule/>
+
     <group>
         <layout>hbox</layout>
         <default-padding>6</default-padding>
@@ -218,4 +233,4 @@
             <stretch>true</stretch>
         </empty>
     </group>
-</PropertyList>
\ No newline at end of file
+</PropertyList>
diff --git a/gui/dialogs/ai.xml b/gui/dialogs/ai.xml
index 56898b8c9..d8515d6f2 100644
--- a/gui/dialogs/ai.xml
+++ b/gui/dialogs/ai.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0"?>
 
-<!-- General ATC/AI options -->
+<!-- AI Traffic Options -->
 
 <PropertyList>
     <name>ai</name>
     <modal>false</modal>
     <layout>vbox</layout>
 
+    <group>
+      <layout>hbox</layout>
+      <empty><stretch>1</stretch></empty>
 
+      <text>
+        <label>AI Traffic Options</label>
+      </text>
 
-    <button>
-      <legend>-</legend>
-      <pref-width>16</pref-width>
-      <pref-height>16</pref-height>
-      <halign>right</halign>
-      <border>2</border>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
+      <empty><stretch>1</stretch></empty>
 
-    <text>
-        <!-- <label>ATC/AI Options</label> -->
-        <label>AI Options</label>
-    </text>
+      <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/>
 
@@ -72,6 +76,8 @@
         </empty>
     </group>
 
+    <hrule/>
+
     <group>
         <layout>hbox</layout>
         <default-padding>6</default-padding>
diff --git a/gui/dialogs/airports.xml b/gui/dialogs/airports.xml
index e1ed9a93c..75fb36749 100644
--- a/gui/dialogs/airports.xml
+++ b/gui/dialogs/airports.xml
@@ -5,9 +5,27 @@
   <layout>vbox</layout>
   <resizable>true</resizable>
 
-  <text>
-    <label>Select an Airport</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Select an Airport</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/>
 
@@ -97,6 +115,8 @@
     </button>
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
     <default-padding>10</default-padding>
diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml
index efa228b08..59f543407 100644
--- a/gui/dialogs/autopilot.xml
+++ b/gui/dialogs/autopilot.xml
@@ -16,17 +16,17 @@
       /autopilot/settings/true-heading-deg
       /autopilot/settings/vertical-speed-fpm
     -->
-	
+
 	<group>
 		<layout>hbox</layout>
 		<empty><stretch>1</stretch></empty>
-		
+
 		<text>
 			<label>Autopilot Settings</label>
 		</text>
-		
+
 		<empty><stretch>1</stretch></empty>
-			
+
 		<button>
 			<pref-width>16</pref-width>
 			<pref-height>16</pref-height>
@@ -536,4 +536,15 @@
         </checkbox>
     </group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
 </PropertyList>
diff --git a/gui/dialogs/cockpit-view.xml b/gui/dialogs/cockpit-view.xml
index 87d7b9171..a26a06468 100644
--- a/gui/dialogs/cockpit-view.xml
+++ b/gui/dialogs/cockpit-view.xml
@@ -8,25 +8,24 @@
   <group>
     <layout>hbox</layout>
 	<empty><stretch>1</stretch></empty>
-	
+
     <text>
       <label>Cockpit View Options</label>
     </text>
-	
+
 	<empty><stretch>1</stretch></empty>
-		
+
 	<button>
 	  <pref-width>16</pref-width>
 	  <pref-height>16</pref-height>
 	  <legend></legend>
-	  <default>1</default>
 	  <keynum>27</keynum>
 	  <border>2</border>
 	  <binding>
 	  	<command>dialog-close</command>
 	  </binding>
 	</button>
-	
+
   </group>
 
   <hrule/>
@@ -63,7 +62,7 @@
   <text>
     <halign>center</halign>
     <label>Blackout</label>
-	<enable>
+	  <enable>
       <property>/sim/rendering/redout/enabled</property>
     </enable>
   </text>
@@ -74,7 +73,7 @@
       <row>0</row>
       <col>0</col>
       <label>Onset</label>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -87,7 +86,7 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/blackout-onset-g</property>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -101,7 +100,7 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </slider>
@@ -110,7 +109,7 @@
       <row>1</row>
       <col>0</col>
       <label>Complete</label>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -123,7 +122,7 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/blackout-complete-g</property>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -137,7 +136,7 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </slider>
@@ -148,7 +147,7 @@
   <text>
     <halign>center</halign>
     <label>Redout</label>
-	<enable>
+	  <enable>
       <property>/sim/rendering/redout/enabled</property>
     </enable>
   </text>
@@ -159,7 +158,7 @@
       <row>0</row>
       <col>0</col>
       <label>Onset</label>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -172,7 +171,7 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/redout-onset-g</property>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -186,7 +185,7 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </slider>
@@ -207,7 +206,7 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/redout-complete-g</property>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </text>
@@ -221,10 +220,21 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
-	  <enable>
+	    <enable>
         <property>/sim/rendering/redout/enabled</property>
       </enable>
     </slider>
   </group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
 </PropertyList>
diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
index dc7c39118..fbbfaabd1 100644
--- a/gui/dialogs/display.xml
+++ b/gui/dialogs/display.xml
@@ -5,29 +5,26 @@
   <modal>false</modal>
   <layout>vbox</layout>
 
-
   <group>
     <layout>hbox</layout>
-	<empty><stretch>1</stretch></empty>
-	
+	  <empty><stretch>1</stretch></empty>
+
     <text>
       <label>Display Options</label>
     </text>
-	
-	<empty><stretch>1</stretch></empty>
-		
-	<button>
-	  <pref-width>16</pref-width>
-	  <pref-height>16</pref-height>
-	  <legend></legend>
-	  <default>1</default>
-	  <keynum>27</keynum>
-	  <border>2</border>
-	  <binding>
-	  	<command>dialog-close</command>
-	  </binding>
-	</button>
-	
+
+	  <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/>
@@ -82,4 +79,15 @@
     </checkbox>
   </group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
 </PropertyList>
diff --git a/gui/dialogs/formation.xml b/gui/dialogs/formation.xml
index 4cf76a276..a2bbf810b 100644
--- a/gui/dialogs/formation.xml
+++ b/gui/dialogs/formation.xml
@@ -7,17 +7,29 @@
 	<layout>vbox</layout>
 
 	<!-- AI Wingman options -->
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
 
-	<text>
-		<halign>left</halign>
-		<label>Wingman Controls</label>
-		<color>
-			<red>0.5</red>
-			<green>0.5</green>
-			<blue>0.5</blue>
-			<alpha>1</alpha>
-		</color>
-	</text>
+    <text>
+      <label>AI Wingman Controls</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>
@@ -182,7 +194,7 @@
 			<halign>left</halign>
 			<label>Set Formation</label>
 		</text>
-		
+
 		<button>
 			<x>40</x>
 			<y>10</y>
@@ -195,9 +207,7 @@
 
 		</group>
 
-	<empty>
-		<stretch>true</stretch>
-	</empty>
+	<hrule/>
 
 	<group>
 		<layout>hbox</layout>
diff --git a/gui/dialogs/gps.xml b/gui/dialogs/gps.xml
index f9e96035f..b3722091f 100644
--- a/gui/dialogs/gps.xml
+++ b/gui/dialogs/gps.xml
@@ -9,24 +9,42 @@
 		var dlg = props.globals.getNode("/sim/gui/dialogs/gps", 1);
 		var cmd = gps.getNode("command", 1);
 		var scratch = gps.getNode("scratch");
-		
+
 		scratch.getNode("exact", 1).setBoolValue(0);
 		var searchType = scratch.getNode("type", 1);
 		var searchQuery = scratch.getNode("query", 1);
-		
+
 		var copySearchArgs = func {
 			searchType.setValue(dlg.getNode("search-type").getValue());
 			searchQuery.setValue(dlg.getNode("search-query").getValue());
 		}
-		
+
 		var slaved = props.globals.getNode("/instrumentation/nav[0]/slaved-to-gps", 1);
 	</open>
     </nasal>
     <name>gps</name>
     <layout>vbox</layout>
-    <text>
+    <group>
+      <layout>hbox</layout>
+      <empty><stretch>1</stretch></empty>
+
+      <text>
         <label>GPS</label>
-    </text>
+      </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/>
     <!-- show current state -->
     <group>
@@ -262,7 +280,7 @@
         </text>
     </group>
     <hrule/>
-    <!--  ident text field, type combo, next/prev paging buttons 
+    <!--  ident text field, type combo, next/prev paging buttons
 		nearest and search buttons
 	-->
     <group>
@@ -341,7 +359,7 @@
                         <script>
 				copySearchArgs();
 				scratch.getNode("max-results", 1).setIntValue(10);
-				
+
 				# ensure scratch pos is invalid, so we use current GPS
 				# position as the search origin
 				scratch.getNode("longitude-deg", 1).setDoubleValue(-9999);
diff --git a/gui/dialogs/hud.xml b/gui/dialogs/hud.xml
index ac19d1c83..2b7de76a1 100644
--- a/gui/dialogs/hud.xml
+++ b/gui/dialogs/hud.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 
 <PropertyList>
-	<x>-20</x>
-	<y>20</y>
 	<name>hud</name>
 	<layout>vbox</layout>
 	<padding>20</padding>
-	
+
 	<group>
 		<layout>hbox</layout>
 		<empty><stretch>1</stretch></empty>
@@ -14,14 +12,13 @@
 		<text>
 			<label>HUD Configuration</label>
 		</text>
-		
+
 		<empty><stretch>1</stretch></empty>
-			
+
 		<button>
 			<pref-width>16</pref-width>
 			<pref-height>16</pref-height>
 			<legend></legend>
-			<default>1</default>
 			<keynum>27</keynum>
 			<border>2</border>
 			<binding>
@@ -174,6 +171,17 @@
 		</slider>
 	</group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
 	<nasal>
 		<open>
 			gui.enable_widgets(cmdarg(), "devel-stuff", getprop("/sim/gui/devel-widgets"));
diff --git a/gui/dialogs/instrument-failures.xml b/gui/dialogs/instrument-failures.xml
index 2e6ab0625..1dc4cb1dd 100644
--- a/gui/dialogs/instrument-failures.xml
+++ b/gui/dialogs/instrument-failures.xml
@@ -5,9 +5,28 @@
   <name>instrument-failures</name>
   <modal>false</modal>
   <layout>vbox</layout>
-  <text>
-    <label>Instrument Failures</label>
-  </text>
+
+  <group>
+    <layout>hbox</layout>
+    <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Instrument Failures</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/>
 
@@ -19,6 +38,8 @@
     </text>
   </group>
 
+  <hrule/>
+
   <group>
     <layout>table</layout>
     <halign>center</halign>
@@ -90,7 +111,7 @@
       <height>20</height>
       <property>/sim/failure-manager/instrumentation/nav[1]/cdi/mtbf</property>
     </input>
-    
+
     <text>
       <row>2</row>
       <col>0</col>
@@ -320,6 +341,8 @@
     </input>
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
     <button>
@@ -363,7 +386,7 @@
         <command>dialog-update</command>
       </binding>
     </button>
-    
+
     <button>
       <legend>Cancel</legend>
       <equal>true</equal>
diff --git a/gui/dialogs/instruments.xml b/gui/dialogs/instruments.xml
index cfeda905a..9c3125e0b 100644
--- a/gui/dialogs/instruments.xml
+++ b/gui/dialogs/instruments.xml
@@ -3,209 +3,250 @@
 <PropertyList>
 
  <name>instruments</name>
- <width>400</width>
- <height>150</height>
  <modal>false</modal>
+ <layout>vbox</layout>
 
- <text>
-  <x>0</x>
-  <y>120</y>
-  <label>Instrument Settings</label>
- </text>
+  <group>
+    <layout>hbox</layout>
+    <empty><stretch>1</stretch></empty>
 
- <group>
-  <x>0</x>
-  <y>90</y>
+    <text>
+      <label>Instrument Settings</label>
+    </text>
 
-  <text>
-   <label>ALT setting:</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>table</layout>
+    <default-padding>5</default-padding>
+
+    <text>
+      <row>0</row>
+      <col>0</col>
+      <halign>right</halign>
+      <label>ALT setting:</label>
+    </text>
+
+    <group>
+      <row>0</row>
+      <col>1</col>
+      <layout>hbox</layout>
+      <default-padding>0</default-padding>
+
+      <button>
+      <width>35</width>
+      <height>26</height>
+      <border>1</border>
+      <legend>&lt;</legend>
+      <binding>
+        <command>property-adjust</command>
+        <property>/instrumentation/altimeter/setting-inhg</property>
+        <step type="double">-0.01</step>
+      </binding>
+      <binding>
+        <command>dialog-update</command>
+      </binding>
+      </button>
+
+      <button>
+       <width>35</width>
+       <height>26</height>
+       <border>1</border>
+       <legend>&lt;&lt;</legend>
+       <binding>
+        <command>property-adjust</command>
+        <property>/instrumentation/altimeter/setting-inhg</property>
+        <step type="double">-0.10</step>
+       </binding>
+       <binding>
+        <command>dialog-update</command>
+       </binding>
+      </button>
+    </group>
+
+    <input>
+      <row>0</row>
+      <col>3</col>
+      <width>75</width>
+      <height>25</height>
+      <property>/instrumentation/altimeter/setting-inhg</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </input>
+
+    <text>
+      <row>0</row>
+      <col>4</col>
+      <padding>0</padding>
+      <halign>left</halign>
+      <label>inHg</label>
+    </text>
+
+    <group>
+      <layout>hbox</layout>
+      <row>0</row>
+      <col>5</col>
+      <default-padding>0</default-padding>
+
+      <button>
+       <width>35</width>
+       <height>26</height>
+       <border>1</border>
+       <legend>&gt;&gt;</legend>
+       <binding>
+        <command>property-adjust</command>
+        <property>/instrumentation/altimeter/setting-inhg</property>
+        <step type="double">0.10</step>
+       </binding>
+       <binding>
+        <command>dialog-update</command>
+       </binding>
+      </button>
+
+      <button>
+        <row>0</row>
+        <col>6</col>
+        <width>35</width>
+        <height>26</height>
+        <border>1</border>
+        <legend>&gt;</legend>
+        <binding>
+          <command>property-adjust</command>
+          <property>/instrumentation/altimeter/setting-inhg</property>
+          <step type="double">0.01</step>
+        </binding>
+        <binding>
+          <command>dialog-update</command>
+        </binding>
+      </button>
+    </group>
+
+    <text>
+      <row>1</row>
+      <col>0</col>
+      <halign>right</halign>
+      <label>HI offset:</label>
+    </text>
+
+    <group>
+      <layout>hbox</layout>
+      <default-padding>0</default-padding>
+      <row>1</row>
+      <col>1</col>
+
+      <button>
+        <width>35</width>
+        <height>26</height>
+        <border>1</border>
+        <legend>&lt;</legend>
+        <binding>
+          <command>property-adjust</command>
+          <property>/instrumentation/heading-indicator/offset-deg</property>
+          <step type="double">-1.0</step>
+        </binding>
+        <binding>
+          <command>dialog-update</command>
+        </binding>
+      </button>
+
+      <button>
+       <width>35</width>
+       <height>26</height>
+       <border>1</border>
+       <legend>&lt;&lt;</legend>
+       <binding>
+        <command>property-adjust</command>
+        <property>/instrumentation/heading-indicator/offset-deg</property>
+        <step type="double">-10.0</step>
+       </binding>
+       <binding>
+        <command>dialog-update</command>
+       </binding>
+      </button>
+    </group>
+
+    <input>
+      <row>1</row>
+      <col>3</col>
+      <width>75</width>
+      <height>25</height>
+      <property>/instrumentation/heading-indicator/offset-deg</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </input>
+
+    <text>
+      <row>1</row>
+      <col>4</col>
+      <padding>0</padding>
+      <halign>left</halign>
+      <label>deg</label>
+    </text>
+
+    <group>
+      <layout>hbox</layout>
+      <default-padding>0</default-padding>
+      <row>1</row>
+      <col>5</col>
+
+      <button>
+       <width>35</width>
+       <height>26</height>
+       <border>1</border>
+       <legend>&gt;&gt;</legend>
+       <binding>
+        <command>property-adjust</command>
+        <property>/instrumentation/heading-indicator/offset-deg</property>
+        <step type="double">10.0</step>
+       </binding>
+       <binding>
+        <command>dialog-update</command>
+       </binding>
+      </button>
+
+      <button>
+       <width>35</width>
+       <height>26</height>
+       <border>1</border>
+       <legend>&gt;</legend>
+       <binding>
+        <command>property-adjust</command>
+        <property>/instrumentation/heading-indicator/offset-deg</property>
+        <step type="double">1.0</step>
+       </binding>
+       <binding>
+        <command>dialog-update</command>
+       </binding>
+      </button>
+     </group>
+
+  </group>
+
+  <hrule/>
 
   <button>
-   <x>115</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&lt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/altimeter/setting-inhg</property>
-    <step type="double">-0.01</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
   </button>
 
-  <button>
-   <x>150</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&lt;&lt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/altimeter/setting-inhg</property>
-    <step type="double">-0.10</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
-  <input>
-   <x>190</x>
-   <y>0</y>
-   <width>75</width>
-   <height>25</height>
-   <label>inHg</label>
-   <property>/instrumentation/altimeter/setting-inhg</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-  </input>
-
-  <button>
-   <x>315</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&gt;&gt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/altimeter/setting-inhg</property>
-    <step type="double">0.10</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
-  <button>
-   <x>350</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&gt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/altimeter/setting-inhg</property>
-    <step type="double">0.01</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
- </group>
-
- <group>
-  <x>0</x>
-  <y>60</y>
-
-  <text>
-   <label>HI offset:</label>
-  </text>
-
-  <button>
-   <x>115</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&lt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/heading-indicator/offset-deg</property>
-    <step type="double">-1.0</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
-  <button>
-   <x>150</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&lt;&lt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/heading-indicator/offset-deg</property>
-    <step type="double">-10.0</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
-  <input>
-   <x>190</x>
-   <y>0</y>
-   <width>75</width>
-   <height>25</height>
-   <label>deg</label>
-   <property>/instrumentation/heading-indicator/offset-deg</property>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-  </input>
-
-  <button>
-   <x>315</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&gt;&gt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/heading-indicator/offset-deg</property>
-    <step type="double">10.0</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
-  <button>
-   <x>350</x>
-   <y>2</y>
-   <width>35</width>
-   <height>26</height>
-   <border>1</border>
-   <legend>&gt;</legend>
-   <binding>
-    <command>property-adjust</command>
-    <property>/instrumentation/heading-indicator/offset-deg</property>
-    <step type="double">1.0</step>
-   </binding>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
-
- </group> 
-
- <group>
-
-  <button>
-   <x>150</x>
-   <y>10</y>
-   <legend>Close</legend>
-   <default>true</default>
-   <key>Esc</key>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
-
- </group>
-
 </PropertyList>
diff --git a/gui/dialogs/local_weather.xml b/gui/dialogs/local_weather.xml
index 6561adba8..e0130e620 100644
--- a/gui/dialogs/local_weather.xml
+++ b/gui/dialogs/local_weather.xml
@@ -10,6 +10,8 @@
  <modal>false</modal>
 
 
+
+
 <text>
   <x>10</x>
   <y>570</y>
@@ -62,7 +64,7 @@
   <x>0</x>
   <y>525</y>
 
- 
+
 <combo>
    <x>10</x>
    <y>0</y>
@@ -101,7 +103,7 @@
     <command>dialog-apply</command>
    </binding>
   </combo>
- 
+
 
   <input>
    <x>203</x>
@@ -231,7 +233,7 @@
   <x>0</x>
   <y>440</y>
 
- 
+
 <combo>
    <x>10</x>
    <y>0</y>
@@ -426,7 +428,7 @@
   <x>165</x>
   <y>0</y>
   <label>alt (ft)</label>
- </text> 
+ </text>
 
 <input>
    <x>245</x>
@@ -440,7 +442,7 @@
   <x>320</x>
   <y>0</y>
   <label>size (km)</label>
- </text> 
+ </text>
 
 <input>
    <x>410</x>
@@ -649,7 +651,7 @@
   <x>0</x>
   <y>195</y>
 
- 
+
 <combo>
    <x>10</x>
    <y>0</y>
diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index ce16f3fae..b57a0b80c 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -36,9 +36,27 @@
     <close># just kept for educational purposes :-)</close>
   </nasal>
 
-  <text>
-    <label>Location (in air)</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Position Aircraft In Air</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/>
 
@@ -48,7 +66,7 @@
 
   <group>
     <layout>table</layout>
-    <halign>left</halign>
+    <halign>center</halign>
     <radio>
       <row>0</row><col>0</col>
       <live>true</live>
@@ -63,6 +81,7 @@
     </radio>
     <text>
       <row>0</row><col>1</col>
+      <halign>right</halign>
       <label>Airport:</label>
     </text>
     <input>
@@ -71,6 +90,7 @@
     </input>
     <text>
       <row>0</row><col>3</col>
+      <halign>right</halign>
       <label>Runway:</label>
     </text>
     <input>
@@ -92,6 +112,7 @@
     </radio>
     <text>
       <row>1</row><col>1</col>
+      <halign>right</halign>
       <label>Longitude:</label>
     </text>
     <input>
@@ -100,6 +121,7 @@
     </input>
     <text>
       <row>1</row><col>3</col>
+      <halign>right</halign>
       <label>Latitude:</label>
     </text>
     <input>
@@ -178,6 +200,8 @@
     </input>
   </group>
 
+  <hrule/>
+
   <text>
     <label>Relative Position</label>
   </text>
@@ -246,6 +270,8 @@
     </input>
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
     <default-padding>10</default-padding>
diff --git a/gui/dialogs/location-of-tower.xml b/gui/dialogs/location-of-tower.xml
index 718107490..effc2bc3f 100644
--- a/gui/dialogs/location-of-tower.xml
+++ b/gui/dialogs/location-of-tower.xml
@@ -3,18 +3,42 @@
   <name>location-of-tower</name>
   <layout>vbox</layout>
 
-  <text>
-    <label>Select tower for the Tower View</label>
-  </text>
+
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Tower Position</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/>
 
+  <text>
+    <label>Select position of tower for the Tower Views</label>
+  </text>
+
   <group>
     <layout>table</layout>
 
     <text>
       <row>0</row><col>0</col>
-      <label>Airport ID</label>
+      <halign>right</halign>
+      <label>Airport ID:</label>
     </text>
     <input>
       <name>airport-id</name>
@@ -94,7 +118,7 @@
 	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  :-( 
+        The way it is now CANCEL doesn't undo PRESET  :-(
       -->
       <binding>
        <command>property-assign</command>
@@ -114,10 +138,10 @@
       <row>3</row><col>3</col>
       <stretch>true</stretch>
     </empty>
-
-
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
     <default-padding>10</default-padding>
@@ -128,10 +152,10 @@
       <default>true</default>
       <equal>true</equal>
       <binding>
-	<command>dialog-apply</command>
+        <command>dialog-apply</command>
       </binding>
       <binding>
-	<command>dialog-close</command>
+        <command>dialog-close</command>
       </binding>
     </button>
 
@@ -142,7 +166,7 @@
       <equal>true</equal>
       <key>Esc</key>
       <binding>
-	<command>dialog-close</command>
+        <command>dialog-close</command>
       </binding>
     </button>
 
diff --git a/gui/dialogs/location-on-ground.xml b/gui/dialogs/location-on-ground.xml
index 49e8b4450..fe4e2f5a3 100644
--- a/gui/dialogs/location-on-ground.xml
+++ b/gui/dialogs/location-on-ground.xml
@@ -4,9 +4,27 @@
   <name>location-on-ground</name>
   <layout>vbox</layout>
 
-  <text>
-    <label>Set New Location</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Position Aircraft On Ground</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/>
 
@@ -19,7 +37,7 @@
       rwy.setValue("");
       var parkpos = dlg.getNode("parkpos", 1);
       parkpos.setValue("");
-      
+
       var mode = {
         runway:  dlg.getNode("use_runway", 1),
         parkpos: dlg.getNode("use_parkpos", 1)
@@ -42,12 +60,13 @@
       if (!initialized) {
         set_radio("runway");
       }
-	  
-	  var runways = dlg.getNode("available-runways", 1);
-	  var updateRunways = func {         
+
+      var runways = dlg.getNode("available-runways", 1);
+
+      var updateRunways = func {
         var icao = dlg.getNode("airport").getValue();
-		runways.removeChildren("value");
-        
+        runways.removeChildren("value");
+
         var apt = airportinfo(icao);
         if (apt != nil) {
           var i=0;
@@ -56,7 +75,8 @@
             i += 1;
           }
         }
-		gui.dialog_update("location-on-ground");
+
+        gui.dialog_update("location-on-ground");
       }
     </open>
   </nasal>
@@ -64,20 +84,20 @@
   <group>
     <layout>table</layout>
     <halign>center</halign>
-	
+
     <text>
       <row>0</row><col>1</col>
       <halign>right</halign>
       <label>Airport:</label>
     </text>
-	
+
     <input>
       <row>0</row><col>2</col>
       <property>/sim/gui/dialogs/location-on-ground/airport</property>
-	  <binding>
+      <binding>
         <command>dialog-apply</command>
       </binding>
-	  <binding>
+      <binding>
         <command>nasal</command>
         <script>updateRunways();</script>
       </binding>
@@ -92,18 +112,18 @@
         <script>set_radio("runway")</script>
       </binding>
     </radio>
-	
+
     <text>
       <row>1</row><col>1</col>
       <halign>right</halign>
       <label>Runway:</label>
     </text>
-	
+
 	<combo>
       <name>runway</name>
-	  <row>1</row><col>2</col>
+      <row>1</row><col>2</col>
       <pref-width>85</pref-width>
-	  <enable>
+      <enable>
         <property>/sim/gui/dialogs/location-on-ground/use_runway</property>
       </enable>
       <property>sim/gui/dialogs/location-on-ground/runway</property>
@@ -114,7 +134,7 @@
         <object-name>runway</object-name>
       </binding>
     </combo>
-	
+
     <radio>
       <row>2</row><col>0</col>
       <property>/sim/gui/dialogs/location-on-ground/use_parkpos</property>
@@ -124,22 +144,24 @@
         <script>set_radio("parkpos")</script>
       </binding>
     </radio>
-	
+
     <text>
       <row>2</row><col>1</col>
       <halign>right</halign>
       <label>Parking:</label>
     </text>
-	
+
     <input>
       <row>2</row><col>2</col>
-	  <enable>
+      <enable>
         <property>/sim/gui/dialogs/location-on-ground/use_parkpos</property>
       </enable>
       <property>/sim/gui/dialogs/location-on-ground/parkpos</property>
     </input>
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
     <default-padding>10</default-padding>
diff --git a/gui/dialogs/pilot_offset.xml b/gui/dialogs/pilot_offset.xml
index e359b1692..fec11ce33 100644
--- a/gui/dialogs/pilot_offset.xml
+++ b/gui/dialogs/pilot_offset.xml
@@ -4,6 +4,30 @@
  <name>pilot_offset</name>
  <layout>vbox</layout>
 
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Adjust View Position</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>
 
@@ -19,7 +43,7 @@
     <property>/sim/current-view/x-offset-m</property>
     <binding><command>dialog-apply</command></binding>
    </dial>
- 
+
    <text>
     <label>-100.00</label>
     <format>%-0.2f m</format>
@@ -27,7 +51,7 @@
     <property>/sim/current-view/x-offset-m</property>
    </text>
   </group>
- 
+
   <group>
    <layout>vbox</layout>
 
@@ -71,11 +95,13 @@
   </group>
  </group>
 
+ <hrule/>
+
  <group>
    <layout>hbox</layout>
    <empty><stretch>true</stretch></empty>
    <button>
-     <legend>OK</legend>
+     <legend>Close</legend>
      <equal>true</equal>
      <default>true</default>
      <key>Esc</key>
diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index 900962601..36382aac1 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -3,46 +3,74 @@
 <PropertyList>
 
  <name>radios</name>
- <width>600</width>
- <height>370</height>
+ <width>550</width>
  <modal>false</modal>
+ <layout>vbox</layout>
 
- <text>
-  <x>10</x>
-  <y>300</y>
-  <label>Radio Frequencies</label>
- </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Radio Frequencies</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>table</layout>
 
  <!-- headers -->
- <group>
-  <x>0</x>
-  <y>280</y>
   <text>
-   <x>75</x>
+   <row>0</row>
+   <col>1</col>
    <label>Selected</label>
   </text>
+
   <text>
-   <x>300</x>
+   <row>0</row>
+   <col>4</col>
    <label>Standby</label>
   </text>
+
   <text>
-   <x>450</x>
+   <row>0</row>
+   <col>6</col>
    <label>Radial</label>
   </text>
- </group>
 
- <group>
-  <x>0</x>
-  <y>240</y>
+  <!-- Dummy label to stretch table, as layout manager doesn't handle labels well -->
+  <text>
+   <row>0</row>
+   <col>7</col>
+   <label></label>
+  </text>
 
   <text>
+   <row>1</row>
+   <col>0</col>
+   <halign>right</halign>
    <label>COM1</label>
   </text>
 
   <input>
    <name>com1-selected</name>
-   <x>75</x>
-   <y>0</y>
+   <row>1</row>
+   <col>1</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
@@ -50,8 +78,8 @@
   </input>
 
   <button>
-   <x>220</x>
-   <y>2</y>
+   <row>1</row>
+   <col>3</col>
    <width>35</width>
    <height>26</height>
    <border>1</border>
@@ -81,28 +109,25 @@
 
   <input>
    <name>com1-standby</name>
-   <x>300</x>
-   <y>0</y>
+   <row>1</row>
+   <col>4</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
    <property>/instrumentation/comm[0]/frequencies/standby-mhz</property>
   </input>
 
- </group>
-
- <group>
-  <x>0</x>
-  <y>210</y>
-
   <text>
+   <row>2</row>
+   <col>0</col>
+   <halign>right</halign>
    <label>COM2</label>
   </text>
 
   <input>
    <name>com2-selected</name>
-   <x>75</x>
-   <y>0</y>
+   <row>2</row>
+   <col>1</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
@@ -110,8 +135,8 @@
   </input>
 
   <button>
-   <x>220</x>
-   <y>2</y>
+   <row>2</row>
+   <col>3</col>
    <width>35</width>
    <height>26</height>
    <border>1</border>
@@ -141,28 +166,25 @@
 
   <input>
    <name>com2-standby</name>
-   <x>300</x>
-   <y>0</y>
+   <row>2</row>
+   <col>4</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
    <property>/instrumentation/comm[1]/frequencies/standby-mhz</property>
   </input>
 
- </group>
-
- <group>
-  <x>0</x>
-  <y>180</y>
-
   <text>
+   <row>3</row>
+   <col>0</col>
+   <halign>right</halign>
    <label>NAV1</label>
   </text>
 
   <input>
    <name>nav1-selected</name>
-   <x>75</x>
-   <y>0</y>
+   <row>3</row>
+   <col>1</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
@@ -170,8 +192,8 @@
   </input>
 
   <button>
-   <x>220</x>
-   <y>2</y>
+   <row>3</row>
+   <col>3</col>
    <width>35</width>
    <height>26</height>
    <border>1</border>
@@ -201,8 +223,8 @@
 
   <input>
    <name>nav1-standby</name>
-   <x>300</x>
-   <y>0</y>
+   <row>3</row>
+   <col>4</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
@@ -211,28 +233,25 @@
 
   <input>
    <name>nav1-radial</name>
-   <x>450</x>
-   <y>0</y>
+   <row>3</row>
+   <col>6</col>
    <width>75</width>
    <height>25</height>
    <label>deg</label>
    <property>/instrumentation/nav[0]/radials/selected-deg</property>
   </input>
 
- </group>
-
- <group>
-  <x>0</x>
-  <y>150</y>
-
   <text>
+   <row>4</row>
+   <col>0</col>
+   <halign>right</halign>
    <label>NAV2</label>
   </text>
 
   <input>
    <name>nav2-selected</name>
-   <x>75</x>
-   <y>0</y>
+   <row>4</row>
+   <col>1</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
@@ -240,8 +259,8 @@
   </input>
 
   <button>
-   <x>220</x>
-   <y>2</y>
+   <row>4</row>
+   <col>3</col>
    <width>35</width>
    <height>26</height>
    <border>1</border>
@@ -271,8 +290,8 @@
 
   <input>
    <name>nav2-standby</name>
-   <x>300</x>
-   <y>0</y>
+   <row>4</row>
+   <col>4</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
@@ -281,28 +300,25 @@
 
   <input>
    <name>nav2-radial</name>
-   <x>450</x>
-   <y>0</y>
+   <row>4</row>
+   <col>6</col>
    <width>75</width>
    <height>25</height>
    <label>deg</label>
    <property>/instrumentation/nav[1]/radials/selected-deg</property>
   </input>
 
- </group>
-
- <group>
-  <x>0</x>
-  <y>120</y>
-
   <text>
+   <row>5</row>
+   <col>0</col>
+   <halign>right</halign>
    <label>ADF</label>
   </text>
 
   <input>
    <name>adf-selected</name>
-   <x>75</x>
-   <y>0</y>
+   <row>5</row>
+   <col>1</col>
    <width>75</width>
    <height>25</height>
    <label>kHz</label>
@@ -310,8 +326,8 @@
   </input>
 
   <button>
-   <x>220</x>
-   <y>2</y>
+   <row>5</row>
+   <col>3</col>
    <width>35</width>
    <height>26</height>
    <border>1</border>
@@ -341,8 +357,8 @@
 
   <input>
    <name>adf-standby</name>
-   <x>300</x>
-   <y>0</y>
+   <row>5</row>
+   <col>4</col>
    <width>75</width>
    <height>25</height>
    <label>kHz</label>
@@ -350,50 +366,48 @@
   </input>
 
   <input>
-   <name>nav2-radial</name>
-   <x>450</x>
-   <y>0</y>
+   <name>adf-radial</name>
+   <row>5</row>
+   <col>6</col>
    <width>75</width>
    <height>25</height>
    <label>deg</label>
    <property>/instrumentation/adf/rotation-deg</property>
   </input>
 
- </group>
-
- <group>
-  <x>0</x>
-  <y>90</y>
-
   <text>
+   <row>6</row>
+   <col>0</col>
+   <halign>right</halign>
    <label>DME</label>
   </text>
 
   <input>
    <name>dme-selected</name>
-   <x>75</x>
-   <y>0</y>
+   <row>6</row>
+   <col>1</col>
    <width>75</width>
    <height>25</height>
    <label>MHz</label>
    <property>/instrumentation/dme/frequencies/selected-mhz</property>
   </input>
 
- </group>
 
- <group>
-  <x>0</x>
-  <y>60</y>
+</group>
 
-  <text>
+<hrule/>
+  <group>
+
+   <layout>hbox</layout>
+
+     <text>
    <label>TACAN</label>
   </text>
 
+
   <combo>
-   <x>75</x>
-   <y>0</y>
-   <width>45</width>
-   <height>25</height>
+   <pref-width>45</pref-width>
+   <pref-height>25</pref-height>
    <property>/instrumentation/tacan/frequencies/selected-channel[1]</property>
    <value>0</value>
    <value>1</value>
@@ -408,10 +422,8 @@
   </combo>
 <!---->
   <combo>
-   <x>120</x>
-   <y>0</y>
-   <width>45</width>
-   <height>25</height>
+   <pref-width>45</pref-width>
+   <pref-height>25</pref-height>
    <property>/instrumentation/tacan/frequencies/selected-channel[2]</property>
    <value>0</value>
    <value>1</value>
@@ -426,10 +438,8 @@
   </combo>
 
   <combo>
-   <x>165</x>
-   <y>0</y>
-   <width>45</width>
-   <height>25</height>
+   <pref-width>45</pref-width>
+   <pref-height>25</pref-height>
    <property>/instrumentation/tacan/frequencies/selected-channel[3]</property>
    <value>0</value>
    <value>1</value>
@@ -444,76 +454,77 @@
   </combo>
 
   <combo>
-   <x>210</x>
-   <y>0</y>
-   <width>47</width>
-   <height>25</height>
+   <pref-width>45</pref-width>
+   <pref-height>25</pref-height>
    <property>/instrumentation/tacan/frequencies/selected-channel[4]</property>
    <value>X</value>
    <value>Y</value>
   </combo>
 
-  
+  <empty>
+    <stretch>true</stretch>
+  </empty>
+
+  <!-- Disabled for v2.2.0, as ATC Frequency Search broken
+  <button>
+    <legend>ATC Services in range</legend>
+    <binding>
+      <command>ATC-freq-search</command>
+    </binding>
+  </button>
+
+  -->
  </group>
- 
+ <hrule/>
 
- <group>
+ 	<group>
+		<layout>hbox</layout>
+		<default-padding>6</default-padding>
+		<empty>
+			<stretch>true</stretch>
+		</empty>
 
-  <button>
-   <x>105</x>
-   <y>10</y>
-   <legend>OK</legend>
-   <default>true</default>
-   <equal>true</equal>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
+		<button>
+			<legend>OK</legend>
+			<default>true</default>
+			<equal>true</equal>
+			<binding>
+				<command>dialog-apply</command>
+			</binding>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
 
-  <button>
-   <x>205</x>
-   <y>10</y>
-   <legend>Apply</legend>
-   <equal>true</equal>
-   <binding>
-    <command>dialog-apply</command>
-   </binding>
-  </button>
+		<button>
+			<legend>Apply</legend>
+			<equal>true</equal>
+			<binding>
+				<command>dialog-apply</command>
+			</binding>
+		</button>
 
-  <button>
-   <x>305</x>
-   <y>10</y>
-   <legend>Reset</legend>
-   <equal>true</equal>
-   <binding>
-    <command>dialog-update</command>
-   </binding>
-  </button>
+		<button>
+			<legend>Reset</legend>
+			<equal>true</equal>
+			<binding>
+				<command>dialog-update</command>
+			</binding>
+		</button>
 
-  <button>
-   <x>405</x>
-   <y>10</y>
-   <legend>Cancel</legend>
-   <equal>true</equal>
-   <key>Esc</key>
-   <binding>
-    <command>dialog-close</command>
-   </binding>
-  </button>
+		<button>
+			<legend>Cancel</legend>
+			<equal>true</equal>
+			<key>Esc</key>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
 
- </group>
-	<group>
-		<x>400</x>
-		<y>60</y>
-			<button>
-			<legend>ATC Services in range</legend>
-				<binding>
-					<command>ATC-freq-search</command>
-				</binding> 
-			</button>
+		<empty>
+			<stretch>true</stretch>
+		</empty>
 	</group>
 
+
 </PropertyList>
diff --git a/gui/dialogs/random-failures.xml b/gui/dialogs/random-failures.xml
index 2fdec4efe..3366a53c2 100644
--- a/gui/dialogs/random-failures.xml
+++ b/gui/dialogs/random-failures.xml
@@ -9,7 +9,7 @@
   <nasal>
     <open>
       <![CDATA[
-        var groups = cmdarg().getChildren("group")[0].getChildren("group");
+        var groups = cmdarg().getChildren("group")[1].getChildren("group");
         var mtbfNodes = groups[0].getChildren("radio");
         var mcbfNodes = groups[1].getChildren("radio");
 
@@ -40,13 +40,32 @@
     </open>
   </nasal>
 
-  <text>
-    <label>Random Failures</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+    <empty><stretch>1</stretch></empty>
 
-  <hrule></hrule>
+    <text>
+      <label>Random Failures</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/>
 
   <text>
+    <halign>left</halign>
     <label>Configure MTBF/MCBF for all systems and instruments.</label>
   </text>
 
@@ -166,17 +185,17 @@
     </group>
 
     <empty><stretch>true</stretch></empty>
-    
+
     <vrule/>
 
     <empty><stretch>true</stretch></empty>
-    
+
     <group>
       <layout>vbox</layout>
       <halign>left</halign>
       <valign>top</valign>
       <stretch>true</stretch>
- 
+
       <text>
         <halign>center</halign>
         <label>Mean Cycles Between Failures</label>
@@ -332,7 +351,7 @@
     </button>
 
     <button>
-    <legend>Close</legend>
+    <legend>Cancel</legend>
     <equal>true</equal>
     <key>Esc</key>
     <binding>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 0590ee7fd..92f1f5feb 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -9,18 +9,17 @@
   <group>
     <layout>hbox</layout>
     <empty><stretch>1</stretch></empty>
-	
+
 	<text>
 	  <label>Rendering options</label>
 	</text>
-    
+
 	<empty><stretch>1</stretch></empty>
-		
+
 	<button>
 	  <pref-width>16</pref-width>
 	  <pref-height>16</pref-height>
 	  <legend></legend>
-	  <default>1</default>
 	  <keynum>27</keynum>
 	  <border>2</border>
 	  <binding>
@@ -28,16 +27,16 @@
 	  </binding>
 	</button>
   </group>
-  
+
   <hrule/>
-  
+
   <group>
     <halign>center</halign>
     <layout>hbox</layout>
 
     <group>
       <layout>vbox</layout>
-	  
+
       <text>
         <halign>left</halign>
 	    <label>"Material shaders" must be enabled for most options.</label>
@@ -46,14 +45,14 @@
         <halign>left</halign>
 	    <label>Snow is dependant on crop, landmass and urban shaders.</label>
       </text>
-	  
+
 	  <group>
 	    <layout>vbox</layout>
 		<stretch>1</stretch>
 	  </group>
-	  
+
 	  <!--
-	  
+
 	  <group>
         <layout>hbox</layout>
 	    <text>
@@ -109,7 +108,7 @@
           <command>dialog-apply</command>
         </binding>
       </checkbox>
-	  
+
 	  -->
 
       <group>
@@ -144,9 +143,9 @@
 		  <object-name>precipitation</object-name>
         </binding>
       </checkbox>
-	  
+
 	  <!--
-	  
+
 	  <checkbox>
         <halign>left</halign>
         <label>Lightning</label>
@@ -164,7 +163,7 @@
           <command>dialog-apply</command>
         </binding>
       </checkbox>
-	  
+
 	  -->
 
       <checkbox>
@@ -180,7 +179,7 @@
 		  <object-name>random-vegetation</object-name>
         </binding>
       </checkbox>
-	  
+
 	  <group>
         <layout>hbox</layout>
 	    <text>
@@ -191,9 +190,9 @@
           <stretch>true</stretch>
         </hrule>
 	  </group>
-	  
+
 	  <!--
-	  
+
 	  <checkbox>
         <halign>left</halign>
         <label>2D clouds</label>
@@ -202,7 +201,7 @@
           <command>dialog-apply</command>
         </binding>
       </checkbox>
-	  
+
 	  -->
 
       <checkbox>
@@ -218,7 +217,7 @@
 		  <object-name>3d-clouds</object-name>
         </binding>
       </checkbox>
-	  
+
 	  <!--
 
       <group>
@@ -242,7 +241,7 @@
           <property>/sim/rendering/clouds3d-density</property>
         </text>
       </group>
-	  
+
 	  -->
 
       <group>
@@ -286,14 +285,14 @@
           <property>/sim/rendering/clouds3d-vis-range</property>
         </text>
       </group>
-	  
+
 	  <group>
 	    <layout>vbox</layout>
 		<stretch>1</stretch>
 	  </group>
 
     </group>
-	
+
     <vrule/>
 
     <group>
@@ -380,7 +379,7 @@
 			<object-name>urban-effects</object-name>
           </binding>
         </checkbox>
-        
+
         <checkbox>
           <halign>left</halign>
           <label>Transition effects</label>
@@ -497,10 +496,21 @@
           <property>/sim/rendering/quality-level</property>
         </text>
       </group>
-	  
+
     </group>
   </group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
   <nasal>
     <open>
       gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets"));
diff --git a/gui/dialogs/replay.xml b/gui/dialogs/replay.xml
index aa7056b54..17dfb2112 100644
--- a/gui/dialogs/replay.xml
+++ b/gui/dialogs/replay.xml
@@ -4,15 +4,34 @@
   <modal>false</modal>
   <layout>vbox</layout>
 
-  <text>
-    <label>Instant Replay</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Instant Replay</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/>
 
   <nasal>
     <open>
       # Populate the view combo box with a list of the available views
-      var combo = cmdarg().getNode("group").getNode("combo");
+      var combo = cmdarg().getChildren("group")[1].getNode("combo");
       combo.removeChildren("value");
 
       var current_view = getprop("/sim/current-view/view-number");
@@ -29,7 +48,7 @@
         if (v.getIndex() == current_view) {
           setprop("/sim/replay/view-name", name);
         }
-        
+
         combo.getNode("value[" ~ i ~ "]", 1).setValue(name);
         i = i + 1;
       }
@@ -38,25 +57,25 @@
 
   <group>
     <layout>table</layout>
-    
+
     <text>
       <row>0</row><col>0</col>
       <halign>right</halign>
       <label>Duration:</label>
     </text>
-    
+
     <input>
       <row>0</row><col>1</col>
       <halign>left</halign>
       <property>/sim/replay/duration</property>
     </input>
-    
+
     <text>
       <row>1</row><col>0</col>
       <halign>right</halign>
       <label>View:</label>
     </text>
-    
+
     <combo>
       <row>1</row><col>1</col>
       <halign>left</halign>
@@ -65,8 +84,8 @@
         <command>dialog-apply</command>
       </binding>
     </combo>
-    
-    
+
+
     <text>
       <row>2</row><col>0</col>
       <halign>right</halign>
@@ -81,7 +100,7 @@
         <command>dialog-apply</command>
       </binding>
     </checkbox>
-    
+
   </group>
 
   <hrule/>
@@ -90,7 +109,7 @@
     <halign>left</halign>
     <label>During replay:</label>
   </text>
-  
+
   <group>
     <layout>table</layout>
 
@@ -99,31 +118,31 @@
       <halign>center</halign>
       <label>v/V</label>
     </text>
-    
+
     <text>
       <row>1</row><col>1</col>
       <halign>left</halign>
       <label>Change view</label>
     </text>
-  
+
     <text>
       <row>2</row><col>0</col>
       <halign>center</halign>
       <label>Ctrl-v</label>
     </text>
-    
+
     <text>
       <row>2</row><col>1</col>
       <halign>left</halign>
       <label>Reset view</label>
     </text>
-    
+
     <text>
       <row>3</row><col>0</col>
       <halign>center</halign>
       <label>p p</label>
     </text>
-    
+
     <text>
       <row>3</row><col>1</col>
       <halign>left</halign>
@@ -132,7 +151,7 @@
   </group>
 
   <hrule/>
-  
+
   <group>
     <layout>hbox</layout>
     <empty><stretch>true</stretch></empty>
@@ -141,7 +160,7 @@
       <default>true</default>
       <equal>true</equal>
       <binding>
-	<command>dialog-apply</command>
+        <command>dialog-apply</command>
       </binding>
       <binding>
         <command>nasal</command>
@@ -151,10 +170,10 @@
         </script>
       </binding>
       <binding>
-	<command>replay</command>
+        <command>replay</command>
       </binding>
       <binding>
-	<command>dialog-close</command>
+        <command>dialog-close</command>
       </binding>
     </button>
     <empty><stretch>true</stretch></empty>
@@ -163,7 +182,7 @@
       <equal>true</equal>
       <key>Esc</key>
       <binding>
-	<command>dialog-close</command>
+        <command>dialog-close</command>
       </binding>
     </button>
     <empty><stretch>true</stretch></empty>
diff --git a/gui/dialogs/scenario.xml b/gui/dialogs/scenario.xml
index 3b05adada..d0d32f594 100644
--- a/gui/dialogs/scenario.xml
+++ b/gui/dialogs/scenario.xml
@@ -30,7 +30,7 @@
     <empty><stretch>true</stretch></empty>
 
     <text>
-      <label>Choose active scenario(s) for the next program start</label>
+      <label>AI Scenario Select</label>
     </text>
 
     <empty><stretch>true</stretch></empty>
@@ -49,6 +49,13 @@
 
   <hrule/>
 
+  <text>
+    <label>Choose active scenario(s) for the next program start</label>
+  </text>
+
+  <hrule/>
+
+
   <group>
     <layout>hbox</layout>
 
@@ -64,6 +71,7 @@
 
   </group>
 
+  <hrule/>
 
   <group>
     <layout>hbox</layout>
@@ -172,7 +180,7 @@
             scnNode.setValue( src.getNode("name",1).getValue() );
             i+=1;
           }
-        } 
+        }
       }
 
       var path = getprop("/sim/fg-root") ~ "/AI";
diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 4b58249d4..337661c72 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -8,9 +8,27 @@
   <width>400</width>
   <layout>vbox</layout>
 
-  <text>
-    <label>Sound Configuration</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Sound 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/>
 
@@ -49,7 +67,7 @@
       <label>Channel</label>
       <padding>10</padding>
     </text>
-    
+
     <text>
       <row>0</row>
       <col>1</col>
@@ -139,7 +157,7 @@
         <property>/sim/sound/enabled</property>
       </enable>
     </text>
-    
+
     <checkbox>
       <row>3</row>
       <col>1</col>
@@ -173,7 +191,7 @@
         <property>/sim/sound/enabled</property>
       </enable>
     </text>
-    
+
     <checkbox>
       <row>4</row>
       <col>1</col>
@@ -219,7 +237,7 @@
         <property>/sim/sound/enabled</property>
       </enable>
     </text>
-    
+
     <checkbox>
       <row>5</row>
       <col>1</col>
@@ -262,7 +280,7 @@
   <group>
     <layout>hbox</layout>
     <default-padding>10</default-padding>
-    
+
     <button>
       <legend>Apply</legend>
       <key>Enter</key>
diff --git a/gui/dialogs/static-lod.xml b/gui/dialogs/static-lod.xml
old mode 100755
new mode 100644
index 2e424f29b..ee283b296
--- a/gui/dialogs/static-lod.xml
+++ b/gui/dialogs/static-lod.xml
@@ -4,9 +4,27 @@
   <name>static-lod</name>
   <layout>vbox</layout>
 
-  <text>
-    <label>Static Scenery Level Of Detail</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>Static Scenery Level Of Detail</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/>
 
@@ -57,6 +75,8 @@
 
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
     <default-padding>10</default-padding>
@@ -66,10 +86,10 @@
       <default>true</default>
       <equal>true</equal>
       <binding>
-	<command>dialog-apply</command>
+        <command>dialog-apply</command>
       </binding>
       <binding>
-	<command>dialog-close</command>
+        <command>dialog-close</command>
       </binding>
     </button>
     <empty><stretch>true</stretch></empty>
@@ -77,7 +97,7 @@
       <legend>Apply</legend>
       <equal>true</equal>
       <binding>
-	<command>dialog-apply</command>
+        <command>dialog-apply</command>
       </binding>
     </button>
     <empty><stretch>true</stretch></empty>
@@ -85,7 +105,7 @@
       <legend>Reset</legend>
       <equal>true</equal>
       <binding>
-	<command>dialog-update</command>
+        <command>dialog-update</command>
       </binding>
     </button>
     <empty><stretch>true</stretch></empty>
@@ -93,7 +113,7 @@
       <legend>Cancel</legend>
       <key>Esc</key>
       <binding>
-	<command>dialog-close</command>
+        <command>dialog-close</command>
       </binding>
     </button>
   </group>
diff --git a/gui/dialogs/stereoscopic-view-options.xml b/gui/dialogs/stereoscopic-view-options.xml
index b873861fa..a5c55fd90 100644
--- a/gui/dialogs/stereoscopic-view-options.xml
+++ b/gui/dialogs/stereoscopic-view-options.xml
@@ -105,4 +105,16 @@
       </text>
   </group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
+
 </PropertyList>
diff --git a/gui/dialogs/system-failures.xml b/gui/dialogs/system-failures.xml
index 77e6b4799..64be83cc4 100644
--- a/gui/dialogs/system-failures.xml
+++ b/gui/dialogs/system-failures.xml
@@ -10,12 +10,12 @@
    <open>
     # Code to populate the engine entries.
     var groups = cmdarg().getChildren("group");
-    var group = groups[3].getChildren("group")[2];
+    var group = groups[1].getChildren("group")[2];
     var engines = props.globals.getNode("/engines");
     var row = 4;
     var engine = 0;
     var i = 0;
-    
+
     group.removeChildren("checkbox");
     group.removeChildren("input");
     group.removeChildren("text");
@@ -28,66 +28,78 @@
     target = group.getNode("text[" ~ i ~ "]", 1);
     props.copy(group.getNode("mtbf-label"), target);
     i += 1;
-    
+
     foreach (var e; engines.getChildren("engine")) {
-        if ((e.getChild("starter") != nil) or (e.getChild("running") != nil)) {
+        if (((e.getChild("starter") != nil) and (e.getChild("starter") != "")) or
+            ((e.getChild("running") != nil) and (e.getChild("running") != ""))   ) {
             row = row + 1;
-            
+
             # Set up the label
             target = group.getNode("text[" ~ i ~ "]", 1);
             props.copy(group.getNode("text-template"), target);
             target.getNode("row").setValue(row);
-            
+
             if (size(engines.getChildren("engine")) == 1) {
                 target.getNode("label").setValue("Engine");
             } else {
                 # Engines are indexed from 1 in the GUI.
                 target.getNode("label").setValue("Engine " ~ (engine + 1));
             }
-            
+
             # Now the checkbox
             target = group.getNode("checkbox[" ~ i ~ "]", 1);
-            props.copy(group.getChild("checkbox-template"), target);        
+            props.copy(group.getChild("checkbox-template"), target);
             target.getNode("row").setValue(row);
 
             var failure = "/sim/failure-manager/engines/engine[" ~ engine ~ "]/serviceable";
             target.getNode("property").setValue(failure);
-            
+
             # Finally the MTBF
             target = group.getNode("input[" ~ i ~ "]", 1);
             props.copy(group.getChild("input-template"), target);
             target.getNode("row").setValue(row);
             i += 1;
-            
+
             var mtbf = "/sim/failure-manager/engines/engine[" ~ engine ~ "]/mtbf";
             target.getNode("property").setValue(mtbf);
             engine += 1;
         }
     }
-    
-    
+
+
    </open>
   </nasal>
 
   <group>
     <layout>hbox</layout>
+    <empty><stretch>1</stretch></empty>
+
     <text>
       <label>System Failures</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>
 
-  <group>
-    <layout>hbox</layout>
-    <hrule/>
-  </group>
+  <hrule/>
 
-  <group>
-    <layout>hbox</layout>
+  <text>
     <halign>left</halign>
-    <text>
-      <label>Uncheck a system to fail it, or set the Mean Time/Cycles Between Failures.</label>
-    </text>
-  </group>
+    <label>Uncheck a system to fail it, or set the Mean Time/Cycles Between Failures.</label>
+  </text>
+
+  <hrule/>
 
   <group>
     <layout>hbox</layout>
@@ -103,7 +115,7 @@
         <col>0</col>
         <label>System</label>
       </text>
-      
+
       <text>
         <row>0</row>
         <col>2</col>
@@ -192,57 +204,57 @@
         <halign>right</halign>
         <label>Aileron</label>
       </text>
-      
+
       <checkbox>
         <row>5</row>
         <col>1</col>
         <property>/sim/failure-manager/controls/flight/aileron/serviceable</property>
       </checkbox>
-      
+
       <input>
         <row>5</row>
         <col>2</col>
         <property>/sim/failure-manager/controls/flight/aileron/mtbf</property>
       </input>
-      
+
       <text>
         <row>6</row>
         <col>0</col>
         <halign>right</halign>
         <label>Elevator</label>
       </text>
-      
+
       <checkbox>
         <row>6</row>
         <col>1</col>
         <property>/sim/failure-manager/controls/flight/elevator/serviceable</property>
       </checkbox>
-      
+
       <input>
         <row>6</row>
         <col>2</col>
         <property>/sim/failure-manager/controls/flight/elevator/mtbf</property>
       </input>
-      
+
       <text>
         <row>7</row>
         <col>0</col>
         <halign>right</halign>
         <label>Rudder</label>
       </text>
-      
+
       <checkbox>
         <row>7</row>
         <col>1</col>
         <property>/sim/failure-manager/controls/flight/rudder/serviceable</property>
       </checkbox>
-      
+
       <input>
         <row>7</row>
         <col>2</col>
         <property>/sim/failure-manager/controls/flight/rudder/mtbf</property>
       </input>
-      
+
 
     </group>
 
@@ -252,7 +264,7 @@
       <layout>table</layout>
       <halign>center</halign>
       <valign>top</valign>
-    
+
       <text>
         <row>0</row>
         <col>0</col>
@@ -264,58 +276,58 @@
         <col>2</col>
         <label>MCBF</label>
       </text>
-      
+
       <text>
         <row>1</row>
         <col>0</col>
         <halign>right</halign>
         <label>Landing Gear</label>
       </text>
-      
+
       <checkbox>
         <row>1</row>
         <col>1</col>
         <property>/gear/serviceable</property>
       </checkbox>
-      
+
       <input>
         <row>1</row>
         <col>2</col>
         <property>/sim/failure-manager/controls/gear/gear-down/mcbf</property>
       </input>
-  
+
       <text>
         <row>2</row>
         <col>0</col>
         <halign>right</halign>
         <label>Flaps</label>
       </text>
-      
+
       <checkbox>
         <row>2</row>
         <col>1</col>
         <property>/sim/failure-manager/controls/flight/flaps/serviceable</property>
       </checkbox>
-      
+
       <input>
         <row>2</row>
         <col>2</col>
         <property>/sim/failure-manager/controls/flight/flaps/mcbf</property>
       </input>
-      
+
       <text>
         <row>3</row>
         <col>0</col>
         <halign>right</halign>
         <label>Speedbrake</label>
       </text>
-      
+
       <checkbox>
         <row>3</row>
         <col>1</col>
         <property>/sim/failure-manager/controls/flight/speedbrake/serviceable</property>
       </checkbox>
-      
+
       <input>
         <row>3</row>
         <col>2</col>
@@ -324,46 +336,48 @@
     </group>
 
     <vrule/>
-    
+
     <group>
       <layout>table</layout>
       <halign>center</halign>
       <valign>top</valign>
-      
+
       <engine-label>
         <row>0</row>
         <col>0</col>
         <label>Engine</label>
        </engine-label>
-      
+
       <mtbf-label>
         <row>0</row>
         <col>2</col>
         <label>MTBF</label>
       </mtbf-label>
-      
+
       <text-template>
         <row><!-- template value--></row>
         <col>0</col>
         <halign>right</halign>
         <label><!-- template value--></label>
       </text-template>
-      
+
       <checkbox-template>
         <row><!-- template value--></row>
         <col>1</col>
         <property><!-- template value--></property>
       </checkbox-template>
-      
+
       <input-template>
         <row><!-- template value--></row>
         <col>2</col>
         <property><!-- template value--></property>
       </input-template>
-      
+
     </group>
   </group>
 
+  <hrule/>
+
   <group>
     <layout>hbox</layout>
 
diff --git a/gui/dialogs/timeofday.xml b/gui/dialogs/timeofday.xml
index 7d79fefc4..50688ff21 100644
--- a/gui/dialogs/timeofday.xml
+++ b/gui/dialogs/timeofday.xml
@@ -9,18 +9,17 @@
 	<group>
 		<layout>hbox</layout>
 		<empty><stretch>1</stretch></empty>
-		
+
 		<text>
 			<label>Time Settings</label>
 		</text>
-		
+
 		<empty><stretch>1</stretch></empty>
-			
+
 		<button>
 			<pref-width>16</pref-width>
 			<pref-height>16</pref-height>
 			<legend></legend>
-			<default>1</default>
 			<keynum>27</keynum>
 			<border>2</border>
 			<binding>
@@ -158,14 +157,6 @@
 				</button>
 			</group>
 
-			<empty>
-				<pref-height>6</pref-height>
-			</empty>
-			<hrule/>
-			<empty>
-				<pref-height>6</pref-height>
-			</empty>
-
 			<empty>
 				<stretch>true</stretch>
 			</empty>
@@ -261,4 +252,15 @@
 		</group>
 	</group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
 </PropertyList>
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index b105ee1db..7d71cc515 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -5,15 +5,37 @@
 	<modal>false</modal>
 	<layout>vbox</layout>
 
+  <group>
+    <layout>hbox</layout>
+	  <empty><stretch>1</stretch></empty>
+
+    <text>
+      <label>View Options</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/>
+
 	<text>
 		<label>Choose Active Views</label>
 	</text>
 
-	<hrule/>
-
-		<nasal>
+  <nasal>
 		<open>
-			var group = cmdarg().getNode("group");
+			var group = cmdarg().getChildren("group")[1];
 			var ac = getprop("/sim/aircraft");
 			group.removeChildren("checkbox");
 			group.removeChildren("hrule");
@@ -64,6 +86,8 @@
 		</checkbox-template>
 	</group>
 
+	<hrule/>
+
 	<button>
 		<legend>Close</legend>
 		<default>true</default>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 17b17ac11..0d199dda1 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -37,6 +37,7 @@
       </binding>
     </button>
   </group>
+
   <hrule/>
 
   <group>
@@ -55,7 +56,7 @@
           <layout>hbox</layout>
           <text>
             <label>Cloud Layers (All Altitudes ft-AMSL)</label>
-		    <enable> 
+		    <enable>
               <property>/sim/gui/dialogs/weather-scenario/state</property>
             </enable>
           </text>
@@ -73,7 +74,7 @@
               <label>Altitude (ft)</label>
               <row>0</row>
               <col>1</col>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -83,7 +84,7 @@
               <row>0</row>
               <col>2</col>
               <width>80</width>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -92,7 +93,7 @@
               <label>Thickness (ft)</label>
               <row>0</row>
               <col>3</col>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -405,7 +406,7 @@
           <layout>hbox</layout>
           <text>
             <label>Precipitation</label>
-		    <enable> 
+		    <enable>
               <property>/sim/gui/dialogs/weather-scenario/state</property>
             </enable>
           </text>
@@ -423,7 +424,7 @@
               <row>0</row>
               <col>0</col>
               <label>Rain</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -432,7 +433,7 @@
               <row>0</row>
               <col>1</col>
               <label>Snow</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -477,7 +478,7 @@
               <row>0</row>
               <col>3</col>
               <label>QNH (inHg)</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -526,7 +527,7 @@
     <!-- Right Column -->
     <group>
       <layout>vbox</layout>
-    
+
       <!-- Aloft -->
       <group>
         <layout>vbox</layout>
@@ -1140,7 +1141,7 @@
           <layout>hbox</layout>
           <text>
             <label>Boundary (All Elevations ft-AGL)</label>
-		    <enable> 
+		    <enable>
               <property>/sim/gui/dialogs/weather-scenario/state</property>
             </enable>
           </text>
@@ -1159,7 +1160,7 @@
               <row>0</row>
               <col>0</col>
               <label>Elevation</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -1169,7 +1170,7 @@
               <col>1</col>
               <colspan>2</colspan>
               <label>Wind (dir/kt)</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -1178,7 +1179,7 @@
               <row>0</row>
               <col>3</col>
               <label>Vis (m)</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -1187,7 +1188,7 @@
               <row>0</row>
               <col>4</col>
               <label>Temp (C)</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -1196,7 +1197,7 @@
               <row>0</row>
               <col>5</col>
               <label>Dewpt (C)</label>
-		      <enable> 
+		      <enable>
                 <property>/sim/gui/dialogs/weather-scenario/state</property>
               </enable>
             </text>
@@ -1436,7 +1437,7 @@
 
       </group>
       <!-- Boundary  End -->
-    
+
     </group>
     <!-- Right Column -->
 
@@ -1548,9 +1549,20 @@
     </textbox>
 
     <!-- Automatic Weather -->
-    
+
   </group>
 
+  <hrule/>
+
+  <button>
+    <legend>Close</legend>
+    <default>true</default>
+    <key>Esc</key>
+    <binding>
+      <command>dialog-close</command>
+    </binding>
+  </button>
+
   <nasal>
     <open><![CDATA[
         var normalize_string = func(src) {