diff --git a/templates/table/layout.lucius b/templates/table/layout.lucius
index 93b19d264..605fb0c77 100644
--- a/templates/table/layout.lucius
+++ b/templates/table/layout.lucius
@@ -15,7 +15,7 @@
         margin: 0;
 
         .page-link {
-          margin: 0 7px;
+          margin: 7px;
           display: inline-block;
           background-color: var(--color-grey);
 
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 4fb9bef79..06578df77 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -3,6 +3,7 @@ $newline never
 $case formLayout
   $of FormDBTablePagesize
     $forall view <- fieldViews
+      <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
       ^{fvInput view}
   $of _
     $forall view <- fieldViews
diff --git a/templates/widgets/form.lucius b/templates/widgets/form.lucius
index d8e632a84..2bc3785d4 100644
--- a/templates/widgets/form.lucius
+++ b/templates/widgets/form.lucius
@@ -22,3 +22,7 @@ fieldset {
   width: 5em;
   min-width: 75px;
 }
+
+.label-pagesize {
+  margin-right: 13px;
+}