diff --git a/templates/help.hamlet b/templates/help.hamlet
index 073bac477..4b09217cb 100644
--- a/templates/help.hamlet
+++ b/templates/help.hamlet
@@ -1,3 +1,4 @@
-<p>
+<section>
   _{MsgHelpIntroduction}
-^{formWidget}
+<section>
+  ^{formWidget}
diff --git a/templates/widgets/form/form.hamlet b/templates/widgets/form/form.hamlet
index 45a25b820..1046f79b5 100644
--- a/templates/widgets/form/form.hamlet
+++ b/templates/widgets/form/form.hamlet
@@ -1,19 +1,18 @@
 $newline never
 $# Wrapper for all kinds of forms
-<section>
-  <form ##{formId} method=#{decodeUtf8 (renderStdMethod formMethod)} action=#{fromMaybe "" formActionUrl} enctype=#{formEncoding} *{formAttrs}>
-    $# Distinguish different falvours of submit button layouts here:
-    $case formSubmit
-      $of FormNoSubmit
-        ^{formWidget}
-      $of FormSubmit
-        ^{formWidget}
-        ^{submitButtonView}
-      $of FormDualSubmit
-        ^{submitButtonView}
-        ^{formWidget}
-        ^{submitButtonView}
-      $of FormAutoSubmit
-        ^{formWidget}
-        <button type=submit uw-auto-submit-button>
-          ^{btnLabel BtnSubmit}
+<form ##{formId} method=#{decodeUtf8 (renderStdMethod formMethod)} action=#{fromMaybe "" formActionUrl} enctype=#{formEncoding} *{formAttrs}>
+  $# Distinguish different falvours of submit button layouts here:
+  $case formSubmit
+    $of FormNoSubmit
+      ^{formWidget}
+    $of FormSubmit
+      ^{formWidget}
+      ^{submitButtonView}
+    $of FormDualSubmit
+      ^{submitButtonView}
+      ^{formWidget}
+      ^{submitButtonView}
+    $of FormAutoSubmit
+      ^{formWidget}
+      <button type=submit uw-auto-submit-button>
+        ^{btnLabel BtnSubmit}