diff --git a/messages/de.msg b/messages/de.msg
index d80594ac7..331efef79 100644
--- a/messages/de.msg
+++ b/messages/de.msg
@@ -7,12 +7,17 @@ TermNewTitle: Semester editiere/anlegen.
 InvalidInput: Eingaben bitte korrigieren.
 Term: Semester
 TermPlaceholder: W/S + vierstellige Jahreszahl
+TermEditHeading: Semester editieren/anlegen
 
 CourseNewOk        tid@TermIdentifier courseShortHand@Text: Kurs #{termToText tid}-#{courseShortHand} wurde erfolgreich erstellt.
 CourseEditOk       tid@TermIdentifier courseShortHand@Text: Kurs #{termToText tid}-#{courseShortHand} wurde erfolgreich geändert.
 CourseNewDupShort  tid@TermIdentifier courseShortHand@Text: Kurs #{termToText tid}-#{courseShortHand} konnte nicht erstellt werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{courseShortHand} in diesem Semester.
 CourseEditDupShort tid@TermIdentifier courseShortHand@Text: Kurs #{termToText tid}-#{courseShortHand} konnte nicht geändert werden: Es gibt bereits einen anderen Kurs mit dem Kürzel #{courseShortHand} in diesem Semester.
 FFSheetName: Name
+TermCourseListHeading tid@TermIdentifier: Kursübersicht #{termToText tid} 
+TermCourseListTitle tid@TermIdentifier: Kurse #{termToText tid}
+CourseEditHeading: Kurs editieren/anlegen
+CourseEditTitle: Kurs editieren/anlegen
 
 SheetNewOk         tid@TermIdentifier courseShortHand@Text sheetName@Text: Neues Übungsblatt #{sheetName} wurde im Kurs #{termToText tid}-#{courseShortHand} erfolgreich erstellt.
 SheetTitle         tid@TermIdentifier courseShortHand@Text sheetName@Text: #{termToText tid}-#{courseShortHand} #{sheetName}
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 2cd146bba..22014a05e 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -638,14 +638,25 @@ pageActions (TermCourseListR _) =
 
 pageActions _ = []
 
+i18nHeading :: (MonadWidget m, RenderMessage site msg, HandlerSite m ~ site) => msg -> m ()
+i18nHeading msg = liftWidgetT $ toWidget =<< getMessageRender <*> pure msg
+
 pageHeading :: Route UniWorX -> Maybe Widget
 pageHeading HomeR
-  = Just [whamlet|_{MsgHomeHeading}|]
+  = Just $ i18nHeading MsgHomeHeading
 pageHeading TermShowR
-  = Just [whamlet|_{MsgTermsHeading}|]
--- TODO: add headings for single course- and single term-pages
--- pageHeading CourseR
---   = Just ...
+  = Just $ i18nHeading MsgTermsHeading
+pageHeading TermEditR
+  = Just $ i18nHeading MsgTermEditHeading
+pageHeading (TermCourseListR tid)
+  = Just . i18nHeading . MsgTermCourseListHeading $ unTermKey tid
+pageHeading CourseNewR
+  = Just $ i18nHeading MsgCourseEditHeading
+pageHeading (CourseR tid csh CShowR)
+  = Just $ do
+    Entity _ Course{..} <- handlerToWidget . runDB . getBy404 $ CourseTermShort tid csh
+    toWidget courseName
+-- TODO: add headings for more single course- and single term-pages
 pageHeading _
   = Nothing
 
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 4c8af6bbd..2ae19143c 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -73,7 +73,7 @@ getTermCourseListR tidini = do
         ]
   let coursesTable = encodeWidgetTable tableSortable colonnadeTerms courses
   defaultLayout $ do
-    setTitle "Semesterkurse"
+    setTitleI . MsgTermCourseListTitle $ unTermKey tidini
     $(widgetFile "courses")
 
 getCShowR :: TermId -> Text -> Handler Html
@@ -254,10 +254,9 @@ courseEditHandler isGet course = do
       (FormFailure _) -> addMessageI "warning" MsgInvalidInput
       (FormMissing) | isGet -> return ()
       other -> addMessage "error" $ [shamlet| Error: #{show other}|]
-    let formTitle   = "Kurs editieren/anlegen" :: Text
     actionUrl <- fromMaybe CourseNewR <$> getCurrentRoute
     defaultLayout $ do
-      setTitle [shamlet| #{formTitle} |]
+      setTitleI MsgCourseEditTitle
       $(widgetFile "formPage")
 
 
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index e9aee4b35..f09bc9e9a 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -125,10 +125,9 @@ termEditHandler term = do
           redirect TermShowR
       (FormMissing  ) -> return ()
       (FormFailure _) -> addMessageI "warning" MsgInvalidInput
-    let formTitle   = "Semester editieren/anlegen" :: Text
     let actionUrl   = TermEditR
     defaultLayout $ do
-      setTitle [shamlet| #{formTitle} |]
+      setTitleI MsgTermEditHeading
       $(widgetFile "formPage")
 
 newTermForm :: Maybe Term -> Form Term
diff --git a/templates/course.hamlet b/templates/course.hamlet
index d8f1fd5f7..75629dc32 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,5 +1,4 @@
 <div .container>
-  <h2>#{courseName course}
   <table>
     $maybe school <- schoolMB
       <tr>
diff --git a/templates/courses.hamlet b/templates/courses.hamlet
index b1f774078..cc9106b21 100644
--- a/templates/courses.hamlet
+++ b/templates/courses.hamlet
@@ -1,4 +1,3 @@
 <div .container>
-  <h1>Kursübersicht für Semester #{termToText $ unTermKey tidini}
   <div .scrolltable>
     ^{coursesTable}
diff --git a/templates/formPage.hamlet b/templates/formPage.hamlet
index 855a10e76..f75289e29 100644
--- a/templates/formPage.hamlet
+++ b/templates/formPage.hamlet
@@ -1,12 +1,2 @@
-<div .container>
-    <div .bs-docs-section>
-        <div .row>
-            <div .col-lg-12>
-                <div .page-header>
-                    <h1 #forms>
-                      #{formTitle}
-        <div .row>
-            <div .col-md-10 .col-lg-9>
-                <div .bs-callout bs-callout-info well>
-                    <form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-                        ^{formWidget}
+<form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
+  ^{formWidget}
diff --git a/templates/formPageI18n.hamlet b/templates/formPageI18n.hamlet
index e7b11f4a9..c86e3de7c 100644
--- a/templates/formPageI18n.hamlet
+++ b/templates/formPageI18n.hamlet
@@ -1,15 +1,5 @@
-<div .container>
-    <div .bs-docs-section>
-        <div .row>
-            <div .col-lg-12>
-                <div .page-header>
-                    <h1 #forms>
-                      _{formTitle}
-                    $maybe text <- formText
-                      _{text}
-
-        <div .row>
-            <div .col-md-10 .col-lg-9>
-                <div .bs-callout bs-callout-info well>
-                    <form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
-                        ^{formWidget}                        
+$maybe text <- formText
+  <p>
+    _{text}
+<form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}>
+   ^{formWidget}