diff --git a/templates/course.hamlet b/templates/course.hamlet
index 94d8dbfb4..39839aa2f 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,34 +1,54 @@
-<div .course-header>
-  <div .course-header__info>
-    <table>
-      <tr>
-        <th>Teilnehmer
-        <td>
-          #{participants}
-          $maybe capacity <- courseCapacity course
-            \ von #{capacity}
-      <tr>
-        <th>Anmeldezeitraum
-        <td>
-          $maybe regFrom <- courseRegisterFrom course
-            #{formatTimeGerWD regFrom}
-          $maybe regTo   <- courseRegisterTo   course
-            \ bis #{formatTimeGerWD regTo}
-
-    <div>
-      <form method=post action=@{CourseR tid csh CourseShowR} enctype=#{regEnctype}>
-        ^{regWidget}
-
-  <div .course-header__title>
-    <h1>#{courseName course}
-    $maybe school <- schoolMB
-      <h4>#{schoolName school}
-
-
 <div .container>
+  <h2>#{courseName course}
+  $maybe school <- schoolMB
+    <h4>#{schoolName school}
   $maybe descr <- courseDescription course
-    <h2 #description>Beschreibung
+    <h3 #description>Beschreibung
     <p> #{descr}
   $maybe link <- courseLinkExternal course
-    <h4 #linl>Homepage
+    <h3 #linl>Homepage
     <a href=#{link}>#{link}
+
+<div .container>
+  <h3>Übersicht
+  <table>
+    <tr>
+      <th>Teilnehmer
+      <td>
+        #{participants}
+        $maybe capacity <- courseCapacity course
+          \ von #{capacity}
+    <tr>
+      <th>Anmeldezeitraum
+      <td>
+        $maybe regFrom <- courseRegisterFrom course
+          #{formatTimeGerWD regFrom}
+        $maybe regTo   <- courseRegisterTo   course
+          \ bis #{formatTimeGerWD regTo}
+
+  <form method=post action=@{CourseR tid csh CourseShowR} enctype=#{regEnctype}>
+    ^{regWidget}
+
+$# TODO: maybe übungsblätter
+<div .container>
+  <h3>Übungsblätter
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr>
+        <th>Blatt
+        <th>Abgabe ab
+        <th>Abgabe bis
+        <th>Bewertung</th>
+    <tbody>
+      <tr>
+        <td>
+          <a class="btn btn-link" href="http://localhost:3000/course/S2018/ffp/ex/Blatt%201/show" role="button">Blatt 1
+        <td>Do 11.04.18
+        <td>Do 11.04.18
+        <td>NotGraded
+
+$# TODO: maybe klausuren
+<div .container>
+  <h3>Klausuren
+  <span>...
+$# ...
diff --git a/templates/course.lucius b/templates/course.lucius
index a9715afd7..e69de29bb 100644
--- a/templates/course.lucius
+++ b/templates/course.lucius
@@ -1,19 +0,0 @@
-.course-header {
-  /*display: flex;
-  flex-direction: row;
-  justify-content: space-between;*/
-}
-
-.course-header__title {
-  align-self: baseline;
-}
-.course-header__info {
-  border: 1px solid var(--greybase);
-  padding: 13px;
-  align-self: center;
-  float: right;
-}
-
-.course-header__info table {
-  margin: 0;
-}