diff --git a/templates/courses.hamlet b/templates/courses.hamlet
index cc9106b21..6cc6a0c13 100644
--- a/templates/courses.hamlet
+++ b/templates/courses.hamlet
@@ -1,3 +1,2 @@
 <div .container>
-  <div .scrolltable>
-    ^{coursesTable}
+  ^{coursesTable}
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 08c29a53a..729e4c672 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -335,6 +335,8 @@ input[type="button"].btn-info:hover,
 /* SCROLLTABLE */
 .scrolltable {
   overflow: auto;
+  box-shadow: 0 0 3px 0 var(--color-grey);
+  margin-bottom: 15px;
 }
 
 @media (max-width: 425px) {
diff --git a/templates/widgets/gradingSummary.hamlet b/templates/widgets/gradingSummary.hamlet
index 75c488504..248c4b085 100644
--- a/templates/widgets/gradingSummary.hamlet
+++ b/templates/widgets/gradingSummary.hamlet
@@ -9,34 +9,35 @@ $#  rowWdgts        :: Liste von Widgets für jede Zeile (Normal,Bonus,KeineWert
 $# --
 <div>
   <h3>_{MsgSummaryTitle} _{title $ getSum $ numSheets $ sumSummaries}
-  <table .table .table--striped>
-    <tr .table__row .table__row--head>
-      <th>
-        $# empty cell for row headers
-      $maybe _ <- hasMarkedPasses
-        <th .table__th colspan=2>_{MsgCorrected}
-      $maybe _ <- hasPasses
-        <th .table__th>_{MsgSheetGradingPassing'}
-      $maybe _ <- hasMarkedPoints
-        <th .table__th colspan=2>_{MsgCorrected}
-      $maybe _ <- hasPoints
-        <th .table__th>_{MsgSheetGradingPoints'}
-      <th .table__th>_{MsgSheetGradingCount'}
-        $# Number of Sheet/Submissions used for calculating maximum passes/points
-    $forall row <- rowWdgts
-      ^{row}
-    $maybe nrNoGrade <- positiveSum $ numNotGraded
-      <tr .table__row>
-        <th .table__th>_{MsgSheetTypeNotGraded}
+  <div .scrolltable>
+    <table .table .table--striped>
+      <tr .table__row .table__row--head>
+        <th>
+          $# empty cell for row headers
         $maybe _ <- hasMarkedPasses
-          <td colspan=2>
+          <th .table__th colspan=2>_{MsgCorrected}
         $maybe _ <- hasPasses
-          <td .table__td>
+          <th .table__th>_{MsgSheetGradingPassing'}
         $maybe _ <- hasMarkedPoints
-          <td .table__td colspan=2>
+          <th .table__th colspan=2>_{MsgCorrected}
         $maybe _ <- hasPoints
-          <td .table__td>
-        <td .table__td>#{nrNoGrade}
+          <th .table__th>_{MsgSheetGradingPoints'}
+        <th .table__th>_{MsgSheetGradingCount'}
+          $# Number of Sheet/Submissions used for calculating maximum passes/points
+      $forall row <- rowWdgts
+        ^{row}
+      $maybe nrNoGrade <- positiveSum $ numNotGraded
+        <tr .table__row>
+          <th .table__th>_{MsgSheetTypeNotGraded}
+          $maybe _ <- hasMarkedPasses
+            <td colspan=2>
+          $maybe _ <- hasPasses
+            <td .table__td>
+          $maybe _ <- hasMarkedPoints
+            <td .table__td colspan=2>
+          $maybe _ <- hasPoints
+            <td .table__td>
+          <td .table__td>#{nrNoGrade}
   $maybe _ <- positiveSum $ bonusSummary ^. _numSheets
     <p>_{MsgSheetTypeInfoBonus} #
       $maybe _ <- positiveSum $ bonusSummary ^. _achievedPoints