diff --git a/gui/dialogs/location.xml b/gui/dialogs/location-in-air.xml
similarity index 99%
rename from gui/dialogs/location.xml
rename to gui/dialogs/location-in-air.xml
index 63e5a2b20..357005ba3 100644
--- a/gui/dialogs/location.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <PropertyList>
- <name>location</name>
+ <name>location-in-air</name>
  <width>400</width>
  <height>400</height>
 
diff --git a/gui/dialogs/presets.xml b/gui/dialogs/location-on-ground.xml
similarity index 70%
rename from gui/dialogs/presets.xml
rename to gui/dialogs/location-on-ground.xml
index 5dc8d94c8..47301e825 100644
--- a/gui/dialogs/presets.xml
+++ b/gui/dialogs/location-on-ground.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 
 <PropertyList>
- <name>presets</name>
+ <name>location-on-ground</name>
  <width>400</width>
- <height>300</height>
+ <height>400</height>
 
  <text>
   <x>10</x>
-  <y>270</y>
-  <label>Set New Position</label>
+  <y>360</y>
+  <label>Set New Location</label>
  </text>
 
  <input>
   <x>10</x>
-  <y>210</y>
+  <y>300</y>
   <width>200</width>
   <height>25</height>
   <label>Airport</label>
@@ -22,49 +22,13 @@
 
  <input>
   <x>10</x>
-  <y>180</y>
+  <y>270</y>
   <width>200</width>
   <height>25</height>
   <label>Runway</label>
   <property>/sim/presets/runway</property>
  </input>
 
- <input>
-  <x>10</x>
-  <y>150</y>
-  <width>200</width>
-  <height>25</height>
-  <label>Distance (mi)</label>
-  <property>/sim/presets/offset-distance</property>
- </input>
-
- <input>
-  <x>10</x>
-  <y>120</y>
-  <width>200</width>
-  <height>25</height>
-  <label>Altitude (ft)</label>
-  <property>/sim/presets/altitude-ft</property>
- </input>
-
- <input>
-  <x>10</x>
-  <y>90</y>
-  <width>200</width>
-  <height>25</height>
-  <label>Glidepath (deg)</label>
-  <property>/sim/presets/glidescope-deg</property>
- </input>
-
- <input>
-  <x>10</x>
-  <y>60</y>
-  <width>200</width>
-  <height>25</height>
-  <label>Airspeed (kt)</label>
-  <property>/sim/presets/airspeed-kt</property>
- </input>
-
  <!-- Button Box -->
  <group>
   <x>10</x>
@@ -84,6 +48,11 @@
     <property>/sim/presets/latitude-deg</property>
     <value type="double">-9999</value>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/presets/altitude-ft</property>
+    <value type="double">-9999</value>
+   </binding>
    <binding>
     <command>dialog-apply</command>
    </binding>
@@ -110,6 +79,11 @@
     <property>/sim/presets/latitude-deg</property>
     <value type="double">-9999</value>
    </binding>
+   <binding>
+    <command>property-assign</command>
+    <property>/sim/presets/altitude-ft</property>
+    <value type="double">-9999</value>
+   </binding>
    <binding>
     <command>dialog-apply</command>
    </binding>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 35b70e7d9..8c021b086 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -135,10 +135,18 @@
   <label>Location</label>
 
   <item>
-   <label>Aircraft Location</label>
+   <label>Position Aircraft (on ground)</label>
    <binding>
     <command>dialog-show</command>
-    <dialog-name>location</dialog-name>
+    <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>