diff --git a/config.yaml b/config.yaml
index 7a327c7..0ec230f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -12,11 +12,6 @@ menu:
     url: /
     weight: 1
   main:
-  - identifier: about
-    name: About
-    title: about
-    url: /about/
-    weight: 1
   - identifier: blog
     name: Blog
     title: blog
@@ -36,33 +31,22 @@ menu:
     title: projects
     url: /projects/
     weight: 5
-  externallinks:
-  - identifier: git
-    name: git
-    title: git
-    url: https://code.cozy.town/vrifox
-    weight: 1
-  - identifier: cozy.town
-    name: cozy.town
-    title: cozy.town
-    url: https://cozy.town
-    weight: 2
   footer:
   - identifier: privacy
-    name: privacy
+    name: Privacy
     title: privacy
     url: /privacy/
-    weight: 1
+    weight: 3
   - identifier: feed
-    name: feed (rss)
+    name: Feed (RSS)
     title: rss-feed
     url: /blog/index.xml
-    weight: 2
+    weight: 4
   - identifier: sourcecode
-    name: source code
+    name: Source Code
     title: source code
     url: https://code.cozy.town/vrifox/vrifox.cc
-    weight: 3
+    weight: 5
 markup:
   highlight:
     anchorLineNos: false
diff --git a/layouts/index.html b/layouts/index.html
index 3713c36..fb735cd 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,7 +1,26 @@
 {{- define "main" }}
     <main>
-    {{- range first 8 (where .Site.RegularPages "Type" "post") }}
-      <p> <a href="{{ .Permalink }}">{{ .Title }}</a> <span>{{ .Date.Format "2 January 2006" }}</span> </p>
-    {{- end }}
+      <h1 class="title">{{ .Title }}</h1>
+      {{- if eq .Params.type "post" }}
+      <p title="{{ .Date.Format "2. January 2006, 15:04 MST" }}">{{ .Date.Format "2. January 2006" }}</p>
+      {{- end }}
+      {{ .Content -}}
+      <aside>
+      {{- with .Params.topics }}
+        <ul class="topics">
+          {{- range . }}
+          <li>
+            <a href="{{ "topics" | relURL}}/{{ . | urlize }}">{{ . }}</a>
+          </li>
+          {{ end }}
+        </ul>
+      {{- end }}
+      {{- with .Params.tags }}
+        tags
+        {{- range . }}
+        <a href="{{ "tags" | relURL }}/{{ . | urlize }}">{{ . }}</a>
+        {{- end }}
+      {{- end }}
+      </aside>
     </main>
 {{- end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index fa3698c..547f869 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,6 +1,6 @@
 
      <footer>
-      <span title="{{ now.Format "2. January 2006, 15:04 MST" }}">version {{ now.Format "2006-01-02" }}</span>
+      <span title="Revision: {{ now.Format "2. January 2006, 15:04 MST" }}">R {{ now.Format "2006-01-02" }}</span>
       {{- range .Site.Menus.footer }}
       <a href="{{ .URL }}">{{ .Name }}</a>
       {{- end }}