diff --git a/src/app/components/dashboard/dashboard.css b/src/app/components/dashboard/dashboard.css
index ef75673..bc498af 100644
--- a/src/app/components/dashboard/dashboard.css
+++ b/src/app/components/dashboard/dashboard.css
@@ -55,17 +55,6 @@
   place-items: center;
 }
 
-nav {
-  display: flex;
-  align-items: center;
-  gap: 20px;
-}
-
-.workspace-card-link {
-  text-decoration: none;
-  color: inherit;
-}
-
 .logout-btn {
   border: 1px solid rgba(255, 255, 255, 0.24);
   background: transparent;
@@ -158,6 +147,36 @@ nav {
   letter-spacing: 0.04em;
 }
 
+.card-actions {
+  margin-top: 14px;
+  display: flex;
+  gap: 8px;
+}
+
+.action-btn {
+  border-radius: 8px;
+  border: 1px solid #d0d0d0;
+  padding: 7px 12px;
+  font-size: 13px;
+  cursor: pointer;
+  background: #fff;
+  color: #111;
+}
+
+.edit-btn:hover {
+  background: #f3f3f3;
+}
+
+.delete-btn {
+  border-color: #2b2b2b;
+  background: #111;
+  color: #fff;
+}
+
+.delete-btn:hover {
+  background: #000;
+}
+
 .empty-state {
   border: 1px dashed #bcbcbc;
   border-radius: 12px;
diff --git a/src/app/components/dashboard/dashboard.html b/src/app/components/dashboard/dashboard.html
index e624684..a478f4f 100644
--- a/src/app/components/dashboard/dashboard.html
+++ b/src/app/components/dashboard/dashboard.html
@@ -27,18 +27,16 @@ <h2>Your Workspaces</h2>
       <a routerLink="/workspace/create" class="create-btn">Create Workspace</a>
     </div>
 
-    <div class="workspace-list">
-      <a *ngFor="let ws of workspaces" [routerLink]="['/workspaces', ws.id]" class="workspace-card-link">
-        <div class="workspace-card">
-          <h3>{{ ws.name }}</h3>
-          <p>{{ ws.description }}</p>
-          <small>Created: {{ ws.createdDate | date }}</small>
+    <div class="workspace-list" *ngIf="workspaces.length > 0; else empty">
+      <article *ngFor="let ws of workspaces" class="workspace-card">
+        <h3>{{ ws.name }}</h3>
+        <p>{{ ws.description || 'No description yet.' }}</p>
+        <small>Created: {{ ws.createdDate | date }}</small>
+        <div class="card-actions">
+          <button type="button" class="action-btn edit-btn" (click)="editWorkspace(ws)">Edit</button>
+          <button type="button" class="action-btn delete-btn" (click)="deleteWorkspace(ws)">Delete</button>
         </div>
-      </a>
-    </div>
-
-    <div *ngIf="workspaces.length === 0" class="empty-state">
-      <p>No workspaces found. Create one to get started!</p>
+      </article>
     </div>
 
     <ng-template #empty>
diff --git a/src/app/components/dashboard/dashboard.ts b/src/app/components/dashboard/dashboard.ts
index 453e81f..ccd9b38 100644
--- a/src/app/components/dashboard/dashboard.ts
+++ b/src/app/components/dashboard/dashboard.ts
@@ -25,6 +25,41 @@ export class Dashboard implements OnInit {
     });
   }
 
