diff --git a/templates/bridge_table.html b/templates/bridge_table.html
index 3ddbfb0..aac4a17 100644
--- a/templates/bridge_table.html
+++ b/templates/bridge_table.html
@@ -1,55 +1,54 @@
 <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>
- {% 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 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">
+  <legend><b><font color="#000">&nbsp;.: Bridge status :.&nbsp;</font></b></legend>
+  {% 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 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%" />
-        <col style="width: 5%"  />
-        <col style="width: 5%"  />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 20%" />
-        <col style="width: 30%" />
+      <col style="width: 10%" />
+      <col style="width: 5%"  />
+      <col style="width: 5%"  />
+      <col style="width: 10%" />
+      <col style="width: 10%" />
+      <col style="width: 10%" />
+      <col style="width: 20%" />
+      <col style="width: 30%" />
     </colgroup>
     <h4 align="left">{{ _bridge }}</h4>
     <tr style="width:100%; font: 10pt arial, sans-serif; background-color:#6A7D8E; color:white">
-        <th>System</th>
-        <th>Slot</th>
-        <th>TG#</th>
-        <th>Status</th>
-        <th>Timeout</th>
-        <th>Timeout Action</th>
-        <th>Connect TG#</th>
-        <th>Disconnect TG#</th>
+      <th>System</th>
+      <th>Slot</th>
+      <th>TG#</th>
+      <th>Status</th>
+      <th>Timeout</th>
+      <th>Timeout Action</th>
+      <th>Connect TG#</th>
+      <th>Disconnect TG#</th>
     </tr>
     {% for system, _system_data in _table['BRIDGES'][_bridge].items() %}
     <tr style="background-color:#f9f9f9f9;">
-        <td>{{ system }}</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>
+      <td>{{ system }}</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>
-
+  </table>
+  {% endfor %}
+  {% endif %}
+</fieldset>
\ No newline at end of file
diff --git a/templates/lastheard.html b/templates/lastheard.html
index dc5f783..c475295 100644
--- a/templates/lastheard.html
+++ b/templates/lastheard.html
@@ -1,5 +1,6 @@
 <br><fieldset style="border-radius: 8px; background-color:#f0f0f0; margin-left:15px; margin-right:15px; font-size:14px;">
-<legend><b><span style="color:#000;">&nbsp;.: Lastheard :.&nbsp;</span></b></legend>
-<table style="width:100%; font: 10pt arial, sans-serif">
-<tr class="theme_color" style="height: 32px; font: 10pt arial, sans-serif;"><th>Date</th><th>Time</th><th>Callsign (DMR-Id)</th><th>Name</th><th>TG#</th><th>TG Name</th><th>TX (s)</th><th>System</th></tr>
-</table></fieldset><br>
+  <legend><b><span style="color:#000;">&nbsp;.: Lastheard :.&nbsp;</span></b></legend>
+  <table style="width:100%; font: 10pt arial, sans-serif">
+    <tr class="theme_color" style="height: 32px; font: 10pt arial, sans-serif;"><th>Date</th><th>Time</th><th>Callsign (DMR-Id)</th><th>Name</th><th>TG#</th><th>TG Name</th><th>TX (s)</th><th>System</th></tr>
+  </table>
+</fieldset><br>
diff --git a/templates/main_table.html b/templates/main_table.html
index edb39ee..08b2d54 100644
--- a/templates/main_table.html
+++ b/templates/main_table.html
@@ -1,119 +1,126 @@
 
 <fieldset style="width:1045px; background-color:#f1f1f1; margin-left:5px; margin-right:5px; font-size:14px; border-radius: 10px;">
-<legend><b><span style="color:#000;">&nbsp;.: Server Activity :.&nbsp;</span></b></legend>
-{% if _table['MASTERS']|length >0 %}
- <table style="width:100%; background-color:#f0f0f0; border:none !important; border-collapse:collapse;">
+  <legend><b><span style="color:#000;">&nbsp;.: Server Activity :.&nbsp;</span></b></legend>
+  {% if _table['MASTERS']|length >0 %}
+  <table style="width:100%; background-color:#f0f0f0; border:none !important; border-collapse:collapse;">
     <tr style="height:30px; border-collapse:collapse; border:none;">
       <td style="width:100%; border-collapse:collapse; border:none;"><div id="rcornerh">Active QSO's</div></td>
     </tr>
     <tr style="border-collapse:collapse; border:none;">
-    <td id="lact">
-    <div id="rcorner"><div>
-    {% for _master in _table['MASTERS'] %}
-    {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
-    {% if _cdata[1]['TS'] == True or _cdata[2]['TS'] == True %}
-        {% if _cdata[1]['TRX'] == "RX" %}
-        &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _cdata[1]['CALL']|safe }}</span>
-        &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{ _cdata[1]['TG']|safe }}</span>]&nbsp;
-        {% endif %}
-        {% if _cdata[2]['TRX'] == "RX" %}
-        &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _cdata[2]['CALL']|safe}}</span>
-        &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{_cdata[2]['TG']|safe}}</span>]&nbsp;
+      <td id="lact">
+        <div id="rcorner"><div>
+        {% for _master in _table['MASTERS'] %}
+        {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
+        {% if _cdata[1]['TS'] == True or _cdata[2]['TS'] == True %}
+          {% if _cdata[1]['TRX'] == "RX" %}
+          &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _cdata[1]['CALL']|safe }}</span>
+          &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{ _cdata[1]['TG']|safe }}</span>]&nbsp;
+          {% endif %}
+          {% if _cdata[2]['TRX'] == "RX" %}
+          &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _cdata[2]['CALL']|safe}}</span>
+          &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{_cdata[2]['TG']|safe}}</span>]&nbsp;
+          {% endif %}
         {% endif %}
