diff --git a/package.json b/package.json
index 6a789f5..827a11c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ui",
-	"version": "6.4.73",
+	"version": "6.4.74",
 	"license": "BUSL-1.1",
 	"private": true,
 	"packageManager": "pnpm@9.15.5",
diff --git a/src/lib/components/ui/button/index.ts b/src/lib/components/ui/button/index.ts
index e24beac..2786b20 100644
--- a/src/lib/components/ui/button/index.ts
+++ b/src/lib/components/ui/button/index.ts
@@ -8,7 +8,7 @@ const buttonVariants = tv({
   base: 'focus-visible:ring-ring inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 disabled:pointer-events-none disabled:opacity-50',
   variants: {
     variant: {
-      default: 'bg-primary text-primary-foreground select:bg-primary/70 shadow',
+      default: 'bg-primary text-primary-foreground select:bg-neutral-500 shadow',
       destructive: 'bg-destructive text-destructive-foreground select:bg-destructive/90 shadow-sm',
       outline: 'border-input bg-background select:bg-accent select:text-accent-foreground border shadow-sm',
       secondary: 'bg-secondary text-secondary-foreground select:bg-secondary/70 shadow-sm',
diff --git a/src/lib/modules/navigate.ts b/src/lib/modules/navigate.ts
index bb4ca40..9427b69 100644
--- a/src/lib/modules/navigate.ts
+++ b/src/lib/modules/navigate.ts
@@ -160,7 +160,7 @@ function getDistance (anchor: ElementPosition, relative: ElementPosition) {
  * Gets keyboard-focusable elements within a specified element.
  */
 function getKeyboardFocusableElements (element: Element = document.body) {
-  return [...element.querySelectorAll<HTMLElement>('a[href], button:not([disabled], [tabindex="-1"]), fieldset:not([disabled]), input:not([disabled], [readonly]), optgroup:not([disabled]), option:not([disabled]), select:not([disabled]), textarea:not([disabled]), details, [tabindex]:not([tabindex="-1"], [disabled]), [contenteditable], [controls]')].filter(
+  return [...element.querySelectorAll<HTMLElement>('a[href]:not([disabled], [tabindex="-1"]), button:not([disabled], [tabindex="-1"]), fieldset:not([disabled]), input:not([disabled], [readonly]), optgroup:not([disabled]), option:not([disabled]), select:not([disabled]), textarea:not([disabled]), details, [tabindex]:not([tabindex="-1"], [disabled]), [contenteditable], [controls]')].filter(
     el => !el.getAttribute('aria-hidden')
   )
 }
diff --git a/src/routes/setup/+page.svelte b/src/routes/setup/+page.svelte
index 5c5db09..c2f817a 100644
--- a/src/routes/setup/+page.svelte
+++ b/src/routes/setup/+page.svelte
@@ -22,8 +22,8 @@
   <div class='flex items-center space-x-2 pt-12 pb-3'>
     <Checkbox id='terms' bind:checked />
     <Label for='terms' class='text-md font-medium leading-none text-muted-foreground'>
-      I agree to the <a use:click={() => native.openURL(`${WEB_URL}/terms`)} class='text-primary underline'>Terms of Service</a> and <a use:click={() => native.openURL(`${WEB_URL}/privacy`)} class='text-primary underline'>Privacy Policy</a>
+      I agree to the<a use:click={() => native.openURL(`${WEB_URL}/terms`)} class='text-primary underline p-2'>Terms of Service</a>and<a use:click={() => native.openURL(`${WEB_URL}/privacy`)} class='text-primary underline p-2'>Privacy Policy</a>
     </Label>
   </div>
-  <Button class='text-lg font-bold shrink-0' disabled={!checked} size='lg' href={checked ? './storage' : undefined} data-sveltekit-replacestate>Start Setup</Button>
+  <Button class='text-lg font-bold shrink-0' disabled={!checked} size='lg' href={checked ? './storage' : undefined} data-sveltekit-replacestate>{!checked ? 'Accept terms to continue' : 'Start Setup'}</Button>
 </div>
diff --git a/src/routes/setup/Footer.svelte b/src/routes/setup/Footer.svelte
index 19464f9..a45ef7a 100644
--- a/src/routes/setup/Footer.svelte
+++ b/src/routes/setup/Footer.svelte
@@ -71,7 +71,7 @@
   {#await settled}
     <Tooltip.Root>
       <Tooltip.Trigger let:builder>
-        <Button builders={[builder]} class='font-semibold w-24 !pointer-events-auto cursor-wait' disabled id='setup-next-button' data-left='#setup-prev-button'>Next</Button>
+        <Button builders={[builder]} class='font-semibold !pointer-events-auto cursor-wait' disabled id='setup-next-button' data-left='#setup-prev-button'>Waiting for checks...</Button>
       </Tooltip.Trigger>
       <Tooltip.Content>
         <p>Wait for all checks to settle</p>
diff --git a/src/routes/setup/Progress.svelte b/src/routes/setup/Progress.svelte
index f16135d..7e3932a 100644
--- a/src/routes/setup/Progress.svelte
+++ b/src/routes/setup/Progress.svelte
@@ -16,19 +16,19 @@
       <div class='bg-white w-full h-full transform-gpu' style:--tw-translate-x='-{STEP_PERCENTAGE[step]}%' />
     </div>
     <div class='w-20 flex flex-col items-center z-10 shrink-0'>
-      <Badge class='w-12 h-12 rounded-[50%] flex justify-center' href='../storage/'><HardDrive /></Badge>
+      <Badge class='w-12 h-12 rounded-[50%] flex justify-center' href='../storage/' tabindex='-1'><HardDrive /></Badge>
       <div class='mt-3 font-bold'>
         Storage
       </div>
     </div>
     <div class='w-20 flex flex-col items-center z-10 shrink-0 {step > 0 ? 'text-white' : 'text-muted-foreground'}'>
-      <Badge variant={step > 0 ? 'default' : 'secondary'} class='w-12 h-12 rounded-[50%] flex justify-center {step > 0 ? 'text-black' : 'text-muted-foreground'}' href={step > 1 ? '../network/' : undefined}><Network /></Badge>
+      <Badge variant={step > 0 ? 'default' : 'secondary'} class='w-12 h-12 rounded-[50%] flex justify-center {step > 0 ? 'text-black' : 'text-muted-foreground'}' href={step > 1 ? '../network/' : undefined} tabindex='-1'><Network /></Badge>
       <div class='mt-3 font-bold'>
         Network
       </div>
     </div>
     <div class='w-20 flex flex-col items-center z-10 shrink-0 {step > 1 ? 'text-white' : 'text-muted-foreground'}'>
-      <Badge variant={step > 1 ? 'default' : 'secondary'} class='w-12 h-12 rounded-[50%] flex justify-center {step > 1 ? 'text-black' : 'text-muted-foreground'}'><Puzzle /></Badge>
+      <Badge variant={step > 1 ? 'default' : 'secondary'} class='w-12 h-12 rounded-[50%] flex justify-center {step > 1 ? 'text-black' : 'text-muted-foreground'}' tabindex='-1'><Puzzle /></Badge>
       <div class='mt-3 font-bold'>
         Extensions
       </div>