diff --git a/apps/app/src/components/views/board-view.tsx b/apps/app/src/components/views/board-view.tsx
index 6891c1e4..f7587f59 100644
--- a/apps/app/src/components/views/board-view.tsx
+++ b/apps/app/src/components/views/board-view.tsx
@@ -849,34 +849,12 @@ export function BoardView() {
     // Same column, nothing to do
     if (targetStatus === draggedFeature.status) return;
 
-    // Check concurrency limit before moving to in_progress (only for backlog -> in_progress and if running agent)
-    if (
-      targetStatus === "in_progress" &&
-      draggedFeature.status === "backlog" &&
-      !autoMode.canStartNewTask
-    ) {
-      console.log("[Board] Cannot start new task - at max concurrency limit");
-      toast.error("Concurrency limit reached", {
-        description: `You can only have ${autoMode.maxConcurrency} task${
-          autoMode.maxConcurrency > 1 ? "s" : ""
-        } running at a time. Wait for a task to complete or increase the limit.`,
-      });
-      return;
-    }
-
     // Handle different drag scenarios
     if (draggedFeature.status === "backlog") {
       // From backlog
       if (targetStatus === "in_progress") {
-        // Update with startedAt timestamp
-        const updates = {
-          status: targetStatus,
-          startedAt: new Date().toISOString(),
-        };
-        updateFeature(featureId, updates);
-        persistFeatureUpdate(featureId, updates);
-        console.log("[Board] Feature moved to in_progress, starting agent...");
-        await handleRunFeature(draggedFeature);
+        // Use helper function to handle concurrency check and start implementation
+        await handleStartImplementation(draggedFeature);
       } else {
         moveFeature(featureId, targetStatus);
         persistFeatureUpdate(featureId, { status: targetStatus });
@@ -1149,6 +1127,28 @@ export function BoardView() {
     }
   };
 
+  // Helper function to start implementing a feature (from backlog to in_progress)
+  const handleStartImplementation = async (feature: Feature) => {
+    if (!autoMode.canStartNewTask) {
+      toast.error("Concurrency limit reached", {
+        description: `You can only have ${autoMode.maxConcurrency} task${
+          autoMode.maxConcurrency > 1 ? "s" : ""
+        } running at a time. Wait for a task to complete or increase the limit.`,
+      });
+      return false;
+    }
+
+    const updates = {
+      status: "in_progress" as const,
+      startedAt: new Date().toISOString(),
+    };
+    updateFeature(feature.id, updates);
+    persistFeatureUpdate(feature.id, updates);
+    console.log("[Board] Feature moved to in_progress, starting agent...");
+    await handleRunFeature(feature);
+    return true;
+  };
+
   const handleVerifyFeature = async (feature: Feature) => {
     if (!currentProject) return;
 
@@ -2187,30 +2187,9 @@ export function BoardView() {
                                 onComplete={() =>
                                   handleCompleteFeature(feature)
                                 }
-                                onImplement={async () => {
-                                  // Check concurrency limit
-                                  if (!autoMode.canStartNewTask) {
-                                    toast.error("Concurrency limit reached", {
-                                      description: `You can only have ${
-                                        autoMode.maxConcurrency
-                                      } task${
-                                        autoMode.maxConcurrency > 1 ? "s" : ""
-                                      } running at a time. Wait for a task to complete or increase the limit.`,
-                                    });
-                                    return;
-                                  }
-                                  // Update with startedAt timestamp
-                                  const updates = {
-                                    status: "in_progress" as const,
-                                    startedAt: new Date().toISOString(),
-                                  };
-                                  updateFeature(feature.id, updates);
-                                  persistFeatureUpdate(feature.id, updates);
-                                  console.log(
-                                    "[Board] Feature moved to in_progress via Implement button, starting agent..."
-                                  );
-                                  await handleRunFeature(feature);
-                                }}
+                                onImplement={() =>
+                                  handleStartImplementation(feature)
+                                }
                                 hasContext={featuresWithContext.has(feature.id)}
                                 isCurrentAutoTask={runningAutoTasks.includes(
                                   feature.id
@@ -2376,9 +2355,9 @@ export function BoardView() {
             </Button>
             <Button
               variant="destructive"
-              onClick={() => {
+              onClick={async () => {
                 if (deleteCompletedFeature) {
-                  handleDeleteFeature(deleteCompletedFeature.id);
+                  await handleDeleteFeature(deleteCompletedFeature.id);
                   setDeleteCompletedFeature(null);
                 }
               }}
diff --git a/apps/app/src/components/views/kanban-card.tsx b/apps/app/src/components/views/kanban-card.tsx
index f1b87b48..00a14414 100644
--- a/apps/app/src/components/views/kanban-card.tsx
+++ b/apps/app/src/components/views/kanban-card.tsx
@@ -549,102 +549,64 @@ export const KanbanCard = memo(function KanbanCard({
             </Button>
           </div>
         )}
-        {!isCurrentAutoTask && feature.status === "waiting_approval" && (
-          <div className="absolute top-2 right-2 flex items-center gap-1">
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-foreground"
-              onClick={(e) => {
-                e.stopPropagation();
-                onEdit();
-              }}
-              onPointerDown={(e) => e.stopPropagation()}
-              data-testid={`edit-waiting-${feature.id}`}
-              title="Edit"
-            >
-              <Edit className="w-4 h-4" />
-            </Button>
-            {onViewOutput && (
+        {!isCurrentAutoTask &&
+          (feature.status === "waiting_approval" ||
+            feature.status === "verified") && (
+            <div className="absolute top-2 right-2 flex items-center gap-1">
               <Button
                 variant="ghost"
                 size="sm"
                 className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-foreground"
                 onClick={(e) => {
                   e.stopPropagation();
-                  onViewOutput();
+                  onEdit();
                 }}
                 onPointerDown={(e) => e.stopPropagation()}
-                data-testid={`logs-waiting-${feature.id}`}
-                title="Logs"
+                data-testid={`edit-${
+                  feature.status === "waiting_approval" ? "waiting" : "verified"
+                }-${feature.id}`}
+                title="Edit"
               >
-                <FileText className="w-4 h-4" />
+                <Edit className="w-4 h-4" />
               </Button>
-            )}
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-destructive"
-              onClick={(e) => {
-                e.stopPropagation();
-                handleDeleteClick(e);
-              }}
-              onPointerDown={(e) => e.stopPropagation()}
-              data-testid={`delete-waiting-${feature.id}`}
-              title="Delete"
-            >
-              <Trash2 className="w-4 h-4" />
-            </Button>
-          </div>
-        )}
-        {!isCurrentAutoTask && feature.status === "verified" && (
-          <div className="absolute top-2 right-2 flex items-center gap-1">
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-foreground"
-              onClick={(e) => {
-                e.stopPropagation();
-                onEdit();
-              }}
-              onPointerDown={(e) => e.stopPropagation()}
-              data-testid={`edit-verified-${feature.id}`}
-              title="Edit"
-            >
-              <Edit className="w-4 h-4" />
-            </Button>
-            {onViewOutput && (
+              {onViewOutput && (
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-foreground"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onViewOutput();
+                  }}
+                  onPointerDown={(e) => e.stopPropagation()}
+                  data-testid={`logs-${
+                    feature.status === "waiting_approval"
+                      ? "waiting"
+                      : "verified"
+                  }-${feature.id}`}
+                  title="Logs"
+                >
+                  <FileText className="w-4 h-4" />
+                </Button>
+              )}
               <Button
                 variant="ghost"
                 size="sm"
-                className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-foreground"
+                className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-destructive"
                 onClick={(e) => {
                   e.stopPropagation();
-                  onViewOutput();
+                  handleDeleteClick(e);
                 }}
                 onPointerDown={(e) => e.stopPropagation()}
-                data-testid={`logs-verified-${feature.id}`}
-                title="Logs"
+                data-testid={`delete-${
+                  feature.status === "waiting_approval" ? "waiting" : "verified"
+                }-${feature.id}`}
+                title="Delete"
               >
-                <FileText className="w-4 h-4" />
+                <Trash2 className="w-4 h-4" />
               </Button>
-            )}
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-6 w-6 p-0 hover:bg-white/10 text-muted-foreground hover:text-destructive"
-              onClick={(e) => {
-                e.stopPropagation();
-                handleDeleteClick(e);
-              }}
-              onPointerDown={(e) => e.stopPropagation()}
-              data-testid={`delete-verified-${feature.id}`}
-              title="Delete"
-            >
-              <Trash2 className="w-4 h-4" />
-            </Button>
-          </div>
-        )}
+            </div>
+          )}
         {!isCurrentAutoTask && feature.status === "in_progress" && (
           <div className="absolute top-2 right-2">
             <DropdownMenu>