diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index c3a14372..44d881e0 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -3,11 +3,11 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.index, name='index'),
-    url(r'about$', views.about, name='about'),
-    url(r'contact$', views.contact, name='contact'),
-    url(r'letscowork$', views.letscowork, name='letscowork'),
-    url(r'home$', views.home, name='home'),
+    url(r'old^$', views.index, name='index'),
+    url(r'old_about$', views.about, name='about'),
+    url(r'old_contact$', views.contact, name='contact'),
+    url(r'old_letscowork$', views.letscowork, name='letscowork'),
+    url(r'old_home$', views.home, name='home'),
     url(r'blog/$', views.blog, name='blog'),
     url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
 ]
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index b624498d..10291fac 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -8,8 +8,6 @@ from dynamicweb import settings
 from hosting.views import railshosting
 
 urlpatterns = [
-    url(r'^digitalglarus/', include('digitalglarus.urls',
-                                    namespace="digitalglarus")),
     url(r'^hosting/', include('hosting.urls', namespace="hosting")),
     url(r'^railshosting/', railshosting, name="rails.hosting"),
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
@@ -20,6 +18,8 @@ urlpatterns = [
 # note the django CMS URLs included via i18n_patterns
 urlpatterns += i18n_patterns('',
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^digitalglarus/', include('digitalglarus.urls',
+       namespace="digitalglarus")),
     url(r'^', include('cms.urls')),
 )
 
diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html
index d5d50456..221c44c5 100644
--- a/templates/cms/digitalglarus/base.html
+++ b/templates/cms/digitalglarus/base.html
@@ -56,43 +56,7 @@
     </div>
 
     <!-- Navigation -->
-    <nav class="navbar navbar-default" role="navigation">
-	<div class="container">
-	    <!-- 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="icon-bar"></span>
-		    <span class="icon-bar"></span>
-		    <span class="icon-bar"></span>
-		</button>
-		<!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
-		<a class="navbar-brand" href="index.html">Digital Glarus</a>
-	    </div>
-	    <!-- 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">
-		    <li>
-		      <a href="{% url 'digitalglarus:letscowork' %}">Crowdfunding</a>
-		    </li>
-		    <li>
-			<a href="{% url 'digitalglarus:home' %}">Home</a>
-		    </li>
-		    <li>
-		      <a href="{% url 'digitalglarus:contact' %}">Contact</a>
-		    </li>
-		    <li>
-			<a href="{% url 'digitalglarus:about' %}">About</a>
-		    </li>
-		    <li>
-			<a href="{% url 'digitalglarus:blog' %}">Blog</a>
-		    </li>
-		</ul>
-	    </div>
-	    <!-- /.navbar-collapse -->
-	</div>
-	<!-- /.container -->
-    </nav>
+    {% include "cms/digitalglarus/partials/menu.html" %}
 
     <div class="container">
     {% block content %} {% endblock %}
diff --git a/templates/cms/digitalglarus/partials/menu.html b/templates/cms/digitalglarus/partials/menu.html
new file mode 100644
index 00000000..fe303540
--- /dev/null
+++ b/templates/cms/digitalglarus/partials/menu.html
@@ -0,0 +1,28 @@
+{% load menu_tags staticfiles cms_tags %}
+<!-- Navigation -->
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container">
+    <!-- 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="icon-bar"></span>
+	<span class="icon-bar"></span>
+	<span class="icon-bar"></span>
+      </button>
+      <!-- navbar-brand is hidden on larger screens, but visible when the menu is collapsed -->
+      <a class="navbar-brand" href="index.html">Digital Glarus</a>
+    </div>
+    <!-- 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">
+	{% show_sub_menu 1 %}
+	<li>
+	  <a href="{% url 'digitalglarus:blog' %}">Blog</a>
+	</li>
+      </ul>
+    </div>
+    <!-- /.navbar-collapse -->
+  </div>
+  <!-- /.container -->
+</nav>