diff --git a/components/docs/generated/previews.ts b/components/docs/generated/previews.ts
index daaff9f0..73142dd2 100644
--- a/components/docs/generated/previews.ts
+++ b/components/docs/generated/previews.ts
@@ -2,7 +2,7 @@
 // This file is autogenerated by scripts/create-pr-content.ts.
 // Do not edit this file directly.
 
-import React from 'react'
+import React from 'react';
 
 export const previews: Record<string, any> = {
   "date-and-time/date-field-demo": {
diff --git a/components/ui/field.tsx b/components/ui/field.tsx
index 4cbfe457..c51ae42e 100644
--- a/components/ui/field.tsx
+++ b/components/ui/field.tsx
@@ -1,16 +1,24 @@
-'use client';
-
-import * as React from 'react';
-
-
-
-import { FieldError as FieldErrorPrimitive, type FieldErrorProps, Group, type GroupProps, Input as InputPrimitive, type InputProps, Label as LabelPrimitive, type LabelProps, Text, type TextFieldProps as TextFieldPrimitiveProps, type TextProps, type ValidationResult } from 'react-aria-components';
-import { tv } from 'tailwind-variants';
-
-
-
-import { cr, ctr } from './primitive';
-
+"use client"
+
+import * as React from "react"
+
+import {
+  FieldError as FieldErrorPrimitive,
+  type FieldErrorProps,
+  Group,
+  type GroupProps,
+  Input as InputPrimitive,
+  type InputProps,
+  Label as LabelPrimitive,
+  type LabelProps,
+  Text,
+  type TextFieldProps as TextFieldPrimitiveProps,
+  type TextProps,
+  type ValidationResult
+} from "react-aria-components"
+import { tv } from "tailwind-variants"
+
+import { cr, ctr } from "./primitive"
 
 // primitive styles
 
diff --git a/components/ui/menu.tsx b/components/ui/menu.tsx
index 488d946a..ec774012 100644
--- a/components/ui/menu.tsx
+++ b/components/ui/menu.tsx
@@ -117,7 +117,7 @@ const Item = ({ className, isDanger = false, children, ...props }: MenuItemProps
       className={cr(className, (className, renderProps) =>
         dropdownItemStyles({
           ...renderProps,
-          className
+          className: cn("pl-2.5", className)
         })
       )}
       data-danger={isDanger ? "true" : undefined}
@@ -174,7 +174,7 @@ const Radio = ({ className, children, ...props }: MenuItemProps) => (
     {(values) => (
       <>
         {values.isSelected && (
-          <span className="absolute left-3.5 flex size-[0.650rem] items-center animate-in justify-center">
+          <span className="absolute left-3 flex size-[0.650rem] items-center animate-in justify-center">
             <IconBulletFill className="size-[0.650rem]" />
           </span>
         )}
diff --git a/components/ui/popover.tsx b/components/ui/popover.tsx
index 46eb8d51..5ae42b2d 100644
--- a/components/ui/popover.tsx
+++ b/components/ui/popover.tsx
@@ -110,8 +110,8 @@ const Content = ({
   const isMenuTrigger = popoverContext?.trigger === "MenuTrigger"
   const isSubmenuTrigger = popoverContext?.trigger === "SubmenuTrigger"
   const isMenu = isMenuTrigger || isSubmenuTrigger
-  let offset = showArrow ? 12 : 8
-  offset = isSubmenuTrigger ? offset - 6 : offset
+  const offset = showArrow ? 12 : 8
+  const effectiveOffset = isSubmenuTrigger ? offset - 5 : offset
   return isMobile && respectScreen ? (
     <ModalOverlay
       className={twJoin(
@@ -136,7 +136,7 @@ const Content = ({
     </ModalOverlay>
   ) : (
     <PopoverPrimitive
-      offset={offset}
+      offset={effectiveOffset}
       {...props}
       className={cr(className, (className, renderProps) =>
         popoverContentStyles({