diff --git a/data_gateway.py b/data_gateway.py
index 6c017f0..5b8522d 100644
--- a/data_gateway.py
+++ b/data_gateway.py
@@ -1339,7 +1339,7 @@ def aprs_rx(aprs_rx_login, aprs_passcode, aprs_server, aprs_port, aprs_filter, u
         logger.info(e)
         
 def aprs_beacon_send():
-    beacon_packet = CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['GPS_DATA']['IGATE_LATITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][0]) + CONFIG['GPS_DATA']['IGATE_LONGITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT']
+    beacon_packet = CONFIG['DATA_CONFIG']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['DATA_CONFIG']['IGATE_LATITUDE'] + str(CONFIG['DATA_CONFIG']['IGATE_BEACON_ICON'][0]) + CONFIG['DATA_CONFIG']['IGATE_LONGITUDE'] + str(CONFIG['DATA_CONFIG']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['DATA_CONFIG']['IGATE_BEACON_COMMENT']
     aprs_send(beacon_packet)
     logger.info(beacon_packet)
 
diff --git a/web/app.py b/web/app.py
index 5f372a4..1300be7 100644
--- a/web/app.py
+++ b/web/app.py
@@ -4462,6 +4462,8 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
 <p style="text-align: center;"><strong><a href="/data_wizard/''' + str(s.name) + '''">Add options for Data Gateway</a></strong></p>
 
 
+<strong>Note: </strong>If <strong>IP/DNS</strong> is left blank, this server will not be listed on the Passphrase(s) page. This can be used to hide a server that users shouldn't connect to directly, such as a data gateway.
+
 <form action="manage_servers?save_mode=edit&server=''' + str(s.name) + '''" method="post">
 <p style="text-align: center;">&nbsp;</p>
 <h3 style="text-align: center;"><strong>Server<br /></strong></h3>
@@ -4669,6 +4671,9 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
         # Add new server
         elif request.args.get('add'): # == 'yes':
             content = '''
+
+<strong>Note: </strong>If <strong>IP/DNS</strong> is left blank, this server will not be listed on the Passphrase(s) page. This can be used to hide a server that users shouldn't connect to directly, such as a data gateway.
+
 <form action="manage_servers?save_mode=new" method="post">
   <p style="text-align: center;">&nbsp;</p>
 <h3 style="text-align: center;"><strong>Server<br /></strong></h3>
diff --git a/web/templates/data_gateway_wizard.html b/web/templates/data_gateway_wizard.html
index 49bd469..a302425 100644
--- a/web/templates/data_gateway_wizard.html
+++ b/web/templates/data_gateway_wizard.html
@@ -6,6 +6,9 @@
 <br />
 
 <strong>Note: </strong> Setting the APRS Login Call to <strong>N0CALL</strong> will disable APRS features. You will still be able to see station positions on the map though.
+
+<strong>Note: </strong> Setting iGate Time to 0 will disable beaconing of iGate packets.
+
 <br />
 <br />
 
diff --git a/web/templates/map.html b/web/templates/map.html
index b64552f..cfdef58 100644
--- a/web/templates/map.html
+++ b/web/templates/map.html
@@ -10,19 +10,16 @@
 <tbody>
 <tr>
 <td><span style="color: #ff0000;"><strong>Red</strong></span> = Peer location (no APRS)</td>
-<td><span style="color: #0000ff;"><strong>Blue</strong></span> = GPS location (APRS)</td>
+<td><span style="color: #0000ff;">  <strong>Blue</strong></span> = GPS location (APRS)</td>
 <!-- <td><strong><span style="color: #00ff00;">Green</span></strong> = Peer location (APRS)</td> -->
 </tr>
 </tbody>
 </table>
  
-</div>
-<div class="row container-fluid" >
-  <div class="col-xs-12">
+<div class="row" >
   {{markup_content}}
 
 </div>
-</div>
 
 <p>&nbsp;</p>
 {% endblock %}