diff --git a/config/__pycache__/settings.cpython-311.pyc b/config/__pycache__/settings.cpython-311.pyc
index f7be13a..80bb7d0 100644
Binary files a/config/__pycache__/settings.cpython-311.pyc and b/config/__pycache__/settings.cpython-311.pyc differ
diff --git a/config/settings.py b/config/settings.py
index 7f0b943..0a5b204 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -62,8 +62,8 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
     'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -136,7 +136,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/5.2/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'en'
 LANGUAGES = [
     ('en', 'English'),
     ('ar', 'Arabic'),
diff --git a/core/templates/base.html b/core/templates/base.html
index 2668d34..35c7f35 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -277,22 +277,6 @@
 
                 {% endwith %}
             </ul>
-
-            <div class="mt-auto p-4 border-top">
-                <form action="{% url 'set_language' %}" method="post">
-                    {% csrf_token %}
-                    <input name="next" type="hidden" value="{{ request.get_full_path }}">
-                    <select name="language" onchange="this.form.submit()" class="form-select form-select-sm border-0 bg-light">
-                        {% get_available_languages as LANGUAGES %}
-                        {% get_language_info_list for LANGUAGES as languages %}
-                        {% for language in languages %}
-                            <option value="{{ language.code }}" {% if language.code == LANGUAGE_CODE %}selected{% endif %}>
-                                {{ language.name_local }}
-                            </option>
-                        {% endfor %}
-                    </select>
-                </form>
-            </div>
         </nav>
         {% endif %}
 
@@ -307,6 +291,28 @@
                     {% endif %}
                     
                     <div class="ms-auto d-flex align-items-center">
+                        <!-- Language Switcher -->
+                        <div class="me-3">
+                            <form action="{% url 'set_language' %}" method="post" id="lang-switcher-form">
+                                {% csrf_token %}
+                                <input name="next" type="hidden" value="{{ request.get_full_path }}">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text bg-light border-0 rounded-start-pill pe-0">
+                                        <i class="bi bi-translate text-muted"></i>
+                                    </span>
+                                    <select name="language" onchange="this.form.submit()" class="form-select form-select-sm border-0 bg-light rounded-end-pill ps-2 pe-4" style="width: auto; cursor: pointer;">
+                                        {% get_available_languages as LANGUAGES %}
+                                        {% get_language_info_list for LANGUAGES as languages %}
+                                        {% for language in languages %}
+                                            <option value="{{ language.code }}" {% if language.code == LANGUAGE_CODE %}selected{% endif %}>
+                                                {{ language.name_local }}
+                                            </option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                            </form>
+                        </div>
+
                         <div class="dropdown">
                             <button class="btn btn-light dropdown-toggle d-flex align-items-center rounded-pill px-3" type="button" id="userDropdown" data-bs-toggle="dropdown">
                                 {% if user.is_authenticated and user.profile.image %}
@@ -383,4 +389,4 @@
     </script>
     {% block scripts %}{% endblock %}
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo
index 1bc5065..2468fe9 100644
Binary files a/locale/ar/LC_MESSAGES/django.mo and b/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po
index bfe9fe5..d1894a4 100644
--- a/locale/ar/LC_MESSAGES/django.po
+++ b/locale/ar/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"