diff --git a/templates/hblink_table.html b/templates/hblink_table.html
index 15a895a..efa67a5 100755
--- a/templates/hblink_table.html
+++ b/templates/hblink_table.html
@@ -29,9 +29,10 @@
     {% for _master in _table['MASTERS'] %}    
 
     <tr>
-        <td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|length }}"> {{ _master}} </td>
-        {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].iteritems() %}
-        
+        <td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|length + 1 }}"> {{ _master}} </td>
+    </tr>
+    {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].iteritems() %}
+    <tr>
         <td>{{ _client }}</td>
         <td>{{ _cdata['CALLSIGN'] }}</td>
         <td>{{ _cdata['TX_FREQ'] }}</td>
@@ -41,9 +42,8 @@
         <td>{{ _cdata['PINGS_RECEIVED'] }}</td>
         <td>{{ _cdata['IP'] }}</td>
         <td>{{ _cdata['PORT'] }}</td>
-        </tr>    
-        {% endfor %}
-    </tr>
+    </tr>    
+    {% endfor %}
 {% endfor %}
 </table>