diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index 2c5d9f1..82536e1 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -143,7 +143,7 @@ export function CustomFormBuilder() {
       .from("custom_form_templates")
       .select("*")
       .order("updated_at", { ascending: false });
-    setTemplates((data ?? []) as SavedTemplate[]);
+    setTemplates((data ?? []) as unknown as SavedTemplate[]);
   };
 
   // Apply font style to editor DOM
diff --git a/src/routes/cases.$caseId.tsx b/src/routes/cases.$caseId.tsx
index 3e182dd..4fc116d 100644
--- a/src/routes/cases.$caseId.tsx
+++ b/src/routes/cases.$caseId.tsx
@@ -8,7 +8,7 @@ import { Badge } from "@/components/ui/badge";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { supabase } from "@/integrations/supabase/client";
-import { ArrowLeft, FileText, Clock, DollarSign, Activity, Receipt, Scale, Users, Contact, Phone } from "lucide-react";
+import { ArrowLeft, FileText, Clock, DollarSign, Activity, Receipt, Scale, Users, Contact, Phone, Tag } from "lucide-react";
 import { ContactsLinkTab } from "@/components/contacts/contacts-link-tab";
 import { CaseCallLogsTab } from "@/components/cases/call-logs-tab";
 import { formatCurrency, formatDate, statusBadgeClass } from "@/lib/format";
@@ -19,6 +19,7 @@ import { CaseStatusTab } from "@/components/cases/status-tab";
 import { CaseInvoicesTab } from "@/components/cases/invoices-tab";
 import { CaseLitigationTab } from "@/components/cases/litigation-tab";
 import { CaseCollectionsTab } from "@/components/cases/collections-tab";
+import { CaseCustomFieldsTab } from "@/components/cases/custom-fields-tab";
 import { toast } from "sonner";
 import { useAuth } from "@/lib/auth";
 
@@ -164,6 +165,7 @@ function CaseTabs({ data, caseId, canManage, load }: { data: any; caseId: string
         <TabsTrigger value="expenses"><DollarSign className="h-3.5 w-3.5 mr-1.5" />Expenses</TabsTrigger>
         <TabsTrigger value="invoices"><Receipt className="h-3.5 w-3.5 mr-1.5" />Invoices</TabsTrigger>
         <TabsTrigger value="calls"><Phone className="h-3.5 w-3.5 mr-1.5" />Calls</TabsTrigger>
+        <TabsTrigger value="custom"><Tag className="h-3.5 w-3.5 mr-1.5" />Custom fields</TabsTrigger>
         {(data.client?.client_type === "hoa" || data.client?.client_type === "condo") && (
           <TabsTrigger value="collections"><Users className="h-3.5 w-3.5 mr-1.5" />Collections</TabsTrigger>
         )}
@@ -176,6 +178,7 @@ function CaseTabs({ data, caseId, canManage, load }: { data: any; caseId: string
       <TabsContent value="expenses"><CaseExpensesTab caseId={caseId} /></TabsContent>
       <TabsContent value="invoices"><CaseInvoicesTab caseRecord={data} /></TabsContent>
       <TabsContent value="calls"><CaseCallLogsTab caseId={caseId} /></TabsContent>
+      <TabsContent value="custom"><CaseCustomFieldsTab caseId={caseId} /></TabsContent>
       {(data.client?.client_type === "hoa" || data.client?.client_type === "condo") && (
         <TabsContent value="collections"><CaseCollectionsTab caseRecord={data} /></TabsContent>
       )}
diff --git a/src/routes/settings.tsx b/src/routes/settings.tsx
index 911bbfc..d272b66 100644
--- a/src/routes/settings.tsx
+++ b/src/routes/settings.tsx
@@ -13,6 +13,7 @@ const TABS = [
   { to: "/settings/profile", label: "My profile", anyone: true },
   { to: "/settings", label: "Company", exact: true },
   { to: "/settings/fees", label: "Fee schedule" },
+  { to: "/settings/custom-fields", label: "Custom case fields" },
   { to: "/settings/workflow", label: "Collections workflow" },
   { to: "/settings/workflows", label: "Task workflows" },
   { to: "/settings/smtp", label: "Email (SMTP)" },