diff --git a/src/functional_tests/test_my_lists.py b/src/functional_tests/test_my_lists.py
index a122a34..554e0e0 100644
--- a/src/functional_tests/test_my_lists.py
+++ b/src/functional_tests/test_my_lists.py
@@ -39,8 +39,6 @@ class MyListsTest(FunctionalTest):
             )
         )
 
-        return # TODO: resume here after templates refactor
-
         self.wait_for(
             lambda: self.browser.find_element(By.LINK_TEXT, "Reticulate splines")
         )
diff --git a/src/templates/apps/dashboard/_partials/_form.html b/src/templates/apps/dashboard/_partials/_form.html
new file mode 100644
index 0000000..6de5867
--- /dev/null
+++ b/src/templates/apps/dashboard/_partials/_form.html
@@ -0,0 +1,17 @@
+<form method="POST" action="{{ form_action }}">
+    {% csrf_token %}
+    <input
+        id="id_text"
+        name="text"
+        class="form-control form-control-lg{% if form.errors %} is-invalid{% endif %}"
+        placeholder="Enter a to-do item"
+        value="{{ form.text.value | default:'' }}"
+        aria-describedby="id_text_feedback"
+        required
+    />
+    {% if form.errors %}
+        <div id="id_text_feedback" class="invalid-feedback">
+            {{ form.errors.text.0 }}
+        </div>
+    {% endif %}
+</form>
\ No newline at end of file
diff --git a/src/templates/apps/dashboard/_partials/_scripts.html b/src/templates/apps/dashboard/_partials/_scripts.html
new file mode 100644
index 0000000..76ac717
--- /dev/null
+++ b/src/templates/apps/dashboard/_partials/_scripts.html
@@ -0,0 +1,6 @@
+<script src="/static/apps/scripts/dashboard.js"></script>
+<script>
+    window.onload = () => {
+        initialize("#id_text");
+    };
+</script>
\ No newline at end of file
diff --git a/src/templates/apps/dashboard/home.html b/src/templates/apps/dashboard/home.html
index 67e9937..d9ea19f 100644
--- a/src/templates/apps/dashboard/home.html
+++ b/src/templates/apps/dashboard/home.html
@@ -3,4 +3,11 @@
 {% block title_text %}Start a new to-do list{% endblock title_text %}
 {% block header_text %}Start a new to-do list{% endblock header_text %}
 
-{% block form_action %}{% url "new_list" %}{% endblock form_action %}
+{% block extra_header %}
+    {% url "new_list" as form_action %}
+    {% include "apps/dashboard/_partials/_form.html" with form=form form_action=form_action %}
+{% endblock extra_header %}
+
+{% block scripts %}
+    {% include "apps/dashboard/_partials/_scripts.html" %}
+{% endblock scripts %}
diff --git a/src/templates/apps/dashboard/list.html b/src/templates/apps/dashboard/list.html
index ec9340b..e583f5b 100644
--- a/src/templates/apps/dashboard/list.html
+++ b/src/templates/apps/dashboard/list.html
@@ -3,13 +3,24 @@
 {% block title_text %}Your to-do list{% endblock title_text %}
 {% block header_text %}Your to-do list{% endblock header_text %}
 
-{% block form_action %}{% url "view_list" list.id %}{% endblock form_action %}
 
-{% block table %}
-    <table id="id_list_table" class="table">
-        {% for item in list.item_set.all %}
-            <tr><td>{{ forloop.counter }}. {{ item.text }}</td></tr>
-        {% endfor %}
-    </table>
-{% endblock table %}
+{% block extra_header %}
+    {% url "view_list" list.id as form_action %}
+    {% include "apps/dashboard/_partials/_form.html" with form=form form_action=form_action %}
+{% endblock extra_header %}
 
+{% block content %}
+    <div class="row justify-content-center">
+        <div class="col-lg-6">
+            <table id="id_list_table" class="table">
+                {% for item in list.item_set.all %}
+                    <tr><td>{{ forloop.counter }}. {{ item.text }}</td></tr>
+                {% endfor %}
+            </table>
+        </div>
+    </div>
+{% endblock content %}
+
+{% block scripts %}
+    {% include "apps/dashboard/_partials/_scripts.html" %}
+{% endblock scripts %}
diff --git a/src/templates/core/base.html b/src/templates/core/base.html
index d7128cd..9aaf0b3 100644
--- a/src/templates/core/base.html
+++ b/src/templates/core/base.html
@@ -62,33 +62,13 @@
             <div class="row justify-content-center p-5 bg-body-tertiary rounded-3">
                 <div class="col-lg-6 text-center">
                     <h2 class="display-1 mb-4">{% block header_text %}{% endblock header_text %}</h2>
-
-                    <form method="POST" action="{% block form_action %}{% endblock form_action %}">
-                        {% csrf_token %}
-                        <input
-                            id="id_text"
-                            name="text"
-                            class="form-control form-control-lg{% if form.errors %} is-invalid{% endif %}"
-                            placeholder="Enter a to-do item"
-                            value="{{ form.text.value | default:'' }}"
-                            aria-describedby="id_text_feedback"
-                            required
-                        />
-                        {% if form.errors %}
-                            <div id="id_text_feedback" class="invalid-feedback">
-                                {{ form.errors.text.0 }}
-                            </div>
-                        {% endif %}
-                    </form>
+                    {% block extra_header %}
+                    {% endblock extra_header %}
                 </div>
             </div>
 
-            <div class="row justify-content-center">
-                <div class="col-lg-6">
-                    {% block table %}
-                    {% endblock table %}
-                </div>
-            </div>
+            {% block content %}
+            {% endblock content %}
 
         </div>
     </body>
@@ -96,12 +76,7 @@
     <script
         src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.8/js/bootstrap.min.js"
     ></script>
-
-    <script src="/static/apps/scripts/dashboard.js"></script>
-    <script>
-        window.onload = () => {
-            initialize("#id_text");
-        };
-    </script>
+    {% block scripts %}
+    {% endblock scripts %}
 
 </html>
\ No newline at end of file