+  editWorkspace(workspace: Workspace) {
+    const updatedName = window.prompt('Edit workspace name', workspace.name)?.trim();
+    if (!updatedName) {
+      return;
+    }
+
+    const updatedDescriptionInput = window.prompt('Edit workspace description', workspace.description ?? '');
+    if (updatedDescriptionInput === null) {
+      return;
+    }
+
+    const updatedDescription = updatedDescriptionInput.trim();
+
+    this.workspaceService.updateWorkspace(workspace.id, updatedName, updatedDescription).subscribe(updatedWorkspace => {
+      if (!updatedWorkspace) {
+        return;
+      }
+      this.workspaces = this.workspaces.map(ws => ws.id === updatedWorkspace.id ? updatedWorkspace : ws);
+    });
+  }
+
+  deleteWorkspace(workspace: Workspace) {
+    const confirmed = window.confirm(`Delete workspace "${workspace.name}"?`);
+    if (!confirmed) {
+      return;
+    }
+
+    this.workspaceService.deleteWorkspace(workspace.id).subscribe(deleted => {
+      if (!deleted) {
+        return;
+      }
+      this.workspaces = this.workspaces.filter(ws => ws.id !== workspace.id);
+    });
+  }
+
   logout() {
     this.authService.logout();
     this.router.navigate(['/login']);
diff --git a/src/app/components/workspace/create-workspace.css b/src/app/components/workspace/create-workspace.css
index e8cdb50..4de2a73 100644
--- a/src/app/components/workspace/create-workspace.css
+++ b/src/app/components/workspace/create-workspace.css
@@ -28,10 +28,13 @@ label {
   font-weight: 600;
 }
 
-input {
+input,
+textarea {
   padding: 10px 12px;
   border: 1px solid #d0d7de;
   border-radius: 6px;
+  font: inherit;
+  resize: vertical;
 }
 
 .actions {
diff --git a/src/app/components/workspace/create-workspace.html b/src/app/components/workspace/create-workspace.html
index a02bd2e..b7725db 100644
--- a/src/app/components/workspace/create-workspace.html
+++ b/src/app/components/workspace/create-workspace.html
@@ -14,6 +14,16 @@ <h2>Create Workspace</h2>
       placeholder="e.g. Product Team"
     />
 
+    <label for="workspace-description">Description</label>
+    <textarea
+      id="workspace-description"
+      name="workspaceDescription"
+      [(ngModel)]="description"
+      [disabled]="isSubmitting"
+      rows="4"
+      placeholder="Describe this workspace"
+    ></textarea>
+
     <div class="actions">
       <button type="submit" [disabled]="isSubmitting || !workspaceForm.form.valid">
         {{ isSubmitting ? 'Creating...' : 'Create Workspace' }}
diff --git a/src/app/components/workspace/create-workspace.ts b/src/app/components/workspace/create-workspace.ts
index 1fd002e..5d08528 100644
--- a/src/app/components/workspace/create-workspace.ts
+++ b/src/app/components/workspace/create-workspace.ts
@@ -13,6 +13,7 @@ import { WorkspaceService } from '../../services/workspace';
 })
 export class CreateWorkspace {
   name = '';
+  description = '';
   error = '';
   isSubmitting = false;
 
@@ -29,7 +30,7 @@ export class CreateWorkspace {
     this.isSubmitting = true;
     this.error = '';
 
-    this.workspaceService.createWorkspace(trimmedName).subscribe({
+    this.workspaceService.createWorkspace(trimmedName, this.description.trim()).subscribe({
       next: () => this.router.navigate(['/dashboard']),
       error: () => {
         this.error = 'Unable to create workspace. Please try again.';
diff --git a/src/app/services/workspace.ts b/src/app/services/workspace.ts
index 3895d13..5656664 100644
--- a/src/app/services/workspace.ts
+++ b/src/app/services/workspace.ts
@@ -38,15 +38,32 @@ export class WorkspaceService {
         return of(this.mockWorkspaces.find(w => w.id === id));
     }
 
-    createWorkspace(name: string): Observable<Workspace> {
+    createWorkspace(name: string, description: string): Observable<Workspace> {
         const newWorkspace: Workspace = {
             id: Math.random().toString(36).substring(7),
             name,
-            description: '',
+            description,
             createdDate: new Date(),
             ownerId: 'user1' // Mock owner
         };
         this.mockWorkspaces.push(newWorkspace);
         return of(newWorkspace);
     }
+
+    updateWorkspace(id: string, name: string, description: string): Observable<Workspace | undefined> {
+        const workspace = this.mockWorkspaces.find(w => w.id === id);
+        if (!workspace) {
+            return of(undefined);
+        }
+
+        workspace.name = name;
+        workspace.description = description;
+        return of(workspace);
+    }
+
+    deleteWorkspace(id: string): Observable<boolean> {
+        const initialLength = this.mockWorkspaces.length;
+        this.mockWorkspaces = this.mockWorkspaces.filter(w => w.id !== id);
+        return of(this.mockWorkspaces.length < initialLength);
+    }
 }