diff --git a/Gemfile.lock b/Gemfile.lock
index 64efe17..c878bbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
     ffi (1.9.18)
+    ffi (1.9.18-x64-mingw32)
     forwardable-extended (2.6.0)
     hash-joiner (0.0.7)
       safe_yaml
@@ -52,9 +53,15 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2017.3)
+      tzinfo (>= 1.0.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   hash-joiner
@@ -67,4 +74,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/_config.yml b/_config.yml
index 1eb8264..83a077d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -34,10 +34,15 @@ jekyll_get:
   - data: angels
     cache: true
     json: "https://forum.fairphone.com/t/angel-the-fairphone-angels-program-local-support-by-community-members/33058.json"
-  - data: event
+  - data: contribute
+    cache: true
+    json: "https://forum.fairphone.com/t/a-little-guide-to-the-fairphone-community-how-to-become-part-of-the-movement-and-contribute/26177.json"
+  - data: efct
     cache: true
     json: "https://forum.fairphone.com/t/star-save-the-date-european-fairphoners-community-trip-to-amsterdam-2018-13-8-19-8-2018/32940.json"
-
+  - data: design
+    cache: true
+    json: "https://forum.fairphone.com/t/fairphone-community-design/35920.json"
   - data: synapse
     cache: true
     json: "https://forum.fairphone.com/t/synapse-inspired-by-fairphone-movement/31607.json"
diff --git a/_i18n/de/apks.md b/_i18n/de/apks.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/contribute.md b/_i18n/de/contribute.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/installation.md b/_i18n/de/custom-roms.md
similarity index 100%
rename from _i18n/de/installation.md
rename to _i18n/de/custom-roms.md
diff --git a/_i18n/de/design.md b/_i18n/de/design.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/efct.md b/_i18n/de/efct.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/event-guide.md b/_i18n/de/event-guide.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/events.md b/_i18n/de/events.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/flashable-zips.md b/_i18n/de/flashable-zips.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/hardware.md b/_i18n/de/hardware.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/local-events.md b/_i18n/de/local-events.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/online.md b/_i18n/de/online.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/de/software.md b/_i18n/de/software.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en.yml b/_i18n/en.yml
index 72424bd..930c500 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -11,12 +11,32 @@ pages:
   about:
     title: "About"
   angels:
-    title: "Fairphone Angels"
-  community-maps:
-    title: "Community Maps"
+    title: "The Angels Program"
+  contribute:
+    title: "Contribute"
+  design:
+    title: "Design Guidelines"
+  events:
+    title: "Community Events"
+  local-events:
+    title: "Local Meetups and Events"
   event-materials:
-    title: "Community event materials"
-  installation:
-    title: "Installation"
+    title: "Useful Event Materials"
+  event-guide:
+    title: "Fairphone Meetup Guide"
+  efct:
+    title: "European Fairphoners Community Meetup"
+  hardware:
+    title: "DIY & Repair"
+  online:
+    title: "Online Communities"
+  software:
+    title: "Custom Roms & other Software"
+  custom-roms:
+    title: "Custom Roms"
+  flashable-zips:
+    title: "Flashable ZIPs"
+  apks:
+    title: "Community Apps"
   synapse:
     title: "Synapse"
diff --git a/_i18n/en/angels.md b/_i18n/en/angels.md
index 892448d..be5e7db 100644
--- a/_i18n/en/angels.md
+++ b/_i18n/en/angels.md
@@ -1,3 +1 @@
-Fairphone Angels are community members, who offer technical support.
-
-See [Local technical support by community members +mailing lists: project description](https://forum.fairphone.com/t/local-technical-support-by-community-members-mailing-lists-project-description/26193/5) for more information.
+Fairphone Angels are active volunteers in your area that offer local technical support.
diff --git a/_i18n/en/apks.md b/_i18n/en/apks.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/contribute.md b/_i18n/en/contribute.md
new file mode 100644
index 0000000..e381680
--- /dev/null
+++ b/_i18n/en/contribute.md
@@ -0,0 +1 @@
+Become part of the movement by helping out with the online and offline projects.
diff --git a/_i18n/en/installation.md b/_i18n/en/custom-roms.md
similarity index 100%
rename from _i18n/en/installation.md
rename to _i18n/en/custom-roms.md
diff --git a/_i18n/en/design.md b/_i18n/en/design.md
new file mode 100644
index 0000000..bd8480e
--- /dev/null
+++ b/_i18n/en/design.md
@@ -0,0 +1 @@
+The Fairphone Community Design helps preserve a common visual identity across all community activities.
diff --git a/_i18n/en/efct.md b/_i18n/en/efct.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/event-guide.md b/_i18n/en/event-guide.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/events.md b/_i18n/en/events.md
new file mode 100644
index 0000000..2a3ae67
--- /dev/null
+++ b/_i18n/en/events.md
@@ -0,0 +1 @@
+Community events are the perfect way to get in touch with Fairphoners and talk about fair electronics.
diff --git a/_i18n/en/flashable-zips.md b/_i18n/en/flashable-zips.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/hardware.md b/_i18n/en/hardware.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/local-events.md b/_i18n/en/local-events.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/online.md b/_i18n/en/online.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/software.md b/_i18n/en/software.md
new file mode 100644
index 0000000..e69de29
diff --git a/_i18n/en/synpase.md b/_i18n/en/synapse.md
similarity index 100%
rename from _i18n/en/synpase.md
rename to _i18n/en/synapse.md
diff --git a/_layouts/page.html b/_layouts/page.html
index 6b3f50d..254f0d5 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -31,4 +31,23 @@ <h1 class="post-title">{% translate page.title %}</h1>
       {% endfor %}
     </div>
   {% endif %}
+
+  {% if page.subpages %}
+    <ul class="page-list">
+      {% for pageobj in site.pages %}
+        {% if page.subpages contains pageobj.path %}
+          <li class="page-list-item">
+            <h2>
+              <a class="page-link" href="{{ page.url | relative_url }}">
+                {% translate pageobj.title %}
+              </a>
+            </h2>
+            <div class="page-content">
+              {{ pageobj.content }}
+            </div>
+          </li>
+        {% endif %}
+      {% endfor %}
+    </ul>
+  {% endif %}
 </article>
diff --git a/_layouts/subpage.html b/_layouts/subpage.html
new file mode 100644
index 0000000..6465ed0
--- /dev/null
+++ b/_layouts/subpage.html
@@ -0,0 +1,34 @@
+---
+layout: default
+---
+<article class="post">
+
+  <header class="post-header">
+    <h1 class="post-title">{% translate subpage.title %}</h1>
+  </header>
+
+  <div class="post-content">
+    {{ content }}
+  </div>
+
+  {% if subpage.further_reading %}
+    <div class="supplemental-teaser">
+      {% translate global.further_reading %}:
+
+      {% assign feed_key = site.data[subpage.further_reading] %}
+      {% assign first_post = feed_key.post_stream.posts[0] %}
+      <blockquote>
+        {{ first_post.cooked }}
+      </blockquote>
+      &ndash;
+      {% for links in site.jekyll_get %}
+        {% if links.data == subpage.further_reading %}
+          {% assign forum_link = links.json %}
+          <a href="{{ forum_link }}" target="_blank">
+            {% translate global.source %}
+          </a>
+        {% endif %}
+      {% endfor %}
+    </div>
+  {% endif %}
+</article>
diff --git a/contribute/community-maps.md b/contribute/community-maps.md
deleted file mode 100644
index ff058cd..0000000
--- a/contribute/community-maps.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: page
-title: pages.community-maps.title
----
-<iframe src="https://wearefairphone.github.io/fprsmap/?show=angels,events,repairshops,shops"
-        width="100%"
-        height="400"
-        allowfullscreen="true"
-        frameborder="0">
-  <p>
-    <a href="https://wearefairphone.github.io/fprsmap/?show=angels,events,repairshops,shops" target="_blank">See the Fairphone Community Map!
-    </a>
-  </p>
-</iframe>
diff --git a/angels.md b/pages/angels.md
similarity index 100%
rename from angels.md
rename to pages/angels.md
diff --git a/pages/contribute.md b/pages/contribute.md
new file mode 100644
index 0000000..610a32f
--- /dev/null
+++ b/pages/contribute.md
@@ -0,0 +1,7 @@
+---
+layout: page
+title: pages.contribute.title
+further_reading: contribute
+---
+
+{% translate_file contribute.md %}
diff --git a/pages/design.md b/pages/design.md
new file mode 100644
index 0000000..640f793
--- /dev/null
+++ b/pages/design.md
@@ -0,0 +1,7 @@
+---
+layout: page
+title: pages.design.title
+further_reading: design
+---
+
+{% translate_file design.md %}
diff --git a/pages/events.md b/pages/events.md
new file mode 100644
index 0000000..4fda015
--- /dev/null
+++ b/pages/events.md
@@ -0,0 +1,7 @@
+---
+layout: page
+title: pages.events.title
+subpages: [pages/events/local-events.md, pages/events/event-materials.md, pages/events/event-guide.md, pages/events/efct.md]
+---
+
+{% translate_file events.md %}
diff --git a/pages/events/efct.md b/pages/events/efct.md
new file mode 100644
index 0000000..f8d09c3
--- /dev/null
+++ b/pages/events/efct.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.efct.title
+---
+
+{% translate_file efct.md %}
diff --git a/pages/events/event-guide.md b/pages/events/event-guide.md
new file mode 100644
index 0000000..b7fbfda
--- /dev/null
+++ b/pages/events/event-guide.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.event-guide.title
+---
+
+{% translate_file event-guide.md %}
diff --git a/community-events/event-materials.md b/pages/events/event-materials.md
similarity index 87%
rename from community-events/event-materials.md
rename to pages/events/event-materials.md
index 8b99c7f..d87beab 100644
--- a/community-events/event-materials.md
+++ b/pages/events/event-materials.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: subpage
 title:  pages.event-materials.title
 further_reading: event
 ---
diff --git a/pages/events/local-events.md b/pages/events/local-events.md
new file mode 100644
index 0000000..78b444f
--- /dev/null
+++ b/pages/events/local-events.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.local-events.title
+---
+
+{% translate_file local-events.md %}
diff --git a/pages/hardware.md b/pages/hardware.md
new file mode 100644
index 0000000..7ee07e1
--- /dev/null
+++ b/pages/hardware.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.hardware.title
+---
+
+{% translate_file hardware.md %}
diff --git a/pages/online.md b/pages/online.md
new file mode 100644
index 0000000..674db3f
--- /dev/null
+++ b/pages/online.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.online.title
+---
+
+{% translate_file online.md %}
diff --git a/pages/software.md b/pages/software.md
new file mode 100644
index 0000000..8ace7cf
--- /dev/null
+++ b/pages/software.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: pages.software.title
+---
+
+{% translate_file software.md %}
diff --git a/pages/software/apks.md b/pages/software/apks.md
new file mode 100644
index 0000000..778f4f3
--- /dev/null
+++ b/pages/software/apks.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.apks.title
+---
+
+{% translate_file apks.md %}
diff --git a/pages/software/custom-roms.md b/pages/software/custom-roms.md
new file mode 100644
index 0000000..4a3ef35
--- /dev/null
+++ b/pages/software/custom-roms.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.custom-roms.title
+---
+
+{% translate_file custom-roms.md %}
diff --git a/pages/software/flashable-zips.md b/pages/software/flashable-zips.md
new file mode 100644
index 0000000..45b19b2
--- /dev/null
+++ b/pages/software/flashable-zips.md
@@ -0,0 +1,6 @@
+---
+layout: subpage
+title:  pages.flashable-zips.title
+---
+
+{% translate_file flashable-zips.md %}
diff --git a/synapse.md b/pages/synapse.md
similarity index 100%
rename from synapse.md
rename to pages/synapse.md
diff --git a/software/installation.md b/software/installation.md
deleted file mode 100644
index 20cf62c..0000000
--- a/software/installation.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: page
-title:  pages.installation.title
----
-
-{% translate_file installation.md %}