diff --git a/Aircraft/Generic/WalkView/walkview.nas b/Aircraft/Generic/WalkView/walkview.nas
index 0824dc229..cecd081c6 100644
--- a/Aircraft/Generic/WalkView/walkview.nas
+++ b/Aircraft/Generic/WalkView/walkview.nas
@@ -362,7 +362,7 @@ var TO_DEG = 180/math.pi;
 var walkers = {};
 
 var closerXY = func (pos, p1, p2) {
-    l1 = [p1[0] - pos[0], p1[1] - pos[1]];
-    l2 = [p2[0] - pos[0], p2[1] - pos[1]];
+    var l1 = [p1[0] - pos[0], p1[1] - pos[1]];
+    var l2 = [p2[0] - pos[0], p2[1] - pos[1]];
     return (l1[0]*l1[0] + l1[1]*l1[1]) - (l2[0]*l2[0] + l2[1]*l2[1]);
 }
diff --git a/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml b/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
index 02ee2b61d..a9666f23c 100644
--- a/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
+++ b/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
@@ -279,7 +279,10 @@ properties' values.
   <animation>
     <type>select</type>
     <object-name>vs-minus</object-name>
-    <object-name>vs-digits-minus</object-name>
+    <object-name>vs-digit2-minus</object-name>
+    <object-name>vs-digit3-minus</object-name>
+    <object-name>vs-digit4-minus</object-name>
+    <object-name>vs-digit5-minus</object-name>
     <condition>
       <and>
         <equals>
@@ -287,15 +290,18 @@ properties' values.
           <value type="bool">true</value>
         </equals>
         <greater-than>
-          <value>0</value>
           <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+          <value>0</value>
         </greater-than>
       </and>
     </condition>
   </animation>
   <animation>
     <type>select</type>
-    <object-name>vs-digits</object-name>
+    <object-name>vs-digit2</object-name>
+    <object-name>vs-digit3</object-name>
+    <object-name>vs-digit4</object-name>
+    <object-name>vs-digit5</object-name>
     <condition>
       <and>
         <equals>
@@ -303,8 +309,8 @@ properties' values.
           <value type="bool">true</value>
         </equals>
         <less-than>
-          <value>0</value>
           <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+          <value>0</value>
         </less-than>
       </and>
     </condition>
@@ -312,11 +318,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit5</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -331,11 +336,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit4</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -350,11 +354,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit3</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -369,11 +372,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit2</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -388,11 +390,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit5-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -407,11 +408,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit4-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -426,11 +426,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit3-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -445,11 +444,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit2-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -911,5 +909,5 @@ properties' values.
       </binding>
     </action>
   </animation>
-  
+
 </PropertyList>
diff --git a/Environment/metarinterpolator.xml b/Environment/metarinterpolator.xml
index 2c027ea10..c67cb2ab5 100644
--- a/Environment/metarinterpolator.xml
+++ b/Environment/metarinterpolator.xml
@@ -28,7 +28,7 @@
     -->
     <name>MetarController:pressure-sea-level-inhg</name>
     <type>noise-spike</type>
-    <max-rate-of-change>0.0003</max-rate-of-change>
+    <max-rate-of-change>0.006</max-rate-of-change>
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
diff --git a/Input/Keyboard/multikey.xml b/Input/Keyboard/multikey.xml
index c6b0a1608..6b9e01307 100644
--- a/Input/Keyboard/multikey.xml
+++ b/Input/Keyboard/multikey.xml
@@ -89,16 +89,6 @@
 			</binding>
 		</key>
 
-		<key n="99">
-			<name>c</name>
-			<desc>Clouds</desc>
-			<exit/>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>clouds</dialog-name>
-			</binding>
-		</key>
-
 		<key n="102">
 			<name>f</name>
 			<desc>Fuel and Payload</desc>
