diff --git a/web/app/(auth)/signup/page.tsx b/web/app/(auth)/signup/page.tsx
index 40b2f09..0ae2f4f 100644
--- a/web/app/(auth)/signup/page.tsx
+++ b/web/app/(auth)/signup/page.tsx
@@ -156,18 +156,7 @@ export default function SignupPage() {
             checked={formData.acceptTerms}
             onChange={handleChange}
             error={formErrors.acceptTerms}
-            label={
-              <span>
-                I accept the{' '}
-                <Link href="/legal/terms" external variant="primary">
-                  Terms of Service
-                </Link>{' '}
-                and{' '}
-                <Link href="/legal/privacy" external variant="primary">
-                  Privacy Policy
-                </Link>
-              </span>
-            }
+            label="I accept the Terms of Service and Privacy Policy"
           />
         </div>
 
diff --git a/web/components/common/Header.tsx b/web/components/common/Header.tsx
index 5127193..ae172af 100644
--- a/web/components/common/Header.tsx
+++ b/web/components/common/Header.tsx
@@ -130,27 +130,28 @@ export const Header = ({
           <div className="md:hidden py-4 border-t border-gray-200 dark:border-gray-700">
             <div className="space-y-2">
               {navItems.map((item) => (
-                <Link
-                  key={item.href}
-                  href={item.href}
-                  variant="neutral"
-                  className="block px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md no-underline"
-                  onClick={() => setMobileMenuOpen(false)}
-                >
-                  {item.label}
-                </Link>
+                <div key={item.href} onClick={() => setMobileMenuOpen(false)}>
+                  <Link
+                    href={item.href}
+                    variant="neutral"
+                    className="block px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md no-underline"
+                  >
+                    {item.label}
+                  </Link>
+                </div>
               ))}
               <div className="border-t border-gray-200 dark:border-gray-700 pt-2 mt-2">
                 {isAuthenticated ? (
                   <>
-                    <Link
-                      href="/dashboard"
-                      variant="neutral"
-                      className="block px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md no-underline"
-                      onClick={() => setMobileMenuOpen(false)}
-                    >
-                      Dashboard
-                    </Link>
+                    <div onClick={() => setMobileMenuOpen(false)}>
+                      <Link
+                        href="/dashboard"
+                        variant="neutral"
+                        className="block px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md no-underline"
+                      >
+                        Dashboard
+                      </Link>
+                    </div>
                     <button
                       className="w-full text-left px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md"
                       onClick={() => {
@@ -172,14 +173,15 @@ export const Header = ({
                     >
                       Login
                     </button>
-                    <Link
-                      href="/auth/signup"
-                      variant="neutral"
-                      className="block px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md no-underline"
-                      onClick={() => setMobileMenuOpen(false)}
-                    >
-                      Sign Up
-                    </Link>
+                    <div onClick={() => setMobileMenuOpen(false)}>
+                      <Link
+                        href="/auth/signup"
+                        variant="neutral"
+                        className="block px-4 py-2 text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 rounded-md no-underline"
+                      >
+                        Sign Up
+                      </Link>
+                    </div>
                   </>
                 )}
               </div>