diff --git a/layouts/blog/li_grid_with_date.html b/layouts/blog/li_grid_with_date.html
index 245f559..ed687de 100644
--- a/layouts/blog/li_grid_with_date.html
+++ b/layouts/blog/li_grid_with_date.html
@@ -1,11 +1,14 @@
-<li>
-  <time class="nobreak" datetime="{{ .Date | time.Format "2006-01-02" }}">{{ .Date | time.Format "January" }}</time>
-  <time class="nobreak" datetime="{{ .Date | time.Format "2006-01-02" }}">{{ .Date | time.Format "2" }}</time>
-  <a href="{{ .Permalink }}">{{ .Title }}</a>
-  <div class="category">
-    {{ with index (.GetTerms "categories") 0 }}
-    <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
-    {{ end }}
-  </div>
+<li class="post">
+  <time class="nobreak" datetime="{{ .Date | time.Format "2006-01-02" }}">{{ .Date | time.Format "Jan 2, 2006" }}</time>
+  <h2 class="title"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+  {{ if .Description }}
+    <p>{{ .Description }}</p>
+  {{ else if lt .WordCount 110 }}
+    <article>{{ .Content }}</article>
+  {{ else }}
+    {{ warnf "Post \"%s\" doesn't have a description or content suitable for the blog list" .Title }}
+    <p>{{ .WordCount }} words</p>
+  {{ end }}
+  {{ partial "footer_tags.html" . }}
   {{ partial "development/draft_tag.html" . }}
 </li>
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 070b633..a7af6da 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -4,14 +4,14 @@
 
 {{ define "main" }}
 {{- range .Pages.ByDate.GroupByDate "2006" -}}
-<h5>{{ .Key | title }}</h5>
-<ul>
-  {{- range .Pages -}}
-    {{- if or (not .Draft) (not hugo.IsProduction) -}}
-      {{- .Render "li_grid_with_date" -}}
+  <h1 class="date">{{ .Key | title }}</h1>
+  <ul>
+    {{- range .Pages -}}
+      {{- if or (not .Draft) (not hugo.IsProduction) -}}
+        {{- .Render "li_grid_with_date" -}}
+      {{- end -}}
     {{- end -}}
-  {{- end -}}
-</ul>
+  </ul>
 {{- end -}}
 {{ end }}