diff --git a/app/components/layout/NavigationProgressBar.tsx b/app/components/layout/NavigationProgressBar.tsx
index 0d80c09..0b19ff4 100644
--- a/app/components/layout/NavigationProgressBar.tsx
+++ b/app/components/layout/NavigationProgressBar.tsx
@@ -1,13 +1,38 @@
 import {useNavigation} from '@remix-run/react';
 import {useNProgress} from '@tanem/react-nprogress';
 import {AnimatePresence, m} from 'framer-motion';
+import {useEffect, useState} from 'react';
 
 export function NavigationProgressBar() {
   const navigation = useNavigation();
-  const isLoading = navigation.state !== 'idle';
+  const [isLoading, setIsLoading] = useState(false);
   const {animationDuration, isFinished, progress} = useNProgress({
     isAnimating: isLoading,
   });
+  const delay = 300;
+
+  // Delay the progress bar apparing to avoid flickering when the page loads quickly
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      setIsLoading(navigation.state !== 'idle');
+    }, delay);
+
+    return () => clearTimeout(timeout);
+  }, [navigation.state]);
+
+  return (
+    <Container animationDuration={animationDuration} isFinished={isFinished}>
+      <Bar animationDuration={animationDuration} progress={progress} />
+    </Container>
+  );
+}
+
+function Container(props: {
+  animationDuration: number;
+  children: React.ReactNode;
+  isFinished: boolean;
+}) {
+  const {animationDuration, children, isFinished} = props;
 
   return (
     <AnimatePresence>
@@ -17,30 +42,35 @@ export function NavigationProgressBar() {
           exit={{opacity: 0}}
           initial={{opacity: 0}}
           transition={{
-            delay: 0.15,
             duration: animationDuration / 1000,
           }}
         >
-          <m.div
-            animate={{
-              marginLeft: `${(-1 + progress) * 100}%`,
-              transition: {
-                duration: animationDuration / 1000,
-                ease: 'linear',
-              },
-            }}
-            className="fixed left-0 top-0 z-[1042] h-[3px] w-full rounded-r-full bg-primary"
-          >
-            <div
-              className="absolute right-0 block h-full w-[100px] translate-y-[-4px] rotate-3 opacity-100"
-              style={{
-                boxShadow:
-                  '0 0 10px rgb(var(--primary)), 0 0 5px rgb(var(--primary))',
-              }}
-            />
-          </m.div>
+          {children}
         </m.div>
       )}
     </AnimatePresence>
   );
 }
+
+function Bar(props: {animationDuration: number; progress: number}) {
+  const {animationDuration, progress} = props;
+  const marginLeft = `${(-1 + progress) * 100}%`;
+
+  return (
+    <m.div
+      className="fixed left-0 top-0 z-[1041] h-[3px] w-full rounded-r-full bg-primary"
+      style={{
+        marginLeft,
+        transition: `margin-left ${animationDuration}ms linear`,
+      }}
+    >
+      <div
+        className="absolute right-0 block h-full w-[100px] translate-y-[-4px] rotate-3 opacity-100"
+        style={{
+          boxShadow:
+            '0 0 10px rgb(var(--primary)), 0 0 5px rgb(var(--primary))',
+        }}
+      />
+    </m.div>
+  );
+}
diff --git a/app/components/navigation/MobileNavigation.tsx b/app/components/navigation/MobileNavigation.tsx
index a9d1e96..bddf5fd 100644
--- a/app/components/navigation/MobileNavigation.tsx
+++ b/app/components/navigation/MobileNavigation.tsx
@@ -17,6 +17,10 @@ import {
   DrawerTrigger,
 } from '../ui/Drawer';
 
