diff --git a/gui/menubar.xml b/gui/menubar.xml
index 0a9243d27..cd8babbdf 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -21,12 +21,12 @@
 		</item>
 
 		<item>
-            <label>Scenario</label>
+			<label>Scenario</label>
 			<binding>
-                <command>dialog-show</command>
-                <dialog-name>scenario</dialog-name>
-            </binding>
-        </item>
+				<command>dialog-show</command>
+				<dialog-name>scenario</dialog-name>
+			</binding>
+		</item>
 -->
 		<item>
 			<label>Reset           (Shift-Esc)</label>
@@ -36,15 +36,15 @@
 		</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>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>
@@ -64,15 +64,15 @@
 		</item>
 		<!--
 		<item>
-        <label>Last snapshot</label>
+		<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")
+				<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>
+					gui.popupTip("Screenshot written to '" ~ path ~ "'");
+				</script>
 			</binding>
 		</item>
 
@@ -120,16 +120,16 @@
 		</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>   -->
+			<!--		<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>View Options</label>
 			<binding>
 				<command>dialog-show</command>
@@ -277,6 +277,7 @@
 
 		<item>
 			<label>Route Manager</label>
+			<name>route-manager</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>route-manager</dialog-name>
@@ -285,6 +286,7 @@
 
 		<item>
 			<label>Previous Waypoint</label>
+			<name>previous-waypoint</name>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/autopilot/route-manager/input", "@previous")</script>
@@ -293,6 +295,7 @@
 
 		<item>
 			<label>Next Waypoint</label>
+			<name>next-waypoint</name>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/autopilot/route-manager/input", "@next")</script>
@@ -302,6 +305,7 @@
 
 	<menu>
 		<label>Environment</label>
+		<name>environment</name>
 
 		<!--<item>
 			<label>Weather Scenario</label>
@@ -321,6 +325,7 @@
 
 		<item>
 			<label>Global Weather</label>
+			<name>global-weather</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>weather</dialog-name>
@@ -348,6 +353,7 @@
 
 		<item>
 			<label>Time Settings</label>
+			<name>time-settings</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>timeofday</dialog-name>
@@ -356,6 +362,7 @@
 
 		<item>
 			<label>Wildfire Settings</label>
+			<name>wildfire-settings</name>
 			<binding>
 				<command>nasal</command>
 				<script>wildfire.dialog.show()</script>
@@ -364,6 +371,7 @@
 
 		<item>
 			<label>Scenery Download</label>
+			<name>terrasync</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>terrasync</dialog-name>
@@ -374,6 +382,7 @@
 
 	<menu>
 		<label>Equipment</label>
+		<name>equipment</name>
 
 		<item>
 			<label>Map</label>
@@ -386,6 +395,7 @@
 
 		<item>
 			<label>Stopwatch</label>
+			<name>stopwatch</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>stopwatch-dialog</dialog-name>
@@ -421,14 +431,13 @@
 
 		<item>
 			<label>Instrument Settings</label>
+			<name>instrument-settings</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>instruments</dialog-name>
 			</binding>
 		</item>
 
-
-
 		<item>
 			<label> --- Failures ---</label>
 			<enabled>false</enabled>
@@ -436,6 +445,7 @@
 
 		<item>
 			<label>Random Failures</label>
+			<name>random-failures</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>random-failures</dialog-name>
@@ -444,6 +454,7 @@
 
 		<item>
 			<label>System Failures</label>
+			<name>system-failures</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>system-failures</dialog-name>
@@ -452,6 +463,7 @@
 
 		<item>
 			<label>Instrument Failures</label>
+			<name>instrument-failures</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>instrument-failures</dialog-name>
@@ -468,10 +480,11 @@
 				<command>ATC-freq-search</command>
 			</binding>
 		</item>
-
 		-->
+
 		<item>
 			<label>Wingman Controls</label>
+			<name>wingman</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>formation</dialog-name>
@@ -490,6 +503,7 @@
 
 		<item>
 			<label>Carrier Controls</label>
+			<name>carrier</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>AIcarrier</dialog-name>
@@ -498,24 +512,21 @@
 
 		<item>
 			<label>Scenario Select (requires restart)</label>
+			<name>scenario</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>scenario</dialog-name>
 			</binding>
 		</item>
 
-                <item>
-                        <label>Jetway Settings</label>
-<!--                        <binding>
-                                <command>nasal</command>
-                                <script>jetways.jetways.dialog()</script>
-                        </binding>-->
+		<item>
+			<label>Jetway Settings</label>
+			<name>jetway</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>jetways</dialog-name>
 			</binding>
-                </item>
-
+		</item>
 
 	</menu>
 
@@ -523,8 +534,9 @@
 		<label>Multiplayer</label>
 		<name>multiplayer</name>
 
-        <item>
+		<item>
 			<label>Multiplayer settings</label>
+			<name>mp-settings</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>multiplayer</dialog-name>
@@ -533,6 +545,7 @@
 		
 		<item>
 			<label>Chat Dialog</label>
+			<name>mp-chat</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>chat-full</dialog-name>
@@ -541,6 +554,7 @@
 
 		<item>
 			<label>Chat Menu         (-)</label>
+			<name>mp-chat-menu</name>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>chat-menu</dialog-name>
@@ -549,6 +563,7 @@
 
 		<item>
 			<label>Pilot List</label>
+			<name>mp-list</name>
 			<binding>
 				<command>nasal</command>
 				<script>multiplayer.dialog.show()</script>
@@ -557,6 +572,7 @@
 
 		<item>
 			<label>MPCarrier Selection</label>
+			<name>mp-carrier</name>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -569,7 +585,6 @@
 			</binding>
 		</item>
 
-
 	</menu>
 
 	<menu>
@@ -726,13 +741,13 @@
 
 	</menu>
 
-
 	<menu>
 		<label>Help</label>
-
+		<name>help</name>
 
 		<item>
 			<label>Help  (opens in browser)</label>
+			<name>help-browser</name>
 			<binding>
 				<command>old-help-dialog</command>
 			</binding>
@@ -740,6 +755,7 @@
 
 		<item>
 			<label>Aircraft Help              (?)</label>
+			<name>aircraft-keys</name>
 			<binding>
 				<command>nasal</command>
 				<script>gui.showHelpDialog("/sim/help")</script>
@@ -757,19 +773,21 @@
 
 		<item>
 			<label>Basic Simulator Keys</label>
+			<name>basic-keys</name>
 			<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>Common Aircraft Keys</label>
+			<name>common-keys</name>
+			<binding>
+				<command>nasal</command>
+				<script>gui.showHelpDialog("/sim/help/common")</script>
+			</binding>
+		</item>
 
 		<item>
 			<label>------------------</label>