diff --git a/gui/menubar.xml b/gui/menubar.xml
index b2918aee7..deb8e6cce 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -18,7 +18,7 @@
 				<script>gui.save_flight()</script>
 			</binding>
 		</item>
-
+<!--
         <item>
             <label>Scenario</label>
             <binding>
@@ -26,7 +26,7 @@
                 <dialog-name>scenario</dialog-name>
             </binding>
         </item>
-
+-->
 		<item>
 			<label>Reset         (Shift-Esc)</label>
 			<binding>
@@ -35,13 +35,22 @@
 		</item>
 
 <!--		<item>
+            <label>Set Lat/Lon Format</label>
+            <binding>
+                <command>nasal</command>
+                <script>
+                    var f = getprop(var d = "/sim/lon-lat-format") + 1;
+                    setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
+                </script>
+            </binding>
+        </item>  
 			<label>High-Res Snapshot</label>
 			<enabled>false</enabled>
 			<binding>
 				<command>hires-screen-capture</command>
 			</binding>
 		</item>
--->
+-->		
 		<item>
 			<label>Snapshot</label>
 			<binding>
@@ -114,7 +123,16 @@
 			</binding>
 		</item>
 
-		<item>
+		<item><!--      <item>
+            <label>Set Lat/Lon Format</label>
+            <binding>
+                <command>nasal</command>
+                <script>
+                    var f = getprop(var d = "/sim/lon-lat-format") + 1;
+                    setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
+                </script>
+            </binding>
+        </item>   -->
 			<label>Configure Views </label>
 			<binding>
 				<command>dialog-show</command>
@@ -266,19 +284,6 @@
 				<script>setprop("/autopilot/route-manager/input", "@next")</script>
 			</binding>
 		</item>
-
-<!--		<item>
-			<label>Set Lat/Lon Format</label>
-			<binding>
-				<command>nasal</command>
-				<script>
-					var f = getprop(var d = "/sim/lon-lat-format") + 1;
-					setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
-				</script>
-			</binding>
-		</item>   -->
-		
-
 	</menu>
 
 	<menu>
@@ -443,7 +448,7 @@
                 <dialog-name>ai</dialog-name>
             </binding>
         </item>
-        
+<!--  Not working at present        
 		<item>
 			<label>ATC Services in range</label>
 			<binding>
@@ -451,7 +456,7 @@
 			</binding>
 		</item>
 
-		
+		-->
 
 		<item>
 			<label>AI Tanker</label>
@@ -471,6 +476,16 @@
             </binding>
         </item>
 
+        <item>
+            <label>AI Scenario Select - takes effect on next run </label>
+            <binding>
+                <command>dialog-show</command>
+                <dialog-name>scenario</dialog-name>
+            </binding>
+          </item>
+
+
+
 	</menu>
 
 	<menu>
@@ -652,13 +667,7 @@
             <label>OSG Display Settings</label>
             <binding>
                 <command>dialog-show</command>
-                <dialog-name>osg-display<item>
-            <label>About</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>about</dialog-name>
-            </binding>
-        </item>-settings</dialog-name>
+                <dialog-name>osg-display-settings</dialog-name>
             </binding>
         </item>
     </menu>
@@ -715,9 +724,6 @@
         <item>
             <label> ---------------------</label>
         </item>
-		
-
-
 
 		<item>
 			<label>Start Tutorial</label>
