diff --git a/templates/bridge_table.html b/templates/bridge_table.html
index 595f83b..d78b564 100644
--- a/templates/bridge_table.html
+++ b/templates/bridge_table.html
@@ -1,7 +1,20 @@
- {% if _table|length >0 %}
+
 <fieldset style="background-color:#e0e0e0e0;margin-left:15px;margin-right:15px;font-size:14px;border-top-left-radius: 10px; border-top-right-radius: 10px;border-bottom-left-radius: 10px; border-bottom-right-radius: 10px;">
 <legend><b><font color="#000">&nbsp;.: Bridge status :.&nbsp;</font></b></legend>
-{% for _bridge, _bridge_data in _table.items() %}
+ {% if _table['BRIDGES']|length == 0 and _table['SETUP']['BRIDGES'] != False %}
+         <table style='width:100%; font: 13pt arial, sans-serif'>
+             <tr style='border:none; background-color:#f9f9f9f9;'>
+             <td style='border:none;height:60px;'><font color=brown><b><center>Waiting for data from the HBLink server ...</center></b></td>
+             </tr>
+            </table>
+{% elif _table['SETUP']['BRIDGES'] == False %}
+         <table style='width:100%; font: 13pt arial, sans-serif'>
+             <tr style='border:none; background-color:#f9f9f9f9;'>
+             <td style='border:none;height:60px;'><font color=brown><b><center>BRIDGES display is disabled by setup</center></b></td>
+             </tr>
+            </table>
+{% else %}
+{% for _bridge, _bridge_data in _table['BRIDGES'].items() %}
 <table style="width:100%; font: 10pt arial, sans-serif">
     <colgroup>
         <col style="width: 10%" />
@@ -24,19 +37,20 @@
         <th>Connect TG#</th>
         <th>Disconnect TG#</th>
     </tr>
-    {% for system, _system_data in _table[_bridge].items() %}
+    {% for system, _system_data in _table['BRIDGES'][_bridge].items() %}
     <tr style="background-color:#f9f9f9f9;">
         <td>{{ system }}</td>
-        <td>{{ _table[_bridge][system]['TS'] }}</td>
-        <td>{{ _table[_bridge][system]['TGID'] }}</td>
-        <td style="background-color:#{{ _table[_bridge][system]['BGCOLOR'] }}; color:#{{ _table[_bridge][system]['COLOR'] }}">{{ _table[_bridge][system]['ACTIVE'] }}</td>
-        <td>{{ _table[_bridge][system]['EXP_TIME'] }}</td>
-        <td>{{ _table[_bridge][system]['TO_ACTION'] }}</td>
-        <td>{{ _table[_bridge][system]['TRIG_ON'] }}</td>
-        <td>{{ _table[_bridge][system]['TRIG_OFF'] }}</td>
+        <td>{{ _table['BRIDGES'][_bridge][system]['TS'] }}</td>
+        <td>{{ _table['BRIDGES'][_bridge][system]['TGID'] }}</td>
+        <td style="background-color:#{{ _table['BRIDGES'][_bridge][system]['BGCOLOR'] }}; color:#{{ _table['BRIDGES'][_bridge][system]['COLOR'] }}">{{ _table['BRIDGES'][_bridge][system]['ACTIVE'] }}</td>
+        <td>{{ _table['BRIDGES'][_bridge][system]['EXP_TIME'] }}</td>
+        <td>{{ _table['BRIDGES'][_bridge][system]['TO_ACTION'] }}</td>
+        <td>{{ _table['BRIDGES'][_bridge][system]['TRIG_ON'] }}</td>
+        <td>{{ _table['BRIDGES'][_bridge][system]['TRIG_OFF'] }}</td>
     </tr>
     {% endfor %}
 </table>
 {% endfor %}
+ {% endif %}
 </fieldset>
-{% endif %}
+