diff --git a/gui/dialogs/circles.xml b/gui/dialogs/circles.xml
index a9eeb2121..162f55d50 100644
--- a/gui/dialogs/circles.xml
+++ b/gui/dialogs/circles.xml
@@ -115,20 +115,34 @@
 
 		<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>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-		</button>
+		<group>
+			<layout>table</layout>
+			
+			<button>
+				<row>0</row>
+				<col>0</col>
+				<halign>right</halign>
+				<pref-width>20</pref-width>
+				<pref-height>20</pref-height>
+				<legend>?</legend>
+				<binding>
+					<command>dialog-show</command>
+					<dialog-name>stpt-help</dialog-name>
+				</binding>
+			</button>
+			<button>
+				<row>0</row>
+				<col>1</col>
+				<halign>right</halign>
+				<pref-width>20</pref-width>
+				<pref-height>20</pref-height>
+				<legend>X</legend>
+				<key>Esc</key>
+				<binding>
+					<command>dialog-close</command>
+				</binding>
+			</button>
+		</group>
 	</group>
 
 	<hrule/>
@@ -161,9 +175,47 @@
 
 	<empty><stretch>1</stretch></empty>
 	<hrule/>
+	<empty><stretch>1</stretch></empty>
+
+	    <group>
+		<layout>hbox</layout>
+		 <input>
+			  	<width>250</width>
+			  	<height>25</height>
+			  	<label>From STPT</label>
+			  	<property>f16/avionics/stpt-from</property>
+			  	<live>true</live>
+			  	<halign>left</halign>
+		        <binding>
+		            <command>dialog-apply</command>
+		      	</binding>
+			</input>
+			<input>
+			  	<width>250</width>
+			  	<height>25</height>
+			  	<label>To STPT</label>
+			  	<property>f16/avionics/stpt-to</property>
+			  	<live>true</live>
+			  	<halign>left</halign>
+		        <binding>
+		            <command>dialog-apply</command>
+		      	</binding>
+			</input>
+			<button>
+				<legend>Copy STPT over</legend>
+				<binding>
+					<command>nasal</command>
+					<script><![CDATA[
+						steerpoints.copy(getprop("f16/avionics/stpt-from"),getprop("f16/avionics/stpt-to"));
+					]]></script>
+				</binding>
+			</button>
+	</group>
 
-	<text><halign>left</halign><label>Input coordinates (Lat, Lon and Radius in NM) to display threat or friendly circled areas on HSD page.</label></text>
-	<text><halign>left</halign><label>Stored as STPT #300 to #305</label></text>
+	<empty><stretch>1</stretch></empty>
+	<hrule/>
+
+	<text><halign>left</halign><label>Input coordinates (Lat, Lon and Rad in NM) to display threat or friendly circled areas on HSD page, STPT #300 to #305.</label></text>
 	<empty><stretch>1</stretch></empty>
 
   	<group>
@@ -843,8 +895,8 @@
 	    </button>
     </group>
     <empty><stretch>1</stretch></empty>
-    <text><label>Load .fgfp or .gpx route file to enable lines on HSD page.</label></text>
-    <text><label>Lines 1 is solid. Lines 2 is dashed.</label></text>
+    <text><label>Load .fgfp or .gpx route file to enable lines on HSD page. (Lines 1 solid, Lines 2 dashed).</label></text>
+    <empty><stretch>1</stretch></empty>
     
     <hrule/>
 
@@ -852,45 +904,48 @@
     
     <group>
 		<layout>hbox</layout>
