diff --git a/frontend/src/components/CreateTaskModal.tsx b/frontend/src/components/CreateTaskModal.tsx
index 034252a..2175069 100644
--- a/frontend/src/components/CreateTaskModal.tsx
+++ b/frontend/src/components/CreateTaskModal.tsx
@@ -1,4 +1,6 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
+import { fetchProjects } from "../lib/api";
+import type { Project } from "../lib/types";
 
 interface CreateTaskModalProps {
   open: boolean;
@@ -8,6 +10,8 @@ interface CreateTaskModalProps {
     description?: string;
     source?: string;
     priority?: string;
+    projectId?: string;
+    dueDate?: string;
   }) => void;
 }
 
@@ -16,6 +20,26 @@ export function CreateTaskModal({ open, onClose, onCreate }: CreateTaskModalProp
   const [description, setDescription] = useState("");
   const [source, setSource] = useState("donovan");
   const [priority, setPriority] = useState("medium");
+  const [projectId, setProjectId] = useState("");
+  const [dueDate, setDueDate] = useState("");
+  const [projects, setProjects] = useState<Project[]>([]);
+  const [showAdvanced, setShowAdvanced] = useState(false);
+
+  useEffect(() => {
+    if (open) {
+      fetchProjects().then(setProjects).catch(() => {});
+    }
+  }, [open]);
+
+  // Keyboard shortcut: Escape to close
+  useEffect(() => {
+    if (!open) return;
+    const handleKey = (e: KeyboardEvent) => {
+      if (e.key === "Escape") onClose();
+    };
+    window.addEventListener("keydown", handleKey);
+    return () => window.removeEventListener("keydown", handleKey);
+  }, [open, onClose]);
 
   if (!open) return null;
 
@@ -27,75 +51,166 @@ export function CreateTaskModal({ open, onClose, onCreate }: CreateTaskModalProp
       description: description.trim() || undefined,
       source,
       priority,
+      projectId: projectId || undefined,
+      dueDate: dueDate ? new Date(dueDate).toISOString() : undefined,
     });
+    // Reset form
     setTitle("");
     setDescription("");
     setSource("donovan");
     setPriority("medium");
