diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index f1e10c0..6579599 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,38 +1,28 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
 
-<div class="container content page">
-	{{ $paginator := .Paginate (where .Data.Pages "Type" "blog") }}{{ range $paginator.Pages }}
-	<div class="card">
-		<div class="card-content">
-			<div class="media">
-				<div class="media-content">
-					<a class="title is-4" href="{{ .Permalink }}">{{ .Title }}</a>
-					<p class="subtitle is-6">
-						{{ .Date.Format "2006-01-02" }}
-					</p>
-				</div>
-			</div>
-
+<div class="container is-centered page">
+	<div class="columns">
+		<div class="column is-one-quarter">
+			{{ partial "menu" . }}
+		</div>
+		<div class="column is-three-quarters">
 			<div class="content">
-				{{ .Summary }}
-			</div>
+				{{ .Content }}
 
-			<a href="{{ .Permalink }}" class="button is-primary is-outlined noshadow">
-				Read more
-			</a>
+				{{ range .Pages.GroupBy "Section" }}
+				<h3>{{ .Key | title }}</h3>
+				<ul>
+					{{ range .Pages }}
+					<li>
+						<a href="{{ .Permalink }}">{{ .Title }}</a>
+					</li>
+					{{ end }}
+				</ul>
+				{{ end }}
+			</div>
 		</div>
 	</div>
-	{{ end }}
-
-	<nav class="pagination is-centered" role="navigation" aria-label="pagination">
-		{{ if .Paginator.HasPrev}}
-		<a class="pagination-previous" href="{{ .Paginator.Prev.URL }}">Previous</a>
-		{{ end }}
-		{{ if .Paginator.HasNext }}
-		<a class="pagination-next" href="{{ .Paginator.Next.URL }}">Next</a>
-		{{ end }}
-	</nav>
 </div>
 
 {{ partial "footer.html" . }}
diff --git a/layouts/post/list.html b/layouts/post/list.html
index 6aea8d3..d4b8c90 100644
--- a/layouts/post/list.html
+++ b/layouts/post/list.html
@@ -3,38 +3,36 @@
 
 <div class="container content page">
 	{{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}{{ range $paginator.Pages }}
-		<div class="card">
-			<div class="card-content">
-				<div class="media">
-					<div class="media-content">
-						<a class="title is-4" href="{{ .Permalink }}">{{ .Title }}</a>
-						<p class="subtitle is-6">{{ .Date.Format "Mon Jan 2, 2006" }} {{ i18n "authored_by" }}
-							<a href="https://github.com/{{ .Params.author | default .Site.Params.author }}">
-							{{ .Params.author | default .Site.Params.author }}
-							</a>
-						</p>
-					</div>
+	<div class="card">
+		<div class="card-content">
+			<div class="media">
+				<div class="media-content">
+					<a class="title is-4" href="{{ .Permalink }}">{{ .Title }}</a>
+					<p class="subtitle is-6">
+						{{ .Date.Format "2006-01-02" }}
+					</p>
 				</div>
-
-				<div class="content">
-					{{ .Summary }}
-				</div>
-
-				<a href="{{ .Permalink }}" class="button is-success is-outlined">
-					{{ i18n "read_more" }}
-				</a>
 			</div>
+
+			<div class="content">
+				{{ .Summary }}
+			</div>
+
+			<a href="{{ .Permalink }}" class="button is-primary is-outlined noshadow">
+				Read more
+			</a>
 		</div>
+	</div>
 	{{ end }}
 
 	<nav class="pagination is-centered" role="navigation" aria-label="pagination">
 		{{ if .Paginator.HasPrev}}
-			<a class="pagination-previous" href="{{ .Paginator.Prev.URL }}">{{ i18n "page_prev" }}</a>
+		<a class="pagination-previous" href="{{ .Paginator.Prev.URL }}">Previous</a>
 		{{ end }}
 		{{ if .Paginator.HasNext }}
-			<a class="pagination-next" href="{{ .Paginator.Next.URL }}">{{ i18n "page_next" }}</a>
+		<a class="pagination-next" href="{{ .Paginator.Next.URL }}">Next</a>
 		{{ end }}
 	</nav>
 </div>
 
-{{ partial "footer.html" . }}
\ No newline at end of file
+{{ partial "footer.html" . }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 632628c..b038ee9 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -9,9 +9,7 @@
 			</a>
 		</h2>
 		<p>
-			<i>{{ .Date.Format "Mon Jan 2, 2006" }}</i>
-			{{ i18n "authored_by" }}
-			<b>{{ .Params.author | default .Site.Params.author }}</b>
+			<i>{{ .Date.Format "2006-01-02" }}</i>
 		</p>
 		{{ partial "headline-hash.html" .Content }}
 	</div>