diff --git a/articles/templates/articles/article_detail.html b/articles/templates/articles/article_detail.html
index fd4d307..a6f3ad7 100644
--- a/articles/templates/articles/article_detail.html
+++ b/articles/templates/articles/article_detail.html
@@ -2,11 +2,8 @@
 
 {% block content %}
     <article>
-        <h1>{{ article.title }}</h1>
-        <p>By: {{ article.author }}</p>
-        <p>Published at: {{ article.published_at }}</p>
-        <p>Updated at: {{ article.updated_at }}</p>
-
+        <h1>{{ article.title }}{% if article.status != article.PUBLISHED %} ({{ article.status }}){% endif %}</h1>
+        {% include "articles/date_snippet.html" %}
         <div>
             {{ article.get_formatted_content|safe }}
         </div>
diff --git a/articles/templates/articles/article_list.html b/articles/templates/articles/article_list.html
index 6e4b75b..2468802 100644
--- a/articles/templates/articles/article_list.html
+++ b/articles/templates/articles/article_list.html
@@ -4,9 +4,10 @@
     <h1>{{ title }} list</h1>
     {% for article in articles %}
         <article>
-        <h2><a href="{% url 'article-detail' pk=article.pk %}">{{ article.title }}</a></h2>
-        <p>{{ article.get_abstract|safe }}</p>
-        <p><a href="{% url 'article-detail' pk=article.pk %}">Read more</a></p>
+            <h2><a href="{% url 'article-detail' pk=article.pk %}">{{ article.title }}</a></h2>
+            {% include "articles/date_snippet.html" %}
+            <p>{{ article.get_abstract|safe }}</p>
+            <p><a href="{% url 'article-detail' pk=article.pk %}">Read more</a></p>
         </article>
     {% empty %}
         <p>No article here. Come back later 🙂</p>
diff --git a/articles/templates/articles/date_snippet.html b/articles/templates/articles/date_snippet.html
new file mode 100644
index 0000000..75d2c5c
--- /dev/null
+++ b/articles/templates/articles/date_snippet.html
@@ -0,0 +1,7 @@
+<p class="date">
+    {% if article.published_at %}
+        {{ article.published_at|date }}
+    {% else %}
+        {{ article.updated_at|date }}
+    {% endif %}
+</p>