diff --git a/scores/templates/scores/match.html b/scores/templates/scores/match.html
index 725a628..672c8be 100644
--- a/scores/templates/scores/match.html
+++ b/scores/templates/scores/match.html
@@ -43,8 +43,8 @@ document.getElementById("demo").innerHTML = "EXPIRED";
 
 <div class="wrapper">
 
-  {% if match.club.header %}
-  <header class="center">{{ match.club.header }}</header>
+  {% if match.tournament.club.header %}
+  <header class="center">{{ match.tournament.club.header }}</header>
   {% endif %}
 
   <main class="page-body">
@@ -60,20 +60,20 @@ document.getElementById("demo").innerHTML = "EXPIRED";
         {% if match.team3 %}
 
         <table>
-          <tr><td>{{ match.team1 }}</td>
+          <tr><td>{{ match.team1|linebreaksbr }}</td>
             {% if match.team1scorecolumn1 %}<td class="score">{{ match.team1scorecolumn1 }}</td>{% endif %}
           </tr>
-          <tr><td>{{ match.team2 }}</td>
+          <tr><td>{{ match.team2|linebreaksbr }}</td>
             {% if match.team1scorecolumn2 %}<td class="score">{{ match.team1scorecolumn2 }}</td>{% endif %}
           </tr>
-          <tr><td>{{ match.team3 }}</td>
+          <tr><td>{{ match.team3|linebreaksbr }}</td>
             {% if match.team1scorecolumn3 %}<td class="score">{{ match.team1scorecolumn3 }}</td>{% endif %}
           </tr>
-          <tr><td>{{ match.team4 }}</td>
+          <tr><td>{{ match.team4|linebreaksbr }}</td>
             {% if match.team1scorecolumn4 %}<td class="score">{{ match.team1scorecolumn4 }}</td>{% endif %}
           </tr>
 
-          <tr><td>{{ match.team5 }}</td>
+          <tr><td>{{ match.team5|linebreaksbr }}</td>
             {% if match.team1scorecolumn5 %}<td class="score">{{ match.team1scorecolumn5 }}</td>{% endif %}
           </tr>
         </table>
@@ -81,7 +81,7 @@ document.getElementById("demo").innerHTML = "EXPIRED";
 
         <table>
           <tr>
-            <td>{{ match.team1 }}</td>
+            <td>{{ 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 +89,7 @@ document.getElementById("demo").innerHTML = "EXPIRED";
             {% if match.team1scorecolumn5 %}<td class="score">{{ match.team1scorecolumn5 }}</td>{% endif %}
           </tr>
           <tr>
-            <td>{{ match.team2 }}</td>
+            <td>{{ 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 %}