diff --git a/src/newsreader/templates/form/errors.html b/src/newsreader/templates/form/errors.html
new file mode 100644
index 0000000..bf030ea
--- /dev/null
+++ b/src/newsreader/templates/form/errors.html
@@ -0,0 +1,3 @@
+<section class="section form__section form__section--errors">
+  {{ form.non_field_errors }}
+</section>
diff --git a/src/newsreader/templates/form.html b/src/newsreader/templates/form/form.html
similarity index 76%
rename from src/newsreader/templates/form.html
rename to src/newsreader/templates/form/form.html
index eb9ff03..5b8f2fa 100644
--- a/src/newsreader/templates/form.html
+++ b/src/newsreader/templates/form/form.html
@@ -4,20 +4,16 @@
   {% csrf_token %}
 
   {% if form.non_field_errors %}
-    <section class="section form__errors">
-      {{ form.non_field_errors }}
-    </section>
+    {% include "form/errors.html" title=title %}
   {% endif %}
 
   {% if title %}
-    <section class="section form__header">
-      <h1 class="h1 form__title">{{ title }}</h1>
-    </section>
+    {% include "form/title.html" title=title %}
   {% 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 %}
diff --git a/src/newsreader/templates/form/title.html b/src/newsreader/templates/form/title.html
new file mode 100644
index 0000000..3adcb75
--- /dev/null
+++ b/src/newsreader/templates/form/title.html
@@ -0,0 +1,3 @@
+<section class="section form__header">
+  <h1 class="h1 form__title">{{ title }}</h1>
+</section>