diff --git a/content/about.md b/content/about/_index.md
similarity index 100%
rename from content/about.md
rename to content/about/_index.md
diff --git a/content/studium.md b/content/studium/_index.md
similarity index 100%
rename from content/studium.md
rename to content/studium/_index.md
diff --git a/layouts/section/about.html b/layouts/section/about.html
new file mode 100644
index 0000000..ee06014
--- /dev/null
+++ b/layouts/section/about.html
@@ -0,0 +1,7 @@
+{{ define "main" }}
+    <div class="container">
+        <div id="markdown">
+            {{ .Content }}
+        </div>
+    </div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/section/studium.html b/layouts/section/studium.html
new file mode 100644
index 0000000..ee06014
--- /dev/null
+++ b/layouts/section/studium.html
@@ -0,0 +1,7 @@
+{{ define "main" }}
+    <div class="container">
+        <div id="markdown">
+            {{ .Content }}
+        </div>
+    </div>
+{{ end }}
\ No newline at end of file
diff --git a/static/admin/config.yml b/static/admin/config.yml
index f7d0676..02b4f5a 100644
--- a/static/admin/config.yml
+++ b/static/admin/config.yml
@@ -15,7 +15,9 @@ collections:
     files:
       - name: "about"
         label: "About"
-        file: "content/about.md"
+        file: "content/about/_index.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
@@ -23,7 +25,9 @@ collections:
 
       - name: "studium"
         label: "Studium"
-        file: "content/studium.md"
+        file: "content/studium/_index.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
@@ -32,6 +36,8 @@ collections:
       - name: "sitzung-und-protokolle"
         label: "Sitzung & Protokolle"
         file: "content/sitzung-und-protokolle.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
@@ -40,6 +46,8 @@ collections:
       - name: "kontakt"
         label: "Kontakt"
         file: "content/kontakt.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
@@ -48,6 +56,8 @@ collections:
       - name: "barrierefreiheit"
         label: "Barrierefreiheit"
         file: "content/barrierefreiheit.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
@@ -56,6 +66,8 @@ collections:
       - name: "datenschutz"
         label: "Datenschutz"
         file: "content/datenschutz.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
@@ -64,29 +76,97 @@ collections:
       - name: "impressum"
         label: "Impressum"
         file: "content/impressum.md"
+        editor:
+          preview: false
         fields:
           - { label: "Title", name: "title", widget: "string" }
           - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
           - { label: "Inhalt", name: "body", widget: "markdown" }
 
-  - name: "about_pages"
+  - name: "content_about"
     label: "Content / About"
-    folder: "content/about"
-    create: false
-    format: "frontmatter"
-    extension: "md"
-    fields:
-      - { label: "Titel", name: "title", widget: "string" }
-      - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
-      - { label: "Inhalt", name: "body", widget: "markdown", required: true }
+    files:
+      - name: "aemter"
+        label: "Ämter"
+        file: "content/about/aemter.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "aufgaben"
+        label: "Aufgaben"
+        file: "content/about/aufgaben.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "entsendungen"
+        label: "Entsendungen"
+        file: "content/about/entsendungen.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "mitglieder"
+        label: "Mitglieder"
+        file: "content/about/mitglieder.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "ordnungen"
+        label: "Ordnungen"
+        file: "content/about/ordnungen.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "uniwahlen"
+        label: "Uniwahlen"
+        file: "content/about/uniwahlen.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
 
-  - name: "studium_pages"
+  - name: "content_studium"
     label: "Content / Studium"
-    folder: "content/studium"
-    create: false
-    format: "frontmatter"
-    extension: "md"
-    fields:
-      - { label: "Titel", name: "title", widget: "string" }
-      - { label: "Entwurf", name: "draft", widget: "boolean", default: false }
-      - { label: "Inhalt", name: "body", widget: "markdown", required: true }
\ No newline at end of file
+    files:
+      - name: "linksammlung"
+        label: "Linksammlung"
+        file: "content/studium/linksammlung.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "services"
+        label: "Services"
+        file: "content/studium/services.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "stoffkiste-und-ftp"
+        label: "Stoffkiste & FTP"
+        file: "content/studium/stoffkiste-und-ftp.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
+      - name: "studienberatung"
+        label: "Studienberatung"
+        file: "content/studium/studienberatung.md"
+        editor:
+          preview: false
+        fields:
+          - { label: "Title", name: "title", widget: "string" }
+          - { label: "Body", name: "body", widget: "markdown" }
\ No newline at end of file