diff --git a/src/components/clients/client-tabs.tsx b/src/components/clients/client-tabs.tsx
index 9764650..b4ca8e4 100644
--- a/src/components/clients/client-tabs.tsx
+++ b/src/components/clients/client-tabs.tsx
@@ -116,6 +116,8 @@ interface ClientTabsOptions {
       tenureType: string;
       status: string;
     }>;
+    interestCount?: number;
+    noteCount?: number;
     tags?: Array<{ id: string; name: string; color: string }>;
   };
 }
@@ -224,6 +226,7 @@ export function getClientTabs({ clientId, currentUserId, client }: ClientTabsOpt
     {
       id: 'interests',
       label: 'Interests',
+      badge: client.interestCount,
       content: <ClientInterestsTab clientId={clientId} />,
     },
     {
@@ -261,6 +264,7 @@ export function getClientTabs({ clientId, currentUserId, client }: ClientTabsOpt
     {
       id: 'notes',
       label: 'Notes',
+      badge: client.noteCount,
       content: <NotesList entityType="clients" entityId={clientId} currentUserId={currentUserId} />,
     },
     {
diff --git a/src/components/companies/company-detail-header.tsx b/src/components/companies/company-detail-header.tsx
index b7f0f9f..228e31a 100644
--- a/src/components/companies/company-detail-header.tsx
+++ b/src/components/companies/company-detail-header.tsx
@@ -77,7 +77,9 @@ export function CompanyDetailHeader({ company }: CompanyDetailHeaderProps) {
   return (
     <>
       <DetailHeaderStrip>
-        <div className="flex items-start gap-3 flex-wrap">
+        {/* Stack actions below the title block on phone widths; horizontal
+            beside it from sm up. */}
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:flex-wrap sm:gap-3">
           <div className="flex-1 min-w-0">
             <div className="flex items-center gap-2 flex-wrap">
               <h1 className="hidden sm:block text-2xl font-bold text-foreground truncate">
diff --git a/src/components/companies/company-tabs.tsx b/src/components/companies/company-tabs.tsx
index 4a5feaa..4fa2b44 100644
--- a/src/components/companies/company-tabs.tsx
+++ b/src/components/companies/company-tabs.tsx
@@ -146,7 +146,11 @@ function OverviewTab({ companyId, company }: { companyId: string; company: Compa
           </EditableRow>
           <EditableRow label="Incorporation Date">
             <InlineEditableField
-              value={company.incorporationDate}
+              // The API returns this as an ISO timestamp ("2019-03-14T00:00:00.000Z")
+              // because Postgres `date` columns are serialized through JSON. Strip
+              // the time portion so the read-only state shows just YYYY-MM-DD,
+              // which is also the format the user types when editing.
+              value={company.incorporationDate ? company.incorporationDate.slice(0, 10) : null}
               placeholder="YYYY-MM-DD"
               onSave={save('incorporationDate')}
             />
diff --git a/src/components/reminders/reminder-list.tsx b/src/components/reminders/reminder-list.tsx
index b9800e9..37761c7 100644
--- a/src/components/reminders/reminder-list.tsx
+++ b/src/components/reminders/reminder-list.tsx
@@ -249,7 +249,9 @@ export function ReminderList() {
         }
       />
 
-      <div className="flex items-center gap-4 mb-4">
+      {/* Wrap on phone widths so the priority filter doesn't get pushed
+          off-screen by the My/All tabs + status filter taking the full row. */}
+      <div className="flex flex-wrap items-center gap-3 mb-4 sm:gap-4">
         {canViewAll && (
           <Tabs value={viewMode} onValueChange={(v) => setViewMode(v as 'my' | 'all')}>
             <TabsList>
diff --git a/src/components/yachts/yacht-detail-header.tsx b/src/components/yachts/yacht-detail-header.tsx
index 2a60245..5306396 100644
--- a/src/components/yachts/yacht-detail-header.tsx
+++ b/src/components/yachts/yacht-detail-header.tsx
@@ -142,7 +142,10 @@ export function YachtDetailHeader({ yacht }: YachtDetailHeaderProps) {
   return (
     <>
       <DetailHeaderStrip>
-        <div className="flex items-start gap-3 flex-wrap">
+        {/* Stacks vertically on phone widths so the action cluster doesn't
+            crush the status pill / owner row. From sm up, title block sits
+            beside actions in the original layout. */}
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:gap-3 sm:flex-wrap">
           <div className="flex-1 min-w-0">
             <div className="flex items-center gap-2 flex-wrap">
               <h1 className="hidden sm:block text-2xl font-bold text-foreground truncate">
diff --git a/src/lib/services/clients.service.ts b/src/lib/services/clients.service.ts
index 7bfc5ac..290c2e1 100644
--- a/src/lib/services/clients.service.ts
+++ b/src/lib/services/clients.service.ts
@@ -4,6 +4,7 @@ import { db } from '@/lib/db';
 import {
   clients,
   clientContacts,
+  clientNotes,
   clientRelationships,
   clientTags,
   clientAddresses,
@@ -251,6 +252,19 @@ export async function getClientById(id: string, portId: string) {
 
   const portalEnabled = await isPortalEnabledForPort(portId);
 
+  // Counts surfaced for tab badges (Interests + Notes — Yachts/Companies/etc
+  // get their counts from the corresponding row arrays we already fetched).
+  const [interestCountRow] = await db
+    .select({ count: count() })
+    .from(interests)
+    .where(
+      and(eq(interests.portId, portId), eq(interests.clientId, id), isNull(interests.archivedAt)),
+    );
+  const [noteCountRow] = await db
+    .select({ count: count() })
+    .from(clientNotes)
+    .where(eq(clientNotes.clientId, id));
+
   return {
     ...client,
     contacts,
@@ -259,6 +273,8 @@ export async function getClientById(id: string, portId: string) {
     yachts: yachtRows,
     companies: membershipRows,
     activeReservations,
+    interestCount: interestCountRow?.count ?? 0,
+    noteCount: noteCountRow?.count ?? 0,
     clientPortalEnabled: portalEnabled,
   };
 }