diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/addMemberModal.tsx b/gridwalk-ui/src/app/workspace/[workspaceId]/addMemberModal.tsx
index 053817e..1aea694 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/addMemberModal.tsx
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/addMemberModal.tsx
@@ -1,12 +1,7 @@
 "use client";
 import React, { useState } from "react";
 import { useRouter } from "next/navigation";
-
-interface AddWorkspaceMemberModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onSubmit: (email: string, role: "Admin" | "Read") => Promise<void>;
-}
+import { AddWorkspaceMemberModalProps } from "./types";
 
 export const AddWorkspaceMemberModal: React.FC<
   AddWorkspaceMemberModalProps
diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/projectModal.tsx b/gridwalk-ui/src/app/workspace/[workspaceId]/projectModal.tsx
index 44af702..0e773b8 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/projectModal.tsx
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/projectModal.tsx
@@ -1,6 +1,6 @@
 "use client";
 import React, { useState } from "react";
-import { CreateProjectModalProps } from "./types";
+import { CreateProjectModalProps, DeleteProjectModalProps } from "./types";
 
 export const CreateProjectModal: React.FC<CreateProjectModalProps> = ({
   isOpen,
@@ -20,7 +20,11 @@ export const CreateProjectModal: React.FC<CreateProjectModalProps> = ({
       onClose();
       setProjectName("");
     } catch (err) {
-      setError(err instanceof Error ? err.message : "An error occurred");
+      setError(
+        err instanceof Error
+          ? err.message
+          : "An error occurred creating a new project"
+      );
     } finally {
       setIsLoading(false);
     }
@@ -96,13 +100,6 @@ export const CreateProjectModal: React.FC<CreateProjectModalProps> = ({
   );
 };
 
-interface DeleteProjectModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  projectName: string;
-  onConfirm: () => Promise<void>;
-}
-
 export const DeleteProjectModal: React.FC<DeleteProjectModalProps> = ({
   isOpen,
   onClose,
@@ -112,13 +109,13 @@ export const DeleteProjectModal: React.FC<DeleteProjectModalProps> = ({
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [confirmText, setConfirmText] = useState("");
-  
+
   const isDeleteEnabled = confirmText === "DELETE";
 
   const handleDelete = async (e: React.FormEvent) => {
     e.preventDefault();
     if (!isDeleteEnabled) return;
-    
+
     setIsLoading(true);
     setError(null);
 
diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/types.ts b/gridwalk-ui/src/app/workspace/[workspaceId]/types.ts
index 5a23892..32014be 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/types.ts
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/types.ts
@@ -11,3 +11,28 @@ export interface CreateProjectModalProps {
   onClose: () => void;
   onSubmit: (name: string) => Promise<void>;
 }
+
+export interface DeleteProjectModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  projectName: string;
+  onConfirm: () => Promise<void>;
+}
+
+export interface AddWorkspaceMemberModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSubmit: (email: string, role: "Admin" | "Read") => Promise<void>;
+}
+
+export interface ViewWorkspaceConnectionsModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  workspaceId: string;
+}
+
+export interface ViewWorkspaceMemberModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  workspaceId: string;
+}
diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/viewConnectionsModal.tsx b/gridwalk-ui/src/app/workspace/[workspaceId]/viewConnectionsModal.tsx
index abb5d2d..90e8f29 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/viewConnectionsModal.tsx
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/viewConnectionsModal.tsx
@@ -1,17 +1,12 @@
 "use client";
 import React, { useEffect, useState } from "react";
 import { Database, Loader2 } from "lucide-react";
+import { ViewWorkspaceConnectionsModalProps } from "./types";
 import {
   getWorkspaceConnections,
   type WorkspaceConnection,
 } from "./actions/workspace/get_connections";
 
-interface ViewWorkspaceConnectionsModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  workspaceId: string;
-}
-
 export const ViewWorkspaceConnectionsModal: React.FC<
   ViewWorkspaceConnectionsModalProps
 > = ({ isOpen, onClose, workspaceId }) => {
diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/viewMembersModal.tsx b/gridwalk-ui/src/app/workspace/[workspaceId]/viewMembersModal.tsx
index d917083..42142e6 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/viewMembersModal.tsx
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/viewMembersModal.tsx
@@ -4,12 +4,7 @@ import { getWorkspaceMembers } from "./actions/workspace/get_members";
 import { Shield, Mail, Loader2, X } from "lucide-react";
 import { removeWorkspaceMember } from "./actions/workspace/remove_members";
 import { useRouter } from "next/navigation";
-
-interface ViewWorkspaceMemberModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  workspaceId: string;
-}
+import { ViewWorkspaceMemberModalProps } from "./types";
 
 type WorkspaceMember = {
   email: string;
@@ -23,6 +18,10 @@ export const ViewWorkspaceMemberModal: React.FC<
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [removing, setRemoving] = useState<string | null>(null);
+  const [confirmText, setConfirmText] = useState("");
+  const [memberToDelete, setMemberToDelete] = useState<WorkspaceMember | null>(
+    null
+  );
   const router = useRouter();
 
   useEffect(() => {
@@ -35,7 +34,9 @@ export const ViewWorkspaceMemberModal: React.FC<
           setMembers(fetchedMembers);
         } catch (err) {
           setError(
-            err instanceof Error ? err.message : "Failed to fetch members",
+            err instanceof Error
+              ? err.message
+              : "Failed to fetch workspace members"
           );
         } finally {
           setLoading(false);
@@ -46,132 +47,224 @@ export const ViewWorkspaceMemberModal: React.FC<
     }
   }, [isOpen, workspaceId]);
 
-  if (!isOpen) return null;
-
-  const getRoleColor = (role: "Admin" | "Read") => {
-    switch (role) {
-      case "Admin":
-        return "bg-blue-100 text-blue-800";
-      case "Read":
-        return "bg-gray-100 text-gray-800";
-    }
+  const handleRemoveMember = async (member: WorkspaceMember) => {
+    setMemberToDelete(member);
+    setConfirmText("");
   };
 
-  const handleRemoveMember = async (email: string) => {
+  const confirmRemoveMember = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!memberToDelete || confirmText !== "DELETE") return;
+
     try {
-      setRemoving(email);
+      setRemoving(memberToDelete.email);
       await removeWorkspaceMember({
         workspace_id: workspaceId,
-        email: email,
+        email: memberToDelete.email,
       });
-      setMembers(members.filter((member) => member.email !== email));
+      setMembers(
+        members.filter((member) => member.email !== memberToDelete.email)
+      );
       router.refresh();
+      setMemberToDelete(null);
+      setConfirmText("");
     } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to remove member");
+      setError(
+        err instanceof Error ? err.message : "Failed to remove workspace member"
+      );
     } finally {
       setRemoving(null);
     }
   };
 
-  return (
-    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
-      <div className="bg-white rounded-lg p-6 w-full max-w-2xl relative">
-        <div className="flex justify-between items-center mb-4">
-          <h2 className="text-xl font-bold text-gray-900">Workspace Members</h2>
-          <button
-            onClick={onClose}
-            className="text-gray-500 hover:text-gray-700"
-          >
-            ✕
-          </button>
-        </div>
+  if (!isOpen) return null;
 
-        <div className="py-4">
-          {loading ? (
-            <div className="flex justify-center items-center py-8">
-              <Loader2 className="animate-spin h-6 w-6 text-gray-500" />
-            </div>
-          ) : error ? (
-            <div className="text-red-500 text-center py-4">{error}</div>
-          ) : members.length === 0 ? (
-            <div className="text-gray-500 text-center py-4">
-              No members found
-            </div>
-          ) : (
-            <div className="overflow-hidden rounded-lg border border-gray-200">
-              <table className="min-w-full divide-y divide-gray-200">
-                <thead className="bg-gray-50">
-                  <tr>
-                    <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                      Email
-                    </th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                      Role
-                    </th>
-                    <th className="px-6 py-3 text-xs font-medium text-gray-500 uppercase tracking-wider text-center">
-                      Remove
-                    </th>
-                  </tr>
-                </thead>
-                <tbody className="bg-white divide-y divide-gray-200">
-                  {members.map((member, index) => (
-                    <tr key={index} className="hover:bg-gray-50">
-                      <td className="px-6 py-4 whitespace-nowrap">
-                        <div className="flex items-center">
-                          <Mail className="h-4 w-4 text-gray-400 mr-2" />
-                          <span className="text-sm text-gray-900">
-                            {member.email}
-                          </span>
-                        </div>
-                      </td>
-                      <td className="px-6 py-4 whitespace-nowrap">
-                        <div className="flex items-center">
-                          <Shield className="h-4 w-4 text-gray-400 mr-2" />
-                          <span
-                            className={`px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${getRoleColor(
-                              member.role,
-                            )}`}
-                          >
-                            {member.role}
-                          </span>
-                        </div>
-                      </td>
-                      <td className="px-6 py-4 whitespace-nowrap text-center">
-                        <button
-                          onClick={() => handleRemoveMember(member.email)}
-                          disabled={removing === member.email}
-                          className={`inline-flex items-center justify-center h-8 w-8 rounded-full
-                            ${
-                              removing === member.email
-                                ? "bg-gray-100 cursor-not-allowed"
-                                : "text-red-600 hover:bg-red-100 transition-colors"
-                            }`}
-                          title="Remove member"
-                        >
-                          {removing === member.email ? (
-                            <Loader2 className="h-4 w-4 animate-spin text-gray-500" />
-                          ) : (
-                            <X className="h-4 w-4" />
-                          )}
-                        </button>
-                      </td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
+  const getRoleColor = (role: "Admin" | "Read") => {
+    switch (role) {
+      case "Admin":
+        return "bg-blue-100 text-blue-800";
+      case "Read":
+        return "bg-gray-100 text-gray-800";
+    }
+  };
+
+  // Delete confirmation modal
+  const DeleteConfirmation = () => {
+    if (!memberToDelete) return null;
+
+    return (
+      <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
+        <div className="bg-white rounded-lg p-6 w-full max-w-md relative">
+          <div className="flex justify-between items-center mb-4">
+            <h2 className="text-xl font-bold text-gray-900">Remove Member</h2>
+            <button
+              onClick={() => setMemberToDelete(null)}
+              className="text-gray-500 hover:text-gray-700"
+            >
+              ✕
+            </button>
+          </div>
+
+          <div className="mb-6">
+            <p className="text-gray-700 mb-2">
+              Are you sure you want to remove{" "}
+              <span className="font-semibold">{memberToDelete.email}</span>?
+            </p>
+            <p className="text-gray-600 text-sm mb-4">
+              This action cannot be undone. The member will lose access to this
+              workspace.
+            </p>
+            <p className="text-gray-700 text-sm mb-2">
+              Type <span className="font-mono font-bold">DELETE</span> to
+              confirm:
+            </p>
+            <input
+              type="text"
+              value={confirmText}
+              onChange={(e) => setConfirmText(e.target.value)}
+              className="w-full px-3 py-2 border border-gray-300 rounded-md text-gray-900 placeholder:text-gray-500 focus:outline-none focus:ring-2 focus:ring-red-500"
+              placeholder="Enter text..."
+              disabled={removing === memberToDelete.email}
+            />
+          </div>
+
+          <form onSubmit={confirmRemoveMember}>
+            <div className="flex justify-end gap-2">
+              <button
+                type="button"
+                onClick={() => setMemberToDelete(null)}
+                className="px-4 py-2 text-gray-700 bg-gray-100 rounded-md hover:bg-gray-200"
+                disabled={removing === memberToDelete.email}
+              >
+                Cancel
+              </button>
+              <button
+                type="submit"
+                disabled={
+                  removing === memberToDelete.email || confirmText !== "DELETE"
+                }
+                className="px-4 py-2 bg-red-500 text-white rounded-md hover:bg-red-600 disabled:opacity-50 disabled:cursor-not-allowed flex items-center gap-2"
+              >
+                {removing === memberToDelete.email ? (
+                  <>
+                    <Loader2 className="animate-spin h-4 w-4" />
+                    Removing...
+                  </>
+                ) : (
+                  "Remove Member"
+                )}
+              </button>
             </div>
-          )}
+          </form>
         </div>
+      </div>
+    );
+  };
+
+  return (
+    <>
+      <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
+        <div className="bg-white rounded-lg p-6 w-full max-w-2xl relative">
+          <div className="flex justify-between items-center mb-4">
+            <h2 className="text-xl font-bold text-gray-900">
+              Workspace Members
+            </h2>
+            <button
+              onClick={onClose}
+              className="text-gray-500 hover:text-gray-700"
+            >
+              ✕
+            </button>
+          </div>
+
+          <div className="py-4">
+            {loading ? (
+              <div className="flex justify-center items-center py-8">
+                <Loader2 className="animate-spin h-6 w-6 text-gray-500" />
+              </div>
+            ) : error ? (
+              <div className="text-red-500 text-center py-4">{error}</div>
+            ) : members.length === 0 ? (
+              <div className="text-gray-500 text-center py-4">
+                No members found
+              </div>
+            ) : (
+              <div className="overflow-hidden rounded-lg border border-gray-200">
+                <table className="min-w-full divide-y divide-gray-200">
+                  <thead className="bg-gray-50">
+                    <tr>
+                      <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                        Email
+                      </th>
+                      <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                        Role
+                      </th>
+                      <th className="px-6 py-3 text-xs font-medium text-gray-500 uppercase tracking-wider text-center">
+                        Remove
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody className="bg-white divide-y divide-gray-200">
+                    {members.map((member, index) => (
+                      <tr key={index} className="hover:bg-gray-50">
+                        <td className="px-6 py-4 whitespace-nowrap">
+                          <div className="flex items-center">
+                            <Mail className="h-4 w-4 text-gray-400 mr-2" />
+                            <span className="text-sm text-gray-900">
+                              {member.email}
+                            </span>
+                          </div>
+                        </td>
+                        <td className="px-6 py-4 whitespace-nowrap">
+                          <div className="flex items-center">
+                            <Shield className="h-4 w-4 text-gray-400 mr-2" />
+                            <span
+                              className={`px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${getRoleColor(
+                                member.role
+                              )}`}
+                            >
+                              {member.role}
+                            </span>
+                          </div>
+                        </td>
+                        <td className="px-6 py-4 whitespace-nowrap text-center">
+                          <button
+                            onClick={() => handleRemoveMember(member)}
+                            disabled={removing === member.email}
+                            className={`inline-flex items-center justify-center h-8 w-8 rounded-full
+                              ${
+                                removing === member.email
+                                  ? "bg-gray-100 cursor-not-allowed"
+                                  : "text-red-600 hover:bg-red-100 transition-colors"
+                              }`}
+                            title="Remove member"
+                          >
+                            {removing === member.email ? (
+                              <Loader2 className="h-4 w-4 animate-spin text-gray-500" />
+                            ) : (
+                              <X className="h-4 w-4" />
+                            )}
+                          </button>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            )}
+          </div>
 
-        <div className="flex justify-end mt-4">
-          <button
-            onClick={onClose}
-            className="px-4 py-2 text-gray-700 bg-gray-100 rounded-md hover:bg-gray-200"
-          >
-            Close
-          </button>
+          <div className="flex justify-end mt-4">
+            <button
+              onClick={onClose}
+              className="px-4 py-2 text-gray-700 bg-gray-100 rounded-md hover:bg-gray-200"
+            >
+              Close
+            </button>
+          </div>
         </div>
       </div>
-    </div>
+      <DeleteConfirmation />
+    </>
   );
 };
diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx b/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx
index 9dcd016..68b2172 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx
@@ -9,6 +9,7 @@ import {
   Trash2,
   HelpCircle,
   Database,
+  User2,
 } from "lucide-react";
 import { CreateProjectModal, DeleteProjectModal } from "./projectModal";
 import { HelpSupportModal } from "../supportModal";
@@ -172,6 +173,10 @@ export default function WorkspaceProjectsClient({
                   <Database size={16} />
                   View Connections
                 </button>
+                <button className="flex items-center gap-2 px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 transition-colors w-full text-left">
+                  <User2 size={16} />
+                  Account Settings
+                </button>
               </div>
             </div>
           )}
@@ -205,6 +210,16 @@ export default function WorkspaceProjectsClient({
           )}
         </div>
 
+        {/* Back Button */}
+        <div className="fixed bottom-0 left-29 p-8">
+          <button
+            onClick={() => router.push("/workspace")}
+            className="bg-white border text-black border-gray-700 rounded-full shadow-lg hover:shadow-l transition-all duration-200 group p-1 relative"
+          >
+            ←
+          </button>
+        </div>
+
         {/* Help Button */}
         <div className="fixed bottom-0 right-0 p-6">
           <button
diff --git a/gridwalk-ui/src/app/workspace/page.tsx b/gridwalk-ui/src/app/workspace/page.tsx
index 7d6d944..52428a4 100644
--- a/gridwalk-ui/src/app/workspace/page.tsx
+++ b/gridwalk-ui/src/app/workspace/page.tsx
@@ -1,61 +1,142 @@
-'use client'
+"use client";
 import React, { useState } from "react";
-import { FolderKanban, Plus, HelpCircle } from "lucide-react";
+import {
+  FolderKanban,
+  Plus,
+  HelpCircle,
+  Users,
+  Database,
+  LucideIcon,
+} from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { CreateWorkspaceModal } from "./modal";
 import { createWorkspace } from "./actions";
 import { HelpSupportModal } from "./supportModal";
+import { useWorkspaces } from "./workspaceContext";
+
+interface StatCardProps {
+  title: string;
+  value: string | number;
+  icon: LucideIcon;
+  description?: string;
+}
+
+const StatCard = ({ title, value, icon: Icon, description }: StatCardProps) => (
+  <div className="bg-white p-6 rounded-xl border border-gray-500 shadow-sm">
+    {" "}
+    {/* Changed border color */}
+    <div className="flex items-center gap-4">
+      <div className="bg-blue-50 p-3 rounded-lg">
+        <Icon className="w-6 h-6 text-blue-500" />
+      </div>
+      <div>
+        <p className="text-sm text-black">{title}</p>
+        <h3 className="text-2xl font-semibold text-black">{value}</h3>
+        {description && (
+          <p className="text-xs text-black/70 mt-1">{description}</p>
+        )}
+      </div>
+    </div>
+  </div>
+);
 
 export default function WorkspacePage() {
+  const { workspaces } = useWorkspaces();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isHelpSupportModalOpen, setIsHelpSupportModalOpen] = useState(false);
 
-  const handleCreateWorkspace = async (name: string) => {
-    await createWorkspace(name);
-  };
+  // Mock data for now
+  // TODO add in real data
+  const currentPlan = "MVP";
+  const totalProjects = 0; // Example count
+  const totalConnections = 0; // Example count
 
   return (
     <div className="w-full min-h-screen bg-gray-50">
       <div className="max-w-7xl mx-auto p-6 md:p-8">
-        <div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4 sm:gap-6 mb-12">
-          <div className="space-y-3">
-            <div className="flex items-center gap-3">
-              <h1 className="text-3xl sm:text-4xl font-bold bg-gradient-to-r from-gray-900 to-gray-600 bg-clip-text text-transparent">
-                GridWalk Workspaces
-              </h1>
+        {/* Header Section with Plan Info */}
+        <div className="flex items-center justify-between mb-8 bg-white p-4 rounded-xl border border-gray-500 shadow-sm">
+          <div>
+            <h1 className="text-2xl font-bold text-gray-900">
+              Welcome to GridWalk
+            </h1>
+          </div>
+          <div className="flex items-center gap-4">
+            <div className="bg-green-50 px-4 py-2 rounded-full">
+              <span className="text-green-700 font-medium">{currentPlan}</span>
             </div>
-            <p className="text-gray-600 text-lg">
-              Manage and organise your projects across different workspaces.
-            </p>
           </div>
-          <Button
-            className="w-full sm:w-auto bg-background text-white hover:bg-blue-600 hover:text-white"
-            size="lg"
-            onClick={() => setIsModalOpen(true)}
-          >
-            <Plus className="w-4 h-4 mr-2" />
-            Create Workspace
-          </Button>
         </div>
 
-        <div className="mt-8 flex flex-col items-center justify-center min-h-[400px] bg-white rounded-2xl shadow-sm border border-gray-100 p-8">
-          <div className="flex flex-col items-center text-center max-w-md">
-            <div className="bg-gray-50 p-4 rounded-full mb-6">
-              <FolderKanban className="w-12 h-12 text-gray-400" />
-            </div>
-            <h2 className="text-xl font-semibold text-gray-900 mb-3">
-              No Workspace Selected
+        {/* Stats Grid */}
+        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-8">
+          <StatCard
+            title="Total Workspaces"
+            value={workspaces.length}
+            icon={FolderKanban}
+            description="Active workspaces"
+          />
+          <StatCard
+            title="Total Projects"
+            value={totalProjects}
+            icon={Database}
+            description="Across all workspaces"
+          />
+          <StatCard
+            title="Active Connections"
+            value={totalConnections}
+            icon={Users}
+            description="Connected team members"
+          />
+        </div>
+
+        {/* Workspaces List */}
+        <div className="bg-white rounded-xl shadow-sm border border-gray-500 overflow-hidden">
+          <div className="p-6">
+            <h2 className="text-xl font-semibold text-black">
+              Your Workspaces
             </h2>
-            <p className="text-gray-500 mb-6">
-              Choose a workspace from the sidebar to view and manage your
-              projects. Each workspace helps you organise related projects and
-              collaborate with your team.
-            </p>
+          </div>
+          <div className="p-6">
+            {workspaces.length > 0 ? (
+              <div className="grid gap-4 font-semibold text-black">
+                {workspaces.map((workspace) => (
+                  <div
+                    key={workspace.id}
+                    className="flex items-center justify-between p-4 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors border border-gray-300"
+                  >
+                    <div className="flex items-center gap-4">
+                      <FolderKanban className="w-5 h-5 text-blue-500" />
+                      <div>
+                        <h3 className="font-medium">{workspace.name}</h3>
+                        <p className="text-sm text-black">
+                          0 projects • 0 members
+                        </p>
+                      </div>
+                    </div>
+                  </div>
+                ))}
+              </div>
+            ) : (
+              <div className="text-center py-12">
+                <FolderKanban className="w-12 h-12 text-gray-400 mx-auto mb-4" />
+                <h3 className="text-lg font-medium text-gray-900 mb-2">
+                  No workspaces yet
+                </h3>
+                <p className="text-gray-500 mb-4">
+                  Create your first workspace to get started
+                </p>
+                <Button onClick={() => setIsModalOpen(true)}>
+                  <Plus className="w-4 h-4 mr-2" />
+                  Create Workspace
+                </Button>
+              </div>
+            )}
           </div>
         </div>
       </div>
 
-      {/* Help Button - Fixed to bottom right */}
+      {/* Help Button */}
       <div className="fixed bottom-0 right-0 p-6">
         <button
           onClick={() => setIsHelpSupportModalOpen(true)}
@@ -70,7 +151,7 @@ export default function WorkspacePage() {
       <CreateWorkspaceModal
         isOpen={isModalOpen}
         onClose={() => setIsModalOpen(false)}
-        onCreate={handleCreateWorkspace}
+        onCreate={createWorkspace}
       />
       <HelpSupportModal
         isOpen={isHelpSupportModalOpen}
@@ -78,4 +159,4 @@ export default function WorkspacePage() {
       />
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/gridwalk-ui/src/app/workspace/sidebar.tsx b/gridwalk-ui/src/app/workspace/sidebar.tsx
index 092b1a6..564e736 100644
--- a/gridwalk-ui/src/app/workspace/sidebar.tsx
+++ b/gridwalk-ui/src/app/workspace/sidebar.tsx
@@ -8,7 +8,7 @@ import {
   SheetTrigger,
 } from "@/components/ui/sheet";
 import { Button } from "@/components/ui/button";
-import { Menu, LogOut, ChevronDown, Plus, ChevronRight } from "lucide-react";
+import { Menu, LogOut, ChevronDown, Plus, Briefcase } from "lucide-react";
 import { ProfileData, Workspaces, logout, createWorkspace } from "./actions";
 import { CreateWorkspaceSidebar } from "./modal";
 import { useRouter } from "next/navigation";
@@ -65,14 +65,16 @@ const WorkspaceAccordion = ({ workspaces }: { workspaces: Workspaces }) => {
     <div className="space-y-2">
       <div className="px-4 py-2">
         <div className="flex flex-col gap-3">
-          <h2 className="text-gray-600 font-semibold italic">GW</h2>
+          <h2 className="text-gray-700 font-semibold italic text-lg">
+            GridWalk
+          </h2>
           <div className="flex justify-between items-center mb-4">
-            <h2 className="text-xl font-semibold">Workspaces</h2>
+            <h3 className="text-sm font-semibold">New Workspace</h3>
             <Button
               variant="ghost"
               size="sm"
               onClick={() => setIsCreateModalOpen(true)}
-              className="hover:bg-blue-500 hover:text-white"
+              className="hover:bg-blue-500 hover:text-white p-1 h-6 w-6 flex"
             >
               <Plus className="h-4 w-4" />
             </Button>
@@ -80,11 +82,11 @@ const WorkspaceAccordion = ({ workspaces }: { workspaces: Workspaces }) => {
         </div>
         <button
           onClick={() => setIsOpen(!isOpen)}
-          className="w-full flex items-center justify-between rounded-lg bg-gray-100 dark:bg-gray-800 hover:bg-blue-500 hover:text-white dark:hover:bg-blue-800 transition-colors duration-200 focus:outline-none focus:ring-3 focus:ring-blue-500 font-medium text-sm"
+          className="w-full flex items-center justify-between rounded-lg bg-gray-100 dark:bg-gray-800 hover:text-white transition-colors duration-200 focus:outline-none focus:ring-3 focus:ring-blue-500 font-medium text-sm"
         >
-          <span>View Workspaces</span>
+          <h2 className="text-sm font-semibold">Select Workspace</h2>
           <div
-            className={`rounded-full p-1 transition-colors duration-200 ${
+            className={`rounded-full p-0.7 transition-colors duration-200 ${
               mounted && isOpen ? "bg-green-500" : "bg-black"
             }`}
           >
@@ -105,14 +107,13 @@ const WorkspaceAccordion = ({ workspaces }: { workspaces: Workspaces }) => {
           <Link
             key={workspace.id}
             href={`/workspace/${workspace.id}`}
-            className="w-full text-left py-1.5 px-3 rounded-md bg-gray-100 dark:bg-gray-800 hover:bg-blue-500 hover:text-white dark:hover:bg-blue-800 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 font-medium group flex items-center gap-2"
+            className="w-full text-left py-1.5 px-3 rounded-md bg-gray-100 dark:bg-gray-800 hover:bg-blue-500 hover:text-white dark:hover:bg-blue-500 transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 font-medium group flex items-center gap-2"
           >
-            <ChevronRight className="h-4 w-4 text-blue-500 dark:text-blue-400" />
-            <span className="flex-1">{workspace.name}</span>
+            <Briefcase className="h-4 w-4 text-white dark:text-white" />
+            <span className="flex-1 text-xs">{workspace.name}</span>
           </Link>
         ))}
       </div>
-
       <CreateWorkspaceSidebar
         isOpen={isCreateModalOpen}
         onClose={() => setIsCreateModalOpen(false)}