diff --git a/client/src/components/Layout.jsx b/client/src/components/Layout.jsx
index 16ff011..cf5b3e6 100644
--- a/client/src/components/Layout.jsx
+++ b/client/src/components/Layout.jsx
@@ -3,6 +3,7 @@ import { Outlet, Link, useLocation } from 'react-router-dom';
 import { useAuth } from '../contexts/AuthContext';
 import { useSocket } from '../contexts/SocketContext';
 import DebugToggle from './DebugToggle';
+import LanguageSelector from './common/LanguageSelector';
 import { canAccessSettings, hasPermission } from '../utils/rbac';
 import {
   HomeIcon,
@@ -131,6 +132,9 @@ const Layout = () => {
                 </div>
               )}
 
+              {/* Language selector */}
+              <LanguageSelector />
+
               {/* User menu */}
               <div className="ml-3 relative">
                 <div className="flex items-center space-x-2">
diff --git a/management/src/components/Layout.jsx b/management/src/components/Layout.jsx
index 7348cd3..f2e39ae 100644
--- a/management/src/components/Layout.jsx
+++ b/management/src/components/Layout.jsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import { Outlet, NavLink, useLocation } from 'react-router-dom'
 import { useAuth } from '../contexts/AuthContext'
+import LanguageSelector from './common/LanguageSelector'
 import { 
   HomeIcon, 
   BuildingOfficeIcon, 
@@ -83,6 +84,14 @@ const Layout = () => {
 
       {/* Main content */}
       <div className="pl-64">
+        {/* Top header bar */}
+        <div className="bg-white border-b border-gray-200 px-4 py-3">
+          <div className="flex justify-between items-center">
+            <div></div> {/* Empty div for spacing */}
+            <LanguageSelector />
+          </div>
+        </div>
+        
         <div className="py-6">
           <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
             <Outlet />