Use seperate form dir

src/newsreader/templates/form/errors.html

@@ -0,0 +1,3 @@
+<section class="section form__section form__section--errors">
+  {{ form.non_field_errors }}
+</section>

src/newsreader/templates/form/form.html

@@ -4,20 +4,16 @@
   {% csrf_token %}
 
   {% if form.non_field_errors %}
-    <section class="section form__errors">
+    {% include "form/errors.html" title=title %}
-      {{ form.non_field_errors }}
-    </section>
   {% endif %}
 
   {% if title %}
-    <section class="section form__header">
+    {% include "form/title.html" title=title %}
-      <h1 class="h1 form__title">{{ title }}</h1>
-    </section>
   {% endif %}
 
   <section class="section form__section">
     {% for field in form %}
-      <fieldset class="form__fieldset">
+      <fieldset class="fieldset form__fieldset">
         <label class="label form__label" for="{{ field.name }}">
           {{ field.label }}
         </label>
@@ -30,7 +26,7 @@
   </section>
 
   <section class="section form__section--last">
-    <fieldset class="form__fieldset">
+    <fieldset class="fieldset form__fieldset">
       {% if cancel_url %}
         <a class="link button button--cancel" href="{{ cancel_url }}">{% trans "Cancel" %}</a>
       {% endif %}

src/newsreader/templates/form/title.html

@@ -0,0 +1,3 @@
+<section class="section form__header">
+  <h1 class="h1 form__title">{{ title }}</h1>
+</section>