diff --git a/src/components/ContentFrameBox.tsx b/src/components/ContentFrameBox.tsx
index bb47363..befb17e 100644
--- a/src/components/ContentFrameBox.tsx
+++ b/src/components/ContentFrameBox.tsx
@@ -10,10 +10,12 @@ export function ContentFrameBox() {
 
   return (
     <div className="background">
-      <LanguageSelector />
       <div className="ContentFrameBox">
-        <header>
+        <header className="relative px-4 pt-4 pb-2 sm:px-6 sm:py-4 lg:px-8 lg:py-8">
           <div className="headline">Tom DevTech</div>
+          <div className="mt-8 mb-4 sm:mt-0 sm:mb-0 flex justify-center sm:block sm:absolute sm:right-6 sm:top-1/2 sm:-translate-y-1/2 lg:right-16 xl:right-24 z-50">
+            <LanguageSelector />
+          </div>
         </header>
         <div className="body">
           <ContentFrame
diff --git a/src/components/LanguageSelector.tsx b/src/components/LanguageSelector.tsx
index 7981fc3..bada8f3 100644
--- a/src/components/LanguageSelector.tsx
+++ b/src/components/LanguageSelector.tsx
@@ -5,29 +5,27 @@ export const LanguageSelector: React.FC = () => {
   const { language, setLanguage } = useLanguage();
 
   return (
-    <div className="absolute top-4 right-4 z-50">
-      <div className="flex rounded-lg overflow-hidden border border-white/10">
-        <button
-          onClick={() => setLanguage('de')}
-          className={`px-3 py-1.5 text-sm font-medium transition-all duration-300
-            ${language === 'de' 
-              ? 'bg-gray-800 text-white' 
-              : 'text-white hover:bg-white/10'
-            }`}
-        >
-          DE
-        </button>
-        <button
-          onClick={() => setLanguage('en')}
-          className={`px-3 py-1.5 text-sm font-medium transition-all duration-300
-            ${language === 'en' 
-              ? 'bg-gray-800 text-white' 
-              : 'text-white hover:bg-white/10'
-            }`}
-        >
-          EN
-        </button>
-      </div>
+    <div className="flex rounded-lg overflow-hidden border-2 border-white/20 shadow-lg backdrop-blur-sm">
+      <button
+        onClick={() => setLanguage('de')}
+        className={`px-4 py-2.5 text-lg lg:text-xl font-medium transition-all duration-300
+          ${language === 'de' 
+            ? 'bg-gray-800 text-white' 
+            : 'text-white hover:bg-white/10'
+          }`}
+      >
+        DE
+      </button>
+      <button
+        onClick={() => setLanguage('en')}
+        className={`px-4 py-2.5 text-lg lg:text-xl font-medium transition-all duration-300
+          ${language === 'en' 
+            ? 'bg-gray-800 text-white' 
+            : 'text-white hover:bg-white/10'
+          }`}
+      >
+        EN
+      </button>
     </div>
   );
 }; 
\ No newline at end of file
diff --git a/src/context/LanguageContext.tsx b/src/context/LanguageContext.tsx
index 73d7f02..9a55625 100644
--- a/src/context/LanguageContext.tsx
+++ b/src/context/LanguageContext.tsx
@@ -4,16 +4,16 @@ type Language = 'de' | 'en';
 
 interface LanguageContextType {
   language: Language;
-  setLanguage: () => void;
+  setLanguage: (newLanguage: Language) => void;
 }
 
 const LanguageContext = createContext<LanguageContextType | undefined>(undefined);
 
 export const LanguageProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
-  // Get initial language from localStorage or default to 'de'
+  // Get initial language from localStorage or default to 'en'
   const [language, setLanguageState] = useState<Language>(() => {
     const savedLanguage = localStorage.getItem('language');
-    return (savedLanguage === 'en' || savedLanguage === 'de') ? savedLanguage : 'de';
+    return (savedLanguage === 'en' || savedLanguage === 'de') ? savedLanguage : 'en';
   });
 
   const setLanguage = (newLanguage: Language) => {