diff --git a/templates/widgets/gradingSummaryRow.hamlet b/templates/widgets/gradingSummaryRow.hamlet
index 0b40eeba3..16ef69f15 100644
--- a/templates/widgets/gradingSummaryRow.hamlet
+++ b/templates/widgets/gradingSummaryRow.hamlet
@@ -15,15 +15,21 @@ $#
       <th .table__th>_{sumHeader}
       $maybe _ <- hasMarkedPasses
         $with Sum pmax <- summary ^. _numMarkedPasses
-          $with Sum pacv <- summary ^. _achievedPasses
-            <td .table__td>
-              $if pmax > 0
-                #{textPercentInt pacv pmax}
-            <td .table__td>
-              #{display pacv} / #{display pmax}
+          $if pmax > 0
+            $with Sum pacv <- summary ^. _achievedPasses
+              <td .table__td>
+                $if pmax > 0
+                  #{textPercentInt pacv pmax}
+              <td .table__td>
+                #{display pacv} / #{display pmax}
+          $else
+              <td .table__td>
+              <td .table__td>
       $maybe _ <- hasPasses
-        <td .table__td>
-          #{display $ summary ^. _numSheetsPasses}
+        $with Sum numPass <- summary ^. _numSheetsPasses
+          <td .table__td>
+            $if numPass > 0
+              #{display numPass}
       $maybe _ <- hasMarkedPoints
         $with Sum pmax <- summary ^. _sumMarkedPoints
           $with Sum pacv <- summary ^. _achievedPoints
@@ -32,9 +38,17 @@ $#
                 #{textPercent $ realToFrac $ pacv / pmax}
             <td .table__td>
               #{display pacv} / #{display pmax}
-              \ (_{title $ getSum $ summary ^. _numMarkedPoints})
+              $if ((summary ^. _numMarkedPoints) /= (summary ^. _numSheets))
+                $# Falls Anzahl Blätter der Zeile verschieden von Anzahl gewerterer Blätter
+                \ (_{title $ getSum $ summary ^. _numMarkedPoints})
+                $# Kurze Alternative mit Hashtag-Symbol für "Anzahl"
+                $# \ (##{display $ summary ^. _numMarkedPoints})
       $maybe _ <- hasPoints
         <td .table__td>
           #{display (summary ^. _sumSheetsPoints)}
-          \ (_{title $ getSum $ summary ^. _numSheetsPoints})
+          $if ((summary ^. _numSheetsPoints) /= (summary ^. _numSheets))
+            $# Falls Anzahl Blätter der Zeile verschieden von Anzahl Blätter mit Punkten
+            \ (_{title $ getSum $ summary ^. _numSheetsPoints})
+            $# Kurze Alternative mit Hashtag-Symbol für "Anzahl"
+            $# \ (##{display $ summary ^. _numSheetsPoints})
       <td .table__td>#{display $ summary ^. _numSheets}
\ No newline at end of file