diff --git a/templates/course.hamlet b/templates/course.hamlet
index eefb2ce53..6b2e77ab9 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,42 +1,43 @@
 <div .container>
-  <table>
-    $maybe school <- schoolMB
-      <tr>
-        <th #school>Fakultät/Institut
+  <div .scrolltable>
+    <table .table.table--striped.table--hover.table--vertical>
+      $maybe school <- schoolMB
+        <tr .table__row>
+          <th #school>Fakultät/Institut
+          <td>
+            #{schoolName school}
+      $maybe descr <- courseDescription course
+        <tr .table__row>
+          <th #description>Beschreibung
+          <td>
+            #{descr}
+      $maybe link <- courseLinkExternal course
+        <tr .table__row>
+          <th #website>Website
+          <td>
+            <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
+      <tr .table__row>
+        <th #participants>Teilnehmer
         <td>
-          #{schoolName school}
-    $maybe descr <- courseDescription course
-      <tr>
-        <th #description>Beschreibung
+          #{participants}
+          $maybe capacity <- courseCapacity course
+            \ von #{capacity}
+      <tr .table__row>
+        <th #registration>Anmeldezeitraum
         <td>
-          #{descr}
-    $maybe link <- courseLinkExternal course
-      <tr>
-        <th #website>Website
-        <td>
-          <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
-    <tr>
-      <th #participants>Teilnehmer
-      <td>
-        #{participants}
-        $maybe capacity <- courseCapacity course
-          \ von #{capacity}
-    <tr>
-      <th #registration>Anmeldezeitraum
-      <td>
-        $maybe regFrom <- courseRegisterFrom course
-          #{formatTimeGerWD regFrom}
-        $maybe regTo   <- courseRegisterTo   course
-          \ bis #{formatTimeGerWD regTo}
+          $maybe regFrom <- courseRegisterFrom course
+            #{formatTimeGerWD regFrom}
+          $maybe regTo   <- courseRegisterTo   course
+            \ bis #{formatTimeGerWD regTo}
 
-    <tr>
-      <th>
-      <td>
-        $if registrationOpen
-          <div .course__registration.container>
-            <form method=post action=@{CourseR tid csh CRegisterR} enctype=#{regEnctype}>
-              $# regWidget is defined through templates/widgets/registerForm
-              ^{regWidget}
+      <tr .table__row>
+        <th>
+        <td>
+          $if registrationOpen
+            <div .course__registration.container>
+              <form method=post action=@{CourseR tid csh CRegisterR} enctype=#{regEnctype}>
+                $# regWidget is defined through templates/widgets/registerForm
+                ^{regWidget}
 
 $# <div .container>
 $#   <div .tab-group>
diff --git a/templates/course.lucius b/templates/course.lucius
index 4f4794dfb..8b11b05a7 100644
--- a/templates/course.lucius
+++ b/templates/course.lucius
@@ -1,7 +1,3 @@
-.course__registration {
-  margin-top: 20px;
-}
-
 th {
   vertical-align: top;
   text-align: left;
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 592a45b1d..994f2258e 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -118,11 +118,11 @@ h1 {
 }
 h2 {
   font-size: 24px;
-  margin: 10px 0 5px;
+  margin: 10px 0;
 }
 h3 {
   font-size: 20px;
-  margin: 5px 0;
+  margin: 10px 0;
 }
 h4 {
   font-size: 16px;
diff --git a/templates/formPageI18n.hamlet b/templates/formPageI18n.hamlet
index c86e3de7c..34c3bd3f9 100644
--- a/templates/formPageI18n.hamlet
+++ b/templates/formPageI18n.hamlet
@@ -1,5 +1,5 @@
 $maybe text <- formText
-  <p>
+  <h3>
     _{text}
 <form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-   ^{formWidget}                        
+   ^{formWidget}
diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index 69cb79dba..0233e8956 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -1,7 +1,4 @@
 /* GENERAL STYLES FOR FORMS */
-form {
-  margin: 20px 0;
-}
 
 /* FORM GROUPS */
 .form-group {
@@ -12,7 +9,7 @@ form {
   grid-gap: 5px;
   justify-content: flex-start;
   align-items: flex-start;
-  padding: 4px;
+  padding: 4px 0;
   border-left: 2px solid transparent;
 
   + .form-group {