diff --git a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
index d63b92e..18ba651 100644
--- a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
+++ b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
@@ -25,27 +25,29 @@
   .ms-lang-switcher-link:hover { color: #1d4ed8; }
 </style>
 <div class="header-right">
-    <a class="ms-lang-switcher-link" href="{% url language_test %}" title="Language test">LANG</a>
-    <form action="{% url set_language %}" method="post" class="ms-lang-switcher me-2" aria-label="Language switcher">
+    <a class="ms-lang-switcher-link" href="/language-test/" title="Language test">LANG</a>
+    <form action="{% url 'set_language' %}" method="post" class="ms-lang-switcher me-2" aria-label="Language switcher">
         {% csrf_token %}
         <input name="next" type="hidden" value="{{ request.get_full_path }}">
         <label for="header-language-switcher" class="visually-hidden">{% trans "Language" %}</label>
         <select id="header-language-switcher" name="language" class="form-select form-select-sm" onchange="this.form.submit()">
             {% get_current_language as LANGUAGE_CODE %}
-            {% get_available_languages as LANGUAGES %}
-            {% for code, name in LANGUAGES %}
-                {% if code in nl,en,de,fr,es,it,pt,ru %}
-                    <option value="{{ code }}" {% if code == LANGUAGE_CODE %}selected{% endif %}>{{ code|upper }}</option>
-                {% endif %}
-            {% endfor %}
+            <option value="nl" {% if LANGUAGE_CODE == 'nl' %}selected{% endif %}>NL</option>
+            <option value="en" {% if LANGUAGE_CODE == 'en' %}selected{% endif %}>EN</option>
+            <option value="de" {% if LANGUAGE_CODE == 'de' %}selected{% endif %}>DE</option>
+            <option value="fr" {% if LANGUAGE_CODE == 'fr' %}selected{% endif %}>FR</option>
+            <option value="es" {% if LANGUAGE_CODE == 'es' %}selected{% endif %}>ES</option>
+            <option value="it" {% if LANGUAGE_CODE == 'it' %}selected{% endif %}>IT</option>
+            <option value="pt" {% if LANGUAGE_CODE == 'pt' %}selected{% endif %}>PT</option>
+            <option value="ru" {% if LANGUAGE_CODE == 'ru' %}selected{% endif %}>RU</option>
         </select>
     </form>
 
     <a tabindex="0" aria-label="Open Search" role="search" class="search-toggler user-button menu-circle">
         <i class="fa fa-search"></i>
     </a>
-    <a href="{% url customer:summary %}" aria-label="{% trans Customer summary %}" class="user-button menu-circle"><i class="fa fa-user-solid"></i></a>
-    {% include oxyan/headers/partials/mini_basket.html %}
+    <a href="{% url 'customer:summary' %}" aria-label="{% trans 'Customer summary' %}" class="user-button menu-circle"><i class="fa fa-user-solid"></i></a>
+    {% include 'oxyan/headers/partials/mini_basket.html' %}
 </div>
 
 <div class="alert-messages-header" aria-live="polite">
diff --git a/mandelstudio/urls.py b/mandelstudio/urls.py
index cbaefa6..99ec877 100644
--- a/mandelstudio/urls.py
+++ b/mandelstudio/urls.py
@@ -2,14 +2,12 @@ from django.conf.urls.i18n import i18n_patterns
 from django.urls import include, path
 
 from ocyan.main.urls import urlpatterns as ocyan_urlpatterns
-from mandelstudio.views import language_test
 
 urlpatterns = [
-    path("i18n/", include("django.conf.urls.i18n")),
+    path('i18n/', include('django.conf.urls.i18n')),
 ]
 
 urlpatterns += i18n_patterns(
-    path("language-test/", language_test, name="language_test"),
     *ocyan_urlpatterns,
     prefix_default_language=False,
 )