diff --git a/src/components/FightTable.svelte b/src/components/FightTable.svelte
index 291984a..d95cfe8 100644
--- a/src/components/FightTable.svelte
+++ b/src/components/FightTable.svelte
@@ -44,27 +44,31 @@
 
 <div>
     <table>
-        <tr class="font-bold border-b">
-            {#each Array(rows) as i (i)}
-                <td>{t("announcements.table.time")}</td>
-                <td>{t("announcements.table.blue")}</td>
-                <td>{t("announcements.table.red")}</td>
-                <td>{t("announcements.table.winner")}</td>
-            {/each}
-        </tr>
-        {#each window(event.fights.filter(f => f.group === group), rows) as fights}
-            <tr>
-                {#each fights as fight (fight.id)}
-                    <td>{Intl.DateTimeFormat(astroI18n.locale, {
-                        hour: "numeric",
-                        minute: "numeric",
-                    }).format(new Date(fight.start))}</td>
-                    <td class:font-bold={fight.ergebnis === 1} class:italic={fight.ergebnis === 3}>{fight.blueTeam.kuerzel}</td>
-                    <td class:font-bold={fight.ergebnis === 2} class:italic={fight.ergebnis === 3}>{fight.redTeam.kuerzel}</td>
-                    <td>{getWinner(fight)}</td>
+        <thead>
+            <tr class="font-bold border-b">
+                {#each Array(rows) as i (i)}
+                    <td>{t("announcements.table.time")}</td>
+                    <td>{t("announcements.table.blue")}</td>
+                    <td>{t("announcements.table.red")}</td>
+                    <td>{t("announcements.table.winner")}</td>
                 {/each}
             </tr>
-        {/each}
+        </thead>
+        <tbody>
+            {#each window(event.fights.filter(f => f.group === group), rows) as fights}
+                <tr>
+                    {#each fights as fight (fight.id)}
+                        <td>{Intl.DateTimeFormat(astroI18n.locale, {
+                            hour: "numeric",
+                            minute: "numeric",
+                        }).format(new Date(fight.start))}</td>
+                        <td class:font-bold={fight.ergebnis === 1} class:italic={fight.ergebnis === 3}>{fight.blueTeam.kuerzel}</td>
+                        <td class:font-bold={fight.ergebnis === 2} class:italic={fight.ergebnis === 3}>{fight.redTeam.kuerzel}</td>
+                        <td>{getWinner(fight)}</td>
+                    {/each}
+                </tr>
+            {/each}
+        </tbody>
     </table>
 </div>
 
diff --git a/src/components/GroupTable.svelte b/src/components/GroupTable.svelte
index 275682b..7e878cf 100644
--- a/src/components/GroupTable.svelte
+++ b/src/components/GroupTable.svelte
@@ -50,20 +50,24 @@
 
 <div>
     <table>
-        <tr class="font-bold border-b">
-            {#each Array(rows) as i (i)}
-                <td>{t("announcements.table.team")}</td>
-                <td>{t("announcements.table.points")}</td>
-            {/each}
-        </tr>
-        {#each window(teamPoints, rows) as teams}
-            <tr>
-                {#each teams as team (team.team.id)}
-                    <td>{team.team.name}</td>
-                    <td>{team.points}</td>
+        <thead>
+            <tr class="font-bold border-b">
+                {#each Array(rows) as i (i)}
+                    <td>{t("announcements.table.team")}</td>
+                    <td>{t("announcements.table.points")}</td>
                 {/each}
             </tr>
-        {/each}
+        </thead>
+        <tbody>
+            {#each window(teamPoints, rows) as teams}
+                <tr>
+                    {#each teams as team (team.team.id)}
+                        <td>{team.team.name}</td>
+                        <td>{team.points}</td>
+                    {/each}
+                </tr>
+            {/each}
+        </tbody>
     </table>
 </div>