+        {% endfor %}
+        {% endfor %}
+  {% else %}
+  <table style="width:100%; background-color:#f9f9f9; font: 13pt arial, sans-serif; margin-top:4px; margin-bottom:4px;">
+    <tr style="border:none; background-color:#f0f0f0;">
+      <td style="border:none; height:60px; text-align:center;"><span style="color:brown;"><b>Waiting for data from the Server ...</b></span></td>
+    </tr>
+  </table>
+  {% endif %}
+  {% for _peer, _pdata  in _table['PEERS'].items() %}
+  {% if _pdata[1]['TS'] == True or _pdata[2]['TS'] == True %}
+    {% if _pdata[1]['TRX'] == "RX" %}
+    &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _pdata[1]['CALL']|safe }}</span>
+    &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{ _pdata[1]['TG']|safe }}</span>]&nbsp;
     {% endif %}
-    {% endfor %}
-    {% endfor %}
-{% else %}
-         <table style="width:100%; background-color:#f9f9f9; font: 13pt arial, sans-serif; margin-top:4px; margin-bottom:4px;">
-             <tr style="border:none; background-color:#f0f0f0;">
-             <td style="border:none; height:60px; text-align:center;"><span style="color:brown;"><b>Waiting for data from the Server ...</b></span></td>
-             </tr>
-            </table>
- {% endif %}
-    {% for _peer, _pdata  in _table['PEERS'].items() %}
-    {% if _pdata[1]['TS'] == True or _pdata[2]['TS'] == True %}
-        {% if _pdata[1]['TRX'] == "RX" %}
-        &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _pdata[1]['CALL']|safe }}</span>
-        &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{ _pdata[1]['TG']|safe }}</span>]&nbsp;
-        {% endif %}
-        {% if _pdata[2]['TRX'] == "RX" %}
-        &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _pdata[2]['CALL']|safe }}</span>
-        &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{ _pdata[2]['TG']|safe }}</span>]&nbsp;
-        {% endif %}
+    {% if _pdata[2]['TRX'] == "RX" %}
+    &#32;[<span style="color:#008000;">M</span>:&nbsp;<span style="color:#0065ff;">{{ _pdata[2]['CALL']|safe }}</span>
+    &nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">{{ _pdata[2]['TG']|safe }}</span>]&nbsp;
     {% endif %}
