diff --git a/gui/dialogs/map.xml b/gui/dialogs/map.xml
new file mode 100644
index 000000000..16be235c0
--- /dev/null
+++ b/gui/dialogs/map.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+
+<!--
+command interface /autopilot/route-manager/input:
+
+  @clear             ... clear route
+  @pop               ... remove first entry
+  @delete3           ... delete 4th entry
+  @insert2:ksfo@900  ... insert "ksfo@900" as 3rd entry
+  ksfo@900           ... append "ksfo@900"
+
+-->
+
+<PropertyList>
+    <name>map</name>
+    <layout>vbox</layout>
+    <resizable>true</resizable>
+
+    <nasal>
+        <open>
+
+        </open>
+
+        <close>
+
+        </close>
+    </nasal>
+
+        <group>
+            <layout>hbox</layout>
+            <empty><stretch>1</stretch></empty>
+
+            <text>
+                <label>Map</label>
+            </text>
+
+            <empty><stretch>1</stretch></empty>
+
+            <button>
+                <pref-width>16</pref-width>
+                <pref-height>16</pref-height>
+                <legend></legend>
+                <default>1</default>
+                <keynum>27</keynum>
+                <border>2</border>
+
+                <binding>
+                    <command>dialog-close</command>
+                </binding>
+            </button>
+        </group>
+        <hrule/>
+        
+        <group>
+            <layout>hbox</layout>
+            <stretch>true</stretch>
+            
+            <!-- sidebar -->
+            <group>
+                <layout>vbox</layout>
+                <button>
+                    <legend>Fixes</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/draw-fixes</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+                
+                <button>
+                    <legend>Navaids</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/draw-navaids</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+                
+                <button>
+                    <legend>Airways</legend>
+                    <pref-width>80</pref-width>
+                </button>
+                
+                <button>
+                    <legend>Traffic</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/draw-traffic</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+                
+                <button>
+                    <legend>Obstacles</legend>
+                    <pref-width>80</pref-width>
+                </button>
+                
+                <button>
+                    <legend>Data</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/draw-data</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+                
+                <empty><stretch>true</stretch></empty>
+                
+                <button>
+                    <legend>Center on Acft</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/centre-on-aircraft</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+                
+                <button>
+                    <legend>Acft Hdg Up</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/aircraft-heading-up</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+                
+                <button>
+                    <legend>Magnetic Hdgs</legend>
+                    <pref-width>80</pref-width>
+                    <property>/gui/map/magnetic-headings</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </button>
+            </group>
+            
+            <map>
+                <!-- <halign>fill</halign> -->
+                <valign>fill</valign>
+                <halign>fill</halign>
+                <stretch>true</stretch>
+                <pref-height>400</pref-height>
+                <pref-width>600</pref-width>
+                <property>/gui/map</property>
+            </map>
+        
+        </group>
+</PropertyList>
+
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 209419ae5..a1f7063bd 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -267,6 +267,14 @@
 				</script>
 			</binding>
 		</item>
+		
+		<item>
+			<label>Map</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>map</dialog-name>
+			</binding>
+		</item>
 	</menu>
 
 	<menu>