diff --git a/extras/website/website/static/css/style.css b/extras/website/website/static/css/style.css
index 08a401717..e6108954f 100755
--- a/extras/website/website/static/css/style.css
+++ b/extras/website/website/static/css/style.css
@@ -9,6 +9,10 @@ body {
 }
 .navbar .nav > li > a {
     color: #cccccc;
+    font-size: 14px;
+}
+.navbar .nav.pull-right > li > a {
+    font-size: 12px;
 }
 .hero-unit {
     margin-top: -15px;
diff --git a/extras/website/website/templates/base.html b/extras/website/website/templates/base.html
index ef10e90c2..36e998ab5 100644
--- a/extras/website/website/templates/base.html
+++ b/extras/website/website/templates/base.html
@@ -38,7 +38,8 @@
           <ul class="nav">
             <li class="{% block mainmenu_about %}{% endblock %}"><a href="{% url about %}">{% trans "Über OpenSlides" %}</a></li>
             <li class="{% block mainmenu_download %}{% endblock %}"><a href="{% url download %}">{% trans "Download" %}</a></li>
-            <li class="{% block mainmenu_support %}{% endblock %}"><a href="{% url support %}">{% trans "Support & Dokumentation" %}</a></li>
+            <li class="{% block mainmenu_support %}{% endblock %}"><a href="{% url support %}">{% trans "Support" %}</a></li>
+            <li class="{% block mainmenu_documentation %}{% endblock %}"><a href="{% url documentation %}">{% trans "Dokumentation" %}</a></li>
             <li class="{% block mainmenu_development %}{% endblock %}"><a href="{% url development %}">{% trans "Entwicklung" %}</a></li>
           </ul>
           <ul class="nav pull-right">
diff --git a/extras/website/website/templates/base_documentation.html b/extras/website/website/templates/base_documentation.html
new file mode 100644
index 000000000..f32e358c9
--- /dev/null
+++ b/extras/website/website/templates/base_documentation.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+
+{% block mainmenu_documentation %}active{% endblock %}
+
+{% block submenu %}
+  <div class="subnav subnav-fixed">
+    <ul class="nav nav-pills">
+        <li class="{% block submenu_documentation %}{% endblock %}"><a href="{% url documentation %}">Handbuch</a></li>
+        <li class="{% block submenu_faq %}{% endblock %}"><a href="{% url faq %}">FAQ</a></li>
+    </ul>
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/extras/website/website/templates/base_support.html b/extras/website/website/templates/base_support.html
deleted file mode 100644
index 98af45a35..000000000
--- a/extras/website/website/templates/base_support.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-
-{% load i18n %}
-
-{% block mainmenu_support %}active{% endblock %}
-
-{% block submenu %}
-  <div class="subnav subnav-fixed">
-    <ul class="nav nav-pills">
-        <li class="{% block submenu_support %}{% endblock %}"><a href="{% url support %}">Professioneller Support</a></li>
-        <li><a href="#">FAQ</a></li>
-        <li><a href="#">Handbuch</a></li>
-    </ul>
-  </div>
-{% endblock %}
\ No newline at end of file
diff --git a/extras/website/website/templates/documentation.html b/extras/website/website/templates/documentation.html
new file mode 100644
index 000000000..2be59993b
--- /dev/null
+++ b/extras/website/website/templates/documentation.html
@@ -0,0 +1,21 @@
+{% extends "base_documentation.html" %}
+
+{% load i18n %}
+
+{% block title %}{{ block.super }} - {% trans "Handbuch" %}{% endblock %}
+{% block headline %}{% trans "Handbuch" %}{% endblock %}
+
+{% block submenu_documentation %}active{% endblock %}
+
+{% block lead %}
+{% endblock %}
+
+{% block content %}
+  <div class="row">
+    <div class="span6">
+    <p>TODO</p>
+    </div>
+  </div>
+  <p><br></p>
+  <p><br></p>
+{% endblock %}
diff --git a/extras/website/website/templates/faq.html b/extras/website/website/templates/faq.html
new file mode 100644
index 000000000..cec9357f8
--- /dev/null
+++ b/extras/website/website/templates/faq.html
@@ -0,0 +1,21 @@
+{% extends "base_documentation.html" %}
+
+{% load i18n %}
+
+{% block title %}{{ block.super }} - {% trans "FAQ" %}{% endblock %}
+{% block headline %}{% trans "FAQ" %}{% endblock %}
+
+{% block submenu_faq %}active{% endblock %}
+
+{% block lead %}
+{% endblock %}
+
+{% block content %}
+  <div class="row">
+    <div class="span6">
+    <p>TODO</p>
+    </div>
+  </div>
+  <p><br></p>
+  <p><br></p>
+{% endblock %}
diff --git a/extras/website/website/templates/support.html b/extras/website/website/templates/support.html
index 5134f1d4d..c64c34ba3 100644
--- a/extras/website/website/templates/support.html
+++ b/extras/website/website/templates/support.html
@@ -1,11 +1,11 @@
-{% extends "base_support.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
 
 {% block title %}{{ block.super }} - Support{% endblock %}
 {% block headline %}Support{% endblock %}
 
-{% block submenu_support %}active{% endblock %}
+{% block mainmenu_support %}active{% endblock %}
  
 {% block lead %}
 Die Intevation GmbH bietet Ihnen professionellen Support beim Einsatz von OpenSlides auf Ihrer Veranstaltung an.
diff --git a/extras/website/website/urls.py b/extras/website/website/urls.py
index 75aae77eb..cb6581120 100644
--- a/extras/website/website/urls.py
+++ b/extras/website/website/urls.py
@@ -18,9 +18,10 @@ urlpatterns = i18n_patterns('',
     url(r'^about/press$', TemplateView.as_view(template_name="press.html"), name='press',),
     url(r'^download/$', TemplateView.as_view(template_name="download.html"), name='download',),
     url(r'^support/$', TemplateView.as_view(template_name="support.html"), name='support',),
+    url(r'^documentation/$', TemplateView.as_view(template_name="documentation.html"), name='documentation',),
+    url(r'^faq/$', TemplateView.as_view(template_name="faq.html"), name='faq',),
     url(r'^development/$', TemplateView.as_view(template_name="development.html"), name='development',),
     url(r'^contact/$', 'website.views.contact', name='contact',),
-    #url(r'^contact/$', TemplateView.as_view(template_name="contact.html"), name='contact',),
     url(r'^demo/$', TemplateView.as_view(template_name="demo.html"), name='demo',),
     url(r'^impressum/$', TemplateView.as_view(template_name="impressum.html"), name='impressum',),
 )