+const mobileMenuLinkClass = cn(
+  'flex rounded-md px-3 py-2 items-center gap-2 w-full transition-colors hover:bg-accent hover:text-accent-foreground',
+);
+
 export function MobileNavigation(props: {data?: NavigationProps}) {
   const [open, setOpen] = useState(false);
   const device = useDevice();
@@ -41,9 +45,11 @@ export function MobileNavigation(props: {data?: NavigationProps}) {
             props.data?.map((item) => (
               <li key={item._key}>
                 {item._type === 'internalLink' && (
-                  <div onClick={handleClose}>
-                    <SanityInternalLink data={item} />
-                  </div>
+                  <SanityInternalLink
+                    className={mobileMenuLinkClass}
+                    data={item}
+                    onClick={handleClose}
+                  />
                 )}
                 {item._type === 'externalLink' && (
                   <div onClick={handleClose}>
@@ -77,7 +83,7 @@ function MobileNavigationContent(props: {
       onOpenAutoFocus={(e) => e.preventDefault()}
     >
       <nav className="mt-4 flex h-full flex-col gap-0 p-6">
-        <ul className="flex flex-1 flex-col gap-4 overflow-x-hidden overflow-y-scroll pb-6 text-xl font-medium">
+        <ul className="flex flex-1 flex-col gap-2 overflow-x-hidden overflow-y-scroll pb-6 text-xl font-medium">
           {props.children}
         </ul>
       </nav>
@@ -107,7 +113,7 @@ function MobileNavigationNested(props: {
       onOpenChange={setOpen}
       open={open}
     >
-      <DrawerTrigger className="flex items-center gap-2">
+      <DrawerTrigger className={mobileMenuLinkClass}>
         {data.name}
         <span>
           <IconChevron className="size-5" direction="right" />
@@ -122,11 +128,18 @@ function MobileNavigationNested(props: {
         {childLinks &&
           childLinks.length > 0 &&
           childLinks.map((child) => (
-            <li key={child._key} onClick={handleClose}>
+            <li key={child._key}>
               {child._type === 'internalLink' ? (
-                <SanityInternalLink data={child} />
+                <SanityInternalLink
+                  className={mobileMenuLinkClass}
+                  data={child}
+                  onClick={handleClose}
+                />
               ) : child._type === 'externalLink' ? (
-                <SanityExternalLink data={child} />
+                <SanityExternalLink
+                  className={mobileMenuLinkClass}
+                  data={child}
+                />
               ) : null}
             </li>
           ))}
@@ -135,6 +148,7 @@ function MobileNavigationNested(props: {
   ) : data.link && data.name && (!childLinks || childLinks.length === 0) ? (
     // Render internal link if no child links
     <SanityInternalLink
+      className={mobileMenuLinkClass}
       data={{
         _key: data._key,
         _type: 'internalLink',
@@ -142,6 +156,7 @@ function MobileNavigationNested(props: {
         link: data.link,
         name: data.name,
       }}
+      onClick={handleClose}
     >
       {data.name}
     </SanityInternalLink>
diff --git a/app/components/product/VariantSelector.tsx b/app/components/product/VariantSelector.tsx
index 10a2b3e..6541ee2 100644
--- a/app/components/product/VariantSelector.tsx
+++ b/app/components/product/VariantSelector.tsx
@@ -170,6 +170,7 @@ function Pills(props: {
           )}
           <m.span
             className="inline-flex h-8 select-none items-center justify-center whitespace-nowrap px-3 py-1.5"
+            tabIndex={-1}
             whileTap={{scale: 0.9}}
           >
             {value}
diff --git a/app/components/sanity/link/SanityInternalLink.tsx b/app/components/sanity/link/SanityInternalLink.tsx
index d1ddcf2..668a848 100644
--- a/app/components/sanity/link/SanityInternalLink.tsx
+++ b/app/components/sanity/link/SanityInternalLink.tsx
@@ -1,3 +1,4 @@
+import type {LinkProps} from '@remix-run/react';
 import type {TypeFromSelection} from 'groqd';
 
 import {Link} from '@remix-run/react';
@@ -14,6 +15,7 @@ export function SanityInternalLink(props: {
   children?: React.ReactNode;
   className?: string;
   data?: SanityInternalLinkProps;
+  onClick?: () => void;
 }) {
   const locale = useLocale();
   const {children, className, data} = props;
@@ -53,6 +55,7 @@ export function SanityInternalLink(props: {
         'focus-visible:rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
         className,
       ])}
+      onClick={props.onClick}
       prefetch="intent"
       to={url}
     >