diff --git a/messages/de.msg b/messages/de.msg
index fb15e4fea..04a970e74 100644
--- a/messages/de.msg
+++ b/messages/de.msg
@@ -1,7 +1,7 @@
 SummerTerm year@Integer: Sommersemester #{tshow year}
 WinterTerm year@Integer: Wintersemester #{tshow year}/#{tshow $ succ year}
 PSLimitNonPositive: “pagesize” muss größer als null sein
-Page n@Int64 num@Int64: Seite #{tshow n} von #{tshow num}
+Page n@Int64: #{tshow n}
 TermEdited tid@TermIdentifier: Semester #{termToText tid} erfolgreich editiert.
 TermNewTitle: Semester editiere/anlegen.
 InvalidInput: Eingaben bitte korrigieren.
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 9dc99a2ef..997a4aa6b 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -152,6 +152,7 @@ dbTable PSValidator{..} DBTable{ dbtIdent = (toPathPiece -> dbtIdent), .. } = do
     getParams <- handlerToWidget $ queryToQueryText . Wai.queryString . reqWaiRequest <$> getRequest
     let table = $(widgetFile "table/colonnade")
         pageCount = max 1 . ceiling $ rowCount % psLimit
+        pageNumbers = [0..pred pageCount]
         tblLink f = decodeUtf8 . Builder.toLazyByteString . renderQueryText True $ f getParams
 
         withSortLinks Sortable{ sortableContent = Cell{..}, .. } = Cell
diff --git a/templates/table/layout.cassius b/templates/table/layout.cassius
new file mode 100644
index 000000000..ffce3f52a
--- /dev/null
+++ b/templates/table/layout.cassius
@@ -0,0 +1,14 @@
+ul.paginationLinks
+  list-style: none outside none
+  margin: 0
+  padding: 0
+  text-align: center
+  li
+    margin: 0
+    margin-right: .25em
+    padding: 0
+    display: inline-block
+    .current
+      text-decoration: underline
+  li:last-child
+    margin-right: 0
\ No newline at end of file
diff --git a/templates/table/layout.hamlet b/templates/table/layout.hamlet
index 9e83cfeb6..a5707d2a9 100644
--- a/templates/table/layout.hamlet
+++ b/templates/table/layout.hamlet
@@ -1,7 +1,13 @@
+$newline never
 <div ##{dbtIdent}-table-wrapper>
   <div .scrolltable>
     ^{table}
   $if pageCount > 1
-    <p style="text-align:center">
-      $# TODO: foreach (reachable pages) print link to that page
-      _{MsgPage (succ psPage) pageCount}
+    <ul .paginationLinks>
+      $forall p <- pageNumbers
+        <li>
+          $if p == psPage
+            <span .current>_{MsgPage (succ p)}
+          $else
+            <a href=#{tblLink $ setParam (wIdent "page") (Just $ tshow p)}>
+              _{MsgPage (succ p)}