diff --git a/gui/menubar.xml~ b/gui/menubar.xml~
deleted file mode 100644
index ec36d8598..000000000
--- a/gui/menubar.xml~
+++ /dev/null
@@ -1,752 +0,0 @@
-<PropertyList>
-
-	<menu>
-		<label>File</label>
-
-		<item>
-			<label>Load Flight    (Shift-F1)</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.load_flight()</script>
-			</binding>
-		</item>
-
-		<item>
-			<label>Save Flight    (Shift-F2)</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.save_flight()</script>
-			</binding>
-		</item>
-
-        <item>
-            <label>Scenario</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>scenario</dialog-name>
-            </binding>
-        </item>
-
-		<item>
-			<label>Reset         (Shift-Esc)</label>
-			<binding>
-				<command>reset</command>
-			</binding>
-		</item>
-
-<!--		<item>
-			<label>High-Res Snapshot</label>
-			<enabled>false</enabled>
-			<binding>
-				<command>hires-screen-capture</command>
-			</binding>
-		</item>
--->
-		<item>
-			<label>Snapshot</label>
-			<binding>
-				<command>nasal</command>
-				<script>
-				    gui.popdown();
-					var success = fgcommand("screen-capture");
-					var path = getprop("/sim/paths/screenshot-last");
-					if (success)
-					gui.popupTip("Screenshot written to '" ~ path ~ "'");
-					else
-					gui.popupTip("Error writing screenshot '" ~ path ~ "'");
-				</script>
-			</binding>
-		</item>
-<!--
-        <item>
-        <label>Last snapshot</label>
-            <binding>
-                <command>nasal</command>
-                <script>
-                    var path = getprop("/sim/paths/screenshot-last");
-                    if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
-
-                    gui.popupTip("Screenshot written to '" ~ path ~ "'");
-                </script>
-            </binding>
-        </item>
--->
-		<item>
-			<label>Print Screen         (F3)</label>
-			<binding>
-				<command>old-print-dialog</command>
-			</binding>
-		</item>
-
-		<item>
-			<label>Sound Configuration</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>sound-dialog</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Quit                (Esc)</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>exit</dialog-name>
-			</binding>
-		</item>
-	</menu>
-
-	<menu>
-		<label>View</label>
-
-		<item>
-			<label>Display Options</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>display</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Rendering Options</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>rendering</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Configure Views </label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>view</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Cockpit View Options</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>cockpit-view</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Adjust View Position</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>pilot_offset</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Adjust HUD Properties</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>hud</dialog-name>
-			</binding>
-		</item>
-
-        <item>
-            <label>Toggle Glide Slope Tunnel</label>
-            <binding>
-                <command>nasal</command>
-                <script>
-                    var p = "/sim/rendering/glide-slope-tunnel";
-                    setprop(p, var i = !getprop(p));
-                    gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
-                </script>
-            </binding>
-        </item>
-
-		<item>
-			<label>Instant Replay   (Ctrl-R)</label> <item>
-            <label> ------------- </label>
-        </item>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>replay</dialog-name>
-			</binding>
-		</item>
-	</menu>	
-
-	<menu>
-		<label>Location</label>
-
-		<item>
-			<label>Position Aircraft (on ground)</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>location-on-ground</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Position Aircraft (in air)</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>location-in-air</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Select Airport from List</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>airports</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Random Attitude</label>H
-			<binding>
-				<command>property-assign</command>
-				<property>/sim/presets/trim</property>
-				<value>false</value>
-			</binding>
-			<binding>
-				<command>property-randomize</command>
-				<property>/orientation/pitch-deg</property>
-				<min>0</min>
-				<max>360</max>
-			</binding>
-			<binding>
-				<command>property-randomize</command>
-				<property>/orientation/roll-deg</property>
-				<min>0</min>
-				<max>360</max>
-			</binding>
-			<binding>
-				<command>property-randomize</command>
-				<property>/orientation/heading-deg</property>
-				<min>0</min>
-				<max>360</max>
-			</binding>
-		</item>
-
-		<item>
-			<label>Tower position</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>location-of-tower</dialog-name>
-			</binding>
-		</item>
-
-	</menu>
-
-	<menu>
-		<label>Autopilot</label>
-		<name>autopilot</name>
-
-		<item>
-			<label>Autopilot Settings (F11)</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>autopilot</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Route Manager</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>route-manager</dialog-name>
-			</binding>
-		</item>
-
-        <item>
-			<label>Previous Waypoint</label>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("/autopilot/route-manager/input", "@previous")</script>
-			</binding>
-		</item>
-		
-        <item>
-			<label>Next Waypoint</label>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("/autopilot/route-manager/input", "@next")</script>
-			</binding>
-		</item>
-
-<!--		<item>
-			<label>Set Lat/Lon Format</label>
-			<binding>
-				<command>nasal</command>
-				<script>
-					var f = getprop(var d = "/sim/lon-lat-format") + 1;
-					setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
-				</script>
-			</binding>
-		</item>   -->
-		
-
-	</menu>
-
-	<menu>
-		<label>Environment</label>
-
-		<item>
-			<label>Weather Scenario</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>weather_scenario</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Weather Conditions</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>weather</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Clouds</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>clouds</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Rain/Snow Settings</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>rainsnow</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Local Weather</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>local_weather</dialog-name>
-			</binding>
-		</item>
-		
-		<item>
-			<label>Local Weather Tiles</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>local_weather_tiles</dialog-name>
-			</binding>
-		</item>
-
-
-        <item>
-            <label>Time Settings</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>timeofday</dialog-name>
-            </binding>
-        </item>
-
-        <item>
-            <label>Wildfire Settings</label>
-            <binding>
-                <command>nasal</command>
-                <script>wildfire.dialog.show()</script>
-            </binding>
-        </item>
-
-	</menu>
-
-	<menu>
-		<label>Equipment</label>
-		
-        <item>
-            <label>Map</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>map</dialog-name>
-            </binding>
-        </item>
-
-        <item>
-            <label>Stopwatch</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>stopwatch-dialog</dialog-name>
-            </binding>
-        </item>
-        
-		<item>
-			<label>Fuel and Payload</label>
-			<name>fuel-and-payload</name>
-			<binding>
-				<command>nasal</command>
-				<script>gui.showWeightDialog()</script>
-			</binding>
-		</item>
-
-		<item>
-			<label>Radio Settings (F12)</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>radios</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>GPS Settings</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>gps</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Instrument Settings</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>instruments</dialog-name>
-			</binding>
-		</item>
-
-
-
-        <item>
-            <label> --- Failures ---</label>
-        </item>
-            
-		<item>
-			<label>Random Failures</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>random-failures</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>System Failures</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>system-failures</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Instrument Failures</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>instrument-failures</dialog-name>
-			</binding>
-		</item>
-	</menu>
-
-	<menu>
-		<label>ATC/AI</label>
-        <item>
-            <label>ATC Options</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>ai</dialog-name>
-            </binding>
-        </item>
-        
-		<item>
-			<label>ATC Services in range</label>
-			<binding>
-				<command>ATC-freq-search</command>
-			</binding>
-		</item>
-
-		
-
-		<item>
-			<label>AI Tanker</label>
-			<name>tanker</name>
-			<enabled>false</enabled>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>tanker</dialog-name>
-			</binding>
-		</item>
-
-        <item>
-            <label>AI Carrier Options</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>AIcarrier</dialog-name>
-            </binding>
-        </item>
-
-	</menu>
-
-	<menu>
-		<label>Multiplayer</label>
-		<name>multiplayer</name>
-
-		<item>
-			<label>Chat Dialog</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>chat-full</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Chat Menu</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>chat-menu</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Pilot List</label>
-			<binding>
-				<command>nasal</command>
-				<script>multiplayer.dialog.show()</script>
-			</binding>
-		</item>
-		
-		<item>
-			<label>MP Carrier selection</label>
-			<binding>
-				<command>nasal</command>
-				<script>
-					if (contains(globals, "MPCarriers")) {
-						MPCarriers.carrier_dialog.show();
-					} else {
-						gui.popupTip("No MPCarriers around at the moment.");
-					}
-				</script>
-			</binding>
-		</item>
-
-
-	</menu>
-
-	<menu>
-		<label>Debug</label>
-
-		<item>
-			<label>Reload GUI</label>
-			<binding>
-				<command>reinit</command>
-				<subsystem>gui</subsystem>
-			</binding>
-		</item>
-
-		<item>
-			<label>Reload Input</label>
-			<binding>
-				<command>reinit</command>
-				<subsystem>input</subsystem>
-			</binding>
-		</item>
-
-		<item>
-			<label>Reload Panel</label>
-			<binding>
-				<command>panel-load</command>
-			</binding>
-		</item>
-
-		<item>
-			<label>Reload Autopilot</label>
-			<binding>
-				<command>reinit</command>
-				<subsystem>xml-autopilot</subsystem>
-			</binding>
-		</item>
-
-        <item>
-                <label>Reload Network</label>
-                <binding>
-                        <command>reinit</command>
-                        <subsystem>io</subsystem>
-                </binding>
-        </item>
-
-		<item>
-			<label>Nasal Console</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>nasal-console</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Development Keys</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.showHelpDialog("/sim/help/debug")</script>
-			</binding>
-		</item>
-
-		<item>
-			<label>Configure Development Extensions</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>devel-extensions</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Display Tutorial Marker</label>
-			<binding>
-				<command>nasal</command>
-				<script>tutorial.dialog()</script>
-			</binding>
-		</item>
-
-		<item>
-			<label>Dump Scene Graph</label>
-			<binding>
-				<command>dump-scenegraph</command>
-			</binding>
-		</item>
-
-		<item>
-			<label>Print Statistics</label>
-			<binding>
-				<command>property-assign</command>
-				<property>/sim/rendering/print-statistics</property>
-				<value>true</value>
-			</binding>
-		</item>
-
-		<item>
-			<label>Cycle On-Screen Statistics</label>
-			<binding>
-				<command>property-adjust</command>
-				<property>/sim/rendering/on-screen-statistics</property>
-				<step type="int">1</step>
-			</binding>
-		</item>
-
-        <item>
-            <label> ------------- </label>
-        </item>
-        
-
-        <item>
-            <label>Browse Internal Properties</label>
-            <binding>
-                <command>nasal</command>
-                <script>gui.property_browser()</script>
-            </binding>
-        </item>
-
-        <item>
-            <label>Logging</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>logging</dialog-name>
-            </binding>
-        </item>
-
-
-
-        <item>
-            <label>Adjust LOD Ranges</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>static-lod</dialog-name>
-            </binding>
-        </item>
-
-        <item>
-            <label>OSG Display Settings</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>osg-display<item>
-            <label>About</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>about</dialog-name>
-            </binding>
-        </item>-settings</dialog-name>
-            </binding>
-        </item>
-    </menu>
-	
-
-	<menu>
-		<label>Help</label>
-
-
-		<item>
-			<label>Help (opens in browser)</label>
-			<binding>
-				<command>old-help-dialog</command>
-			</binding>
-		</item>
-
-		<item>
-			<label>Joystick Information</label>
-			<name>joystick-info</name>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>joystick-info</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-		    <label> --- Key Reference ---</label>
-        </item>
-
-		<item>
-			<label>Basic Simulator Keys</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.showHelpDialog("/sim/help/basic")</script>
-			</binding>
-		</item>
-
-		<item>
-			<label>Common Aircraft Keys</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.showHelpDialog("/sim/help/common")</script>
-			</binding>
-		</item>
-
-		<item>
-			<label> Current Aircraft Keys           (?)</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.showHelpDialog("/sim/help")</script>
-			</binding>
-		</item>
-
-        <item>
-            <label> ---------------------</label>
-        </item>
-		
-
-
-
-		<item>
-			<label>Start Tutorial</label>
-			<name>tutorial-start</name>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>tutorial</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>End Tutorial</label>
-			<name>tutorial-stop</name>
-			<enabled>false</enabled>
-			<binding>
-				<command>nasal</command>
-				<script>tutorial.stopTutorial()</script>
-			</binding>
-		</item>
-
-		<item>
-            <label>About</label>
-            <binding>
-                <command>dialog-show</command>
-                <dialog-name>about</dialog-name>
-            </binding>
-        </item>
-	</menu>
-
-</PropertyList>