diff --git a/client/src/main.jsx b/client/src/main.jsx
index 4f7f073..82e3060 100644
--- a/client/src/main.jsx
+++ b/client/src/main.jsx
@@ -2,6 +2,7 @@ import React from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App.jsx'
 import './index.css'
+import './i18n' // Initialize i18n
 
 // Suppress browser extension errors in development
 if (process.env.NODE_ENV === 'development') {
diff --git a/management/src/components/common/LanguageSelector.jsx b/management/src/components/common/LanguageSelector.jsx
new file mode 100644
index 0000000..6914005
--- /dev/null
+++ b/management/src/components/common/LanguageSelector.jsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Menu, Transition } from '@headlessui/react';
+import { Fragment } from 'react';
+import { Globe, ChevronDown, Check } from 'lucide-react';
+
+const languages = [
+  { code: 'en', name: 'English', flag: '🇺🇸' },
+  { code: 'sv', name: 'Svenska', flag: '🇸🇪' }
+];
+
+export default function LanguageSelector({ className = '' }) {
+  const { i18n, t } = useTranslation();
+
+  const currentLanguage = languages.find(lang => lang.code === i18n.language) || languages[0];
+
+  const changeLanguage = (languageCode) => {
+    i18n.changeLanguage(languageCode);
+  };
+
+  return (
+    <Menu as="div" className={`relative inline-block text-left ${className}`}>
+      <div>
+        <Menu.Button className="inline-flex items-center justify-center w-full px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+          <Globe className="w-4 h-4 mr-2" />
+          <span className="mr-1">{currentLanguage.flag}</span>
+          <span>{currentLanguage.name}</span>
+          <ChevronDown className="w-4 h-4 ml-2" />
+        </Menu.Button>
+      </div>
+
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-100"
+        enterFrom="transform opacity-0 scale-95"
+        enterTo="transform opacity-100 scale-100"
+        leave="transition ease-in duration-75"
+        leaveFrom="transform opacity-100 scale-100"
+        leaveTo="transform opacity-0 scale-95"
+      >
+        <Menu.Items className="absolute right-0 z-10 w-48 mt-2 origin-top-right bg-white border border-gray-300 rounded-md shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+          <div className="py-1">
+            {languages.map((language) => (
+              <Menu.Item key={language.code}>
+                {({ active }) => (
+                  <button
+                    onClick={() => changeLanguage(language.code)}
+                    className={`${
+                      active ? 'bg-gray-100 text-gray-900' : 'text-gray-700'
+                    } ${
+                      language.code === i18n.language ? 'bg-indigo-50 text-indigo-600' : ''
+                    } group flex items-center px-4 py-2 text-sm w-full text-left`}
+                  >
+                    <span className="mr-3">{language.flag}</span>
+                    <span>{language.name}</span>
+                    {language.code === i18n.language && (
+                      <span className="ml-auto">
+                        <Check className="w-4 h-4" />
+                      </span>
+                    )}
+                  </button>
+                )}
+              </Menu.Item>
+            ))}
+          </div>
+        </Menu.Items>
+      </Transition>
+    </Menu>
+  );
+}
\ No newline at end of file
diff --git a/management/src/main.jsx b/management/src/main.jsx
index 54b39dd..39b83fa 100644
--- a/management/src/main.jsx
+++ b/management/src/main.jsx
@@ -2,6 +2,7 @@ import React from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App.jsx'
 import './index.css'
+import './i18n' // Initialize i18n
 
 ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>