diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bc3a3e76cf52df2274a3b3e511a3011900543fd8..b8d9034233c4ae2bfd65705d59322fd37acd5d66 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,10 +1,22 @@
 {{ define "main" }}
-<header>
-  <h1>
-    {{ .Title }}
-  </h1>
-</header>
-<div class="">
-  {{ .Content }}
-</div>
+    <main aria-role="main">
+      <header>
+        <h1>{{.Title}}</h1>
+        {{ with .Params.subtitle }}
+        <span class="subtitle">{{.}}</span>
+        {{ end }}
+      </header>
+      <div class="container">
+        <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md -->
+        {{.Content}}
+      </div>
+      <aside>
+        <h3>Next Office Hours</h3><!-- TODO: translate -->
+        <ul>
+        {{ range getJSON "https://sprechstunden.stusta.mhn.de/appointments.json"}}
+           <li>{{ dateFormat "Monday, Jan 2, 2006 15:04" (int .start) }}-{{ dateFormat "15:04" (int .end) }}</li>
+        {{ end }}
+        </ul>
+      </aside>
+    </main>
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
deleted file mode 100644
index 2690276289a1190f267fd7e3e6d1f71b813d3f41..0000000000000000000000000000000000000000
--- a/layouts/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ define "main" }}
-    <main aria-role="main">
-      <header class="homepage-header">
-        <h1>{{.Title}}</h1>
-        {{ with .Params.subtitle }}
-        <span class="subtitle">{{.}}</span>
-        {{ end }}
-      </header>
-      <div class="homepage-content">
-        <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md -->
-        {{.Content}}
-      </div>
-      <aside>
-        <h3>Next Office Hours</h3><!-- TODO: translate -->
-        <ul>
-        {{ range getJSON "https://sprechstunden.stusta.mhn.de/appointments.json"}}
-           <li>{{ dateFormat "Monday, Jan 2, 2006 15:04" (int .start) }}-{{ dateFormat "15:04" (int .end) }}</li>
-        {{ end }}
-        </ul>
-      </aside>
-    </main>
-{{ end }}