diff --git a/docker-compose.yml b/docker-compose.yml
index cccb6a3..d0bc9ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       - 9001:80
 
   website:
+    restart: always
     build:
       context: '.'
       dockerfile: ./Dockerfile.python
diff --git a/website/content/pages/index.md b/website/content/pages/index.md
index a1990f1..43802c3 100644
--- a/website/content/pages/index.md
+++ b/website/content/pages/index.md
@@ -1,7 +1,7 @@
 title: offen.software
 description: TBD
 save_as: index.html
-template: index
+template: page
 sitemap_priority: 1.0
 
 # offen.software website
diff --git a/website/theme/templates/index.html b/website/theme/templates/_layout.html
similarity index 69%
rename from website/theme/templates/index.html
rename to website/theme/templates/_layout.html
index 9b42ae8..04a64b9 100644
--- a/website/theme/templates/index.html
+++ b/website/theme/templates/_layout.html
@@ -3,7 +3,7 @@
 {% block head %}
   <head>
     <title>
-      {% block title %}{{ page.title }}{% endblock %}
+      {% block title %}{{ title }}{% endblock %}
     </title>
     <meta charset="UTF-8">
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'">
@@ -12,22 +12,20 @@
     <meta name="description" content="{{ description }}">
     <meta property="og:site_name" content="{{ SITENAME }}">
     <meta property="og:locale" content="{{ DEFAULT_LANG }}">
-    <meta property="og:title" content="{{ page.title }}">
-    <meta property="og:description" content="{{ page.description }}">
+    <meta property="og:title" content="{{ title }}">
+    <meta property="og:description" content="{{ description }}">
     <meta property="og:type" content="website">
-    <meta property="og:url" content="{{ SITEURL }}/{{ page.href }}">
-    <link rel="canonical" href="{{ SITEURL }}/{{ page.href }}">
+    <meta property="og:url" content="{{ SITEURL }}/{{ href }}">
+    <link rel="canonical" href="{{ SITEURL }}/{{ href }}">
     {% assets filters="postcss", output="css/style.min.css", "css/tachyons.min.css", "css/styles.css" %}
       <link rel="stylesheet" href="/{{ ASSET_URL }}">
     {% endassets %}
   </head>
 {% endblock %}
 <body class="no-js">
+  {% block body %}{% endblock %}
   <script>
     document.body.classList.remove('no-js');
   </script>
-  {% block content %}
-    {{ page.content }}
-  {% endblock %}
 </body>
 </html>
diff --git a/website/theme/templates/page.html b/website/theme/templates/page.html
new file mode 100644
index 0000000..ca65bb9
--- /dev/null
+++ b/website/theme/templates/page.html
@@ -0,0 +1,9 @@
+{% extends "_layout.html" %}
+
+{% set href = page.href %}
+{% set title = page.title %}
+{% set description = page.description %}
+
+{% block body %}
+  {{ page.content }}
+{% endblock %}