-    	<button>
-			<legend>Load Left MDC</legend>
-			<binding>
-				<command>nasal</command>
-				<script><![CDATA[
-					knee.get_knee_file_gui_l();
-				]]></script>
-			</binding>
-		</button>
-		<checkbox>
-			<label>Visible</label>
-			<halign>center</halign>
-			<live>true</live>
-			<property>f16/cockpit/kneeboard-left-visible</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-		</checkbox>
-	</group>
-	<group>
-		<layout>hbox</layout>
-		<button>
-			<legend>Load Right MDC</legend>
-			<binding>
-				<command>nasal</command>
-				<script><![CDATA[
-					knee.get_knee_file_gui_r();
-				]]></script>
-			</binding>
-		</button>
-		<checkbox>
-			<label>Visible</label>
-			<halign>center</halign>
-			<live>true</live>
-			<property>f16/cockpit/kneeboard-right-visible</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-		</checkbox>
+	    <group>
+			<layout>hbox</layout>
+	    	<button>
+				<legend>Load Left MDC</legend>
+				<binding>
+					<command>nasal</command>
+					<script><![CDATA[
+						knee.get_knee_file_gui_l();
+					]]></script>
+				</binding>
+			</button>
+			<checkbox>
+				<label>Visible</label>
+				<halign>center</halign>
+				<live>true</live>
+				<property>f16/cockpit/kneeboard-left-visible</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
+		</group>
+		<group>
+			<layout>hbox</layout>
+			<button>
+				<legend>Load Right MDC</legend>
+				<binding>
+					<command>nasal</command>
+					<script><![CDATA[
+						knee.get_knee_file_gui_r();
+					]]></script>
+				</binding>
+			</button>
+			<checkbox>
+				<label>Visible</label>
+				<halign>center</halign>
+				<live>true</live>
+				<property>f16/cockpit/kneeboard-right-visible</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+			</checkbox>
+		</group>
 	</group>
 
 	<empty><stretch>1</stretch></empty>
diff --git a/gui/dialogs/config.xml b/gui/dialogs/config.xml
index f17b37d63..010461264 100644
--- a/gui/dialogs/config.xml
+++ b/gui/dialogs/config.xml
@@ -20,19 +20,14 @@
     </empty>
     
     <button>
-      <pref-width>16</pref-width>
-      <pref-height>16</pref-height>
-      <legend></legend>
-      
-      <default>1</default>
-      <keynum>27</keynum>
-      <border>2</border>
+      <halign>right</halign>
+      <pref-width>20</pref-width>
+      <pref-height>20</pref-height>
+      <legend>X</legend>
+      <key>Esc</key>
       <binding>
         <command>dialog-close</command>
       </binding>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
     </button>
   </group>
 
diff --git a/gui/dialogs/program-gps.xml b/gui/dialogs/program-gps.xml
index 0e02637a4..55d5a4b19 100644
--- a/gui/dialogs/program-gps.xml
+++ b/gui/dialogs/program-gps.xml
@@ -26,69 +26,88 @@
         ]]></close>
     </nasal>
 
-    <group>
+	<group>
+		<row>0</row>
+		<col>0</col>
 		<layout>hbox</layout>
+		<text>
+			<halign>left</halign>
+			<label>Program GPS target</label>
+		</text>
 		<empty><stretch>1</stretch></empty>
-
-		<text><label>Program GPS target</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>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-		</button>
+		
+		<group>
+			<layout>table</layout>
+			
+			<button>
+				<row>0</row>
+				<col>0</col>
+				<halign>right</halign>
+				<pref-width>20</pref-width>
+				<pref-height>20</pref-height>
+				<legend>?</legend>
+				<binding>
+					<command>dialog-show</command>
+					<dialog-name>stpt-help</dialog-name>
+				</binding>
+			</button>
+			<button>
+				<row>0</row>
+				<col>1</col>
+				<halign>right</halign>
+				<pref-width>20</pref-width>
+				<pref-height>20</pref-height>
+				<legend>X</legend>
+				<key>Esc</key>
+				<binding>
+					<command>dialog-close</command>
+				</binding>
+			</button>
+		</group>
 	</group>
 
 	<hrule/>
 
   	<text>
-	    <label>STPT #500 for standoff GPS-guided munitions (JSOW, JASSM)</label>
+	    <label>STPT #500 for standoff GPS-guided munitions (JSOW, JASSM).</label>
 	    <height>25</height>
 	</text>
+	<group>
+		<layout>hbox</layout>
+		<input>
+		  	<width>250</width>
+		  	<height>25</height>
+		  	<label>Latitude</label>
+		  	<property>f16/avionics/gps-lat</property>
+		  	<live>true</live>
+		  	<halign>left</halign>
+	        <binding>
+	            <command>dialog-apply</command>
+	      	</binding>
+	      	<!--<color>
+	      		<red>0.5</red>
+	      		<green>1</green>
+	      		<blue>0.5</blue>
+	      	</color>-->
+		</input>
+		<input>
+		  	<width>250</width>
+		  	<height>25</height>
+		  	<label>Longitude</label>
+		  	<property>f16/avionics/gps-lon</property>
+		  	<live>true</live>
+		  	<halign>left</halign>
+	        <binding>
+	            <command>dialog-apply</command>
+	      	</binding>
+	      	<!--<color>
+	      		<red>0.5</red>
+	      		<green>1</green>
+	      		<blue>0.5</blue>
+	      	</color>-->
+		</input>
+	</group>
 
