diff --git a/digitalglarus/static/digitalglarus/css/business-casual.css b/digitalglarus/static/digitalglarus/css/business-casual.css
index eec8d195..f48fa1bf 100755
--- a/digitalglarus/static/digitalglarus/css/business-casual.css
+++ b/digitalglarus/static/digitalglarus/css/business-casual.css
@@ -143,7 +143,7 @@ footer p {
     .address-bar {
 	display: inherit;
 	margin: 0;
-	padding: 0 0 40px;
+	padding: 0 0 20px;
 	text-align: center;
 	text-shadow: 1px 1px 2px rgba(0,0,0,0.5);
 	text-transform: uppercase;
@@ -256,11 +256,17 @@ article {
 }
 
 .language-chooser-list {
-    width: 200px;
+    width: 138px;
+    font-family: "Josefin Slab","Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-weight: 700;
     margin-bottom: 20px;
 }
 
-.language-chooser-list a {
+li.lang.active a {
     color: white;
+}
+
+.language-chooser-list a {
+    color: #cccccc;
     float: left;
 }
\ No newline at end of file
diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py
index 6bcc26c3..442a1f82 100644
--- a/dynamicweb/settings.py
+++ b/dynamicweb/settings.py
@@ -186,8 +186,8 @@ USE_L10N = True
 USE_TZ = True
 
 LANGUAGES = (
-    ('en-us', _('US English')),
-    ('de', _('German')),
+    ('en-us', _('English')),
+    ('de', _('Deutsch')),
 )
 
 LANGUAGE_CODE = 'en-us'
diff --git a/templates/cms/digitalglarus/base.html b/templates/cms/digitalglarus/base.html
index cbfbc927..990bf7a7 100644
--- a/templates/cms/digitalglarus/base.html
+++ b/templates/cms/digitalglarus/base.html
@@ -55,7 +55,7 @@
     </div>
     <div class="center-block">
       <ul class="list-inline center-block language-chooser-list">
-	{% language_chooser "menu/language_chooser.html" %}
+	{% language_chooser "cms/digitalglarus/partials/language-chooser.html" %}
       </ul>
     </div>
 
diff --git a/templates/cms/digitalglarus/partials/language-chooser.html b/templates/cms/digitalglarus/partials/language-chooser.html
new file mode 100644
index 00000000..c3b75cd6
--- /dev/null
+++ b/templates/cms/digitalglarus/partials/language-chooser.html
@@ -0,0 +1,9 @@
+{% load i18n menu_tags %}
+
+{% if languages|length > 1 %}
+{% for language in languages %}
+<li class="lang{% if current_language == language.0 %} active{% endif %}">
+  <a href="{% page_language_url language.0 %}" title="{% trans "Change to language:" %} {{ language.1 }}">{{ language.1 }}</a>
+</li>
+{% endfor %}
+{% endif %}