diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index ee791648..9c17d39e 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -1,10 +1,12 @@
-{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %}
+{% load staticfiles i18n%}
+{% load custom_tags %}
+{% get_current_language as LANGUAGE_CODE %}
 <nav class="navbar navbar-default navbar-fixed-top topnav">
     <div class="topnav">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                <span class="sr-only">Toggle navigation</span>
+                <span class="sr-only">{% trans "Toggle navigation" %}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index b5cccff3..84f3fb3d 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -12,42 +12,54 @@ from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse_lazy
 import debug_toolbar
 
-urlpatterns = [url(r'^index.html$', LandingView.as_view()),
-               url(r'^hosting/', include('hosting.urls', namespace="hosting")),
-               url(r'^open_api/', include('opennebula_api.urls',
-                                          namespace='opennebula_api')),
-               url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"),
-               url(r'^nodehosting/', NodeJSHostingView.as_view(), name="node.hosting"),
-               url(r'^djangohosting/', DjangoHostingView.as_view(), name="django.hosting"),
-               url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
-               url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
-               url(r'^jsi18n/(?P<packages>\S+?)/$',
-                   i18n.javascript_catalog),
-               ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+urlpatterns = [
+    url(r'^index.html$', LandingView.as_view()),
+    url(r'^open_api/', include('opennebula_api.urls',
+                               namespace='opennebula_api')),
+    url(r'^railshosting/', RailsHostingView.as_view(),
+        name="rails.hosting"),
+    url(r'^nodehosting/', NodeJSHostingView.as_view(),
+        name="node.hosting"),
+    url(r'^djangohosting/', DjangoHostingView.as_view(),
+        name="django.hosting"),
+    url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
+    url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
+    url(r'^jsi18n/(?P<packages>\S+?)/$',
+        i18n.javascript_catalog),
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+urlpatterns += i18n_patterns(
+    url(r'^hosting/', include('hosting.urls', namespace="hosting")),
+)
 
 # note the django CMS URLs included via i18n_patterns
 urlpatterns += i18n_patterns(
-                             url(r'^$', LandingView.as_view()),
-                             url(r'^admin/', include(admin.site.urls)),
-                             url(r'^datacenterlight/', include('datacenterlight.urls', namespace="datacenterlight")),
-                             url(r'^hosting/', RedirectView.as_view(
-                                 url=reverse_lazy('hosting:login')), name='redirect_hosting_login'),
-                             url(r'^alplora/', include('alplora.urls', namespace="alplora")),
-                             url(r'^membership/', include(membership_urls)),
-                             url(r'^digitalglarus/', include('digitalglarus.urls',
-                                                             namespace="digitalglarus")),
-                             # url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
-                             url(r'^',
-                                 include('ungleich_page.urls', namespace='ungleich_page'),
-                                 name='ungleich_page'),
-                             url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
-                             url(r'^', include('cms.urls'))
-                             )
+    url(r'^$', LandingView.as_view()),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^datacenterlight/',
+        include('datacenterlight.urls', namespace="datacenterlight")),
+    url(r'^hosting/', RedirectView.as_view(
+        url=reverse_lazy('hosting:login')), name='redirect_hosting_login'),
+    url(r'^alplora/', include('alplora.urls', namespace="alplora")),
+    url(r'^membership/', include(membership_urls)),
+    url(r'^digitalglarus/', include('digitalglarus.urls',
+                                    namespace="digitalglarus")),
+    # url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
+    url(r'^',
+        include('ungleich_page.urls',
+                namespace='ungleich_page'),
+        name='ungleich_page'),
+    url(r'^blog/', include('ungleich.urls',
+                           namespace='ungleich')),
+    url(r'^', include('cms.urls'))
+)
+
 urlpatterns += [
-                        url(r'^media/(?P<path>.*)$',
-                            static_view.serve, {
-                                'document_root': settings.MEDIA_ROOT,
-                            }),
-                        ]
+    url(r'^media/(?P<path>.*)$',
+        static_view.serve, {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+]
+
 if settings.DEBUG:
     urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]
diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css
index 699f417c..a3811d96 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -5,7 +5,7 @@
 }
 
 .dashboard-container {
-  padding-top:70px;
+  padding-top: 80px;
   padding-bottom: 70px;
   width: 90%;
   margin: 0 auto;
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index b69f1b8f..076ec34c 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -29,18 +29,22 @@ h6 {
     max-height: 740px;
 }
 .navbar-brand {
-    padding: 10px 15px;
+    /* padding: 10px 15px; */
 }
 
 .navbar-default {
     background: #fff;
-    box-shadow: 0 3px 3px -2px hsla(0,0%,78%,.72);
+    /* box-shadow: 0 3px 3px -2px hsla(0,0%,78%,.72); */
 }
 
 .navbar-default .navbar-header {
     position: relative;
     z-index: 1;
 }
+.navbar-default .navbar-nav>li>a {
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
 
 .navbar-transparent {
     background: transparent;
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 5030d9ab..5f87e315 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -51,61 +51,7 @@
 
 
     {% block navbar %}
-
-        <!-- Navigation -->
-
-        <nav class="navbar navbar-default  navbar-fixed-top topnav" role="navigation">
-            <div class="container topnav">
-                <!-- Brand and toggle get grouped for better mobile display -->
-                <div class="navbar-header">
-                    {% if request.user.is_authenticated %}
-                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                            <span class="sr-only">Toggle navigation</span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    {% endif %}
-                    <a class="navbar-brand topnav" href="{% if site_url %}{{site_url}}{% else %}{{ request.session.hosting_url}}{% endif %}"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
-                </div>
-                {% if request.user.is_authenticated %}
-                <!-- Collect the nav links, forms, and other content for toggling -->
-                <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                    <ul class="nav navbar-nav navbar-right">
-                        <li>
-                            <a href="{% url 'hosting:virtual_machines' %}">
-                                <i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%}
-                            </a>
-                        </li>
-                        <li>
-                            <a href="{% url 'hosting:orders' %}">
-                                <i class="fa fa-credit-card"></i> {% trans "My Orders"%}
-                            </a>
-                        </li>
-                        <li class="dropdown">
-                          <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
-                            <i class="glyphicon glyphicon-user"></i> {{request.user.name}} <span class="caret"></span></a>
-                          <ul id="g-account-menu" class="dropdown-menu" role="menu">
-                            <li>
-                                <a href="{% url 'hosting:ssh_keys' %}">
-                                    <i class="fa fa-key"></i> {% trans "SSH Keys" %}
-                                </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'hosting:notifications' %}">
-                                    <i class="fa fa-bell"></i> {% trans "Notifications "%}
-                                </a>
-                            </li>
-                            <li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li>
-                          </ul>
-                        </li>
-                    </ul>
-                </div>
-                {% endif %}
-                <!-- /.navbar-collapse -->
-            </div>
-            <!-- /.container -->
-        </nav>
+        {% include "hosting/includes/_navbar_user.html" %}
     {% endblock navbar %}
 
 
diff --git a/hosting/templates/hosting/includes/_navbar_user.html b/hosting/templates/hosting/includes/_navbar_user.html
new file mode 100644
index 00000000..cfd313ce
--- /dev/null
+++ b/hosting/templates/hosting/includes/_navbar_user.html
@@ -0,0 +1,50 @@
+{% load staticfiles %}
+{% load i18n %}
+{% load custom_tags %}
+
+<!-- Navigation -->
+
+<nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
+    <div class="topnav">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            {% if request.user.is_authenticated %}
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">{% trans "Toggle navigation" %}</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            {% endif %}
+            <a class="navbar-brand topnav" href="{% if site_url %}{{site_url}}{% else %}{{ request.session.hosting_url}}{% endif %}"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
+        </div>
+        {% if request.user.is_authenticated %}
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav navbar-right">
+                <li>
+                    <a href="{% url 'hosting:dashboard' %}">
+                        <i class="fa fa-server" aria-hidden="true"></i>&nbsp;&nbsp;{% trans "Dashboard"%}
+                    </a>
+                </li>
+                <li class="dropdown highlights-dropdown">
+                    <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
+                        <i class="fa fa-user"></i>&nbsp;&nbsp;{{request.user.name}}&nbsp;<span class="caret"></span>
+                    </a>
+                    <ul id="g-account-menu" class="dropdown-menu" role="menu">
+                        <li><a href="{% url 'hosting:logout' %}">{% trans "Logout"%}</a></li>
+                    </ul>
+                </li>
+                <li>
+                    {% get_current_language as LANGUAGE_CODE %}
+                    {% if LANGUAGE_CODE == 'en-us'%}
+                    <a href="{% change_lang 'de' %}">Deutsch&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a> {% else %}
+                    <a href="{% change_lang 'en-us' %}">English&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a> {% endif %}
+                </li>
+            </ul>
+        </div>
+        {% endif %}
+        <!-- /.navbar-collapse -->
+    </div>
+    <!-- /.container -->
+</nav>
\ No newline at end of file
diff --git a/hosting/urls.py b/hosting/urls.py
index e6b6fee3..94444107 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -11,6 +11,7 @@ from .views import (
     HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView,
     SSHKeyChoiceView, DashboardView)
 
+
 urlpatterns = [
     url(r'index/?$', IndexView.as_view(), name='index'),
     url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),