+  {% endif %}
+  {% endfor %}
+  {% if _table['OPENBRIDGES']|length >0 %}
+  {% for _openbridge in _table['OPENBRIDGES'] %}
+  {% set rx = namespace(value=0) %}
+  {% if _table['OPENBRIDGES'][_openbridge]['STREAMS']|length >0 %}
+    {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS'] if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0]=='RX' %}
+      {% set rx.value=1 %}
     {% endfor %}
-{% if _table['OPENBRIDGES']|length >0 %}
-    {% for _openbridge in _table['OPENBRIDGES'] %}
-    {% set rx = namespace(value=0) %}
-    {% if _table['OPENBRIDGES'][_openbridge]['STREAMS']|length >0 %}
-       {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS'] if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0]=='RX' %}
-         {% set rx.value=1 %}
-       {% endfor %}
-       {% if rx.value == 1 %}
-         {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' %}&#32;[<span style="color:#008000;">O</span>:&nbsp;<span style="color:#0065ff;">{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1]}}</span>&nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">TG&nbsp;{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe}}</span>]&nbsp;{% endfor %}
-      {% endif %}
-   {% endif %}
-   {% endfor %}
-     </div></div></td>
-      </tr>
-{% endif %}
-</table>
+    {% if rx.value == 1 %}
+      {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' %}&#32;[<span style="color:#008000;">O</span>:&nbsp;<span style="color:#0065ff;">{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1]}}</span>&nbsp;<span style="color:red;">>></span>&nbsp;<span style="color:#b5651d;">TG&nbsp;{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe}}</span>]&nbsp;{% endfor %}
+    {% endif %}
+  {% endif %}
+  {% endfor %}
+        </div></div>
+      </td>
+    </tr>
+  {% endif %}
+  </table>
 </fieldset>
 {% if _table['SETUP']['LASTHEARD'] == True %}
   {% include 'lastheard.html' ignore missing %}
 {% endif %}
 <fieldset style="background-color:#f0f0f0; margin-left:15px; margin-right:15px; font-size:14px; border-radius: 10px;">
-<legend><b><span style="color:#000;">&nbsp;.: Connected to Server :.&nbsp;</span></b></legend>
-<table style="table-layout:fixed; width:100%; font: 10pt arial, sans-serif; font-weight:600; margin-top:5px; margin-bottom:5px; border:none !important; border-collapse:collapse;">
-{% if _table['MASTERS']|length >0 %}
-<tr style="border-collapse:collapse; border:none;"><td style="border-collapse:collapse; border:none;">
-<div style="background-color:#f9f9f9; background-image: linear-gradient(to bottom, #e9e9e9 50%, #bcbaba 100%); border-radius: 10px; border: 1px solid LightGrey;">
-<br>
-<div style="text-align:left;"><span style="color:#464646;font-weight:600;line-height:1.4;">&nbsp;&nbsp;USERS:</span></div>
-<div style="text-align:left;font:9.5pt arial, sans-serif;font-weight:bold;margin-left:25px; margin-right:25px;line-height:1.4;white-space:normal;">
-    {% for _master in _table['MASTERS'] %}    
-    {% if _table['MASTERS'][_master]['PEERS']|length >0 %}
-    {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
-    <span class="tooltip" style="border-bottom: 1px dotted white;">
-    <a style="border-bottom: 1px dotted white;font: 9.5pt arial,sans-serif;font-weight:bold;color:#0066ff;text-shadow: 1px 1px 1px Lightgrey, 0 0 0.5em LightGrey, 0 0 1em whitesmoke;" target="_blank" href="http://www.qrz.com/db/{{_cdata['CALLSIGN']}}"><b>{{_cdata['CALLSIGN']}}</b></a>
-    <span class="tooltiptext" style="left:115%;top:-10px;">
-        <span style="font: 9pt arial,sans-serif;color:#FFFFFF">
-        &nbsp;&nbsp;&nbsp;<b>DMR ID</b>: <b><font color=yellow>{{ _client }}</b></font><br>
-        {% if _cdata['RX_FREQ'] == 'N/A' and _cdata['TX_FREQ'] == 'N/A' %}
-             &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>IP Network</font></b><br>
-        {% else %} 
-            &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>Radio</font></b> ({{ _cdata['SLOTS'] }})<br>
-        {% endif %}
-        &nbsp;&nbsp;&nbsp;<b>Hardware</b>: {{_cdata['PACKAGE_ID'] }}
-        <br>&nbsp;&nbsp;&nbsp;<b>Soft_Ver</b>: {{_cdata['SOFTWARE_ID'] }}
-        <br>&nbsp;&nbsp;&nbsp;<b>Info</b>: {{_cdata['LOCATION']}}
-        <br>&nbsp;&nbsp;&nbsp;<b>Master</b>: <font color=yellow>{{_master}}</font>
-        <br>&nbsp;&nbsp;&nbsp;<b>Time connected</b>: <font color=yellow>{{ _cdata['CONNECTED'] }}</font>
-        </span></span></span>&nbsp;
-    {% endfor %}
+  <legend><b><span style="color:#000;">&nbsp;.: Connected to Server :.&nbsp;</span></b></legend>
+  <table style="table-layout:fixed; width:100%; font: 10pt arial, sans-serif; font-weight:600; margin-top:5px; margin-bottom:5px; border:none !important; border-collapse:collapse;">
+    {% if _table['MASTERS']|length >0 %}
+    <tr style="border-collapse:collapse; border:none;">
+      <td style="border-collapse:collapse; border:none;">
+        <div style="background-color:#f9f9f9; background-image: linear-gradient(to bottom, #e9e9e9 50%, #bcbaba 100%); border-radius: 10px; border: 1px solid LightGrey;">
+          <br>
+          <div style="text-align:left;"><span style="color:#464646;font-weight:600;line-height:1.4;">&nbsp;&nbsp;USERS:</span></div>
+          <div style="text-align:left;font:9.5pt arial, sans-serif;font-weight:bold;margin-left:25px; margin-right:25px;line-height:1.4;white-space:normal;">
+            {% for _master in _table['MASTERS'] %}
+            {% if _table['MASTERS'][_master]['PEERS']|length >0 %}
+            {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
+            <span class="tooltip" style="border-bottom: 1px dotted white;">
+              <a style="border-bottom: 1px dotted white;font: 9.5pt arial,sans-serif;font-weight:bold;color:#0066ff;text-shadow: 1px 1px 1px Lightgrey, 0 0 0.5em LightGrey, 0 0 1em whitesmoke;" target="_blank" href="http://www.qrz.com/db/{{_cdata['CALLSIGN']}}"><b>{{_cdata['CALLSIGN']}}</b></a>
+              <span class="tooltiptext" style="left:115%;top:-10px;">
+                <span style="font: 9pt arial,sans-serif;color:#FFFFFF">
+                  &nbsp;&nbsp;&nbsp;<b>DMR ID</b>: <b><font color=yellow>{{ _client }}</b></font><br>
+                  {% if _cdata['RX_FREQ'] == 'N/A' and _cdata['TX_FREQ'] == 'N/A' %}
+                    &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>IP Network</font></b><br>
+                  {% else %}
+                    &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>Radio</font></b> ({{ _cdata['SLOTS'] }})<br>
+                  {% endif %}
+                  &nbsp;&nbsp;&nbsp;<b>Hardware</b>: {{_cdata['PACKAGE_ID'] }}
+                  <br>&nbsp;&nbsp;&nbsp;<b>Soft_Ver</b>: {{_cdata['SOFTWARE_ID'] }}
+                  <br>&nbsp;&nbsp;&nbsp;<b>Info</b>: {{_cdata['LOCATION']}}
+                  <br>&nbsp;&nbsp;&nbsp;<b>Master</b>: <font color=yellow>{{_master}}</font>
+                  <br>&nbsp;&nbsp;&nbsp;<b>Time connected</b>: <font color=yellow>{{ _cdata['CONNECTED'] }}</font>
+                </span>
+              </span>
+            </span>&nbsp;
+            {% endfor %}
+            {% endif %}
+            {% endfor %}
+          </div>
     {% endif %}
-    {% endfor %}
-</div>
-{% endif %}
-{% if _table['PEERS']|length >0 %}
-<br>
-<div style="text-align:left;"><span style="color:#464646;font-weight:600;line-height:1.8;">&nbsp;&nbsp;PEERS:</span></div>
-<div style="text-align:left;font:9.5pt arial, sans-serif;font-weight:bold;margin-left:25px; margin-right:25px;line-height:1.6;white-space:normal;">
-    {% for _peer, _pdata  in _table['PEERS'].items() %}
-    <span class="tooltip" style="margin-bottom:6px;border-bottom: 1px dotted white;{{'background-color:#8ecfb4; color:#464646;' if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' else 'background-color:#ff0000; color:white;'}}"><b>&nbsp;&nbsp;{{_peer}}&nbsp;&nbsp;</b>
-    {% if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' %}
-    <span class="tooltiptext" style="top:120%;left:50%;margin-left:-70%;width:100px;padding: 2px 0;">
-    <center><font color=white>Connected</font></center>
-    </span>
-   {% else %}
-    <span class="tooltiptext" style="top:120%;left:50%;margin-left:-70%;width:100px;padding: 2px 0;">
-    <center><b><font color=white>Disconnected</font></center>
-    </span>
+    {% if _table['PEERS']|length >0 %}
+          <br>
+          <div style="text-align:left;"><span style="color:#464646;font-weight:600;line-height:1.8;">&nbsp;&nbsp;PEERS:</span></div>
+          <div style="text-align:left;font:9.5pt arial, sans-serif;font-weight:bold;margin-left:25px; margin-right:25px;line-height:1.6;white-space:normal;">
+            {% for _peer, _pdata  in _table['PEERS'].items() %}
+            <span class="tooltip" style="margin-bottom:6px;border-bottom: 1px dotted white;{{'background-color:#8ecfb4; color:#464646;' if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' else 'background-color:#ff0000; color:white;'}}"><b>&nbsp;&nbsp;{{_peer}}&nbsp;&nbsp;</b>
+              {% if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' %}
+              <span class="tooltiptext" style="top:120%;left:50%;margin-left:-70%;width:100px;padding: 2px 0;">
+                <center><font color=white>Connected</font></center>
+              </span>
+              {% else %}
+              <span class="tooltiptext" style="top:120%;left:50%;margin-left:-70%;width:100px;padding: 2px 0;">
+                <center><b><font color=white>Disconnected</font></center>
+              </span>
+              {% endif %}
+            </span>&nbsp;
+            {% endfor %}
+          </div>
     {% endif %}
-    </span>&nbsp;
- {% endfor %}
-</div>
-{% endif %}
-<br>
- </div></td></tr></table>
+          <br>
+        </div>
+      </td>
+    </tr>
+  </table>
 </fieldset>
diff --git a/templates/masters_table.html b/templates/masters_table.html
index 978af6f..68419f5 100644
--- a/templates/masters_table.html
+++ b/templates/masters_table.html
@@ -1,55 +1,55 @@
 <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;.: Masters status :.&nbsp;</font></b></legend>
-{% if _table['MASTERS']|length >0 %}
-<table style="table-layout:fixed;width:100%; font: 10pt arial, sans-serif; margin-top:5px; margin-bottom:5px;">
+  <legend><b><font color="#000">&nbsp;.: Masters status :.&nbsp;</font></b></legend>
+  {% if _table['MASTERS']|length >0 %}
+  <table style="table-layout:fixed;width:100%; font: 10pt arial, sans-serif; margin-top:5px; margin-bottom:5px;">
     <tr class="theme_color" style="font: 10pt arial, sans-serif;">
-        <th style='width: 120px;'>HB Protocol<br>Master Systems</th>
-        <th style='width: 160px;'>Callsign (DMR Id)<br>Info</th>
-        <th style='width: 90px;'>Time Connected</th>
-        <th style='width: 40px;'>Slot</th>
-        <th style='width: 50%;'>Source</th>
-        <th style='width: 40%;'>Destination</th>
+      <th style='width: 120px;'>HB Protocol<br>Master Systems</th>
+      <th style='width: 160px;'>Callsign (DMR Id)<br>Info</th>
+      <th style='width: 90px;'>Time Connected</th>
+      <th style='width: 40px;'>Slot</th>
+      <th style='width: 50%;'>Source</th>
+      <th style='width: 40%;'>Destination</th>
     </tr>
 
-    {% for _master in _table['MASTERS'] %}    
+    {% for _master in _table['MASTERS'] %}
     {% if ((_table['MASTERS'][_master]['PEERS']|length==0 or _table['MASTERS'][_master]['PEERS']|length>0) and emaster==True) or (_table['MASTERS'][_master]['PEERS']|length>0 and emaster==False) %}
 
     <tr style="background-color:#f9f9f9f9;">
-        <td style="font-weight:bold" rowspan="{{ (_table['MASTERS'][_master]['PEERS']|length * 2) +1 }}"> {{_master}}<br><div style="font: 8pt arial, sans-serif">{{_table['MASTERS'][_master]['REPEAT']}}</div></td>
+      <td style="font-weight:bold" rowspan="{{ (_table['MASTERS'][_master]['PEERS']|length * 2) +1 }}"> {{_master}}<br><div style="font: 8pt arial, sans-serif">{{_table['MASTERS'][_master]['REPEAT']}}</div></td>
     </tr>
     {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].items() %}
     <tr style="background-color:#f9f9f9f9;">
-        <td rowspan="2"><div class="tooltip"><b><font color=#0066ff>{{ _cdata['CALLSIGN']}}</font> 
+      <td rowspan="2"><div class="tooltip"><b><font color=#0066ff>{{ _cdata['CALLSIGN']}}</font>
         </b><span style="font: 8pt arial,sans-serif">(Id: {{ _client }})</span><span class="tooltiptext">
         <span style="font: 9pt arial,sans-serif;color:#FFFFFF">
         {% if _cdata['RX_FREQ'] == 'N/A' and _cdata['TX_FREQ'] == 'N/A' %}
-             &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>IP Network</font></b><br>
-        {% else %} 
-            &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>Radio</font></b> ({{ _cdata['SLOTS'] }})<br>
+          &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>IP Network</font></b><br>
+        {% else %}
+          &nbsp;&nbsp;&nbsp;<b>Type: <font color=yellow>Radio</font></b> ({{ _cdata['SLOTS'] }})<br>
         {% endif %}
-            &nbsp;&nbsp;&nbsp;<b>Soft_Ver</b>: {{_cdata['SOFTWARE_ID'] }}
+          &nbsp;&nbsp;&nbsp;<b>Soft_Ver</b>: {{_cdata['SOFTWARE_ID'] }}
         <br>&nbsp;&nbsp;&nbsp;<b>Hardware</b>: {{_cdata['PACKAGE_ID'] }}</span></span></div>
         <br><div style="font: 92% arial,sans-serif; color:#b5651d;font-weight:bold">{{_cdata['LOCATION']}}</div></td>
-        <td style="background-color:#e8ffec;font: 10pt arial, sans-serif;" rowspan="2">{{ _cdata['CONNECTED'] }}</td>
-        <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[1]['BGCOLOR'] if _cdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[1]['COLOR'] if _cdata[1]['COLOR']|length !=0 else '000000' }}"><span style="color:#{{ _cdata[1]['COLOR'] if _cdata[1]['BGCOLOR'] == 'ff6347' else 'b70101'}}">TS1</span></td>
-        <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[1]['BGCOLOR'] if _cdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[1]['COLOR'] if _cdata[1]['COLOR']|length !=0 else '000000' }}">{{ _cdata[1]['SUB']|safe }}</td>
-        <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[1]['BGCOLOR'] if _cdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[1]['COLOR'] if _cdata[1]['COLOR']|length !=0 else '000000' }}">{{ _cdata[1]['DEST']|safe }}</td>
-        <tr style="background-color:#f9f9f9f9;">
+      <td style="background-color:#e8ffec;font: 10pt arial, sans-serif;" rowspan="2">{{ _cdata['CONNECTED'] }}</td>
+      <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[1]['BGCOLOR'] if _cdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[1]['COLOR'] if _cdata[1]['COLOR']|length !=0 else '000000' }}"><span style="color:#{{ _cdata[1]['COLOR'] if _cdata[1]['BGCOLOR'] == 'ff6347' else 'b70101'}}">TS1</span></td>
+      <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[1]['BGCOLOR'] if _cdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[1]['COLOR'] if _cdata[1]['COLOR']|length !=0 else '000000' }}">{{ _cdata[1]['SUB']|safe }}</td>
+      <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[1]['BGCOLOR'] if _cdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[1]['COLOR'] if _cdata[1]['COLOR']|length !=0 else '000000' }}">{{ _cdata[1]['DEST']|safe }}</td>
+      <tr style="background-color:#f9f9f9f9;">
         <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[2]['BGCOLOR'] if _cdata[2]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[2]['COLOR'] if _cdata[2]['COLOR']|length !=0 else '000000' }}"><span style="color:#{{ _cdata[2]['COLOR'] if _cdata[2]['BGCOLOR'] == 'ff6347' else '3a4aa6'}}">TS2</span></td>
         <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[2]['BGCOLOR'] if _cdata[2]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[2]['COLOR'] if _cdata[2]['COLOR']|length !=0 else '000000' }}">{{ _cdata[2]['SUB']|safe }}</td>
         <td style="font: 10pt arial, sans-serif;background-color:#{{ _cdata[2]['BGCOLOR'] if _cdata[2]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _cdata[2]['COLOR'] if _cdata[2]['COLOR']|length !=0 else '000000' }}">{{ _cdata[2]['DEST']|safe }}</td>
