diff --git a/app/portal/rigs/page.tsx b/app/portal/rigs/page.tsx
index 129a6bc9..060f39f0 100644
--- a/app/portal/rigs/page.tsx
+++ b/app/portal/rigs/page.tsx
@@ -1,13 +1,46 @@
 // app/portal/rigs/page.tsx
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
 import RigsSwitcher from "@/components/portal/RigsSwitcher";
 
-export const metadata = { title: "MakerDash • Rigs" };
+type Opt = { id: string | number; label: string };
+
+export default async function Page() {
+    const jar = await cookies(); // Next 15: async cookies()
+    const ma_at = jar.get("ma_at")?.value;
+    if (!ma_at) redirect("/auth/sign-in?next=/portal/rigs");
+
+    const DIRECTUS = (process.env.DIRECTUS_URL || "").replace(/\/$/, "");
+    let rigTypes: Opt[] = [];
+
+    try {
+        const res = await fetch(
+            `${DIRECTUS}/items/user_rig_type?fields=id,name&sort=sort`,
+            {
+                headers: {
+                    Authorization: `Bearer ${ma_at}`,
+                    Accept: "application/json",
+                    "Cache-Control": "no-store",
+                },
+                cache: "no-store",
+            }
+        );
+
+        if (res.ok) {
+            const json = await res.json();
+            rigTypes = (json?.data ?? []).map((r: any) => ({
+                id: r.id,
+                label: r.name ?? String(r.id),
+            }));
+        }
+    } catch {
+        // fall back to empty
+    }
 
-export default function RigsPortalPage() {
     return (
         <div className="rounded-lg border p-6">
         <h2 className="mb-4 text-xl font-semibold">Rigs</h2>
-        <RigsSwitcher />
+        <RigsSwitcher rigTypes={rigTypes} />
         </div>
     );
 }
diff --git a/app/rigs/page.tsx b/app/rigs/page.tsx
index b7d34289..f7bf1a9f 100644
--- a/app/rigs/page.tsx
+++ b/app/rigs/page.tsx
@@ -1,52 +1,30 @@
-// app/portal/rigs/page.tsx
-import { cookies } from "next/headers";
-import { redirect } from "next/navigation";
-import RigsSwitcher from "@/components/portal/RigsSwitcher";
-
-type Opt = { id: string | number; label: string };
-
-export default async function Page() {
-    const jar = await cookies(); // Next 15: async
-    const ma_at = jar.get("ma_at")?.value;
-    if (!ma_at) {
-        redirect("/auth/sign-in?next=/portal/rigs");
-    }
-
-    const DIRECTUS = (process.env.DIRECTUS_URL || "").replace(/\/$/, "");
-    let rigTypes: Opt[] = [];
-
-    try {
-        const res = await fetch(
-            `${DIRECTUS}/items/user_rig_type?fields=id,name&sort=sort`,
-            {
-                headers: {
-                    Authorization: `Bearer ${ma_at}`,
-                    Accept: "application/json",
-                    "Cache-Control": "no-store",
-                },
-                cache: "no-store",
-            }
-        );
-
-        if (res.ok) {
-            const json = await res.json();
-            rigTypes = (json?.data ?? []).map((r: any) => ({
-                id: r.id,
-                label: r.name ?? String(r.id),
-            }));
-        } else {
-            // Optional: log server-side for debugging
-            // console.error("Failed to fetch user_rig_type", res.status);
-            rigTypes = [];
-        }
-    } catch {
-        rigTypes = [];
-    }
+// app/rigs/page.tsx
+import RigBuilderServer from "./RigBuilderServer";
+import RigsListClient from "./RigsListClient";
 
+export default function Page() {
     return (
-        <div className="rounded-lg border p-6">
-        <h2 className="mb-4 text-xl font-semibold">Rigs</h2>
-        <RigsSwitcher rigTypes={rigTypes} />
+        <div className="p-4 space-y-6">
+        <header>
+        <h1 className="text-2xl font-bold mb-1">Rigs</h1>
+        <p className="text-sm text-muted-foreground">
+        Manage rigs used when submitting settings.
+        </p>
+        </header>
+
+        <div className="grid gap-6 md:grid-cols-2">
+        {/* Left: existing rigs */}
+        <section>
+        <h2 className="text-lg font-semibold mb-2">My Rigs</h2>
+        <RigsListClient />
+        </section>
+
+        {/* Right: create a new rig (server-provided rig types) */}
+        <section>
+        <h2 className="text-lg font-semibold mb-2">Create Rig</h2>
+        <RigBuilderServer />
+        </section>
+        </div>
         </div>
     );
 }