@@ -241,7 +231,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "Fair weather");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -253,7 +242,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "METAR");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -265,7 +253,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "none");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -277,7 +264,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "Thunderstorm");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
diff --git a/Nasal/contrail.nas b/Nasal/contrail.nas
index 167759324..3ae2fcb41 100644
--- a/Nasal/contrail.nas
+++ b/Nasal/contrail.nas
@@ -26,7 +26,7 @@ updateContrail = func{
 
 ### Contrail
 
-print ("init contrail");
+printlog ("debug", "init contrail");
 _setlistener("/sim/signals/nasal-dir-initialized", func {
     props.globals.initNode("environment/pressure-inhg", 1, "DOUBLE");
     props.globals.initNode("environment/temperature-degc", 1, "DOUBLE");
diff --git a/Nasal/mp_broadcast.nas b/Nasal/mp_broadcast.nas
index cabef40ac..702a3372d 100644
--- a/Nasal/mp_broadcast.nas
+++ b/Nasal/mp_broadcast.nas
@@ -45,24 +45,25 @@ BroadcastChannel.new = func (mpp_path, process,
                              accept_predicate = nil,
                              on_disconnect = nil,
                              enable_send=1) {
-  obj = { parents      : [BroadcastChannel],
-          mpp_path     : mpp_path,
-          send_node    : enable_send ? props.globals.getNode(mpp_path, 1) 
-                                     : nil,
-          process_msg  : process,
-          send_to_self : send_to_self,
-          accept_predicate : (accept_predicate != nil) ? accept_predicate :
-                                                         func (p) { return 1; },
-          on_disconnect    : (on_disconnect != nil) ? on_disconnect :
-                                                      func (p) { return; },
-          # Internal state.
-          send_buf     : [],
-          peers        : {},
-          loopid       : 0,
-          PERIOD       : 1.3,
-          last_time    : 0.0,  # For join handling.
-          last_send    : 0.0,  # For the send queue 
-          SEND_TIME    : 0.5 };
+  var obj = { parents      : [BroadcastChannel],
+              mpp_path     : mpp_path,
+              send_node    : enable_send ? props.globals.getNode(mpp_path, 1) 
+                                         : nil,
+              process_msg  : process,
+              send_to_self : send_to_self,
+              accept_predicate :
+                (accept_predicate != nil) ? accept_predicate
+                                          : func (p) { return 1; },
+              on_disconnect : (on_disconnect != nil) ? on_disconnect
+                                                     : func (p) { return; },
+              # Internal state.
+              send_buf     : [],
+              peers        : {},
+              loopid       : 0,
+              PERIOD       : 1.3,
+              last_time    : 0.0,  # For join handling.
+              last_send    : 0.0,  # For the send queue 
+              SEND_TIME    : 0.5 };
   if (enable_send and (obj.send_node == nil)) {
     printlog("warn",
              "BroadcastChannel invalid send node.");
@@ -232,10 +233,10 @@ Binary.decodeCoord = func (str) {
 #       The same object is seldom used for both sending and receiving.
 var MessageChannel = {};
 MessageChannel.new = func (n = nil, process = nil) {
-  obj = { parents     : [MessageChannel],
-          node        : n, 
-          process_msg : process,
-          old         : "" };
+  var obj = { parents     : [MessageChannel],
+              node        : n, 
+              process_msg : process,
+              old         : "" };
   return obj;
 }
 MessageChannel.update = func {
diff --git a/Nasal/seaport.nas b/Nasal/seaport.nas
index 5d9cb7fdb..f496b6ecb 100644
--- a/Nasal/seaport.nas
+++ b/Nasal/seaport.nas
@@ -1,5 +1,5 @@
 _setlistener("/sim/presets/latitude-deg", func {
-	print("*** NEW LOCATION ***");
+	printlog("info", "*** NEW LOCATION ***");
 	settimer(func {
 		var typ = getprop("/sim/type");
 		var lat = getprop("/position/latitude-deg");
diff --git a/Nasal/startup.nas b/Nasal/startup.nas
index dddf1524f..d2d692a14 100644
--- a/Nasal/startup.nas
+++ b/Nasal/startup.nas
@@ -1,6 +1,4 @@
 var set_runway_from_metar_wind = func {
-	if (!getprop("/environment/realwx/enabled"))
-		return printlog("info", "metar-rwy: no live weather");
 	if (!getprop("/environment/metar/valid"))
 		return printlog("info", "metar-rwy: no valid metar");
 	if (!getprop("/sim/startup/options/airport"))
diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
index bc7eccaa6..a2861d45e 100644
--- a/gui/dialogs/display.xml
+++ b/gui/dialogs/display.xml
@@ -42,13 +42,23 @@
       </binding>
     </checkbox>
 
-    <item>
+    <checkbox>
+      <halign>left</halign>
       <label>Show 2D Panel</label>
       <property>/sim/panel/visibility</property>
       <binding>
         <command>dialog-apply</command>
       </binding>
-    </item>
+    </checkbox>
+
+    <checkbox>
+      <halign>left</halign>
+      <label>Autohide Menubar</label>
+      <property>/sim/menubar/autovisibility/enabled</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
   </group>
 
   <hrule/>
diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index 63e104414..4e2fa953a 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -260,6 +260,8 @@
       <binding>
         <command>nasal</command>
         <script>
+          setprop("/sim/presets/parkpos", "");
+            
           if (!mode.airport.getBoolValue()) {
             setprop("/sim/presets/airport-id", "");
             setprop("/sim/presets/runway", "");
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 058e25879..b0e8b8a1a 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1,1659 +1,1664 @@
-<?xml version="1.0"?>
-
-<PropertyList>
-
-  <!-- Control the weather -->
-  <name>weather</name>
-  <modal>false</modal>
-  <resizable>false</resizable>
-  <layout>vbox</layout>
-  <default-padding>3</default-padding>
-
-  <!-- Title bar with close button -->
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-
-    <empty>
-      <stretch>true</stretch>
-    </empty>
-
-    <text>
-      <label>Global Troposphere Weather Conditions</label>
-    </text>
-
-    <empty>
-      <stretch>true</stretch>
-    </empty>
-
-    <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/>
-
-  <group>
-    <layout>hbox</layout>
-    <default-padding>0</default-padding>
-
-    <!-- Left Column -->
-    <group>
-      <layout>vbox</layout>
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <!-- Cloud Layers -->
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Cloud Layers (All Altitudes ft-AMSL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-            <layout>table</layout>
-
-            <text>
-              <label>Altitude (ft)</label>
-              <row>0</row>
-              <col>1</col>
-            </text>
-
-            <text>
-              <label>Coverage</label>
-              <row>0</row>
-              <col>2</col>
-              <width>80</width>
-            </text>
-
-            <text>
-              <label>Thickness (ft)</label>
-              <row>0</row>
-              <col>3</col>
-            </text>
-
-
-            <!-- Layer 4 -->
-
-            <input>
-              <row>1</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>1</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 3 -->
-
-            <input>
-              <row>2</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>2</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 2 -->
-
-            <input>
-              <row>3</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>3</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>3</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 1 -->
-
-            <input>
-              <row>4</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>4</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>4</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-
-            <!-- Layer 0 -->
-
-            <input>
-              <row>5</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[0]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-            <combo>
-              <row>5</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <editable>false</editable>
-              <property>/environment/clouds/layer[0]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </combo>
-
-            <input>
-              <row>5</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[0]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </input>
-
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-      </group>
-      <!-- Cloud Layers End -->
-
-      <!-- Precipitation -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Precipitation</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <halign>fill</halign>
-          <group>
-            <layout>table</layout>
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Rain</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <label>Snow</label>
-            </text>
-
-            <slider>
-              <row>1</row>
-              <col>0</col>
-              <live>true</live>
-              <halign>fill</halign>
-              <property>/environment/metar/rain-norm</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <stretch>true</stretch>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </slider>
-
-            <slider>
-              <row>1</row>
-              <col>1</col>
-              <halign>fill</halign>
-              <property>/environment/metar/snow-norm</property>
-              <live>true</live>
-              <pref-height>30</pref-height>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-            </slider>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>QNH (inHg)</label>
-            </text>
-
-            <input>
-              <name>pressure-sea-level-inhg</name>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>50</pref-width>
-              <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>pressure-sea-level-inhg</object-name>
-              </binding>
-            </input>
-
-            <empty>
-              <row>2</row>
-              <col>0</col>
-              <colspan>3</colspan>
-              <pref-height>30</pref-height>
-            </empty>
-
-          </group>
-
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-      </group>
-      <!-- Precipitation End  -->
-    </group>
-    <!-- Left Column End -->
-
-    <vrule>
-      <stretch>true</stretch>
-    </vrule>
-
-    <!-- Right Column -->
-    <group>
-      <layout>vbox</layout>
-    
-      <!-- Aloft -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Aloft (All Altitudes ft-AMSL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-            <layout>table</layout>
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Altitude</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <colspan>2</colspan>
-              <label>Wind (dir/kt)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>Vis (m)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>4</col>
-              <label>Temp (C)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>5</col>
-              <label>Dewpt (C)</label>
-            </text>
-
-            <input>
-              <name>aloft-4-elevation-ft</name>
-              <row>1</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-wind-from-heading-deg</name>
-              <row>1</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-wind-speed-kt</name>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-visibility-m</name>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-temperature-degc</name>
-              <row>1</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-4-dewpoint-degc</name>
-              <row>1</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[4]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-4-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-elevation-ft</name>
-              <row>2</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-wind-from-heading-deg</name>
-              <row>2</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-wind-speed-kt</name>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-visibility-m</name>
-              <row>2</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-temperature-degc</name>
-              <row>2</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-3-dewpoint-degc</name>
-              <row>2</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[3]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-3-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-elevation-ft</name>
-              <row>3</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-wind-from-heading-deg</name>
-              <row>3</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-wind-speed-kt</name>
-              <row>3</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-visibility-m</name>
-              <row>3</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-temperature-degc</name>
-              <row>3</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-2-dewpoint-degc</name>
-              <row>3</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[2]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-2-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-elevation-ft</name>
-              <row>4</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-wind-from-heading-deg</name>
-              <row>4</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-wind-speed-kt</name>
-              <row>4</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-visibility-m</name>
-              <row>4</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-temperature-degc</name>
-              <row>4</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-1-dewpoint-degc</name>
-              <row>4</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[1]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-1-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-elevation-ft</name>
-              <row>5</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-wind-from-heading-deg</name>
-              <row>5</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-wind-speed-kt</name>
-              <row>5</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-visibility-m</name>
-              <row>5</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-temperature-degc</name>
-              <row>5</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>aloft-0-dewpoint-degc</name>
-              <row>5</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/aloft/entry[0]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>aloft-0-dewpoint-degc</object-name>
-              </binding>
-            </input>
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-
-      </group>
-      <!-- Aloft End -->
-
-      <!-- Boundary  -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Boundary (All Elevations ft-AGL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-
-            <layout>table</layout>
-
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Elevation</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <colspan>2</colspan>
-              <label>Wind (dir/kt)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>Vis (m)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>4</col>
-              <label>Temp (C)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>5</col>
-              <label>Dewpt (C)</label>
-            </text>
-
-            <input>
-              <name>boundary-1-elevation-ft</name>
-              <row>1</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-wind-from-heading-deg</name>
-              <row>1</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-wind-speed-kt</name>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-visibility-m</name>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-temperature-degc</name>
-              <row>1</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-1-dewpoint-degc</name>
-              <row>1</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[1]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-1-dewpoint-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-elevation-ft</name>
-              <row>2</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/elevation-ft</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-elevation-ft</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-wind-from-heading-deg</name>
-              <row>2</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-wind-from-heading-deg</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-wind-speed-kt</name>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-wind-speed-kt</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-visibility-m</name>
-              <row>2</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/visibility-m</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-visibility-m</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-temperature-degc</name>
-              <row>2</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/temperature-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-temperature-degc</object-name>
-              </binding>
-            </input>
-
-            <input>
-              <name>boundary-0-dewpoint-degc</name>
-              <row>2</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <enable>
-                <equals>
-                  <property>/sim/gui/dialogs/weather-scenario/state</property>
-                  <value type="int">1</value>
-                </equals>
-              </enable>
-              <property>/environment/config/boundary/entry[0]/dewpoint-degc</property>
-              <live>true</live>
-              <binding>
-                <command>dialog-apply</command>
-                <object-name>boundary-0-dewpoint-degc</object-name>
-              </binding>
-            </input>
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-
-      </group>
-      <!-- Boundary  End -->
-    
-    </group>
-    <!-- Right Column -->
-
-  </group>
-
-  <group>
-    <layout>vbox</layout>
-
-    <!-- Automatic Weather -->
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>Automatic Weather Generation</label>
-      </text>
-      <hrule>
-        <stretch>true</stretch>
-      </hrule>
-    </group>
-
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>METAR Source</label>
-      </text>
-      <combo>
-        <name>source-selection</name>
-        <halign>fill</halign>
-        <stretch>true</stretch>
-        <property>sim/gui/dialogs/weather-scenario/source-selection</property>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>source-selection</object-name>
-        </binding>
-        <binding>
-          <command>dialog-update</command>
-          <object-name>metar</object-name>
-        </binding>
-      </combo>
-
-      <checkbox>
-        <name>metar-updates-winds-aloft</name>
-        <property>/environment/params/metar-updates-winds-aloft</property>
-        <label>Update winds aloft</label>
-        <live>true</live>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>metar-updates-winds-aloft</object-name>
-        </binding>
-        <name>aloft</name>
-      </checkbox>
-
-    </group>
-
-    <textbox>
-      <name>description</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>180</pref-width>
-      <pref-height>60</pref-height>
-      <slider>20</slider>
-      <editable>false</editable>
-      <wrap>true</wrap>
-      <live>true</live>
-      <property>sim/gui/dialogs/weather-scenario/description</property>
-    </textbox>
-
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>METAR Data</label>
-      </text>
-      <empty>
-        <stretch>true</stretch>
-      </empty>
-    </group>
-
-    <textbox>
-      <name>metar</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>180</pref-width>
-      <pref-height>50</pref-height>
-      <slider>20</slider>
-      <editable>true</editable>
-      <wrap>true</wrap>
-      <live>false</live>
-      <property>sim/gui/dialogs/weather-scenario/metar</property>
-      <enable>
-	<equals>
-	  <property>/sim/gui/dialogs/weather-scenario/state</property>
-	  <value type="int">1</value>
-	</equals>
-      </enable>
-    </textbox>
-
-    <!-- Automatic Weather -->
-    
-  </group>
-
-  <nasal>
-    <open><![CDATA[
-        var normalize_string = func(src) {
-          if( src == nil ) src = "";
-          var dst = "";
-          for( var i = 0; i < size(src); i+=1 ) {
-            if( src[i] == `\n` or src[i] == `\r` )
-              src[i] = ` `;
-
-            if( i != 0 and src[i] == ` ` and src[i-1] == ` ` )
-              continue;
-
-            dst = dst ~ " ";
-            dst[size(dst)-1] = src[i];
-          }
-          return dst;
-        }
-
-      var GlobalWeatherDialogController = {
-
-        new : func( dlgRoot ) {
-          var obj = { parents: [GlobalWeatherDialogController] };
-          obj.dlgRoot = dlgRoot;
-          obj.base = "sim/gui/dialogs/weather-scenario";
-          obj.baseN = props.globals.getNode( obj.base, 1 );
-
-          return obj;
-        },
-
-        open : func {
-          #initialize the METAR source selection
-          if( getprop( "environment/params/metar-updates-environment" ) == 0 ) {
-            setprop( me.base ~ "/source-selection", "Disabled" );
-          } else if( getprop( "environment/realwx/enabled" ) ) {
-            setprop( me.base ~ "/source-selection", "Live data" );
-          } else {
-            setprop( me.base ~ "/source-selection", "Manual input" );
-          }
-          setprop( me.base ~ "/metar", normalize_string(getprop("environment/metar/data")) );
-
-
-          # fill the METAR source combo box
-          var combo = me.findElementByName( me.dlgRoot, "source-selection" );
-          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-          if( wsn != nil ) {
-            var scenarios = wsn.getChildren("scenario");
-            forindex (var i; scenarios )
-              combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
-          }
-
-          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); } );
-          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 0 );
-        },
-
-        close : func {
-          removelistener( me.scenarioListenerId );
-          removelistener( me.metarListenerId );
-        },
-
-        stateChange : func {
-          var scenarioName = getprop( me.base ~ "/source-selection");
-          var metar = nil;
-          if( scenarioName == "Disabled" ) {
-            setprop( "/environment/params/metar-updates-environment", 0 );
-            setprop( "/environment/realwx/enabled", 0 );
-            setprop( "/environment/config/enabled", 0 );
-            me.baseN.getNode("state",1).setIntValue( 1 );
-            metar = "";
-          } else if( scenarioName == "Live data" ) {
-            setprop( "/environment/params/metar-updates-environment", 1 );
-            setprop( "/environment/realwx/enabled", 1 );
-            setprop( "/environment/config/enabled", 1 );
-            me.baseN.getNode("state",1).setIntValue( 0 );
-          } else {
-            setprop( "/environment/params/metar-updates-environment", 1 );
-            setprop( "/environment/realwx/enabled", 0 );
-            setprop( "/environment/config/enabled", 1 );
-            metar = getprop( me.base ~ "/metar" );
-            me.baseN.getNode("state",1).setIntValue( 0 );
-          }
-          if( metar != nil )
-            setprop( "environment/metar/data", normalize_string(metar) );
-        },
-
-        findScenarioByName : func(name) {
-          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-          if( wsn != nil ) {
-            var scenarios = wsn.getChildren("scenario");
-            foreach (var scenario; scenarios ) {
-              if( scenario.getNode("name").getValue() == name )
-                return scenario;
-            }
-          }
-          return nil;
-        },
-
-        findElementByName : func(base,name) {
-          foreach( var child; base.getChildren() ) {
-            var n = child.getNode( "name" );
-            if( n != nil and n.getValue() == name )
-              return child;
-            var f = me.findElementByName(child,name);
-            if( f != nil ) return f;
-          }
-          return nil;
-        },
-
-        scenarioListener : func( n ) {
-          description = "";
-          metar = "nil";
-          var scenario = me.findScenarioByName( n.getValue() );
-          if( scenario != nil ) {
-            description = normalize_string(scenario.getNode("description", 1 ).getValue());
-            metar = normalize_string(scenario.getNode("metar", 1 ).getValue());
-          }
-          setprop(me.base ~ "/description", description );
-          setprop(me.base ~ "/metar", metar );
-          me.stateChange();
-        },
-
-        metarListener : func( n ) {
-          var metar = getprop("environment/metar/data");
-          if( metar == nil or metar == "" ) metar = "NIL";
-          metar = normalize_string(metar);
-          setprop( me.base ~ "/metar", metar );
-          gui.dialog_update( "weather", "metar" );
-        },
-
-      };
-
-      var controller = GlobalWeatherDialogController.new( cmdarg() );
-      controller.open();
-    ]]></open>
-
-    <close><![CDATA[
-      controller.close();
-    ]]></close>
-  </nasal>
-</PropertyList>
+<?xml version="1.0"?>
+
+<PropertyList>
+
+  <!-- Control the weather -->
+  <name>weather</name>
+  <modal>false</modal>
+  <resizable>false</resizable>
+  <layout>vbox</layout>
+  <default-padding>3</default-padding>
+
+  <!-- Title bar with close button -->
+  <group>
+    <layout>hbox</layout>
+    <default-padding>1</default-padding>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+    <text>
+      <label>Global Troposphere Weather Conditions</label>
+    </text>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+    <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/>
+
+  <group>
+    <layout>hbox</layout>
+    <default-padding>0</default-padding>
+
+    <!-- Left Column -->
+    <group>
+      <layout>vbox</layout>
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <!-- Cloud Layers -->
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Cloud Layers (All Altitudes ft-AMSL)</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <group>
+            <layout>table</layout>
+
+            <text>
+              <label>Altitude (ft)</label>
+              <row>0</row>
+              <col>1</col>
+            </text>
+
+            <text>
+              <label>Coverage</label>
+              <row>0</row>
+              <col>2</col>
+              <width>80</width>
+            </text>
+
+            <text>
+              <label>Thickness (ft)</label>
+              <row>0</row>
+              <col>3</col>
+            </text>
+
+
+            <!-- Layer 4 -->
+
+            <input>
+              <row>1</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[4]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>1</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[4]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>1</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[4]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 3 -->
+
+            <input>
+              <row>2</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[3]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>2</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[3]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>2</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[3]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 2 -->
+
+            <input>
+              <row>3</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[2]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>3</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[2]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>3</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[2]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 1 -->
+
+            <input>
+              <row>4</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[1]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>4</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[1]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>4</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[1]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 0 -->
+
+            <input>
+              <row>5</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[0]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>5</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <editable>false</editable>
+              <property>/environment/clouds/layer[0]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>5</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[0]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+          </group>
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+      </group>
+      <!-- Cloud Layers End -->
+
+      <!-- Precipitation -->
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Precipitation</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <halign>fill</halign>
+          <group>
+            <layout>table</layout>
+            <text>
+              <row>0</row>
+              <col>0</col>
+              <label>Rain</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>1</col>
+              <label>Snow</label>
+            </text>
+
+            <slider>
+              <row>1</row>
+              <col>0</col>
+              <live>true</live>
+              <halign>fill</halign>
+              <property>/environment/metar/rain-norm</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <stretch>true</stretch>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </slider>
+
+            <slider>
+              <row>1</row>
+              <col>1</col>
+              <halign>fill</halign>
+              <property>/environment/metar/snow-norm</property>
+              <live>true</live>
+              <pref-height>30</pref-height>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </slider>
+
+            <text>
+              <row>0</row>
+              <col>3</col>
+              <label>QNH (inHg)</label>
+            </text>
+
+            <input>
+              <name>pressure-sea-level-inhg</name>
+              <row>1</row>
+              <col>3</col>
+              <pref-width>50</pref-width>
+              <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>pressure-sea-level-inhg</object-name>
+              </binding>
+            </input>
+
+            <empty>
+              <row>2</row>
+              <col>0</col>
+              <colspan>3</colspan>
+              <pref-height>30</pref-height>
+            </empty>
+
+          </group>
+
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+      </group>
+      <!-- Precipitation End  -->
+    </group>
+    <!-- Left Column End -->
+
+    <vrule>
+      <stretch>true</stretch>
+    </vrule>
+
+    <!-- Right Column -->
+    <group>
+      <layout>vbox</layout>
+    
+      <!-- Aloft -->
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Aloft (All Altitudes ft-AMSL)</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <group>
+            <layout>table</layout>
+            <text>
+              <row>0</row>
+              <col>0</col>
+              <label>Altitude</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>1</col>
+              <colspan>2</colspan>
+              <label>Wind (dir/kt)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>3</col>
+              <label>Vis (m)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>4</col>
+              <label>Temp (C)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>5</col>
+              <label>Dewpt (C)</label>
+            </text>
+
+            <input>
+              <name>aloft-4-elevation-ft</name>
+              <row>1</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-wind-from-heading-deg</name>
+              <row>1</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-wind-speed-kt</name>
+              <row>1</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-visibility-m</name>
+              <row>1</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-temperature-degc</name>
+              <row>1</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-dewpoint-degc</name>
+              <row>1</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-elevation-ft</name>
+              <row>2</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-wind-from-heading-deg</name>
+              <row>2</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-wind-speed-kt</name>
+              <row>2</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-visibility-m</name>
+              <row>2</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-temperature-degc</name>
+              <row>2</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-dewpoint-degc</name>
+              <row>2</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-elevation-ft</name>
+              <row>3</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-wind-from-heading-deg</name>
+              <row>3</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-wind-speed-kt</name>
+              <row>3</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-visibility-m</name>
+              <row>3</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-temperature-degc</name>
+              <row>3</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-dewpoint-degc</name>
+              <row>3</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-elevation-ft</name>
+              <row>4</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-wind-from-heading-deg</name>
+              <row>4</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-wind-speed-kt</name>
+              <row>4</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-visibility-m</name>
+              <row>4</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-temperature-degc</name>
+              <row>4</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-dewpoint-degc</name>
+              <row>4</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-elevation-ft</name>
+              <row>5</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-wind-from-heading-deg</name>
+              <row>5</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-wind-speed-kt</name>
+              <row>5</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-visibility-m</name>
+              <row>5</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-temperature-degc</name>
+              <row>5</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-dewpoint-degc</name>
+              <row>5</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-dewpoint-degc</object-name>
+              </binding>
+            </input>
+          </group>
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+
+      </group>
+      <!-- Aloft End -->
+
+      <!-- Boundary  -->
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Boundary (All Elevations ft-AGL)</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <group>
+
+            <layout>table</layout>
+
+            <text>
+              <row>0</row>
+              <col>0</col>
+              <label>Elevation</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>1</col>
+              <colspan>2</colspan>
+              <label>Wind (dir/kt)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>3</col>
+              <label>Vis (m)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>4</col>
+              <label>Temp (C)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>5</col>
+              <label>Dewpt (C)</label>
+            </text>
+
+            <input>
+              <name>boundary-1-elevation-ft</name>
+              <row>1</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-wind-from-heading-deg</name>
+              <row>1</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-wind-speed-kt</name>
+              <row>1</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-visibility-m</name>
+              <row>1</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-temperature-degc</name>
+              <row>1</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-dewpoint-degc</name>
+              <row>1</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-elevation-ft</name>
+              <row>2</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-wind-from-heading-deg</name>
+              <row>2</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-wind-speed-kt</name>
+              <row>2</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-visibility-m</name>
+              <row>2</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-temperature-degc</name>
+              <row>2</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-dewpoint-degc</name>
+              <row>2</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-dewpoint-degc</object-name>
+              </binding>
+            </input>
+          </group>
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+
+      </group>
+      <!-- Boundary  End -->
+    
+    </group>
+    <!-- Right Column -->
+
+  </group>
+
+  <group>
+    <layout>vbox</layout>
+
+    <!-- Automatic Weather -->
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>Automatic Weather Generation</label>
+      </text>
+      <hrule>
+        <stretch>true</stretch>
+      </hrule>
+    </group>
+
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>METAR Source</label>
+      </text>
+      <combo>
+        <name>source-selection</name>
+        <halign>fill</halign>
+        <stretch>true</stretch>
+        <property>sim/gui/dialogs/weather-scenario/source-selection</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>source-selection</object-name>
+        </binding>
+        <binding>
+          <command>dialog-update</command>
+          <object-name>metar</object-name>
+        </binding>
+      </combo>
+
+      <checkbox>
+        <name>metar-updates-winds-aloft</name>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+        <label>Update winds aloft</label>
+        <live>true</live>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>metar-updates-winds-aloft</object-name>
+        </binding>
+      </checkbox>
+
+    </group>
+
+    <textbox>
+      <name>description</name>
+      <halign>fill</halign>
+      <stretch>true</stretch>
+      <pref-width>180</pref-width>
+      <pref-height>60</pref-height>
+      <slider>20</slider>
+      <editable>false</editable>
+      <wrap>true</wrap>
+      <live>true</live>
+      <property>sim/gui/dialogs/weather-scenario/description</property>
+    </textbox>
+
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>METAR Data</label>
+      </text>
+      <empty>
+        <stretch>true</stretch>
+      </empty>
+      <checkbox>
+        <property>/environment/metar/valid</property>
+        <label>valid</label>
+        <live>true</live>
+        <editable>false</editable>
+      </checkbox>
+    </group>
+
+    <textbox>
+      <name>metar</name>
+      <halign>fill</halign>
+      <stretch>true</stretch>
+      <pref-width>180</pref-width>
+      <pref-height>50</pref-height>
+      <slider>20</slider>
+      <editable>true</editable>
+      <wrap>true</wrap>
+      <live>false</live>
+      <property>sim/gui/dialogs/weather-scenario/metar</property>
+      <enable>
+	<equals>
+	  <property>/sim/gui/dialogs/weather-scenario/state</property>
+	  <value type="int">1</value>
+	</equals>
+      </enable>
+    </textbox>
+
+    <!-- Automatic Weather -->
+    
+  </group>
+
+  <nasal>
+    <open><![CDATA[
+        var normalize_string = func(src) {
+          if( src == nil ) src = "";
+          var dst = "";
+          for( var i = 0; i < size(src); i+=1 ) {
+            if( src[i] == `\n` or src[i] == `\r` )
+              src[i] = ` `;
+
+            if( i != 0 and src[i] == ` ` and src[i-1] == ` ` )
+              continue;
+
+            dst = dst ~ " ";
+            dst[size(dst)-1] = src[i];
+          }
+          return dst;
+        }
+
+      var GlobalWeatherDialogController = {
+
+        new : func( dlgRoot ) {
+          var obj = { parents: [GlobalWeatherDialogController] };
+          obj.dlgRoot = dlgRoot;
+          obj.base = "sim/gui/dialogs/weather-scenario";
+          obj.baseN = props.globals.getNode( obj.base, 1 );
+
+          return obj;
+        },
+
+        open : func {
+          #initialize the METAR source selection
+          if( getprop( "environment/params/metar-updates-environment" ) == 0 ) {
+            setprop( me.base ~ "/source-selection", "Disabled" );
+          } else if( getprop( "environment/realwx/enabled" ) ) {
+            setprop( me.base ~ "/source-selection", "Live data" );
+          } else {
+            setprop( me.base ~ "/source-selection", "Manual input" );
+          }
+          setprop( me.base ~ "/metar", normalize_string(getprop("environment/metar/data")) );
+
+
+          # fill the METAR source combo box
+          var combo = me.findElementByName( me.dlgRoot, "source-selection" );
+          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+          if( wsn != nil ) {
+            var scenarios = wsn.getChildren("scenario");
+            forindex (var i; scenarios )
+              combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
+          }
+
+          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); } );
+          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 0 );
+        },
+
+        close : func {
+          removelistener( me.scenarioListenerId );
+          removelistener( me.metarListenerId );
+        },
+
+        stateChange : func {
+          var scenarioName = getprop( me.base ~ "/source-selection");
+          var metar = nil;
+          if( scenarioName == "Disabled" ) {
+            setprop( "/environment/params/metar-updates-environment", 0 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 0 );
+            me.baseN.getNode("state",1).setIntValue( 1 );
+            metar = "";
+          } else if( scenarioName == "Live data" ) {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 1 );
+            setprop( "/environment/config/enabled", 1 );
+            me.baseN.getNode("state",1).setIntValue( 0 );
+          } else {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 1 );
+            metar = getprop( me.base ~ "/metar" );
+            me.baseN.getNode("state",1).setIntValue( 0 );
+          }
+          if( metar != nil )
+            setprop( "environment/metar/data", normalize_string(metar) );
+        },
+
+        findScenarioByName : func(name) {
+          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+          if( wsn != nil ) {
+            var scenarios = wsn.getChildren("scenario");
+            foreach (var scenario; scenarios ) {
+              if( scenario.getNode("name").getValue() == name )
+                return scenario;
+            }
+          }
+          return nil;
+        },
+
+        findElementByName : func(base,name) {
+          foreach( var child; base.getChildren() ) {
+            var n = child.getNode( "name" );
+            if( n != nil and n.getValue() == name )
+              return child;
+            var f = me.findElementByName(child,name);
+            if( f != nil ) return f;
+          }
+          return nil;
+        },
+
+        scenarioListener : func( n ) {
+          description = "";
+          metar = "nil";
+          var scenario = me.findScenarioByName( n.getValue() );
+          if( scenario != nil ) {
+            description = normalize_string(scenario.getNode("description", 1 ).getValue());
+            metar = normalize_string(scenario.getNode("metar", 1 ).getValue());
+          }
+          setprop(me.base ~ "/description", description );
+          setprop(me.base ~ "/metar", metar );
+          me.stateChange();
+        },
+
+        metarListener : func( n ) {
+          var metar = getprop("environment/metar/data");
+          if( metar == nil or metar == "" ) metar = "NIL";
+          metar = normalize_string(metar);
+          setprop( me.base ~ "/metar", metar );
+          gui.dialog_update( "weather", "metar" );
+        },
+
+      };
+
+      var controller = GlobalWeatherDialogController.new( cmdarg() );
+      controller.open();
+    ]]></open>
+
+    <close><![CDATA[
+      controller.close();
+    ]]></close>
+  </nasal>
+</PropertyList>
diff --git a/materials.xml b/materials.xml
index 5f990123f..e3f79bf99 100644
--- a/materials.xml
+++ b/materials.xml
@@ -1313,9 +1313,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -1376,9 +1376,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -1437,9 +1437,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -2133,9 +2133,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -2195,9 +2195,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -2257,9 +2257,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
diff --git a/preferences.xml b/preferences.xml
index bf2b8e90a..fcb3db031 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -290,14 +290,14 @@ Started September 2000 by David Megginson, david@megginson.com
     <name>autopilot helpers</name>
     <path>Aircraft/Generic/generic-autopilot-helper.xml</path>
    </autopilot>
-   <property-rule>
-     <name>Environment Interpolation Rule</name>
-     <path>Environment/interpolator.xml</path>
-   </property-rule>
    <property-rule>
      <name>Environment METAR Interpolation Rule</name>
      <path>Environment/metarinterpolator.xml</path>
    </property-rule>
+   <property-rule>
+     <name>Environment Interpolation Rule</name>
+     <path>Environment/interpolator.xml</path>
+   </property-rule>
   </systems>
   <instrumentation>
    <path>Aircraft/Generic/generic-instrumentation.xml</path>