diff --git a/scores/templates/scores/match.html b/scores/templates/scores/match.html
index 672c8be..10ea699 100644
--- a/scores/templates/scores/match.html
+++ b/scores/templates/scores/match.html
@@ -60,28 +60,31 @@ document.getElementById("demo").innerHTML = "EXPIRED";
         {% if match.team3 %}
 
         <table>
-          <tr><td>{{ match.team1|linebreaksbr }}</td>
+          <tr><td class="teamname">{{ match.team1|linebreaksbr }}</td>
             {% if match.team1scorecolumn1 %}<td class="score">{{ match.team1scorecolumn1 }}</td>{% endif %}
           </tr>
-          <tr><td>{{ match.team2|linebreaksbr }}</td>
+          <tr><td class="teamname">{{ match.team2|linebreaksbr }}</td>
             {% if match.team1scorecolumn2 %}<td class="score">{{ match.team1scorecolumn2 }}</td>{% endif %}
           </tr>
-          <tr><td>{{ match.team3|linebreaksbr }}</td>
+          <tr><td class="teamname">{{ match.team3|linebreaksbr }}</td>
             {% if match.team1scorecolumn3 %}<td class="score">{{ match.team1scorecolumn3 }}</td>{% endif %}
           </tr>
-          <tr><td>{{ match.team4|linebreaksbr }}</td>
+          <tr><td class="teamname">{{ match.team4|linebreaksbr }}</td>
             {% if match.team1scorecolumn4 %}<td class="score">{{ match.team1scorecolumn4 }}</td>{% endif %}
           </tr>
-
-          <tr><td>{{ match.team5|linebreaksbr }}</td>
+          
+          {% if match.team5 %}
+          <tr><td class="teamname">{{ match.team5|linebreaksbr }}</td>
             {% if match.team1scorecolumn5 %}<td class="score">{{ match.team1scorecolumn5 }}</td>{% endif %}
           </tr>
+          {% endif %}
+
         </table>
         {% else %}
 
         <table>
           <tr>
-            <td>{{ match.team1|linebreaksbr }}</td>
+            <td class="teamname">{{ match.team1|linebreaksbr }}</td>
             {% if match.team1scorecolumn1 %}<td class="score">{{ match.team1scorecolumn1 }}</td>{% endif %}
             {% if match.team1scorecolumn2 %}<td class="score">{{ match.team1scorecolumn2 }}</td>{% endif %}
             {% if match.team1scorecolumn3 %}<td class="score">{{ match.team1scorecolumn3 }}</td>{% endif %}
@@ -89,7 +92,7 @@ document.getElementById("demo").innerHTML = "EXPIRED";
             {% if match.team1scorecolumn5 %}<td class="score">{{ match.team1scorecolumn5 }}</td>{% endif %}
           </tr>
           <tr>
-            <td>{{ match.team2|linebreaksbr }}</td>
+            <td class="teamname">{{ match.team2|linebreaksbr }}</td>
             {% if match.team2scorecolumn1 %}<td class="score">{{ match.team2scorecolumn1 }}</td>{% endif %}
             {% if match.team2scorecolumn2 %}<td class="score">{{ match.team2scorecolumn2 }}</td>{% endif %}
             {% if match.team2scorecolumn3 %}<td class="score">{{ match.team2scorecolumn3 }}</td>{% endif %}