diff --git a/layouts/index.html b/layouts/index.html
index e0d6c25..47dd0e2 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -2,10 +2,17 @@
 <section class="main">
     <div class="container">
         <div class="content">
-            <div class="page-heading">Blog</div>
+            {{ range where .Data.Pages "Title" "Home"}}
+                <div class="markdown">
+                {{ .Content }}
+                </div>
+            {{ end }}
+
             <ul>
-            {{ range .Data.Pages.ByPublishDate }}
-                {{ if eq .Section "blog" }}
+            {{ range first 5 (.Data.Pages.GroupByDate "Jan, 2006" "desc")}}
+                {{ $nbPages := len (where .Pages "Section" "blog")}}
+                {{ if ne $nbPages 0}}{{ .Key }}{{ end }}
+                {{ range where .Pages.ByPublishDate "Section" "blog"}}
                     {{ partial "li.html" . }}
                 {{ end }}
             {{ end }}
diff --git a/layouts/section/blog.html b/layouts/section/blog.html
new file mode 100644
index 0000000..ff6baa4
--- /dev/null
+++ b/layouts/section/blog.html
@@ -0,0 +1,17 @@
+{{ partial "header.html" . }}
+<section class="main">
+    <div class="container">
+        <div class="content">
+            <div class="page-heading">Blog</div>
+            <ul>
+                {{ range .Data.Pages.GroupByDate "Jan, 2006" "desc"}}
+                    {{ .Key }}
+                    {{ range .Pages.ByPublishDate }}
+                        {{ partial "li.html" . }}
+                    {{ end }}
+                {{ end }}
+            </ul>
+        </div>
+    </div>
+</section>
+{{ partial "footer.html" . }}