diff --git a/README.md b/README.md
index 2ae8e13..9ea80d2 100755
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 ![ ](https://raw.githubusercontent.com/kf7eel/hblink3/hbnet/HBNet.png  "Logo")
 
-HBNet is a fork of [HBlink3](https://github.com/HBLink-org/hblink3) the extends the functionality of HBLink through several optional features, making it more of a usable application and less of a framework. HBNet aims to be complete and easy to use application that can be used to build, administrate, and run a DMR network.
+HBNet is a fork of [HBlink3](https://github.com/HBLink-org/hblink3) that extends the functionality of HBLink through several features, making it more of a usable application and less of a framework. HBNet aims to be complete and ready to use application that can be used to build and run a DMR network.
 
-HBNet consists of 2 parts, HBNet Web Server and the actual DMR server, based on HBLink.
+HBNet consists of 2 parts, HBNet Web Service and the actual DMR server, based on HBLink. The HBNet Web Service handles user administration, server configuration, and is a content management system for your DMR network.
+
+This project originally started as a not so simple set of scripts to decode GPS locations and generate APRS positions. Through other modifications and additions, it has grown into a fully featured fork.
 
 
 ### User end features:
@@ -13,20 +15,23 @@ HBNet consists of 2 parts, HBNet Web Server and the actual DMR server, based on
 
 * Automatic retrieval of DMR IDs on registration
 
-* Monitor and change active talkgroups (WORK IN PROGRESS)
+* Automatically generate talkgroup pages
+
+* Automatically generates a script for Pi-Star setup (WORK IN PROGRESS)
+
+* Map of currently connected peers
 
 
 ### Administrative features:
 
-* Administrate multiple DMR servers through the web panel
+* Administrate multiple DMR servers through the web service
 
 * Optional manual approval of new users
 
 * Multiple Admin user logins
 
-* Entirely configure DMR server (HBlink) in web server
+* Entirely configure DMR server (HBlink) in web service
 
-* Log all peer authentication
 
 
 ### Other features
@@ -42,7 +47,7 @@ Please join the DVSwitch group at groups.io for online forum support, discussion
 
 DVSwitch@groups.io 
 
-A voluntary registrty for HBlink systems with public access has been created at http://hblink-register.com.es Please consider listing your system if you allow open access.
+A voluntary registry for HBlink systems with public access has been created at http://hblink-register.com.es Please consider listing your system if you allow open access.
 
 ---
 
diff --git a/web/app.py b/web/app.py
index 8780dd9..6ce499d 100644
--- a/web/app.py
+++ b/web/app.py
@@ -2188,34 +2188,17 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
 ##    @login_required
     def tg_list():
         cbl = BridgeList.query.filter_by(public_list=True).all()
-        content = '''
-<p>&nbsp;</p>
-<p style="text-align: center;"><strong>Note:</strong> Talkgroups listed here may not be available on all servers. See <a href="/generate_passphrase">Passphrase(s)</a> for complete list of talkgroup availability per server.</p>
-<p style="text-align: center;"><a href="hbnet_tg.csv"><strong>Download talkgroup CSV</strong></a> | <a href="hbnet_tg_anytone.csv"><strong>Download talkgroup CSV (Anytone format)</strong></a></p>
-<div class="container">          
-  <table class="table table-striped table-bordered">
-    <thead>
-      <tr>
-        <th style="width: 146.1px; text-align: center;">Name</th>
-        <th style="width: 89.9px; text-align: center;">TG</th>
-        <th style="width: 339px; text-align: center;">Description</th>
-      </tr>
-    </thead>
-    <tbody> '''
+        content = ''
         for i in cbl:
             print(str(re.sub('<[^>]*>', '', i.description))[:50])
             content = content + '''
 <tr>
-      <td>&nbsp;<a href="/tg/''' + i.bridge_name + '''"><button type="button" class="btn btn-info">''' + i.bridge_name + '''</button></a></td>
+      <td>&nbsp;<a href="/tg/''' + i.bridge_name + '''"><button type="button" class="btn btn-primary">''' + i.bridge_name + '''</button></a></td>
       <td style="width: 89.9px;">&nbsp;''' + str(i.tg) + '''</td>
       <td style="width: 339px;">&nbsp;''' + str(re.sub('<[^>]*>|\s\s+', ' ', i.description))[:50] + '''...</td>
       </tr>'''
-        content = content + '''
-</tbody>
-  </table>
-</div>
-'''
-        return render_template('flask_user_layout.html', markup_content = Markup(content))
+        
+        return render_template('tg_all.html', markup_content = Markup(content))
 
     @app.route('/talkgroups/<server>') #, methods=['POST', 'GET'])
     @login_required