-	<input>
-	  	<width>250</width>
-	  	<height>25</height>
-	  	<label>Latitude</label>
-	  	<property>f16/avionics/gps-lat</property>
-	  	<live>true</live>
-	  	<halign>left</halign>
-        <binding>
-            <command>dialog-apply</command>
-      	</binding>
-      	<!--<color>
-      		<red>0.5</red>
-      		<green>1</green>
-      		<blue>0.5</blue>
-      	</color>-->
-	</input>
-	<input>
-	  	<width>250</width>
-	  	<height>25</height>
-	  	<label>Longitude</label>
-	  	<property>f16/avionics/gps-lon</property>
-	  	<live>true</live>
-	  	<halign>left</halign>
-        <binding>
-            <command>dialog-apply</command>
-      	</binding>
-      	<!--<color>
-      		<red>0.5</red>
-      		<green>1</green>
-      		<blue>0.5</blue>
-      	</color>-->
-	</input>
 	<input>
 	  	<width>250</width>
 	  	<height>25</height>
@@ -165,61 +184,4 @@
 
  <empty><stretch>1</stretch></empty>
 
- <hrule/>
-
- <input>
-	  	<width>250</width>
-	  	<height>25</height>
-	  	<label>From STPT</label>
-	  	<property>f16/avionics/stpt-from</property>
-	  	<live>true</live>
-	  	<halign>left</halign>
-        <binding>
-            <command>dialog-apply</command>
-      	</binding>
-	</input>
-	<input>
-	  	<width>250</width>
-	  	<height>25</height>
-	  	<label>to STPT</label>
-	  	<property>f16/avionics/stpt-to</property>
-	  	<live>true</live>
-	  	<halign>left</halign>
-        <binding>
-            <command>dialog-apply</command>
-      	</binding>
-	</input>
-	<button>
-		<legend>Copy STPT</legend>
-		<binding>
-			<command>nasal</command>
-			<script><![CDATA[
-				steerpoints.copy(getprop("f16/avionics/stpt-from"),getprop("f16/avionics/stpt-to"));
-			]]></script>
-		</binding>
-	</button>
-
-	<text>
-	    <label>#000 to #099 is route (read-only).</label>
-	    <height>25</height>
-	</text>
-	<text>
-	    <label>#100 to #199 is HSD lines 1 (read-only). #200 to #299 is HSD lines 2 (read-only).</label>
-	    <height>25</height>
-	</text>
-	<text>
-	    <label>#300 to 305 is threat circles. #350 to #359 is for pilot mnemonics.</label>
-	    <height>25</height>
-	</text>
-	<text>
-	    <label>#400 to #404 is own OFLY/TGP marks. #450 to 454 is DLNK marks.</label>
-	    <height>25</height>
-	</text>
-	<text>
-	    <label>#500 is WPN program GPS coords. #555 is bulls-eye.</label>
-	    <height>25</height>
-	</text>
-
-	<empty><stretch>1</stretch></empty>
-
 </PropertyList>
\ No newline at end of file
diff --git a/gui/dialogs/stpt-help.xml b/gui/dialogs/stpt-help.xml
new file mode 100644
index 000000000..1e6635688
--- /dev/null
+++ b/gui/dialogs/stpt-help.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<PropertyList>
+
+	<name>stpt-help</name>
+	<layout>vbox</layout>
+
+	<group>
+		<layout>hbox</layout>
+		<text>
+			<halign>left</halign>
+			<label>F-16 Quick Steerpoint Guide</label>
+		</text>
+		<button>
+			<halign>right</halign>
+			<pref-width>20</pref-width>
+			<pref-height>20</pref-height>
+			<legend>X</legend>
+			<key>Esc</key>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+	</group>
+	
+	<hrule/>
+
+	<text>
+		<halign>left</halign>
+	    <label>#000 to #099 reserved for for route (read-only).</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#100 to #199 are HSD lines 1 (read-only).</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#200 to #299 are HSD lines 2 (read-only).</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#300 to 305 are for threat circles.</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#350 to #359 for pilot mnemonics.</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#400 to #404 are own OFLY/TGP marks.</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#450 to 454 are for DLNK marks.</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#500 is WPN program GPS coords.</label>
+	    <height>25</height>
+	</text>
+	<text>
+		<halign>left</halign>
+	    <label>#555 is Bulls-eye.</label>
+	    <height>25</height>
+	</text>
+
+	<empty><stretch>1</stretch></empty>
+
+</PropertyList>