diff --git a/layouts/micro/list.html b/layouts/micro/list.html
new file mode 100644
index 0000000..a21921e
--- /dev/null
+++ b/layouts/micro/list.html
@@ -0,0 +1,22 @@
+{{ define "meta" }}
+{{- partial "section_meta.html" . -}}
+{{- partial "opengraph_meta.html" . -}}
+{{ end }}
+
+{{ define "header" }}
+{{- partial "section_json_ld.html" . -}}
+{{ end }}
+
+{{ define "main" -}}
+<main class="main layout__main">
+<h1 class="title">Micro posts</h1>
+<p class="micro__follow"><a href="https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}">{{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }}</a></p>
+
+{{ $paginator := .Paginate (.Data.Pages) -}}
+{{ range $paginator.Pages -}}
+{{ .Render "summary"}}
+{{ end -}}
+
+{{ partial "pagination.html" . }}
+</main>
+{{ end }}
diff --git a/layouts/section/micro.rss.xml b/layouts/micro/rss.xml
similarity index 100%
rename from layouts/section/micro.rss.xml
rename to layouts/micro/rss.xml
diff --git a/layouts/micro/single.html b/layouts/micro/single.html
index 110908a..9f50952 100644
--- a/layouts/micro/single.html
+++ b/layouts/micro/single.html
@@ -8,9 +8,14 @@
 
 {{ define "main" -}}
 <main class="main layout__main">
-<h1 class="title hidden">{{ .Title }}</h1>
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
-{{ if $.Param "submitted" | default false }}<a href="{{ .RelPermalink }}">{{ partial "submitted.html" . -}}</a>{{ end }}
+<header>
+<h1 class="hidden">{{ .Title }}</h1>
+<p>
+{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
+<time class="modified-date" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format ($.Param "dateformat" | default "2 January, 2006") }}</time>
+</p>
+</header>
 <div class="content">
 {{ .Content }}
 </div>
diff --git a/layouts/micro/summary.html b/layouts/micro/summary.html
index 0e11063..18d9ed4 100644
--- a/layouts/micro/summary.html
+++ b/layouts/micro/summary.html
@@ -1,7 +1,10 @@
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}list-view">
 <header>
-<h2 class="title hidden">{{ .Title }}</h2>
-{{ if $.Param "submitted" | default false }}<a href="{{ .RelPermalink }}">{{ partial "submitted.html" . -}}</a>{{ end }}
+<h2 class="hidden">{{ .Title }}</h2>
+<p><a href="{{ .RelPermalink }}">
+{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
+<time class="modified-date" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format ($.Param "dateformat" | default "2 January, 2006") }}</time>
+</a></p>
 </header>
 <div class="content">
 {{ .Content }}