-        </tr>
+      </tr>
 
-    </tr>    
-     {% endfor %}
-   {% endif %}
-{% endfor %}
-</table>
-{% else %}
-         <table style='width:100%; font: 13pt arial, sans-serif; margin-top:8px;margin-bottom:8px;'>
-             <tr style='border:none; background-color:#f9f9f9f9;'>
-             <td style='border:none;height:60px;'><font color=brown><b><center>Waiting for data from the Server ...</center></b></td>
-             </tr>
-            </table>
-{% endif %}
+    </tr>
+    {% endfor %}
+    {% endif %}
+    {% endfor %}
+  </table>
+  {% else %}
+  <table style='width:100%; font: 13pt arial, sans-serif; margin-top:8px;margin-bottom:8px;'>
+    <tr style='border:none; background-color:#f9f9f9f9;'>
+      <td style='border:none;height:60px;'><font color=brown><b><center>Waiting for data from the Server ...</center></b></td>
+    </tr>
+  </table>
+  {% endif %}
 </fieldset>
diff --git a/templates/opb_table.html b/templates/opb_table.html
index 2c4926a..6aa6871 100644
--- a/templates/opb_table.html
+++ b/templates/opb_table.html
@@ -1,25 +1,25 @@
 <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;.: OpenBridge status :.&nbsp;</font></b></legend>
