diff --git a/apps/rowboat/app/actions/testing_actions.ts b/apps/rowboat/app/actions/testing_actions.ts
index c697b483..ed6ee745 100644
--- a/apps/rowboat/app/actions/testing_actions.ts
+++ b/apps/rowboat/app/actions/testing_actions.ts
@@ -170,6 +170,7 @@ export async function createSimulation(
     projectId: string,
     data: {
         name: string;
+        description?: string;
         scenarioId: string;
         profileId: string | null;
         passCriteria: string;
@@ -195,6 +196,7 @@ export async function updateSimulation(
     simulationId: string,
     updates: {
         name?: string;
+        description?: string;
         scenarioId?: string;
         profileId?: string | null;
         passCriteria?: string;
@@ -268,7 +270,6 @@ export async function deleteProfile(projectId: string, profileId: string): Promi
     await testProfilesCollection.deleteOne({
         _id: new ObjectId(profileId),
         projectId,
-        default: false,
     });
 }
 
@@ -449,6 +450,15 @@ export async function updateRun(
     );
 }
 
+export async function cancelRun(projectId: string, runId: string): Promise<void> {
+    await projectAuthCheck(projectId);
+
+    await testRunsCollection.updateOne(
+        { _id: new ObjectId(runId), projectId },
+        { $set: { status: 'cancelled' } }
+    );
+}
+
 export async function listResults(
     projectId: string,
     runId: string,
@@ -510,6 +520,7 @@ export async function createResult(
         simulationId: string;
         result: 'pass' | 'fail';
         details: string;
+        transcript: string;
     }
 ): Promise<WithStringId<z.infer<typeof TestResult>>> {
     await projectAuthCheck(projectId);
@@ -544,4 +555,56 @@ export async function updateResult(
             $set: updates,
         }
     );
+}
+
+export async function getSimulationResult(
+    projectId: string,
+    runId: string,
+    simulationId: string
+): Promise<WithStringId<z.infer<typeof TestResult>> | null> {
+    await projectAuthCheck(projectId);
+    
+    const result = await testResultsCollection.findOne({
+        projectId,
+        runId,
+        simulationId
+    });
+
+    if (!result) {
+        return null;
+    }
+
+    const { _id, ...rest } = result;
+    return {
+        ...rest,
+        _id: _id.toString(),
+    };
+}
+
+export async function listRunSimulations(
+    projectId: string,
+    simulationIds: string[]
+): Promise<WithStringId<z.infer<typeof TestSimulation>>[]> {
+    await projectAuthCheck(projectId);
+    
+    const simulations = await testSimulationsCollection
+        .find({ 
+            _id: { $in: simulationIds.map(id => new ObjectId(id)) },
+            projectId 
+        })
+        .toArray();
+
+    // Fetch associated scenario and profile names
+    const enrichedSimulations = await Promise.all(simulations.map(async (simulation) => {
+        const scenario = simulation.scenarioId ? await testScenariosCollection.findOne({ _id: new ObjectId(simulation.scenarioId) }) : null;
+        const profile = simulation.profileId ? await testProfilesCollection.findOne({ _id: new ObjectId(simulation.profileId) }) : null;
+        return {
+            ...simulation,
+            _id: simulation._id.toString(),
+            scenarioName: scenario?.name || 'Unknown',
+            profileName: profile?.name || 'None',
+        };
+    }));
+
+    return enrichedSimulations;
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/lib/types/testing_types.ts b/apps/rowboat/app/lib/types/testing_types.ts
index ff544517..bbace333 100644
--- a/apps/rowboat/app/lib/types/testing_types.ts
+++ b/apps/rowboat/app/lib/types/testing_types.ts
@@ -20,12 +20,13 @@ export const TestProfile = z.object({
 
 export const TestSimulation = z.object({
     projectId: z.string(),
-    name: z.string().min(1, "Name cannot be empty"),
+    name: z.string(),
+    description: z.string().optional().nullable(),
+    createdAt: z.string().datetime(),
+    lastUpdatedAt: z.string().datetime(),
     scenarioId: z.string(),
     profileId: z.string().nullable(),
     passCriteria: z.string(),
-    createdAt: z.string().datetime(),
-    lastUpdatedAt: z.string().datetime(),
 });
 
 export const TestRun = z.object({
@@ -48,5 +49,6 @@ export const TestResult = z.object({
     runId: z.string(),
     simulationId: z.string(),
     result: z.union([z.literal('pass'), z.literal('fail')]),
-    details: z.string()
+    details: z.string(),
+    transcript: z.string()
 });
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/app.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/app.tsx
index 88837987..d8e8537f 100644
--- a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/app.tsx
@@ -6,6 +6,8 @@ import { ProfilesApp } from "./profiles_app";
 import { SimulationsApp } from "./simulations_app";
 import { usePathname } from "next/navigation";
 import { RunsApp } from "./runs_app";
+import { StructuredPanel } from "../../../../lib/components/structured-panel";
+import { ListItem } from "../../../../lib/components/structured-list";
 
 export function App({
     projectId,
@@ -43,21 +45,18 @@ export function App({
     ];
 
     return <div className="flex h-full">
-        <div className="w-40 shrink-0 p-2">
-            <ul>
+        <StructuredPanel title="TEST" tooltip="Browse and manage your test scenarios and runs">
+            <div className="overflow-auto flex flex-col gap-1 justify-start">
                 {menuItems.map((item) => (
-                    <li key={item.label}>
-                        <Link
-                            className={`block p-2 rounded-md text-sm ${
-                                pathname.startsWith(item.href) 
-                                    ? "bg-gray-100 dark:bg-neutral-800" 
-                                    : "hover:bg-gray-100 dark:hover:bg-neutral-800"
-                            }`}
-                            href={item.href}>{item.label}</Link>
-                    </li>
+                    <ListItem
+                        key={item.label}
+                        name={item.label}
+                        isSelected={pathname.startsWith(item.href)}
+                        onClick={() => router.push(item.href)}
+                    />
                 ))}
-            </ul>
-        </div>
+            </div>
+        </StructuredPanel>
         <div className="grow border-l border-gray-200 dark:border-neutral-800 p-2">
             {selection === "scenarios" && <ScenariosApp projectId={projectId} slug={innerSlug} />}
             {selection === "profiles" && <ProfilesApp projectId={projectId} slug={innerSlug} />}
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/item-view.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/item-view.tsx
new file mode 100644
index 00000000..c343e9db
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/item-view.tsx
@@ -0,0 +1,38 @@
+// First, let's create a reusable component for item views
+export function ItemView({
+    items,
+    actions
+}: {
+    items: { label: string; value: string | React.ReactNode }[];
+    actions: React.ReactNode;
+}) {
+    return (
+        <div className="max-w-3xl">
+            {/* Content */}
+            <div className="bg-white dark:bg-neutral-950 rounded-lg border border-gray-200 dark:border-neutral-800 overflow-hidden">
+                <div className="divide-y divide-gray-100 dark:divide-neutral-800">
+                    {items.map((item, index) => (
+                        <div 
+                            key={index} 
+                            className="px-6 py-4 flex flex-col gap-1"
+                        >
+                            <dt className="text-xs font-medium uppercase tracking-wide text-gray-500 dark:text-neutral-400">
+                                {item.label}
+                            </dt>
+                            <dd className="text-sm text-gray-900 dark:text-white">
+                                {item.value || "—"}
+                            </dd>
+                        </div>
+                    ))}
+                </div>
+
+                {/* Actions */}
+                <div className="px-6 py-4 bg-gray-50 dark:bg-neutral-900 border-t border-gray-200 dark:border-neutral-800">
+                    <div className="flex gap-2">
+                        {actions}
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+} 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/profile-form.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/profile-form.tsx
new file mode 100644
index 00000000..e80f3f5d
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/profile-form.tsx
@@ -0,0 +1,90 @@
+import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { Button, Input, Textarea, Switch } from "@heroui/react"
+import { useRef, useState } from "react";
+
+interface ProfileFormProps {
+    defaultValues?: {
+        name?: string;
+        context?: string;
+        mockTools?: boolean;
+        mockPrompt?: string;
+    };
+    formRef: React.RefObject<HTMLFormElement>;
+    handleSubmit: (formData: FormData) => Promise<void>;
+    onCancel: () => void;
+    submitButtonText: string;
+}
+
+export function ProfileForm({
+    defaultValues = {},
+    formRef,
+    handleSubmit,
+    onCancel,
+    submitButtonText,
+}: ProfileFormProps) {
+    const [mockTools, setMockTools] = useState(Boolean(defaultValues.mockTools));
+    const [showMockPrompt, setShowMockPrompt] = useState(Boolean(defaultValues.mockTools));
+
+    return (
+        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-6">
+            <Input
+                label="Name"
+                name="name"
+                placeholder="Provide a name to describe the user's profile to simulate, e.g. &quot;Frequent buyer&quot;"
+                defaultValue={defaultValues.name}
+                isRequired
+            />
+
+            <Textarea
+                label="Context"
+                name="context"
+                placeholder="Provide user info and other info to simulate, e.g. &quot;User's name: John Smith. Buying frequency: 10 orders a month. Location: US. Latest order: Pair of Jeans - XL.&quot;"
+                defaultValue={defaultValues.context}
+                isRequired
+            />
+
+            <Switch
+                isSelected={mockTools}
+                onValueChange={(checked) => {
+                    setMockTools(checked);
+                    setShowMockPrompt(checked);
+                }}
+                name="mockTools"
+                value="on"
+            >
+                Mock Tools
+            </Switch>
+
+            {showMockPrompt && (
+                <div className="rounded-lg border border-gray-200 dark:border-neutral-800 p-4">
+                    <div className="text-sm font-medium mb-2">Mock Prompt (Optional)</div>
+                    <Textarea
+                        name="mockPrompt"
+                        placeholder="Enter a mock prompt"
+                        defaultValue={defaultValues.mockPrompt}
+                    />
+                </div>
+            )}
+
+            <div className="flex gap-3">
+                <FormStatusButton
+                    props={{
+                        children: submitButtonText,
+                        size: "md",
+                        color: "primary",
+                        type: "submit",
+                        className: "font-medium"
+                    }}
+                />
+                <Button
+                    size="md"
+                    variant="flat"
+                    onPress={onCancel}
+                    className="font-medium"
+                >
+                    Cancel
+                </Button>
+            </div>
+        </form>
+    );
+} 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/scenario-form.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/scenario-form.tsx
new file mode 100644
index 00000000..e281e043
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/scenario-form.tsx
@@ -0,0 +1,68 @@
+import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { Button, Input, Textarea } from "@heroui/react";
+
+interface ScenarioFormProps {
+    formRef: React.RefObject<HTMLFormElement>;
+    handleSubmit: (formData: FormData) => Promise<void>;
+    onCancel: () => void;
+    submitButtonText: string;
+    defaultValues?: {
+        name?: string;
+        description?: string;
+    };
+}
+
+export function ScenarioForm({
+    formRef,
+    handleSubmit,
+    onCancel,
+    submitButtonText,
+    defaultValues = {},
+}: ScenarioFormProps) {
+    return (
+        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-6">
+            <Input
+                type="text"
+                name="name"
+                label="Name"
+                placeholder="Provide a name for this scenario, e.g. &quot;Order cancellation&quot;"
+                defaultValue={defaultValues.name}
+                isRequired
+                classNames={{
+                    input: "bg-white dark:bg-neutral-900",
+                    inputWrapper: "bg-white dark:bg-neutral-900 border border-gray-200 dark:border-neutral-800"
+                }}
+            />
+            <Textarea
+                name="description"
+                label="Description"
+                placeholder="Describe the scenario that should be simulated, e.g. &quot;Role play a user who wants to cancel their recently ordered pair of jeans.&quot;"
+                defaultValue={defaultValues.description}
+                isRequired
+                classNames={{
+                    input: "bg-white dark:bg-neutral-900",
+                    inputWrapper: "bg-white dark:bg-neutral-900 border border-gray-200 dark:border-neutral-800"
+                }}
+            />
+            <div className="flex gap-3">
+                <FormStatusButton
+                    props={{
+                        children: submitButtonText,
+                        size: "md",
+                        color: "primary",
+                        type: "submit",
+                        className: "font-medium"
+                    }}
+                />
+                <Button
+                    size="md"
+                    variant="flat"
+                    onPress={onCancel}
+                    className="font-medium"
+                >
+                    Cancel
+                </Button>
+            </div>
+        </form>
+    );
+} 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/simulation-form.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/simulation-form.tsx
new file mode 100644
index 00000000..86a05f87
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/simulation-form.tsx
@@ -0,0 +1,190 @@
+import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { Button, Input, Textarea } from "@heroui/react";
+import { TestProfile, TestScenario } from "@/app/lib/types/testing_types";
+import { WithStringId } from "@/app/lib/types/types";
+import { ScenarioSelector } from "@/app/lib/components/selectors/scenario-selector";
+import { ProfileSelector } from "@/app/lib/components/selectors/profile-selector";
+import { z } from "zod";
+
+interface SimulationFormProps {
+    formRef: React.RefObject<HTMLFormElement>;
+    handleSubmit: (formData: FormData) => Promise<void>;
+    scenario: WithStringId<z.infer<typeof TestScenario>> | null;
+    setScenario: (scenario: WithStringId<z.infer<typeof TestScenario>> | null) => void;
+    profile: WithStringId<z.infer<typeof TestProfile>> | null;
+    setProfile: (profile: WithStringId<z.infer<typeof TestProfile>> | null) => void;
+    isScenarioModalOpen: boolean;
+    setIsScenarioModalOpen: (isOpen: boolean) => void;
+    isProfileModalOpen: boolean;
+    setIsProfileModalOpen: (isOpen: boolean) => void;
+    projectId: string;
+    submitButtonText: string;
+    defaultValues?: {
+        name?: string;
+        description?: string;
+        passCriteria?: string;
+    };
+    onCancel: () => void;
+}
+
+export function SimulationForm({
+    formRef,
+    handleSubmit,
+    scenario,
+    setScenario,
+    profile,
+    setProfile,
+    isScenarioModalOpen,
+    setIsScenarioModalOpen,
+    isProfileModalOpen,
+    setIsProfileModalOpen,
+    projectId,
+    submitButtonText,
+    defaultValues = {},
+    onCancel,
+}: SimulationFormProps) {
+    return (
+        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-6">
+            {/* Basic Information */}
+            <div className="flex flex-col gap-4 p-4 bg-white dark:bg-neutral-900 rounded-lg border border-gray-200 dark:border-neutral-800">
+                <h2 className="text-sm font-medium">Basic Information</h2>
+                <Input
+                    type="text"
+                    name="name"
+                    label={<span>Name</span>}
+                    placeholder="Enter a name for the simulation, e.g. &quot;Frequent buyer cancelling order&quot;"
+                    defaultValue={defaultValues.name}
+                    isRequired
+                    classNames={{
+                        input: "bg-white dark:bg-neutral-900",
+                        inputWrapper: "bg-white dark:bg-neutral-900 border border-gray-200 dark:border-neutral-800"
+                    }}
+                />
+                <Textarea
+                    name="description"
+                    label={<span>Description</span>}
+                    placeholder="Enter an optional description for the simulation, just to help you remember what it's for"
+                    defaultValue={defaultValues.description}
+                    classNames={{
+                        input: "bg-white dark:bg-neutral-900",
+                        inputWrapper: "bg-white dark:bg-neutral-900 border border-gray-200 dark:border-neutral-800"
+                    }}
+                />
+            </div>
+
+            {/* Test Configuration */}
+            <div className="flex flex-col gap-6 p-6 bg-white dark:bg-neutral-900 rounded-lg border border-gray-200 dark:border-neutral-800">
+                <h2 className="text-base font-semibold text-gray-900 dark:text-white">Test Configuration</h2>
+                
+                <div className="flex flex-col gap-6">
+                    {/* Scenario Selection */}
+                    <div className="flex flex-col gap-3">
+                        <label className="text-sm font-medium text-gray-900 dark:text-white">
+                            Scenario <span className="text-red-500">*</span>
+                        </label>
+                        <div className="flex items-center gap-1.5 min-h-[2rem]">
+                            <div className="flex-1 text-sm text-gray-600 dark:text-neutral-400">
+                                {scenario ? (
+                                    <span className="text-blue-600 dark:text-blue-400">{scenario.name}</span>
+                                ) : (
+                                    <span className="text-red-500">No scenario selected</span>
+                                )}
+                            </div>
+                            <Button
+                                size="sm"
+                                onPress={() => setIsScenarioModalOpen(true)}
+                                type="button"
+                            >
+                                {scenario ? "Change" : "Select"} Scenario
+                            </Button>
+                        </div>
+                    </div>
+
+                    {/* Profile Selection */}
+                    <div className="flex flex-col gap-3">
+                        <label className="text-sm font-medium text-gray-900 dark:text-white">
+                            Profile <span className="text-gray-500 dark:text-neutral-400">(optional)</span>
+                        </label>
+                        <div className="flex items-center gap-1.5 min-h-[2rem]">
+                            <div className="flex-1 text-sm text-gray-600 dark:text-neutral-400">
+                                {profile ? (
+                                    <span className="text-blue-600 dark:text-blue-400">{profile.name}</span>
+                                ) : (
+                                    "No profile selected"
+                                )}
+                            </div>
+                            <div className="flex gap-2">
+                                {profile && (
+                                    <Button size="sm" variant="bordered" onClick={() => setProfile(null)}>
+                                        Remove
+                                    </Button>
+                                )}
+                                <Button
+                                    size="sm"
+                                    onPress={() => setIsProfileModalOpen(true)}
+                                    type="button"
+                                >
+                                    {profile ? "Change" : "Select"} Profile
+                                </Button>
+                            </div>
+                        </div>
+                    </div>
+
+                    {/* Pass Criteria */}
+                    <div className="flex flex-col gap-3">
+                        <label className="text-sm font-medium text-gray-900 dark:text-white">
+                            Pass Criteria <span className="text-red-500">*</span>
+                        </label>
+                        <Textarea
+                            name="passCriteria"
+                            placeholder="Define the criteria for this test to pass, e.g. &quot;The assistant should successfully cancel the user's order and provide next steps for the user to confirm the cancellation&quot;"
+                            defaultValue={defaultValues.passCriteria}
+                            isRequired
+                            minRows={3}
+                            classNames={{
+                                base: "w-full",
+                                input: "bg-white dark:bg-neutral-900 resize-none",
+                                inputWrapper: "bg-white dark:bg-neutral-900 border border-gray-200 dark:border-neutral-800 hover:border-gray-300 dark:hover:border-neutral-700 transition-colors"
+                            }}
+                        />
+                    </div>
+                </div>
+            </div>
+
+            {/* Submit Button */}
+            <div className="flex gap-3">
+                <FormStatusButton
+                    props={{
+                        children: submitButtonText,
+                        size: "md",
+                        color: "primary",
+                        type: "submit",
+                        isDisabled: !scenario,
+                        className: "font-medium"
+                    }}
+                />
+                <Button
+                    size="md"
+                    variant="flat"
+                    onPress={onCancel}
+                    className="font-medium"
+                >
+                    Cancel
+                </Button>
+            </div>
+
+            <ScenarioSelector
+                projectId={projectId}
+                isOpen={isScenarioModalOpen}
+                onOpenChange={setIsScenarioModalOpen}
+                onSelect={setScenario}
+            />
+            <ProfileSelector
+                projectId={projectId}
+                isOpen={isProfileModalOpen}
+                onOpenChange={setIsProfileModalOpen}
+                onSelect={setProfile}
+            />
+        </form>
+    );
+} 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/table.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/table.tsx
new file mode 100644
index 00000000..2a2bcffc
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/components/table.tsx
@@ -0,0 +1,321 @@
+import { Table, TableHeader, TableBody, TableColumn, TableRow, TableCell, Selection } from "@heroui/react";
+import { Button } from "@heroui/react";
+import { PencilIcon, TrashIcon, EyeIcon, DownloadIcon } from "lucide-react";
+import Link from "next/link";
+import { ReactNode, useState } from "react";
+import { Modal, ModalContent, ModalHeader, ModalBody, ModalFooter } from "@heroui/react";
+
+// Helper function to safely parse dates
+const isValidDate = (date: any): boolean => {
+    const parsed = new Date(date);
+    return parsed instanceof Date && !isNaN(parsed.getTime());
+};
+
+interface Column {
+    key: string;
+    label: string;
+    render?: (item: any) => ReactNode;
+}
+
+interface DataTableProps {
+    items: any[];
+    columns: Column[];
+    selectedKeys?: Selection;
+    onSelectionChange?: (keys: Selection) => void;
+    projectId: string;
+    onDelete?: (id: string) => Promise<void>;
+    onEdit?: (id: string) => void;
+    onView?: (id: string) => void;
+    onDownload?: (id: string) => void;
+    selectionMode?: "multiple" | "none";
+}
+
+export function DataTable({
+    items,
+    columns,
+    selectedKeys,
+    onSelectionChange,
+    projectId,
+    onDelete,
+    onEdit,
+    onView,
+    onDownload,
+    selectionMode = "multiple",
+}: DataTableProps) {
+    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+    const [itemToDelete, setItemToDelete] = useState<string | null>(null);
+    const [isDeleteAllModalOpen, setIsDeleteAllModalOpen] = useState(false);
+    const [deleteError, setDeleteError] = useState<string | null>(null);
+
+    const handleDeleteClick = (id: string) => {
+        setItemToDelete(id);
+        setIsDeleteModalOpen(true);
+    };
+
+    const handleDeleteConfirm = async () => {
+        if (!itemToDelete || !onDelete) return;
+        
+        try {
+            await onDelete(itemToDelete);
+            setIsDeleteModalOpen(false);
+            setItemToDelete(null);
+        } catch (error) {
+            setDeleteError(`Failed to delete: ${error}`);
+        }
+    };
+
+    const handleDeleteAll = async () => {
+        if (!onDelete) return;
+
+        try {
+            // Delete all items sequentially
+            for (const item of items) {
+                await onDelete(item._id);
+            }
+            setIsDeleteAllModalOpen(false);
+            // Selection will be cleared automatically when items refresh
+        } catch (error) {
+            setDeleteError(`Failed to delete items: ${error}`);
+        }
+    };
+
+    const isAllSelected = selectedKeys === "all";
+
+    const renderCells = (item: any) => {
+        const cells = columns.map(column => (
+            <TableCell key={column.key}>
+                {column.render ? column.render(item) : 
+                    // Handle date fields specially
+                    (column.key.toLowerCase().includes('date') || 
+                     column.key === 'createdAt' || 
+                     column.key === 'lastUpdatedAt') && isValidDate(item[column.key]) ?
+                        new Date(item[column.key]).toLocaleString() :
+                        item[column.key]
+                }
+            </TableCell>
+        ));
+
+        // Only add actions column if there are any actions
+        const hasActions = onDelete || onEdit || onView || onDownload;
+        if (hasActions) {
+            cells.push(
+                <TableCell key="actions">
+                    <div className="flex items-center gap-0.5">
+                        {onView && (
+                            <Button
+                                isIconOnly
+                                size="sm"
+                                variant="light"
+                                onPress={() => onView(item._id)}
+                                aria-label="View item"
+                            >
+                                <EyeIcon size={16} />
+                            </Button>
+                        )}
+                        {onEdit && (
+                            <Button
+                                isIconOnly
+                                size="sm"
+                                variant="light"
+                                onPress={() => onEdit(item._id)}
+                                aria-label="Edit item"
+                            >
+                                <PencilIcon size={16} />
+                            </Button>
+                        )}
+                        {onDownload && (
+                            <Button
+                                isIconOnly
+                                size="sm"
+                                variant="light"
+                                onPress={() => onDownload(item._id)}
+                                aria-label="Download results"
+                            >
+                                <DownloadIcon size={16} />
+                            </Button>
+                        )}
+                        {onDelete && (
+                            <Button
+                                isIconOnly
+                                size="sm"
+                                variant="light"
+                                color="danger"
+                                onPress={() => handleDeleteClick(item._id)}
+                                aria-label="Delete item"
+                            >
+                                <TrashIcon size={16} />
+                            </Button>
+                        )}
+                    </div>
+                </TableCell>
+            );
+        }
+
+        return cells;
+    };
+
+    return (
+        <>
+            <div className="flex flex-col gap-4">
+                {/* Only show Delete All button when selection is enabled and items are selected */}
+                {selectionMode === "multiple" && selectedKeys === "all" && items.length > 0 && (
+                    <div className="flex justify-start">
+                        <Button
+                            size="sm"
+                            color="danger"
+                            variant="flat"
+                            onPress={() => setIsDeleteAllModalOpen(true)}
+                            startContent={<TrashIcon size={16} />}
+                        >
+                            Delete All ({items.length})
+                        </Button>
+                    </div>
+                )}
+
+                <Table
+                    selectedKeys={selectionMode === "multiple" ? selectedKeys : undefined}
+                    onSelectionChange={selectionMode === "multiple" ? onSelectionChange : undefined}
+                    aria-label="Data table"
+                    classNames={{
+                        base: "max-h-[400px] overflow-auto",
+                        table: "min-w-full",
+                    }}
+                    selectionMode={selectionMode}
+                >
+                    <TableHeader columns={[
+                        ...columns.map(column => ({
+                            key: column.key,
+                            label: column.label
+                        })),
+                        ...((onDelete || onEdit || onView || onDownload) ? [{
+                            key: 'actions',
+                            label: 'ACTIONS',
+                            render: (item: any) => (
+                                <div className="flex items-center gap-0.5">
+                                    <Button
+                                        isIconOnly
+                                        size="sm"
+                                        variant="light"
+                                    >
+                                        <PencilIcon size={16} />
+                                    </Button>
+                                    <Button
+                                        isIconOnly
+                                        size="sm"
+                                        variant="light"
+                                        color="danger"
+                                    >
+                                        <TrashIcon size={16} />
+                                    </Button>
+                                </div>
+                            ),
+                        }] : [])
+                    ]}>
+                        {(column) => (
+                            <TableColumn key={column.key}>{column.label}</TableColumn>
+                        )}
+                    </TableHeader>
+                    <TableBody items={items}>
+                        {(item) => (
+                            <TableRow key={item._id}>
+                                {renderCells(item)}
+                            </TableRow>
+                        )}
+                    </TableBody>
+                </Table>
+            </div>
+
+            {/* Single Delete Confirmation Modal */}
+            <Modal
+                isOpen={isDeleteModalOpen}
+                onOpenChange={(open) => {
+                    setIsDeleteModalOpen(open);
+                    if (!open) setItemToDelete(null);
+                }}
+                size="sm"
+            >
+                <ModalContent>
+                    {(onClose) => (
+                        <>
+                            <ModalHeader>Confirm Deletion</ModalHeader>
+                            <ModalBody>
+                                Are you sure you want to delete this item?
+                            </ModalBody>
+                            <ModalFooter>
+                                <Button size="sm" variant="flat" onPress={onClose}>
+                                    Cancel
+                                </Button>
+                                <Button
+                                    size="sm"
+                                    color="danger"
+                                    onPress={() => {
+                                        handleDeleteConfirm();
+                                        onClose();
+                                    }}
+                                >
+                                    Delete
+                                </Button>
+                            </ModalFooter>
+                        </>
+                    )}
+                </ModalContent>
+            </Modal>
+
+            {/* Delete All Confirmation Modal */}
+            <Modal
+                isOpen={isDeleteAllModalOpen}
+                onOpenChange={setIsDeleteAllModalOpen}
+                size="sm"
+            >
+                <ModalContent>
+                    {(onClose) => (
+                        <>
+                            <ModalHeader>Confirm Delete All</ModalHeader>
+                            <ModalBody>
+                                Are you sure you want to delete all {items.length} items? This action cannot be undone.
+                            </ModalBody>
+                            <ModalFooter>
+                                <Button size="sm" variant="flat" onPress={onClose}>
+                                    Cancel
+                                </Button>
+                                <Button
+                                    size="sm"
+                                    color="danger"
+                                    onPress={() => {
+                                        handleDeleteAll();
+                                        onClose();
+                                    }}
+                                >
+                                    Delete All
+                                </Button>
+                            </ModalFooter>
+                        </>
+                    )}
+                </ModalContent>
+            </Modal>
+
+            {/* Error Modal */}
+            <Modal
+                isOpen={deleteError !== null}
+                onOpenChange={() => setDeleteError(null)}
+                size="sm"
+            >
+                <ModalContent>
+                    {(onClose) => (
+                        <>
+                            <ModalHeader>Error</ModalHeader>
+                            <ModalBody>
+                                {deleteError}
+                            </ModalBody>
+                            <ModalFooter>
+                                <Button size="sm" onPress={onClose}>
+                                    Close
+                                </Button>
+                            </ModalFooter>
+                        </>
+                    )}
+                </ModalContent>
+            </Modal>
+        </>
+    );
+}
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/page.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/page.tsx
index f6f323bd..2627562a 100644
--- a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/page.tsx
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/page.tsx
@@ -1,8 +1,43 @@
-import { App } from "./app";
+'use client';
 
-export default function Page({ params }: { params: { projectId: string, slug?: string[] } }) {
-  return <App
-    projectId={params.projectId}
-    slug={params.slug}
-  />;
+import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from "@/components/ui/resizable";
+import { ScenariosApp } from "./scenarios_app";
+import { SimulationsApp } from "./simulations_app";
+import { ProfilesApp } from "./profiles_app";
+import { RunsApp } from "./runs_app";
+import { TestingMenu } from "./testing_menu";
+export default function TestPage({ params }: { params: { projectId: string; slug?: string[] } }) {
+    const { projectId, slug = [] } = params;
+    let app: "scenarios" | "simulations" | "profiles" | "runs" = "runs";
+    
+    if (slug[0] === "scenarios") {
+        app = "scenarios";
+    } else if (slug[0] === "simulations") {
+        app = "simulations";
+    } else if (slug[0] === "profiles") {
+        app = "profiles";
+    } else if (slug[0] === "runs") {
+        app = "runs";
+    }
+
+    return (
+        <div className="h-full flex flex-col">
+            <ResizablePanelGroup direction="horizontal" className="h-full">
+                <ResizablePanel defaultSize={15} minSize={10}>
+                    <div className="h-full border-r border-gray-200 dark:border-neutral-800">
+                        <TestingMenu projectId={projectId} app={app} />
+                    </div>
+                </ResizablePanel>
+                
+                <ResizableHandle />
+                
+                <ResizablePanel defaultSize={85}>
+                    {app === "scenarios" && <ScenariosApp projectId={projectId} slug={slug.slice(1)} />}
+                    {app === "simulations" && <SimulationsApp projectId={projectId} slug={slug.slice(1)} />}
+                    {app === "profiles" && <ProfilesApp projectId={projectId} slug={slug.slice(1)} />}
+                    {app === "runs" && <RunsApp projectId={projectId} slug={slug.slice(1)} />}
+                </ResizablePanel>
+            </ResizablePanelGroup>
+        </div>
+    );
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/profiles_app.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/profiles_app.tsx
index 5ba7e040..34d58b52 100644
--- a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/profiles_app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/profiles_app.tsx
@@ -1,15 +1,19 @@
+"use client";
+
 import Link from "next/link";
 import { WithStringId } from "@/app/lib/types/types";
 import { TestProfile } from "@/app/lib/types/testing_types";
 import { useEffect, useState, useRef } from "react";
 import { createProfile, getProfile, listProfiles, updateProfile, deleteProfile } from "@/app/actions/testing_actions";
-import { Button, Input, Pagination, Spinner, Switch, Textarea, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter, Tooltip } from "@heroui/react";
+import { Button, Spinner, Selection } from "@heroui/react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { z } from "zod";
-import { PlusIcon, ArrowLeftIcon, StarIcon } from "lucide-react";
-import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { PlusIcon } from "lucide-react";
 import { RelativeTime } from "@primer/react"
-import { getProjectConfig } from "@/app/actions/project_actions";
+import { StructuredPanel, ActionButton } from "@/app/lib/components/structured-panel";
+import { DataTable } from "./components/table";
+import { isValidDate } from './utils/date';
+import { ProfileForm } from "./components/profile-form";
 
 function EditProfile({
     projectId,
@@ -46,324 +50,96 @@ function EditProfile({
         try {
             const name = formData.get("name") as string;
             const context = formData.get("context") as string;
+            const mockTools = formData.get("mockTools") === "on";
             const mockPrompt = formData.get("mockPrompt") as string;
-            await updateProfile(projectId, profileId, {
-                name,
-                context,
+
+            await updateProfile(projectId, profileId, { 
+                name, 
+                context, 
                 mockTools,
-                mockPrompt: mockPrompt || undefined
+                mockPrompt: mockTools && mockPrompt ? mockPrompt : undefined
             });
-            router.push(`/projects/${projectId}/test/profiles/${profileId}`);
+            router.push(`/projects/${projectId}/test/profiles`);
         } catch (error) {
             setError(`Unable to update profile: ${error}`);
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">Edit Profile</h1>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 dark:bg-red-900/20 p-2 rounded-md text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => formRef.current?.requestSubmit()}>Retry</Button>
-        </div>}
-        {!loading && profile && (
-            <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-                <Input
-                    type="text"
-                    name="name"
-                    label="Name"
-                    placeholder="Enter a name for the profile"
-                    defaultValue={profile.name}
-                    required
-                />
-                <Textarea
-                    name="context"
-                    label="Context"
-                    placeholder="Enter the context for this profile"
-                    defaultValue={profile.context}
-                    required
-                />
-                <Switch
-                    name="mockTools"
-                    isSelected={mockTools}
-                    onValueChange={(value) => {
-                        setMockTools(value);
+    return <StructuredPanel 
+        title="EDIT PROFILE"
+        tooltip="Edit an existing test profile"
+    >
+        <div className="flex flex-col gap-6 max-w-2xl">
+            {loading && (
+                <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
+                    <Spinner size="sm" />
+                    Loading profile...
+                </div>
+            )}
+            
+            {error && (
+                <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                    {error}
+                    <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                </div>
+            )}
+
+            {!loading && profile && (
+                <ProfileForm
+                    formRef={formRef}
+                    handleSubmit={handleSubmit}
+                    onCancel={() => router.push(`/projects/${projectId}/test/profiles`)}
+                    submitButtonText="Update Profile"
+                    defaultValues={{
+                        name: profile.name,
+                        context: profile.context,
+                        mockTools: Boolean(profile.mockTools),
+                        mockPrompt: profile.mockPrompt || ""
                     }}
-                    className="self-start"
-                >
-                    Mock Tools
-                </Switch>
-                {mockTools && <Textarea
-                    name="mockPrompt"
-                    label="Mock Prompt (Optional)"
-                    placeholder="Enter a mock prompt"
-                    defaultValue={profile.mockPrompt}
-                />}
-                <div className="flex gap-2 items-center">
-                    <FormStatusButton
-                        props={{
-                            className: "self-start",
-                            children: "Update",
-                            size: "sm",
-                            type: "submit",
-                        }}
-                    />
-                    <Button
-                        size="sm"
-                        variant="flat"
-                        as={Link}
-                        href={`/projects/${projectId}/test/profiles/${profileId}`}
-                    >
-                        Cancel
-                    </Button>
-                </div>
-            </form>
-        )}
-    </div>;
+                />
+            )}
+        </div>
+    </StructuredPanel>;
 }
 
-function ViewProfile({
-    projectId,
-    profileId,
-}: {
-    projectId: string,
-    profileId: string,
-}) {
-    const router = useRouter();
-    const [profile, setProfile] = useState<WithStringId<z.infer<typeof TestProfile>> | null>(null);
-    const [loading, setLoading] = useState(true);
-    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-    const [deleteError, setDeleteError] = useState<string | null>(null);
-
-    useEffect(() => {
-        async function fetchProfile() {
-            const profile = await getProfile(projectId, profileId);
-            setProfile(profile);
-            setLoading(false);
-        }
-        fetchProfile();
-    }, [projectId, profileId]);
-
-    async function handleDelete() {
-        try {
-            await deleteProfile(projectId, profileId);
-            router.push(`/projects/${projectId}/test/profiles`);
-        } catch (error) {
-            setDeleteError(`Failed to delete profile: ${error}`);
-        }
-    }
-
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">View Profile</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/profiles`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
-        >
-            All Profiles
-        </Button>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {!loading && !profile && <div className="text-gray-600 dark:text-neutral-400 text-center">Profile not found</div>}
-        {!loading && profile && (
-            <>
-                <div className="flex flex-col gap-1 text-sm">
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Name</div>
-                        <div className="flex-[2] dark:text-neutral-200">{profile.name}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Context</div>
-                        <div className="flex-[2] whitespace-pre-wrap dark:text-neutral-200">{profile.context}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Mock Tools</div>
-                        <div className="flex-[2] dark:text-neutral-200">{profile.mockTools ? "Yes" : "No"}</div>
-                    </div>
-                    {profile.mockPrompt && (
-                        <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                            <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Mock Prompt</div>
-                            <div className="flex-[2] whitespace-pre-wrap dark:text-neutral-200">{profile.mockPrompt}</div>
-                        </div>
-                    )}
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Created</div>
-                        <div className="flex-[2] dark:text-neutral-300"><RelativeTime date={new Date(profile.createdAt)} /></div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Last Updated</div>
-                        <div className="flex-[2] dark:text-neutral-300"><RelativeTime date={new Date(profile.lastUpdatedAt)} /></div>
-                    </div>
-                </div>
-                <div className="flex gap-2 mt-4">
-                    <Button
-                        size="sm"
-                        as={Link}
-                        href={`/projects/${projectId}/test/profiles/${profileId}/edit`}
-                    >
-                        Edit
-                    </Button>
-                    <Button
-                        size="sm"
-                        color="danger"
-                        variant="flat"
-                        onPress={() => setIsDeleteModalOpen(true)}
-                    >
-                        Delete
-                    </Button>
-                </div>
-
-                <Modal
-                    isOpen={isDeleteModalOpen}
-                    onOpenChange={setIsDeleteModalOpen}
-                    size="sm"
-                >
-                    <ModalContent>
-                        {(onClose) => (
-                            <>
-                                <ModalHeader>Confirm Deletion</ModalHeader>
-                                <ModalBody>
-                                    Are you sure you want to delete this profile?
-                                </ModalBody>
-                                <ModalFooter>
-                                    <Button size="sm" variant="flat" onPress={onClose}>
-                                        Cancel
-                                    </Button>
-                                    <Button
-                                        size="sm"
-                                        color="danger"
-                                        onPress={() => {
-                                            handleDelete();
-                                            onClose();
-                                        }}
-                                    >
-                                        Delete
-                                    </Button>
-                                </ModalFooter>
-                            </>
-                        )}
-                    </ModalContent>
-                </Modal>
-
-                <Modal
-                    isOpen={deleteError !== null}
-                    onOpenChange={() => setDeleteError(null)}
-                    size="sm"
-                >
-                    <ModalContent>
-                        {(onClose) => (
-                            <>
-                                <ModalHeader>Error</ModalHeader>
-                                <ModalBody>
-                                    {deleteError}
-                                </ModalBody>
-                                <ModalFooter>
-                                    <Button
-                                        size="sm"
-                                        color="primary"
-                                        onPress={onClose}
-                                    >
-                                        Close
-                                    </Button>
-                                </ModalFooter>
-                            </>
-                        )}
-                    </ModalContent>
-                </Modal>
-            </>
-        )}
-    </div>;
-}
-
-function NewProfile({
-    projectId,
-}: {
-    projectId: string,
-}) {
+function NewProfile({ projectId }: { projectId: string }) {
+    const formRef = useRef<HTMLFormElement>(null);
     const router = useRouter();
     const [error, setError] = useState<string | null>(null);
-    const [mockTools, setMockTools] = useState(false);
-    const formRef = useRef<HTMLFormElement>(null);
 
     async function handleSubmit(formData: FormData) {
         setError(null);
         try {
             const name = formData.get("name") as string;
             const context = formData.get("context") as string;
-            const mockPrompt = formData.get("mockPrompt") as string;
-            const profile = await createProfile(projectId, {
-                name,
-                context,
+            const mockTools = formData.get("mockTools") === "on";
+            const mockPrompt = mockTools ? (formData.get("mockPrompt") as string) : undefined;
+            
+            await createProfile(projectId, { 
+                name, 
+                context, 
                 mockTools,
-                mockPrompt: mockPrompt || undefined
+                mockPrompt // This will be undefined if mockTools is false
             });
-            router.push(`/projects/${projectId}/test/profiles/${profile._id}`);
+            router.push(`/projects/${projectId}/test/profiles`);
         } catch (error) {
             setError(`Unable to create profile: ${error}`);
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 pb-2 border-b border-gray-200">New Profile</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/profiles`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
-        >
-            All Profiles
-        </Button>
-        {error && <div className="bg-red-100 p-2 rounded-md text-red-800 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => formRef.current?.requestSubmit()}>Retry</Button>
-        </div>}
-        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-            <Input
-                type="text"
-                name="name"
-                label="Name"
-                placeholder="Enter a name for the profile"
-                required
+    return <StructuredPanel 
+        title="NEW PROFILE"
+        tooltip="Create a new test profile"
+    >
+        <div className="flex flex-col gap-6 max-w-2xl">
+            <ProfileForm
+                formRef={formRef}
+                handleSubmit={handleSubmit}
+                onCancel={() => router.push(`/projects/${projectId}/test/profiles`)}
+                submitButtonText="Create Profile"
             />
-            <Textarea
-                name="context"
-                label="Context"
-                placeholder="Enter the context for this profile"
-                required
-            />
-            <Switch
-                name="mockTools"
-                isSelected={mockTools}
-                onValueChange={(value) => {
-                    setMockTools(value);
-                }}
-                className="self-start"
-            >
-                Mock Tools
-            </Switch>
-            {mockTools && <Textarea
-                name="mockPrompt"
-                label="Mock Prompt (Optional)"
-                placeholder="Enter a mock prompt"
-            />}
-            <FormStatusButton
-                props={{
-                    className: "self-start",
-                    children: "Create",
-                    size: "sm",
-                    type: "submit",
-                }}
-            />
-        </form>
-    </div>;
+        </div>
+    </StructuredPanel>;
 }
 
 function ProfileList({
@@ -379,6 +155,8 @@ function ProfileList({
     const [error, setError] = useState<string | null>(null);
     const [profiles, setProfiles] = useState<WithStringId<z.infer<typeof TestProfile>>[]>([]);
     const [total, setTotal] = useState(0);
+    const [selectedKeys, setSelectedKeys] = useState<Selection>(new Set<string>());
+    const [selectedProfiles, setSelectedProfiles] = useState<string[]>([]);
 
     useEffect(() => {
         let ignore = false;
@@ -412,95 +190,154 @@ function ProfileList({
         };
     }, [page, pageSize, error, projectId]);
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">Profiles</h1>
-        <Button
-            size="sm"
-            onPress={() => router.push(`/projects/${projectId}/test/profiles/new`)}
-            className="self-end"
-            startContent={<PlusIcon className="w-4 h-4" />}
-        >
-            New Profile
-        </Button>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 dark:bg-red-900/20 p-2 rounded-md text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
-        </div>}
-        {!loading && !error && <>
-            {profiles.length === 0 && <div className="text-gray-600 dark:text-neutral-400 text-center">No profiles found</div>}
-            {profiles.length > 0 && <div className="flex flex-col w-full">
-                {/* Header */}
-                <div className="grid grid-cols-8 py-2 bg-gray-100 dark:bg-neutral-800 font-semibold text-sm">
-                    <div className="col-span-2 px-4 dark:text-neutral-300">Name</div>
-                    <div className="col-span-3 px-4 dark:text-neutral-300">Context</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Mock Tools</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Created</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Updated</div>
-                </div>
+    const handleSelectionChange = (selection: Selection) => {
+        if (selection === "all" && 
+            selectedKeys !== "all" && 
+            (selectedKeys as Set<string>).size > 0) {
+            setSelectedKeys(new Set());
+            setSelectedProfiles([]);
+        } else {
+            setSelectedKeys(selection);
+            if (selection === "all") {
+                setSelectedProfiles(profiles.map(profile => profile._id));
+            } else {
+                setSelectedProfiles(Array.from(selection as Set<string>));
+            }
+        }
+    };
 
-                {/* Rows */}
-                {profiles.map((profile) => (
-                    <div key={profile._id} className="grid grid-cols-8 py-2 border-b border-gray-200 dark:border-neutral-800 hover:bg-gray-50 dark:hover:bg-neutral-800 text-sm">
-                        <div className="col-span-2 px-4 truncate">
-                            <Link
-                                href={`/projects/${projectId}/test/profiles/${profile._id}`}
-                                className="text-blue-600 dark:text-blue-400 hover:underline"
-                            >
-                                {profile.name}
-                            </Link>
-                        </div>
-                        <div className="col-span-3 px-4 truncate dark:text-neutral-300">{profile.context}</div>
-                        <div className="col-span-1 px-4 dark:text-neutral-300">{profile.mockTools ? "Yes" : "No"}</div>
-                        <div className="col-span-1 px-4 text-gray-600 dark:text-neutral-400 truncate">
-                            <RelativeTime date={new Date(profile.createdAt)} />
-                        </div>
-                        <div className="col-span-1 px-4 text-gray-600 dark:text-neutral-400 truncate">
-                            <RelativeTime date={new Date(profile.lastUpdatedAt)} />
-                        </div>
-                    </div>
-                ))}
-            </div>}
-            {total > 1 && <Pagination
-                total={total}
-                page={page}
-                onChange={(page) => {
-                    router.push(`/projects/${projectId}/test/profiles?page=${page}`);
-                }}
-                className="self-center"
-            />}
-        </>}
-    </div>;
+    const handleDelete = async (profileId: string) => {
+        try {
+            await deleteProfile(projectId, profileId);
+            // Refresh the profiles list after deletion
+            const result = await listProfiles(projectId, page, pageSize);
+            setProfiles(result.profiles);
+            setTotal(result.total);
+        } catch (err) {
+            setError(`Failed to delete profile: ${err}`);
+        }
+    };
+
+    const columns = [
+        {
+            key: 'name',
+            label: 'NAME',
+            render: (profile: any) => profile.name
+        },
+        {
+            key: 'context',
+            label: 'CONTEXT'
+        },
+        {
+            key: 'mockTools',
+            label: 'MOCK TOOLS',
+            render: (profile: any) => profile.mockTools ? "Yes" : "No"
+        },
+        {
+            key: 'createdAt',
+            label: 'CREATED',
+            render: (profile: any) => profile?.createdAt && isValidDate(profile.createdAt) ? 
+                <RelativeTime date={new Date(profile.createdAt)} /> : 
+                'Invalid date'
+        },
+        {
+            key: 'lastUpdatedAt',
+            label: 'LAST UPDATED',
+            render: (profile: any) => profile?.lastUpdatedAt && isValidDate(profile.lastUpdatedAt) ? 
+                <RelativeTime date={new Date(profile.lastUpdatedAt)} /> : 
+                'Invalid date'
+        }
+    ];
+
+    return <StructuredPanel 
+        title="PROFILES"
+        tooltip="View and manage your test profiles"
+    >
+        <div className="flex flex-col gap-6 max-w-4xl">
+            {/* Header Section */}
+            <div className="flex items-center justify-between">
+                <div className="flex flex-col gap-1">
+                    <h1 className="text-lg font-semibold text-gray-900 dark:text-white">Profiles</h1>
+                    <p className="text-sm text-gray-600 dark:text-neutral-400">
+                        Create and manage test profiles for your simulations
+                    </p>
+                </div>
+                <Button
+                    size="sm"
+                    color="primary"
+                    startContent={<PlusIcon size={16} />}
+                    onPress={() => router.push(`/projects/${projectId}/test/profiles/new`)}
+                >
+                    New Profile
+                </Button>
+            </div>
+
+            {/* Error Display */}
+            {error && (
+                <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                    {error}
+                    <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                </div>
+            )}
+
+            {/* Profiles Table */}
+            {loading ? (
+                <div className="flex gap-2 items-center justify-center p-8 text-gray-600 dark:text-neutral-400">
+                    <Spinner size="sm" />
+                    Loading profiles...
+                </div>
+            ) : profiles.length === 0 ? (
+                <div className="text-center p-8 bg-gray-50 dark:bg-neutral-900 rounded-lg border border-dashed border-gray-200 dark:border-neutral-800">
+                    <p className="text-gray-600 dark:text-neutral-400 mb-4">No profiles created yet</p>
+                    <Button
+                        size="sm"
+                        color="primary"
+                        startContent={<PlusIcon size={16} />}
+                        onPress={() => router.push(`/projects/${projectId}/test/profiles/new`)}
+                    >
+                        Create Your First Profile
+                    </Button>
+                </div>
+            ) : (
+                <DataTable
+                    items={profiles}
+                    columns={columns}
+                    selectedKeys={selectedKeys}
+                    onSelectionChange={handleSelectionChange}
+                    onDelete={handleDelete}
+                    onEdit={(id) => router.push(`/projects/${projectId}/test/profiles/${id}/edit`)}
+                    projectId={projectId}
+                />
+            )}
+        </div>
+    </StructuredPanel>;
 }
 
-export function ProfilesApp({
-    projectId,
-    slug
-}: {
-    projectId: string,
-    slug: string[]
-}) {
-    let selection: "list" | "view" | "new" | "edit" = "list";
-    let profileId: string | null = null;
-    if (slug.length > 0) {
+export function ProfilesApp({ projectId, slug }: { projectId: string; slug?: string[] }) {
+    let selection: "list" | "new" | "edit" = "list";
+    let profileId: string | undefined;
+
+    if (slug && slug.length > 0) {
         if (slug[0] === "new") {
             selection = "new";
-        } else if (slug[slug.length - 1] === "edit") {
+        } else if (slug[1] === "edit") {
             selection = "edit";
             profileId = slug[0];
         } else {
-            selection = "view";
+            selection = "list";
             profileId = slug[0];
         }
     }
 
-    return <>
-        {selection === "list" && <ProfileList projectId={projectId} />}
-        {selection === "new" && <NewProfile projectId={projectId} />}
-        {selection === "view" && profileId && <ViewProfile projectId={projectId} profileId={profileId} />}
-        {selection === "edit" && profileId && <EditProfile projectId={projectId} profileId={profileId} />}
-    </>;
-}
\ No newline at end of file
+    return (
+        <div className="h-full">
+            {selection === "list" && <ProfileList projectId={projectId} />}
+            {selection === "new" && <NewProfile projectId={projectId} />}
+            {selection === "edit" && profileId && (
+                <EditProfile projectId={projectId} profileId={profileId} />
+            )}
+        </div>
+    );
+}
+
+export { NewProfile, EditProfile };
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/runs_app.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/runs_app.tsx
index fd8a5e2f..3e80f90f 100644
--- a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/runs_app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/runs_app.tsx
@@ -1,149 +1,20 @@
+"use client";
+
 import Link from "next/link";
 import { WithStringId } from "@/app/lib/types/types";
 import { TestSimulation, TestRun } from "@/app/lib/types/testing_types";
-import { useEffect, useState, useRef } from "react";
-import { createRun, getRun, getSimulation, listRuns } from "@/app/actions/testing_actions";
-import { Button, Input, Pagination, Spinner, Chip } from "@heroui/react";
+import { useEffect, useState } from "react";
+import { getRun, getSimulation, listRuns, cancelRun, deleteRun, getSimulationResult, listRunSimulations } from "@/app/actions/testing_actions";
+import { Button, Spinner, Selection } from "@heroui/react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { z } from "zod";
-import { ArrowLeftIcon, PlusIcon, WorkflowIcon } from "lucide-react";
-import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { ArrowLeftIcon, PlusIcon, DownloadIcon } from "lucide-react";
 import { RelativeTime } from "@primer/react"
-import { SimulationSelector } from "@/app/lib/components/selectors/simulation-selector";
-import { WorkflowSelector } from "@/app/lib/components/selectors/workflow-selector";
 import { Workflow } from "@/app/lib/types/workflow_types";
 import { fetchWorkflow } from "@/app/actions/workflow_actions";
-
-function NewRun({
-    projectId,
-}: {
-    projectId: string,
-}) {
-    const router = useRouter();
-    const [error, setError] = useState<string | null>(null);
-    const formRef = useRef<HTMLFormElement>(null);
-    const [selectedSimulations, setSelectedSimulations] = useState<WithStringId<z.infer<typeof TestSimulation>>[]>([]);
-    const [isSimulationSelectorOpen, setIsSimulationSelectorOpen] = useState(false);
-    const [selectedWorkflow, setSelectedWorkflow] = useState<WithStringId<z.infer<typeof Workflow>> | null>(null);
-    const [isWorkflowSelectorOpen, setIsWorkflowSelectorOpen] = useState(false);
-
-    async function handleSubmit(formData: FormData) {
-        setError(null);
-        const simulationIds = selectedSimulations.map(sim => sim._id);
-
-        if (!selectedWorkflow) {
-            setError("Please select a workflow");
-            return;
-        }
-
-        if (simulationIds.length === 0) {
-            setError("Please select at least one simulation");
-            return;
-        }
-
-        try {
-            const run = await createRun(projectId, {
-                workflowId: selectedWorkflow._id,
-                simulationIds
-            });
-            router.push(`/projects/${projectId}/test/runs/${run._id}`);
-        } catch (error) {
-            setError(`Unable to create run: ${error}`);
-        }
-    }
-
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 pb-2 border-b border-gray-200">New Run</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/runs`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
-        >
-            All Runs
-        </Button>
-        {error && <div className="bg-red-100 p-2 rounded-md text-red-800 flex items-center gap-2 text-sm">
-            {error}
-            <Button
-                size="sm"
-                color="danger"
-                onPress={() => {
-                    formRef.current?.requestSubmit();
-                }}
-            >
-                Retry
-            </Button>
-        </div>}
-        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-            <div className="flex flex-col gap-2">
-                <label className="text-sm font-medium">Workflow</label>
-                <div className="flex items-center gap-2">
-                    {selectedWorkflow ? (
-                        <div className="text-sm text-blue-600">{selectedWorkflow.name}</div>
-                    ) : (
-                        <div className="text-sm text-gray-500">No workflow selected</div>
-                    )}
-                    <Button
-                        size="sm"
-                        onPress={() => setIsWorkflowSelectorOpen(true)}
-                        type="button"
-                    >
-                        {selectedWorkflow ? "Change" : "Select"} Workflow
-                    </Button>
-                </div>
-            </div>
-            <div className="flex flex-col gap-2">
-                <Button
-                    size="sm"
-                    onPress={() => setIsSimulationSelectorOpen(true)}
-                    type="button"
-                    className="self-start"
-                >
-                    Select Simulations
-                </Button>
-                {selectedSimulations.length > 0 && (
-                    <div className="flex flex-wrap gap-2">
-                        {selectedSimulations.map((sim) => (
-                            <Chip
-                                key={sim._id}
-                                onClose={() => setSelectedSimulations(prev => prev.filter(s => s._id !== sim._id))}
-                                variant="flat"
-                                className="py-1"
-                            >
-                                {sim.name}
-                            </Chip>
-                        ))}
-                    </div>
-                )}
-            </div>
-            <FormStatusButton
-                props={{
-                    className: "self-start",
-                    children: "Create Run",
-                    size: "sm",
-                    type: "submit",
-                    isDisabled: !selectedWorkflow || selectedSimulations.length === 0,
-                }}
-            />
-        </form>
-
-        <SimulationSelector
-            projectId={projectId}
-            isOpen={isSimulationSelectorOpen}
-            onOpenChange={setIsSimulationSelectorOpen}
-            onSelect={setSelectedSimulations}
-            initialSelected={selectedSimulations}
-        />
-
-        <WorkflowSelector
-            projectId={projectId}
-            isOpen={isWorkflowSelectorOpen}
-            onOpenChange={setIsWorkflowSelectorOpen}
-            onSelect={setSelectedWorkflow}
-        />
-    </div>;
-}
+import { StructuredPanel, ActionButton } from "@/app/lib/components/structured-panel"
+import { DataTable } from "./components/table"
+import { isValidDate } from './utils/date';
 
 function ViewRun({
     projectId,
@@ -152,49 +23,124 @@ function ViewRun({
     projectId: string,
     runId: string,
 }) {
+    const router = useRouter();
     const [run, setRun] = useState<WithStringId<z.infer<typeof TestRun>> | null>(null);
-    const [loading, setLoading] = useState(true);
-    const [workflow, setWorkflow] = useState<WithStringId<z.infer<typeof Workflow>> | null>(null);
     const [simulations, setSimulations] = useState<WithStringId<z.infer<typeof TestSimulation>>[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+    const [workflow, setWorkflow] = useState<WithStringId<z.infer<typeof Workflow>> | null>(null);
 
     useEffect(() => {
-        async function fetchRun() {
-            const run = await getRun(projectId, runId);
-            setRun(run);
-            if (run) {
+        async function fetchData() {
+            try {
+                const run = await getRun(projectId, runId);
+                if (!run) {
+                    setError("Run not found");
+                    return;
+                }
+                setRun(run);
+
+                const enrichedSimulations = await listRunSimulations(projectId, run.simulationIds);
+                setSimulations(enrichedSimulations);
+
                 // Fetch workflow and simulations in parallel
                 const [workflowResult, simulationsResult] = await Promise.all([
                     fetchWorkflow(projectId, run.workflowId),
                     Promise.all(run.simulationIds.map(id => getSimulation(projectId, id)))
                 ]);
                 setWorkflow(workflowResult);
-                setSimulations(simulationsResult.filter(s => s !== null));
+            } catch (error) {
+                setError(`Error fetching run: ${error}`);
+            } finally {
+                setLoading(false);
             }
-            setLoading(false);
         }
-        fetchRun();
-    }, [runId, projectId]);
+        fetchData();
+    }, [projectId, runId]);
 
-    return <div className="h-full flex flex-col gap-4">
-        <div className="flex items-center justify-between">
-            <Button
-                size="sm"
-                className="self-start"
-                as={Link}
-                href={`/projects/${projectId}/test/runs`}
-                startContent={<ArrowLeftIcon className="w-4 h-4" />}
+    const columns = [
+        {
+            key: 'name',
+            label: 'SIMULATION',
+            render: (simulation: any) => simulation.name
+        },
+        {
+            key: 'scenarioId',
+            label: 'SCENARIO',
+            render: (simulation: any) => simulation.scenarioName
+        },
+        {
+            key: 'profileId',
+            label: 'PROFILE',
+            render: (simulation: any) => simulation.profileName
+        }
+    ];
+
+    const handleDownload = async (simulationId: string) => {
+        try {
+            const result = await getSimulationResult(projectId, runId, simulationId);
+            if (!result) {
+                console.error("No result found for simulation");
+                return;
+            }
+
+            // Get simulation name from simulations array
+            const simulation = simulations.find(s => s._id === simulationId);
+            if (!simulation) {
+                console.error("Simulation not found");
+                return;
+            }
+
+            // Create a safe filename
+            const safeName = `${run?.name}_${simulation.name}`
+                .toLowerCase()
+                .replace(/[^a-z0-9]+/g, '_')
+                .replace(/^_+|_+$/g, ''); // Remove leading/trailing underscores
+
+            // Create the JSON content
+            const content = {
+                run: run?.name,
+                simulation: simulation.name,
+                result: result.result,
+                details: result.details,
+                transcript: result.transcript
+            };
+
+            // Create and trigger download
+            const blob = new Blob([JSON.stringify(content, null, 2)], { type: 'application/json' });
+            const url = window.URL.createObjectURL(blob);
+            const a = document.createElement('a');
+            a.href = url;
+            a.download = `${safeName}.json`;
+            document.body.appendChild(a);
+            a.click();
+            window.URL.revokeObjectURL(url);
+            document.body.removeChild(a);
+        } catch (error) {
+            console.error("Failed to download result:", error);
+        }
+    };
+
+    return <StructuredPanel 
+        title="VIEW RUN"
+        tooltip="View details of this test run"
+        actions={[
+            <ActionButton
+                key="back"
+                icon={<ArrowLeftIcon size={16} />}
+                onClick={() => router.push(`/projects/${projectId}/test/runs`)}
             >
                 All Runs
-            </Button>
-        </div>
-
+            </ActionButton>
+        ]}
+    >
         {loading && <div className="flex gap-2 items-center">
             <Spinner size="sm" />
             Loading...
         </div>}
         {!loading && !run && <div className="text-gray-600 text-center">Run not found</div>}
         {!loading && run && (
-            <>
+            <div className="flex flex-col gap-6 max-w-4xl">
                 {/* Workflow and timing information in a grid */}
                 <div className="grid grid-cols-3 gap-4">
                     {workflow && (
@@ -236,31 +182,22 @@ function ViewRun({
                 </div>
 
                 {/* Simulations List */}
-                <div className="mt-4">
+                <div>
                     <h2 className="text-sm font-medium text-gray-600 dark:text-neutral-400 mb-2">Simulations</h2>
-                    <div className="space-y-2">
-                        {simulations.map(sim => (
-                            <div key={sim._id} className="border dark:border-neutral-800 rounded-lg p-3">
-                                <Link
-                                    href={`/projects/${projectId}/test/simulations/${sim._id}`}
-                                    className="text-blue-600 hover:underline"
-                                >
-                                    {sim.name}
-                                </Link>
-                            </div>
-                        ))}
-                    </div>
+                    <DataTable
+                        items={simulations}
+                        columns={columns}
+                        projectId={projectId}
+                        onDownload={handleDownload}
+                        selectionMode="none"
+                    />
                 </div>
-            </>
+            </div>
         )}
-    </div>;
+    </StructuredPanel>
 }
 
-function RunList({
-    projectId,
-}: {
-    projectId: string,
-}) {
+function RunsList({ projectId }: { projectId: string }) {
     const router = useRouter();
     const searchParams = useSearchParams();
     const page = parseInt(searchParams.get("page") || "1");
@@ -270,6 +207,54 @@ function RunList({
     const [runs, setRuns] = useState<WithStringId<z.infer<typeof TestRun>>[]>([]);
     const [workflowMap, setWorkflowMap] = useState<Record<string, WithStringId<z.infer<typeof Workflow>>>>({});
     const [total, setTotal] = useState(0);
+    const [selectedKeys, setSelectedKeys] = useState<Selection>(new Set<string>());
+    const [selectedRuns, setSelectedRuns] = useState<string[]>([]);
+
+    const handleSelectionChange = (selection: Selection) => {
+        if (selection === "all" && 
+            selectedKeys !== "all" && 
+            (selectedKeys as Set<string>).size > 0) {
+            setSelectedKeys(new Set());
+            setSelectedRuns([]);
+        } else {
+            setSelectedKeys(selection);
+            if (selection === "all") {
+                setSelectedRuns(runs.map(run => run._id));
+            } else {
+                setSelectedRuns(Array.from(selection as Set<string>));
+            }
+        }
+    };
+
+    const handleCancel = async (runId: string) => {
+        try {
+            await cancelRun(projectId, runId);
+            // Update the run status locally after successful cancellation
+            setRuns(runs.map(run => {
+                if (run._id === runId) {
+                    return {
+                        ...run,
+                        status: 'cancelled'
+                    };
+                }
+                return run;
+            }));
+        } catch (err) {
+            setError(`Failed to cancel run: ${err}`);
+        }
+    };
+
+    const handleDelete = async (runId: string) => {
+        try {
+            await deleteRun(projectId, runId);
+            // Refresh the runs list after deletion
+            const updatedRuns = await listRuns(projectId, page, pageSize);
+            setRuns(updatedRuns.runs);
+            setTotal(updatedRuns.total);
+        } catch (err) {
+            setError(`Failed to delete run: ${err}`);
+        }
+    };
 
     useEffect(() => {
         let ignore = false;
@@ -333,101 +318,130 @@ function RunList({
         };
     }, [runs, error, projectId]);
 
-    return <div className="h-full flex flex-col gap-4">
-        <div className="flex items-center justify-between">
-            <h1 className="text-xl font-semibold text-gray-800 dark:text-neutral-200">Test Runs</h1>
-            <Button
-                size="sm"
-                onPress={() => router.push(`/projects/${projectId}/test/runs/new`)}
-                startContent={<PlusIcon className="w-4 h-4" />}
-            >
-                New Run
-            </Button>
-        </div>
+    const columns = [
+        {
+            key: 'name',
+            label: 'NAME',
+            render: (run: any) => run.name
+        },
+        {
+            key: 'status',
+            label: 'STATUS',
+            render: (run: any) => (
+                <div className={`inline-flex items-center gap-1.5 px-2 py-1 rounded-full text-xs font-medium ${getStatusStyles(run.status)}`}>
+                    <div className={`w-1.5 h-1.5 rounded-full ${getStatusDotStyles(run.status)}`} />
+                    {run.status.charAt(0).toUpperCase() + run.status.slice(1)}
+                </div>
+            )
+        },
+        {
+            key: 'results',
+            label: 'RESULTS',
+            render: (run: any) => (
+                <div className="flex items-center gap-2">
+                    <span className="text-green-600 dark:text-green-400">{run.passCount || 0} passed</span>
+                    <span className="text-red-600 dark:text-red-400">{run.failCount || 0} failed</span>
+                </div>
+            )
+        },
+        {
+            key: 'createdAt',
+            label: 'STARTED',
+            render: (run: any) => isValidDate(run.startedAt) ? 
+                <RelativeTime date={new Date(run.startedAt)} /> : 
+                'Invalid date'
+        }
+    ];
 
-        {loading && <div className="flex gap-2 items-center">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 p-2 rounded-md text-red-800 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
-        </div>}
-        {!loading && !error && <>
-            {runs.length === 0 && <div className="text-gray-600 dark:text-neutral-400 text-center">No test runs found</div>}
-            {runs.length > 0 && <div className="space-y-4">
-                {runs.map((run) => (
-                    <div key={run._id} className="border dark:border-neutral-800 rounded-lg shadow-sm">
-                        <div className="p-4 flex items-center justify-between hover:bg-neutral-100 dark:hover:bg-neutral-800">
-                            <div className="flex items-center space-x-4">
-                                <Link
-                                    href={`/projects/${projectId}/test/runs/${run._id}`}
-                                    className="text-blue-600 dark:text-blue-400 hover:underline"
-                                >
-                                    {run.name}
-                                </Link>
-                                {workflowMap[run.workflowId] && (
-                                    <div className="flex items-center gap-2 text-sm text-gray-600 dark:text-neutral-400">
-                                        <WorkflowIcon className="w-4 h-4 shrink-0" />
-                                        {workflowMap[run.workflowId].name}
-                                    </div>
-                                )}
-                            </div>
-                            <div className="flex items-center gap-4">
-                                <span className={getStatusClass(run.status)}>
-                                    {run.status}
-                                </span>
-                                <div className="text-sm text-gray-600 dark:text-neutral-400">
-                                    <RelativeTime date={new Date(run.startedAt)} />
-                                </div>
-                            </div>
-                        </div>
-                        {run.aggregateResults && (
-                            <div className="border-t dark:border-neutral-800 px-4 py-2 bg-gray-50 dark:bg-neutral-900/50">
-                                <div className="grid grid-cols-3 gap-4 text-sm">
-                                    <div className="text-gray-600 dark:text-neutral-400">
-                                        Total: {run.aggregateResults.total}
-                                    </div>
-                                    <div className="text-green-600 dark:text-green-400">
-                                        Passed: {run.aggregateResults.passCount}
-                                    </div>
-                                    <div className="text-red-600 dark:text-red-400">
-                                        Failed: {run.aggregateResults.failCount}
-                                    </div>
-                                </div>
-                            </div>
-                        )}
+    return (
+        <StructuredPanel 
+            title="TEST RUNS"
+            tooltip="View and manage your test runs"
+        >
+            <div className="flex flex-col gap-6 max-w-4xl">
+                {/* Header Section */}
+                <div className="flex items-center justify-between">
+                    <div className="flex flex-col gap-1">
+                        <h1 className="text-lg font-semibold text-gray-900 dark:text-white">Test Runs</h1>
+                        <p className="text-sm text-gray-600 dark:text-neutral-400">
+                            View and monitor your workflow test runs
+                        </p>
                     </div>
-                ))}
-            </div>}
-            {total > 1 && <Pagination
-                total={total}
-                page={page}
-                onChange={(page) => {
-                    router.push(`/projects/${projectId}/test/runs?page=${page}`);
-                }}
-                className="self-center"
-            />}
-        </>}
-    </div>;
+                    <Button
+                        size="sm"
+                        color="primary"
+                        startContent={<PlusIcon size={16} />}
+                        onPress={() => router.push(`/projects/${projectId}/test/simulations`)}
+                    >
+                        New Run
+                    </Button>
+                </div>
+
+                {/* Error Display */}
+                {error && (
+                    <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                        {error}
+                        <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                    </div>
+                )}
+
+                {/* Runs Table */}
+                {loading ? (
+                    <div className="flex gap-2 items-center justify-center p-8 text-gray-600 dark:text-neutral-400">
+                        <Spinner size="sm" />
+                        Loading test runs...
+                    </div>
+                ) : runs.length === 0 ? (
+                    <div className="text-center p-8 bg-gray-50 dark:bg-neutral-900 rounded-lg border border-dashed border-gray-200 dark:border-neutral-800">
+                        <p className="text-gray-600 dark:text-neutral-400 mb-4">No test runs created yet</p>
+                        <Button
+                            size="sm"
+                            color="primary"
+                            startContent={<PlusIcon size={16} />}
+                            onPress={() => router.push(`/projects/${projectId}/test/simulations`)}
+                        >
+                            Create Your First Test Run
+                        </Button>
+                    </div>
+                ) : (
+                    <DataTable
+                        items={runs}
+                        columns={columns}
+                        selectedKeys={selectedKeys}
+                        onSelectionChange={handleSelectionChange}
+                        onDelete={handleDelete}
+                        onView={(id) => router.push(`/projects/${projectId}/test/runs/${id}`)}
+                        projectId={projectId}
+                    />
+                )}
+            </div>
+        </StructuredPanel>
+    );
 }
 
-// Helper function for status styling
-function getStatusClass(status: string) {
-    const baseClass = "px-2 py-1 rounded text-xs uppercase font-medium";
-    switch (status) {
-        case 'completed':
-            return `${baseClass} bg-green-100 dark:bg-green-900/20 text-green-800 dark:text-green-400`;
-        case 'failed':
-        case 'error':
-            return `${baseClass} bg-red-100 dark:bg-red-900/20 text-red-800 dark:text-red-400`;
-        case 'cancelled':
-            return `${baseClass} bg-gray-100 dark:bg-neutral-800 text-gray-800 dark:text-neutral-400`;
-        case 'running':
-        case 'pending':
-        default:
-            return `${baseClass} bg-yellow-100 dark:bg-yellow-900/20 text-yellow-800 dark:text-yellow-400`;
-    }
+// Helper functions for status styling
+function getStatusStyles(status: string): string {
+    const styles = {
+        pending: "bg-gray-100 text-gray-700 dark:bg-neutral-800 dark:text-neutral-300",
+        running: "bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-300",
+        completed: "bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300",
+        cancelled: "bg-yellow-100 text-yellow-700 dark:bg-yellow-900/30 dark:text-yellow-300",
+        failed: "bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300",
+        error: "bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300"
+    };
+    return styles[status as keyof typeof styles] || styles.pending;
+}
+
+function getStatusDotStyles(status: string): string {
+    const styles = {
+        pending: "bg-gray-500 dark:bg-neutral-400",
+        running: "bg-blue-500 dark:bg-blue-400",
+        completed: "bg-green-500 dark:bg-green-400",
+        cancelled: "bg-yellow-500 dark:bg-yellow-400",
+        failed: "bg-red-500 dark:bg-red-400",
+        error: "bg-red-500 dark:bg-red-400"
+    };
+    return styles[status as keyof typeof styles] || styles.pending;
 }
 
 export function RunsApp({
@@ -437,20 +451,15 @@ export function RunsApp({
     projectId: string,
     slug: string[]
 }) {
-    let selection: "list" | "view" | "new" = "list";
+    let selection: "list" | "view" = "list";
     let runId: string | null = null;
     if (slug.length > 0) {
-        if (slug[0] === "new") {
-            selection = "new";
-        } else {
-            selection = "view";
-            runId = slug[0];
-        }
+        selection = "view";
+        runId = slug[0];
     }
 
     return <>
-        {selection === "list" && <RunList projectId={projectId} />}
-        {selection === "new" && <NewRun projectId={projectId} />}
+        {selection === "list" && <RunsList projectId={projectId} />}
         {selection === "view" && runId && <ViewRun projectId={projectId} runId={runId} />}
     </>;
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/scenarios_app.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/scenarios_app.tsx
index 3b269420..4cd628a0 100644
--- a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/scenarios_app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/scenarios_app.tsx
@@ -1,14 +1,20 @@
+"use client";
+
 import Link from "next/link";
 import { WithStringId } from "@/app/lib/types/types";
 import { TestScenario } from "@/app/lib/types/testing_types";
 import { useEffect, useState, useRef } from "react";
 import { createScenario, getScenario, listScenarios, updateScenario, deleteScenario } from "@/app/actions/testing_actions";
-import { Button, Input, Pagination, Spinner, Textarea, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter } from "@heroui/react";
+import { Button, Spinner, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter, Selection } from "@heroui/react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { z } from "zod";
-import { ArrowLeftIcon, PlusIcon } from "lucide-react";
-import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { ArrowLeftIcon, PlusIcon, } from "lucide-react";
 import { RelativeTime } from "@primer/react"
+import { StructuredPanel, ActionButton } from "@/app/lib/components/structured-panel";
+import { DataTable } from "./components/table";
+import { isValidDate } from './utils/date';
+import { ItemView } from "./components/item-view"
+import { ScenarioForm } from "./components/scenario-form";
 
 function EditScenario({
     projectId,
@@ -44,60 +50,45 @@ function EditScenario({
             const name = formData.get("name") as string;
             const description = formData.get("description") as string;
             await updateScenario(projectId, scenarioId, { name, description });
-            router.push(`/projects/${projectId}/test/scenarios/${scenarioId}`);
+            router.push(`/projects/${projectId}/test/scenarios`);
         } catch (error) {
             setError(`Unable to update scenario: ${error}`);
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">Edit Scenario</h1>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 dark:bg-red-900/20 p-2 rounded-md text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => formRef.current?.requestSubmit()}>Retry</Button>
-        </div>}
-        {!loading && scenario && (
-            <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-                <Input
-                    type="text"
-                    name="name"
-                    label="Name"
-                    placeholder="Enter a name for the scenario"
-                    defaultValue={scenario.name}
-                    required
-                />
-                <Textarea
-                    name="description"
-                    label="Description"
-                    placeholder="Enter a description for the scenario"
-                    defaultValue={scenario.description}
-                    required
-                />
-                <div className="flex gap-2 items-center">
-                    <FormStatusButton
-                        props={{
-                            className: "self-start",
-                            children: "Update",
-                            size: "sm",
-                            type: "submit",
-                        }}
-                    />
-                    <Button
-                        size="sm"
-                        variant="flat"
-                        as={Link}
-                        href={`/projects/${projectId}/test/scenarios/${scenarioId}`}
-                    >
-                        Cancel
-                    </Button>
+    return <StructuredPanel 
+        title="EDIT SCENARIO"
+        tooltip="Edit an existing test scenario"
+    >
+        <div className="flex flex-col gap-6 max-w-2xl">
+            {loading && (
+                <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
+                    <Spinner size="sm" />
+                    Loading scenario...
                 </div>
-            </form>
-        )}
-    </div>;
+            )}
+
+            {error && (
+                <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                    {error}
+                    <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                </div>
+            )}
+
+            {!loading && scenario && (
+                <ScenarioForm
+                    formRef={formRef}
+                    handleSubmit={handleSubmit}
+                    onCancel={() => router.push(`/projects/${projectId}/test/scenarios`)}
+                    submitButtonText="Update Scenario"
+                    defaultValues={{
+                        name: scenario.name,
+                        description: scenario.description
+                    }}
+                />
+            )}
+        </div>
+    </StructuredPanel>;
 }
 
 function ViewScenario({
@@ -131,120 +122,98 @@ function ViewScenario({
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">View Scenario</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/scenarios`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
+    return (
+        <StructuredPanel 
+            title="VIEW SCENARIO"
+            tooltip="View scenario details"
+            actions={[
+                <ActionButton
+                    key="back"
+                    icon={<ArrowLeftIcon size={16} />}
+                    onClick={() => router.push(`/projects/${projectId}/test/scenarios`)}
+                >
+                    All Scenarios
+                </ActionButton>
+            ]}
         >
-            All Scenarios
-        </Button>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {!loading && !scenario && <div className="text-gray-600 dark:text-neutral-400 text-center">Scenario not found</div>}
-        {!loading && scenario && (
-            <>
-                <div className="flex flex-col gap-1 text-sm">
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Name</div>
-                        <div className="flex-[2] dark:text-neutral-200">{scenario.name}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Description</div>
-                        <div className="flex-[2] dark:text-neutral-200">{scenario.description}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Created</div>
-                        <div className="flex-[2] dark:text-neutral-300"><RelativeTime date={new Date(scenario.createdAt)} /></div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Last Updated</div>
-                        <div className="flex-[2] dark:text-neutral-300"><RelativeTime date={new Date(scenario.lastUpdatedAt)} /></div>
-                    </div>
-                </div>
-                <div className="flex gap-2 mt-4">
-                    <Button
-                        size="sm"
-                        as={Link}
-                        href={`/projects/${projectId}/test/scenarios/${scenarioId}/edit`}
-                    >
-                        Edit
-                    </Button>
-                    <Button
-                        size="sm"
-                        color="danger"
-                        variant="flat"
-                        onPress={() => setIsDeleteModalOpen(true)}
-                    >
-                        Delete
-                    </Button>
-                </div>
-
-                <Modal
-                    isOpen={isDeleteModalOpen}
-                    onOpenChange={setIsDeleteModalOpen}
-                    size="sm"
-                >
-                    <ModalContent>
-                        {(onClose) => (
-                            <>
-                                <ModalHeader>Confirm Deletion</ModalHeader>
-                                <ModalBody>
-                                    Are you sure you want to delete this scenario?
-                                </ModalBody>
-                                <ModalFooter>
-                                    <Button size="sm" variant="flat" onPress={onClose}>
-                                        Cancel
-                                    </Button>
-                                    <Button
-                                        size="sm"
-                                        color="danger"
-                                        onPress={() => {
-                                            handleDelete();
-                                            onClose();
-                                        }}
-                                    >
-                                        Delete
-                                    </Button>
-                                </ModalFooter>
-                            </>
-                        )}
-                    </ModalContent>
-                </Modal>
-
-                <Modal
-                    isOpen={deleteError !== null}
-                    onOpenChange={() => setDeleteError(null)}
-                    size="sm"
-                >
-                    <ModalContent>
-                        {(onClose) => (
-                            <>
-                                <ModalHeader>Error</ModalHeader>
-                                <ModalBody>
-                                    {deleteError}
-                                </ModalBody>
-                                <ModalFooter>
-                                    <Button
-                                        size="sm"
-                                        color="primary"
-                                        onPress={onClose}
-                                    >
-                                        Close
-                                    </Button>
-                                </ModalFooter>
-                            </>
-                        )}
-                    </ModalContent>
-                </Modal>
-            </>
-        )}
-    </div>;
+            <ItemView
+                items={[
+                    { label: "Name", value: scenario?.name },
+                    { label: "Description", value: scenario?.description },
+                    {
+                        label: "Created",
+                        value: scenario?.createdAt && isValidDate(scenario.createdAt)
+                            ? <RelativeTime date={new Date(scenario.createdAt)} />
+                            : 'Invalid date'
+                    },
+                    {
+                        label: "Last Updated",
+                        value: scenario?.lastUpdatedAt && isValidDate(scenario.lastUpdatedAt)
+                            ? <RelativeTime date={new Date(scenario.lastUpdatedAt)} />
+                            : 'Invalid date'
+                    }
+                ]}
+                actions={
+                    <>
+                        <Button size="sm" variant="flat" onPress={() => router.push(`/projects/${projectId}/test/scenarios/${scenarioId}/edit`)}>Edit</Button>
+                        <Button size="sm" color="danger" variant="flat" onPress={() => setIsDeleteModalOpen(true)}>Delete</Button>
+                    </>
+                }
+            />
+            <Modal
+                isOpen={isDeleteModalOpen}
+                onOpenChange={setIsDeleteModalOpen}
+                size="sm"
+            >
+                <ModalContent>
+                    {(onClose) => (
+                        <>
+                            <ModalHeader>Confirm Deletion</ModalHeader>
+                            <ModalBody>
+                                Are you sure you want to delete this scenario?
+                            </ModalBody>
+                            <ModalFooter>
+                                <Button size="sm" variant="flat" onPress={onClose}>
+                                    Cancel
+                                </Button>
+                                <Button
+                                    size="sm"
+                                    color="danger"
+                                    onPress={() => {
+                                        handleDelete();
+                                        onClose();
+                                    }}
+                                >
+                                    Delete
+                                </Button>
+                            </ModalFooter>
+                        </>
+                    )}
+                </ModalContent>
+            </Modal>
+            <Modal
+                isOpen={deleteError !== null}
+                onOpenChange={() => setDeleteError(null)}
+                size="sm"
+            >
+                <ModalContent>
+                    {(onClose) => (
+                        <>
+                            <ModalHeader>Error</ModalHeader>
+                            <ModalBody>
+                                {deleteError}
+                            </ModalBody>
+                            <ModalFooter>
+                                <Button size="sm" onPress={onClose}>
+                                    Close
+                                </Button>
+                            </ModalFooter>
+                        </>
+                    )}
+                </ModalContent>
+            </Modal>
+        </StructuredPanel>
+    );
 }
 
 function NewScenario({
@@ -258,63 +227,36 @@ function NewScenario({
 
     async function handleSubmit(formData: FormData) {
         setError(null);
-        const name = formData.get("name") as string;
-        const description = formData.get("description") as string;
         try {
-            const scenario = await createScenario(projectId, { name, description });
-            router.push(`/projects/${projectId}/test/scenarios/${scenario._id}`);
+            const name = formData.get("name") as string;
+            const description = formData.get("description") as string;
+            await createScenario(projectId, { name, description });
+            router.push(`/projects/${projectId}/test/scenarios`);
         } catch (error) {
             setError(`Unable to create scenario: ${error}`);
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 pb-2 border-b border-gray-200">New Scenario</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/scenarios`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
-        >
-            All Scenarios
-        </Button>
-        {error && <div className="bg-red-100 p-2 rounded-md text-red-800 flex items-center gap-2 text-sm">
-            {error}
-            <Button
-                size="sm"
-                color="danger"
-                onPress={() => {
-                    formRef.current?.requestSubmit();
-                }}
-            >
-                Retry
-            </Button>
-        </div>}
-        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-            <Input
-                type="text"
-                name="name"
-                label="Name"
-                placeholder="Enter a name for the scenario"
-                required
+    return <StructuredPanel 
+        title="NEW SCENARIO"
+        tooltip="Create a new test scenario"
+    >
+        <div className="flex flex-col gap-6 max-w-2xl">
+            {error && (
+                <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                    {error}
+                    <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                </div>
+            )}
+            
+            <ScenarioForm
+                formRef={formRef}
+                handleSubmit={handleSubmit}
+                onCancel={() => router.push(`/projects/${projectId}/test/scenarios`)}
+                submitButtonText="Create Scenario"
             />
-            <Textarea
-                name="description"
-                label="Description"
-                placeholder="Enter a description for the scenario"
-                required
-            />
-            <FormStatusButton
-                props={{
-                    className: "self-start",
-                    children: "Create",
-                    size: "sm",
-                    type: "submit",
-                }}
-            />
-        </form>
-    </div>;
+        </div>
+    </StructuredPanel>;
 }
 
 function ScenarioList({
@@ -330,6 +272,8 @@ function ScenarioList({
     const [error, setError] = useState<string | null>(null);
     const [scenarios, setScenarios] = useState<WithStringId<z.infer<typeof TestScenario>>[]>([]);
     const [total, setTotal] = useState(0);
+    const [selectedKeys, setSelectedKeys] = useState<Selection>(new Set<string>());
+    const [selectedScenarios, setSelectedScenarios] = useState<string[]>([]);
 
     useEffect(() => {
         let ignore = false;
@@ -363,93 +307,140 @@ function ScenarioList({
         };
     }, [page, pageSize, error, projectId]);
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">Scenarios</h1>
-        <Button
-            size="sm"
-            onPress={() => router.push(`/projects/${projectId}/test/scenarios/new`)}
-            className="self-end"
-            startContent={<PlusIcon className="w-4 h-4" />}
-        >
-            New Scenario
-        </Button>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 dark:bg-red-900/20 p-2 rounded-md text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
-        </div>}
-        {!loading && !error && <>
-            {scenarios.length === 0 && <div className="text-gray-600 dark:text-neutral-400 text-center">No scenarios found</div>}
-            {scenarios.length > 0 && <div className="flex flex-col w-full">
-                {/* Header */}
-                <div className="grid grid-cols-7 py-2 bg-gray-100 dark:bg-neutral-800 font-semibold text-sm">
-                    <div className="col-span-2 px-4 dark:text-neutral-300">Name</div>
-                    <div className="col-span-3 px-4 dark:text-neutral-300">Description</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Created</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Updated</div>
-                </div>
+    const handleSelectionChange = (selection: Selection) => {
+        if (selection === "all" && 
+            selectedKeys !== "all" && 
+            (selectedKeys as Set<string>).size > 0) {
+            setSelectedKeys(new Set());
+            setSelectedScenarios([]);
+        } else {
+            setSelectedKeys(selection);
+            if (selection === "all") {
+                setSelectedScenarios(scenarios.map(scenario => scenario._id));
+            } else {
+                setSelectedScenarios(Array.from(selection as Set<string>));
+            }
+        }
+    };
 
-                {/* Rows */}
-                {scenarios.map((scenario) => (
-                    <div key={scenario._id} className="grid grid-cols-7 py-2 border-b border-gray-200 dark:border-neutral-800 hover:bg-gray-50 dark:hover:bg-neutral-800 text-sm">
-                        <div className="col-span-2 px-4 truncate">
-                            <Link
-                                href={`/projects/${projectId}/test/scenarios/${scenario._id}`}
-                                className="text-blue-600 dark:text-blue-400 hover:underline"
-                            >
-                                {scenario.name}
-                            </Link>
-                        </div>
-                        <div className="col-span-3 px-4 truncate dark:text-neutral-300">{scenario.description}</div>
-                        <div className="col-span-1 px-4 text-gray-600 dark:text-neutral-400 truncate">
-                            <RelativeTime date={new Date(scenario.createdAt)} />
-                        </div>
-                        <div className="col-span-1 px-4 text-gray-600 dark:text-neutral-400 truncate">
-                            <RelativeTime date={new Date(scenario.lastUpdatedAt)} />
-                        </div>
-                    </div>
-                ))}
-            </div>}
-            {total > 1 && <Pagination
-                total={total}
-                page={page}
-                onChange={(page) => {
-                    router.push(`/projects/${projectId}/test/scenarios?page=${page}`);
-                }}
-                className="self-center"
-            />}
-        </>}
-    </div>;
+    const handleDelete = async (scenarioId: string) => {
+        try {
+            await deleteScenario(projectId, scenarioId);
+            // Refresh the scenarios list after deletion
+            const result = await listScenarios(projectId, page, pageSize);
+            setScenarios(result.scenarios);
+            setTotal(result.total);
+        } catch (err) {
+            setError(`Failed to delete scenario: ${err}`);
+        }
+    };
+
+    const columns = [
+        {
+            key: 'name',
+            label: 'NAME',
+            render: (scenario: any) => scenario.name
+        },
+        {
+            key: 'description',
+            label: 'DESCRIPTION'
+        },
+        {
+            key: 'createdAt',
+            label: 'CREATED',
+            render: (scenario: any) => isValidDate(scenario.createdAt) ? 
+                <RelativeTime date={new Date(scenario.createdAt)} /> : 
+                'Invalid date'
+        }
+    ];
+
+    return <StructuredPanel 
+        title="SCENARIOS"
+        tooltip="View and manage your test scenarios"
+    >
+        <div className="flex flex-col gap-6 max-w-4xl">
+            {/* Header Section */}
+            <div className="flex items-center justify-between">
+                <div className="flex flex-col gap-1">
+                    <h1 className="text-lg font-semibold text-gray-900 dark:text-white">Scenarios</h1>
+                    <p className="text-sm text-gray-600 dark:text-neutral-400">
+                        Create and manage test scenarios for your simulations
+                    </p>
+                </div>
+                <Button
+                    size="sm"
+                    color="primary"
+                    startContent={<PlusIcon size={16} />}
+                    onPress={() => router.push(`/projects/${projectId}/test/scenarios/new`)}
+                >
+                    New Scenario
+                </Button>
+            </div>
+
+            {/* Error Display */}
+            {error && (
+                <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                    {error}
+                    <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                </div>
+            )}
+
+            {/* Scenarios Table */}
+            {loading ? (
+                <div className="flex gap-2 items-center justify-center p-8 text-gray-600 dark:text-neutral-400">
+                    <Spinner size="sm" />
+                    Loading scenarios...
+                </div>
+            ) : scenarios.length === 0 ? (
+                <div className="text-center p-8 bg-gray-50 dark:bg-neutral-900 rounded-lg border border-dashed border-gray-200 dark:border-neutral-800">
+                    <p className="text-gray-600 dark:text-neutral-400 mb-4">No scenarios created yet</p>
+                    <Button
+                        size="sm"
+                        color="primary"
+                        startContent={<PlusIcon size={16} />}
+                        onPress={() => router.push(`/projects/${projectId}/test/scenarios/new`)}
+                    >
+                        Create Your First Scenario
+                    </Button>
+                </div>
+            ) : (
+                <DataTable
+                    items={scenarios}
+                    columns={columns}
+                    selectedKeys={selectedKeys}
+                    onSelectionChange={setSelectedKeys}
+                    onDelete={handleDelete}
+                    onEdit={(id) => router.push(`/projects/${projectId}/test/scenarios/${id}/edit`)}
+                    projectId={projectId}
+                />
+            )}
+        </div>
+    </StructuredPanel>;
 }
 
-export function ScenariosApp({
-    projectId,
-    slug
-}: {
-    projectId: string,
-    slug: string[]
-}) {
-    let selection: "list" | "view" | "new" | "edit" = "list";
-    let scenarioId: string | null = null;
-    if (slug.length > 0) {
+export function ScenariosApp({ projectId, slug }: { projectId: string; slug?: string[] }) {
+    let selection: "list" | "new" | "edit" = "list";
+    let scenarioId: string | undefined;
+
+    if (slug && slug.length > 0) {
         if (slug[0] === "new") {
             selection = "new";
-        } else if (slug[slug.length - 1] === "edit") {
+        } else if (slug[1] === "edit") {
             selection = "edit";
             scenarioId = slug[0];
         } else {
-            selection = "view";
+            selection = "list";
             scenarioId = slug[0];
         }
     }
 
-    return <>
-        {selection === "list" && <ScenarioList projectId={projectId} />}
-        {selection === "new" && <NewScenario projectId={projectId} />}
-        {selection === "view" && scenarioId && <ViewScenario projectId={projectId} scenarioId={scenarioId} />}
-        {selection === "edit" && scenarioId && <EditScenario projectId={projectId} scenarioId={scenarioId} />}
-    </>;
+    return (
+        <div className="h-full">
+            {selection === "list" && <ScenarioList projectId={projectId} />}
+            {selection === "new" && <NewScenario projectId={projectId} />}
+            {selection === "edit" && scenarioId && (
+                <EditScenario projectId={projectId} scenarioId={scenarioId} />
+            )}
+        </div>
+    );
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/simulations_app.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/simulations_app.tsx
index b95159df..577026ee 100644
--- a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/simulations_app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/simulations_app.tsx
@@ -1,16 +1,23 @@
+"use client";
+
 import Link from "next/link";
 import { WithStringId } from "@/app/lib/types/types";
-import { TestProfile, TestScenario, TestSimulation } from "@/app/lib/types/testing_types";
+import { TestProfile, TestScenario, TestSimulation, TestRun } from "@/app/lib/types/testing_types";
+import { Workflow } from "@/app/lib/types/workflow_types";
 import { useEffect, useState, useRef } from "react";
-import { createSimulation, getSimulation, listSimulations, updateSimulation, deleteSimulation, listScenarios, getScenario, getProfile } from "@/app/actions/testing_actions";
-import { Button, Input, Pagination, Spinner, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter } from "@heroui/react";
+import { createSimulation, getSimulation, listSimulations, updateSimulation, deleteSimulation, getScenario, getProfile, createRun } from "@/app/actions/testing_actions";
+import { Button, Spinner, Tooltip, Selection } from "@heroui/react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { z } from "zod";
-import { PlusIcon, ArrowLeftIcon } from "lucide-react";
-import { FormStatusButton } from "@/app/lib/components/form-status-button";
+import { PlusIcon, ArrowLeftIcon, AlertTriangleIcon } from "lucide-react";
 import { RelativeTime } from "@primer/react"
 import { ScenarioSelector } from "@/app/lib/components/selectors/scenario-selector";
 import { ProfileSelector } from "@/app/lib/components/selectors/profile-selector";
+import { StructuredPanel, ActionButton } from "@/app/lib/components/structured-panel";
+import { WorkflowSelector } from "@/app/lib/components/selectors/workflow-selector";
+import { DataTable } from "./components/table"
+import { isValidDate } from './utils/date';
+import { SimulationForm } from "./components/simulation-form";
 
 function EditSimulation({
     projectId,
@@ -23,11 +30,11 @@ function EditSimulation({
     const [simulation, setSimulation] = useState<WithStringId<z.infer<typeof TestSimulation>> | null>(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
-    const formRef = useRef<HTMLFormElement>(null);
     const [scenario, setScenario] = useState<WithStringId<z.infer<typeof TestScenario>> | null>(null);
     const [profile, setProfile] = useState<WithStringId<z.infer<typeof TestProfile>> | null>(null);
     const [isScenarioModalOpen, setIsScenarioModalOpen] = useState(false);
     const [isProfileModalOpen, setIsProfileModalOpen] = useState(false);
+    const formRef = useRef<HTMLFormElement>(null);
 
     useEffect(() => {
         async function fetchSimulation() {
@@ -56,291 +63,91 @@ function EditSimulation({
         setError(null);
         try {
             const name = formData.get("name") as string;
+            const description = formData.get("description") as string;
             const passCriteria = formData.get("passCriteria") as string;
 
-            if (!name || !passCriteria) {
-                throw new Error("Name and Pass Criteria are required");
-            }
-
             if (!scenario) {
                 throw new Error("Please select a scenario");
             }
 
             await updateSimulation(projectId, simulationId, {
                 name,
+                description,
                 scenarioId: scenario._id,
                 profileId: profile?._id || null,
                 passCriteria
             });
-            router.push(`/projects/${projectId}/test/simulations/${simulationId}`);
+            router.push(`/projects/${projectId}/test/simulations`);
         } catch (error) {
             setError(`Unable to update simulation: ${error}`);
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">Edit Simulation</h1>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 dark:bg-red-900/20 p-2 rounded-md text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => formRef.current?.requestSubmit()}>Retry</Button>
-        </div>}
-        {!loading && simulation && (
-            <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-                <Input
-                    type="text"
-                    name="name"
-                    label="Name"
-                    placeholder="Enter a name for the simulation"
-                    defaultValue={simulation.name}
-                    required
-                />
-                <Input
-                    type="text"
-                    name="passCriteria"
-                    label="Pass Criteria"
-                    placeholder="Enter the criteria for passing this simulation"
-                    defaultValue={simulation.passCriteria}
-                    required
-                />
-                <div className="flex flex-col gap-2">
-                    <label className="text-sm font-medium text-gray-700 dark:text-neutral-300">Scenario</label>
-                    <div className="flex items-center gap-2">
-                        {scenario ? (
-                            <div className="text-sm text-blue-600 dark:text-blue-400">{scenario.name}</div>
-                        ) : (
-                            <div className="text-sm text-gray-500 dark:text-neutral-500">No scenario selected</div>
-                        )}
-                        <Button
-                            size="sm"
-                            onPress={() => setIsScenarioModalOpen(true)}
-                            type="button"
-                        >
-                            {scenario ? "Change" : "Select"} Scenario
-                        </Button>
-                    </div>
+    return <StructuredPanel 
+        title="EDIT SIMULATION"
+        tooltip="Edit an existing test simulation"
+    >
+        <div className="flex flex-col gap-6 max-w-2xl">
+            {loading && (
+                <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
+                    <Spinner size="sm" />
+                    Loading simulation...
                 </div>
-                <div className="flex flex-col gap-2">
-                    <label className="text-sm font-medium text-gray-700 dark:text-neutral-300">Profile (optional)</label>
-                    <div className="flex items-center gap-2">
-                        {profile ? (
-                            <div className="text-sm text-blue-600 dark:text-blue-400">{profile.name}</div>
-                        ) : (
-                            <div className="text-sm text-gray-500 dark:text-neutral-500">No profile selected</div>
-                        )}
-                        {profile && <Button size="sm" variant="bordered" onClick={() => setProfile(null)}>Remove</Button>}
-                        <Button
-                            size="sm"
-                            onPress={() => setIsProfileModalOpen(true)}
-                            type="button"
-                        >
-                            {profile ? "Change" : "Select"} Profile
-                        </Button>
-                    </div>
+            )}
+            
+            {error && (
+                <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                    {error}
+                    <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
                 </div>
-                <div className="flex gap-2 items-center">
-                    <FormStatusButton
-                        props={{
-                            className: "self-start",
-                            children: "Update",
-                            size: "sm",
-                            type: "submit",
-                            isDisabled: !scenario,
+            )}
+
+            {!loading && simulation && (
+                <>
+                    <div>
+                    <h1 className="text-lg font-semibold text-gray-900 dark:text-white">Edit Simulation</h1>
+                        <p className="text-gray-600 dark:text-neutral-400">
+                            Define a test simulation by selecting a scenario and optionally a profile
+                        </p>
+                    </div>
+
+                    <SimulationForm
+                        formRef={formRef}
+                        handleSubmit={handleSubmit}
+                        scenario={scenario}
+                        setScenario={setScenario}
+                        profile={profile}
+                        setProfile={setProfile}
+                        isScenarioModalOpen={isScenarioModalOpen}
+                        setIsScenarioModalOpen={setIsScenarioModalOpen}
+                        isProfileModalOpen={isProfileModalOpen}
+                        setIsProfileModalOpen={setIsProfileModalOpen}
+                        projectId={projectId}
+                        submitButtonText="Update Simulation"
+                        defaultValues={{
+                            name: simulation.name ?? '',
+                            description: simulation.description ?? '',
+                            passCriteria: simulation.passCriteria ?? ''
                         }}
+                        onCancel={() => router.push(`/projects/${projectId}/test/simulations`)}
                     />
-                    <Button
-                        size="sm"
-                        variant="flat"
-                        as={Link}
-                        href={`/projects/${projectId}/test/simulations/${simulationId}`}
-                    >
-                        Cancel
-                    </Button>
-                </div>
 
-                <ScenarioSelector
-                    projectId={projectId}
-                    isOpen={isScenarioModalOpen}
-                    onOpenChange={setIsScenarioModalOpen}
-                    onSelect={setScenario}
-                />
-                <ProfileSelector
-                    projectId={projectId}
-                    isOpen={isProfileModalOpen}
-                    onOpenChange={setIsProfileModalOpen}
-                    onSelect={setProfile}
-                />
-            </form>
-        )}
-    </div>;
-}
-
-function ViewSimulation({
-    projectId,
-    simulationId,
-}: {
-    projectId: string,
-    simulationId: string,
-}) {
-    const router = useRouter();
-    const [simulation, setSimulation] = useState<WithStringId<z.infer<typeof TestSimulation>> | null>(null);
-    const [loading, setLoading] = useState(true);
-    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-    const [deleteError, setDeleteError] = useState<string | null>(null);
-    const [scenario, setScenario] = useState<WithStringId<z.infer<typeof TestScenario>> | null>(null);
-    const [profile, setProfile] = useState<WithStringId<z.infer<typeof TestProfile>> | null>(null);
-
-    useEffect(() => {
-        async function fetchSimulation() {
-            const simulation = await getSimulation(projectId, simulationId);
-            setSimulation(simulation);
-            if (simulation) {
-                const [scenarioResult, profileResult] = await Promise.all([
-                    getScenario(projectId, simulation.scenarioId),
-                    simulation.profileId ? getProfile(projectId, simulation.profileId) : Promise.resolve(null),
-                ]);
-                setScenario(scenarioResult);
-                setProfile(profileResult);
-            }
-            setLoading(false);
-        }
-        fetchSimulation();
-    }, [simulationId, projectId]);
-
-    async function handleDelete() {
-        try {
-            await deleteSimulation(projectId, simulationId);
-            router.push(`/projects/${projectId}/test/simulations`);
-        } catch (error) {
-            setDeleteError(`Failed to delete simulation: ${error}`);
-        }
-    }
-
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">View Simulation</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/simulations`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
-        >
-            All Simulations
-        </Button>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {!loading && !simulation && <div className="text-gray-600 dark:text-neutral-400 text-center">Simulation not found</div>}
-        {!loading && simulation && (
-            <>
-                <div className="flex flex-col gap-1 text-sm">
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Name</div>
-                        <div className="flex-[2] dark:text-neutral-200">{simulation.name}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Scenario</div>
-                        <div className="flex-[2] dark:text-neutral-200">{scenario?.name || 'Loading...'}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Profile</div>
-                        <div className="flex-[2] dark:text-neutral-200">{profile?.name || 'None'}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Pass Criteria</div>
-                        <div className="flex-[2] dark:text-neutral-200">{simulation.passCriteria}</div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Created</div>
-                        <div className="flex-[2] dark:text-neutral-300"><RelativeTime date={new Date(simulation.createdAt)} /></div>
-                    </div>
-                    <div className="flex border-b border-gray-200 dark:border-neutral-800 py-2">
-                        <div className="flex-[1] font-medium text-gray-600 dark:text-neutral-400">Last Updated</div>
-                        <div className="flex-[2] dark:text-neutral-300"><RelativeTime date={new Date(simulation.lastUpdatedAt)} /></div>
-                    </div>
-                </div>
-                <div className="flex gap-2 mt-4">
-                    <Button
-                        size="sm"
-                        as={Link}
-                        href={`/projects/${projectId}/test/simulations/${simulationId}/edit`}
-                    >
-                        Edit
-                    </Button>
-                    <Button
-                        size="sm"
-                        color="danger"
-                        variant="flat"
-                        onPress={() => setIsDeleteModalOpen(true)}
-                    >
-                        Delete
-                    </Button>
-                </div>
-
-                <Modal
-                    isOpen={isDeleteModalOpen}
-                    onOpenChange={setIsDeleteModalOpen}
-                    size="sm"
-                >
-                    <ModalContent>
-                        {(onClose) => (
-                            <>
-                                <ModalHeader>Confirm Deletion</ModalHeader>
-                                <ModalBody>
-                                    Are you sure you want to delete this simulation?
-                                </ModalBody>
-                                <ModalFooter>
-                                    <Button size="sm" variant="flat" onPress={onClose}>
-                                        Cancel
-                                    </Button>
-                                    <Button
-                                        size="sm"
-                                        color="danger"
-                                        onPress={() => {
-                                            handleDelete();
-                                            onClose();
-                                        }}
-                                    >
-                                        Delete
-                                    </Button>
-                                </ModalFooter>
-                            </>
-                        )}
-                    </ModalContent>
-                </Modal>
-
-                <Modal
-                    isOpen={deleteError !== null}
-                    onOpenChange={() => setDeleteError(null)}
-                    size="sm"
-                >
-                    <ModalContent>
-                        {(onClose) => (
-                            <>
-                                <ModalHeader>Error</ModalHeader>
-                                <ModalBody>
-                                    {deleteError}
-                                </ModalBody>
-                                <ModalFooter>
-                                    <Button
-                                        size="sm"
-                                        color="primary"
-                                        onPress={onClose}
-                                    >
-                                        Close
-                                    </Button>
-                                </ModalFooter>
-                            </>
-                        )}
-                    </ModalContent>
-                </Modal>
-            </>
-        )}
-    </div>;
+                    <ScenarioSelector
+                        projectId={projectId}
+                        isOpen={isScenarioModalOpen}
+                        onOpenChange={setIsScenarioModalOpen}
+                        onSelect={setScenario}
+                    />
+                    <ProfileSelector
+                        projectId={projectId}
+                        isOpen={isProfileModalOpen}
+                        onOpenChange={setIsProfileModalOpen}
+                        onSelect={setProfile}
+                    />
+                </>
+            )}
+        </div>
+    </StructuredPanel>;
 }
 
 function NewSimulation({
@@ -360,6 +167,7 @@ function NewSimulation({
         setError(null);
         try {
             const name = formData.get("name") as string;
+            const description = formData.get("description") as string;
             const passCriteria = formData.get("passCriteria") as string;
 
             if (!name || !passCriteria) {
@@ -372,6 +180,7 @@ function NewSimulation({
 
             const result = await createSimulation(projectId, {
                 name,
+                description,
                 scenarioId: scenario._id,
                 profileId: profile?._id || null,
                 passCriteria,
@@ -382,128 +191,102 @@ function NewSimulation({
         }
     }
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 pb-2 border-b border-gray-200">New Simulation</h1>
-        <Button
-            size="sm"
-            className="self-start"
-            as={Link}
-            href={`/projects/${projectId}/test/simulations`}
-            startContent={<ArrowLeftIcon className="w-4 h-4" />}
-        >
-            All Simulations
-        </Button>
-        {error && <div className="bg-red-100 p-2 rounded-md text-red-800 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onClick={() => formRef.current?.requestSubmit()}>Retry</Button>
-        </div>}
-        <form ref={formRef} action={handleSubmit} className="flex flex-col gap-2">
-            <Input
-                type="text"
-                name="name"
-                label="Name"
-                placeholder="Enter a name for the simulation"
-                required
-            />
-            <Input
-                type="text"
-                name="passCriteria"
-                label="Pass Criteria"
-                placeholder="Enter the criteria for passing this simulation"
-                required
-            />
-            <div className="flex flex-col gap-2">
-                <label className="text-sm font-medium">Scenario</label>
-                <div className="flex items-center gap-2">
-                    {scenario ? (
-                        <div className="text-sm text-blue-600">{scenario.name}</div>
-                    ) : (
-                        <div className="text-sm text-gray-500">No scenario selected</div>
-                    )}
-                    <Button
-                        size="sm"
-                        onPress={() => setIsScenarioModalOpen(true)}
-                        type="button"
-                    >
-                        {scenario ? "Change" : "Select"} Scenario
-                    </Button>
-                </div>
+    return <StructuredPanel 
+        title="NEW SIMULATION"
+        tooltip="Create a new test simulation"
+        actions={[
+            <ActionButton
+                key="back"
+                icon={<ArrowLeftIcon size={16} />}
+                onClick={() => router.push(`/projects/${projectId}/test/simulations`)}
+            >
+                All Simulations
+            </ActionButton>
+        ]}
+    >
+        <div className="h-full flex flex-col gap-6 max-w-2xl">
+            <div className="flex flex-col gap-1">
+                <h1 className="text-lg font-semibold text-gray-900 dark:text-white">Create New Simulation</h1>
+                <p className="text-sm text-gray-600 dark:text-neutral-400">
+                    Define a new test simulation by selecting a scenario and optionally a profile
+                </p>
             </div>
-            <div className="flex flex-col gap-2">
-                <label className="text-sm font-medium">Profile (optional)</label>
-                <div className="flex items-center gap-2">
-                    {profile ? (
-                        <div className="text-sm text-blue-600">{profile.name}</div>
-                    ) : (
-                        <div className="text-sm text-gray-500">No profile selected</div>
-                    )}
-                    {profile && <Button size="sm" variant="bordered" onClick={() => setProfile(null)}>Remove</Button>}
-                    <Button
-                        size="sm"
-                        onPress={() => setIsProfileModalOpen(true)}
-                        type="button"
-                    >
-                        {profile ? "Change" : "Select"} Profile
-                    </Button>
-                </div>
-            </div>
-            <FormStatusButton
-                props={{
-                    className: "self-start",
-                    children: "Create",
-                    size: "sm",
-                    type: "submit",
-                    isDisabled: !scenario,
-                }}
-            />
-        </form>
 
-        <ScenarioSelector
-            projectId={projectId}
-            isOpen={isScenarioModalOpen}
-            onOpenChange={setIsScenarioModalOpen}
-            onSelect={setScenario}
-        />
-        <ProfileSelector
-            projectId={projectId}
-            isOpen={isProfileModalOpen}
-            onOpenChange={setIsProfileModalOpen}
-            onSelect={setProfile}
-        />
-    </div>;
+            {error && <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                {error}
+                <Button size="sm" color="danger" onPress={() => formRef.current?.requestSubmit()}>Retry</Button>
+            </div>}
+
+            <SimulationForm
+                formRef={formRef}
+                handleSubmit={handleSubmit}
+                scenario={scenario}
+                setScenario={setScenario}
+                profile={profile}
+                setProfile={setProfile}
+                isScenarioModalOpen={isScenarioModalOpen}
+                setIsScenarioModalOpen={setIsScenarioModalOpen}
+                isProfileModalOpen={isProfileModalOpen}
+                setIsProfileModalOpen={setIsProfileModalOpen}
+                projectId={projectId}
+                submitButtonText="Create Simulation"
+                onCancel={() => router.push(`/projects/${projectId}/test/simulations`)}
+            />
+        </div>
+    </StructuredPanel>;
 }
 
-function SimulationList({
-    projectId,
-}: {
-    projectId: string,
-}) {
+function SimulationList({ projectId }: { projectId: string }) {
     const router = useRouter();
     const searchParams = useSearchParams();
     const page = parseInt(searchParams.get("page") || "1");
     const pageSize = 10;
+    const [simulations, setSimulations] = useState<WithStringId<z.infer<typeof TestSimulation>>[]>([]);
+    const [selectedSimulations, setSelectedSimulations] = useState<string[]>([]);
+    const [selectedWorkflow, setSelectedWorkflow] = useState<WithStringId<z.infer<typeof Workflow>> | null>(null);
+    const [isWorkflowSelectorOpen, setIsWorkflowSelectorOpen] = useState(false);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
-    const [simulationList, setSimulationList] = useState<WithStringId<z.infer<typeof TestSimulation>>[]>([]);
-    const [scenarioMap, setScenarioMap] = useState<Record<string, WithStringId<z.infer<typeof TestScenario>>>>({});
-    const [profileMap, setProfileMap] = useState<Record<string, WithStringId<z.infer<typeof TestProfile>>>>({});
     const [total, setTotal] = useState(0);
+    const [simulationDetails, setSimulationDetails] = useState<Record<string, {
+        scenario?: WithStringId<z.infer<typeof TestScenario>>,
+        profile?: WithStringId<z.infer<typeof TestProfile>>
+    }>>({});
+    const [selectedKeys, setSelectedKeys] = useState<Selection>(new Set<string>());
 
     useEffect(() => {
         let ignore = false;
 
-        async function fetchSimulation() {
+        async function fetchSimulations() {
             setLoading(true);
             setError(null);
             try {
                 const result = await listSimulations(projectId, page, pageSize);
                 if (!ignore) {
-                    setSimulationList(result.simulations);
-                    setTotal(Math.ceil(result.total / pageSize));
+                    setSimulations(result.simulations);
+                    setTotal(result.total);
+                    
+                    // Fetch scenario and profile details for each simulation
+                    const details: Record<string, any> = {};
+                    await Promise.all(result.simulations.map(async (simulation) => {
+                        const [scenarioResult, profileResult] = await Promise.all([
+                            getScenario(projectId, simulation.scenarioId),
+                            simulation.profileId ? getProfile(projectId, simulation.profileId) : Promise.resolve(null),
+                        ]);
+                        if (!ignore) {
+                            details[simulation._id] = {
+                                scenario: scenarioResult,
+                                profile: profileResult
+                            };
+                        }
+                    }));
+                    if (!ignore) {
+                        setSimulationDetails(details);
+                    }
                 }
             } catch (error) {
                 if (!ignore) {
-                    setError(`Unable to fetch simulation: ${error}`);
+                    setError(`Unable to fetch simulations: ${error}`);
                 }
             } finally {
                 if (!ignore) {
@@ -512,166 +295,309 @@ function SimulationList({
             }
         }
 
-        if (error == null) {
-            fetchSimulation();
-        }
+        fetchSimulations();
 
         return () => {
             ignore = true;
         };
-    }, [page, pageSize, error, projectId]);
+    }, [projectId, page, pageSize]);
 
-    useEffect(() => {
-        let ignore = false;
-
-        async function resolveScenarios() {
-            const scenarioIds = simulationList.reduce((acc, simulation) => {
-                if (!acc.includes(simulation.scenarioId)) {
-                    acc.push(simulation.scenarioId);
-                }
-                return acc;
-            }, [] as string[]);
-            const scenarios = await Promise.all(scenarioIds.map((scenarioId) => getScenario(projectId, scenarioId)));
-            if (ignore) {
-                return;
-            }
-            setScenarioMap(scenarios.filter((scenario) => scenario !== null).reduce((acc, scenario) => {
-                acc[scenario._id] = scenario;
-                return acc;
-            }, {} as Record<string, WithStringId<z.infer<typeof TestScenario>>>));
+    const handleSelectionChange = (selection: Selection) => {
+        setSelectedKeys(selection);
+        if (selection === "all") {
+            setSelectedSimulations(simulations.map(sim => sim._id));
+        } else {
+            setSelectedSimulations(Array.from(selection as Set<string>));
         }
-        async function resolveProfiles() {
-            const profileIds = simulationList.reduce((acc, simulation) => {
-                if (simulation.profileId && !acc.includes(simulation.profileId)) {
-                    acc.push(simulation.profileId);
-                }
-                return acc;
-            }, [] as string[]);
-            const profiles = await Promise.all(profileIds.map((profileId) => getProfile(projectId, profileId)));
-            if (ignore) {
-                return;
-            }
-            setProfileMap(profiles.filter((profile) => profile !== null).reduce((acc, profile) => {
-                acc[profile._id] = profile;
-                return acc;
-            }, {} as Record<string, WithStringId<z.infer<typeof TestProfile>>>));
+    };
+
+    async function handleCreateRun() {
+        if (!selectedWorkflow || selectedSimulations.length === 0) {
+            return; // Just return without setting error
         }
 
-        if (error == null) {
-            resolveScenarios();
-            resolveProfiles();
+        try {
+            const run = await createRun(projectId, {
+                workflowId: selectedWorkflow._id,
+                simulationIds: selectedSimulations
+            });
+
+            setSelectedSimulations([]);
+            setSelectedWorkflow(null);
+            
+            router.push(`/projects/${projectId}/test/runs/${run._id}`);
+        } catch (err) {
+            setError(`Failed to create test run: ${err}`);
         }
+    }
 
-        return () => {
-            ignore = true;
-        };
-    }, [simulationList, error, projectId]);
+    const handleDelete = async (simulationId: string) => {
+        try {
+            await deleteSimulation(projectId, simulationId);
+            // Refresh the simulations list after deletion
+            const result = await listSimulations(projectId, page, pageSize);
+            setSimulations(result.simulations);
+            setTotal(result.total);
+        } catch (err) {
+            setError(`Failed to delete simulation: ${err}`);
+        }
+    };
 
-    return <div className="h-full flex flex-col gap-2">
-        <h1 className="text-medium font-bold text-gray-800 dark:text-neutral-200 pb-2 border-b border-gray-200 dark:border-neutral-800">Simulations</h1>
-        <Button
-            size="sm"
-            onPress={() => router.push(`/projects/${projectId}/test/simulations/new`)}
-            className="self-end"
-            startContent={<PlusIcon className="w-4 h-4" />}
-        >
-            New Simulation
-        </Button>
-        {loading && <div className="flex gap-2 items-center text-gray-600 dark:text-neutral-400">
-            <Spinner size="sm" />
-            Loading...
-        </div>}
-        {error && <div className="bg-red-100 dark:bg-red-900/20 p-2 rounded-md text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
-            {error}
-            <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
-        </div>}
-        {!loading && !error && <>
-            {simulationList.length === 0 && <div className="text-gray-600 dark:text-neutral-400 text-center">No simulations found</div>}
-            {simulationList.length > 0 && <div className="flex flex-col w-full">
-                {/* Header */}
-                <div className="grid grid-cols-9 py-2 bg-gray-100 dark:bg-neutral-800 font-semibold text-sm">
-                    <div className="col-span-2 px-4 dark:text-neutral-300">Name</div>
-                    <div className="col-span-3 px-4 dark:text-neutral-300">Scenario</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Profile</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Criteria</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Created</div>
-                    <div className="col-span-1 px-4 dark:text-neutral-300">Updated</div>
+    const handleLaunchClick = () => {
+        if (!selectedWorkflow || selectedSimulations.length === 0) {
+            alert("Please select a workflow version and at least one simulation.");
+        } else {
+            handleCreateRun();
+        }
+    };
+
+    const columns = [
+        {
+            key: 'name',
+            label: 'NAME',
+            render: (simulation: any) => (
+                <div className="flex items-center gap-2">
+                    <span>{simulation.name}</span>
+                    {(!simulationDetails[simulation._id]?.scenario || 
+                     (simulation.profileId && !simulationDetails[simulation._id]?.profile)) && (
+                        <Tooltip content="Associated scenario or profile has been deleted">
+                            <AlertTriangleIcon 
+                                size={16} 
+                                className="text-amber-500 dark:text-amber-400"
+                            />
+                        </Tooltip>
+                    )}
                 </div>
+            )
+        },
+        {
+            key: 'scenarioId',
+            label: 'SCENARIO',
+            render: (simulation: any) => {
+                const details = simulationDetails[simulation._id];
+                if (!details?.scenario) {
+                    return (
+                        <div className="flex items-center gap-1 text-amber-500 dark:text-amber-400">
+                            <Tooltip content="This scenario has been deleted">
+                                <AlertTriangleIcon size={14} />
+                            </Tooltip>
+                            <span>Deleted</span>
+                        </div>
+                    );
+                }
+                return details.scenario.name;
+            }
+        },
+        {
+            key: 'profileId',
+            label: 'PROFILE',
+            render: (simulation: any) => {
+                const details = simulationDetails[simulation._id];
+                if (simulation.profileId && !details?.profile) {
+                    return (
+                        <div className="flex items-center gap-1 text-amber-500 dark:text-amber-400">
+                            <Tooltip content="This profile has been deleted">
+                                <AlertTriangleIcon size={14} />
+                            </Tooltip>
+                            <span>Deleted</span>
+                        </div>
+                    );
+                }
+                return details?.profile?.name || 'None';
+            }
+        },
+        {
+            key: 'createdAt',
+            label: 'CREATED',
+            render: (simulation: any) => isValidDate(simulation.createdAt) ? 
+                <RelativeTime date={new Date(simulation.createdAt)} /> : 
+                'Invalid date'
+        }
+    ];
 
-                {/* Rows */}
-                {simulationList.map((simulation) => (
-                    <div key={simulation._id} className="grid grid-cols-9 py-2 border-b border-gray-200 dark:border-neutral-800 hover:bg-gray-50 dark:hover:bg-neutral-800 text-sm">
-                        <div className="col-span-2 px-4 truncate">
-                            <Link
-                                href={`/projects/${projectId}/test/simulations/${simulation._id}`}
-                                className="text-blue-600 dark:text-blue-400 hover:underline"
-                            >
-                                {simulation.name}
-                            </Link>
+    return (
+        <StructuredPanel 
+            title="SIMULATIONS"
+            tooltip="View and manage your test simulations"
+        >
+            <div className="flex flex-col gap-6 max-w-4xl">
+                {/* Combined Guidance and Run Creation Section */}
+                <div className="flex flex-col gap-4 p-6 bg-white dark:bg-neutral-950 rounded-lg border border-gray-200 dark:border-neutral-800">
+                    <h2 className="text-lg font-semibold text-gray-900 dark:text-white">
+                        Create a Test Run
+                    </h2>
+                    
+                    <div className="flex flex-col gap-4">
+                        {/* Step 1: Create New Simulation */}
+                        <div className="flex items-start gap-4">
+                            <div className="flex items-center justify-center w-8 h-8 rounded-full bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400 font-medium">
+                                1
+                            </div>
+                            <div className="flex-1">
+                                <h3 className="text-sm font-medium text-gray-900 dark:text-white">
+                                    Create a New Simulation (Optional)
+                                </h3>
+                                <p className="mt-1 text-sm text-gray-600 dark:text-neutral-400">
+                                    Define a new test simulation if needed
+                                </p>
+                                <div className="mt-3">
+                                    <Button
+                                        size="sm"
+                                        color="primary"
+                                        startContent={<PlusIcon size={16} />}
+                                        onPress={() => router.push(`/projects/${projectId}/test/simulations/new`)}
+                                    >
+                                        New Simulation
+                                    </Button>
+                                </div>
+                            </div>
                         </div>
-                        <div className="col-span-3 px-4 truncate dark:text-neutral-300">
-                            {scenarioMap[simulation.scenarioId]?.name || (
-                                <span className="text-gray-500 dark:text-neutral-500 font-mono text-xs">{simulation.scenarioId}</span>
-                            )}
+
+                        {/* Step 2: Select Workflow Version */}
+                        <div className="flex items-start gap-4">
+                            <div className="flex items-center justify-center w-8 h-8 rounded-full bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400 font-medium">
+                                2
+                            </div>
+                            <div className="flex-1">
+                                <div className="flex items-center gap-4">
+                                    <h3 className="text-sm font-medium text-gray-900 dark:text-white">
+                                        Select workflow version
+                                    </h3>
+                                    <Button
+                                        size="sm"
+                                        variant={selectedWorkflow ? "solid" : "flat"}
+                                        onPress={() => setIsWorkflowSelectorOpen(true)}
+                                    >
+                                        {selectedWorkflow?.name || 'Select Version'}
+                                    </Button>
+                                </div>
+                            </div>
                         </div>
-                        <div className="col-span-1 px-4 truncate dark:text-neutral-300">
-                            {simulation.profileId ? (
-                                profileMap[simulation.profileId]?.name || (
-                                    <span className="text-gray-500 dark:text-neutral-500 font-mono text-xs">{simulation.profileId}</span>
-                                )
-                            ) : (
-                                <span className="text-gray-500 dark:text-neutral-500 font-mono text-xs">None</span>
-                            )}
+
+                        {/* Step 3: Select Simulations */}
+                        <div className="flex items-start gap-4">
+                            <div className="flex items-center justify-center w-8 h-8 rounded-full bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400 font-medium">
+                                3
+                            </div>
+                            <div className="flex-1">
+                                <h3 className="text-sm font-medium text-gray-900 dark:text-white">
+                                    Select Simulations for the Test Run
+                                </h3>
+                                <p className="mt-1 text-sm text-gray-600 dark:text-neutral-400">
+                                    Choose one or more simulations from the table below
+                                </p>
+                            </div>
                         </div>
-                        <div className="col-span-1 px-4 truncate dark:text-neutral-300">
-                            {simulation.passCriteria}
-                        </div>
-                        <div className="col-span-1 px-4 text-gray-600 dark:text-neutral-400 truncate">
-                            <RelativeTime date={new Date(simulation.createdAt)} />
-                        </div>
-                        <div className="col-span-1 px-4 text-gray-600 dark:text-neutral-400 truncate">
-                            <RelativeTime date={new Date(simulation.lastUpdatedAt)} />
+
+                        {/* Step 4: Create Test Run */}
+                        <div className="flex items-start gap-4">
+                            <div className="flex items-center justify-center w-8 h-8 rounded-full bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400 font-medium">
+                                4
+                            </div>
+                            <div className="flex-1">
+                                <div className="flex items-center gap-4">
+                                    <h3 className="text-sm font-medium text-gray-900 dark:text-white">
+                                        Create test run
+                                    </h3>
+                                    <Tooltip
+                                        content={
+                                            !selectedWorkflow && selectedSimulations.length === 0 
+                                                ? "Please select a workflow version and at least one simulation"
+                                                : !selectedWorkflow 
+                                                    ? "Please select a workflow version"
+                                                    : selectedSimulations.length === 0 
+                                                        ? "Please select at least one simulation"
+                                                        : ""
+                                        }
+                                        isDisabled={Boolean(selectedWorkflow && selectedSimulations.length > 0)}
+                                    >
+                                        <Button
+                                            size="sm"
+                                            color="primary"
+                                            onPress={handleCreateRun}
+                                            className={(!selectedWorkflow || selectedSimulations.length === 0) ? "opacity-50 cursor-not-allowed" : ""}
+                                        >
+                                            Launch Test Run {selectedSimulations.length > 0 ? `(${selectedSimulations.length})` : ''}
+                                        </Button>
+                                    </Tooltip>
+                                </div>
+                            </div>
                         </div>
                     </div>
-                ))}
-            </div>}
-            {total > 1 && <Pagination
-                total={total}
-                page={page}
-                onChange={(page) => {
-                    router.push(`/projects/${projectId}/test/simulations?page=${page}`);
-                }}
-                className="self-center"
-            />}
-        </>}
-    </div>;
+                </div>
+
+                {/* Error Display - Only for API/system errors */}
+                {error && error.startsWith('Failed to') && (
+                    <div className="bg-red-100 dark:bg-red-900/20 p-4 rounded-lg text-red-800 dark:text-red-400 flex items-center gap-2 text-sm">
+                        {error}
+                        <Button size="sm" color="danger" onPress={() => setError(null)}>Retry</Button>
+                    </div>
+                )}
+
+                {/* Simulations Table */}
+                {loading ? (
+                    <div className="flex gap-2 items-center justify-center p-8 text-gray-600 dark:text-neutral-400">
+                        <Spinner size="sm" />
+                        Loading simulations...
+                    </div>
+                ) : simulations.length === 0 ? (
+                    <div className="text-center p-8 bg-gray-50 dark:bg-neutral-900 rounded-lg border border-dashed border-gray-200 dark:border-neutral-800">
+                        <p className="text-gray-600 dark:text-neutral-400 mb-4">No simulations created yet</p>
+                        <Button
+                            size="sm"
+                            color="primary"
+                            startContent={<PlusIcon size={16} />}
+                            onPress={() => router.push(`/projects/${projectId}/test/simulations/new`)}
+                        >
+                            Create Your First Simulation
+                        </Button>
+                    </div>
+                ) : (
+                    <DataTable
+                        items={simulations}
+                        columns={columns}
+                        selectedKeys={selectedKeys}
+                        onSelectionChange={handleSelectionChange}
+                        onDelete={handleDelete}
+                        onEdit={(id) => router.push(`/projects/${projectId}/test/simulations/${id}/edit`)}
+                        projectId={projectId}
+                    />
+                )}
+
+                <WorkflowSelector
+                    projectId={projectId}
+                    isOpen={isWorkflowSelectorOpen}
+                    onOpenChange={setIsWorkflowSelectorOpen}
+                    onSelect={setSelectedWorkflow}
+                />
+            </div>
+        </StructuredPanel>
+    );
 }
 
-export function SimulationsApp({
-    projectId,
-    slug
-}: {
-    projectId: string,
-    slug: string[]
-}) {
-    let selection: "list" | "view" | "new" | "edit" = "list";
-    let simulationId: string | null = null;
-    if (slug.length > 0) {
+export function SimulationsApp({ projectId, slug }: { projectId: string; slug?: string[] }) {
+    let selection: "list" | "new" | "edit" = "list";
+    let simulationId: string | undefined;
+
+    if (slug && slug.length > 0) {
         if (slug[0] === "new") {
             selection = "new";
-        } else if (slug[slug.length - 1] === "edit") {
+        } else if (slug[1] === "edit") {
             selection = "edit";
             simulationId = slug[0];
         } else {
-            selection = "view";
+            selection = "list";
             simulationId = slug[0];
         }
     }
 
-    return <>
-        {selection === "list" && <SimulationList projectId={projectId} />}
-        {selection === "new" && <NewSimulation projectId={projectId} />}
-        {selection === "view" && simulationId && <ViewSimulation projectId={projectId} simulationId={simulationId} />}
-        {selection === "edit" && simulationId && <EditSimulation projectId={projectId} simulationId={simulationId} />}
-    </>;
+    return (
+        <div className="h-full">
+            {selection === "list" && <SimulationList projectId={projectId} />}
+            {selection === "new" && <NewSimulation projectId={projectId} />}
+            {selection === "edit" && simulationId && (
+                <EditSimulation projectId={projectId} simulationId={simulationId} />
+            )}
+        </div>
+    );
 } 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/testing_menu.tsx b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/testing_menu.tsx
new file mode 100644
index 00000000..c288fcdd
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/testing_menu.tsx
@@ -0,0 +1,53 @@
+'use client';
+
+import { useRouter } from "next/navigation";
+import { StructuredPanel } from "../../../../lib/components/structured-panel";
+import { ListItem } from "../../../../lib/components/structured-list";
+
+export function TestingMenu({
+    projectId,
+    app,
+}: {
+    projectId: string;
+    app: "scenarios" | "simulations" | "profiles" | "runs";
+}) {
+    const router = useRouter();
+
+    const menuItems = [
+        { 
+            label: "Scenarios", 
+            href: `/projects/${projectId}/test/scenarios`,
+            isSelected: app === "scenarios"
+        },
+        { 
+            label: "Profiles", 
+            href: `/projects/${projectId}/test/profiles`,
+            isSelected: app === "profiles"
+        },
+        { 
+            label: "Simulations", 
+            href: `/projects/${projectId}/test/simulations`,
+            isSelected: app === "simulations"
+        },
+        { 
+            label: "Test Runs", 
+            href: `/projects/${projectId}/test/runs`,
+            isSelected: app === "runs"
+        },
+    ];
+
+    return (
+        <StructuredPanel title="TEST" tooltip="Browse and manage your test scenarios and runs">
+            <div className="overflow-auto flex flex-col gap-1 justify-start">
+                {menuItems.map((item) => (
+                    <ListItem
+                        key={item.label}
+                        name={item.label}
+                        isSelected={item.isSelected}
+                        onClick={() => router.push(item.href)}
+                    />
+                ))}
+            </div>
+        </StructuredPanel>
+    );
+} 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/utils/date.ts b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/utils/date.ts
new file mode 100644
index 00000000..d05d9177
--- /dev/null
+++ b/apps/rowboat/app/projects/[projectId]/test/[[...slug]]/utils/date.ts
@@ -0,0 +1,4 @@
+export const isValidDate = (date: any): boolean => {
+    const parsed = new Date(date);
+    return parsed instanceof Date && !isNaN(parsed.getTime());
+};
\ No newline at end of file