diff --git a/src/components/admin/custom-fields/custom-field-form.tsx b/src/components/admin/custom-fields/custom-field-form.tsx
index 7ca55d83..a22993ee 100644
--- a/src/components/admin/custom-fields/custom-field-form.tsx
+++ b/src/components/admin/custom-fields/custom-field-form.tsx
@@ -7,6 +7,7 @@ import { Plus, X } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { FieldLabel } from '@/components/ui/field-label';
 import { Switch } from '@/components/ui/switch';
 import {
   Dialog,
@@ -297,7 +298,12 @@ function CustomFieldFormBody({ open, onOpenChange, field, onSuccess }: CustomFie
 
           {/* Sort Order */}
           <div className="space-y-1.5">
-            <Label htmlFor="cf-sort-order">Sort Order</Label>
+            <FieldLabel
+              htmlFor="cf-sort-order"
+              tooltip="Lower numbers render first when the field set is shown on entity detail pages. Use to pin frequently-edited fields to the top."
+            >
+              Sort Order
+            </FieldLabel>
             <Input
               id="cf-sort-order"
               type="number"
diff --git a/src/components/interests/interest-documents-tab.tsx b/src/components/interests/interest-documents-tab.tsx
index 1782aaae..77116df8 100644
--- a/src/components/interests/interest-documents-tab.tsx
+++ b/src/components/interests/interest-documents-tab.tsx
@@ -97,7 +97,7 @@ export function InterestDocumentsTab({ interestId }: InterestDocumentsTabProps)
     <div className="space-y-8">
       <section className="space-y-4">
         <div className="flex items-center justify-between">
-          <h3 className="text-sm font-medium text-muted-foreground">Legal documents</h3>
+          <h3 className="text-sm font-medium text-muted-foreground">Signature documents</h3>
           <Button size="sm" variant="outline" onClick={() => setEoiDialogOpen(true)}>
             Generate EOI
           </Button>
diff --git a/src/components/yachts/yacht-ownership-history.tsx b/src/components/yachts/yacht-ownership-history.tsx
index 076ef50e..3b701a16 100644
--- a/src/components/yachts/yacht-ownership-history.tsx
+++ b/src/components/yachts/yacht-ownership-history.tsx
@@ -1,9 +1,11 @@
 'use client';
 
+import { useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { useParams } from 'next/navigation';
-import { Loader2 } from 'lucide-react';
+import { Loader2, ArrowLeftRight } from 'lucide-react';
 
+import { Button } from '@/components/ui/button';
 import {
   Table,
   TableBody,
@@ -15,6 +17,8 @@ import {
 import { Badge } from '@/components/ui/badge';
 import { EmptyState } from '@/components/shared/empty-state';
 import { OwnerLink } from '@/components/yachts/yacht-detail-header';
+import { YachtTransferDialog } from '@/components/yachts/yacht-transfer-dialog';
+import { PermissionGate } from '@/components/shared/permission-gate';
 import { apiFetch } from '@/lib/api/client';
 
 interface OwnershipHistoryRow {
@@ -52,6 +56,7 @@ function formatDate(value: string | null): string {
 export function YachtOwnershipHistory({ yachtId }: YachtOwnershipHistoryProps) {
   const params = useParams<{ portSlug: string }>();
   const portSlug = params?.portSlug ?? '';
+  const [transferOpen, setTransferOpen] = useState(false);
 
   const { data, isLoading } = useQuery<OwnershipHistoryRow[]>({
     queryKey: ['yachts', yachtId, 'ownership-history'],
@@ -61,6 +66,11 @@ export function YachtOwnershipHistory({ yachtId }: YachtOwnershipHistoryProps) {
       ),
   });
 
+  const currentOwnerRow = data?.find((r) => r.endDate === null);
+  const currentOwner = currentOwnerRow
+    ? { type: currentOwnerRow.ownerType, id: currentOwnerRow.ownerId }
+    : undefined;
+
   if (isLoading) {
     return (
       <div className="flex items-center justify-center py-12">
@@ -71,53 +81,78 @@ export function YachtOwnershipHistory({ yachtId }: YachtOwnershipHistoryProps) {
 
   if (!data || data.length === 0) {
     return (
-      <EmptyState
-        title="No ownership history"
-        description="This yacht's ownership transfers will appear here."
-      />
+      <>
+        <EmptyState
+          title="No ownership history"
+          description="This yacht's ownership transfers will appear here."
+          action={{ label: 'Transfer ownership', onClick: () => setTransferOpen(true) }}
+        />
+        <YachtTransferDialog
+          open={transferOpen}
+          onOpenChange={setTransferOpen}
+          yachtId={yachtId}
+          currentOwner={currentOwner}
+        />
+      </>
     );
   }
 
   return (
-    <div className="rounded-md border">
-      <Table>
-        <TableHeader>
-          <TableRow>
-            <TableHead>Start Date</TableHead>
-            <TableHead>End Date</TableHead>
-            <TableHead>Owner</TableHead>
-            <TableHead>Reason</TableHead>
-            <TableHead>Notes</TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {data.map((row) => (
-            <TableRow key={row.id}>
-              <TableCell>{formatDate(row.startDate)}</TableCell>
-              <TableCell>
-                {row.endDate ? (
-                  formatDate(row.endDate)
-                ) : (
-                  <Badge variant="secondary" className="text-xs">
-                    Current
-                  </Badge>
-                )}
-              </TableCell>
-              <TableCell>
-                <OwnerLink portSlug={portSlug} type={row.ownerType} id={row.ownerId} />
-              </TableCell>
-              <TableCell className="text-sm text-muted-foreground">
-                {row.transferReason
-                  ? (REASON_LABELS[row.transferReason] ?? row.transferReason)
-                  : '-'}
-              </TableCell>
-              <TableCell className="text-sm text-muted-foreground max-w-[320px] truncate">
-                {row.transferNotes ?? '-'}
-              </TableCell>
+    <div className="space-y-3">
+      <div className="flex items-center justify-end">
+        <PermissionGate resource="yachts" action="edit">
+          <Button size="sm" onClick={() => setTransferOpen(true)} className="gap-1.5">
+            <ArrowLeftRight className="size-4" aria-hidden />
+            Transfer ownership
+          </Button>
+        </PermissionGate>
+      </div>
+      <div className="rounded-md border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Start Date</TableHead>
+              <TableHead>End Date</TableHead>
+              <TableHead>Owner</TableHead>
+              <TableHead>Reason</TableHead>
+              <TableHead>Notes</TableHead>
             </TableRow>
-          ))}
-        </TableBody>
-      </Table>
+          </TableHeader>
+          <TableBody>
+            {data.map((row) => (
+              <TableRow key={row.id}>
+                <TableCell>{formatDate(row.startDate)}</TableCell>
+                <TableCell>
+                  {row.endDate ? (
+                    formatDate(row.endDate)
+                  ) : (
+                    <Badge variant="secondary" className="text-xs">
+                      Current
+                    </Badge>
+                  )}
+                </TableCell>
+                <TableCell>
+                  <OwnerLink portSlug={portSlug} type={row.ownerType} id={row.ownerId} />
+                </TableCell>
+                <TableCell className="text-sm text-muted-foreground">
+                  {row.transferReason
+                    ? (REASON_LABELS[row.transferReason] ?? row.transferReason)
+                    : '-'}
+                </TableCell>
+                <TableCell className="text-sm text-muted-foreground max-w-[320px] truncate">
+                  {row.transferNotes ?? '-'}
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+      <YachtTransferDialog
+        open={transferOpen}
+        onOpenChange={setTransferOpen}
+        yachtId={yachtId}
+        currentOwner={currentOwner}
+      />
     </div>
   );
 }