-    {% if _table['OPENBRIDGES']|length >0 %}
-<table style="table-layout:fixed;width:100%; font: 10pt arial, sans-serif; margin-top:5px; margin-bottom:5px;">
+  <legend><b><font color="#000">&nbsp;.: OpenBridge status :.&nbsp;</font></b></legend>
+  {% if _table['OPENBRIDGES']|length >0 %}
+  <table style="table-layout:fixed;width:100%; font: 10pt arial, sans-serif; margin-top:5px; margin-bottom:5px;">
     <tr class="theme_color" style="width:100%; font: 10pt arial, sans-serif;">
-        <th style='width: 12%'>OpenBridge<br>Systems</th>
-        <th style='width: 12%'>Network ID</th>
-        <th style='width: 70%;'>Active QSOs</th>
+      <th style='width: 12%'>OpenBridge<br>Systems</th>
+      <th style='width: 12%'>Network ID</th>
+      <th style='width: 70%;'>Active QSOs</th>
     </tr>
     {% for _openbridge in _table['OPENBRIDGES'] %}
     <tr style="background-color:#f9f9f9f9;">
-        <td style="font-weight:bold; padding-left: 20px; text-align:left;"> {{ _openbridge}} </td>
-        <td><div style="font: 9pt arial, sans-serif;margin-top:3px;margin-bottom:3px;">Net ID: <span style="font: 9pt arial, sans-serif;font-weight:bold;">{{ _table['OPENBRIDGES'][_openbridge]['NETWORK_ID'] }}</td>
-        <td style="background-color:#f9f9f9f9; font: 9pt arial, sans-serif; font-weight: 600; color:#464646;">{% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  %}[<span style="{{ 'color:#008000;' if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' else 'color:red;' }}">{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] }}</span>: <font color=#0065ff> {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1] }}</font> >> <font color=#b5651d>TG&nbsp;{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe }}</font>]&nbsp;{% endfor %}</td>
-   </tr>
+      <td style="font-weight:bold; padding-left: 20px; text-align:left;"> {{ _openbridge}} </td>
+      <td><div style="font: 9pt arial, sans-serif;margin-top:3px;margin-bottom:3px;">Net ID: <span style="font: 9pt arial, sans-serif;font-weight:bold;">{{ _table['OPENBRIDGES'][_openbridge]['NETWORK_ID'] }}</td>
+      <td style="background-color:#f9f9f9f9; font: 9pt arial, sans-serif; font-weight: 600; color:#464646;">{% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  %}[<span style="{{ 'color:#008000;' if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' else 'color:red;' }}">{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] }}</span>: <font color=#0065ff> {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1] }}</font> >> <font color=#b5651d>TG&nbsp;{{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe }}</font>]&nbsp;{% endfor %}</td>
+    </tr>
     {% endfor %}
