diff --git a/src/app/(admin)/admin/rounds/pipelines/page.tsx b/src/app/(admin)/admin/rounds/pipelines/page.tsx
index ad50cb7..c76cd46 100644
--- a/src/app/(admin)/admin/rounds/pipelines/page.tsx
+++ b/src/app/(admin)/admin/rounds/pipelines/page.tsx
@@ -1,244 +1,257 @@
-'use client'
-
-import Link from 'next/link'
-import type { Route } from 'next'
-import { trpc } from '@/lib/trpc/client'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card'
-import { Skeleton } from '@/components/ui/skeleton'
+'use client'
+
+import Link from 'next/link'
+import type { Route } from 'next'
+import { trpc } from '@/lib/trpc/client'
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card'
+import { Skeleton } from '@/components/ui/skeleton'
 import {
   Plus,
   Layers,
   GitBranch,
   Calendar,
   Workflow,
+  Pencil,
+  Settings2,
 } from 'lucide-react'
-import { cn } from '@/lib/utils'
-import { formatDistanceToNow } from 'date-fns'
-import { useEdition } from '@/contexts/edition-context'
-
-const statusConfig = {
-  DRAFT: {
-    label: 'Draft',
-    bgClass: 'bg-gray-100 text-gray-700',
-    dotClass: 'bg-gray-500',
-  },
-  ACTIVE: {
-    label: 'Active',
-    bgClass: 'bg-emerald-100 text-emerald-700',
-    dotClass: 'bg-emerald-500',
-  },
-  CLOSED: {
-    label: 'Closed',
-    bgClass: 'bg-blue-100 text-blue-700',
-    dotClass: 'bg-blue-500',
-  },
-  ARCHIVED: {
-    label: 'Archived',
-    bgClass: 'bg-muted text-muted-foreground',
-    dotClass: 'bg-muted-foreground',
-  },
-} as const
-
-export default function PipelineListPage() {
-  const { currentEdition } = useEdition()
-  const programId = currentEdition?.id
-
-  const { data: pipelines, isLoading } = trpc.pipeline.list.useQuery(
-    { programId: programId! },
-    { enabled: !!programId }
-  )
-
-  if (!programId) {
-    return (
-      <div className="space-y-6">
-        <div className="flex items-center justify-between">
-          <div>
-            <h1 className="text-xl font-bold">Pipelines</h1>
-            <p className="text-sm text-muted-foreground">
-              Select an edition to view pipelines
-            </p>
-          </div>
-        </div>
-        <Card>
-          <CardContent className="flex flex-col items-center justify-center py-12 text-center">
-            <Calendar className="h-12 w-12 text-muted-foreground/50" />
-            <p className="mt-2 font-medium">No Edition Selected</p>
-            <p className="text-sm text-muted-foreground">
-              Select an edition from the sidebar to view its pipelines
-            </p>
-          </CardContent>
-        </Card>
-      </div>
-    )
-  }
-
-  return (
-    <div className="space-y-6">
-      {/* Header */}
-      <div className="flex items-center justify-between">
-        <div>
-          <h1 className="text-xl font-bold">Pipelines</h1>
-          <p className="text-sm text-muted-foreground">
-            Manage evaluation pipelines for {currentEdition?.name}
-          </p>
-        </div>
-        <div className="flex items-center gap-2">
-          <Link href={`/admin/rounds/new-pipeline?programId=${programId}` as Route}>
-            <Button size="sm">
-              <Plus className="h-4 w-4 mr-1" />
-              Create Pipeline
-            </Button>
-          </Link>
-        </div>
-      </div>
-
-      {/* Loading */}
-      {isLoading && (
-        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-          {[1, 2, 3].map((i) => (
-            <Card key={i}>
-              <CardHeader>
-                <Skeleton className="h-5 w-32" />
-                <Skeleton className="h-4 w-20 mt-1" />
-              </CardHeader>
-              <CardContent>
-                <Skeleton className="h-4 w-full" />
-                <Skeleton className="h-4 w-3/4 mt-2" />
-              </CardContent>
-            </Card>
-          ))}
-        </div>
-      )}
-
-      {/* Empty State */}
-      {!isLoading && (!pipelines || pipelines.length === 0) && (
-        <Card className="border-2 border-dashed">
-          <CardContent className="flex flex-col items-center justify-center py-16 text-center">
-            <div className="rounded-full bg-primary/10 p-4 mb-4">
-              <Workflow className="h-10 w-10 text-primary" />
-            </div>
-            <h3 className="text-lg font-semibold mb-2">No Pipelines Yet</h3>
-            <p className="text-sm text-muted-foreground max-w-md mb-6">
-              Pipelines organize your project evaluation workflow into tracks and stages.
-              Create your first pipeline to get started with managing project evaluations.
-            </p>
-            <Link href={`/admin/rounds/new-pipeline?programId=${programId}` as Route}>
-              <Button>
-                <Plus className="h-4 w-4 mr-2" />
-                Create Your First Pipeline
-              </Button>
-            </Link>
-          </CardContent>
-        </Card>
-      )}
-
-      {/* Pipeline Cards */}
-      {pipelines && pipelines.length > 0 && (
-        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-          {pipelines.map((pipeline) => {
-            const status = pipeline.status as keyof typeof statusConfig
-            const config = statusConfig[status] || statusConfig.DRAFT
-            const description = (pipeline.settingsJson as Record<string, unknown> | null)?.description as string | undefined
-
+import { cn } from '@/lib/utils'
+import { formatDistanceToNow } from 'date-fns'
+import { useEdition } from '@/contexts/edition-context'
+
+const statusConfig = {
+  DRAFT: {
+    label: 'Draft',
+    bgClass: 'bg-gray-100 text-gray-700',
+    dotClass: 'bg-gray-500',
+  },
+  ACTIVE: {
+    label: 'Active',
+    bgClass: 'bg-emerald-100 text-emerald-700',
+    dotClass: 'bg-emerald-500',
+  },
+  CLOSED: {
+    label: 'Closed',
+    bgClass: 'bg-blue-100 text-blue-700',
+    dotClass: 'bg-blue-500',
+  },
+  ARCHIVED: {
+    label: 'Archived',
+    bgClass: 'bg-muted text-muted-foreground',
+    dotClass: 'bg-muted-foreground',
+  },
+} as const
+
+export default function PipelineListPage() {
+  const { currentEdition } = useEdition()
+  const programId = currentEdition?.id
+
+  const { data: pipelines, isLoading } = trpc.pipeline.list.useQuery(
+    { programId: programId! },
+    { enabled: !!programId }
+  )
+
+  if (!programId) {
+    return (
+      <div className="space-y-6">
+        <div className="flex items-center justify-between">
+          <div>
+            <h1 className="text-xl font-bold">Pipelines</h1>
+            <p className="text-sm text-muted-foreground">
+              Select an edition to view pipelines
+            </p>
+          </div>
+        </div>
+        <Card>
+          <CardContent className="flex flex-col items-center justify-center py-12 text-center">
+            <Calendar className="h-12 w-12 text-muted-foreground/50" />
+            <p className="mt-2 font-medium">No Edition Selected</p>
+            <p className="text-sm text-muted-foreground">
+              Select an edition from the sidebar to view its pipelines
+            </p>
+          </CardContent>
+        </Card>
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Header */}
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-xl font-bold">Pipelines</h1>
+          <p className="text-sm text-muted-foreground">
+            Manage evaluation pipelines for {currentEdition?.name}
+          </p>
+        </div>
+        <div className="flex items-center gap-2">
+          <Link href={`/admin/rounds/new-pipeline?programId=${programId}` as Route}>
+            <Button size="sm">
+              <Plus className="h-4 w-4 mr-1" />
+              Create Pipeline
+            </Button>
+          </Link>
+        </div>
+      </div>
+
+      {/* Loading */}
+      {isLoading && (
+        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+          {[1, 2, 3].map((i) => (
+            <Card key={i}>
+              <CardHeader>
+                <Skeleton className="h-5 w-32" />
+                <Skeleton className="h-4 w-20 mt-1" />
+              </CardHeader>
+              <CardContent>
+                <Skeleton className="h-4 w-full" />
+                <Skeleton className="h-4 w-3/4 mt-2" />
+              </CardContent>
+            </Card>
+          ))}
+        </div>
+      )}
+
+      {/* Empty State */}
+      {!isLoading && (!pipelines || pipelines.length === 0) && (
+        <Card className="border-2 border-dashed">
+          <CardContent className="flex flex-col items-center justify-center py-16 text-center">
+            <div className="rounded-full bg-primary/10 p-4 mb-4">
+              <Workflow className="h-10 w-10 text-primary" />
+            </div>
+            <h3 className="text-lg font-semibold mb-2">No Pipelines Yet</h3>
+            <p className="text-sm text-muted-foreground max-w-md mb-6">
+              Pipelines organize your project evaluation workflow into tracks and stages.
+              Create your first pipeline to get started with managing project evaluations.
+            </p>
+            <Link href={`/admin/rounds/new-pipeline?programId=${programId}` as Route}>
+              <Button>
+                <Plus className="h-4 w-4 mr-2" />
+                Create Your First Pipeline
+              </Button>
+            </Link>
+          </CardContent>
+        </Card>
+      )}
+
+      {/* Pipeline Cards */}
+      {pipelines && pipelines.length > 0 && (
+        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+          {pipelines.map((pipeline) => {
+            const status = pipeline.status as keyof typeof statusConfig
+            const config = statusConfig[status] || statusConfig.DRAFT
+            const description = (pipeline.settingsJson as Record<string, unknown> | null)?.description as string | undefined
+
             return (
-              <Link
-                key={pipeline.id}
-                href={`/admin/rounds/pipeline/${pipeline.id}` as Route}
-                className="block"
-              >
-                <Card className="group hover:shadow-md transition-shadow cursor-pointer h-full flex flex-col">
+              <Card key={pipeline.id} className="group hover:shadow-md transition-shadow h-full flex flex-col">
                   <CardHeader className="pb-3">
                     <div className="flex items-start justify-between gap-3">
                       <div className="min-w-0 flex-1">
                         <CardTitle className="text-base leading-tight mb-1">
-                          {pipeline.name}
+                          <Link href={`/admin/rounds/pipeline/${pipeline.id}` as Route} className="hover:underline">
+                            {pipeline.name}
+                          </Link>
                         </CardTitle>
                         <p className="font-mono text-xs text-muted-foreground truncate">
                           {pipeline.slug}
                         </p>
-                      </div>
-                      <Badge
-                        variant="secondary"
-                        className={cn(
-                          'text-[10px] shrink-0 flex items-center gap-1.5',
-                          config.bgClass
-                        )}
-                      >
-                        <span className={cn('h-1.5 w-1.5 rounded-full', config.dotClass)} />
-                        {config.label}
-                      </Badge>
-                    </div>
-
-                    {/* Description */}
-                    {description && (
-                      <p className="text-xs text-muted-foreground line-clamp-2 mt-2">
-                        {description}
-                      </p>
-                    )}
-                  </CardHeader>
-
+                      </div>
+                      <Badge
+                        variant="secondary"
+                        className={cn(
+                          'text-[10px] shrink-0 flex items-center gap-1.5',
+                          config.bgClass
+                        )}
+                      >
+                        <span className={cn('h-1.5 w-1.5 rounded-full', config.dotClass)} />
+                        {config.label}
+                      </Badge>
+                    </div>
+
+                    {/* Description */}
+                    {description && (
+                      <p className="text-xs text-muted-foreground line-clamp-2 mt-2">
+                        {description}
+                      </p>
+                    )}
+                  </CardHeader>
+
                   <CardContent className="mt-auto">
-                    {/* Track Indicator - Simplified visualization */}
-                    <div className="mb-3 pb-3 border-b">
-                      <div className="flex items-center gap-1.5 text-xs text-muted-foreground mb-1.5">
-                        <Layers className="h-3.5 w-3.5" />
-                        <span className="font-medium">
-                          {pipeline._count.tracks === 0
-                            ? 'No tracks'
-                            : pipeline._count.tracks === 1
-                            ? '1 track'
-                            : `${pipeline._count.tracks} tracks`}
-                        </span>
-                      </div>
-                      {pipeline._count.tracks > 0 && (
-                        <div className="flex items-center gap-1">
-                          {Array.from({ length: Math.min(pipeline._count.tracks, 5) }).map((_, i) => (
-                            <div
-                              key={i}
-                              className="h-6 flex-1 rounded border border-border bg-muted/30 flex items-center justify-center"
-                            >
-                              <div className="h-1 w-1 rounded-full bg-muted-foreground/40" />
-                            </div>
-                          ))}
-                          {pipeline._count.tracks > 5 && (
-                            <span className="text-[10px] text-muted-foreground ml-1">
-                              +{pipeline._count.tracks - 5}
-                            </span>
-                          )}
-                        </div>
-                      )}
-                    </div>
-
-                    {/* Stats */}
+                    {/* Track Indicator - Simplified visualization */}
+                    <div className="mb-3 pb-3 border-b">
+                      <div className="flex items-center gap-1.5 text-xs text-muted-foreground mb-1.5">
+                        <Layers className="h-3.5 w-3.5" />
+                        <span className="font-medium">
+                          {pipeline._count.tracks === 0
+                            ? 'No tracks'
+                            : pipeline._count.tracks === 1
+                            ? '1 track'
+                            : `${pipeline._count.tracks} tracks`}
+                        </span>
+                      </div>
+                      {pipeline._count.tracks > 0 && (
+                        <div className="flex items-center gap-1">
+                          {Array.from({ length: Math.min(pipeline._count.tracks, 5) }).map((_, i) => (
+                            <div
+                              key={i}
+                              className="h-6 flex-1 rounded border border-border bg-muted/30 flex items-center justify-center"
+                            >
+                              <div className="h-1 w-1 rounded-full bg-muted-foreground/40" />
+                            </div>
+                          ))}
+                          {pipeline._count.tracks > 5 && (
+                            <span className="text-[10px] text-muted-foreground ml-1">
+                              +{pipeline._count.tracks - 5}
+                            </span>
+                          )}
+                        </div>
+                      )}
+                    </div>
+
+                    {/* Stats */}
                     <div className="space-y-1.5">
-                      <div className="flex items-center justify-between text-xs">
-                        <div className="flex items-center gap-1.5 text-muted-foreground">
-                          <GitBranch className="h-3.5 w-3.5" />
-                          <span>Routing rules</span>
-                        </div>
-                        <span className="font-medium text-foreground">
-                          {pipeline._count.routingRules}
-                        </span>
-                      </div>
-
+                      <div className="flex items-center justify-between text-xs">
+                        <div className="flex items-center gap-1.5 text-muted-foreground">
+                          <GitBranch className="h-3.5 w-3.5" />
+                          <span>Routing rules</span>
+                        </div>
+                        <span className="font-medium text-foreground">
+                          {pipeline._count.routingRules}
+                        </span>
+                      </div>
+
                       <div className="flex items-center justify-between text-xs text-muted-foreground">
                         <span>Updated {formatDistanceToNow(new Date(pipeline.updatedAt))} ago</span>
                       </div>
                     </div>
+
+                    <div className="mt-3 flex items-center gap-2">
+                      <Link href={`/admin/rounds/pipeline/${pipeline.id}/edit` as Route} className="flex-1">
+                        <Button size="sm" variant="outline" className="w-full">
+                          <Pencil className="h-3.5 w-3.5 mr-1.5" />
+                          Edit
+                        </Button>
+                      </Link>
+                      <Link href={`/admin/rounds/pipeline/${pipeline.id}/advanced` as Route} className="flex-1">
+                        <Button size="sm" variant="outline" className="w-full">
+                          <Settings2 className="h-3.5 w-3.5 mr-1.5" />
+                          Advanced
+                        </Button>
+                      </Link>
+                    </div>
                   </CardContent>
                 </Card>
-              </Link>
             )
           })}
         </div>
       )}
-    </div>
-  )
-}
+    </div>
+  )
+}