diff --git a/apps/web/src/components/ActivityFeed.tsx b/apps/web/src/components/ActivityFeed.tsx
index 59849fd..e02a8e2 100644
--- a/apps/web/src/components/ActivityFeed.tsx
+++ b/apps/web/src/components/ActivityFeed.tsx
@@ -241,7 +241,7 @@ export function ActivityFeed({typeFilter, dateRangeDays = 30, contactId}: Activi
         <div className="space-y-4">
           {upcomingActivities.map((activity, index) => (
             <div key={`${activity.id}-${index}`}>
-              <ActivityItem activity={activity} isUpcoming={true} />
+              <ActivityItem activity={activity} status="upcoming" />
               {index < upcomingActivities.length - 1 && <div className="border-t border-neutral-100 my-4" />}
             </div>
           ))}
diff --git a/apps/web/src/components/ActivityItem.tsx b/apps/web/src/components/ActivityItem.tsx
index dbd5aca..c817bda 100644
--- a/apps/web/src/components/ActivityItem.tsx
+++ b/apps/web/src/components/ActivityItem.tsx
@@ -110,7 +110,7 @@ function isEmailActivity(type: string): boolean {
 
 interface ActivityItemProps {
   activity: Activity;
-  isUpcoming?: boolean;
+  status?: 'upcoming' | 'completed';
 }
 
 interface ActivityConfig {
@@ -342,11 +342,12 @@ function getActivityConfig(activity: Activity): ActivityConfig {
   }
 }
 
-export const ActivityItem = memo(function ActivityItem({activity, isUpcoming = false}: ActivityItemProps) {
+export const ActivityItem = memo(function ActivityItem({activity, status = 'completed'}: ActivityItemProps) {
   const [showPreviewModal, setShowPreviewModal] = useState(false);
   const config = getActivityConfig(activity);
   const Icon = config.icon;
   const timestamp = new Date(activity.timestamp);
+  const isUpcoming = status === 'upcoming';
   const relativeTime = isUpcoming ? getUpcomingTime(timestamp) : getRelativeTime(timestamp);
 
   return (
diff --git a/apps/web/src/components/ApiKeyDisplay.tsx b/apps/web/src/components/ApiKeyDisplay.tsx
index 5cc98b7..aaffc52 100644
--- a/apps/web/src/components/ApiKeyDisplay.tsx
+++ b/apps/web/src/components/ApiKeyDisplay.tsx
@@ -9,7 +9,6 @@ interface ApiKeyDisplayProps {
   description?: string;
   isSecret?: boolean;
   onRegenerate?: () => Promise<void>;
-  showRegenerate?: boolean;
 }
 
 export function ApiKeyDisplay({
@@ -18,7 +17,6 @@ export function ApiKeyDisplay({
   description,
   isSecret = false,
   onRegenerate,
-  showRegenerate = false,
 }: ApiKeyDisplayProps) {
   const [showKey, setShowKey] = useState(!isSecret);
   const [copied, setCopied] = useState(false);
@@ -101,7 +99,7 @@ export function ApiKeyDisplay({
               )}
             </AnimatePresence>
           </Button>
-          {showRegenerate && onRegenerate && (
+          {onRegenerate && (
             <Button
               type="button"
               variant="outline"
diff --git a/apps/web/src/components/BillingLimits.tsx b/apps/web/src/components/BillingLimits.tsx
index 48e52ab..84dea49 100644
--- a/apps/web/src/components/BillingLimits.tsx
+++ b/apps/web/src/components/BillingLimits.tsx
@@ -59,13 +59,13 @@ const formatEmailCost = (emailCount: number, currency: string | null): string =>
 
 interface BillingLimitsProps {
   projectId: string;
-  hasSubscription: boolean;
+  tier: 'free' | 'paid';
   billingEnabled: boolean;
 }
 
 type LimitsFormValues = z.infer<typeof BillingLimitSchemas.update>;
 
-export function BillingLimits({projectId, hasSubscription, billingEnabled}: BillingLimitsProps) {
+export function BillingLimits({projectId, tier, billingEnabled}: BillingLimitsProps) {
   const [isEditing, setIsEditing] = useState(false);
   const [successMessage, setSuccessMessage] = useState<string | null>(null);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
@@ -132,7 +132,7 @@ export function BillingLimits({projectId, hasSubscription, billingEnabled}: Bill
   };
 
   // Free tier projects can view their usage but can't edit limits
-  const canEditLimits = hasSubscription;
+  const canEditLimits = tier === 'paid';
 
   // If billing is not enabled, don't show the component
   if (!billingEnabled) {
@@ -160,7 +160,7 @@ export function BillingLimits({projectId, hasSubscription, billingEnabled}: Bill
       <CardHeader>
         <CardTitle>Billing Limits</CardTitle>
         <CardDescription>
-          {hasSubscription
+          {tier === 'paid'
             ? 'Set monthly limits for each email category. Limits reset on the 1st of each month.'
             : 'Free tier projects have a total limit of 1,000 emails per month across all categories.'}
         </CardDescription>
@@ -168,7 +168,7 @@ export function BillingLimits({projectId, hasSubscription, billingEnabled}: Bill
       <CardContent>
         <div className="space-y-6">
           {/* Free tier info banner */}
-          {!hasSubscription && limitsData && (
+          {tier !== 'paid' && limitsData && (
             <Alert>
               <AlertCircle className="h-4 w-4" />
               <div className="ml-2">
@@ -208,7 +208,7 @@ export function BillingLimits({projectId, hasSubscription, billingEnabled}: Bill
           {!isEditing && limitsData && (
             <div className="space-y-4">
               {/* For free tier, show total usage across all categories */}
-              {!hasSubscription ? (
+              {tier !== 'paid' ? (
                 <UsageDisplay
                   category="Total Emails (All Categories)"
                   usage={limitsData.workflows}
diff --git a/apps/web/src/components/EmailEditor/EmailEditor.tsx b/apps/web/src/components/EmailEditor/EmailEditor.tsx
index 36dd2cf..d7f80c9 100644
--- a/apps/web/src/components/EmailEditor/EmailEditor.tsx
+++ b/apps/web/src/components/EmailEditor/EmailEditor.tsx
@@ -76,7 +76,6 @@ export function EmailEditor({value, onChange, placeholder, subject, from, replyT
   // Fetch contacts for preview using SWR
   const {contacts} = useContacts({limit: 50});
 
-  // Update available variables when fields change
   useEffect(() => {
     if (availableFields.length > 0) {
       setAvailableVariables(availableFields);
diff --git a/apps/web/src/components/EmailSettings.tsx b/apps/web/src/components/EmailSettings.tsx
index 9d1f68d..a7a3588 100644
--- a/apps/web/src/components/EmailSettings.tsx
+++ b/apps/web/src/components/EmailSettings.tsx
@@ -11,14 +11,9 @@ interface EmailSettingsProps {
   fromPlaceholder?: string;
   fromNamePlaceholder?: string;
   replyToPlaceholder?: string;
-  showFromNameHelpText?: boolean;
   layout?: 'vertical' | 'grid';
 }
 
-/**
- * Reusable email settings component for from, fromName, and replyTo fields
- * Used in campaign and template forms
- */
 export function EmailSettings({
   from,
   fromName,
@@ -29,7 +24,6 @@ export function EmailSettings({
   fromPlaceholder = 'hello',
   fromNamePlaceholder = 'Your Company',
   replyToPlaceholder,
-  showFromNameHelpText = false,
   layout = 'grid',
 }: EmailSettingsProps) {
   // Use from email's local part as the reply-to placeholder if not provided
@@ -63,11 +57,9 @@ export function EmailSettings({
             onChange={e => onFromNameChange(e.target.value)}
             placeholder={fromNamePlaceholder}
           />
-          {showFromNameHelpText && (
-            <p className="text-xs text-neutral-500 mt-1">
-              The sender name that appears in the recipient&apos;s inbox. Defaults to your project name if not set.
-            </p>
-          )}
+          <p className="text-xs text-neutral-500 mt-1">
+            The sender name that appears in the recipient&apos;s inbox. Defaults to your project name if not set.
+          </p>
         </div>
       </GridWrapper>
 
diff --git a/apps/web/src/lib/contexts/ActiveProjectProvider.tsx b/apps/web/src/lib/contexts/ActiveProjectProvider.tsx
index 9f9c3fb..5be260c 100644
--- a/apps/web/src/lib/contexts/ActiveProjectProvider.tsx
+++ b/apps/web/src/lib/contexts/ActiveProjectProvider.tsx
@@ -1,5 +1,5 @@
 import type {Project} from '@plunk/db';
-import {createContext, type ReactNode, useContext, useEffect, useState} from 'react';
+import {createContext, type ReactNode, use, useEffect, useState} from 'react';
 import {useSWRConfig} from 'swr';
 
 import {useProjects} from '../hooks/useProject';
@@ -74,7 +74,7 @@ export function ActiveProjectProvider({children}: {children: ReactNode}) {
 }
 
 export function useActiveProject() {
-  const context = useContext(ActiveProjectContext);
+  const context = use(ActiveProjectContext);
   if (context === undefined) {
     throw new Error('useActiveProject must be used within an ActiveProjectProvider');
   }
diff --git a/apps/web/src/pages/campaigns/[id].tsx b/apps/web/src/pages/campaigns/[id].tsx
index fb0a382..adf65fd 100644
--- a/apps/web/src/pages/campaigns/[id].tsx
+++ b/apps/web/src/pages/campaigns/[id].tsx
@@ -106,14 +106,18 @@ export default function CampaignDetailsPage() {
   );
 
   const [editedCampaign, setEditedCampaign] = useState<Partial<Campaign>>({});
-  const [isScheduleDialogOpen, setIsScheduleDialogOpen] = useState(false);
   const [scheduledDateTime, setScheduledDateTime] = useState('');
-  const [isTestEmailDialogOpen, setIsTestEmailDialogOpen] = useState(false);
   const [testEmailAddress, setTestEmailAddress] = useState('');
-  const [sendingTestEmail, setSendingTestEmail] = useState(false);
-  const [showCancelDialog, setShowCancelDialog] = useState(false);
-  const [showSendDialog, setShowSendDialog] = useState(false);
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+
+  type CampaignDialog =
+    | {type: 'none'}
+    | {type: 'schedule'}
+    | {type: 'testEmail'; sending: boolean}
+    | {type: 'send'}
+    | {type: 'cancel'}
+    | {type: 'delete'};
+
+  const [dialog, setDialog] = useState<CampaignDialog>({type: 'none'});
 
   // Automatically initialize edit fields when campaign is loaded and is a draft
   const isEditMode = campaign?.data.status === CampaignStatus.DRAFT;
@@ -172,7 +176,7 @@ export default function CampaignDetailsPage() {
       // Show confirmation with user's local time
       const localTimeString = formatFullDateTime(scheduledDate);
       toast.success(`Campaign scheduled for ${localTimeString}`);
-      setIsScheduleDialogOpen(false);
+      setDialog({type: 'none'});
       setScheduledDateTime('');
       void mutate();
     } catch (error) {
@@ -186,7 +190,7 @@ export default function CampaignDetailsPage() {
       return;
     }
 
-    setSendingTestEmail(true);
+    setDialog({type: 'testEmail', sending: true});
 
     try {
       await network.fetch<{success: boolean; message: string}>('POST', `/campaigns/${id}/test`, {
@@ -194,12 +198,12 @@ export default function CampaignDetailsPage() {
       } as any);
 
       toast.success(`Test email sent to ${testEmailAddress}`);
-      setIsTestEmailDialogOpen(false);
+      setDialog({type: 'none'});
       setTestEmailAddress('');
     } catch (error) {
       toast.error(error instanceof Error ? error.message : 'Failed to send test email');
     } finally {
-      setSendingTestEmail(false);
+      setDialog(d => (d.type === 'testEmail' ? {type: 'testEmail', sending: false} : d));
     }
   };
 
@@ -370,7 +374,7 @@ export default function CampaignDetailsPage() {
                 <Button
                   type="button"
                   variant="destructive"
-                  onClick={() => setShowDeleteDialog(true)}
+                  onClick={() => setDialog({type: 'delete'})}
                   className="flex-1 sm:flex-none"
                 >
                   <Trash2 className="h-4 w-4" />
@@ -395,7 +399,7 @@ export default function CampaignDetailsPage() {
                     </Button>
                   </DropdownMenuTrigger>
                   <DropdownMenuContent align="end" className="w-72">
-                    <DropdownMenuItem onClick={() => setIsTestEmailDialogOpen(true)} className="py-3 cursor-pointer">
+                    <DropdownMenuItem onClick={() => setDialog({type: 'testEmail', sending: false})} className="py-3 cursor-pointer">
                       <div className="flex items-start gap-3">
                         <TestTube className="h-4 w-4 mt-0.5 text-neutral-700" />
                         <div className="flex flex-col gap-0.5 flex-1">
@@ -406,7 +410,7 @@ export default function CampaignDetailsPage() {
                         </div>
                       </div>
                     </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setShowSendDialog(true)} className="py-3 cursor-pointer">
+                    <DropdownMenuItem onClick={() => setDialog({type: 'send'})} className="py-3 cursor-pointer">
                       <div className="flex items-start gap-3">
                         <Send className="h-4 w-4 mt-0.5 text-neutral-700" />
                         <div className="flex flex-col gap-0.5 flex-1">
@@ -417,7 +421,7 @@ export default function CampaignDetailsPage() {
                         </div>
                       </div>
                     </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => setIsScheduleDialogOpen(true)} className="py-3 cursor-pointer">
+                    <DropdownMenuItem onClick={() => setDialog({type: 'schedule'})} className="py-3 cursor-pointer">
                       <div className="flex items-start gap-3">
                         <Calendar className="h-4 w-4 mt-0.5 text-neutral-700" />
                         <div className="flex flex-col gap-0.5 flex-1">
@@ -531,7 +535,6 @@ export default function CampaignDetailsPage() {
                   onFromNameChange={value => setEditedCampaign({...editedCampaign, fromName: value})}
                   onReplyToChange={value => setEditedCampaign({...editedCampaign, replyTo: value})}
                   fromNamePlaceholder={activeProject?.name || 'Your Company'}
-                  showFromNameHelpText
                   layout="vertical"
                 />
               </CardContent>
@@ -658,7 +661,7 @@ export default function CampaignDetailsPage() {
           </Card>
 
           {/* Test Email Dialog */}
-          <Dialog open={isTestEmailDialogOpen} onOpenChange={setIsTestEmailDialogOpen}>
+          <Dialog open={dialog.type === 'testEmail'} onOpenChange={open => !open && setDialog({type: 'none'})}>
             <DialogContent className="sm:max-w-lg">
               <DialogHeader>
                 <DialogTitle>Send Test Email</DialogTitle>
@@ -695,21 +698,25 @@ export default function CampaignDetailsPage() {
                   type="button"
                   variant="outline"
                   onClick={() => {
-                    setIsTestEmailDialogOpen(false);
+                    setDialog({type: 'none'});
                     setTestEmailAddress('');
                   }}
                 >
                   Cancel
                 </Button>
-                <Button type="button" onClick={handleSendTestEmail} disabled={sendingTestEmail || !testEmailAddress}>
-                  {sendingTestEmail ? 'Sending...' : 'Send Test Email'}
+                <Button
+                  type="button"
+                  onClick={handleSendTestEmail}
+                  disabled={(dialog.type === 'testEmail' && dialog.sending) || !testEmailAddress}
+                >
+                  {dialog.type === 'testEmail' && dialog.sending ? 'Sending...' : 'Send Test Email'}
                 </Button>
               </DialogFooter>
             </DialogContent>
           </Dialog>
 
           {/* Schedule Dialog */}
-          <Dialog open={isScheduleDialogOpen} onOpenChange={setIsScheduleDialogOpen}>
+          <Dialog open={dialog.type === 'schedule'} onOpenChange={open => !open && setDialog({type: 'none'})}>
             <DialogContent className="sm:max-w-lg">
               <DialogHeader>
                 <DialogTitle>Schedule Campaign</DialogTitle>
@@ -801,7 +808,7 @@ export default function CampaignDetailsPage() {
                   type="button"
                   variant="outline"
                   onClick={() => {
-                    setIsScheduleDialogOpen(false);
+                    setDialog({type: 'none'});
                     setScheduledDateTime('');
                   }}
                 >
@@ -816,11 +823,11 @@ export default function CampaignDetailsPage() {
         </form>
 
         {/* Sticky Save Bar */}
-        <StickySaveBar hasChanges={hasChanges} isSubmitting={isSubmitting} onSave={handleSave} />
+        <StickySaveBar status={isSubmitting ? 'saving' : hasChanges ? 'dirty' : 'idle'} onSave={handleSave} />
 
         <ConfirmDialog
-          open={showSendDialog}
-          onOpenChange={setShowSendDialog}
+          open={dialog.type === 'send'}
+          onOpenChange={open => !open && setDialog({type: 'none'})}
           onConfirm={handleSend}
           title="Send Campaign"
           description="Are you sure you want to send this campaign now? This action cannot be undone."
@@ -829,8 +836,8 @@ export default function CampaignDetailsPage() {
         />
 
         <ConfirmDialog
-          open={showDeleteDialog}
-          onOpenChange={setShowDeleteDialog}
+          open={dialog.type === 'delete'}
+          onOpenChange={open => !open && setDialog({type: 'none'})}
           onConfirm={handleDelete}
           title="Delete Campaign"
           description="Are you sure you want to delete this draft campaign? This action cannot be undone."
@@ -864,7 +871,7 @@ export default function CampaignDetailsPage() {
           {/* Actions */}
           {(c.status === CampaignStatus.SCHEDULED || c.status === CampaignStatus.SENDING) && (
             <div className="flex justify-end">
-              <Button variant="destructive" onClick={() => setShowCancelDialog(true)} className="w-full sm:w-auto">
+              <Button variant="destructive" onClick={() => setDialog({type: 'cancel'})} className="w-full sm:w-auto">
                 <XCircle className="h-4 w-4" />
                 <span className="hidden sm:inline">Cancel Campaign</span>
                 <span className="sm:hidden">Cancel</span>
@@ -1069,8 +1076,8 @@ export default function CampaignDetailsPage() {
       </div>
 
       <ConfirmDialog
-        open={showCancelDialog}
-        onOpenChange={setShowCancelDialog}
+        open={dialog.type === 'cancel'}
+        onOpenChange={open => !open && setDialog({type: 'none'})}
         onConfirm={handleCancel}
         title="Cancel Campaign"
         description="Are you sure you want to cancel this campaign?"
diff --git a/apps/web/src/pages/settings/index.tsx b/apps/web/src/pages/settings/index.tsx
index f93e107..47497b6 100644
--- a/apps/web/src/pages/settings/index.tsx
+++ b/apps/web/src/pages/settings/index.tsx
@@ -92,11 +92,11 @@ export default function Settings() {
   const {data: user} = useUser();
   const [successMessage, setSuccessMessage] = useState<string | null>(null);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [showRegenerateDialog, setShowRegenerateDialog] = useState(false);
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-  const [showResetDialog, setShowResetDialog] = useState(false);
   const [deleteConfirmText, setDeleteConfirmText] = useState('');
   const [resetConfirmText, setResetConfirmText] = useState('');
+
+  type SettingsDialog = {type: 'none'} | {type: 'regenerate'} | {type: 'delete'} | {type: 'reset'};
+  const [dialog, setDialog] = useState<SettingsDialog>({type: 'none'});
   const [isLoadingBilling, setIsLoadingBilling] = useState(false);
   const [selectedCurrency, setSelectedCurrency] = useState<string>('auto');
   const [showCurrencySelector, setShowCurrencySelector] = useState(false);
@@ -235,18 +235,18 @@ export default function Settings() {
       await projectsMutate();
 
       setSuccessMessage('API keys regenerated successfully');
-      setShowRegenerateDialog(false);
+      setDialog({type: 'none'});
 
       // Clear success message after 3 seconds
       setTimeout(() => setSuccessMessage(null), 3000);
     } catch (error) {
       setErrorMessage(error instanceof Error ? error.message : 'Failed to regenerate API keys');
-      setShowRegenerateDialog(false);
+      setDialog({type: 'none'});
     }
   };
 
   const promptRegenerateKeys = () => {
-    setShowRegenerateDialog(true);
+    setDialog({type: 'regenerate'});
   };
 
   const handleStartSubscription = async (currency: string = 'auto') => {
@@ -314,7 +314,7 @@ export default function Settings() {
       await network.fetch('POST', `/users/@me/projects/${activeProject.id}/reset`);
 
       setSuccessMessage('Project reset successfully. All data has been cleared.');
-      setShowResetDialog(false);
+      setDialog({type: 'none'});
       setResetConfirmText('');
 
       // Refresh the page to reload data
@@ -323,7 +323,7 @@ export default function Settings() {
       }, 1500);
     } catch (error) {
       setErrorMessage(error instanceof Error ? error.message : 'Failed to reset project');
-      setShowResetDialog(false);
+      setDialog({type: 'none'});
       setResetConfirmText('');
     }
   };
@@ -338,7 +338,7 @@ export default function Settings() {
       await network.fetch('DELETE', `/users/@me/projects/${activeProject.id}`);
 
       setSuccessMessage('Project deleted successfully. Redirecting...');
-      setShowDeleteDialog(false);
+      setDialog({type: 'none'});
       setDeleteConfirmText('');
 
       // Refresh projects list and redirect to dashboard
@@ -350,7 +350,7 @@ export default function Settings() {
       }, 1500);
     } catch (error) {
       setErrorMessage(error instanceof Error ? error.message : 'Failed to delete project');
-      setShowDeleteDialog(false);
+      setDialog({type: 'none'});
       setDeleteConfirmText('');
     }
   };
@@ -587,7 +587,7 @@ export default function Settings() {
                           <span>API keys, domains, billing information</span>
                         </div>
                       </div>
-                      <Button type="button" variant="outline" onClick={() => setShowResetDialog(true)} className="shrink-0">
+                      <Button type="button" variant="outline" onClick={() => setDialog({type: 'reset'})} className="shrink-0">
                         Reset Data
                       </Button>
                     </div>
@@ -614,7 +614,7 @@ export default function Settings() {
                       <Button
                         type="button"
                         variant="destructive"
-                        onClick={() => setShowDeleteDialog(true)}
+                        onClick={() => setDialog({type: 'delete'})}
                         className="shrink-0"
                       >
                         Delete Project
@@ -753,7 +753,7 @@ export default function Settings() {
                 {/* Billing Limits */}
                 <BillingLimits
                   projectId={activeProject.id}
-                  hasSubscription={!!activeProject.subscription}
+                  tier={activeProject.subscription ? 'paid' : 'free'}
                   billingEnabled={billingEnabled}
                 />
 
@@ -814,7 +814,7 @@ export default function Settings() {
         </div>
 
         {/* Regenerate Keys Confirmation Dialog */}
-        <Dialog open={showRegenerateDialog} onOpenChange={setShowRegenerateDialog}>
+        <Dialog open={dialog.type === 'regenerate'} onOpenChange={open => !open && setDialog({type: 'none'})}>
           <DialogContent>
             <DialogHeader>
               <DialogTitle className="flex items-center gap-2">
@@ -833,7 +833,7 @@ export default function Settings() {
               </DialogDescription>
             </DialogHeader>
             <DialogFooter>
-              <Button variant="outline" onClick={() => setShowRegenerateDialog(false)}>
+              <Button variant="outline" onClick={() => setDialog({type: 'none'})}>
                 Cancel
               </Button>
               <Button variant="destructive" onClick={handleRegenerateKeys}>
@@ -844,7 +844,7 @@ export default function Settings() {
         </Dialog>
 
         {/* Reset Project Confirmation Dialog */}
-        <Dialog open={showResetDialog} onOpenChange={setShowResetDialog}>
+        <Dialog open={dialog.type === 'reset'} onOpenChange={open => !open && setDialog({type: 'none'})}>
           <DialogContent className="sm:max-w-md">
             <DialogHeader className="space-y-3">
               <div className="mx-auto w-12 h-12 bg-amber-100 rounded-full flex items-center justify-center">
@@ -876,7 +876,7 @@ export default function Settings() {
               <Button
                 variant="outline"
                 onClick={() => {
-                  setShowResetDialog(false);
+                  setDialog({type: 'none'});
                   setResetConfirmText('');
                 }}
                 className="w-full"
@@ -896,7 +896,7 @@ export default function Settings() {
         </Dialog>
 
         {/* Delete Project Confirmation Dialog */}
-        <Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+        <Dialog open={dialog.type === 'delete'} onOpenChange={open => !open && setDialog({type: 'none'})}>
           <DialogContent className="sm:max-w-md">
             <DialogHeader className="space-y-3">
               <div className="mx-auto w-12 h-12 bg-red-100 rounded-full flex items-center justify-center">
@@ -934,7 +934,7 @@ export default function Settings() {
               <Button
                 variant="outline"
                 onClick={() => {
-                  setShowDeleteDialog(false);
+                  setDialog({type: 'none'});
                   setDeleteConfirmText('');
                 }}
                 className="w-full"
diff --git a/apps/web/src/pages/templates/[id].tsx b/apps/web/src/pages/templates/[id].tsx
index 7b3de40..1a23cd8 100644
--- a/apps/web/src/pages/templates/[id].tsx
+++ b/apps/web/src/pages/templates/[id].tsx
@@ -21,7 +21,7 @@ import {ArrowLeft, Save, Trash2, TriangleAlert} from 'lucide-react';
 import Link from 'next/link';
 import {NextSeo} from 'next-seo';
 import {useRouter} from 'next/router';
-import {useEffect, useState} from 'react';
+import {useEffect, useMemo, useState} from 'react';
 import {toast} from 'sonner';
 import useSWR from 'swr';
 import {TemplateSchemas, detectUnsubscribeSignal} from '@plunk/shared';
@@ -38,7 +38,6 @@ export default function TemplateEditorPage() {
 
   const [editedTemplate, setEditedTemplate] = useState<Partial<Template>>({});
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [hasChanges, setHasChanges] = useState(false);
   const [showDeleteDialog, setShowDeleteDialog] = useState(false);
 
   // Initialize edit fields when template loads
@@ -54,16 +53,12 @@ export default function TemplateEditorPage() {
         replyTo: template.replyTo || '',
         type: template.type,
       });
-      // Reset hasChanges when loading fresh data
-      setHasChanges(false);
     }
   }, [template, editedTemplate]);
 
-  // Track changes
-  useEffect(() => {
-    if (!template || Object.keys(editedTemplate).length === 0) return;
-
-    const changed =
+  const hasChanges = useMemo(() => {
+    if (!template || Object.keys(editedTemplate).length === 0) return false;
+    return (
       editedTemplate.name !== template.name ||
       (editedTemplate.description || '') !== (template.description || '') ||
       editedTemplate.subject !== template.subject ||
@@ -71,9 +66,8 @@ export default function TemplateEditorPage() {
       editedTemplate.from !== template.from ||
       (editedTemplate.fromName || '') !== (template.fromName || '') ||
       (editedTemplate.replyTo || '') !== (template.replyTo || '') ||
-      editedTemplate.type !== template.type;
-
-    setHasChanges(changed);
+      editedTemplate.type !== template.type
+    );
   }, [editedTemplate, template]);
 
   // Warn before leaving page with unsaved changes
@@ -96,7 +90,6 @@ export default function TemplateEditorPage() {
       });
 
       // Silent save - no toast notification
-      setHasChanges(false);
       void mutate();
     } catch (error) {
       toast.error(error instanceof Error ? error.message : 'Failed to save template');
@@ -267,7 +260,6 @@ export default function TemplateEditorPage() {
                   onFromNameChange={value => setEditedTemplate({...editedTemplate, fromName: value})}
                   onReplyToChange={value => setEditedTemplate({...editedTemplate, replyTo: value})}
                   fromNamePlaceholder={activeProject?.name || 'Your Company'}
-                  showFromNameHelpText
                   layout="vertical"
                 />
               </CardContent>
@@ -290,7 +282,7 @@ export default function TemplateEditorPage() {
       </form>
 
       {/* Sticky Save Bar */}
-      <StickySaveBar hasChanges={hasChanges} isSubmitting={isSubmitting} onSave={handleSave} />
+      <StickySaveBar status={isSubmitting ? 'saving' : hasChanges ? 'dirty' : 'idle'} onSave={handleSave} />
 
       {/* Delete Template Confirmation */}
       <ConfirmDialog
diff --git a/apps/web/src/pages/workflows/[id].tsx b/apps/web/src/pages/workflows/[id].tsx
index 1ffdcf7..5698e93 100644
--- a/apps/web/src/pages/workflows/[id].tsx
+++ b/apps/web/src/pages/workflows/[id].tsx
@@ -74,12 +74,16 @@ export default function WorkflowEditorPage() {
   const router = useRouter();
   const {id} = router.query;
   const [activeTab, setActiveTab] = useState<'builder' | 'executions'>('builder');
-  const [showSettingsDialog, setShowSettingsDialog] = useState(false);
-  const [editingStep, setEditingStep] = useState<WorkflowStep | null>(null);
-  const [showCancelAllDialog, setShowCancelAllDialog] = useState(false);
-  const [executionToCancel, setExecutionToCancel] = useState<string | null>(null);
-  const [isCancelling, setIsCancelling] = useState(false);
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+
+  type WorkflowDialog =
+    | {type: 'none'}
+    | {type: 'settings'}
+    | {type: 'cancelAll'; cancelling: boolean}
+    | {type: 'cancelOne'; executionId: string; cancelling: boolean}
+    | {type: 'editStep'; step: WorkflowStep}
+    | {type: 'delete'};
+
+  const [dialog, setDialog] = useState<WorkflowDialog>({type: 'none'});
 
   const {data: workflow, mutate} = useSWR<WorkflowWithDetails>(id ? `/workflows/${id}` : null, {
     revalidateOnFocus: false,
@@ -106,31 +110,29 @@ export default function WorkflowEditorPage() {
 
   // Handler for cancelling a single execution
   const handleCancelExecution = async (executionId: string) => {
-    setIsCancelling(true);
+    setDialog({type: 'cancelOne', executionId, cancelling: true});
     try {
       await network.fetch('DELETE', `/workflows/${id}/executions/${executionId}`);
       toast.success('Execution cancelled successfully');
+      setDialog({type: 'none'});
       void mutate();
     } catch (error) {
       toast.error(error instanceof Error ? error.message : 'Failed to cancel execution');
-    } finally {
-      setIsCancelling(false);
-      setExecutionToCancel(null);
+      setDialog({type: 'cancelOne', executionId, cancelling: false});
     }
   };
 
   // Handler for cancelling all executions
   const handleCancelAllExecutions = async () => {
-    setIsCancelling(true);
+    setDialog(d => (d.type === 'cancelAll' ? {...d, cancelling: true} : d));
     try {
       const result = await network.fetch<{cancelled: number}>('POST', `/workflows/${id}/executions/cancel-all`);
       toast.success(`Successfully cancelled ${result.cancelled} execution(s)`);
+      setDialog({type: 'none'});
       void mutate();
     } catch (error) {
       toast.error(error instanceof Error ? error.message : 'Failed to cancel executions');
-    } finally {
-      setIsCancelling(false);
-      setShowCancelAllDialog(false);
+      setDialog(d => (d.type === 'cancelAll' ? {...d, cancelling: false} : d));
     }
   };
 
@@ -312,7 +314,7 @@ export default function WorkflowEditorPage() {
       await network.fetch<Workflow, typeof WorkflowSchemas.update>('PATCH', `/workflows/${id}`, data);
       toast.success('Workflow updated successfully');
       void mutate();
-      setShowSettingsDialog(false);
+      setDialog({type: 'none'});
     } catch (error) {
       toast.error(error instanceof Error ? error.message : 'Failed to update workflow');
     }
@@ -336,13 +338,13 @@ export default function WorkflowEditorPage() {
       if (stepId && workflow) {
         const step = workflow.steps.find(s => s.id === stepId);
         if (step) {
-          setEditingStep(step);
+          setDialog({type: 'editStep', step});
         }
       }
     };
 
     const handleOpenSettingsEvent = () => {
-      setShowSettingsDialog(true);
+      setDialog({type: 'settings'});
     };
 
     window.addEventListener('workflow-edit-step', handleEditStepEvent);
@@ -398,13 +400,13 @@ export default function WorkflowEditorPage() {
             )}
           </div>
           <div className="flex items-center gap-1.5 flex-shrink-0">
-            <Button variant="ghost" size="icon" onClick={() => setShowSettingsDialog(true)} aria-label="Settings">
+            <Button variant="ghost" size="icon" onClick={() => setDialog({type: 'settings'})} aria-label="Settings">
               <Settings className="h-4 w-4" />
             </Button>
             <Button
               variant="ghost"
               size="icon"
-              onClick={() => setShowDeleteDialog(true)}
+              onClick={() => setDialog({type: 'delete'})}
               aria-label="Delete workflow"
               className="text-neutral-400 hover:text-red-600 hover:bg-red-50"
             >
@@ -542,7 +544,7 @@ export default function WorkflowEditorPage() {
                   <CardDescription>View and manage all executions of this workflow</CardDescription>
                 </div>
                 {activeExecutionsCount > 0 && (
-                  <Button variant="outline" onClick={() => setShowCancelAllDialog(true)}>
+                  <Button variant="outline" onClick={() => setDialog({type: 'cancelAll', cancelling: false})}>
                     Cancel All Active ({activeExecutionsCount})
                   </Button>
                 )}
@@ -616,8 +618,8 @@ export default function WorkflowEditorPage() {
                               <Button
                                 variant="destructiveGhost"
                                 size="sm"
-                                onClick={() => setExecutionToCancel(execution.id)}
-                                disabled={isCancelling}
+                                onClick={() => setDialog({type: 'cancelOne', executionId: execution.id, cancelling: false})}
+                                disabled={dialog.type === 'cancelOne' && dialog.cancelling}
                               >
                                 Cancel
                               </Button>
@@ -639,37 +641,38 @@ export default function WorkflowEditorPage() {
         <>
           <SettingsDialog
             workflow={workflow}
-            open={showSettingsDialog}
-            onOpenChange={setShowSettingsDialog}
+            open={dialog.type === 'settings'}
+            onOpenChange={open => !open && setDialog({type: 'none'})}
             onSave={handleUpdateSettings}
           />
-          {editingStep && (
+          {dialog.type === 'editStep' && (
             <EditStepDialog
-              step={editingStep}
+              step={dialog.step}
               workflowId={id as string}
-              open={!!editingStep}
-              onOpenChange={open => !open && setEditingStep(null)}
+              open={true}
+              onOpenChange={open => !open && setDialog({type: 'none'})}
               onSuccess={() => mutate()}
             />
           )}
 
           {/* Cancel Single Execution Confirmation */}
           <ConfirmDialog
-            open={!!executionToCancel}
-            onOpenChange={open => !open && setExecutionToCancel(null)}
+            open={dialog.type === 'cancelOne'}
+            onOpenChange={open => !open && setDialog({type: 'none'})}
             onConfirm={() => {
-              if (executionToCancel) {
-                return handleCancelExecution(executionToCancel);
+              if (dialog.type === 'cancelOne') {
+                return handleCancelExecution(dialog.executionId);
               }
             }}
             title="Cancel Execution"
             description={
-              executionToCancel && executionsData?.executions ? (
+              dialog.type === 'cancelOne' && executionsData?.executions ? (
                 <div className="space-y-2">
                   <p>
                     Are you sure you want to cancel the workflow execution for{' '}
                     <strong>
-                      {executionsData.executions.find(e => e.id === executionToCancel)?.contact.email || 'this contact'}
+                      {executionsData.executions.find(e => e.id === dialog.executionId)?.contact.email ||
+                        'this contact'}
                     </strong>
                     ?
                   </p>
@@ -685,13 +688,13 @@ export default function WorkflowEditorPage() {
             confirmText="Cancel Execution"
             cancelText="Keep Running"
             variant="destructive"
-            isLoading={isCancelling}
+            status={dialog.type === 'cancelOne' && dialog.cancelling ? 'loading' : 'idle'}
           />
 
           {/* Cancel All Executions Confirmation */}
           <ConfirmDialog
-            open={showCancelAllDialog}
-            onOpenChange={setShowCancelAllDialog}
+            open={dialog.type === 'cancelAll'}
+            onOpenChange={open => !open && setDialog({type: 'none'})}
             onConfirm={handleCancelAllExecutions}
             title="Cancel All Active Executions"
             description={
@@ -709,13 +712,13 @@ export default function WorkflowEditorPage() {
             confirmText={`Cancel ${activeExecutionsCount} Execution${activeExecutionsCount !== 1 ? 's' : ''}`}
             cancelText="Keep Running"
             variant="destructive"
-            isLoading={isCancelling}
+            status={dialog.type === 'cancelAll' && dialog.cancelling ? 'loading' : 'idle'}
           />
 
           {/* Delete Workflow Confirmation */}
           <ConfirmDialog
-            open={showDeleteDialog}
-            onOpenChange={setShowDeleteDialog}
+            open={dialog.type === 'delete'}
+            onOpenChange={open => !open && setDialog({type: 'none'})}
             onConfirm={handleDelete}
             title="Delete Workflow"
             description="Are you sure you want to delete this workflow? This action cannot be undone."
diff --git a/packages/ui/src/components/atoms/Alert.tsx b/packages/ui/src/components/atoms/Alert.tsx
index a1aa27d..24f1ea3 100644
--- a/packages/ui/src/components/atoms/Alert.tsx
+++ b/packages/ui/src/components/atoms/Alert.tsx
@@ -19,26 +19,24 @@ const alertVariants = cva(
   },
 );
 
-const Alert = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
->(({className, variant, ...props}, ref) => (
-  <div ref={ref} role="alert" className={cn(alertVariants({variant}), className)} {...props} />
-));
+function Alert({
+  className,
+  variant,
+  ref,
+  ...props
+}: React.ComponentProps<'div'> & VariantProps<typeof alertVariants>) {
+  return <div ref={ref} role="alert" className={cn(alertVariants({variant}), className)} {...props} />;
+}
 Alert.displayName = 'Alert';
 
-const AlertTitle = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLHeadingElement>>(
-  ({className, ...props}, ref) => (
-    <h5 ref={ref} className={cn('mb-1 font-medium leading-none tracking-tight', className)} {...props} />
-  ),
-);
+function AlertTitle({className, ref, ...props}: React.ComponentProps<'h5'>) {
+  return <h5 ref={ref} className={cn('mb-1 font-medium leading-none tracking-tight', className)} {...props} />;
+}
 AlertTitle.displayName = 'AlertTitle';
 
-const AlertDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
-  ({className, ...props}, ref) => (
-    <div ref={ref} className={cn('text-sm [&_p]:leading-relaxed', className)} {...props} />
-  ),
-);
+function AlertDescription({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return <div ref={ref} className={cn('text-sm [&_p]:leading-relaxed', className)} {...props} />;
+}
 AlertDescription.displayName = 'AlertDescription';
 
 export {Alert, AlertTitle, AlertDescription};
diff --git a/packages/ui/src/components/atoms/Button.tsx b/packages/ui/src/components/atoms/Button.tsx
index fc99408..b4b0364 100644
--- a/packages/ui/src/components/atoms/Button.tsx
+++ b/packages/ui/src/components/atoms/Button.tsx
@@ -31,18 +31,14 @@ const buttonVariants = cva(
   },
 );
 
-export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
+export interface ButtonProps extends React.ComponentProps<'button'>, VariantProps<typeof buttonVariants> {
   asChild?: boolean;
 }
 
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({className, variant, size, asChild = false, ...props}, ref) => {
-    const Comp = asChild ? Slot : 'button';
-    return <Comp className={cn(buttonVariants({variant, size, className}))} ref={ref} {...props} />;
-  },
-);
+function Button({className, variant, size, asChild = false, ref, ...props}: ButtonProps) {
+  const Comp = asChild ? Slot : 'button';
+  return <Comp className={cn(buttonVariants({variant, size, className}))} ref={ref} {...props} />;
+}
 Button.displayName = 'Button';
 
 export {Button, buttonVariants};
diff --git a/packages/ui/src/components/atoms/Card.tsx b/packages/ui/src/components/atoms/Card.tsx
index fd121f4..9c8fdfa 100644
--- a/packages/ui/src/components/atoms/Card.tsx
+++ b/packages/ui/src/components/atoms/Card.tsx
@@ -2,42 +2,40 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({className, ...props}, ref) => (
-  <div
-    ref={ref}
-    className={cn('rounded-lg border border-neutral-200 bg-white text-neutral-950 shadow-sm overflow-hidden', className)}
-    {...props}
-  />
-));
+function Card({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return (
+    <div
+      ref={ref}
+      className={cn('rounded-lg border border-neutral-200 bg-white text-neutral-950 shadow-sm overflow-hidden', className)}
+      {...props}
+    />
+  );
+}
 Card.displayName = 'Card';
 
-const CardHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({className, ...props}, ref) => (
-    <div ref={ref} className={cn('flex flex-col space-y-1.5 p-6', className)} {...props} />
-  ),
-);
+function CardHeader({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return <div ref={ref} className={cn('flex flex-col space-y-1.5 p-6', className)} {...props} />;
+}
 CardHeader.displayName = 'CardHeader';
 
-const CardTitle = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({className, ...props}, ref) => (
-    <div ref={ref} className={cn('font-semibold leading-none tracking-tight', className)} {...props} />
-  ),
-);
+function CardTitle({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return <div ref={ref} className={cn('font-semibold leading-none tracking-tight', className)} {...props} />;
+}
 CardTitle.displayName = 'CardTitle';
 
-const CardDescription = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({className, ...props}, ref) => <div ref={ref} className={cn('text-sm text-neutral-500', className)} {...props} />,
-);
+function CardDescription({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return <div ref={ref} className={cn('text-sm text-neutral-500', className)} {...props} />;
+}
 CardDescription.displayName = 'CardDescription';
 
-const CardContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({className, ...props}, ref) => <div ref={ref} className={cn('p-6 pt-0', className)} {...props} />,
-);
+function CardContent({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return <div ref={ref} className={cn('p-6 pt-0', className)} {...props} />;
+}
 CardContent.displayName = 'CardContent';
 
-const CardFooter = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({className, ...props}, ref) => <div ref={ref} className={cn('flex items-center p-6 pt-0', className)} {...props} />,
-);
+function CardFooter({className, ref, ...props}: React.ComponentProps<'div'>) {
+  return <div ref={ref} className={cn('flex items-center p-6 pt-0', className)} {...props} />;
+}
 CardFooter.displayName = 'CardFooter';
 
 export {Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle};
diff --git a/packages/ui/src/components/atoms/Chart.tsx b/packages/ui/src/components/atoms/Chart.tsx
index f9cd765..1b3a6e8 100644
--- a/packages/ui/src/components/atoms/Chart.tsx
+++ b/packages/ui/src/components/atoms/Chart.tsx
@@ -29,7 +29,7 @@ interface ChartContextProps {
 const ChartContext = React.createContext<ChartContextProps | null>(null);
 
 function useChart() {
-  const context = React.useContext(ChartContext);
+  const context = React.use(ChartContext);
 
   if (!context) {
     throw new Error('useChart must be used within a <ChartContainer />');
@@ -47,8 +47,7 @@ interface ChartContainerProps extends React.ComponentProps<'div'> {
   children: React.ComponentProps<typeof RechartsPrimitive.ResponsiveContainer>['children'];
 }
 
-const ChartContainer = React.forwardRef<HTMLDivElement, ChartContainerProps>(
-  ({id, className, children, config, ...props}, ref) => {
+function ChartContainer({id, className, children, config, ref, ...props}: ChartContainerProps) {
     const uniqueId = React.useId();
     const chartId = `chart-${id || uniqueId.replace(/:/g, '')}`;
 
@@ -65,8 +64,7 @@ const ChartContainer = React.forwardRef<HTMLDivElement, ChartContainerProps>(
         </div>
       </ChartContext.Provider>
     );
-  },
-);
+}
 ChartContainer.displayName = 'ChartContainer';
 
 // ============================================
@@ -119,25 +117,22 @@ interface ChartTooltipContentProps
 
 const ChartTooltip = RechartsPrimitive.Tooltip;
 
-const ChartTooltipContent = React.forwardRef<HTMLDivElement, ChartTooltipContentProps>(
-  (
-    {
-      active,
-      payload,
-      className,
-      indicator = 'dot',
-      hideLabel = false,
-      hideIndicator = false,
-      label,
-      labelFormatter,
-      labelClassName,
-      formatter,
-      color,
-      nameKey,
-      labelKey,
-    },
-    ref,
-  ) => {
+function ChartTooltipContent({
+  active,
+  payload,
+  className,
+  indicator = 'dot',
+  hideLabel = false,
+  hideIndicator = false,
+  label,
+  labelFormatter,
+  labelClassName,
+  formatter,
+  color,
+  nameKey,
+  labelKey,
+  ref,
+}: ChartTooltipContentProps & {ref?: React.Ref<HTMLDivElement>}) {
     const {config} = useChart();
 
     const tooltipLabel = React.useMemo(() => {
@@ -235,8 +230,7 @@ const ChartTooltipContent = React.forwardRef<HTMLDivElement, ChartTooltipContent
         </div>
       </div>
     );
-  },
-);
+}
 ChartTooltipContent.displayName = 'ChartTooltipContent';
 
 // ============================================
@@ -252,8 +246,14 @@ interface ChartLegendContentProps extends Omit<React.ComponentProps<'div'>, 'pay
 
 const ChartLegend = RechartsPrimitive.Legend;
 
-const ChartLegendContent = React.forwardRef<HTMLDivElement, ChartLegendContentProps>(
-  ({className, hideIcon = false, payload, verticalAlign = 'bottom', nameKey}, ref) => {
+function ChartLegendContent({
+  className,
+  hideIcon = false,
+  payload,
+  verticalAlign = 'bottom',
+  nameKey,
+  ref,
+}: ChartLegendContentProps & {ref?: React.Ref<HTMLDivElement>}) {
     const {config} = useChart();
 
     if (!payload?.length) {
@@ -290,8 +290,7 @@ const ChartLegendContent = React.forwardRef<HTMLDivElement, ChartLegendContentPr
         })}
       </div>
     );
-  },
-);
+}
 ChartLegendContent.displayName = 'ChartLegendContent';
 
 export {ChartContainer, ChartTooltip, ChartTooltipContent, ChartLegend, ChartLegendContent, ChartStyle};
diff --git a/packages/ui/src/components/atoms/Checkbox.tsx b/packages/ui/src/components/atoms/Checkbox.tsx
index 6342040..c105468 100644
--- a/packages/ui/src/components/atoms/Checkbox.tsx
+++ b/packages/ui/src/components/atoms/Checkbox.tsx
@@ -6,23 +6,22 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-const Checkbox = React.forwardRef<
-  React.ElementRef<typeof CheckboxPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
->(({className, ...props}, ref) => (
-  <CheckboxPrimitive.Root
-    ref={ref}
-    className={cn(
-      'peer h-4 w-4 shrink-0 rounded-sm border border-neutral-200 ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-neutral-900 data-[state=checked]:text-neutral-50',
-      className,
-    )}
-    {...props}
-  >
-    <CheckboxPrimitive.Indicator className={cn('flex items-center justify-center text-current')}>
-      <Check className="h-4 w-4" />
-    </CheckboxPrimitive.Indicator>
-  </CheckboxPrimitive.Root>
-));
+function Checkbox({className, ref, ...props}: React.ComponentProps<typeof CheckboxPrimitive.Root>) {
+  return (
+    <CheckboxPrimitive.Root
+      ref={ref}
+      className={cn(
+        'peer h-4 w-4 shrink-0 rounded-sm border border-neutral-200 ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-neutral-900 data-[state=checked]:text-neutral-50',
+        className,
+      )}
+      {...props}
+    >
+      <CheckboxPrimitive.Indicator className={cn('flex items-center justify-center text-current')}>
+        <Check className="h-4 w-4" />
+      </CheckboxPrimitive.Indicator>
+    </CheckboxPrimitive.Root>
+  );
+}
 Checkbox.displayName = CheckboxPrimitive.Root.displayName;
 
 export {Checkbox};
diff --git a/packages/ui/src/components/atoms/Command.tsx b/packages/ui/src/components/atoms/Command.tsx
index 403efeb..4da1ea1 100644
--- a/packages/ui/src/components/atoms/Command.tsx
+++ b/packages/ui/src/components/atoms/Command.tsx
@@ -7,16 +7,15 @@ import {Search} from 'lucide-react';
 
 import {cn} from '../../lib';
 
-const Command = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive>
->(({className, ...props}, ref) => (
-  <CommandPrimitive
-    ref={ref}
-    className={cn('flex h-full w-full flex-col overflow-hidden rounded-md bg-white text-neutral-950', className)}
-    {...props}
-  />
-));
+function Command({className, ref, ...props}: React.ComponentProps<typeof CommandPrimitive>) {
+  return (
+    <CommandPrimitive
+      ref={ref}
+      className={cn('flex h-full w-full flex-col overflow-hidden rounded-md bg-white text-neutral-950', className)}
+      {...props}
+    />
+  );
+}
 Command.displayName = CommandPrimitive.displayName;
 
 const CommandDialog = ({children, ...props}: React.ComponentProps<typeof DialogPrimitive.Root>) => {
@@ -44,85 +43,72 @@ const CommandDialog = ({children, ...props}: React.ComponentProps<typeof DialogP
   );
 };
 
-const CommandInput = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive.Input>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
->(({className, ...props}, ref) => (
-  <div className="flex items-center border-b border-neutral-200 px-4 focus-within:border-neutral-200" cmdk-input-wrapper="">
-    <Search className="mr-3 h-5 w-5 shrink-0 text-neutral-400" />
-    <CommandPrimitive.Input
+function CommandInput({className, ref, ...props}: React.ComponentProps<typeof CommandPrimitive.Input>) {
+  return (
+    <div className="flex items-center border-b border-neutral-200 px-4 focus-within:border-neutral-200" cmdk-input-wrapper="">
+      <Search className="mr-3 h-5 w-5 shrink-0 text-neutral-400" />
+      <CommandPrimitive.Input
+        ref={ref}
+        className={cn(
+          'flex h-14 w-full rounded-md bg-transparent text-sm outline-none! ring-0! shadow-none! border-transparent! placeholder:text-neutral-400 disabled:cursor-not-allowed disabled:opacity-50',
+          className,
+        )}
+        {...props}
+      />
+    </div>
+  );
+}
+CommandInput.displayName = CommandPrimitive.Input.displayName;
+
+function CommandList({className, ref, ...props}: React.ComponentProps<typeof CommandPrimitive.List>) {
+  return (
+    <CommandPrimitive.List
+      ref={ref}
+      className={cn('max-h-[440px] overflow-y-auto overflow-x-hidden', className)}
+      {...props}
+    />
+  );
+}
+CommandList.displayName = CommandPrimitive.List.displayName;
+
+function CommandEmpty({ref, ...props}: React.ComponentProps<typeof CommandPrimitive.Empty>) {
+  return <CommandPrimitive.Empty ref={ref} className="py-6 text-center text-sm text-neutral-500" {...props} />;
+}
+CommandEmpty.displayName = CommandPrimitive.Empty.displayName;
+
+function CommandGroup({className, ref, ...props}: React.ComponentProps<typeof CommandPrimitive.Group>) {
+  return (
+    <CommandPrimitive.Group
       ref={ref}
       className={cn(
-        'flex h-14 w-full rounded-md bg-transparent text-sm outline-none! ring-0! shadow-none! border-transparent! placeholder:text-neutral-400 disabled:cursor-not-allowed disabled:opacity-50',
+        'overflow-hidden p-2 text-neutral-950 [&_[cmdk-group-heading]]:px-3 [&_[cmdk-group-heading]]:py-2 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-neutral-400 [&_[cmdk-group-heading]]:uppercase [&_[cmdk-group-heading]]:tracking-wider',
         className,
       )}
       {...props}
     />
-  </div>
-));
-
-CommandInput.displayName = CommandPrimitive.Input.displayName;
-
-const CommandList = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive.List>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive.List>
->(({className, ...props}, ref) => (
-  <CommandPrimitive.List
-    ref={ref}
-    className={cn('max-h-[440px] overflow-y-auto overflow-x-hidden', className)}
-    {...props}
-  />
-));
-
-CommandList.displayName = CommandPrimitive.List.displayName;
-
-const CommandEmpty = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive.Empty>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive.Empty>
->((props, ref) => (
-  <CommandPrimitive.Empty ref={ref} className="py-6 text-center text-sm text-neutral-500" {...props} />
-));
-
-CommandEmpty.displayName = CommandPrimitive.Empty.displayName;
-
-const CommandGroup = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive.Group>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive.Group>
->(({className, ...props}, ref) => (
-  <CommandPrimitive.Group
-    ref={ref}
-    className={cn(
-      'overflow-hidden p-2 text-neutral-950 [&_[cmdk-group-heading]]:px-3 [&_[cmdk-group-heading]]:py-2 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-neutral-400 [&_[cmdk-group-heading]]:uppercase [&_[cmdk-group-heading]]:tracking-wider',
-      className,
-    )}
-    {...props}
-  />
-));
-
+  );
+}
 CommandGroup.displayName = CommandPrimitive.Group.displayName;
 
-const CommandSeparator = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive.Separator>
->(({className, ...props}, ref) => (
-  <CommandPrimitive.Separator ref={ref} className={cn('-mx-1 h-px bg-neutral-200', className)} {...props} />
-));
+function CommandSeparator({className, ref, ...props}: React.ComponentProps<typeof CommandPrimitive.Separator>) {
+  return (
+    <CommandPrimitive.Separator ref={ref} className={cn('-mx-1 h-px bg-neutral-200', className)} {...props} />
+  );
+}
 CommandSeparator.displayName = CommandPrimitive.Separator.displayName;
 
-const CommandItem = React.forwardRef<
-  React.ElementRef<typeof CommandPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof CommandPrimitive.Item>
->(({className, ...props}, ref) => (
-  <CommandPrimitive.Item
-    ref={ref}
-    className={cn(
-      'relative flex w-full cursor-pointer select-none items-center rounded-md px-3 py-2.5 text-sm outline-none text-neutral-900 aria-selected:bg-neutral-100 aria-selected:text-neutral-900 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:bg-neutral-50',
-      className,
-    )}
-    {...props}
-  />
-));
-
+function CommandItem({className, ref, ...props}: React.ComponentProps<typeof CommandPrimitive.Item>) {
+  return (
+    <CommandPrimitive.Item
+      ref={ref}
+      className={cn(
+        'relative flex w-full cursor-pointer select-none items-center rounded-md px-3 py-2.5 text-sm outline-none text-neutral-900 aria-selected:bg-neutral-100 aria-selected:text-neutral-900 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:bg-neutral-50',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 CommandItem.displayName = CommandPrimitive.Item.displayName;
 
 const CommandShortcut = ({className, ...props}: React.HTMLAttributes<HTMLSpanElement>) => {
diff --git a/packages/ui/src/components/atoms/Dialog.tsx b/packages/ui/src/components/atoms/Dialog.tsx
index 5e014f7..eb81f02 100644
--- a/packages/ui/src/components/atoms/Dialog.tsx
+++ b/packages/ui/src/components/atoms/Dialog.tsx
@@ -12,43 +12,41 @@ const DialogPortal = DialogPrimitive.Portal;
 
 const DialogClose = DialogPrimitive.Close;
 
-const DialogOverlay = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Overlay>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
->(({className, ...props}, ref) => (
-  <DialogPrimitive.Overlay
-    ref={ref}
-    className={cn(
-      'fixed inset-0 z-50 bg-black/60 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
-      className,
-    )}
-    {...props}
-  />
-));
-DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
-
-const DialogContent = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({className, children, ...props}, ref) => (
-  <DialogPortal>
-    <DialogOverlay />
-    <DialogPrimitive.Content
+function DialogOverlay({className, ref, ...props}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+  return (
+    <DialogPrimitive.Overlay
       ref={ref}
       className={cn(
-        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-5 border border-neutral-200 bg-white p-6 shadow-md duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg max-h-[90vh] overflow-y-auto',
+        'fixed inset-0 z-50 bg-black/60 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
         className,
       )}
       {...props}
-    >
-      {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-md opacity-60 ring-offset-white transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 data-[state=open]:text-neutral-500 p-1.5">
-        <X className="h-5 w-5 sm:h-5 sm:w-5" />
-        <span className="sr-only">Close</span>
-      </DialogPrimitive.Close>
-    </DialogPrimitive.Content>
-  </DialogPortal>
-));
+    />
+  );
+}
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
+
+function DialogContent({className, children, ref, ...props}: React.ComponentProps<typeof DialogPrimitive.Content>) {
+  return (
+    <DialogPortal>
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        ref={ref}
+        className={cn(
+          'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-5 border border-neutral-200 bg-white p-6 shadow-md duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg max-h-[90vh] overflow-y-auto',
+          className,
+        )}
+        {...props}
+      >
+        {children}
+        <DialogPrimitive.Close className="absolute right-4 top-4 rounded-md opacity-60 ring-offset-white transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 data-[state=open]:text-neutral-500 p-1.5">
+          <X className="h-5 w-5 sm:h-5 sm:w-5" />
+          <span className="sr-only">Close</span>
+        </DialogPrimitive.Close>
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  );
+}
 DialogContent.displayName = DialogPrimitive.Content.displayName;
 
 const DialogHeader = ({className, ...props}: React.HTMLAttributes<HTMLDivElement>) => (
@@ -61,24 +59,22 @@ const DialogFooter = ({className, ...props}: React.HTMLAttributes<HTMLDivElement
 );
 DialogFooter.displayName = 'DialogFooter';
 
-const DialogTitle = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Title>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
->(({className, ...props}, ref) => (
-  <DialogPrimitive.Title
-    ref={ref}
-    className={cn('text-lg font-semibold leading-none tracking-tight', className)}
-    {...props}
-  />
-));
+function DialogTitle({className, ref, ...props}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      ref={ref}
+      className={cn('text-lg font-semibold leading-none tracking-tight', className)}
+      {...props}
+    />
+  );
+}
 DialogTitle.displayName = DialogPrimitive.Title.displayName;
 
-const DialogDescription = React.forwardRef<
-  React.ElementRef<typeof DialogPrimitive.Description>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
->(({className, ...props}, ref) => (
-  <DialogPrimitive.Description ref={ref} className={cn('text-sm text-neutral-500', className)} {...props} />
-));
+function DialogDescription({className, ref, ...props}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description ref={ref} className={cn('text-sm text-neutral-500', className)} {...props} />
+  );
+}
 DialogDescription.displayName = DialogPrimitive.Description.displayName;
 
 export {Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger};
diff --git a/packages/ui/src/components/atoms/DropdownMenu.tsx b/packages/ui/src/components/atoms/DropdownMenu.tsx
index 9dec651..1e18555 100644
--- a/packages/ui/src/components/atoms/DropdownMenu.tsx
+++ b/packages/ui/src/components/atoms/DropdownMenu.tsx
@@ -18,143 +18,169 @@ const DropdownMenuSub = DropdownMenuPrimitive.Sub;
 
 const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
 
-const DropdownMenuSubTrigger = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
-    inset?: boolean;
-  }
->(({className, inset, children, ...props}, ref) => (
-  <DropdownMenuPrimitive.SubTrigger
-    ref={ref}
-    className={cn(
-      'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-neutral-100 data-[state=open]:bg-neutral-100',
-      inset && 'pl-8',
-      className,
-    )}
-    {...props}
-  >
-    {children}
-    <ChevronRight className="ml-auto h-4 w-4" />
-  </DropdownMenuPrimitive.SubTrigger>
-));
+function DropdownMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {inset?: boolean}) {
+  return (
+    <DropdownMenuPrimitive.SubTrigger
+      ref={ref}
+      className={cn(
+        'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-neutral-100 data-[state=open]:bg-neutral-100',
+        inset && 'pl-8',
+        className,
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRight className="ml-auto h-4 w-4" />
+    </DropdownMenuPrimitive.SubTrigger>
+  );
+}
 DropdownMenuSubTrigger.displayName = DropdownMenuPrimitive.SubTrigger.displayName;
 
-const DropdownMenuSubContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
->(({className, ...props}, ref) => (
-  <DropdownMenuPrimitive.SubContent
-    ref={ref}
-    className={cn(
-      'z-50 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-      className,
-    )}
-    {...props}
-  />
-));
-DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName;
-
-const DropdownMenuContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
->(({className, sideOffset = 4, ...props}, ref) => (
-  <DropdownMenuPrimitive.Portal>
-    <DropdownMenuPrimitive.Content
+function DropdownMenuSubContent({
+  className,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
+  return (
+    <DropdownMenuPrimitive.SubContent
       ref={ref}
-      sideOffset={sideOffset}
       className={cn(
         'z-50 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
         className,
       )}
       {...props}
     />
-  </DropdownMenuPrimitive.Portal>
-));
+  );
+}
+DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName;
+
+function DropdownMenuContent({
+  className,
+  sideOffset = 4,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
+  return (
+    <DropdownMenuPrimitive.Portal>
+      <DropdownMenuPrimitive.Content
+        ref={ref}
+        sideOffset={sideOffset}
+        className={cn(
+          'z-50 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+          className,
+        )}
+        {...props}
+      />
+    </DropdownMenuPrimitive.Portal>
+  );
+}
 DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
 
-const DropdownMenuItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
-    inset?: boolean;
-  }
->(({className, inset, ...props}, ref) => (
-  <DropdownMenuPrimitive.Item
-    ref={ref}
-    className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      inset && 'pl-8',
-      className,
-    )}
-    {...props}
-  />
-));
+function DropdownMenuItem({
+  className,
+  inset,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {inset?: boolean}) {
+  return (
+    <DropdownMenuPrimitive.Item
+      ref={ref}
+      className={cn(
+        'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+        inset && 'pl-8',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;
 
-const DropdownMenuCheckboxItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>
->(({className, children, checked, ...props}, ref) => (
-  <DropdownMenuPrimitive.CheckboxItem
-    ref={ref}
-    className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      className,
-    )}
-    checked={checked}
-    {...props}
-  >
-    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <DropdownMenuPrimitive.ItemIndicator>
-        <Check className="h-4 w-4" />
-      </DropdownMenuPrimitive.ItemIndicator>
-    </span>
-    {children}
-  </DropdownMenuPrimitive.CheckboxItem>
-));
+function DropdownMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
+  return (
+    <DropdownMenuPrimitive.CheckboxItem
+      ref={ref}
+      className={cn(
+        'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+        className,
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+        <DropdownMenuPrimitive.ItemIndicator>
+          <Check className="h-4 w-4" />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </DropdownMenuPrimitive.CheckboxItem>
+  );
+}
 DropdownMenuCheckboxItem.displayName = DropdownMenuPrimitive.CheckboxItem.displayName;
 
-const DropdownMenuRadioItem = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>
->(({className, children, ...props}, ref) => (
-  <DropdownMenuPrimitive.RadioItem
-    ref={ref}
-    className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      className,
-    )}
-    {...props}
-  >
-    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <DropdownMenuPrimitive.ItemIndicator>
-        <Circle className="h-2 w-2 fill-current" />
-      </DropdownMenuPrimitive.ItemIndicator>
-    </span>
-    {children}
-  </DropdownMenuPrimitive.RadioItem>
-));
+function DropdownMenuRadioItem({
+  className,
+  children,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
+  return (
+    <DropdownMenuPrimitive.RadioItem
+      ref={ref}
+      className={cn(
+        'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+        className,
+      )}
+      {...props}
+    >
+      <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+        <DropdownMenuPrimitive.ItemIndicator>
+          <Circle className="h-2 w-2 fill-current" />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </DropdownMenuPrimitive.RadioItem>
+  );
+}
 DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;
 
-const DropdownMenuLabel = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {
-    inset?: boolean;
-  }
->(({className, inset, ...props}, ref) => (
-  <DropdownMenuPrimitive.Label
-    ref={ref}
-    className={cn('px-2 py-1.5 text-sm font-semibold', inset && 'pl-8', className)}
-    {...props}
-  />
-));
+function DropdownMenuLabel({
+  className,
+  inset,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {inset?: boolean}) {
+  return (
+    <DropdownMenuPrimitive.Label
+      ref={ref}
+      className={cn('px-2 py-1.5 text-sm font-semibold', inset && 'pl-8', className)}
+      {...props}
+    />
+  );
+}
 DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
 
-const DropdownMenuSeparator = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
->(({className, ...props}, ref) => (
-  <DropdownMenuPrimitive.Separator ref={ref} className={cn('-mx-1 my-1 h-px bg-neutral-200', className)} {...props} />
-));
+function DropdownMenuSeparator({
+  className,
+  ref,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
+  return (
+    <DropdownMenuPrimitive.Separator ref={ref} className={cn('-mx-1 my-1 h-px bg-neutral-200', className)} {...props} />
+  );
+}
 DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
 
 const DropdownMenuShortcut = ({className, ...props}: React.HTMLAttributes<HTMLSpanElement>) => {
diff --git a/packages/ui/src/components/atoms/Form.tsx b/packages/ui/src/components/atoms/Form.tsx
index 7bccc3e..18c6fa6 100644
--- a/packages/ui/src/components/atoms/Form.tsx
+++ b/packages/ui/src/components/atoms/Form.tsx
@@ -39,8 +39,8 @@ const FormField = <
 };
 
 const useFormField = () => {
-  const fieldContext = React.useContext(FormFieldContext);
-  const itemContext = React.useContext(FormItemContext);
+  const fieldContext = React.use(FormFieldContext);
+  const itemContext = React.use(FormItemContext);
   const {getFieldState, formState} = useFormContext();
 
   if (!fieldContext) {
@@ -67,67 +67,60 @@ interface FormItemContextValue {
 
 const FormItemContext = React.createContext<FormItemContextValue>({} as FormItemContextValue);
 
-const FormItem = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
-  ({className, ...props}, ref) => {
-    const id = React.useId();
+function FormItem({className, ref, ...props}: React.ComponentProps<'div'>) {
+  const id = React.useId();
 
-    return (
-      <FormItemContext.Provider value={{id}}>
-        <div ref={ref} className={cn('space-y-2', className)} {...props} />
-      </FormItemContext.Provider>
-    );
-  },
-);
+  return (
+    <FormItemContext.Provider value={{id}}>
+      <div ref={ref} className={cn('space-y-2', className)} {...props} />
+    </FormItemContext.Provider>
+  );
+}
 FormItem.displayName = 'FormItem';
 
-const FormLabel = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
->(({className, ...props}, ref) => {
+function FormLabel({
+  className,
+  ref,
+  ...props
+}: React.ComponentProps<typeof LabelPrimitive.Root>) {
   const {formItemId} = useFormField();
 
   return <Label ref={ref} className={cn(className)} htmlFor={formItemId} {...props} />;
-});
+}
 FormLabel.displayName = 'FormLabel';
 
-const FormControl = React.forwardRef<React.ElementRef<typeof Slot>, React.ComponentPropsWithoutRef<typeof Slot>>(
-  ({...props}, ref) => {
-    const {formItemId, formDescriptionId, formMessageId} = useFormField();
+function FormControl({ref, ...props}: React.ComponentProps<typeof Slot>) {
+  const {formItemId, formDescriptionId, formMessageId} = useFormField();
 
-    return (
-      <Slot ref={ref} id={formItemId} aria-describedby={formDescriptionId} aria-invalid={!!formMessageId} {...props} />
-    );
-  },
-);
+  return (
+    <Slot ref={ref} id={formItemId} aria-describedby={formDescriptionId} aria-invalid={!!formMessageId} {...props} />
+  );
+}
 FormControl.displayName = 'FormControl';
 
-const FormDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
-  ({className, ...props}, ref) => {
-    const {formDescriptionId} = useFormField();
+function FormDescription({className, ref, ...props}: React.ComponentProps<'p'>) {
+  const {formDescriptionId} = useFormField();
 
-    return (
-      <p ref={ref} id={formDescriptionId} className={cn('text-[0.8rem] text-neutral-500', className)} {...props} />
-    );
-  },
-);
+  return (
+    <p ref={ref} id={formDescriptionId} className={cn('text-[0.8rem] text-neutral-500', className)} {...props} />
+  );
+}
 FormDescription.displayName = 'FormDescription';
 
-const FormMessage = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
-  ({className, children, ...props}, ref) => {
-    const {error, formMessageId} = useFormField();
-    const body = error ? String(error?.message) : children;
+function FormMessage({className, children, ref, ...props}: React.ComponentProps<'p'>) {
+  const {error, formMessageId} = useFormField();
+  const body = error ? String(error?.message) : children;
 
-    if (!body) {
-      return null;
-    }
+  if (!body) {
+    return null;
+  }
 
-    return (
-      <p ref={ref} id={formMessageId} className={cn('text-[0.8rem] font-medium text-red-600', className)} {...props}>
-        {body}
-      </p>
-    );
-  },
-);
+  return (
+    <p ref={ref} id={formMessageId} className={cn('text-[0.8rem] font-medium text-red-600', className)} {...props}>
+      {body}
+    </p>
+  );
+}
 FormMessage.displayName = 'FormMessage';
 
 export {Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage, useFormField};
diff --git a/packages/ui/src/components/atoms/Input.tsx b/packages/ui/src/components/atoms/Input.tsx
index 65fb982..cae8042 100644
--- a/packages/ui/src/components/atoms/Input.tsx
+++ b/packages/ui/src/components/atoms/Input.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<'input'>>(({className, type, ...props}, ref) => {
+function Input({className, type, ref, ...props}: React.ComponentProps<'input'>) {
   return (
     <input
       type={type}
@@ -14,7 +14,7 @@ const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<'input'>>(
       {...props}
     />
   );
-});
+}
 Input.displayName = 'Input';
 
 export {Input};
diff --git a/packages/ui/src/components/atoms/Kbd.tsx b/packages/ui/src/components/atoms/Kbd.tsx
index 52e7709..ce3cb33 100644
--- a/packages/ui/src/components/atoms/Kbd.tsx
+++ b/packages/ui/src/components/atoms/Kbd.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import {cn} from '../../lib';
 
-export const Kbd = React.forwardRef<HTMLElement, React.HTMLAttributes<HTMLElement>>(
-  ({className, ...props}, ref) => (
+export function Kbd({className, ref, ...props}: React.ComponentProps<'kbd'>) {
+  return (
     <kbd
       ref={ref}
       className={cn(
@@ -11,6 +11,6 @@ export const Kbd = React.forwardRef<HTMLElement, React.HTMLAttributes<HTMLElemen
       )}
       {...props}
     />
-  ),
-);
+  );
+}
 Kbd.displayName = 'Kbd';
diff --git a/packages/ui/src/components/atoms/Label.tsx b/packages/ui/src/components/atoms/Label.tsx
index 04811df..f772b50 100644
--- a/packages/ui/src/components/atoms/Label.tsx
+++ b/packages/ui/src/components/atoms/Label.tsx
@@ -6,12 +6,13 @@ import {cn} from '../../lib';
 
 const labelVariants = cva('text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70');
 
-const Label = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & VariantProps<typeof labelVariants>
->(({className, ...props}, ref) => (
-  <LabelPrimitive.Root ref={ref} className={cn(labelVariants(), className)} {...props} />
-));
+function Label({
+  className,
+  ref,
+  ...props
+}: React.ComponentProps<typeof LabelPrimitive.Root> & VariantProps<typeof labelVariants>) {
+  return <LabelPrimitive.Root ref={ref} className={cn(labelVariants(), className)} {...props} />;
+}
 Label.displayName = LabelPrimitive.Root.displayName;
 
 export {Label};
diff --git a/packages/ui/src/components/atoms/Popover.tsx b/packages/ui/src/components/atoms/Popover.tsx
index d233e58..07c9613 100644
--- a/packages/ui/src/components/atoms/Popover.tsx
+++ b/packages/ui/src/components/atoms/Popover.tsx
@@ -9,23 +9,28 @@ const Popover = PopoverPrimitive.Root;
 
 const PopoverTrigger = PopoverPrimitive.Trigger;
 
-const PopoverContent = React.forwardRef<
-  React.ElementRef<typeof PopoverPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({className, align = 'center', sideOffset = 4, ...props}, ref) => (
-  <PopoverPrimitive.Portal>
-    <PopoverPrimitive.Content
-      ref={ref}
-      align={align}
-      sideOffset={sideOffset}
-      className={cn(
-        'z-50 w-72 rounded-md border border-neutral-200 bg-white p-4 text-neutral-950 shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-        className,
-      )}
-      {...props}
-    />
-  </PopoverPrimitive.Portal>
-));
+function PopoverContent({
+  className,
+  align = 'center',
+  sideOffset = 4,
+  ref,
+  ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Content>) {
+  return (
+    <PopoverPrimitive.Portal>
+      <PopoverPrimitive.Content
+        ref={ref}
+        align={align}
+        sideOffset={sideOffset}
+        className={cn(
+          'z-50 w-72 rounded-md border border-neutral-200 bg-white p-4 text-neutral-950 shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+          className,
+        )}
+        {...props}
+      />
+    </PopoverPrimitive.Portal>
+  );
+}
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 
 export {Popover, PopoverTrigger, PopoverContent};
diff --git a/packages/ui/src/components/atoms/Progress.tsx b/packages/ui/src/components/atoms/Progress.tsx
index 92fe65c..ac6e31b 100644
--- a/packages/ui/src/components/atoms/Progress.tsx
+++ b/packages/ui/src/components/atoms/Progress.tsx
@@ -3,12 +3,12 @@ import * as ProgressPrimitive from '@radix-ui/react-progress';
 
 import {cn} from '../../lib';
 
-interface ProgressProps extends React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root> {
+interface ProgressProps extends React.ComponentProps<typeof ProgressPrimitive.Root> {
   indicatorClassName?: string;
 }
 
-const Progress = React.forwardRef<React.ElementRef<typeof ProgressPrimitive.Root>, ProgressProps>(
-  ({className, value, indicatorClassName, ...props}, ref) => (
+function Progress({className, value, indicatorClassName, ref, ...props}: ProgressProps) {
+  return (
     <ProgressPrimitive.Root
       ref={ref}
       className={cn('relative h-4 w-full overflow-hidden rounded-full bg-neutral-100', className)}
@@ -19,8 +19,8 @@ const Progress = React.forwardRef<React.ElementRef<typeof ProgressPrimitive.Root
         style={{transform: `translateX(-${100 - (value || 0)}%)`}}
       />
     </ProgressPrimitive.Root>
-  ),
-);
+  );
+}
 Progress.displayName = ProgressPrimitive.Root.displayName;
 
 export {Progress};
diff --git a/packages/ui/src/components/atoms/RadioGroup.tsx b/packages/ui/src/components/atoms/RadioGroup.tsx
index f7642e9..61c1c68 100644
--- a/packages/ui/src/components/atoms/RadioGroup.tsx
+++ b/packages/ui/src/components/atoms/RadioGroup.tsx
@@ -6,18 +6,12 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-const RadioGroup = React.forwardRef<
-  React.ElementRef<typeof RadioGroupPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
->(({className, ...props}, ref) => {
+function RadioGroup({className, ref, ...props}: React.ComponentProps<typeof RadioGroupPrimitive.Root>) {
   return <RadioGroupPrimitive.Root className={cn('grid gap-2', className)} {...props} ref={ref} />;
-});
+}
 RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;
 
-const RadioGroupItem = React.forwardRef<
-  React.ElementRef<typeof RadioGroupPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
->(({className, ...props}, ref) => {
+function RadioGroupItem({className, ref, ...props}: React.ComponentProps<typeof RadioGroupPrimitive.Item>) {
   return (
     <RadioGroupPrimitive.Item
       ref={ref}
@@ -32,7 +26,7 @@ const RadioGroupItem = React.forwardRef<
       </RadioGroupPrimitive.Indicator>
     </RadioGroupPrimitive.Item>
   );
-});
+}
 RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;
 
 export {RadioGroup, RadioGroupItem};
diff --git a/packages/ui/src/components/atoms/Select.tsx b/packages/ui/src/components/atoms/Select.tsx
index 00cfadf..c869da6 100644
--- a/packages/ui/src/components/atoms/Select.tsx
+++ b/packages/ui/src/components/atoms/Select.tsx
@@ -10,155 +10,167 @@ const SelectGroup = SelectPrimitive.Group;
 
 const SelectValue = SelectPrimitive.Value;
 
-const SelectTrigger = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
->(({className, children, ...props}, ref) => (
-  <SelectPrimitive.Trigger
-    ref={ref}
-    className={cn(
-      'flex h-10 w-full items-center justify-between rounded-md border border-neutral-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
-      className,
-    )}
-    {...props}
-  >
-    {children}
-    <SelectPrimitive.Icon asChild>
-      <ChevronDown className="h-4 w-4 opacity-50" />
-    </SelectPrimitive.Icon>
-  </SelectPrimitive.Trigger>
-));
-SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
-
-const SelectScrollUpButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
->(({className, ...props}, ref) => (
-  <SelectPrimitive.ScrollUpButton
-    ref={ref}
-    className={cn('flex cursor-default items-center justify-center py-1', className)}
-    {...props}
-  >
-    <ChevronUp className="h-4 w-4" />
-  </SelectPrimitive.ScrollUpButton>
-));
-SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
-
-const SelectScrollDownButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
->(({className, ...props}, ref) => (
-  <SelectPrimitive.ScrollDownButton
-    ref={ref}
-    className={cn('flex cursor-default items-center justify-center py-1', className)}
-    {...props}
-  >
-    <ChevronDown className="h-4 w-4" />
-  </SelectPrimitive.ScrollDownButton>
-));
-SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
-
-const SelectContent = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
->(({className, children, position = 'popper', ...props}, ref) => (
-  <SelectPrimitive.Portal>
-    <SelectPrimitive.Content
+function SelectTrigger({className, children, ref, ...props}: React.ComponentProps<typeof SelectPrimitive.Trigger>) {
+  return (
+    <SelectPrimitive.Trigger
       ref={ref}
       className={cn(
-        'relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-        position === 'popper' &&
-          'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
+        'flex h-10 w-full items-center justify-between rounded-md border border-neutral-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
         className,
       )}
-      position={position}
-      sideOffset={4}
       {...props}
     >
-      <SelectScrollUpButton />
-      <SelectPrimitive.Viewport
+      {children}
+      <SelectPrimitive.Icon asChild>
+        <ChevronDown className="h-4 w-4 opacity-50" />
+      </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
+  );
+}
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
+
+function SelectScrollUpButton({
+  className,
+  ref,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
+  return (
+    <SelectPrimitive.ScrollUpButton
+      ref={ref}
+      className={cn('flex cursor-default items-center justify-center py-1', className)}
+      {...props}
+    >
+      <ChevronUp className="h-4 w-4" />
+    </SelectPrimitive.ScrollUpButton>
+  );
+}
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
+
+function SelectScrollDownButton({
+  className,
+  ref,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
+  return (
+    <SelectPrimitive.ScrollDownButton
+      ref={ref}
+      className={cn('flex cursor-default items-center justify-center py-1', className)}
+      {...props}
+    >
+      <ChevronDown className="h-4 w-4" />
+    </SelectPrimitive.ScrollDownButton>
+  );
+}
+SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
+
+function SelectContent({
+  className,
+  children,
+  position = 'popper',
+  ref,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Content>) {
+  return (
+    <SelectPrimitive.Portal>
+      <SelectPrimitive.Content
+        ref={ref}
         className={cn(
-          'p-1',
+          'relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
           position === 'popper' &&
-            'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] max-w-[calc(100vw-2rem)]',
+            'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
+          className,
         )}
+        position={position}
+        sideOffset={4}
+        {...props}
       >
-        {children}
-      </SelectPrimitive.Viewport>
-      <SelectScrollDownButton />
-    </SelectPrimitive.Content>
-  </SelectPrimitive.Portal>
-));
+        <SelectScrollUpButton />
+        <SelectPrimitive.Viewport
+          className={cn(
+            'p-1',
+            position === 'popper' &&
+              'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] max-w-[calc(100vw-2rem)]',
+          )}
+        >
+          {children}
+        </SelectPrimitive.Viewport>
+        <SelectScrollDownButton />
+      </SelectPrimitive.Content>
+    </SelectPrimitive.Portal>
+  );
+}
 SelectContent.displayName = SelectPrimitive.Content.displayName;
 
-const SelectLabel = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
->(({className, ...props}, ref) => (
-  <SelectPrimitive.Label ref={ref} className={cn('py-1.5 pl-8 pr-2 text-sm font-semibold', className)} {...props} />
-));
+function SelectLabel({className, ref, ...props}: React.ComponentProps<typeof SelectPrimitive.Label>) {
+  return (
+    <SelectPrimitive.Label ref={ref} className={cn('py-1.5 pl-8 pr-2 text-sm font-semibold', className)} {...props} />
+  );
+}
 SelectLabel.displayName = SelectPrimitive.Label.displayName;
 
-const SelectItem = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
->(({className, children, ...props}, ref) => (
-  <SelectPrimitive.Item
-    ref={ref}
-    className={cn(
-      'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      className,
-    )}
-    {...props}
-  >
-    <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-      <SelectPrimitive.ItemIndicator>
-        <Check className="h-4 w-4" />
-      </SelectPrimitive.ItemIndicator>
-    </span>
+function SelectItem({className, children, ref, ...props}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+  return (
+    <SelectPrimitive.Item
+      ref={ref}
+      className={cn(
+        'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+        className,
+      )}
+      {...props}
+    >
+      <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+        <SelectPrimitive.ItemIndicator>
+          <Check className="h-4 w-4" />
+        </SelectPrimitive.ItemIndicator>
+      </span>
 
-    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
-  </SelectPrimitive.Item>
-));
+      <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+    </SelectPrimitive.Item>
+  );
+}
 SelectItem.displayName = SelectPrimitive.Item.displayName;
 
-interface SelectItemWithDescriptionProps extends React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item> {
+interface SelectItemWithDescriptionProps extends React.ComponentProps<typeof SelectPrimitive.Item> {
   title: string;
   description?: string;
 }
 
-const SelectItemWithDescription = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Item>,
-  SelectItemWithDescriptionProps
->(({className, title, description, ...props}, ref) => (
-  <SelectPrimitive.Item
-    ref={ref}
-    className={cn(
-      'relative flex w-full cursor-default select-none items-start rounded-sm py-2.5 pl-8 pr-3 text-sm outline-none focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
-      className,
-    )}
-    {...props}
-  >
-    <span className="absolute left-2 top-3 flex h-3.5 w-3.5 items-center justify-center">
-      <SelectPrimitive.ItemIndicator>
-        <Check className="h-4 w-4" />
-      </SelectPrimitive.ItemIndicator>
-    </span>
+function SelectItemWithDescription({
+  className,
+  title,
+  description,
+  ref,
+  ...props
+}: SelectItemWithDescriptionProps) {
+  return (
+    <SelectPrimitive.Item
+      ref={ref}
+      className={cn(
+        'relative flex w-full cursor-default select-none items-start rounded-sm py-2.5 pl-8 pr-3 text-sm outline-none focus:bg-neutral-100 focus:text-neutral-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+        className,
+      )}
+      {...props}
+    >
+      <span className="absolute left-2 top-3 flex h-3.5 w-3.5 items-center justify-center">
+        <SelectPrimitive.ItemIndicator>
+          <Check className="h-4 w-4" />
+        </SelectPrimitive.ItemIndicator>
+      </span>
 
-    <div className="flex flex-col gap-0.5">
-      <SelectPrimitive.ItemText className="font-medium">{title}</SelectPrimitive.ItemText>
-      {description && <span className="text-xs text-neutral-500 leading-tight">{description}</span>}
-    </div>
-  </SelectPrimitive.Item>
-));
+      <div className="flex flex-col gap-0.5">
+        <SelectPrimitive.ItemText className="font-medium">{title}</SelectPrimitive.ItemText>
+        {description && <span className="text-xs text-neutral-500 leading-tight">{description}</span>}
+      </div>
+    </SelectPrimitive.Item>
+  );
+}
 SelectItemWithDescription.displayName = 'SelectItemWithDescription';
 
-const SelectSeparator = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
->(({className, ...props}, ref) => (
-  <SelectPrimitive.Separator ref={ref} className={cn('-mx-1 my-1 h-px bg-neutral-100', className)} {...props} />
-));
+function SelectSeparator({className, ref, ...props}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+  return (
+    <SelectPrimitive.Separator ref={ref} className={cn('-mx-1 my-1 h-px bg-neutral-100', className)} {...props} />
+  );
+}
 SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
 
 export {
diff --git a/packages/ui/src/components/atoms/Separator.tsx b/packages/ui/src/components/atoms/Separator.tsx
index 1ee2a33..1997c93 100644
--- a/packages/ui/src/components/atoms/Separator.tsx
+++ b/packages/ui/src/components/atoms/Separator.tsx
@@ -5,22 +5,27 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-const Separator = React.forwardRef<
-  React.ElementRef<typeof SeparatorPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
->(({className, orientation = 'horizontal', decorative = true, ...props}, ref) => (
-  <SeparatorPrimitive.Root
-    ref={ref}
-    decorative={decorative}
-    orientation={orientation}
-    className={cn(
-      'shrink-0 bg-neutral-200',
-      orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
-      className,
-    )}
-    {...props}
-  />
-));
+function Separator({
+  className,
+  orientation = 'horizontal',
+  decorative = true,
+  ref,
+  ...props
+}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
+  return (
+    <SeparatorPrimitive.Root
+      ref={ref}
+      decorative={decorative}
+      orientation={orientation}
+      className={cn(
+        'shrink-0 bg-neutral-200',
+        orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 Separator.displayName = SeparatorPrimitive.Root.displayName;
 
 export {Separator};
diff --git a/packages/ui/src/components/atoms/Switch.tsx b/packages/ui/src/components/atoms/Switch.tsx
index efe226c..b97e10a 100644
--- a/packages/ui/src/components/atoms/Switch.tsx
+++ b/packages/ui/src/components/atoms/Switch.tsx
@@ -2,25 +2,24 @@ import * as React from 'react';
 import * as SwitchPrimitives from '@radix-ui/react-switch';
 import {cn} from '../../lib';
 
-const Switch = React.forwardRef<
-  React.ElementRef<typeof SwitchPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
->(({className, ...props}, ref) => (
-  <SwitchPrimitives.Root
-    className={cn(
-      'peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-white disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-neutral-900 data-[state=unchecked]:bg-neutral-200',
-      className,
-    )}
-    {...props}
-    ref={ref}
-  >
-    <SwitchPrimitives.Thumb
+function Switch({className, ref, ...props}: React.ComponentProps<typeof SwitchPrimitives.Root>) {
+  return (
+    <SwitchPrimitives.Root
       className={cn(
-        'pointer-events-none block h-4 w-4 rounded-full bg-white shadow-sm ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0',
+        'peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-white disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-neutral-900 data-[state=unchecked]:bg-neutral-200',
+        className,
       )}
-    />
-  </SwitchPrimitives.Root>
-));
+      {...props}
+      ref={ref}
+    >
+      <SwitchPrimitives.Thumb
+        className={cn(
+          'pointer-events-none block h-4 w-4 rounded-full bg-white shadow-sm ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0',
+        )}
+      />
+    </SwitchPrimitives.Root>
+  );
+}
 Switch.displayName = SwitchPrimitives.Root.displayName;
 
 export {Switch};
diff --git a/packages/ui/src/components/atoms/Table.tsx b/packages/ui/src/components/atoms/Table.tsx
index 919b2ed..d8b0923 100644
--- a/packages/ui/src/components/atoms/Table.tsx
+++ b/packages/ui/src/components/atoms/Table.tsx
@@ -2,51 +2,49 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-const Table = React.forwardRef<HTMLTableElement, React.HTMLAttributes<HTMLTableElement>>(
-  ({className, ...props}, ref) => (
+function Table({className, ref, ...props}: React.ComponentProps<'table'>) {
+  return (
     <div className="relative w-full overflow-auto">
       <table ref={ref} className={cn('w-full caption-bottom text-sm', className)} {...props} />
     </div>
-  ),
-);
+  );
+}
 Table.displayName = 'Table';
 
-const TableHeader = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
-  ({className, ...props}, ref) => <thead ref={ref} className={cn('[&_tr]:border-b', className)} {...props} />,
-);
+function TableHeader({className, ref, ...props}: React.ComponentProps<'thead'>) {
+  return <thead ref={ref} className={cn('[&_tr]:border-b', className)} {...props} />;
+}
 TableHeader.displayName = 'TableHeader';
 
-const TableBody = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
-  ({className, ...props}, ref) => (
-    <tbody ref={ref} className={cn('[&_tr:last-child]:border-0', className)} {...props} />
-  ),
-);
+function TableBody({className, ref, ...props}: React.ComponentProps<'tbody'>) {
+  return <tbody ref={ref} className={cn('[&_tr:last-child]:border-0', className)} {...props} />;
+}
 TableBody.displayName = 'TableBody';
 
-const TableFooter = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
-  ({className, ...props}, ref) => (
+function TableFooter({className, ref, ...props}: React.ComponentProps<'tfoot'>) {
+  return (
     <tfoot
       ref={ref}
       className={cn('border-t bg-neutral-50 font-medium [&>tr]:last:border-b-0', className)}
       {...props}
     />
-  ),
-);
+  );
+}
 TableFooter.displayName = 'TableFooter';
 
-const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTMLTableRowElement>>(
-  ({className, ...props}, ref) => (
+function TableRow({className, ref, ...props}: React.ComponentProps<'tr'>) {
+  return (
     <tr
       ref={ref}
       className={cn('border-b transition-colors hover:bg-neutral-50 data-[state=selected]:bg-neutral-100', className)}
       {...props}
     />
-  ),
-);
+  );
+}
 TableRow.displayName = 'TableRow';
 
-const TableHead = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<HTMLTableCellElement>>(
-  ({className, ...props}, ref) => (
+function TableHead({className, ref, ...props}: React.ComponentProps<'th'>) {
+  return (
     <th
       ref={ref}
       className={cn(
@@ -55,22 +53,18 @@ const TableHead = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<
       )}
       {...props}
     />
-  ),
-);
+  );
+}
 TableHead.displayName = 'TableHead';
 
-const TableCell = React.forwardRef<HTMLTableCellElement, React.TdHTMLAttributes<HTMLTableCellElement>>(
-  ({className, ...props}, ref) => (
-    <td ref={ref} className={cn('p-4 align-middle [&:has([role=checkbox])]:pr-0', className)} {...props} />
-  ),
-);
+function TableCell({className, ref, ...props}: React.ComponentProps<'td'>) {
+  return <td ref={ref} className={cn('p-4 align-middle [&:has([role=checkbox])]:pr-0', className)} {...props} />;
+}
 TableCell.displayName = 'TableCell';
 
-const TableCaption = React.forwardRef<HTMLTableCaptionElement, React.HTMLAttributes<HTMLTableCaptionElement>>(
-  ({className, ...props}, ref) => (
-    <caption ref={ref} className={cn('mt-4 text-sm text-neutral-500', className)} {...props} />
-  ),
-);
+function TableCaption({className, ref, ...props}: React.ComponentProps<'caption'>) {
+  return <caption ref={ref} className={cn('mt-4 text-sm text-neutral-500', className)} {...props} />;
+}
 TableCaption.displayName = 'TableCaption';
 
 export {Table, TableBody, TableCaption, TableCell, TableFooter, TableHead, TableHeader, TableRow};
diff --git a/packages/ui/src/components/atoms/Tabs.tsx b/packages/ui/src/components/atoms/Tabs.tsx
index 4ac0284..4822f2e 100644
--- a/packages/ui/src/components/atoms/Tabs.tsx
+++ b/packages/ui/src/components/atoms/Tabs.tsx
@@ -7,49 +7,46 @@ import {cn} from '../../lib';
 
 const Tabs = TabsPrimitive.Root;
 
-const TabsList = React.forwardRef<
-  React.ElementRef<typeof TabsPrimitive.List>,
-  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
->(({className, ...props}, ref) => (
-  <TabsPrimitive.List
-    ref={ref}
-    className={cn(
-      'inline-flex h-10 items-center justify-start rounded-md bg-neutral-100 p-1 text-neutral-500',
-      className,
-    )}
-    {...props}
-  />
-));
+function TabsList({className, ref, ...props}: React.ComponentProps<typeof TabsPrimitive.List>) {
+  return (
+    <TabsPrimitive.List
+      ref={ref}
+      className={cn(
+        'inline-flex h-10 items-center justify-start rounded-md bg-neutral-100 p-1 text-neutral-500',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 TabsList.displayName = TabsPrimitive.List.displayName;
 
-const TabsTrigger = React.forwardRef<
-  React.ElementRef<typeof TabsPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
->(({className, ...props}, ref) => (
-  <TabsPrimitive.Trigger
-    ref={ref}
-    className={cn(
-      'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-white transition-all hover:text-neutral-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-neutral-950 data-[state=active]:shadow-sm',
-      className,
-    )}
-    {...props}
-  />
-));
+function TabsTrigger({className, ref, ...props}: React.ComponentProps<typeof TabsPrimitive.Trigger>) {
+  return (
+    <TabsPrimitive.Trigger
+      ref={ref}
+      className={cn(
+        'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-white transition-all hover:text-neutral-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-neutral-950 data-[state=active]:shadow-sm',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
 
-const TabsContent = React.forwardRef<
-  React.ElementRef<typeof TabsPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
->(({className, ...props}, ref) => (
-  <TabsPrimitive.Content
-    ref={ref}
-    className={cn(
-      'mt-2 ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
-      className,
-    )}
-    {...props}
-  />
-));
+function TabsContent({className, ref, ...props}: React.ComponentProps<typeof TabsPrimitive.Content>) {
+  return (
+    <TabsPrimitive.Content
+      ref={ref}
+      className={cn(
+        'mt-2 ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 TabsContent.displayName = TabsPrimitive.Content.displayName;
 
 export {Tabs, TabsList, TabsTrigger, TabsContent};
diff --git a/packages/ui/src/components/atoms/Textarea.tsx b/packages/ui/src/components/atoms/Textarea.tsx
index 772e3ab..782b266 100644
--- a/packages/ui/src/components/atoms/Textarea.tsx
+++ b/packages/ui/src/components/atoms/Textarea.tsx
@@ -2,9 +2,7 @@ import * as React from 'react';
 
 import {cn} from '../../lib';
 
-export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
-
-const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(({className, ...props}, ref) => {
+function Textarea({className, ref, ...props}: React.ComponentProps<'textarea'>) {
   return (
     <textarea
       className={cn(
@@ -15,7 +13,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(({classNam
       {...props}
     />
   );
-});
+}
 Textarea.displayName = 'Textarea';
 
 export {Textarea};
diff --git a/packages/ui/src/components/atoms/Tooltip.tsx b/packages/ui/src/components/atoms/Tooltip.tsx
index 0c584cd..3646407 100644
--- a/packages/ui/src/components/atoms/Tooltip.tsx
+++ b/packages/ui/src/components/atoms/Tooltip.tsx
@@ -11,20 +11,24 @@ const Tooltip = TooltipPrimitive.Root;
 
 const TooltipTrigger = TooltipPrimitive.Trigger;
 
-const TooltipContent = React.forwardRef<
-  React.ElementRef<typeof TooltipPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({className, sideOffset = 4, ...props}, ref) => (
-  <TooltipPrimitive.Content
-    ref={ref}
-    sideOffset={sideOffset}
-    className={cn(
-      'z-50 overflow-hidden rounded-md border border-neutral-200 bg-white px-3 py-1.5 text-sm text-neutral-950 shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-      className,
-    )}
-    {...props}
-  />
-));
+function TooltipContent({
+  className,
+  sideOffset = 4,
+  ref,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
+  return (
+    <TooltipPrimitive.Content
+      ref={ref}
+      sideOffset={sideOffset}
+      className={cn(
+        'z-50 overflow-hidden rounded-md border border-neutral-200 bg-white px-3 py-1.5 text-sm text-neutral-950 shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+        className,
+      )}
+      {...props}
+    />
+  );
+}
 TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
 export {Tooltip, TooltipTrigger, TooltipContent, TooltipProvider};
diff --git a/packages/ui/src/components/molecules/ConfirmDialog.tsx b/packages/ui/src/components/molecules/ConfirmDialog.tsx
index ca9911e..de32298 100644
--- a/packages/ui/src/components/molecules/ConfirmDialog.tsx
+++ b/packages/ui/src/components/molecules/ConfirmDialog.tsx
@@ -12,7 +12,7 @@ export interface ConfirmDialogProps {
   confirmText?: string;
   cancelText?: string;
   variant?: 'default' | 'destructive';
-  isLoading?: boolean;
+  status?: 'idle' | 'loading';
 }
 
 export function ConfirmDialog({
@@ -24,8 +24,10 @@ export function ConfirmDialog({
   confirmText = 'Confirm',
   cancelText = 'Cancel',
   variant = 'default',
-  isLoading = false,
+  status = 'idle',
 }: ConfirmDialogProps) {
+  const isLoading = status === 'loading';
+
   const handleConfirm = async () => {
     await onConfirm();
     onOpenChange(false);
diff --git a/packages/ui/src/components/molecules/StickySaveBar.tsx b/packages/ui/src/components/molecules/StickySaveBar.tsx
index 216d27c..0b20bde 100644
--- a/packages/ui/src/components/molecules/StickySaveBar.tsx
+++ b/packages/ui/src/components/molecules/StickySaveBar.tsx
@@ -6,86 +6,72 @@ import {Button} from '../atoms/Button';
 import {cn} from '../../lib';
 
 export interface StickySaveBarProps {
-  hasChanges: boolean;
-  isSubmitting: boolean;
+  status: 'idle' | 'dirty' | 'saving';
   onSave: (e: React.FormEvent) => void | Promise<void>;
   className?: string;
 }
 
-export const StickySaveBar = React.forwardRef<HTMLDivElement, StickySaveBarProps>(
-  ({hasChanges, isSubmitting, onSave, className}, ref) => {
-    const [isDismissed, setIsDismissed] = React.useState(false);
+export function StickySaveBar({status, onSave, className}: StickySaveBarProps) {
+  const [dismissedForStatus, setDismissedForStatus] = React.useState<string | null>(null);
 
-    // Reset dismissed state when hasChanges becomes true
-    React.useEffect(() => {
-      if (hasChanges) {
-        setIsDismissed(false);
-      }
-    }, [hasChanges]);
+  const isVisible = status !== 'idle' && dismissedForStatus !== status;
+  const isSaving = status === 'saving';
 
-    const handleSave = (e: React.FormEvent) => {
-      onSave(e);
-    };
-
-    return (
-      <AnimatePresence>
-        {hasChanges && !isDismissed && (
-          <motion.div
-            ref={ref}
-            initial={{opacity: 0, y: 20, scale: 0.95}}
-            animate={{opacity: 1, y: 0, scale: 1}}
-            exit={{opacity: 0, y: 20, scale: 0.95}}
-            transition={{type: 'spring', stiffness: 300, damping: 25}}
-            className={cn(
-              'fixed bottom-6 right-6 z-50 w-72 rounded-md border border-neutral-200 bg-white shadow-lg',
-              className,
-            )}
-          >
-            <div className="flex items-center justify-between gap-3 px-4 py-3">
-              <div className="flex items-center gap-2">
-                <div className="h-2 w-2 rounded-full bg-amber-500" />
-                <span className="text-sm font-medium text-neutral-900">Unsaved changes</span>
-              </div>
-              <button
-                type="button"
-                onClick={() => setIsDismissed(true)}
-                className="text-neutral-400 hover:text-neutral-600 transition-colors -mr-1"
-                aria-label="Dismiss"
-              >
-                <X className="h-4 w-4" />
-              </button>
+  return (
+    <AnimatePresence>
+      {isVisible && (
+        <motion.div
+          initial={{opacity: 0, y: 20, scale: 0.95}}
+          animate={{opacity: 1, y: 0, scale: 1}}
+          exit={{opacity: 0, y: 20, scale: 0.95}}
+          transition={{type: 'spring', stiffness: 300, damping: 25}}
+          className={cn(
+            'fixed bottom-6 right-6 z-50 w-72 rounded-md border border-neutral-200 bg-white shadow-lg',
+            className,
+          )}
+        >
+          <div className="flex items-center justify-between gap-3 px-4 py-3">
+            <div className="flex items-center gap-2">
+              <div className="h-2 w-2 rounded-full bg-amber-500" />
+              <span className="text-sm font-medium text-neutral-900">Unsaved changes</span>
             </div>
-            <div className="border-t border-neutral-100 px-4 py-3">
-              <Button
-                type="button"
-                onClick={handleSave}
-                disabled={isSubmitting}
-                size="sm"
-                className="w-full"
-              >
-                {isSubmitting ? (
-                  <>
-                    <motion.div
-                      animate={{rotate: 360}}
-                      transition={{duration: 1, repeat: Infinity, ease: 'linear'}}
-                    >
-                      <Save className="h-3 w-3" />
-                    </motion.div>
-                    Saving...
-                  </>
-                ) : (
-                  <>
+            <button
+              type="button"
+              onClick={() => setDismissedForStatus(status)}
+              className="text-neutral-400 hover:text-neutral-600 transition-colors -mr-1"
+              aria-label="Dismiss"
+            >
+              <X className="h-4 w-4" />
+            </button>
+          </div>
+          <div className="border-t border-neutral-100 px-4 py-3">
+            <Button
+              type="button"
+              onClick={onSave}
+              disabled={isSaving}
+              size="sm"
+              className="w-full"
+            >
+              {isSaving ? (
+                <>
+                  <motion.div
+                    animate={{rotate: 360}}
+                    transition={{duration: 1, repeat: Infinity, ease: 'linear'}}
+                  >
                     <Save className="h-3 w-3" />
-                    Save Changes
-                  </>
-                )}
-              </Button>
-            </div>
-          </motion.div>
-        )}
-      </AnimatePresence>
-    );
-  },
-);
-
-StickySaveBar.displayName = 'StickySaveBar';
+                  </motion.div>
+                  Saving...
+                </>
+              ) : (
+                <>
+                  <Save className="h-3 w-3" />
+                  Save Changes
+                </>
+              )}
+            </Button>
+          </div>
+        </motion.div>
+      )}
+    </AnimatePresence>
+  );
+}