diff --git a/_includes/user-menu.html b/_includes/user-menu.html
index c4358bb04..88f727a2d 100644
--- a/_includes/user-menu.html
+++ b/_includes/user-menu.html
@@ -46,11 +46,13 @@
Services
Next-Gen Rules
+ Audio & Voice
+
HABmin
HABPanel
- Add-ons
+ Bindings & Add-ons
- Administration
+ Advanced Functionality
- Features
+ Explore the Community
-
- Appendix
-
diff --git a/appendix/downloads.md b/appendix/downloads.md
deleted file mode 100644
index ee305adfb..000000000
--- a/appendix/downloads.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: documentation
----
-
-{% include base.html %}
-
-# Download reference
-
-## OpenHAB distribution
-
-The openHAB distribution is built on our [Cloudbees Jenkins](https://openhab.ci.cloudbees.com/), where you can get the latest snapshots:
-
- - [Offline Distribution](https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-offline/target/openhab-offline-2.0.0-SNAPSHOT.zip)
- - [Online Distribution](https://openhab.ci.cloudbees.com/job/openHAB-Distribution/lastSuccessfulBuild/artifact/distributions/openhab-online/target/openhab-online-2.0.0-SNAPSHOT.zip)
-
-## Designer Builds
-
-The Designer is the tool for textual configuration of your runtime. You will only need it, if your solution makes use of the textual configuration support of Eclipse SmartHome.
-
-The latest nightly snapshot of the Designer package can be found here:
-
- - [Eclipse SmartHome Designer (Windows 32bit)](http://eclipse.org/downloads/download.php?file=/smarthome/nightly-snapshots/eclipsesmarthome-incubation-0.8.0-SNAPSHOT-designer-win.zip)
- - [Eclipse SmartHome Designer (Windows 64bit)](http://eclipse.org/downloads/download.php?file=/smarthome/nightly-snapshots/eclipsesmarthome-incubation-0.8.0-SNAPSHOT-designer-win64.zip)
- - [Eclipse SmartHome Designer (Mac OSX 64bit)](http://eclipse.org/downloads/download.php?file=/smarthome/nightly-snapshots/eclipsesmarthome-incubation-0.8.0-SNAPSHOT-designer-macosx64.zip)
- - [Eclipse SmartHome Designer (Linux 32bit)](http://eclipse.org/downloads/download.php?file=/smarthome/nightly-snapshots/eclipsesmarthome-incubation-0.8.0-SNAPSHOT-designer-linux.zip)
- - [Eclipse SmartHome Designer (Linux 64bit)](http://eclipse.org/downloads/download.php?file=/smarthome/nightly-snapshots/eclipsesmarthome-incubation-0.8.0-SNAPSHOT-designer-linux64.zip)
diff --git a/appendix/examples/index.md b/appendix/examples/index.md
deleted file mode 100644
index f22a8f96a..000000000
--- a/appendix/examples/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: documentation
----
-
-{% include base.html %}
-
-# Examples
-
-to be done...
\ No newline at end of file
diff --git a/appendix/help.md b/appendix/help.md
new file mode 100644
index 000000000..97b92105e
--- /dev/null
+++ b/appendix/help.md
@@ -0,0 +1,12 @@
+---
+layout: documentation
+title: Finding Help and FAQs
+---
+
+{% include base.html %}
+
+# Finding Help
+
+# FAQs - Frequently Asked Questions
+
+{% include contribution-wanted.html %}
diff --git a/features/multimedia.md b/configuration/multimedia.md
similarity index 100%
rename from features/multimedia.md
rename to configuration/multimedia.md
diff --git a/installation/openhabian.md b/installation/openhabian.md
index 9966dd6d4..70ff7c6ed 100644
--- a/installation/openhabian.md
+++ b/installation/openhabian.md
@@ -9,7 +9,7 @@ title: openHABian
The Raspberry Pi is a quite famous platforms for openHAB. Setting up a fully working system with all recommended packages is a boring task taking some time and Linux newcomers shouldn't worry about these technical details. A home automation enthusiast shouldn't need to be a Linux enthusiast!
-openHABian aims to provide a **self-configuring** Raspberry Pi system specific to the needs of every openHAB user.
+openHABian aims to provide a self-configuring Raspberry Pi system specific to the needs of every openHAB user.
For further details, please have a look at: