diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml
new file mode 100644
index 000000000..e3b22e3e3
--- /dev/null
+++ b/gui/dialogs/autopilot.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <type>dialog</type>
+
+ <name>autopilot</name>
+ <width>500</width>
+ <height>300</height>
+ <modal>false</modal>
+
+ <text>
+  <x>10</x>
+  <y>270</y>
+  <label>AutoPilot Settings</label>
+ </text>
+
+ <!-- Headings -->
+
+ <text>
+  <x>10</x>
+  <y>230</y>
+  <label>Function</label>
+ </text>
+
+ <text>
+  <x>150</x>
+  <y>230</y>
+  <label>Activated</label>
+ </text>
+
+ <text>
+  <x>250</x>
+  <y>230</y>
+  <label>Setting</label>
+ </text>
+
+<!-- Data Rows -->
+
+ <text>
+  <x>10</x>
+  <y>200</y>
+  <label>Heading</label>
+ </text>
+
+ <input>
+  <x>150</x>
+  <y>200</y>
+  <width>75</width>
+  <height>25</height>
+  <property>/autopilot/locks/heading</property>
+ </input>
+
+ <input>
+  <x>250</x>
+  <y>200</y>
+  <width>150</width>
+  <height>25</height>
+  <property>/autopilot/settings/heading-bug-deg</property>
+ </input>
+
+ <text>
+  <x>10</x>
+  <y>170</y>
+  <label>Altitude</label>
+ </text>
+
+ <input>
+  <x>150</x>
+  <y>170</y>
+  <width>75</width>
+  <height>25</height>
+  <property>/autopilot/locks/altitude</property>
+ </input>
+
+ <input>
+  <x>250</x>
+  <y>170</y>
+  <width>150</width>
+  <height>25</height>
+  <property>/autopilot/settings/altitude-ft</property>
+ </input>
+
+ <text>
+  <x>10</x>
+  <y>140</y>
+  <label>VOR 1</label>
+ </text>
+
+ <input>
+  <x>150</x>
+  <y>140</y>
+  <width>75</width>
+  <height>25</height>
+  <property>/autopilot/locks/nav</property>
+ </input>
+
+ <text>
+  <x>10</x>
+  <y>110</y>
+  <label>Glideslope</label>
+ </text>
+
+ <input>
+  <x>150</x>
+  <y>110</y>
+  <width>75</width>
+  <height>25</height>
+  <property>/autopilot/locks/glide-slope</property>
+ </input>
+
+ <text>
+  <x>10</x>
+  <y>80</y>
+  <label>Autothrottle</label>
+ </text>
+
+ <input>
+  <x>150</x>
+  <y>80</y>
+  <width>75</width>
+  <height>25</height>
+  <property>/autopilot/locks/auto-throttle</property>
+ </input>
+
+ <text>
+  <x>10</x>
+  <y>50</y>
+  <label>Terrain Follow</label>
+ </text>
+
+ <input>
+  <x>150</x>
+  <y>50</y>
+  <width>75</width>
+  <height>25</height>
+  <property>/autopilot/locks/terrain</property>
+ </input>
+
+
+ <!-- Button Group -->
+
+ <button>
+  <x>105</x>
+  <y>10</y>
+  <legend>OK</legend>
+  <binding>
+   <command>dialog-apply</command>
+  </binding>
+  <binding>
+   <command>dialog-close</command>
+  </binding>
+  <default>true</default>
+ </button>
+
+ <button>
+  <x>205</x>
+  <y>10</y>
+  <legend>Apply</legend>
+  <binding>
+   <command>dialog-apply</command>
+  </binding>
+ </button>
+
+ <button>
+  <x>305</x>
+  <y>10</y>
+  <legend>Reset</legend>
+  <binding>
+   <command>dialog-update</command>
+  </binding>
+ </button>
+
+ <button>
+  <x>405</x>
+  <y>10</y>
+  <legend>Cancel</legend>
+  <binding>
+   <command>dialog-close</command>
+  </binding>
+ </button>
+
+</PropertyList>
\ No newline at end of file
diff --git a/gui/menubar.xml b/gui/menubar.xml
index ff7f659b4..2aeb78589 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -139,19 +139,13 @@
   <label>Autopilot</label>
 
   <item>
-   <label>AP Altitude</label>
+   <label>Autopilot Settings</label>
    <binding>
-    <command>old-ap-altitude-dialog</command>
+    <command>dialog-show</command>
+    <dialog-name>autopilot</dialog-name>
    </binding>
   </item>
-  
-  <item>
-   <label>AP Heading</label>
-   <binding>
-    <command>old-ap-heading-dialog</command>
-   </binding>
-  </item>
-  
+
   <item>
    <label>Add Waypoint</label>
    <binding>
diff --git a/keyboard.xml b/keyboard.xml
index a9c29d74a..2796d374d 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -40,15 +40,6 @@ calculated by adding 256 to the GLUT key value in glut.h.
   </binding>
  </key>
 
- <key n="4">
-  <name>Ctrl-D</name>
-  <desc>weather dialog</desc>
-  <binding>
-   <command>dialog-show</command>
-   <dialog-name>winds</dialog-name>
-  </binding>
- </key>
-
  <key n="7">
   <name>Ctrl-G</name>
   <desc>Toggle autopilot glide slope lock.</desc>
@@ -607,6 +598,22 @@ calculated by adding 256 to the GLUT key value in glut.h.
   </binding>
  </key>
 
+ <key n="67">
+  <name>C</name>
+  <desc>scripting test</desc>
+  <binding>
+   <command>script</command>
+   <script>
+    int main ()
+    {
+      print("Longitude: ", get_property("/position/longitude-deg"), " deg\n");
+      print("Latitude: ", get_property("/position/latitude-deg"), " deg\n");
+      print("Altitude: ", get_property("/position/altitude-ft"), " ft\n");
+    }
+   </script>
+  </binding>
+ </key>
+
  <key n="77">
   <name>M</name>
   <desc>Decrease warp.</desc>
@@ -1052,6 +1059,14 @@ calculated by adding 256 to the GLUT key value in glut.h.
 
  <key n="264">
   <name>F8</name>
+  <binding>
+   <desc>Cycle fog type</desc>
+   <command>property-cycle</command>
+   <property>/sim/rendering/fog</property>
+   <value>fastest</value>
+   <value>nicest</value>
+   <value>disabled</value>
+  </binding>
   <mod-shift>
    <binding>
     <desc>Scroll panel right</desc>
@@ -1073,6 +1088,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
 
  <key n="266">
   <name>F10</name>
+  <binding>
+   <desc>Toggle menubar</desc>
+   <command>property-toggle</command>
+   <property>/sim/menubar/visibility</property>
+  </binding>
   <mod-shift>
    <binding>
     <desc>Toggle FDM data logging.</desc>
@@ -1082,6 +1102,15 @@ calculated by adding 256 to the GLUT key value in glut.h.
   </mod-shift>
  </key>
 
+ <key n="267">
+  <name>F11</name>
+  <binding>
+   <desc>Pop up autopilot dialog</desc>
+   <command>dialog-show</command>
+   <dialog-name>autopilot</dialog-name>
+  </binding>
+ </key>
+
  <key n="269">
   <name>Enter</name>
   <desc>Move rudder right or increase autopilot heading.</desc>