diff --git a/gui/dialogs/location.xml b/gui/dialogs/location.xml
index 6d81c2019..63e5a2b20 100644
--- a/gui/dialogs/location.xml
+++ b/gui/dialogs/location.xml
@@ -1,85 +1,168 @@
-
-
-
location
400
- 180
- false
+ 400
10
- 150
-
+ 360
+
10
- 110
+ 300
200
25
-
- /position/longitude-deg
+
+ /sim/presets/airport-id
10
- 80
+ 270
200
25
-
- /position/latitude-deg
+
+ /sim/presets/runway
10
- 50
+ 240
200
25
-
- /position/altitude-ft
+
+ /sim/presets/vor-id
-
+
+ 10
+ 210
+ 200
+ 25
+
+ /sim/presets/ndb-id
+
-
+
+ 10
+ 180
+ 200
+ 25
+
+ /sim/presets/fix
+
-
+
+ 10
+ 150
+ 200
+ 25
+
+ /sim/presets/offset-distance
+
-
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 364a6196f..b5bf2a07c 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -45,6 +45,21 @@
+ -
+
+
+ old-properties-dialog
+
+
+
+ -
+
+
+ dialog-show
+ logging
+
+
+
-
@@ -83,49 +98,13 @@
-
-
+
+