diff --git a/shared/multilingual/static/multilingual/js/switch_language.js b/shared/multilingual/static/multilingual/js/switch_language.js
index 6035e1e..077d496 100644
--- a/shared/multilingual/static/multilingual/js/switch_language.js
+++ b/shared/multilingual/static/multilingual/js/switch_language.js
@@ -6,8 +6,9 @@ function showLanguages(languages) {
             if (cls) {
                 var l = cls.split('_').pop();
                 if (l.length == 2 || l.length == 3) {
+                    // TODO Currently this filters out *all* fields which have a _ suffix, e.g. template_key
                     // TODO Quick fix; better use "lang" attribute
-                    if (['id', 'url'].indexOf(l) == -1) {
+                    if (['de', 'en', 'rom'].indexOf(l) > -1) {
                         lang.push(l);
                     }
                 }
diff --git a/shared/multilingual/templates/multilingual/admin/switch_language.html b/shared/multilingual/templates/multilingual/admin/switch_language.html
index 32685e5..86795bd 100644
--- a/shared/multilingual/templates/multilingual/admin/switch_language.html
+++ b/shared/multilingual/templates/multilingual/admin/switch_language.html
@@ -1,24 +1,24 @@
 {% load i18n %}
 
-    <style>
-        .language-switch .selected { background-color: #417690 }
-        .language-switch.end-group { margin-right: 1em; }
-    </style>
+	<style>
+		ul.language-switcher { padding: 14px 40px; float: right; }
+		a.selected { background-color: #417690 !important; }
+	</style>
 
 {% get_available_languages as languages %}
-
-    <li class="language-switch">
-        <a class="language-select" href="#" data-languages="{% for lang_code, _ in languages %}{{ lang_code }}{% if not forloop.last %} {% endif %}{% endfor %}">
-            {% trans 'All' %}
-        </a>
-    </li>
-
-{% for lang_code, lang_name in languages %}
-    <li class="language-switch{% if forloop.last %} end-group{% endif %}">
-        <a class="language-select{% if request.LANGUAGE_CODE == lang_code %} selected{% endif %}"
-           href="#"
-           data-languages="{{ lang_code }}">
-        {{ lang_name }}
-        </a>
-    </li>
-{% endfor %}
+	<ul class="object-tools language-switcher">
+		<li>
+			<a class="language-select" href="#" data-languages="{% for lang_code, _ in languages %}{{lang_code}}{% if not forloop.last %} {% endif %}{% endfor %}">
+				{% trans 'All' %}
+			</a>
+		</li>
+	{% for lang_code, lang_name in languages %}
+		<li>
+			<a class="language-select{% if request.LANGUAGE_CODE == lang_code %} selected{% endif %}"
+			   href="#"
+			   data-languages="{{lang_code}}">
+			{{ lang_name }}
+			</a>
+		</li>
+	{% endfor %}
+	</ul>
diff --git a/shared/multilingual/templates/multilingual/admin/switch_language_change_form.html b/shared/multilingual/templates/multilingual/admin/switch_language_change_form.html
new file mode 100644
index 0000000..aec998b
--- /dev/null
+++ b/shared/multilingual/templates/multilingual/admin/switch_language_change_form.html
@@ -0,0 +1,8 @@
+{% extends "admin/change_form.html" %}
+
+{% block breadcrumbs %}
+{{ block.super }}
+<div class="language-switcher">
+	{% include "multilingual/admin/switch_language.html" %}
+</div>
+{% endblock %}