diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index e961ff4ad..4ded9d91a 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -3,31 +3,22 @@ $newline never
 $case formLayout
   $of FormDBTablePagesize
     $forall view <- fieldViews
-      $if fvId view == "form-section-noinput"
-        <label .form-group__label>
-          <h3 .form-section-title>
-            ^{fvInput view}
-      $else
-        <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
-        ^{fvInput view}
+      <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
+      ^{fvInput view}
   $of _
     $forall view <- fieldViews
-      $# TODO: add class 'form-group--submit' if this is the submit-button view
-      <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
-        $if fvId view == "form-section-noinput"
-          <label .form-group__label>
-            <h3 .form-section-title>
-              ^{fvLabel view}
-              $maybe hint <- fvTooltip view
-                  <div .form-group__hint>^{hint}
-        $else
+      $if fvId view == "form-section-noinput"
+        <h3 .form-section-title>
+          ^{fvLabel view}
+      $else
+        <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group__label for=#{fvId view}>
               #{fvLabel view}
               $maybe hint <- fvTooltip view
                 <div .form-group__hint>^{hint}
-              $# TODO: check that error display works as intended
-              $maybe err <- fvErrors view
-                <div .form-error>#{err}
           <div .form-group__input>
             ^{fvInput view}
+            $# TODO: check that error display works as intended
+            $maybe err <- fvErrors view
+              <div .form-error>#{err}