diff --git a/src/newsreader/news/collection/templates/collection/rule-create.html b/src/newsreader/news/collection/templates/collection/rule-create.html
index 3b7ec34..d83d7ec 100644
--- a/src/newsreader/news/collection/templates/collection/rule-create.html
+++ b/src/newsreader/news/collection/templates/collection/rule-create.html
@@ -5,6 +5,6 @@
 {% block content %}
   <main id="rule--page" class="main">
     {% url "news:collection:rules" as cancel_url %}
-    {% include "form.html" with form=form title="Create rule" cancel_url=cancel_url only %}
+    {% include "form/form.html" with form=form title="Create rule" cancel_url=cancel_url only %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/news/collection/templates/collection/rule-update.html b/src/newsreader/news/collection/templates/collection/rule-update.html
index bdb442f..8a6b750 100644
--- a/src/newsreader/news/collection/templates/collection/rule-update.html
+++ b/src/newsreader/news/collection/templates/collection/rule-update.html
@@ -5,6 +5,6 @@
 {% block content %}
   <main id="rule--page" class="main">
     {% url "news:collection:rules" as cancel_url %}
-    {% include "form.html" with form=form title="Update rule" cancel_url=cancel_url only %}
+    {% include "form/form.html" with form=form title="Update rule" cancel_url=cancel_url only %}
   </main>
 {% endblock %}
diff --git a/src/newsreader/templates/form/errors.html b/src/newsreader/templates/form/errors.html
index bf030ea..eed67f5 100644
--- a/src/newsreader/templates/form/errors.html
+++ b/src/newsreader/templates/form/errors.html
@@ -1,3 +1,3 @@
 <section class="section form__section form__section--errors">
-  {{ form.non_field_errors }}
+  {{ errors }}
 </section>
diff --git a/src/newsreader/templates/form/form.html b/src/newsreader/templates/form/form.html
index 5b8f2fa..31242a9 100644
--- a/src/newsreader/templates/form/form.html
+++ b/src/newsreader/templates/form/form.html
@@ -4,11 +4,11 @@
   {% csrf_token %}
 
   {% if form.non_field_errors %}
-    {% include "form/errors.html" title=title %}
+    {% include "form/errors.html" with errors=form.non_field_errors only %}
   {% endif %}
 
   {% if title %}
-    {% include "form/title.html" title=title %}
+    {% include "form/title.html" with title=title only %}
   {% endif %}
 
   <section class="section form__section">