diff --git a/client/components/Layout.tsx b/client/components/Layout.tsx
index f8bd131c..4c6f8b9f 100644
--- a/client/components/Layout.tsx
+++ b/client/components/Layout.tsx
@@ -98,8 +98,8 @@ export default function CodeLayout({ children, hideFooter }: LayoutProps) {
     <div className="min-h-screen bg-aethex-gradient">
       <header className="sticky top-0 z-50 border-b border-border/40 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 animate-slide-down">
         <div className="container mx-auto max-w-7xl flex min-h-16 h-auto items-center justify-between px-4 py-2 gap-2 min-w-0">
-          {/* Logo + Animated Arm Switcher */}
-          <div className="flex items-center space-x-3 shrink-0">
+          {/* Logo */}
+          <div className="flex items-center shrink-0">
             <Link to="/" className="hover-glow group inline-block">
               <img
                 src="https://docs.aethex.tech/~gitbook/image?url=https%3A%2F%2F1143808467-files.gitbook.io%2F%7E%2Ffiles%2Fv0%2Fb%2Fgitbook-x-prod.appspot.com%2Fo%2Forganizations%252FDhUg3jal6kdpG645FzIl%252Fsites%252Fsite_HeOmR%252Flogo%252FqxDYz8Oj2SnwUTa8t3UB%252FAeThex%2520Origin%2520logo.png%3Falt%3Dmedia%26token%3D200e8ea2-0129-4cbe-b516-4a53f60c512b&width=256&dpr=1&quality=100&sign=6c7576ce&sv=2"
@@ -107,12 +107,16 @@ export default function CodeLayout({ children, hideFooter }: LayoutProps) {
                 className="h-10 w-10 transition-all duration-300 group-hover:scale-110 group-hover:rotate-12"
               />
             </Link>
-            <ArmSwitcher />
           </div>
 
           {/* Navigation */}
           <nav className="hidden md:flex items-center flex-1 mx-3" />
 
+          {/* Animated Arm Switcher */}
+          <div className="hidden lg:flex items-center shrink-0">
+            <ArmSwitcher />
+          </div>
+
           {/* Auth Section */}
           <div className="flex items-center gap-2 md:gap-4 animate-slide-left shrink-0">
             <div className="md:hidden">