diff --git a/newsbox_cms/templates/newsbox_cms/inc/list.html b/newsbox_cms/templates/newsbox_cms/inc/list.html
index 67b5b7fa53fea81254c7dd2e593dc8eae2758259..e2a08e28379848ac0e899ba183344a493d5545b9 100644
--- a/newsbox_cms/templates/newsbox_cms/inc/list.html
+++ b/newsbox_cms/templates/newsbox_cms/inc/list.html
@@ -3,6 +3,22 @@
 
 
 {% block newsbox_list_header %}
-    {% render_model_add model %}
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
+    {% if title %}
+        <header>
+            <h1>
+                {% if title_url %}
+                    <a href="{{ title_url }}">{{ title }}</a>
+                {% else %}
+                    {{ title }}
+                {% endif %}
+                {% render_model_add model %}
+            </h1>
+        </header>
+    {% endif %}
+{% endblock %}
+
+{% block newsbox_list_item %}
+    {% render_model_block object %}
+        {{ block.super }}
+    {% endrender_model_block %}
+{% endblock %}
diff --git a/newsbox_cms/templates/newsbox_cms/inc/list_item.html b/newsbox_cms/templates/newsbox_cms/inc/list_item.html
index db644630143562ce9349ce9168ba1590af0285bb..4f85950f6d607bf62da94b640500c3ac78e8bc4e 100644
--- a/newsbox_cms/templates/newsbox_cms/inc/list_item.html
+++ b/newsbox_cms/templates/newsbox_cms/inc/list_item.html
@@ -2,8 +2,14 @@
 {% load i18n cms_tags %}
 
 {% block newsbox_list_item_header %}
-    {% render_model_icon object %}
-    {{ block.super }}
+    <h1>
+        <a href="{{ object.get_absolute_url }}">
+            {{ object.newsbox_title }}
+        </a>
+        {% if object.newsbox_date and object.newsbox_date != object.newsbox_publication_start_date %}
+            <time datetime="{{ object.newsbox_date }}">{{ object.newsbox_date|date:'SHORT_DATE_FORMAT' }}</time>
+        {% endif %}
+    </h1>
 {% endblock %}