diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 771d30b1b..d415ace68 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -102,7 +102,7 @@ TermLectureEndTooltip: Meistens dauer das Sommersemester 14 Wochen und das Winte
 TermActive: Aktiv
 
 
-ScheduleHeadline: Terminübersicht
+NewsHeadlineSchedule: Terminübersicht
 
 ScheduleTableHeadTime: Zeit
 
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index af5771ff4..99aab8438 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -102,7 +102,7 @@ TermLectureEndTooltip: Summer semesters are usually 14 weeks; winter semesters 1
 TermActive: Active
 
 
-ScheduleHeadline: Schedule
+NewsHeadlineSchedule: Schedule
 
 ScheduleTableHeadTime: Time
 
diff --git a/src/Handler/News.hs b/src/Handler/News.hs
index 95473cb5b..8df9d37c5 100644
--- a/src/Handler/News.hs
+++ b/src/Handler/News.hs
@@ -89,7 +89,7 @@ newsSystemMessages = do
 -- TODO: persist default schedule in user settings, lookup default and choose schedule accordingly
 -- TODO: add action to switch schedule (replace widget)
 newsSchedule :: UserId -> Widget
-newsSchedule = flip weekSchedule Nothing
+newsSchedule uid = let schedule = weekSchedule uid Nothing in $(widgetFile "news/schedule")
 
 
 newsUpcomingSheets :: UserId -> Widget
diff --git a/src/Utils/Schedule/Types.hs b/src/Utils/Schedule/Types.hs
index d847d3532..4fb6d44a5 100644
--- a/src/Utils/Schedule/Types.hs
+++ b/src/Utils/Schedule/Types.hs
@@ -12,7 +12,6 @@ data ScheduleEntry = ScheduleEntry
   { seCourse       :: Entity Course  -- TODO: just course?; TODO: Maybe?
   , seType         :: ScheduleEntryType
   , seRoom         :: ScheduleEntryRoom
-  --, seOccurrences  :: Occurrences  -- TODO: will require converting exam occurrences to an ExceptOccur OccurrenceException
   , seOccurrence   :: ScheduleEntryOccurrence
   }
 
diff --git a/templates/news/schedule.hamlet b/templates/news/schedule.hamlet
new file mode 100644
index 000000000..fb9f1b78a
--- /dev/null
+++ b/templates/news/schedule.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<section>
+  <h2>
+    _{MsgNewsHeadlineSchedule}
+  ^{schedule}
diff --git a/templates/widgets/schedule/week.hamlet b/templates/widgets/schedule/week.hamlet
index 8f0952cd3..1a76b93c8 100644
--- a/templates/widgets/schedule/week.hamlet
+++ b/templates/widgets/schedule/week.hamlet
@@ -1,41 +1,37 @@
 $newline never
-<section>
-  <h2>
-    _{MsgScheduleHeadline}
-
-  <div uw-hide-columns="schedule-week">
-    <table .table .table--striped .table--hover .schedule>
-      <thead>
-        <tr .table__row .table__row--head>
-          <th .table__th uw-hide-column-header="time">
-            _{MsgScheduleTableHeadTime}
-          $forall (_, weekDayTitle, weekDayIdent) <- weekDays
-            <th .table__th uw-hide-column-header=#{weekDayIdent}>
-              _{weekDayTitle}
-      <tbody>
-        $forall slot <- slotsToDisplay
-          <tr .table__row>
+<div uw-hide-columns="schedule-week">
+  <table .table .table--striped .table--hover .schedule>
+    <thead>
+      <tr .table__row .table__row--head>
+        <th .table__th uw-hide-column-header="time">
+          _{MsgScheduleTableHeadTime}
+        $forall (_, weekDayTitle, weekDayIdent) <- weekDays
+          <th .table__th uw-hide-column-header=#{weekDayIdent}>
+            _{weekDayTitle}
+    <tbody>
+      $forall slot <- slotsToDisplay
+        <tr .table__row>
+          <td .table__td>
+            ^{slotToDisplayTime slot}
+          $forall (day, _, _) <- weekDays
             <td .table__td>
-              ^{slotToDisplayTime slot}
-            $forall (day, _, _) <- weekDays
-              <td .table__td>
-                <div .table__td-content>
-                  $maybe dayEvents <- Map.lookup day courseEvents
-                    $maybe slotEvents <- Map.lookup slot dayEvents
-                      $forall ScheduleEntry{seCourse=Entity _ Course{courseTerm,courseSchool,courseShorthand,courseName},seType,seRoom,seOccurrence} <- slotEvents
-                        <a href=@{CourseR courseTerm courseSchool courseShorthand CShowR} .schedule--entry-link>
-                          <div .schedule--entry>
-                            #{CI.original courseName}: #
-                            $case seType
-                              $of SETCourseEvent{..}
-                                #{CI.original setceType}
-                              $of SETTutorial{..}
-                                #{CI.original settType}
-                              $of SETExamOccurrence{..}
-                                #{seteoExamName}
-                            <br>
+              <div .table__td-content>
+                $maybe dayEvents <- Map.lookup day courseEvents
+                  $maybe slotEvents <- Map.lookup slot dayEvents
+                    $forall ScheduleEntry{seCourse=Entity _ Course{courseTerm,courseSchool,courseShorthand,courseName},seType,seRoom,seOccurrence} <- slotEvents
+                      <a href=@{CourseR courseTerm courseSchool courseShorthand CShowR} .schedule--entry-link>
+                        <div .schedule--entry>
+                          #{CI.original courseName}: #
+                          $case seType
+                            $of SETCourseEvent{..}
+                              #{CI.original setceType}
+                            $of SETTutorial{..}
+                              #{CI.original settType}
+                            $of SETExamOccurrence{..}
+                              #{seteoExamName}
+                          <br>
 
-                            $maybe room <- seRoom
-                              _{MsgScheduleRoom}: #{room} <br/>
-                            
-                            ^{formatOccurrenceW seOccurrence}
+                          $maybe room <- seRoom
+                            _{MsgScheduleRoom}: #{room} <br/>
+                          
+                          ^{formatOccurrenceW seOccurrence}