diff --git a/src/pages/Workspaces.tsx b/src/pages/Workspaces.tsx
index 241e52c..50f4971 100644
--- a/src/pages/Workspaces.tsx
+++ b/src/pages/Workspaces.tsx
@@ -115,42 +115,48 @@ export default function Workspaces() {
     }
   };
 
-  return (
-    <div className="flex flex-col p-6 min-h-[calc(100vh-73px)] bg-slate-50 dark:bg-slate-900">
-      <div className="flex justify-between items-center mb-8">
-        <div>
-          <h1 className="text-2xl font-bold text-slate-900 dark:text-white">{t.workspace?.title || 'Workspaces'}</h1>
-          <p className="text-slate-500 dark:text-slate-400 mt-1">{t.workspace?.subtitle || 'Manage your workspaces'}</p>
-        </div>
-        <Button
-          onClick={() => navigate('/workspaces/create')}
-          size="icon"
-          className="shadow-sm"
-          title={t.workspace?.createNew || 'Create New'}
-        >
-          <Plus className="h-5 w-5" />
-        </Button>
-      </div>
-
-      <FilterBar 
-        searchQuery={searchQuery}
-        setSearchQuery={setSearchQuery}
-        ordering={ordering}
-        setOrdering={setOrdering}
-        orderingOptions={orderingOptions}
-        searchPlaceholder={t.workspace?.searchPlaceholder || 'Search...'}
-      />
-
-      {isLoading ? (
-        <div className="p-12 flex justify-center text-slate-500">
-           <div className="animate-pulse">{t.workspace?.loading || 'Loading...'}</div>
-        </div>
-      ) : (
-        <div className="flex flex-col flex-1">
-          <div className="flex flex-col gap-4 mb-6">
-            {workspaces.map((workspace) => {
-              const canDeleteWorkspace = canWorkspace(workspace.my_role, WORKSPACE_DELETE);
-              const canEditWorkspace = canWorkspace(workspace.my_role, WORKSPACE_EDIT);
+  return (
+    <div className="mx-auto max-w-7xl space-y-5 p-4 md:p-6">
+      <div className="rounded-3xl border border-slate-200 bg-white p-5 shadow-sm dark:border-slate-800 dark:bg-slate-900 sm:p-6">
+        <div className="flex items-start justify-between gap-4">
+          <div>
+            <h1 className="text-2xl font-bold text-slate-900 dark:text-white">{t.workspace?.title || 'Workspaces'}</h1>
+            <p className="mt-1 text-sm text-slate-500 dark:text-slate-400">{t.workspace?.subtitle || 'Manage your workspaces'}</p>
+          </div>
+          <Button
+            onClick={() => navigate('/workspaces/create')}
+            size="icon"
+            className="shrink-0 shadow-sm"
+            title={t.workspace?.createNew || 'Create New'}
+          >
+            <Plus className="h-5 w-5" />
+          </Button>
+        </div>
+      </div>
+
+      <div className="rounded-3xl border border-slate-200 bg-white p-4 shadow-sm dark:border-slate-800 dark:bg-slate-900 sm:p-5">
+        <FilterBar 
+          searchQuery={searchQuery}
+          setSearchQuery={setSearchQuery}
+          ordering={ordering}
+          setOrdering={setOrdering}
+          orderingOptions={orderingOptions}
+          searchPlaceholder={t.workspace?.searchPlaceholder || 'Search...'}
+        />
+      </div>
+
+      {isLoading ? (
+        <div className="rounded-3xl border border-slate-200 bg-white p-12 shadow-sm dark:border-slate-800 dark:bg-slate-900">
+          <div className="text-center text-slate-500 dark:text-slate-400">
+            <div className="animate-pulse">{t.workspace?.loading || 'Loading...'}</div>
+          </div>
+        </div>
+      ) : (
+        <div className="space-y-6">
+          <div className="flex flex-col gap-4">
+            {workspaces.map((workspace) => {
+              const canDeleteWorkspace = canWorkspace(workspace.my_role, WORKSPACE_DELETE);
+              const canEditWorkspace = canWorkspace(workspace.my_role, WORKSPACE_EDIT);
 
               return (
                 <Card key={workspace.id} className="flex flex-col text-slate-800 dark:text-slate-100 dark:bg-slate-800 dark:border-slate-700 shadow-sm">
@@ -211,24 +217,26 @@ export default function Workspaces() {
                   </CardContent>
                 </Card>
               );
-            })}
-
-            {workspaces.length === 0 && (
-              <div className="py-16 flex flex-col items-center justify-center border-2 border-dashed border-slate-200 dark:border-slate-800 rounded-2xl">
-                <p className="text-slate-500 dark:text-slate-400 font-medium">{t.workspace?.emptyState || 'No workspaces found'}</p>
-              </div>
-            )}
-          </div>
-
-          <Pagination
+            })}
+
+            {workspaces.length === 0 && (
+              <div className="rounded-3xl border-2 border-dashed border-slate-200 bg-white py-16 shadow-sm dark:border-slate-800 dark:bg-slate-900">
+                <div className="flex flex-col items-center justify-center">
+                <p className="text-slate-500 dark:text-slate-400 font-medium">{t.workspace?.emptyState || 'No workspaces found'}</p>
+                </div>
+              </div>
+            )}
+          </div>
+
+          <Pagination
               currentPage={currentPage}
               totalCount={totalItems}
               limit={limit}
-              onPageChange={setCurrentPage}
-              onLimitChange={setLimit}
-              pageSizeOptions={[10, 20, 50]}
-            />
-        </div>
+              onPageChange={setCurrentPage}
+              onLimitChange={setLimit}
+              pageSizeOptions={[10, 20, 50]}
+            />
+        </div>
       )}
 
       {deleteModal.workspace && (