diff --git a/templates/course.hamlet b/templates/course.hamlet
index 869172518..858a48b74 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -3,37 +3,42 @@
     <table .table.table--striped.table--hover.table--vertical>
       $maybe school <- schoolMB
         <tr .table__row>
-          <th #school>Fakultät/Institut
-          <td>
-            #{schoolName school}
+          <th #school .table__th>Fakultät/Institut
+          <td .table__td>
+            <div.table__td-content>
+              #{schoolName school}
       $maybe descr <- courseDescription course
         <tr .table__row>
-          <th #description>Beschreibung
-          <td>
-            #{descr}
+          <th #description .table__th>Beschreibung
+          <td .table__td>
+            <div.table__td-content>
+              #{descr}
       $maybe link <- courseLinkExternal course
         <tr .table__row>
-          <th #website>Website
-          <td>
-            <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
+          <th #website .table__th>Website
+          <td .table__td>
+            <div.table__td-content>
+              <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
       <tr .table__row>
-        <th #participants>Teilnehmer
-        <td>
-          #{participants}
-          $maybe capacity <- courseCapacity course
-            \ von #{capacity}
+        <th #participants .table__th>Teilnehmer
+        <td .table__td>
+          <div.table__td-content>
+            #{participants}
+            $maybe capacity <- courseCapacity course
+              \ von #{capacity}
       $maybe regFrom <- courseRegisterFrom course
         <tr .table__row>
-          <th #registration>Anmeldezeitraum
-          <td>
-            Ab #{formatTimeGerWD regFrom}
-            $maybe regTo   <- courseRegisterTo   course
-              \ bis #{formatTimeGerWD regTo}
+          <th #registration .table__th>Anmeldezeitraum
+          <td .table__td>
+            <div.table__td-content>
+              Ab #{formatTimeGerWD regFrom}
+              $maybe regTo   <- courseRegisterTo   course
+                \ bis #{formatTimeGerWD regTo}
       $if registrationOpen
         <tr .table__row>
-          <th>
-          <td>
-            <div .course__registration.container>
+          <th .table__th>
+          <td .table__td>
+            <div .table__td-content.course__registration.container>
               <form method=post action=@{CourseR tid csh CRegisterR} enctype=#{regEnctype}>
                 $# regWidget is defined through templates/widgets/registerForm
                 ^{regWidget}