diff --git a/files/www/cgi-bin/setup b/files/www/cgi-bin/setup
index 059997bd..03193db9 100755
--- a/files/www/cgi-bin/setup
+++ b/files/www/cgi-bin/setup
@@ -1014,15 +1014,15 @@ print "<tr><td align=left>Latitude</td><td><input type=text name=latitude size=1
 print "<td align='right' colspan='2'>";
 
 print "<button type='button' id='findlocation' value='findloc' onClick='findLocation();'>Find Me!</button>&nbsp;";
-
+print "<input type=submit name='button_updatelocation' value='Apply Location Settings' title='Immediately use these location settings'>";
 if($pingOk)
 {
-    print "<button type='button' id='hideshowmap' value='show' onClick='toggleMap(this);'>Show Map</button>&nbsp;";
+    print "&nbsp;<button type='button' id='hideshowmap' value='show' onClick='toggleMap(this);'>Show Map</button>&nbsp;";
     print "<input type='submit' name='button_uploaddata' value='Upload data to AREDN Servers' />&nbsp;";
 } else {
-    print "<button disabled type='button' title='The map is only available if this node has internet access'>Show Map</button>&nbsp;";
+    print "&nbsp;<button disabled type='button' title='The map is only available if this node has internet access'>Show Map</button>&nbsp;";
 }
-print "<input type=submit name='button_updatelocation' value='Apply Location Settings' title='Immediately use these location settings'>";
+
 print "</td>\n";
 print "<tr><td align=left>Longitude</td><td><input type=text name=longitude size=10 value='$lon' title='Longitude value (in decimal) (ie. -95.334454)' /></td>";
 print "<td align=left>Grid Square</td><td align='left'><input type=text name=gridsquare maxlength=6 size=6 value='$gridsquare' title='Gridsquare value (ie. AB12cd)' /></td></tr>\n";