-</table>
+  </table>
   {% else %}
-         <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 Server ...  or not defined on Server</center></b></td>
-             </tr>
-            </table>
- {% endif %}
+  <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 Server ...  or not defined on Server</center></b></td>
+    </tr>
+  </table>
+  {% endif %}
 </fieldset>
diff --git a/templates/peers_table.html b/templates/peers_table.html
index 4760e9e..042e8cd 100644
--- a/templates/peers_table.html
+++ b/templates/peers_table.html
@@ -1,37 +1,36 @@
 <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;.: Peers status :.&nbsp;</font></b></legend>
-{% if _table['PEERS']|length >0 %}
-<table style="table-layout:fixed;width:100%; font: 10pt arial, sans-serif; margin-top:5px;margin-bottom:5px;">
+  <legend><b><font color="#000">&nbsp;.: Peers status :.&nbsp;</font></b></legend>
+  {% if _table['PEERS']|length >0 %}
+  <table style="table-layout:fixed;width:100%; font: 10pt arial, sans-serif; margin-top:5px;margin-bottom:5px;">
     <tr class="theme_color" style="font: 10pt arial, sans-serif;">
-        <th style='width: 120px;'>HB Protocol<br>Peer Systems</th>
-        <th style='width: 160px;'>Callsign (DMR Id)<br>Info</th>
-        <th style='width: 90px;'>Connected<br>TX/RX/Lost</th>
-        <th style='width: 42px;'>Slot</th>
-        <th style='width: 50%;'>Source</th>
-        <th style='width: 40%;'>Destination</th>
+      <th style='width: 120px;'>HB Protocol<br>Peer Systems</th>
+      <th style='width: 160px;'>Callsign (DMR Id)<br>Info</th>
+      <th style='width: 90px;'>Connected<br>TX/RX/Lost</th>
+      <th style='width: 42px;'>Slot</th>
+      <th style='width: 50%;'>Source</th>
+      <th style='width: 40%;'>Destination</th>
     </tr>
     {% for _peer, _pdata  in _table['PEERS'].items() %}
     <tr style="background-color:#f9f9f9f9;">
