diff --git a/apps/web/src/app/components/logo.tsx b/apps/web/src/app/components/logo.tsx
index 43c202d93b..694092a908 100644
--- a/apps/web/src/app/components/logo.tsx
+++ b/apps/web/src/app/components/logo.tsx
@@ -2,36 +2,36 @@
 
 import Image from "next/image";
 
-export function Logo({ 
+export function Logo({
   className,
-  width = 64, 
+  width = 64,
   height = 64,
   alt = "Comp Logo",
   ...props
-}: { 
-  className?: string; 
-  width?: number; 
+}: {
+  className?: string;
+  width?: number;
   height?: number;
   alt?: string;
 } & Omit<React.ComponentProps<typeof Image>, 'src' | 'alt' | 'width' | 'height'>) {
   return (
-    <>
-      <Image 
+    <div role="img" aria-label={alt}>
+      <Image
         src="/comp-logo-black.png"
-        alt={alt}
-        width={width} 
+        alt=""
+        width={width}
         height={height}
         className={`${className} dark:hidden`}
         {...props}
       />
-      <Image 
+      <Image
         src="/comp-logo-white.png"
-        alt={alt}
-        width={width} 
+        alt=""
+        width={width}
         height={height}
         className={`${className} hidden dark:block`}
         {...props}
       />
-    </>
+    </div>
   );
 }
diff --git a/apps/web/src/app/components/mode-switcher.tsx b/apps/web/src/app/components/mode-switcher.tsx
index 7eb17752c5..3fc9642b9a 100644
--- a/apps/web/src/app/components/mode-switcher.tsx
+++ b/apps/web/src/app/components/mode-switcher.tsx
@@ -3,25 +3,47 @@
 import { MoonIcon, SunIcon } from "lucide-react";
 import { useTheme } from "next-themes";
 import * as React from "react";
-
 import { Button } from "@bubba/ui/button";
 
 export function ModeSwitcher() {
   const { setTheme, resolvedTheme } = useTheme();
+  const [mounted, setMounted] = React.useState(false);
+
+  // Mount handler
+  React.useEffect(() => {
+    setMounted(true);
+  }, []);
 
   const toggleTheme = React.useCallback(() => {
     setTheme(resolvedTheme === "dark" ? "light" : "dark");
   }, [resolvedTheme, setTheme]);
 
+  // Prevent hydration mismatch by not rendering until mounted
+  if (!mounted) {
+    return (
+      <Button
+        variant="ghost"
+        className="group/toggle h-4 w-4 px-0"
+        aria-label="Loading theme switcher"
+      >
+        <span className="sr-only">Loading theme switcher</span>
+      </Button>
+    );
+  }
+
+  const themeText = resolvedTheme === "dark"
+    ? "Switch to light theme"
+    : "Switch to dark theme";
+
   return (
     <Button
       variant="ghost"
-      className="group/toggle h-4 w-4 px-0"
+      className="group/toggle h-4 w-4 px-0 focus-visible:ring-2 focus-visible:ring-ring"
       onClick={toggleTheme}
+      aria-label={themeText}
     >
-      <SunIcon className="hidden [html.dark_&]:block" />
-      <MoonIcon className="hidden [html.light_&]:block" />
-      <span className="sr-only">Toggle theme</span>
+      <SunIcon className="hidden [html.dark_&]:block" aria-hidden="true" />
+      <MoonIcon className="hidden [html.light_&]:block" aria-hidden="true" />
     </Button>
   );
 }
diff --git a/apps/web/src/app/components/site-footer.tsx b/apps/web/src/app/components/site-footer.tsx
index 822131f73b..18d65e4cac 100644
--- a/apps/web/src/app/components/site-footer.tsx
+++ b/apps/web/src/app/components/site-footer.tsx
@@ -27,20 +27,24 @@ export function SiteFooter() {
             .
           </p>
         </div>
-        <div className="flex gap-4">
-          <Link
-            href="/privacy"
-            className="text-sm text-muted-foreground hover:underline"
-          >
-            Privacy
-          </Link>
-          <Link
-            href="/terms"
-            className="text-sm text-muted-foreground hover:underline"
-          >
-            Terms
-          </Link>
-        </div>
+        <ul className="flex gap-4">
+          <li>
+            <Link
+              href="/privacy"
+              className="text-sm text-muted-foreground hover:underline"
+            >
+              Privacy
+            </Link>
+          </li>
+          <li>
+            <Link
+              href="/terms"
+              className="text-sm text-muted-foreground hover:underline"
+            >
+              Terms
+            </Link>
+          </li>
+        </ul>
       </div>
     </footer>
   );
diff --git a/apps/web/src/app/components/site-header.tsx b/apps/web/src/app/components/site-header.tsx
index 84cc964611..a5fae403b8 100644
--- a/apps/web/src/app/components/site-header.tsx
+++ b/apps/web/src/app/components/site-header.tsx
@@ -5,14 +5,14 @@ export function SiteHeader() {
   return (
     <header className="border-grid sticky top-0 z-50 w-full border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
       <div className="container-wrapper">
-        <div className="container flex h-14 items-center">
+        <nav className="container flex h-14 items-center">
           <MainNav />
           <div className="flex flex-1 items-center justify-end gap-2">
-            <nav className="flex items-center gap-0.5">
+            <div className="flex items-center gap-0.5">
               <ModeSwitcher />
-            </nav>
+            </div>
           </div>
-        </div>
+        </nav>
       </div>
     </header>
   );
diff --git a/apps/web/src/app/components/waitlist-form.tsx b/apps/web/src/app/components/waitlist-form.tsx
index 02953154d0..1200c6e647 100644
--- a/apps/web/src/app/components/waitlist-form.tsx
+++ b/apps/web/src/app/components/waitlist-form.tsx
@@ -60,7 +60,7 @@ export function WaitlistForm() {
           className="inline-flex items-center gap-2 px-4 py-2 rounded-md bg-primary/10 hover:bg-primary/20 transition-colors text-primary"
         >
           Join Community
-          <span>→</span>
+          <span aria-hidden="true">→</span>
         </Link>
       </div>
     );
@@ -86,6 +86,7 @@ export function WaitlistForm() {
                   className="h-12 px-4 text-base bg-background border-border/50 focus:border-primary"
                   autoComplete="email"
                   autoCorrect="off"
+                  aria-label="Email address"
                 />
               </FormControl>
               <FormMessage className="text-sm" />
@@ -96,18 +97,18 @@ export function WaitlistForm() {
         <Button
           type="submit"
           size="lg"
-          className="h-12 px-6 text-base font-medium"
+          className="h-12 px-6 text-base font-medium bg-primary text-primary-foreground hover:bg-primary/90 focus-visible:ring-2 focus-visible:ring-sky-300 focus-visible:ring-offset-2"
           disabled={waitlistAction.isExecuting || !form.formState.isValid}
         >
           {waitlistAction.isExecuting ? (
             <span className="flex items-center gap-2">
-              <Loader2 className="h-4 w-4 animate-spin" />
+              <Loader2 className="h-4 w-4 animate-spin" aria-hidden="true" />
               Joining...
             </span>
           ) : (
             <span className="flex items-center gap-2">
               Get Started
-              <ArrowRight className="w-4 h-4" />
+              <ArrowRight className="w-4 h-4" aria-hidden="true" />
             </span>
           )}
         </Button>