diff --git a/resume.typ b/resume.typ
index 16119f4..8309611 100644
--- a/resume.typ
+++ b/resume.typ
@@ -68,84 +68,88 @@
   header(contents.about)
 
   let body = {
-    if "summary" in main and "summary" in contents {
-      section(
-        title: "",
-        {
-          contents.summary.at(lang)
-        },
-      )
-    }
+    for item in main {
+      if item == "summary" and "summary" in contents {
+        section(
+          title: "",
+          {
+            contents.summary.at(lang)
+          },
+        )
+      }
 
-    if "experience_by_type" in main and "experience" in contents {
-      let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
-      section(title: title)[]
-      by_experience_type(experience: contents.experience, type: contents.experience_types)
-    }
-    if "experience_by_client" in main and "experience" in contents {
-      let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
-      section(title: title)[]
-      by_client(experience: contents.experience)
-    }
-    if "experience" in main and "experience" in contents {
-      let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
-      section(title: title, entries: contents.experience)[]
-    }
+      if item == "experience_by_type" and "experience" in contents {
+        let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
+        section(title: title)[]
+        by_experience_type(experience: contents.experience, type: contents.experience_types)
+      }
+      if item == "experience_by_client" and "experience" in contents {
+        let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
+        section(title: title)[]
+        by_client(experience: contents.experience)
+      }
+      if item == "experience" and "experience" in contents {
+        let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
+        section(title: title, entries: contents.experience)[]
+      }
 
-    if "education" in main and "education" in contents {
-      let title = (en: "Education", de: "Ausbildung").at(lang)
-      section(title: title, entries: contents.thesis + contents.education)[]
-    }
+      if item == "education" and "education" in contents {
+        let title = (en: "Education", de: "Ausbildung").at(lang)
+        section(title: title, entries: contents.thesis + contents.education)[]
+      }
 
-    if "volunteering" in main and "volunteering" in contents {
-      let title = (en: "Volunteer Work", de: "Ehrenamt").at(lang)
-      section(title: title, entries: contents.volunteering)[]
-    }
+      if item == "volunteering" and "volunteering" in contents {
+        let title = (en: "Volunteer Work", de: "Ehrenamt").at(lang)
+        section(title: title, entries: contents.volunteering)[]
+      }
 
-    if "skills" in main and "skills" in contents {
-      let title = (en: "Qualifications", de: "Qualifikationen").at(lang)
-      section(
-        title: title,
-        {
-          skill_item(item: contents.skills)
-        },
-      )
-    }
+      if item == "skills" and "skills" in contents {
+        let title = (en: "Qualifications", de: "Qualifikationen").at(lang)
+        section(
+          title: title,
+          {
+            skill_item(item: contents.skills)
+          },
+        )
+      }
 
-    if "languages" in main and "languages" in contents {
-      let title = (en: "Languages", de: "Sprachen").at(lang)
-      section(
-        title: title,
-        {
-          skill_item(item: contents.languages)
-        },
-      )
+      if item == "languages" and "languages" in contents {
+        let title = (en: "Languages", de: "Sprachen").at(lang)
+        section(
+          title: title,
+          {
+            skill_item(item: contents.languages)
+          },
+        )
+      }
     }
   }
 
   let sidebar = {
-    if "volunteering" in sidebar and "volunteering" in contents {
-      let title = (en: "Volunteer Work", de: "Ehrenamt").at(lang)
-      [== #title]
-      for e in contents.at("volunteering") {
-        [
-          - *#e.title.at(lang)* (#e.date.at(lang))
-            #par(e.bullets.at(0).at(lang)) \
-        ]
+    for item in sidebar {
+      if item == "volunteering" and "volunteering" in contents {
+        let title = (en: "Volunteer Work", de: "Ehrenamt").at(lang)
+        [== #title]
+        for e in contents.at("volunteering") {
+          [
+            - *#e.title.at(lang)* (#e.date.at(lang))
+              #par(e.bullets.at(0).at(lang)) \
+          ]
+        }
       }
-    }
 
-    if "languages" in sidebar and "languages" in contents {
-      let title = (en: "Languages", de: "Sprachen").at(lang)
-      [== #title]
-      skill_item(item: contents.languages, is_sidebar: true)
-      [\ ]
-    }
+      if item == "languages" and "languages" in contents {
+        let title = (en: "Languages", de: "Sprachen").at(lang)
+        [== #title]
+        skill_item(item: contents.languages, is_sidebar: true)
+        [\ ]
+      }
 
-    if "skills" in sidebar and "skills" in contents {
-      let title = (en: "Qualifications", de: "Kenntnisse").at(lang)
-      [== #title]
-      skill_item(item: contents.skills, is_sidebar: true)
+      if item == "skills" and "skills" in contents {
+        let title = (en: "Qualifications", de: "Kenntnisse").at(lang)
+        [== #title]
+        skill_item(item: contents.skills, is_sidebar: true)
+      }
     }
   }