diff --git a/tasks/templates/tasks/components/task_li.djhtml b/tasks/templates/tasks/components/task_li.djhtml
new file mode 100644
index 0000000..cb4ad01
--- /dev/null
+++ b/tasks/templates/tasks/components/task_li.djhtml
@@ -0,0 +1,6 @@
+<li>
+  <a href="{{ task.get_absolute_url }}">
+    {{ task.name }}
+  </a>
+  - last completed {{ task.last_event.date|date|default:"never"}}, next required {{ task.next_recurrence|date|default:"never" }}
+</li>
diff --git a/tasks/templates/tasks/components/tool_li.djhtml b/tasks/templates/tasks/components/tool_li.djhtml
new file mode 100644
index 0000000..daff522
--- /dev/null
+++ b/tasks/templates/tasks/components/tool_li.djhtml
@@ -0,0 +1,3 @@
+<li>
+  <a href="{{ tool.get_absolute_url }}">{{ tool.name }}</a>
+</li>
diff --git a/tasks/templates/tasks/index.djhtml b/tasks/templates/tasks/index.djhtml
index 28cf054..8c23c25 100644
--- a/tasks/templates/tasks/index.djhtml
+++ b/tasks/templates/tasks/index.djhtml
@@ -6,7 +6,7 @@
   <h1> Tools </h1>
   <ul>
     {% for tool in tools %}
-      <li><a href="{{ tool.get_absolute_url }}">{{ tool.name }}</a></li>
+      {% include "./components/tool_li.djhtml" with tool=tool %}
     {% empty %}
       <p>No tools are available.</p>
     {% endfor %}
@@ -15,7 +15,7 @@
   <h1> Tasks </h1>
   <ul>
     {% for task in tasks %}
-      <li><a href="{{ task.get_absolute_url }}">{{ task.name }}</a> - last at {{ task.last_event.date|date }}, next at {{ task.next_recurrence|date }} </li>
+      {% include "./components/task_li.djhtml" with task=task %}
     {% empty %}
       <p>No tasks are available.</p>
     {% endfor %}