diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ef0003579..78a7b7d42 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -152,6 +152,8 @@ NoSuchSchool ssh@SchoolId: Institut #{ssh} gibt es nicht.
 NoSuchCourseShorthand csh@CourseShorthand: Kein Kurs mit Kürzel #{csh} bekannt.
 NoSuchCourse: Keinen passenden Kurs gefunden.
 
+NoCourseDescription: Zu diesem Kurs ist keine Beschreibung verfügbar.
+
 Sheet: Blatt
 SheetList          tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Übersicht Übungsblätter
 SheetNewHeading    tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Neues Übungsblatt anlegen
@@ -507,6 +509,8 @@ ForSchools n@Int: für #{pluralDE n "Institut" "Institute"}
 UserListTitle: Komprehensive Benutzerliste
 AccessRightsSaved: Berechtigungsänderungen wurden gespeichert.
 
+LecturersForN n@Int: #{pluralDE n "Dozent" "Dozenten"}
+
 Date: Datum
 DateTimeFormat: Datums- und Uhrzeitformat
 DateFormat: Datumsformat
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index ba7c29687..aeb94f621 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -853,8 +853,8 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
         
         wRows <- forM (zip [0..length rows] rows) $ \(cid, row') -> let
           Course{..}       = row' ^. c . _entityVal
-          lecturers        = toListOf l row'
-          courseLecturers  = intercalate ", " $ userSurname . entityVal <$> lecturers
+          lecturerUsers    = toListOf l row'
+          courseLecturers  = userSurname . entityVal <$> lecturerUsers
           isRegistered     = row' ^. r
           courseSchoolName = unSchoolKey courseSchool
           courseId         = tshow cid
diff --git a/templates/table/course/colonnade.hamlet b/templates/table/course/colonnade.hamlet
index 91f065160..f67891d7d 100644
--- a/templates/table/course/colonnade.hamlet
+++ b/templates/table/course/colonnade.hamlet
@@ -9,4 +9,4 @@ $newline never
       $else
         $forall row <- wRows
           <tr .table__row>
-              ^{row}
\ No newline at end of file
+            ^{row}
\ No newline at end of file
diff --git a/templates/table/course/course-teaser.hamlet b/templates/table/course/course-teaser.hamlet
index 08ec2cf29..6a48d3192 100644
--- a/templates/table/course/course-teaser.hamlet
+++ b/templates/table/course/course-teaser.hamlet
@@ -2,10 +2,15 @@
   <div .course-teaser__chevron>
   <div .course-teaser__shorthand>_{courseShorthand}
   <div .course-teaser__title>
-    <a href=@{AdminTestR}>_{courseName}
+    <a href=@{CourseR courseTerm courseSchool courseShorthand CShowR}>_{courseName}
   <div .course-teaser__registration>_{MsgRegistered}
-  <div .course-teaser__lecturer-label>_{MsgLecturerFor}
-  <div .course-teaser__lecturer-value>_{courseLecturers}
+  <div .course-teaser__lecturer-label>
+    _{MsgLecturersForN (length courseLecturers)}
+  <div .course-teaser__lecturer-value>
+    <ul .list--inline .list--comma-separated>
+      $forall lecturer <- courseLecturers
+        <li>
+          #{lecturer}
   <div .course-teaser__duedate-label>_{MsgRegisterTo}
   $maybe regTo <- courseRegisterTo
     <div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo}
@@ -16,4 +21,4 @@
     $maybe desc <- courseDescription
       #{desc}
     $nothing
-      No description available.
+      _{MsgNoCourseDescription}