+    setProjectId("");
+    setDueDate("");
+    setShowAdvanced(false);
     onClose();
   };
 
   return (
-    <div className="fixed inset-0 bg-black/40 flex items-center justify-center z-50">
-      <div className="bg-white rounded-xl shadow-2xl p-6 w-full max-w-md mx-4">
-        <h2 className="text-lg font-bold mb-4">New Task</h2>
-        <form onSubmit={handleSubmit} className="space-y-3">
-          <input
-            type="text"
-            placeholder="Task title..."
-            value={title}
-            onChange={(e) => setTitle(e.target.value)}
-            className="w-full border rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-amber-400"
-            autoFocus
-          />
-          <textarea
-            placeholder="Description / context (optional)"
-            value={description}
-            onChange={(e) => setDescription(e.target.value)}
-            rows={3}
-            className="w-full border rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-amber-400"
-          />
+    <div className="fixed inset-0 bg-black/40 backdrop-blur-sm flex items-center justify-center z-50">
+      <div className="bg-white rounded-xl shadow-2xl p-6 w-full max-w-lg mx-4 max-h-[90vh] overflow-y-auto">
+        <div className="flex items-center justify-between mb-4">
+          <h2 className="text-lg font-bold">New Task</h2>
+          <button
+            onClick={onClose}
+            className="text-gray-400 hover:text-gray-600 p-1 rounded-lg hover:bg-gray-100 transition"
+          >
+            <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
+              <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
+            </svg>
+          </button>
+        </div>
+        <form onSubmit={handleSubmit} className="space-y-4">
+          {/* Title */}
+          <div>
+            <label className="text-xs font-medium text-gray-500 block mb-1">Title</label>
+            <input
+              type="text"
+              placeholder="What needs to be done?"
+              value={title}
+              onChange={(e) => setTitle(e.target.value)}
+              className="w-full border border-gray-200 rounded-lg px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-amber-400 focus:border-amber-400"
+              autoFocus
+            />
+          </div>
+
+          {/* Description */}
+          <div>
+            <label className="text-xs font-medium text-gray-500 block mb-1">Description</label>
+            <textarea
+              placeholder="Context, requirements, links... (optional)"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              rows={3}
+              className="w-full border border-gray-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-amber-400 focus:border-amber-400 resize-y"
+            />
+          </div>
+
+          {/* Priority & Source row */}
           <div className="flex gap-3">
             <div className="flex-1">
-              <label className="text-xs text-gray-500 block mb-1">Source</label>
-              <select
-                value={source}
-                onChange={(e) => setSource(e.target.value)}
-                className="w-full border rounded-lg px-3 py-2 text-sm"
-              >
-                <option value="donovan">Donovan</option>
-                <option value="david">David</option>
-                <option value="hammer">Hammer</option>
-                <option value="heartbeat">Heartbeat</option>
-                <option value="cron">Cron</option>
-                <option value="other">Other</option>
-              </select>
-            </div>
-            <div className="flex-1">
-              <label className="text-xs text-gray-500 block mb-1">Priority</label>
-              <select
-                value={priority}
-                onChange={(e) => setPriority(e.target.value)}
-                className="w-full border rounded-lg px-3 py-2 text-sm"
-              >
-                <option value="critical">Critical</option>
-                <option value="high">High</option>
-                <option value="medium">Medium</option>
-                <option value="low">Low</option>
-              </select>
+              <label className="text-xs font-medium text-gray-500 block mb-1">Priority</label>
+              <div className="flex gap-1">
+                {(["critical", "high", "medium", "low"] as const).map((p) => (
+                  <button
+                    key={p}
+                    type="button"
+                    onClick={() => setPriority(p)}
+                    className={`flex-1 text-xs py-2 rounded-lg font-medium transition border ${
+                      priority === p
+                        ? p === "critical" ? "bg-red-500 text-white border-red-500"
+                        : p === "high" ? "bg-orange-500 text-white border-orange-500"
+                        : p === "medium" ? "bg-blue-500 text-white border-blue-500"
+                        : "bg-gray-500 text-white border-gray-500"
+                        : "bg-white text-gray-500 border-gray-200 hover:border-gray-300 hover:bg-gray-50"
+                    }`}
+                  >
+                    {p === "critical" ? "🔴" : p === "high" ? "🟠" : p === "medium" ? "🔵" : "⚪"} {p[0].toUpperCase() + p.slice(1)}
+                  </button>
+                ))}
+              </div>
             </div>
           </div>
+
+          {/* Project selector */}
+          <div>
+            <label className="text-xs font-medium text-gray-500 block mb-1">Project</label>
+            <select
+              value={projectId}
+              onChange={(e) => setProjectId(e.target.value)}
+              className="w-full border border-gray-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-amber-400 bg-white"
+            >
+              <option value="">No project</option>
+              {projects.map((p) => (
+                <option key={p.id} value={p.id}>{p.name}</option>
+              ))}
+            </select>
+          </div>
+
+          {/* Advanced toggle */}
+          <button
+            type="button"
+            onClick={() => setShowAdvanced(!showAdvanced)}
+            className="text-xs text-gray-400 hover:text-gray-600 flex items-center gap-1 transition"
+          >
+            {showAdvanced ? "▾" : "▸"} More options
+          </button>
+
+          {showAdvanced && (
+            <div className="space-y-3 pl-2 border-l-2 border-gray-100">
+              {/* Due Date */}
+              <div>
+                <label className="text-xs font-medium text-gray-500 block mb-1">Due Date</label>
+                <div className="flex items-center gap-2">
+                  <input
+                    type="datetime-local"
+                    value={dueDate}
+                    onChange={(e) => setDueDate(e.target.value)}
+                    className="text-sm border border-gray-200 rounded-lg px-3 py-1.5 focus:outline-none focus:ring-2 focus:ring-amber-400 bg-white"
+                  />
+                  {dueDate && (
+                    <button
+                      type="button"
+                      onClick={() => setDueDate("")}
+                      className="text-xs text-gray-400 hover:text-red-500 transition"
+                    >
+                      ✕
+                    </button>
+                  )}
+                </div>
+              </div>
+
+              {/* Source */}
+              <div>
+                <label className="text-xs font-medium text-gray-500 block mb-1">Source</label>
+                <select
+                  value={source}
+                  onChange={(e) => setSource(e.target.value)}
+                  className="w-full border border-gray-200 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-amber-400 bg-white"
+                >
+                  <option value="donovan">Donovan</option>
+                  <option value="david">David</option>
+                  <option value="hammer">Hammer</option>
+                  <option value="heartbeat">Heartbeat</option>
+                  <option value="cron">Cron</option>
+                  <option value="other">Other</option>
+                </select>
+              </div>
+            </div>
+          )}
+
+          {/* Submit buttons */}
           <div className="flex gap-2 pt-2">
             <button
               type="submit"
-              className="flex-1 bg-amber-500 text-white rounded-lg py-2 text-sm font-medium hover:bg-amber-600 transition"
+              disabled={!title.trim()}
+              className="flex-1 bg-amber-500 text-white rounded-lg py-2.5 text-sm font-semibold hover:bg-amber-600 transition disabled:opacity-50 disabled:cursor-not-allowed"
             >
               Create Task
             </button>
             <button
               type="button"
               onClick={onClose}
-              className="px-4 py-2 text-sm text-gray-600 hover:text-gray-900"
+              className="px-4 py-2.5 text-sm text-gray-600 hover:text-gray-900 hover:bg-gray-100 rounded-lg transition"
             >
               Cancel
             </button>
diff --git a/frontend/src/components/TaskCard.tsx b/frontend/src/components/TaskCard.tsx
index 3f1ab7d..51dd510 100644
--- a/frontend/src/components/TaskCard.tsx
+++ b/frontend/src/components/TaskCard.tsx
@@ -53,6 +53,7 @@ interface TaskCardProps {
   isLast?: boolean;
   isActive?: boolean;
   onClick?: () => void;
+  projectName?: string;
 }
 
 export function TaskCard({
@@ -64,6 +65,7 @@ export function TaskCard({
   isLast,
   isActive,
   onClick,
+  projectName,
 }: TaskCardProps) {
   const actions = statusActions[task.status] || [];
   const noteCount = task.progressNotes?.length || 0;
@@ -110,6 +112,18 @@ export function TaskCard({
             <span className={`text-[10px] sm:text-xs px-1.5 sm:px-2 py-0.5 rounded-full font-medium ${sourceColors[task.source] || sourceColors.other}`}>
               {task.source}
             </span>
+            {/* Project badge */}
+            {projectName && (
+              <span className="text-[10px] sm:text-xs px-1.5 sm:px-2 py-0.5 rounded-full font-medium bg-sky-100 text-sky-700">
+                📁 {projectName}
+              </span>
+            )}
+            {/* Assignee badge */}
+            {task.assigneeName && (
+              <span className="text-[10px] sm:text-xs px-1.5 sm:px-2 py-0.5 rounded-full font-medium bg-emerald-100 text-emerald-700">
+                👤 {task.assigneeName}
+              </span>
+            )}
             <span className="text-[10px] sm:text-xs text-gray-400">
               {timeAgo(task.createdAt)}
             </span>
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index bd8817e..9b94393 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -38,7 +38,7 @@ export async function reorderTasks(ids: string[], token?: string): Promise<void>
 }
 
 export async function createTask(
-  task: { title: string; description?: string; source?: string; priority?: string; status?: string },
+  task: { title: string; description?: string; source?: string; priority?: string; status?: string; projectId?: string; dueDate?: string },
   token?: string
 ): Promise<Task> {
   const headers: Record<string, string> = { "Content-Type": "application/json" };
diff --git a/frontend/src/pages/DashboardPage.tsx b/frontend/src/pages/DashboardPage.tsx
index d141085..cd818ed 100644
--- a/frontend/src/pages/DashboardPage.tsx
+++ b/frontend/src/pages/DashboardPage.tsx
@@ -1,7 +1,8 @@
-import { useMemo } from "react";
+import { useMemo, useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import { useTasks } from "../hooks/useTasks";
-import type { Task, ProgressNote } from "../lib/types";
+import { fetchProjects } from "../lib/api";
+import type { Task, ProgressNote, Project } from "../lib/types";
 
 function StatCard({ label, value, icon, color }: { label: string; value: number; icon: string; color: string }) {
   return (
@@ -74,6 +75,17 @@ function RecentActivity({ tasks }: { tasks: Task[] }) {
 
 export function DashboardPage() {
   const { tasks, loading } = useTasks(10000);
+  const [projects, setProjects] = useState<Project[]>([]);
+
+  useEffect(() => {
+    fetchProjects().then(setProjects).catch(() => {});
+  }, []);
+
+  const projectMap = useMemo(() => {
+    const map: Record<string, string> = {};
+    for (const p of projects) map[p.id] = p.name;
+    return map;
+  }, [projects]);
 
   const stats = useMemo(() => {
     const active = tasks.filter((t) => t.status === "active").length;
@@ -146,6 +158,12 @@ export function DashboardPage() {
                           </span>
                           <span className="text-xs font-bold text-amber-700 font-mono">HQ-{task.taskNumber}</span>
                           <span className="text-xs text-amber-600 capitalize px-1.5 py-0.5 bg-amber-200/50 rounded-full">{task.priority}</span>
+                          {task.projectId && projectMap[task.projectId] && (
+                            <span className="text-xs text-sky-600 px-1.5 py-0.5 bg-sky-100 rounded-full">📁 {projectMap[task.projectId]}</span>
+                          )}
+                          {task.assigneeName && (
+                            <span className="text-xs text-emerald-600 px-1.5 py-0.5 bg-emerald-100 rounded-full">👤 {task.assigneeName}</span>
+                          )}
                           {task.dueDate && (() => {
                             const due = new Date(task.dueDate);
                             const diffMs = due.getTime() - Date.now();
diff --git a/frontend/src/pages/QueuePage.tsx b/frontend/src/pages/QueuePage.tsx
index cc3ce3c..5280167 100644
--- a/frontend/src/pages/QueuePage.tsx
+++ b/frontend/src/pages/QueuePage.tsx
@@ -1,12 +1,12 @@
-import { useState, useMemo } from "react";
+import { useState, useMemo, useEffect } from "react";
 import { useTasks } from "../hooks/useTasks";
 import { useCurrentUser } from "../hooks/useCurrentUser";
 import { TaskCard } from "../components/TaskCard";
 import { TaskDetailPanel } from "../components/TaskDetailPanel";
 import { CreateTaskModal } from "../components/CreateTaskModal";
 import { useToast } from "../components/Toast";
-import { updateTask, reorderTasks, createTask } from "../lib/api";
-import type { TaskStatus } from "../lib/types";
+import { updateTask, reorderTasks, createTask, fetchProjects } from "../lib/api";
+import type { TaskStatus, Project } from "../lib/types";
 
 export function QueuePage() {
   const { tasks, loading, error, refresh } = useTasks(5000);
@@ -16,8 +16,35 @@ export function QueuePage() {
   const [selectedTask, setSelectedTask] = useState<string | null>(null);
   const [search, setSearch] = useState("");
   const [filterPriority, setFilterPriority] = useState<string>("");
+  const [filterStatus, setFilterStatus] = useState<string>("");
+  const [projects, setProjects] = useState<Project[]>([]);
   const { toast } = useToast();
 
+  // Load projects for name display
+  useEffect(() => {
+    fetchProjects().then(setProjects).catch(() => {});
+  }, []);
+
+  const projectMap = useMemo(() => {
+    const map: Record<string, string> = {};
+    for (const p of projects) {
+      map[p.id] = p.name;
+    }
+    return map;
+  }, [projects]);
+
+  // Keyboard shortcut: Ctrl+N to create new task
+  useEffect(() => {
+    const handleKey = (e: KeyboardEvent) => {
+      if ((e.ctrlKey || e.metaKey) && e.key === "n" && !showCreate) {
+        e.preventDefault();
+        setShowCreate(true);
+      }
+    };
+    window.addEventListener("keydown", handleKey);
+    return () => window.removeEventListener("keydown", handleKey);
+  }, [showCreate]);
+
   const filteredTasks = useMemo(() => {
     let filtered = tasks;
     if (search.trim()) {
@@ -26,14 +53,18 @@ export function QueuePage() {
         (t) =>
           t.title.toLowerCase().includes(q) ||
           (t.description && t.description.toLowerCase().includes(q)) ||
-          (t.taskNumber && `hq-${t.taskNumber}`.includes(q))
+          (t.taskNumber && `hq-${t.taskNumber}`.includes(q)) ||
+          (t.assigneeName && t.assigneeName.toLowerCase().includes(q))
       );
     }
     if (filterPriority) {
       filtered = filtered.filter((t) => t.priority === filterPriority);
     }
+    if (filterStatus) {
+      filtered = filtered.filter((t) => t.status === filterStatus);
+    }
     return filtered;
-  }, [tasks, search, filterPriority]);
+  }, [tasks, search, filterPriority, filterStatus]);
 
   const selectedTaskData = useMemo(() => {
     if (!selectedTask) return null;
@@ -48,6 +79,9 @@ export function QueuePage() {
     [filteredTasks]
   );
 
+  // When filtering by status, determine which sections to show
+  const showSection = (status: string) => !filterStatus || filterStatus === status;
+
   const handleStatusChange = async (id: string, status: TaskStatus) => {
     try {
       await updateTask(id, { status });
@@ -79,6 +113,8 @@ export function QueuePage() {
     description?: string;
     source?: string;
     priority?: string;
+    projectId?: string;
+    dueDate?: string;
   }) => {
     try {
       await createTask(task);
@@ -89,6 +125,8 @@ export function QueuePage() {
     }
   };
 
+  const activeFilters = [filterPriority, filterStatus].filter(Boolean).length;
+
   return (
     <div className="min-h-screen">
       {/* Page Header */}
@@ -97,11 +135,17 @@ export function QueuePage() {
           <div className="flex items-center justify-between mb-3">
             <div>
               <h1 className="text-lg sm:text-xl font-bold text-gray-900">Task Queue</h1>
-              <p className="text-xs sm:text-sm text-gray-400">Manage what Hammer is working on</p>
+              <p className="text-xs sm:text-sm text-gray-400">
+                Manage what Hammer is working on
+                {filteredTasks.length !== tasks.length && (
+                  <span className="ml-1 text-amber-500">· {filteredTasks.length} of {tasks.length} shown</span>
+                )}
+              </p>
             </div>
             <button
               onClick={() => setShowCreate(true)}
               className="text-sm bg-amber-500 text-white px-3 sm:px-4 py-2 rounded-lg hover:bg-amber-600 transition font-medium"
+              title="Ctrl+N"
             >
               + New
             </button>
@@ -140,6 +184,27 @@ export function QueuePage() {
               <option value="medium">🔵 Medium</option>
               <option value="low">⚪ Low</option>
             </select>
+            <select
+              value={filterStatus}
+              onChange={(e) => setFilterStatus(e.target.value)}
+              className="text-sm border border-gray-200 rounded-lg px-3 py-2 focus:outline-none focus:ring-2 focus:ring-amber-200 bg-white"
+            >
+              <option value="">All statuses</option>
+              <option value="active">⚡ Active</option>
+              <option value="queued">📋 Queued</option>
+              <option value="blocked">🚫 Blocked</option>
+              <option value="completed">✅ Completed</option>
+              <option value="cancelled">❌ Cancelled</option>
+            </select>
+            {activeFilters > 0 && (
+              <button
+                onClick={() => { setFilterPriority(""); setFilterStatus(""); }}
+                className="text-xs text-amber-600 hover:text-amber-700 font-medium px-2 py-2 shrink-0"
+                title="Clear all filters"
+              >
+                Clear ({activeFilters})
+              </button>
+            )}
           </div>
         </div>
       </header>
@@ -161,31 +226,34 @@ export function QueuePage() {
         )}
 
         {/* Active Task */}
-        <section>
-          <h2 className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3">
-            ⚡ Currently Working On
-          </h2>
-          {activeTasks.length === 0 ? (
-            <div className="border-2 border-dashed border-gray-200 rounded-lg p-8 text-center text-gray-400">
-              No active task — Hammer is idle
-            </div>
-          ) : (
-            <div className="space-y-3">
-              {activeTasks.map((task) => (
-                <TaskCard
-                  key={task.id}
-                  task={task}
-                  onStatusChange={handleStatusChange}
-                  isActive
-                  onClick={() => setSelectedTask(task.id)}
-                />
-              ))}
-            </div>
-          )}
-        </section>
+        {showSection("active") && (
+          <section>
+            <h2 className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3">
+              ⚡ Currently Working On
+            </h2>
+            {activeTasks.length === 0 ? (
+              <div className="border-2 border-dashed border-gray-200 rounded-lg p-8 text-center text-gray-400">
+                No active task — Hammer is idle
+              </div>
+            ) : (
+              <div className="space-y-3">
+                {activeTasks.map((task) => (
+                  <TaskCard
+                    key={task.id}
+                    task={task}
+                    onStatusChange={handleStatusChange}
+                    isActive
+                    onClick={() => setSelectedTask(task.id)}
+                    projectName={task.projectId ? projectMap[task.projectId] : undefined}
+                  />
+                ))}
+              </div>
+            )}
+          </section>
+        )}
 
         {/* Blocked */}
-        {blockedTasks.length > 0 && (
+        {showSection("blocked") && blockedTasks.length > 0 && (
           <section>
             <h2 className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3">
               🚫 Blocked ({blockedTasks.length})
@@ -197,6 +265,7 @@ export function QueuePage() {
                   task={task}
                   onStatusChange={handleStatusChange}
                   onClick={() => setSelectedTask(task.id)}
+                  projectName={task.projectId ? projectMap[task.projectId] : undefined}
                 />
               ))}
             </div>
@@ -204,53 +273,80 @@ export function QueuePage() {
         )}
 
         {/* Queue */}
-        <section>
-          <h2 className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3">
-            📋 Queue ({queuedTasks.length})
-          </h2>
-          {queuedTasks.length === 0 ? (
-            <div className="border-2 border-dashed border-gray-200 rounded-lg p-6 text-center text-gray-400">
-              Queue is empty
-            </div>
-          ) : (
-            <div className="space-y-2">
-              {queuedTasks.map((task, i) => (
-                <TaskCard
-                  key={task.id}
-                  task={task}
-                  onStatusChange={handleStatusChange}
-                  onMoveUp={() => handleMoveUp(i)}
-                  onMoveDown={() => handleMoveDown(i)}
-                  isFirst={i === 0}
-                  isLast={i === queuedTasks.length - 1}
-                  onClick={() => setSelectedTask(task.id)}
-                />
-              ))}
-            </div>
-          )}
-        </section>
+        {showSection("queued") && (
+          <section>
+            <h2 className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3">
+              📋 Queue ({queuedTasks.length})
+            </h2>
+            {queuedTasks.length === 0 ? (
+              <div className="border-2 border-dashed border-gray-200 rounded-lg p-6 text-center text-gray-400">
+                Queue is empty
+              </div>
+            ) : (
+              <div className="space-y-2">
+                {queuedTasks.map((task, i) => (
+                  <TaskCard
+                    key={task.id}
+                    task={task}
+                    onStatusChange={handleStatusChange}
+                    onMoveUp={() => handleMoveUp(i)}
+                    onMoveDown={() => handleMoveDown(i)}
+                    isFirst={i === 0}
+                    isLast={i === queuedTasks.length - 1}
+                    onClick={() => setSelectedTask(task.id)}
+                    projectName={task.projectId ? projectMap[task.projectId] : undefined}
+                  />
+                ))}
+              </div>
+            )}
+          </section>
+        )}
 
         {/* Completed */}
-        <section>
-          <button
-            onClick={() => setShowCompleted(!showCompleted)}
-            className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3 flex items-center gap-1 hover:text-gray-700"
-          >
-            {showCompleted ? "▾" : "▸"} Completed / Cancelled ({completedTasks.length})
-          </button>
-          {showCompleted && (
-            <div className="space-y-2 opacity-60">
-              {completedTasks.map((task) => (
-                <TaskCard
-                  key={task.id}
-                  task={task}
-                  onStatusChange={handleStatusChange}
-                  onClick={() => setSelectedTask(task.id)}
-                />
-              ))}
-            </div>
-          )}
-        </section>
+        {(showSection("completed") || showSection("cancelled")) && (
+          <section>
+            {filterStatus ? (
+              <>
+                <h2 className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3">
+                  {filterStatus === "completed" ? "✅" : "❌"} {filterStatus.charAt(0).toUpperCase() + filterStatus.slice(1)} ({completedTasks.length})
+                </h2>
+                <div className="space-y-2 opacity-60">
+                  {completedTasks.map((task) => (
+                    <TaskCard
+                      key={task.id}
+                      task={task}
+                      onStatusChange={handleStatusChange}
+                      onClick={() => setSelectedTask(task.id)}
+                      projectName={task.projectId ? projectMap[task.projectId] : undefined}
+                    />
+                  ))}
+                </div>
+              </>
+            ) : (
+              <>
+                <button
+                  onClick={() => setShowCompleted(!showCompleted)}
+                  className="text-sm font-semibold text-gray-500 uppercase tracking-wide mb-3 flex items-center gap-1 hover:text-gray-700"
+                >
+                  {showCompleted ? "▾" : "▸"} Completed / Cancelled ({completedTasks.length})
+                </button>
+                {showCompleted && (
+                  <div className="space-y-2 opacity-60">
+                    {completedTasks.map((task) => (
+                      <TaskCard
+                        key={task.id}
+                        task={task}
+                        onStatusChange={handleStatusChange}
+                        onClick={() => setSelectedTask(task.id)}
+                        projectName={task.projectId ? projectMap[task.projectId] : undefined}
+                      />
+                    ))}
+                  </div>
+                )}
+              </>
+            )}
+          </section>
+        )}
       </div>
 
       {/* Task Detail Panel */}