-        <td style="font-weight:bold" rowspan="2"> {{ _peer}}<br><span style="font-weight:normal; font: 7pt arial, sans-serif;">Mode: {{ _table['PEERS'][_peer]['MODE'] }}</span></td>
-        <td rowspan="2"><div class="tooltip"><b><font color=#0066ff>{{_table['PEERS'][_peer]['CALLSIGN']}}</font> </b><span style="font-weight:normal; font: 8pt arial, sans-serif;">(Id: {{ _table['PEERS'][_peer]['RADIO_ID'] }})</span><span class="tooltiptext" style="width:170px;">&nbsp;&nbsp;&nbsp;<b>Linked Time Slot: <font color=yellow>{{ _table['PEERS'][_peer]['SLOTS'] }}</font></b></span></div><br><div style="font: 92% arial, sans-serif; color:#b5651d;font-weight:bold">{{_table['PEERS'][_peer]['LOCATION']}}</div></td>
-        <td rowspan="2"; style="font: 9pt arial, sans-serif;{{ 'background-color:#98FB98' if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' else ';background-color:#ff704d' }}">{{ _table['PEERS'][_peer]['STATS']['CONNECTED'] }}<br><div style="font: 8pt arial, sans-serif">{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] - _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}</div></td>
-        
-        <td style="font: 10pt arial, sans-serif;background-color:#{{ _pdata[1]['BGCOLOR'] if _pdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[1]['COLOR'] if _pdata[1]['COLOR']|length !=0 else '000000' }}"><span style="color:#b70101">TS1</span></td>
-        <td style="font: 10pt arial, sans-serif;background-color:#{{ _pdata[1]['BGCOLOR'] if _pdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[1]['COLOR'] if _pdata[1]['COLOR']|length !=0 else '000000' }}">{{ _pdata[1]['SUB']|safe }}</td>
-        <td style="font: 10pt arial, sans-serif;color:#464646;background-color:#{{ _pdata[1]['BGCOLOR'] if _pdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[1]['COLOR'] if _pdata[1]['COLOR']|length !=0 else '000000' }}">{{ _pdata[1]['DEST']|safe }}</td>
-        <tr style="background-color:#f9f9f9f9;">
+      <td style="font-weight:bold" rowspan="2"> {{ _peer}}<br><span style="font-weight:normal; font: 7pt arial, sans-serif;">Mode: {{ _table['PEERS'][_peer]['MODE'] }}</span></td>
+      <td rowspan="2"><div class="tooltip"><b><font color=#0066ff>{{_table['PEERS'][_peer]['CALLSIGN']}}</font> </b><span style="font-weight:normal; font: 8pt arial, sans-serif;">(Id: {{ _table['PEERS'][_peer]['RADIO_ID'] }})</span><span class="tooltiptext" style="width:170px;">&nbsp;&nbsp;&nbsp;<b>Linked Time Slot: <font color=yellow>{{ _table['PEERS'][_peer]['SLOTS'] }}</font></b></span></div><br><div style="font: 92% arial, sans-serif; color:#b5651d;font-weight:bold">{{_table['PEERS'][_peer]['LOCATION']}}</div></td>
+      <td rowspan="2"; style="font: 9pt arial, sans-serif;{{ 'background-color:#98FB98' if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' else ';background-color:#ff704d' }}">{{ _table['PEERS'][_peer]['STATS']['CONNECTED'] }}<br><div style="font: 8pt arial, sans-serif">{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }} / {{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] - _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}</div></td>
+      <td style="font: 10pt arial, sans-serif;background-color:#{{ _pdata[1]['BGCOLOR'] if _pdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[1]['COLOR'] if _pdata[1]['COLOR']|length !=0 else '000000' }}"><span style="color:#b70101">TS1</span></td>
+      <td style="font: 10pt arial, sans-serif;background-color:#{{ _pdata[1]['BGCOLOR'] if _pdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[1]['COLOR'] if _pdata[1]['COLOR']|length !=0 else '000000' }}">{{ _pdata[1]['SUB']|safe }}</td>
+      <td style="font: 10pt arial, sans-serif;color:#464646;background-color:#{{ _pdata[1]['BGCOLOR'] if _pdata[1]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[1]['COLOR'] if _pdata[1]['COLOR']|length !=0 else '000000' }}">{{ _pdata[1]['DEST']|safe }}</td>
+      <tr style="background-color:#f9f9f9f9;">
         <td style="font: 10pt arial, sans-serif;background-color:#{{ _pdata[2]['BGCOLOR'] if _pdata[2]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[2]['COLOR'] if _pdata[2]['COLOR']|length !=0 else '000000' }}"><span style="color:#{{ _pdata[2]['COLOR'] if _pdata[2]['BGCOLOR'] == 'ff6347' else '3a4aa6'}}">TS2</span></td>
         <td style="font: 10pt arial, sans-serif;background-color:#{{ _pdata[2]['BGCOLOR'] if _pdata[2]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[2]['COLOR'] if _pdata[2]['COLOR']|length !=0 else '000000' }}">{{ _pdata[2]['SUB']|safe }}</td>
         <td style="font: 10pt arial, sans-serif;color:#464646;background-color:#{{ _pdata[2]['BGCOLOR'] if _pdata[2]['BGCOLOR']|length !=0 else 'f9f9f9f9' }}; color:#{{ _pdata[2]['COLOR'] if _pdata[2]['COLOR']|length !=0 else '000000' }}">{{ _pdata[2]['DEST']|safe }}</td>
-        </tr>
+      </tr>
     </tr>
-  {% endfor %}
-</table>
- {% else %}
-         <table style='width:100%; font: 13pt arial, sans-serif; margin-top:8px;margin-bottom:8px;'>
-             <tr style='border:none; background-color:#f9f9f9f9;'>
-             <td style='border:none;height:60px;'><font color=brown><b><center>Waiting for data from the Server ... or not defined on Server</center></b></td>
-             </tr>
-            </table>
- {% endif %}
+    {% endfor %}
+  </table>
+  {% else %}
+  <table style='width:100%; font: 13pt arial, sans-serif; margin-top:8px;margin-bottom:8px;'>
+    <tr style='border:none; background-color:#f9f9f9f9;'>
+      <td style='border:none;height:60px;'><font color=brown><b><center>Waiting for data from the Server ... or not defined on Server</center></b></td>
+    </tr>
+  </table>
+  {% endif %}
 </fieldset>