diff --git a/src/app/components/dashboard/dashboard.css b/src/app/components/dashboard/dashboard.css
index ef75673..ec09dd4 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,47 @@ nav {
   letter-spacing: 0.04em;
 }
 
+.card-actions {
+  margin-top: 14px;
+  display: flex;
+  gap: 8px;
+}
+
+.action-btn {
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  border-radius: 8px;
+  border: 1px solid #d0d0d0;
+  padding: 7px 12px;
+  font-size: 13px;
+  cursor: pointer;
+  background: #fff;
+  color: #111;
+}
+
+.open-btn {
+  background: #f3f3f3;
+}
+
+.open-btn:hover {
+  background: #e9e9e9;
+}
+
+.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..7da68ac 100644
--- a/src/app/components/dashboard/dashboard.html
+++ b/src/app/components/dashboard/dashboard.html
@@ -27,18 +27,17 @@ <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: 'mediumDate' }}</small>
+        <div class="card-actions">
+          <a [routerLink]="['/workspaces', ws.id, 'decisions']" class="action-btn open-btn">Open</a>
+          <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/decision-form/decision-form.component.css b/src/app/components/decision-form/decision-form.component.css
index 71e22d1..d4a3e61 100644
--- a/src/app/components/decision-form/decision-form.component.css
+++ b/src/app/components/decision-form/decision-form.component.css
@@ -1,12 +1,24 @@
 .form-container {
     max-width: 600px;
-    margin: 20px auto;
+    margin: 8px auto 20px;
     padding: 20px;
     border: 1px solid #ddd;
-    border-radius: 4px;
+    border-radius: 12px;
     background-color: #fff;
 }
 
+.form-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 16px;
+}
+
+.form-header h2 {
+    margin: 0;
+}
+
 .form-group {
     margin-bottom: 15px;
 }
@@ -19,9 +31,9 @@
 
 .form-control {
     width: 100%;
-    padding: 8px;
+    padding: 10px 11px;
     border: 1px solid #ced4da;
-    border-radius: 4px;
+    border-radius: 8px;
     box-sizing: border-box;
     /* Ensures padding doesn't increase width */
 }
@@ -44,24 +56,35 @@
 }
 
 .btn-primary {
-    background-color: #007bff;
-    color: white;
-    padding: 8px 16px;
-    border: none;
-    border-radius: 4px;
+    background-color: #111;
+    color: #fff;
+    padding: 8px 14px;
+    border: 1px solid #111;
+    border-radius: 8px;
     cursor: pointer;
 }
 
 .btn-primary:disabled {
-    background-color: #a0c4ff;
+    background-color: #888;
+    border-color: #888;
     cursor: not-allowed;
 }
 
 .btn-secondary {
-    background-color: #6c757d;
-    color: white;
-    padding: 8px 16px;
-    border: none;
-    border-radius: 4px;
+    background-color: #fff;
+    color: #111;
+    padding: 8px 14px;
+    border: 1px solid #cfcfcf;
+    border-radius: 8px;
     cursor: pointer;
-}
\ No newline at end of file
+}
+
+.btn-ghost {
+    background: #fff;
+    color: #111;
+    padding: 8px 12px;
+    text-decoration: none;
+    border-radius: 8px;
+    border: 1px solid #cfcfcf;
+    font-size: 13px;
+}
diff --git a/src/app/components/decision-form/decision-form.component.html b/src/app/components/decision-form/decision-form.component.html
index 68930f8..4467ca5 100644
--- a/src/app/components/decision-form/decision-form.component.html
+++ b/src/app/components/decision-form/decision-form.component.html
@@ -1,5 +1,8 @@
 <div class="form-container">
-    <h2>{{ isEditMode ? 'Edit Decision' : 'Create New Decision' }}</h2>
+    <div class="form-header">
+        <h2>{{ isEditMode ? 'Edit Decision' : 'Create New Decision' }}</h2>
+        <a routerLink="/dashboard" class="btn-ghost">Back to Dashboard</a>
+    </div>
 
     <form [formGroup]="decisionForm" (ngSubmit)="onSubmit()">
         <div class="form-group">
@@ -27,10 +30,10 @@ <h2>{{ isEditMode ? 'Edit Decision' : 'Create New Decision' }}</h2>
         </div>
 
         <div class="form-actions">
-            <button type="button" routerLink="../" class="btn-secondary">Cancel</button>
+            <button type="button" routerLink="../" class="btn-secondary">Back</button>
             <button type="submit" [disabled]="decisionForm.invalid || isLoading" class="btn-primary">
                 {{ isEditMode ? 'Update Decision' : 'Create Decision' }}
             </button>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/components/decision-form/decision-form.component.ts b/src/app/components/decision-form/decision-form.component.ts
index 70adcba..c48d6a2 100644
--- a/src/app/components/decision-form/decision-form.component.ts
+++ b/src/app/components/decision-form/decision-form.component.ts
@@ -17,6 +17,7 @@ export class DecisionFormComponent implements OnInit {
     isEditMode = false;
     decisionId: string | null = null;
     isLoading = false;
+    workspaceId: string | null = null;
 
     constructor(
         private fb: FormBuilder,
@@ -32,13 +33,7 @@ export class DecisionFormComponent implements OnInit {
     }
 
     ngOnInit(): void {
-        // Get workspaceId from parent
-        this.route.parent?.paramMap.subscribe(params => {
-            const workspaceId = params.get('id');
-            if (workspaceId) {
-                this.decisionForm.patchValue({ workspaceId });
-            }
-        });
+        this.workspaceId = this.getWorkspaceIdFromRoute();
 
         // Get decisionId from current route
         this.route.paramMap.subscribe(params => {
@@ -78,11 +73,23 @@ export class DecisionFormComponent implements OnInit {
                 this.router.navigate(['../../'], { relativeTo: this.route });
             });
         } else {
-            // Include workspaceId from parent route if available
-            const workspaceId = this.route.parent?.snapshot.paramMap.get('id');
-            this.decisionService.createDecision({ ...formValue, workspaceId }).subscribe(() => {
+            if (!this.workspaceId) {
+                return;
+            }
+
+            this.decisionService.createDecision({ ...formValue, workspaceId: this.workspaceId }).subscribe(() => {
                 this.router.navigate(['../'], { relativeTo: this.route });
             });
         }
     }
+
+    private getWorkspaceIdFromRoute(): string | null {
+        for (const route of this.route.pathFromRoot) {
+            const id = route.snapshot.paramMap.get('id');
+            if (id) {
+                return id;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/app/components/decision-list/decision-list.component.css b/src/app/components/decision-list/decision-list.component.css
index 781008a..9cc4ed3 100644
--- a/src/app/components/decision-list/decision-list.component.css
+++ b/src/app/components/decision-list/decision-list.component.css
@@ -1,6 +1,6 @@
 .decision-container {
-    padding: 20px;
-    max-width: 800px;
+    padding: 0 0 20px;
+    max-width: 920px;
     margin: 0 auto;
 }
 
@@ -8,42 +8,69 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    margin-bottom: 20px;
+    margin-bottom: 16px;
+    gap: 12px;
+}
+
+.header h2 {
+    margin: 0;
+    font-size: 30px;
+    line-height: 1.1;
+    letter-spacing: -0.01em;
+}
+
+.header-actions {
+    display: flex;
+    gap: 8px;
 }
 
 .btn-primary {
-    background-color: #007bff;
-    color: white;
-    padding: 10px 15px;
+    background-color: #0a0a0a;
+    color: #fff;
+    padding: 9px 13px;
     text-decoration: none;
-    border-radius: 4px;
+    border-radius: 8px;
+    border: 1px solid #0a0a0a;
+    font-size: 13px;
+}
+
+.btn-ghost {
+    background: #fff;
+    color: #111;
+    padding: 9px 13px;
+    text-decoration: none;
+    border-radius: 8px;
+    border: 1px solid #d2d2d2;
+    font-size: 13px;
 }
 
 .btn-secondary {
-    background-color: #6c757d;
-    color: white;
-    padding: 5px 10px;
+    background-color: #fff;
+    color: #111;
+    padding: 7px 11px;
     text-decoration: none;
-    border-radius: 4px;
+    border-radius: 8px;
+    border: 1px solid #d2d2d2;
     margin-right: 5px;
     cursor: pointer;
-    border: none;
+    font-size: 13px;
 }
 
 .btn-danger {
-    background-color: #dc3545;
-    color: white;
-    padding: 5px 10px;
-    border: none;
-    border-radius: 4px;
+    background-color: #111;
+    color: #fff;
+    padding: 7px 11px;
+    border: 1px solid #111;
+    border-radius: 8px;
     cursor: pointer;
+    font-size: 13px;
 }
 
 .decision-card {
     border: 1px solid #ddd;
-    padding: 15px;
+    padding: 16px;
     margin-bottom: 10px;
-    border-radius: 4px;
+    border-radius: 10px;
     background-color: #fff;
 }
 
@@ -59,29 +86,31 @@
 }
 
 .status-badge {
-    padding: 3px 8px;
-    border-radius: 12px;
+    padding: 3px 9px;
+    border-radius: 999px;
     font-size: 12px;
-    font-weight: bold;
+    font-weight: 600;
+    border: 1px solid #d5d5d5;
 }
 
 .status-badge.draft {
-    background-color: #e2e3e5;
-    color: #383d41;
+    background-color: #efefef;
+    color: #303030;
 }
 
 .status-badge.open {
-    background-color: #d4edda;
-    color: #155724;
+    background-color: #ffffff;
+    color: #111;
 }
 
 .status-badge.closed {
-    background-color: #d1ecf1;
-    color: #0c5460;
+    background-color: #111;
+    color: #fff;
+    border-color: #111;
 }
 
 .decision-meta {
     font-size: 12px;
     color: #666;
     margin-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/app/components/decision-list/decision-list.component.html b/src/app/components/decision-list/decision-list.component.html
index 4196208..926b067 100644
--- a/src/app/components/decision-list/decision-list.component.html
+++ b/src/app/components/decision-list/decision-list.component.html
@@ -1,7 +1,10 @@
 <div class="decision-container">
     <div class="header">
         <h2>Decisions</h2>
-        <a routerLink="new" class="btn-primary">Create New Decision</a>
+        <div class="header-actions">
+            <a routerLink="new" class="btn-primary">Create Decision</a>
+            <a routerLink="/dashboard" class="btn-ghost">Back to Dashboard</a>
+        </div>
     </div>
 
     <div class="decision-list" *ngIf="decisions$ | async as decisions">
@@ -24,4 +27,4 @@ <h3>{{ decision.title }}</h3>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/components/decision-list/decision-list.component.ts b/src/app/components/decision-list/decision-list.component.ts
index 17b4681..13f6809 100644
--- a/src/app/components/decision-list/decision-list.component.ts
+++ b/src/app/components/decision-list/decision-list.component.ts
@@ -21,13 +21,10 @@ export class DecisionListComponent implements OnInit {
     ) { }
 
     ngOnInit(): void {
-        // Get workspaceId from the parent route (workspaces/:id)
-        this.route.parent?.paramMap.subscribe(params => {
-            const workspaceId = params.get('id');
-            if (workspaceId) {
-                this.decisions$ = this.decisionService.getDecisions(workspaceId);
-            }
-        });
+        const workspaceId = this.getWorkspaceIdFromRoute();
+        if (workspaceId) {
+            this.decisions$ = this.decisionService.getDecisions(workspaceId);
+        }
     }
 
     deleteDecision(id: string): void {
@@ -35,4 +32,14 @@ export class DecisionListComponent implements OnInit {
             this.decisionService.deleteDecision(id);
         }
     }
+
+    private getWorkspaceIdFromRoute(): string | null {
+        for (const route of this.route.pathFromRoot) {
+            const id = route.snapshot.paramMap.get('id');
+            if (id) {
+                return id;
+            }
+        }
+        return null;
+    }
 }
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/components/workspace/workspace-details/workspace-details.css b/src/app/components/workspace/workspace-details/workspace-details.css
index ec5419e..6c98056 100644
--- a/src/app/components/workspace/workspace-details/workspace-details.css
+++ b/src/app/components/workspace/workspace-details/workspace-details.css
@@ -1,46 +1,72 @@
 .workspace-details-container {
-    padding: 20px;
-    max-width: 1000px;
+    padding: 28px 24px;
+    max-width: 1100px;
     margin: 0 auto;
 }
 
 header {
     margin-bottom: 20px;
-    border-bottom: 1px solid #eee;
-    padding-bottom: 20px;
+    border-bottom: 1px solid #dedede;
+    padding-bottom: 18px;
+}
+
+.header-top {
+    margin-bottom: 12px;
+}
+
+.back-btn {
+    display: inline-flex;
+    align-items: center;
+    text-decoration: none;
+    color: #fff;
+    background: #0a0a0a;
+    border: 1px solid #0a0a0a;
+    border-radius: 8px;
+    padding: 7px 12px;
+    font-size: 13px;
+}
+
+.back-btn:hover {
+    background: #000;
 }
 
 header h1 {
-    margin: 0 0 10px 0;
+    margin: 0 0 8px;
+    font-size: 34px;
 }
 
 header p {
-    color: #666;
+    color: #555;
     margin: 0;
 }
 
 .workspace-nav {
     display: flex;
-    gap: 20px;
-    border-bottom: 1px solid #ddd;
-    margin-bottom: 20px;
+    gap: 8px;
+    border-bottom: 1px solid #dedede;
+    padding-bottom: 10px;
+    margin-bottom: 24px;
 }
 
 .workspace-nav a {
-    padding: 10px 15px;
+    padding: 8px 14px;
     text-decoration: none;
-    color: #555;
-    border-bottom: 2px solid transparent;
+    color: #444;
+    border: 1px solid transparent;
+    border-radius: 8px;
+    font-size: 14px;
+    line-height: 1.1;
 }
 
 .workspace-nav a.active {
-    color: #007bff;
-    border-bottom-color: #007bff;
-    font-weight: 500;
+    color: #fff;
+    background: #0a0a0a;
+    border-color: #0a0a0a;
+    font-weight: 600;
 }
 
 .loading {
     text-align: center;
     padding: 40px;
     color: #666;
-}
\ No newline at end of file
+}
diff --git a/src/app/components/workspace/workspace-details/workspace-details.html b/src/app/components/workspace/workspace-details/workspace-details.html
index 6cf2abf..a7f6e6f 100644
--- a/src/app/components/workspace/workspace-details/workspace-details.html
+++ b/src/app/components/workspace/workspace-details/workspace-details.html
@@ -1,11 +1,13 @@
 <div class="workspace-details-container" *ngIf="workspace$ | async as workspace; else loading">
     <header>
+        <div class="header-top">
+            <a routerLink="/dashboard" class="back-btn">Back to Dashboard</a>
+        </div>
         <h1>{{ workspace.name }}</h1>
-        <p>{{ workspace.description }}</p>
+        <p>{{ workspace.description || 'No description yet.' }}</p>
     </header>
 
     <nav class="workspace-nav">
-        <a routerLink="./" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">Overview</a>
         <a routerLink="decisions" routerLinkActive="active">Decisions</a>
     </nav>
 
@@ -16,4 +18,4 @@ <h1>{{ workspace.name }}</h1>
 
 <ng-template #loading>
     <div class="loading">Loading workspace...</div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/src/app/services/decision.service.ts b/src/app/services/decision.service.ts
index 3e1aced..0bb6719 100644
--- a/src/app/services/decision.service.ts
+++ b/src/app/services/decision.service.ts
@@ -52,12 +52,16 @@ export class DecisionService {
     }
 
     createDecision(decision: Partial<Decision>): Observable<Decision> {
+        if (!decision.workspaceId) {
+            throw new Error('workspaceId is required to create a decision');
+        }
+
         const newDecision: Decision = {
             id: Math.random().toString(36).substring(2, 9),
             title: decision.title!,
             description: decision.description,
             status: decision.status || 'DRAFT',
-            workspaceId: decision.workspaceId || 'ws-1', // Default to ws-1 for now
+            workspaceId: decision.workspaceId,
             userId: 'user-1', // Mock user
             createdAt: new Date(),
             updatedAt: new Date(),
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);
+    }
 }