diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a14d59e..1525016 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,6 +49,7 @@ Thank you for your interest in contributing to Spacepad! This document provides
 ### Coding Standards
 
 - Follow the [PSR-12](https://www.php-fig.org/psr/psr-12/) coding style guide for PHP
+- Always use import statements instead of inline fully qualified class names - See [Coding Standards](backend/docs/CODING_STANDARDS.md) for details
 - Use ESLint and Prettier for JavaScript/TypeScript
 - Write meaningful commit messages
 - Add comments for complex logic
diff --git a/backend/WORKSPACE_SETUP.md b/backend/WORKSPACE_SETUP.md
new file mode 100644
index 0000000..5b9e354
--- /dev/null
+++ b/backend/WORKSPACE_SETUP.md
@@ -0,0 +1,111 @@
+# Workspace System Documentation
+
+## Overview
+
+The workspace system allows multiple users to collaborate on managing displays, devices, calendars, and rooms. Each user automatically gets their own workspace, and Pro users can invite colleagues to join their workspace.
+
+## Architecture
+
+### Models
+
+1. **Workspace** - Represents a team/workspace
+   - Has an `owner` (User)
+   - Has many `members` (Users with roles)
+   - Contains displays, devices, calendars, rooms
+
+2. **WorkspaceMember** - Pivot table linking users to workspaces
+   - Roles: `owner`, `admin`, `member`
+   - `owner` role is implicit for the workspace owner
+
+### Relationships
+
+- **User** → **Workspace** (one-to-many: owned workspaces)
+- **User** ↔ **Workspace** (many-to-many: member workspaces)
+- **Workspace** → **Display** (one-to-many)
+- **Workspace** → **Device** (one-to-many)
+- **Workspace** → **Calendar** (one-to-many)
+- **Workspace** → **Room** (one-to-many)
+
+## Migration Strategy
+
+1. **Existing Users**: Each user automatically gets a workspace created with their name
+2. **Existing Data**: All displays, devices, calendars, and rooms are migrated to the user's workspace
+3. **Backward Compatibility**: The `user_id` field is kept for backward compatibility
+
+## Permissions
+
+### Workspace Roles
+
+- **Owner**: Full control (can delete workspace, manage all members)
+- **Admin**: Can manage members and workspace settings
+- **Member**: Can view and use workspace resources
+
+### Display Access
+
+- Users can access displays they own directly (`user_id`)
+- Users can access displays in workspaces they're members of (`workspace_id`)
+- Device authentication checks workspace membership
+
+## Usage
+
+### Adding a Colleague
+
+1. Navigate to workspace settings (requires Pro)
+2. Enter colleague's email address
+3. Select role (admin or member)
+4. Colleague receives access to all workspace resources
+
+### Managing Members
+
+- **Add Member**: Only owners/admins can add members
+- **Update Role**: Change member role between admin/member
+- **Remove Member**: Remove access from workspace
+
+## API Changes
+
+### DisplayController
+
+- `index()` now returns displays from user's workspace(s)
+- Access checks include workspace membership
+
+### DisplayService
+
+- `validateDisplayPermission()` checks workspace membership
+- Pro features check workspace owner's Pro status
+
+## Frontend Changes Needed
+
+1. **Workspace Management UI**
+   - List workspaces
+   - View workspace members
+   - Add/remove members
+   - Update member roles
+
+2. **Display Creation**
+   - Automatically assign to user's primary workspace
+   - Allow selecting workspace (if user has multiple)
+
+3. **Device Connection**
+   - Connect code should work with workspace
+   - Devices inherit workspace from user
+
+## Migration Commands
+
+Run migrations in order:
+
+```bash
+php artisan migrate
+```
+
+The migration `2025_12_30_000003_create_workspaces_for_existing_users.php` will:
+1. Create a workspace for each existing user
+2. Migrate all user's displays, devices, calendars, and rooms to their workspace
+3. Add the user as an owner member
+
+## Notes
+
+- Pro subscription is required to add team members
+- Workspace owner cannot be removed
+- All existing functionality remains backward compatible
+- `user_id` fields are kept for direct ownership tracking
+
diff --git a/backend/app/Enums/WorkspaceRole.php b/backend/app/Enums/WorkspaceRole.php
new file mode 100644
index 0000000..35a8e3c
--- /dev/null
+++ b/backend/app/Enums/WorkspaceRole.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Enums;
+
+enum WorkspaceRole: string
+{
+    case OWNER = 'owner';
+    case ADMIN = 'admin';
+    case MEMBER = 'member';
+
+    public function label(): string
+    {
+        return match($this) {
+            self::OWNER => 'Owner',
+            self::ADMIN => 'Admin',
+            self::MEMBER => 'Member',
+        };
+    }
+
+    /**
+     * Check if this role can manage the workspace
+     */
+    public function canManage(): bool
+    {
+        return in_array($this, [self::OWNER, self::ADMIN]);
+    }
+}
+
diff --git a/backend/app/Http/Controllers/API/Auth/AuthController.php b/backend/app/Http/Controllers/API/Auth/AuthController.php
index 9bb5dc8..44fc6a0 100644
--- a/backend/app/Http/Controllers/API/Auth/AuthController.php
+++ b/backend/app/Http/Controllers/API/Auth/AuthController.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\API\Auth\LoginRequest;
 use App\Http\Resources\API\DeviceResource;
 use App\Models\Device;
+use App\Models\User;
 use App\Services\OutlookService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
@@ -32,15 +33,24 @@ public function login(LoginRequest $request): JsonResponse
 
         // Check if the code is a valid connect code
         if ($connectedUserId !== null) {
+            $user = User::find($connectedUserId);
+            $workspace = $user?->primaryWorkspace();
+
             $device = Device::firstOrCreate([
                 'user_id' => $connectedUserId,
                 'uid' => $uid,
             ],[
                 'user_id' => $connectedUserId,
+                'workspace_id' => $workspace?->id,
                 'uid' => $uid,
                 'name' => $name,
             ]);
 
+            // Update workspace_id if device already existed but didn't have one
+            if ($device->workspace_id === null && $workspace) {
+                $device->update(['workspace_id' => $workspace->id]);
+            }
+
             logger()->info('Device authentication successful', [
                 'user_id' => $connectedUserId,
                 'device_id' => $device->id,
diff --git a/backend/app/Http/Controllers/API/DeviceController.php b/backend/app/Http/Controllers/API/DeviceController.php
index e85ddd3..2e823bc 100644
--- a/backend/app/Http/Controllers/API/DeviceController.php
+++ b/backend/app/Http/Controllers/API/DeviceController.php
@@ -7,6 +7,7 @@
 use App\Http\Resources\API\DeviceResource;
 use App\Models\Device;
 use App\Models\Display;
+use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -25,8 +26,33 @@ public function changeDisplay(ChangeDisplayRequest $request): JsonResponse
         $device = auth()->user();
         $data = $request->validated();
 
+        if (!$device->user_id) {
+            return $this->error(
+                message: 'Device is not associated with a user',
+                code: Response::HTTP_BAD_REQUEST
+            );
+        }
+
+        $user = User::with('workspaces')->find($device->user_id);
+        if (!$user) {
+            return $this->error(
+                message: 'User not found',
+                code: Response::HTTP_NOT_FOUND
+            );
+        }
+
+        // Get all workspace IDs the user is a member of
+        $workspaceIds = $user->workspaces->pluck('id');
+        if ($workspaceIds->isEmpty()) {
+            return $this->error(
+                message: 'User is not a member of any workspace',
+                code: Response::HTTP_BAD_REQUEST
+            );
+        }
+
+        // Find display in any of the user's workspaces
         $display = Display::query()
-            ->where('user_id', $device->user_id)
+            ->whereIn('workspace_id', $workspaceIds)
             ->find($data['display_id']);
 
         if (! $display) {
diff --git a/backend/app/Http/Controllers/API/DisplayController.php b/backend/app/Http/Controllers/API/DisplayController.php
index 4bc108e..8b6d2a8 100644
--- a/backend/app/Http/Controllers/API/DisplayController.php
+++ b/backend/app/Http/Controllers/API/DisplayController.php
@@ -9,6 +9,7 @@
 use App\Http\Resources\API\EventResource;
 use App\Models\Device;
 use App\Models\Display;
+use App\Models\User;
 use App\Services\DisplayService;
 use App\Services\EventService;
 use App\Services\ImageService;
@@ -30,8 +31,23 @@ public function index(): JsonResponse
         /** @var Device $device */
         $device = auth()->user();
 
+        if (!$device->user_id) {
+            return $this->success(data: []);
+        }
+
+        $user = User::find($device->user_id);
+        if (!$user) {
+            return $this->success(data: []);
+        }
+
+        // Get displays from all workspaces the user is a member of
+        $workspaceIds = $user->workspaces->pluck('id');
+        if ($workspaceIds->isEmpty()) {
+            return $this->success(data: []);
+        }
+
         $displays = Display::query()
-            ->where('user_id', $device->user_id)
+            ->whereIn('workspace_id', $workspaceIds)
             ->whereIn('status', [DisplayStatus::READY, DisplayStatus::ACTIVE])
             ->with('settings')
             ->get();
@@ -39,6 +55,7 @@ public function index(): JsonResponse
         logger()->info('Display list requested', [
             'user_id' => $device->user_id,
             'device_id' => $device->id,
+            'workspace_ids' => $workspaceIds->toArray(),
             'display_count' => $displays->count(),
             'ip' => request()->ip(),
         ]);
diff --git a/backend/app/Http/Controllers/AdminController.php b/backend/app/Http/Controllers/AdminController.php
index 5c48485..a24edef 100644
--- a/backend/app/Http/Controllers/AdminController.php
+++ b/backend/app/Http/Controllers/AdminController.php
@@ -6,19 +6,38 @@
 use App\Models\Display;
 use App\Models\Instance;
 use App\Models\User;
+use App\Models\Workspace;
+use App\Models\WorkspaceMember;
 use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 
 class AdminController extends Controller
 {
-    public function index()
+    /**
+     * Check if the current request is authorized for admin access
+     */
+    private function checkAdminAccess(): void
     {
         $user = Auth::user();
+        
+        // Prevent access if impersonating
+        if (session()->get('impersonating')) {
+            abort(403, 'Cannot access admin panel while impersonating. Please stop impersonating first.');
+        }
+        
+        // Check if current user is admin
         if (!$user || !$user->isAdmin() || config('settings.is_self_hosted')) {
             abort(403);
         }
+    }
+
+    public function index()
+    {
+        $this->checkAdminAccess();
 
         $activeDisplays = Display::where('status', DisplayStatus::ACTIVE)->count();
         $totalDisplays = Display::count();
@@ -110,10 +129,34 @@ public function index()
                 return $user;
             });
 
+        // All users for the users overview tab (paginated for performance)
+        $search = request()->get('search');
+        $allUsersQuery = User::query()
+            ->withCount('displays')
+            ->with(['subscriptions' => function($query) {
+                $query->where(function($q) {
+                    $q->whereNull('ends_at')
+                      ->orWhere('ends_at', '>', now());
+                });
+            }]);
+        
+        if ($search) {
+            $allUsersQuery->where(function($query) use ($search) {
+                $query->where('name', 'like', "%{$search}%")
+                      ->orWhere('email', 'like', "%{$search}%");
+            });
+        }
+        
+        $allUsers = $allUsersQuery
+            ->orderBy('created_at', 'desc')
+            ->paginate(50)
+            ->withQueryString();
+
         return view('pages.admin', [
             'activeInstances' => $activeInstances,
             'activeDisplays' => $activeDisplays,
             'payingUsers' => $payingUsers,
+            'allUsers' => $allUsers,
             'activeDisplaysCount' => $activeDisplays->count(),
             'totalDisplays' => $totalDisplays,
             'activeInstancesCount' => $activeInstances->count(),
@@ -313,4 +356,280 @@ private function getSubscriptionPrice(string $subscriptionId, int $displaysCount
             return null;
         }
     }
+
+    /**
+     * Show user details page
+     */
+    public function showUser(User $user)
+    {
+        $this->checkAdminAccess();
+        
+        $admin = Auth::user();
+
+        // Load user relationships for display
+        $user->load([
+            'outlookAccounts',
+            'googleAccounts',
+            'caldavAccounts',
+            'displays',
+            'devices',
+            'workspaces',
+            'subscriptions' => function($query) {
+                $query->where(function($q) {
+                    $q->whereNull('ends_at')
+                      ->orWhere('ends_at', '>', now());
+                })->orderByDesc('created_at');
+            },
+        ]);
+
+        // Get subscription info
+        $subscriptionInfo = null;
+        if (!$user->is_unlimited && $user->subscriptions->isNotEmpty()) {
+            $subscription = $user->subscriptions->first();
+            $subscriptionData = $this->getSubscriptionData($subscription->lemon_squeezy_id, $user->displays_count);
+            if ($subscriptionData) {
+                $subscriptionInfo = [
+                    'status' => $subscriptionData['status'] ?? null,
+                    'price' => $subscriptionData['price'] ?? 0,
+                    'mrr' => ($subscriptionData['price'] ?? 0) * $user->displays_count,
+                    'ends_at' => $subscription->ends_at,
+                ];
+            }
+        }
+
+        return view('pages.admin.user', [
+            'user' => $user,
+            'subscriptionInfo' => $subscriptionInfo,
+        ]);
+    }
+
+    /**
+     * Delete a user account and all associated data
+     */
+    public function deleteUser(Request $request, User $user): RedirectResponse
+    {
+        $this->checkAdminAccess();
+        
+        $admin = Auth::user();
+
+        // Prevent deleting yourself
+        if ($user->id === $admin->id) {
+            return redirect()->route('admin.index')
+                ->with('error', 'You cannot delete your own account.');
+        }
+
+        // Confirm deletion
+        $request->validate([
+            'confirm_email' => ['required', 'email'],
+        ]);
+
+        if ($request->input('confirm_email') !== $user->email) {
+            return back()->withErrors(['confirm_email' => 'Email confirmation does not match.']);
+        }
+
+        DB::transaction(function () use ($user, $admin) {
+            // Delete all user's personal access tokens
+            $user->tokens()->delete();
+
+            // Delete displays and their related data first (before calendars/accounts)
+            if ($user->displays) {
+                foreach ($user->displays as $display) {
+                    // Delete event subscriptions
+                    $display->eventSubscriptions()->delete();
+                    // Delete display settings
+                    $display->settings()->delete();
+                    // Delete events associated with this display
+                    $display->events()->delete();
+                    // Delete devices associated with this display
+                    $display->devices()->delete();
+                    $display->delete();
+                }
+            }
+
+            // Delete devices (standalone devices not linked to displays)
+            $user->devices()->delete();
+
+            // Delete rooms
+            $user->rooms()->delete();
+
+            // Delete Outlook accounts and their calendars/events
+            if ($user->outlookAccounts) {
+                foreach ($user->outlookAccounts as $account) {
+                    if ($account->calendars) {
+                        foreach ($account->calendars as $calendar) {
+                            $calendar->events()->delete();
+                            $calendar->delete();
+                        }
+                    }
+                    $account->delete();
+                }
+            }
+
+            // Delete Google accounts and their calendars/events
+            if ($user->googleAccounts) {
+                foreach ($user->googleAccounts as $account) {
+                    if ($account->calendars) {
+                        foreach ($account->calendars as $calendar) {
+                            $calendar->events()->delete();
+                            $calendar->delete();
+                        }
+                    }
+                    $account->delete();
+                }
+            }
+
+            // Delete CalDAV accounts and their calendars/events
+            if ($user->caldavAccounts) {
+                foreach ($user->caldavAccounts as $account) {
+                    if ($account->calendars) {
+                        foreach ($account->calendars as $calendar) {
+                            $calendar->events()->delete();
+                            $calendar->delete();
+                        }
+                    }
+                    $account->delete();
+                }
+            }
+
+            // Delete any remaining calendars directly linked to user (shouldn't happen, but safety check)
+            // Note: Calendars are linked through accounts, not directly to users, so this is unlikely
+            // Events are deleted through calendars above
+
+            // Handle workspaces
+            $ownedWorkspaces = $user->ownedWorkspaces()->get();
+            foreach ($ownedWorkspaces as $workspace) {
+                // Get other members (excluding the user being deleted)
+                $otherMembers = $workspace->members()->where('user_id', '!=', $user->id)->get();
+                
+                if ($otherMembers->isNotEmpty()) {
+                    // Find first admin or first member to transfer ownership
+                    $newOwner = $otherMembers->first(function ($member) {
+                        return $member->pivot->role === \App\Enums\WorkspaceRole::ADMIN->value;
+                    }) ?? $otherMembers->first();
+                    
+                    if ($newOwner) {
+                        // Transfer ownership
+                        WorkspaceMember::where('workspace_id', $workspace->id)
+                            ->where('user_id', $newOwner->id)
+                            ->update(['role' => \App\Enums\WorkspaceRole::OWNER]);
+                    }
+                } else {
+                    // No other members, delete the workspace and all its data
+                    foreach ($workspace->displays as $display) {
+                        $display->eventSubscriptions()->delete();
+                        $display->settings()->delete();
+                        $display->events()->delete();
+                        $display->devices()->delete();
+                        $display->delete();
+                    }
+                    $workspace->devices()->delete();
+                    foreach ($workspace->calendars as $calendar) {
+                        $calendar->events()->delete();
+                        $calendar->delete();
+                    }
+                    $workspace->rooms()->delete();
+                    WorkspaceMember::where('workspace_id', $workspace->id)->delete();
+                    $workspace->delete();
+                }
+            }
+
+            // Delete workspace memberships (user's membership in workspaces they don't own)
+            WorkspaceMember::where('user_id', $user->id)->delete();
+
+            // Delete instance if exists
+            Instance::where('user_id', $user->id)->delete();
+
+            // Cancel LemonSqueezy subscriptions (if any)
+            // Note: This doesn't actually cancel them in LemonSqueezy, just removes the local reference
+            // You might want to add API call to cancel subscriptions
+            if (method_exists($user, 'subscriptions')) {
+                $user->subscriptions()->delete();
+            }
+
+            // Finally, delete the user
+            $user->delete();
+
+            logger()->info('User account deleted by admin', [
+                'deleted_user_id' => $user->id,
+                'deleted_user_email' => $user->email,
+                'deleted_by_admin_id' => $admin->id,
+                'deleted_by_admin_email' => $admin->email,
+            ]);
+        });
+
+        return redirect()->route('admin.index')
+            ->with('success', "User account {$user->email} and all associated data have been permanently deleted.");
+    }
+
+    /**
+     * Impersonate a user
+     */
+    public function impersonate(User $user): RedirectResponse
+    {
+        $this->checkAdminAccess();
+        
+        $admin = Auth::user();
+
+        // Prevent impersonating yourself
+        if ($admin->id === $user->id) {
+            return redirect()->route('admin.index')
+                ->with('error', 'You cannot impersonate yourself.');
+        }
+
+        // Store original admin ID in session
+        session()->put('impersonating', true);
+        session()->put('impersonator_id', $admin->id);
+
+        // Clear any workspace selection from admin session - let impersonated user's workspace be selected
+        session()->forget('selected_workspace_id');
+
+        // Log in as the target user
+        Auth::login($user);
+
+        logger()->info('Admin started impersonating user', [
+            'admin_id' => $admin->id,
+            'admin_email' => $admin->email,
+            'impersonated_user_id' => $user->id,
+            'impersonated_user_email' => $user->email,
+        ]);
+
+        return redirect()->route('dashboard')
+            ->with('success', "You are now impersonating {$user->email}");
+    }
+
+    /**
+     * Stop impersonating and return to admin account
+     */
+    public function stopImpersonating(): RedirectResponse
+    {
+        $impersonatorId = session()->get('impersonator_id');
+        
+        if (!$impersonatorId) {
+            return redirect()->route('dashboard');
+        }
+
+        $impersonator = User::find($impersonatorId);
+        if (!$impersonator || !$impersonator->isAdmin()) {
+            session()->forget(['impersonating', 'impersonator_id']);
+            return redirect()->route('dashboard');
+        }
+
+        $impersonatedUser = Auth::user();
+
+        // Clear impersonation session
+        session()->forget(['impersonating', 'impersonator_id']);
+
+        // Log back in as admin
+        Auth::login($impersonator);
+
+        logger()->info('Admin stopped impersonating user', [
+            'admin_id' => $impersonator->id,
+            'admin_email' => $impersonator->email,
+            'impersonated_user_id' => $impersonatedUser->id,
+            'impersonated_user_email' => $impersonatedUser->email,
+        ]);
+
+        return redirect()->route('admin.index')
+            ->with('success', 'Stopped impersonating user.');
+    }
 }
diff --git a/backend/app/Http/Controllers/CalDAVAccountsController.php b/backend/app/Http/Controllers/CalDAVAccountsController.php
index 7715d2c..3f1e9d1 100644
--- a/backend/app/Http/Controllers/CalDAVAccountsController.php
+++ b/backend/app/Http/Controllers/CalDAVAccountsController.php
@@ -41,9 +41,14 @@ public function store(Request $request): RedirectResponse
             ])->withInput();
         }
 
+        // Get selected workspace (from session or default to primary)
+        $selectedWorkspace = auth()->user()->getSelectedWorkspace();
+        $workspaceId = $selectedWorkspace?->id;
+
         // Create the CalDAV account
         $account = CalDAVAccount::create([
             'user_id' => auth()->id(),
+            'workspace_id' => $workspaceId,
             'name' => parse_url($validated['url'], PHP_URL_HOST),
             'email' => $validated['username'],
             'url' => $validated['url'],
diff --git a/backend/app/Http/Controllers/DashboardController.php b/backend/app/Http/Controllers/DashboardController.php
index 6d7b870..2503d8b 100644
--- a/backend/app/Http/Controllers/DashboardController.php
+++ b/backend/app/Http/Controllers/DashboardController.php
@@ -6,6 +6,12 @@
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
+use App\Services\InstanceService;
+use App\Models\Display;
+use App\Models\Calendar;
+use App\Models\OutlookAccount;
+use App\Models\GoogleAccount;
+use App\Models\CalDAVAccount;
 
 class DashboardController extends Controller
 {
@@ -20,26 +26,64 @@ public function __construct(protected OutlookService $outlookService)
     public function __invoke(): View|Factory|Application
     {
         $user = auth()->user();
+        
+        // Load workspaces with pivot data (role) - this includes all workspaces user is a member of
+        $workspaces = $user->workspaces()->withPivot('role')->get();
+        
+        // Get connect code for user
         $connectCode = $user->getConnectCode();
-        $user->load(['outlookAccounts', 'googleAccounts', 'caldavAccounts', 'displays']);
+
+        // Get selected workspace (from session or default to primary)
+        $selectedWorkspace = $user->getSelectedWorkspace();
+        
+        // Get displays from selected workspace only
+        if ($selectedWorkspace) {
+            $displays = Display::where('workspace_id', $selectedWorkspace->id)
+                ->with(['workspace', 'calendar.outlookAccount', 'calendar.googleAccount', 'calendar.caldavAccount'])
+                ->get();
+            
+            // Get accounts for the selected workspace
+            $outlookAccounts = OutlookAccount::where('workspace_id', $selectedWorkspace->id)
+                ->get();
+            $googleAccounts = GoogleAccount::where('workspace_id', $selectedWorkspace->id)
+                ->get();
+            $caldavAccounts = CalDAVAccount::where('workspace_id', $selectedWorkspace->id)
+                ->get();
+        } else {
+            $displays = collect();
+            $outlookAccounts = collect();
+            $googleAccounts = collect();
+            $caldavAccounts = collect();
+        }
 
         logger()->info('Dashboard page accessed', [
             'user_id' => $user->id,
             'email' => $user->email,
-            'outlook_accounts_count' => $user->outlookAccounts->count(),
-            'google_accounts_count' => $user->googleAccounts->count(),
-            'caldav_accounts_count' => $user->caldavAccounts->count(),
-            'displays_count' => $user->displays->count(),
+            'outlook_accounts_count' => $outlookAccounts->count(),
+            'google_accounts_count' => $googleAccounts->count(),
+            'caldav_accounts_count' => $caldavAccounts->count(),
+            'displays_count' => $displays->count(),
+            'workspaces_count' => $workspaces->count(),
+            'selected_workspace_id' => $selectedWorkspace?->id,
             'ip' => request()->ip(),
             'user_agent' => substr(request()->userAgent() ?? '', 0, 100),
         ]);
 
+        $isSelfHosted = config('settings.is_self_hosted');
+        
         return view('pages.dashboard', [
-            'outlookAccounts' => $user->outlookAccounts,
-            'googleAccounts' => $user->googleAccounts,
-            'caldavAccounts' => $user->caldavAccounts,
-            'displays' => $user->displays,
+            'outlookAccounts' => $outlookAccounts,
+            'googleAccounts' => $googleAccounts,
+            'caldavAccounts' => $caldavAccounts,
+            'displays' => $displays,
+            'workspaces' => $workspaces,
+            'selectedWorkspace' => $selectedWorkspace,
             'connectCode' => $connectCode,
+            'primaryWorkspace' => $user->primaryWorkspace(),
+            'version' => config('settings.version', 'dev'),
+            'appEnv' => config('app.env', 'production'),
+            'appUrl' => config('app.url'),
+            'isSelfHosted' => $isSelfHosted,
         ]);
     }
 }
diff --git a/backend/app/Http/Controllers/DisplayController.php b/backend/app/Http/Controllers/DisplayController.php
index 090888f..6902276 100644
--- a/backend/app/Http/Controllers/DisplayController.php
+++ b/backend/app/Http/Controllers/DisplayController.php
@@ -34,14 +34,27 @@ public function __construct(
 
     public function create(): View
     {
-        $outlookAccounts = auth()->user()->outlookAccounts;
-        $googleAccounts = auth()->user()->googleAccounts;
-        $caldavAccounts = auth()->user()->caldavAccounts;
+        $user = auth()->user();
+        $workspaces = $user->workspaces()->withPivot('role')->get();
+        $selectedWorkspace = $user->getSelectedWorkspace();
+
+        // Filter accounts to only show those for the selected workspace
+        if ($selectedWorkspace) {
+            $outlookAccounts = $user->outlookAccounts()->where('workspace_id', $selectedWorkspace->id)->get();
+            $googleAccounts = $user->googleAccounts()->where('workspace_id', $selectedWorkspace->id)->get();
+            $caldavAccounts = $user->caldavAccounts()->where('workspace_id', $selectedWorkspace->id)->get();
+        } else {
+            $outlookAccounts = $user->outlookAccounts;
+            $googleAccounts = $user->googleAccounts;
+            $caldavAccounts = $user->caldavAccounts;
+        }
 
         return view('pages.displays.create', [
             'outlookAccounts' => $outlookAccounts,
             'googleAccounts' => $googleAccounts,
             'caldavAccounts' => $caldavAccounts,
+            'workspaces' => $workspaces,
+            'defaultWorkspace' => $selectedWorkspace ?? $user->primaryWorkspace(),
         ]);
     }
 
@@ -55,8 +68,8 @@ public function store(CreateDisplayRequest $request): RedirectResponse
         $provider = $validatedData['provider'];
         $accountId = $validatedData['account'];
 
-        // Check on access to create multiple displays
-        if (auth()->user()->shouldUpgrade()) {
+        // Check on access to create multiple displays (workspace-aware Pro check)
+        if (auth()->user()->shouldUpgradeForCurrentWorkspace()) {
             return redirect()->back()->with('error', 'You require an active Pro license to create multiple displays.');
         }
 
@@ -68,12 +81,35 @@ public function store(CreateDisplayRequest $request): RedirectResponse
             default => throw new \InvalidArgumentException('Invalid provider')
         };
 
-        $display = DB::transaction(function () use ($validatedData) {
+        $user = auth()->user();
+        
+        // Get workspace from request, session (selected workspace), or default to primary
+        $workspaceId = $validatedData['workspace_id'] 
+            ?? session()->get('selected_workspace_id')
+            ?? $user->primaryWorkspace()?->id;
+        
+        if (!$workspaceId) {
+            return redirect()->back()->with('error', 'No workspace found. Please contact support.');
+        }
+        
+        // Verify user has access to this workspace
+        $workspace = $user->workspaces()->find($workspaceId);
+        if (!$workspace) {
+            return redirect()->back()->with('error', 'You do not have access to this workspace.');
+        }
+        
+        // Check if user can create displays in this workspace (owner/admin)
+        if (!$workspace->canBeManagedBy($user)) {
+            return redirect()->back()->with('error', 'You do not have permission to create displays in this workspace.');
+        }
+
+        $display = DB::transaction(function () use ($validatedData, $workspace) {
             // Handle room or calendar selection
-            $calendar = $this->createCalendar($validatedData);
+            $calendar = $this->createCalendar($validatedData, $workspace);
 
             return Display::create([
                 'user_id' => auth()->id(),
+                'workspace_id' => $workspace->id,
                 'name' => $validatedData['name'],
                 'display_name' => $validatedData['displayName'],
                 'status' => DisplayStatus::READY,
@@ -127,10 +163,11 @@ public function delete(Display $display): RedirectResponse
             ->with('status', 'Display has successfully been deleted.');
     }
 
-    private function createCalendar(array $validatedData): Calendar
+    private function createCalendar(array $validatedData, $workspace): Calendar
     {
         $provider = $validatedData['provider'];
         $accountId = $validatedData['account'];
+        $userId = auth()->id();
 
         if (isset($validatedData['room'])) {
             $roomData = explode(',', $validatedData['room']);
@@ -139,20 +176,22 @@ private function createCalendar(array $validatedData): Calendar
 
             $calendar = Calendar::firstOrCreate([
                 'calendar_id' => $calendarId,
-                'user_id' => auth()->id(),
+                'workspace_id' => $workspace->id,
             ], [
                 'calendar_id' => $calendarId,
-                'user_id' => auth()->id(),
+                'user_id' => $userId,
+                'workspace_id' => $workspace->id,
                 "{$provider}_account_id" => $accountId,
                 'name' => $calendarName,
             ]);
 
             Room::firstOrCreate([
                 'email_address' => $calendarId,
-                'user_id' => auth()->id(),
+                'workspace_id' => $workspace->id,
             ], [
                 'email_address' => $calendarId,
-                'user_id' => auth()->id(),
+                'user_id' => $userId,
+                'workspace_id' => $workspace->id,
                 'calendar_id' => $calendar->id,
                 'name' => $calendarName,
             ]);
@@ -163,15 +202,18 @@ private function createCalendar(array $validatedData): Calendar
         $calendarData = explode(',', $validatedData['calendar']);
         $calendarName = $this->extractCalendarName($calendarData[1] ?? '');
         
-        return Calendar::firstOrCreate([
+        $calendar = Calendar::firstOrCreate([
             'calendar_id' => $calendarData[0],
-            'user_id' => auth()->id(),
+            'workspace_id' => $workspace->id,
         ], [
-            'user_id' => auth()->id(),
+            'user_id' => $userId,
+            'workspace_id' => $workspace->id,
             "{$provider}_account_id" => $accountId,
             'calendar_id' => $calendarData[0],
             'name' => $calendarName,
         ]);
+
+        return $calendar;
     }
 
     /**
diff --git a/backend/app/Http/Controllers/DisplaySettingsController.php b/backend/app/Http/Controllers/DisplaySettingsController.php
index 531f75a..ab906f0 100644
--- a/backend/app/Http/Controllers/DisplaySettingsController.php
+++ b/backend/app/Http/Controllers/DisplaySettingsController.php
@@ -21,8 +21,8 @@ public function index(Display $display): View
     {
         $this->authorize('update', $display);
 
-        // Check if user has Pro access
-        if (!auth()->user()->hasPro()) {
+        // Check if user has Pro access (workspace-aware)
+        if (!auth()->user()->hasProForCurrentWorkspace()) {
             return redirect()->route('dashboard')->with('error', 'Display settings are only available for Pro users.');
         }
 
@@ -35,8 +35,8 @@ public function update(Request $request, Display $display): RedirectResponse
     {
         $this->authorize('update', $display);
 
-        // Check if user has Pro access
-        if (!auth()->user()->hasPro()) {
+        // Check if user has Pro access (workspace-aware)
+        if (!auth()->user()->hasProForCurrentWorkspace()) {
             return redirect()->route('dashboard')->with('error', 'Display settings are only available for Pro users.');
         }
 
@@ -103,7 +103,7 @@ public function customization(Display $display): View
     {
         $this->authorize('update', $display);
 
-        if (!auth()->user()->hasPro()) {
+        if (!auth()->user()->hasProForCurrentWorkspace()) {
             return redirect()->route('dashboard')->with('error', 'Display customization is only available for Pro users.');
         }
 
@@ -116,7 +116,7 @@ public function updateCustomization(UpdateDisplayCustomizationRequest $request,
     {
         $this->authorize('update', $display);
 
-        if (!auth()->user()->hasPro()) {
+        if (!auth()->user()->hasProForCurrentWorkspace()) {
             return redirect()->route('dashboard')->with('error', 'Display customization is only available for Pro users.');
         }
 
diff --git a/backend/app/Http/Controllers/WorkspaceController.php b/backend/app/Http/Controllers/WorkspaceController.php
new file mode 100644
index 0000000..f464312
--- /dev/null
+++ b/backend/app/Http/Controllers/WorkspaceController.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Workspace;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class WorkspaceController extends Controller
+{
+    /**
+     * Switch to a different workspace
+     * 
+     * Note: This works for all users (including non-Pro users) who are members of the workspace.
+     * Workspace access is based on membership, not Pro status.
+     * Also works during impersonation - uses the impersonated user's workspace memberships.
+     */
+    public function switch(Request $request): RedirectResponse
+    {
+        $request->validate([
+            'workspace_id' => 'required|string|exists:workspaces,id',
+        ]);
+        
+        $user = Auth::user();
+        $workspaceId = $request->input('workspace_id');
+        
+        // Validate user has access to this workspace (checks membership, not Pro status)
+        // This works for both regular users and impersonated users
+        $workspace = $user->workspaces()->find($workspaceId);
+        if (!$workspace) {
+            abort(403, 'You do not have access to this workspace.');
+        }
+        
+        // Store selected workspace in session
+        // This persists during impersonation since we're using the impersonated user's session
+        session()->put('selected_workspace_id', $workspace->id);
+        
+        logger()->info('User switched workspace', [
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+            'workspace_name' => $workspace->name,
+            'is_impersonating' => session()->has('impersonating'),
+        ]);
+        
+        return redirect()->route('dashboard')->with('success', "Switched to workspace: {$workspace->name}");
+    }
+}
+
diff --git a/backend/app/Http/Requests/CreateDisplayRequest.php b/backend/app/Http/Requests/CreateDisplayRequest.php
index 5dc927e..b929dce 100644
--- a/backend/app/Http/Requests/CreateDisplayRequest.php
+++ b/backend/app/Http/Requests/CreateDisplayRequest.php
@@ -35,6 +35,7 @@ public function rules(): array
             'provider' => 'required|string|in:outlook,google,caldav',
             'room' => 'required_without:calendar|string',
             'calendar' => 'required_without:room|string',
+            'workspace_id' => 'nullable|string|exists:workspaces,id',
         ];
     }
 }
diff --git a/backend/app/Models/CalDAVAccount.php b/backend/app/Models/CalDAVAccount.php
index dab6413..9076fd1 100644
--- a/backend/app/Models/CalDAVAccount.php
+++ b/backend/app/Models/CalDAVAccount.php
@@ -25,6 +25,7 @@ class CalDAVAccount extends Model
         'status',
         'permission_type',
         'user_id',
+        'workspace_id',
         'url',
         'username',
         'password',
@@ -49,4 +50,9 @@ public function calendars(): HasMany
     {
         return $this->hasMany(Calendar::class, 'caldav_account_id');
     }
+
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class);
+    }
 }
diff --git a/backend/app/Models/Calendar.php b/backend/app/Models/Calendar.php
index ee3f88f..0acf46d 100644
--- a/backend/app/Models/Calendar.php
+++ b/backend/app/Models/Calendar.php
@@ -17,6 +17,7 @@ class Calendar extends Model
 
     protected $fillable = [
         'user_id',
+        'workspace_id',
         'outlook_account_id',
         'google_account_id',
         'caldav_account_id',
@@ -54,4 +55,9 @@ public function events(): HasMany
     {
         return $this->hasMany(Event::class);
     }
+
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class, 'workspace_id');
+    }
 }
diff --git a/backend/app/Models/Device.php b/backend/app/Models/Device.php
index 068ef8a..3c47216 100644
--- a/backend/app/Models/Device.php
+++ b/backend/app/Models/Device.php
@@ -21,6 +21,7 @@ class Device extends Model implements Authenticatable
 
     protected $fillable = [
         'user_id',
+        'workspace_id',
         'display_id',
         'name',
         'uid',
@@ -40,4 +41,9 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id');
     }
+
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class, 'workspace_id');
+    }
 }
diff --git a/backend/app/Models/Display.php b/backend/app/Models/Display.php
index 099ab7c..92f446c 100644
--- a/backend/app/Models/Display.php
+++ b/backend/app/Models/Display.php
@@ -18,6 +18,7 @@ class Display extends Model
 
     protected $fillable = [
         'user_id',
+        'workspace_id',
         'name',
         'display_name',
         'calendar_id',
@@ -42,6 +43,11 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class, 'user_id');
     }
 
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class, 'workspace_id');
+    }
+
     public function eventSubscriptions(): HasMany
     {
         return $this->hasMany(EventSubscription::class);
diff --git a/backend/app/Models/GoogleAccount.php b/backend/app/Models/GoogleAccount.php
index a79bccb..7323ac3 100644
--- a/backend/app/Models/GoogleAccount.php
+++ b/backend/app/Models/GoogleAccount.php
@@ -27,6 +27,7 @@ class GoogleAccount extends Model
         'service_account_file_path',
         'booking_method',
         'user_id',
+        'workspace_id',
         'google_id',
         'token',
         'refresh_token',
@@ -61,4 +62,9 @@ public function isBusiness(): bool
     {
         return !empty($this->hosted_domain);
     }
+
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class);
+    }
 }
diff --git a/backend/app/Models/OutlookAccount.php b/backend/app/Models/OutlookAccount.php
index 13dc95b..aae69d3 100644
--- a/backend/app/Models/OutlookAccount.php
+++ b/backend/app/Models/OutlookAccount.php
@@ -9,6 +9,7 @@
 use App\Enums\AccountStatus;
 use App\Enums\PermissionType;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class OutlookAccount extends Model
 {
@@ -23,6 +24,7 @@ class OutlookAccount extends Model
         'status',
         'permission_type',
         'user_id',
+        'workspace_id',
         'outlook_id',
         'token',
         'refresh_token',
@@ -51,4 +53,9 @@ public function calendars(): HasMany
     {
         return $this->hasMany(Calendar::class, 'outlook_account_id');
     }
+
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class);
+    }
 }
diff --git a/backend/app/Models/Room.php b/backend/app/Models/Room.php
index 097d5b8..1762d23 100644
--- a/backend/app/Models/Room.php
+++ b/backend/app/Models/Room.php
@@ -17,6 +17,7 @@ class Room extends Model
 
     protected $fillable = [
         'user_id',
+        'workspace_id',
         'calendar_id',
         'name',
         'email_address',
@@ -31,4 +32,9 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id');
     }
+
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class, 'workspace_id');
+    }
 }
diff --git a/backend/app/Models/User.php b/backend/app/Models/User.php
index 63f50bf..1c267f6 100644
--- a/backend/app/Models/User.php
+++ b/backend/app/Models/User.php
@@ -4,10 +4,12 @@
 
 use App\Enums\Plan;
 use App\Enums\UsageType;
+use App\Enums\WorkspaceRole;
 use App\Traits\HasUlid;
 use App\Traits\HasLastActivity;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
@@ -19,6 +21,31 @@ class User extends Authenticatable
 {
     use HasApiTokens, HasFactory, Notifiable, HasUlid, HasLastActivity, Billable;
 
+    /**
+     * Boot the model.
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        // Auto-create workspace when user is created
+        static::created(function ($user) {
+            // Only create if user doesn't already have a workspace
+            if (!$user->workspaces()->exists()) {
+                $workspace = Workspace::create([
+                    'name' => $user->name . "'s Workspace",
+                ]);
+
+                // Add user as owner member (use WorkspaceMember::create to generate ULID)
+                WorkspaceMember::create([
+                    'workspace_id' => $workspace->id,
+                    'user_id' => $user->id,
+                    'role' => WorkspaceRole::OWNER,
+                ]);
+            }
+        });
+    }
+
     /**
      * The attributes that are mass assignable.
      *
@@ -96,6 +123,40 @@ public function rooms(): HasMany
         return $this->hasMany(Room::class);
     }
 
+    /**
+     * Get workspaces owned by this user (where user has 'owner' role)
+     */
+    public function ownedWorkspaces()
+    {
+        return $this->workspaces()->wherePivot('role', WorkspaceRole::OWNER->value);
+    }
+
+    /**
+     * Get workspaces this user is a member of
+     */
+    public function workspaces(): BelongsToMany
+    {
+        return $this->belongsToMany(Workspace::class, 'workspace_members')
+            ->withPivot('role')
+            ->withTimestamps();
+    }
+
+    /**
+     * Get the primary workspace for this user (first workspace where user is owner)
+     */
+    public function primaryWorkspace(): ?Workspace
+    {
+        return $this->ownedWorkspaces()->first() ?? $this->workspaces()->first();
+    }
+
+    /**
+     * Get all workspaces this user has access to
+     */
+    public function accessibleWorkspaces()
+    {
+        return $this->workspaces()->get();
+    }
+
     public function hasAnyDisplay(): bool
     {
         return $this->displays()->count() > 0;
@@ -106,6 +167,11 @@ public function hasAnyAccount(): bool
         return $this->outlookAccounts()->count() > 0 || $this->googleAccounts()->count() > 0 || $this->caldavAccounts()->count() > 0;
     }
 
+    /**
+     * Get or generate a connect code for this user
+     * 
+     * @return string 6-digit connect code
+     */
     public function getConnectCode(): string
     {
         $connectCode = cache()->get("user:$this->id:connect-code");
@@ -116,7 +182,7 @@ public function getConnectCode(): string
             } while (cache()->has("connect-code:$connectCode"));
 
             cache()->put("user:$this->id:connect-code", $connectCode, $expiresAt);
-            cache()->put("connect-code:$connectCode", auth()->id(), $expiresAt);
+            cache()->put("connect-code:$connectCode", $this->id, $expiresAt);
         }
 
         return $connectCode;
@@ -140,6 +206,26 @@ public function hasPro(): bool
         return $this->is_unlimited || $this->subscribed();
     }
 
+    /**
+     * Check if the user has Pro for the current workspace context.
+     * Returns true if the user has Pro OR if the selected workspace has Pro (any owner has Pro).
+     */
+    public function hasProForCurrentWorkspace(): bool
+    {
+        // If user has Pro, they have Pro everywhere
+        if ($this->hasPro()) {
+            return true;
+        }
+
+        // Check if the selected workspace has Pro (any owner has Pro)
+        $selectedWorkspace = $this->getSelectedWorkspace();
+        if ($selectedWorkspace && $selectedWorkspace->hasPro()) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Check if the user should be treated as a business user
      */
@@ -170,6 +256,26 @@ public function shouldUpgrade(): bool
         return ! $this->hasPro() && $this->hasAnyDisplay();
     }
 
+    /**
+     * Check if the user should upgrade to Pro for the current workspace context.
+     * Returns false if the user has Pro OR if the selected workspace has Pro.
+     */
+    public function shouldUpgradeForCurrentWorkspace(): bool
+    {
+        // If user has Pro for current workspace, no upgrade needed
+        if ($this->hasProForCurrentWorkspace()) {
+            return false;
+        }
+
+        // Self Hosted: If the user is a personal user, use a soft limit
+        if (config('settings.is_self_hosted') && $this->isPersonalUser()) {
+            return false;
+        }
+
+        // Cloud Hosted: If the user is a business user and doesn't have Pro, they should upgrade
+        return $this->hasAnyDisplay();
+    }
+
     public function getCheckoutUrl(?string $redirectUrl = null): ?Checkout
     {
         $redirectUrl ??= route('dashboard');
@@ -213,4 +319,28 @@ public function isAdmin(): bool
     {
         return (bool) $this->is_admin;
     }
+
+    /**
+     * Get the currently selected workspace (from session) or default to primary workspace
+     * 
+     * Note: This works for all users (including non-Pro users) who are members of workspaces.
+     * Workspace access is based on membership, not Pro status.
+     */
+    public function getSelectedWorkspace(): ?Workspace
+    {
+        $selectedWorkspaceId = session()->get('selected_workspace_id');
+        
+        if ($selectedWorkspaceId) {
+            // Validate user has access to the selected workspace (checks membership, not Pro status)
+            $workspace = $this->workspaces()->find($selectedWorkspaceId);
+            if ($workspace) {
+                return $workspace;
+            }
+            // If selected workspace is invalid or user no longer has access, clear it from session
+            session()->forget('selected_workspace_id');
+        }
+        
+        // Default to primary workspace (first owned workspace, or first workspace user is a member of)
+        return $this->primaryWorkspace();
+    }
 }
diff --git a/backend/app/Models/Workspace.php b/backend/app/Models/Workspace.php
new file mode 100644
index 0000000..45bd964
--- /dev/null
+++ b/backend/app/Models/Workspace.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\WorkspaceRole;
+use App\Traits\HasUlid;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Workspace extends Model
+{
+    use HasFactory, HasUlid;
+
+    protected $fillable = [
+        'name',
+    ];
+
+    /**
+     * Get all members of the workspace
+     */
+    public function members(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'workspace_members')
+            ->withPivot('role')
+            ->withTimestamps();
+    }
+
+    /**
+     * Get all displays in this workspace
+     */
+    public function displays(): HasMany
+    {
+        return $this->hasMany(Display::class);
+    }
+
+    /**
+     * Get all devices in this workspace
+     */
+    public function devices(): HasMany
+    {
+        return $this->hasMany(Device::class);
+    }
+
+    /**
+     * Get all calendars in this workspace
+     */
+    public function calendars(): HasMany
+    {
+        return $this->hasMany(Calendar::class);
+    }
+
+    /**
+     * Get all rooms in this workspace
+     */
+    public function rooms(): HasMany
+    {
+        return $this->hasMany(Room::class);
+    }
+
+    /**
+     * Check if a user is a member of this workspace
+     */
+    public function hasMember(User $user): bool
+    {
+        return $this->members()->where('user_id', $user->id)->exists();
+    }
+
+    /**
+     * Get the owner(s) of the workspace (members with 'owner' role)
+     */
+    public function owners()
+    {
+        return $this->members()->wherePivot('role', WorkspaceRole::OWNER->value);
+    }
+
+    /**
+     * Check if a user is the owner of this workspace
+     */
+    public function isOwnedBy(User $user): bool
+    {
+        return $this->members()->where('user_id', $user->id)->wherePivot('role', WorkspaceRole::OWNER->value)->exists();
+    }
+
+    /**
+     * Check if a user can manage this workspace (owner or admin)
+     */
+    public function canBeManagedBy(User $user): bool
+    {
+        $member = $this->members()->where('user_id', $user->id)->first();
+        if (!$member) {
+            return false;
+        }
+        
+        $role = $member->pivot->role instanceof WorkspaceRole 
+            ? $member->pivot->role 
+            : WorkspaceRole::from($member->pivot->role);
+            
+        return $role->canManage();
+    }
+
+    /**
+     * Get the role of a user in this workspace
+     */
+    public function getUserRole(User $user): ?WorkspaceRole
+    {
+        $member = $this->members()->where('user_id', $user->id)->first();
+        if (!$member) {
+            return null;
+        }
+        
+        $role = $member->pivot->role;
+        return $role instanceof WorkspaceRole ? $role : WorkspaceRole::from($role);
+    }
+
+    /**
+     * Check if this workspace has Pro (any owner has Pro)
+     */
+    public function hasPro(): bool
+    {
+        $owners = $this->owners()->with('subscriptions')->get();
+        foreach ($owners as $owner) {
+            if ($owner->hasPro()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
diff --git a/backend/app/Models/WorkspaceMember.php b/backend/app/Models/WorkspaceMember.php
new file mode 100644
index 0000000..e7e66bc
--- /dev/null
+++ b/backend/app/Models/WorkspaceMember.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\WorkspaceRole;
+use App\Traits\HasUlid;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class WorkspaceMember extends Model
+{
+    use HasFactory, HasUlid;
+
+    protected $table = 'workspace_members';
+
+    protected $fillable = [
+        'workspace_id',
+        'user_id',
+        'role',
+    ];
+
+    protected $casts = [
+        'role' => WorkspaceRole::class,
+    ];
+
+    /**
+     * Get the workspace this member belongs to
+     */
+    public function workspace(): BelongsTo
+    {
+        return $this->belongsTo(Workspace::class);
+    }
+
+    /**
+     * Get the user member
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}
+
diff --git a/backend/app/Policies/DisplayPolicy.php b/backend/app/Policies/DisplayPolicy.php
index 1697a71..b7b1ca3 100644
--- a/backend/app/Policies/DisplayPolicy.php
+++ b/backend/app/Policies/DisplayPolicy.php
@@ -24,7 +24,12 @@ public function create(User $user): bool
      */
     public function update(User $user, Display $display): bool
     {
-        return $user->id === $display->user_id;
+        if (!$display->workspace_id) {
+            return false;
+        }
+
+        $workspace = $display->workspace;
+        return $workspace && $workspace->canBeManagedBy($user);
     }
 
     /**
@@ -32,7 +37,12 @@ public function update(User $user, Display $display): bool
      */
     public function delete(User $user, Display $display): bool
     {
-        return $user->id === $display->user_id;
+        if (!$display->workspace_id) {
+            return false;
+        }
+
+        $workspace = $display->workspace;
+        return $workspace && $workspace->canBeManagedBy($user);
     }
 
     /**
@@ -42,7 +52,12 @@ public function view($user, Display $display): bool
     {
         // Handle User model
         if ($user instanceof User) {
-            return $user->id === $display->user_id;
+            if (!$display->workspace_id) {
+                return false;
+            }
+
+            $workspace = $display->workspace;
+            return $workspace && $workspace->hasMember($user);
         }
         
         // Handle Device model
diff --git a/backend/app/Services/DisplayService.php b/backend/app/Services/DisplayService.php
index 8674277..ebebe08 100644
--- a/backend/app/Services/DisplayService.php
+++ b/backend/app/Services/DisplayService.php
@@ -5,6 +5,7 @@
 use App\Data\PermissionResult;
 use App\Models\Device;
 use App\Models\Display;
+use App\Models\User;
 
 class DisplayService
 {
@@ -23,18 +24,47 @@ public function getDisplay(string $displayId)
      */
     public function validateDisplayPermission(?string $displayId, string $deviceId, array $options = []): PermissionResult
     {
-        $userId = Device::query()->where('id', $deviceId)->value('user_id');
-        $display = $displayId ? Display::with('user')->where('user_id', $userId)->find($displayId) : null;
+        $device = Device::with('user.workspaces')->find($deviceId);
+        
+        if (!$device || !$device->user_id) {
+            return new PermissionResult(false, 'Device not found', 404);
+        }
+
+        $user = $device->user;
+        if (!$user) {
+            return new PermissionResult(false, 'User not found', 404);
+        }
+
+        if (!$displayId) {
+            return new PermissionResult(false, 'Display not found', 404);
+        }
+
+        // Get all workspace IDs the user is a member of
+        $workspaceIds = $user->workspaces->pluck('id');
+        if ($workspaceIds->isEmpty()) {
+            return new PermissionResult(false, 'User is not a member of any workspace', 403);
+        }
+
+        // Find display in any of the user's workspaces
+        $display = Display::with('workspace.members')
+            ->whereIn('workspace_id', $workspaceIds)
+            ->find($displayId);
 
         if (!$display) {
             return new PermissionResult(false, 'Display not found', 404);
         }
+        
         if ($display->isDeactivated()) {
             return new PermissionResult(false, 'Display is deactivated', 400);
         }
-        if (!empty($options['pro']) && (!$display->user || !$display->user->hasPro())) {
-            return new PermissionResult(false, 'This is a Pro feature. Please upgrade to Pro to use this feature.', 403);
+        
+        // Pro feature check: check if any workspace owner has Pro
+        if (!empty($options['pro'])) {
+            if (!$display->workspace->hasPro()) {
+                return new PermissionResult(false, 'This is a Pro feature. Please upgrade to Pro to use this feature.', 403);
+            }
         }
+        
         if (!empty($options['booking']) && !$display->isBookingEnabled()) {
             return new PermissionResult(false, 'Booking is not enabled for this display', 403);
         }
diff --git a/backend/app/Services/GoogleService.php b/backend/app/Services/GoogleService.php
index e30c76d..a655575 100644
--- a/backend/app/Services/GoogleService.php
+++ b/backend/app/Services/GoogleService.php
@@ -59,14 +59,20 @@ public function authenticateGoogleAccount(string $authCode, PermissionType $perm
         $googleService = new Oauth2($this->client);
         $googleUserInfo = $googleService->userinfo->get();
 
+        // Get selected workspace (from session or default to primary)
+        $selectedWorkspace = auth()->user()->getSelectedWorkspace();
+        $workspaceId = $selectedWorkspace?->id;
+
         // Save the user's Google account and tokens in the database
         return GoogleAccount::updateOrCreate(
             [
                 'user_id' => auth()->id(),
                 'google_id' => $googleUserInfo->id,
+                'workspace_id' => $workspaceId,
             ],
             [
                 'user_id' => auth()->id(),
+                'workspace_id' => $workspaceId,
                 'email' => $googleUserInfo->email,
                 'name' => $googleUserInfo->name,
                 'avatar' => $googleUserInfo->picture,
diff --git a/backend/app/Services/OutlookService.php b/backend/app/Services/OutlookService.php
index 772a141..beb14dd 100644
--- a/backend/app/Services/OutlookService.php
+++ b/backend/app/Services/OutlookService.php
@@ -111,14 +111,20 @@ public function authenticateOutlookAccount(string $authCode, string|PermissionTy
 
         $tenantId = $this->getTenantId($tokenData['access_token']);
 
+        // Get selected workspace (from session or default to primary)
+        $selectedWorkspace = auth()->user()->getSelectedWorkspace();
+        $workspaceId = $selectedWorkspace?->id;
+
         // Save the Outlook account and tokens
         return OutlookAccount::updateOrCreate(
             [
                 'user_id' => auth()->id(),
                 'outlook_id' => $user['id'],
+                'workspace_id' => $workspaceId,
             ],
             [
                 'user_id' => auth()->id(),
+                'workspace_id' => $workspaceId,
                 'email' => $user['mail'] ?? $user['userPrincipalName'],
                 'name' => $user['displayName'],
                 'tenant_id' => $tenantId,
diff --git a/backend/database/migrations/2025_12_30_000000_create_workspaces_table.php b/backend/database/migrations/2025_12_30_000000_create_workspaces_table.php
new file mode 100644
index 0000000..423c935
--- /dev/null
+++ b/backend/database/migrations/2025_12_30_000000_create_workspaces_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('workspaces', function (Blueprint $table) {
+            $table->ulid('id')->primary();
+            $table->string('name');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('workspaces');
+    }
+};
+
diff --git a/backend/database/migrations/2025_12_30_000001_create_workspace_members_table.php b/backend/database/migrations/2025_12_30_000001_create_workspace_members_table.php
new file mode 100644
index 0000000..0912dde
--- /dev/null
+++ b/backend/database/migrations/2025_12_30_000001_create_workspace_members_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('workspace_members', function (Blueprint $table) {
+            $table->ulid('id')->primary();
+            $table->foreignUlid('workspace_id')->constrained()->onDelete('cascade');
+            $table->foreignUlid('user_id')->constrained()->onDelete('cascade');
+            $table->string('role')->default('member'); // Uses WorkspaceRole enum: 'owner', 'admin', 'member'
+            $table->timestamps();
+
+            // Ensure a user can only be a member once per workspace
+            $table->unique(['workspace_id', 'user_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('workspace_members');
+    }
+};
+
diff --git a/backend/database/migrations/2025_12_30_000002_add_workspace_id_to_tables.php b/backend/database/migrations/2025_12_30_000002_add_workspace_id_to_tables.php
new file mode 100644
index 0000000..345113f
--- /dev/null
+++ b/backend/database/migrations/2025_12_30_000002_add_workspace_id_to_tables.php
@@ -0,0 +1,61 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Add workspace_id to displays
+        Schema::table('displays', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+
+        // Add workspace_id to devices
+        Schema::table('devices', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+
+        // Add workspace_id to calendars
+        Schema::table('calendars', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+
+        // Add workspace_id to rooms
+        Schema::table('rooms', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('displays', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+
+        Schema::table('devices', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+
+        Schema::table('calendars', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+
+        Schema::table('rooms', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+    }
+};
+
diff --git a/backend/database/migrations/2025_12_30_000003_add_workspace_id_to_accounts_tables.php b/backend/database/migrations/2025_12_30_000003_add_workspace_id_to_accounts_tables.php
new file mode 100644
index 0000000..019c7bc
--- /dev/null
+++ b/backend/database/migrations/2025_12_30_000003_add_workspace_id_to_accounts_tables.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Add workspace_id to outlook_accounts
+        Schema::table('outlook_accounts', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+
+        // Add workspace_id to google_accounts
+        Schema::table('google_accounts', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+
+        // Add workspace_id to caldav_accounts
+        Schema::table('caldav_accounts', function (Blueprint $table) {
+            $table->foreignUlid('workspace_id')->nullable()->after('user_id')->constrained()->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('outlook_accounts', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+
+        Schema::table('google_accounts', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+
+        Schema::table('caldav_accounts', function (Blueprint $table) {
+            $table->dropForeign(['workspace_id']);
+            $table->dropColumn('workspace_id');
+        });
+    }
+};
+
diff --git a/backend/database/migrations/2025_12_30_000004_create_workspaces_for_existing_users.php b/backend/database/migrations/2025_12_30_000004_create_workspaces_for_existing_users.php
new file mode 100644
index 0000000..318369b
--- /dev/null
+++ b/backend/database/migrations/2025_12_30_000004_create_workspaces_for_existing_users.php
@@ -0,0 +1,86 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+use App\Models\User;
+use App\Models\Workspace;
+use App\Models\WorkspaceMember;
+use App\Models\Display;
+use App\Models\Device;
+use App\Models\Calendar;
+use App\Models\Room;
+use App\Models\OutlookAccount;
+use App\Models\GoogleAccount;
+use App\Models\CalDAVAccount;
+use App\Enums\WorkspaceRole;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create a workspace for each existing user and migrate their data
+        User::chunk(100, function ($users) {
+            foreach ($users as $user) {
+                // Skip if user already has a workspace
+                if ($user->workspaces()->exists()) {
+                    continue;
+                }
+
+                // Create workspace for user
+                $workspace = Workspace::create([
+                    'name' => $user->name . "'s Workspace",
+                ]);
+
+                // Add user as owner member (use WorkspaceMember::create to generate ULID)
+                WorkspaceMember::create([
+                    'workspace_id' => $workspace->id,
+                    'user_id' => $user->id,
+                    'role' => WorkspaceRole::OWNER,
+                ]);
+
+                // Migrate displays to workspace
+                Display::where('user_id', $user->id)->update(['workspace_id' => $workspace->id]);
+
+                // Migrate devices to workspace
+                Device::where('user_id', $user->id)->update(['workspace_id' => $workspace->id]);
+
+                // Migrate calendars to workspace
+                Calendar::where('user_id', $user->id)->update(['workspace_id' => $workspace->id]);
+
+                // Migrate rooms to workspace
+                Room::where('user_id', $user->id)->update(['workspace_id' => $workspace->id]);
+
+                // Migrate Outlook accounts to workspace
+                OutlookAccount::where('user_id', $user->id)
+                    ->whereNull('workspace_id')
+                    ->update(['workspace_id' => $workspace->id]);
+
+                // Migrate Google accounts to workspace
+                GoogleAccount::where('user_id', $user->id)
+                    ->whereNull('workspace_id')
+                    ->update(['workspace_id' => $workspace->id]);
+
+                // Migrate CalDAV accounts to workspace
+                CalDAVAccount::where('user_id', $user->id)
+                    ->whereNull('workspace_id')
+                    ->update(['workspace_id' => $workspace->id]);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // This migration cannot be fully reversed as we don't know which workspace
+        // data belongs to which user after potential member additions.
+        // In practice, you'd need to keep the user_id relationships intact.
+    }
+};
+
diff --git a/backend/docs/CODING_STANDARDS.md b/backend/docs/CODING_STANDARDS.md
new file mode 100644
index 0000000..1a211c7
--- /dev/null
+++ b/backend/docs/CODING_STANDARDS.md
@@ -0,0 +1,64 @@
+# Coding Standards
+
+This document outlines coding standards and best practices for the Spacepad backend codebase.
+
+## Import Statements
+
+**Always use import statements at the top of files instead of inline fully qualified class names.**
+
+### ✅ Correct
+
+```php
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Display;
+use App\Models\User;
+use App\Services\InstanceService;
+
+class DashboardController extends Controller
+{
+    public function __invoke()
+    {
+        $displays = Display::where('status', 'active')->get();
+        $user = User::find(1);
+        $isValid = InstanceService::hasValidLicense();
+    }
+}
+```
+
+### ❌ Incorrect
+
+```php
+<?php
+
+namespace App\Http\Controllers;
+
+class DashboardController extends Controller
+{
+    public function __invoke()
+    {
+        $displays = \App\Models\Display::where('status', 'active')->get();
+        $user = \App\Models\User::find(1);
+        $isValid = \App\Services\InstanceService::hasValidLicense();
+    }
+}
+```
+
+### Why?
+
+- **Readability**: Import statements make it clear which classes are used in a file
+- **Maintainability**: Easier to refactor and understand dependencies
+- **IDE Support**: Better autocomplete and navigation
+- **PSR Standards**: Follows PSR-12 coding standard
+- **Consistency**: Matches Laravel conventions
+
+### When to Use Fully Qualified Names
+
+Only use fully qualified class names (`\App\Models\...`) when:
+- There's a naming conflict that requires disambiguation
+- You're using a class from a different namespace that's not commonly imported
+
+In all other cases, use `use` statements at the top of the file.
+
diff --git a/backend/docs/WORKSPACE_SETUP.md b/backend/docs/WORKSPACE_SETUP.md
new file mode 100644
index 0000000..5b9e354
--- /dev/null
+++ b/backend/docs/WORKSPACE_SETUP.md
@@ -0,0 +1,111 @@
+# Workspace System Documentation
+
+## Overview
+
+The workspace system allows multiple users to collaborate on managing displays, devices, calendars, and rooms. Each user automatically gets their own workspace, and Pro users can invite colleagues to join their workspace.
+
+## Architecture
+
+### Models
+
+1. **Workspace** - Represents a team/workspace
+   - Has an `owner` (User)
+   - Has many `members` (Users with roles)
+   - Contains displays, devices, calendars, rooms
+
+2. **WorkspaceMember** - Pivot table linking users to workspaces
+   - Roles: `owner`, `admin`, `member`
+   - `owner` role is implicit for the workspace owner
+
+### Relationships
+
+- **User** → **Workspace** (one-to-many: owned workspaces)
+- **User** ↔ **Workspace** (many-to-many: member workspaces)
+- **Workspace** → **Display** (one-to-many)
+- **Workspace** → **Device** (one-to-many)
+- **Workspace** → **Calendar** (one-to-many)
+- **Workspace** → **Room** (one-to-many)
+
+## Migration Strategy
+
+1. **Existing Users**: Each user automatically gets a workspace created with their name
+2. **Existing Data**: All displays, devices, calendars, and rooms are migrated to the user's workspace
+3. **Backward Compatibility**: The `user_id` field is kept for backward compatibility
+
+## Permissions
+
+### Workspace Roles
+
+- **Owner**: Full control (can delete workspace, manage all members)
+- **Admin**: Can manage members and workspace settings
+- **Member**: Can view and use workspace resources
+
+### Display Access
+
+- Users can access displays they own directly (`user_id`)
+- Users can access displays in workspaces they're members of (`workspace_id`)
+- Device authentication checks workspace membership
+
+## Usage
+
+### Adding a Colleague
+
+1. Navigate to workspace settings (requires Pro)
+2. Enter colleague's email address
+3. Select role (admin or member)
+4. Colleague receives access to all workspace resources
+
+### Managing Members
+
+- **Add Member**: Only owners/admins can add members
+- **Update Role**: Change member role between admin/member
+- **Remove Member**: Remove access from workspace
+
+## API Changes
+
+### DisplayController
+
+- `index()` now returns displays from user's workspace(s)
+- Access checks include workspace membership
+
+### DisplayService
+
+- `validateDisplayPermission()` checks workspace membership
+- Pro features check workspace owner's Pro status
+
+## Frontend Changes Needed
+
+1. **Workspace Management UI**
+   - List workspaces
+   - View workspace members
+   - Add/remove members
+   - Update member roles
+
+2. **Display Creation**
+   - Automatically assign to user's primary workspace
+   - Allow selecting workspace (if user has multiple)
+
+3. **Device Connection**
+   - Connect code should work with workspace
+   - Devices inherit workspace from user
+
+## Migration Commands
+
+Run migrations in order:
+
+```bash
+php artisan migrate
+```
+
+The migration `2025_12_30_000003_create_workspaces_for_existing_users.php` will:
+1. Create a workspace for each existing user
+2. Migrate all user's displays, devices, calendars, and rooms to their workspace
+3. Add the user as an owner member
+
+## Notes
+
+- Pro subscription is required to add team members
+- Workspace owner cannot be removed
+- All existing functionality remains backward compatible
+- `user_id` fields are kept for direct ownership tracking
+
diff --git a/backend/resources/views/components/displays/table-row.blade.php b/backend/resources/views/components/displays/table-row.blade.php
new file mode 100644
index 0000000..e603051
--- /dev/null
+++ b/backend/resources/views/components/displays/table-row.blade.php
@@ -0,0 +1,114 @@
+@props(['display'])
+
+<tr>
+    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-0">
+        <div class="font-medium text-gray-900">{{ $display->name }}</div>
+        <div class="text-gray-500">{{ $display->display_name }}</div>
+    </td>
+    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+        <div class="flex flex-col gap-1">
+            @if($display->calendar->outlookAccount)
+                <div class="flex items-center">
+                    <x-icons.microsoft class="h-4 w-4 text-gray-900 mr-2" />
+                    <span class="text-gray-900">{{ $display->calendar->outlookAccount->name }}</span>
+                </div>
+            @endif
+            @if($display->calendar->googleAccount)
+                <div class="flex items-center">
+                    <x-icons.google class="h-4 w-4 text-gray-900 mr-2" />
+                    <span class="text-gray-900">{{ $display->calendar->googleAccount->name }}</span>
+                </div>
+            @endif
+            @if($display->calendar->caldavAccount)
+                <div class="flex items-center">
+                    <x-icons.calendar class="h-4 w-4 text-gray-900 mr-2" />
+                    <span class="text-gray-900">{{ $display->calendar->caldavAccount->name }}</span>
+                </div>
+            @endif
+            <div class="text-gray-500">{{ $display->calendar->name }}</div>
+        </div>
+    </td>
+    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+        <span class="inline-flex items-center rounded-md bg-{{ $display->status->color() }}-50 px-2 py-1 text-xs font-medium text-{{ $display->status->color() }}-700 ring-1 ring-inset ring-{{ $display->status->color() }}-600">
+            {{ $display->status->label() }}
+        </span>
+    </td>
+    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+        <div class="flex flex-col gap-1">
+            <div class="flex items-center gap-x-1.5">
+                @if($display->devices->isNotEmpty())
+                    <div class="flex-none rounded-full bg-emerald-500/20 p-1">
+                        <div class="h-2 w-2 rounded-full bg-emerald-500"></div>
+                    </div>
+                    <div class="group relative">
+                        <button type="button" class="flex items-center gap-x-1 text-sm text-gray-500 hover:text-gray-900">
+                            <span>{{ $display->devices->count() }} device{{ $display->devices->count() > 1 ? 's' : '' }}</span>
+                            <x-icons.information class="h-4 w-4 text-gray-400" />
+                        </button>
+                        <div class="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 hidden group-hover:block">
+                            <div class="rounded-md bg-gray-900 px-2 py-1 text-xs text-white shadow-lg">
+                                <div class="whitespace-nowrap">
+                                    @foreach($display->devices as $device)
+                                        <div class="flex items-center gap-x-1">
+                                            <span>{{ $device->name }}</span>
+                                            @if($device->last_activity_at)
+                                                <span class="text-gray-400">({{ $device->last_activity_at->diffForHumans() }})</span>
+                                            @endif
+                                        </div>
+                                    @endforeach
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @else
+                    <div class="flex-none rounded-full bg-gray-500/20 p-1">
+                        <div class="h-2 w-2 rounded-full bg-gray-500"></div>
+                    </div>
+                    <span class="text-gray-500">No devices</span>
+                @endif
+            </div>
+            @if($display->last_sync_at)
+                <div class="text-gray-400 text-xs">Last sync {{ $display->last_sync_at->diffForHumans() }}</div>
+            @endif
+        </div>
+    </td>
+    <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-0">
+        <div class="flex justify-end gap-x-2">
+            <form action="{{ route('displays.updateStatus', $display) }}" method="POST" class="inline">
+                @csrf
+                @method('PATCH')
+                <input type="hidden" name="status" value="{{ $display->status === \App\Enums\DisplayStatus::ACTIVE ? 'deactivated' : 'active' }}">
+                <button type="submit" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50">
+                    @if($display->status === \App\Enums\DisplayStatus::ACTIVE)
+                        <x-icons.pause class="h-4 w-4" />
+                    @else
+                        <x-icons.play class="h-4 w-4" />
+                    @endif
+                </button>
+            </form>
+            @if(auth()->user()->hasProForCurrentWorkspace())
+                <a href="{{ route('displays.customization', $display) }}" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-indigo-600 shadow-sm ring-1 ring-inset ring-indigo-300 hover:bg-indigo-50" title="Customize display (Pro)">
+                    <x-icons.brush class="h-4 w-4" />
+                </a>
+                <a href="{{ route('displays.settings.index', $display) }}" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-blue-600 shadow-sm ring-1 ring-inset ring-blue-300 hover:bg-blue-50" title="Display settings (Pro)">
+                    <x-icons.settings class="h-4 w-4" />
+                </a>
+            @else
+                <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to unlock customization">
+                    <x-icons.brush class="h-4 w-4" />
+                </span>
+                <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to unlock settings">
+                    <x-icons.settings class="h-4 w-4" />
+                </span>
+            @endif
+            <form action="{{ route('displays.delete', $display) }}" method="POST" class="inline" onsubmit="return confirm('Are you sure you want to delete this display?');">
+                @csrf
+                @method('DELETE')
+                <button type="submit" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-red-600 shadow-sm ring-1 ring-inset ring-red-300 hover:bg-red-50" title="Delete display">
+                    <x-icons.trash class="h-4 w-4" />
+                </button>
+            </form>
+        </div>
+    </td>
+</tr>
+
diff --git a/backend/resources/views/components/impersonation-banner.blade.php b/backend/resources/views/components/impersonation-banner.blade.php
new file mode 100644
index 0000000..26b1e1e
--- /dev/null
+++ b/backend/resources/views/components/impersonation-banner.blade.php
@@ -0,0 +1,20 @@
+@if(session('impersonating'))
+    <div class="bg-yellow-50 border-b border-yellow-200">
+        <div class="mx-auto container px-4 sm:px-6">
+            <div class="flex h-12 items-center justify-between px-4 sm:px-0">
+                <div class="flex items-center gap-2">
+                    <span class="text-sm font-medium text-yellow-800">
+                        ⚠️ You are impersonating {{ auth()->user()->email }}
+                    </span>
+                </div>
+                <form action="{{ route('admin.stop-impersonating') }}" method="POST" class="inline">
+                    @csrf
+                    <button type="submit" class="rounded-md bg-yellow-600 px-3 py-1.5 text-sm font-medium text-white hover:bg-yellow-700">
+                        Stop Impersonating
+                    </button>
+                </form>
+            </div>
+        </div>
+    </div>
+@endif
+
diff --git a/backend/resources/views/layouts/base.blade.php b/backend/resources/views/layouts/base.blade.php
index d752d3d..42ff7d4 100644
--- a/backend/resources/views/layouts/base.blade.php
+++ b/backend/resources/views/layouts/base.blade.php
@@ -8,12 +8,12 @@
                         <img class="h-7 w-7" src="/images/logo-black.svg" alt="Logo">
                     </div>
                     <span class="text-xl font-semibold text-black">Spacepad</span>
-                    @if(auth()->user()->hasPro())
+                    @if(auth()->user()->hasProForCurrentWorkspace())
                         <span class="ml-2 inline-flex items-center rounded-md bg-blue-50 px-1.5 py-0.5 text-sm font-medium text-blue-700 ring-1 ring-inset ring-blue-600">Pro</span>
                     @endif
                 </a>
                 <div class="ml-4 flex items-center space-x-4">
-                    @if(auth()->user()->isAdmin() && !config('settings.is_self_hosted'))
+                    @if(!session('impersonating') && auth()->user()->isAdmin() && !config('settings.is_self_hosted'))
                         <a href="{{ route('admin.index') }}" class="rounded-md px-3 py-2 text-sm font-medium text-gray-700 hover:bg-gray-300 hover:text-black">
                             Admin
                         </a>
diff --git a/backend/resources/views/layouts/blank.blade.php b/backend/resources/views/layouts/blank.blade.php
index 839adcc..c696c2c 100644
--- a/backend/resources/views/layouts/blank.blade.php
+++ b/backend/resources/views/layouts/blank.blade.php
@@ -33,6 +33,9 @@
     <body class="h-full @yield('body-classes')">
         @includeWhen(config('googletagmanager.enabled') && config('googletagmanager.id'), 'googletagmanager::body')
         @stack('modals')
+        
+        @include('components.impersonation-banner')
+        
         <div class="min-h-full bg-gray-50">
             @yield('page')
         </div>
diff --git a/backend/resources/views/pages/admin.blade.php b/backend/resources/views/pages/admin.blade.php
index 4cf449f..f29c0bd 100644
--- a/backend/resources/views/pages/admin.blade.php
+++ b/backend/resources/views/pages/admin.blade.php
@@ -3,10 +3,17 @@
 @section('title', 'Admin dashboard')
 
 @section('content')
-    <div x-data="{ activeTab: 'instances' }">
+    <div x-data="{ activeTab: 'users-overview' }">
         <!-- Tab Navigation -->
         <div class="border-b border-gray-200">
             <nav class="-mb-px flex space-x-8" aria-label="Tabs">
+                <button
+                    @click="activeTab = 'users-overview'"
+                    :class="activeTab === 'users-overview' ? 'border-blue-500 text-blue-600' : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700'"
+                    class="whitespace-nowrap border-b-2 py-4 px-1 text-sm font-medium"
+                >
+                    Users Overview
+                </button>
                 <button
                     @click="activeTab = 'instances'"
                     :class="activeTab === 'instances' ? 'border-blue-500 text-blue-600' : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700'"
@@ -310,5 +317,131 @@ class="whitespace-nowrap border-b-2 py-4 px-1 text-sm font-medium"
                 </div>
             </div>
         </div>
+
+        <!-- Tab 4: Users Overview -->
+        <div x-show="activeTab === 'users-overview'" x-transition:enter="transition ease-out duration-200" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100" x-transition:leave="transition ease-in duration-150" x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0">
+            <div class="mt-6 grid grid-cols-1 gap-6 sm:grid-cols-3">
+                <div class="bg-white overflow-hidden shadow rounded-lg">
+                    <div class="p-5 flex items-center">
+                        <div class="flex-shrink-0">
+                            <!-- Heroicon: Users (outline) -->
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-purple-500"><path stroke-linecap="round" stroke-linejoin="round" d="M15 19.128a9.38 9.38 0 002.625.372 9.337 9.337 0 004.121-.952 4.125 4.125 0 00-7.533-2.493M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 018.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0111.964-3.07M12 6.375a3.375 3.375 0 11-6.75 0 3.375 3.375 0 016.75 0zm8.25 2.25a2.625 2.625 0 11-5.25 0 2.625 2.625 0 015.25 0z" /></svg>
+                        </div>
+                        <div class="ml-5 w-0 flex-1">
+                            <dl>
+                                <dt class="text-sm font-medium text-gray-500 truncate">Total Users</dt>
+                                <dd class="mt-1 text-2xl font-semibold text-gray-900">{{ $allUsers->count() }}</dd>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+                <div class="bg-white overflow-hidden shadow rounded-lg">
+                    <div class="p-5 flex items-center">
+                        <div class="flex-shrink-0">
+                            <!-- Heroicon: UserCircle (outline) -->
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-blue-500"><path stroke-linecap="round" stroke-linejoin="round" d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z" /></svg>
+                        </div>
+                        <div class="ml-5 w-0 flex-1">
+                            <dl>
+                                <dt class="text-sm font-medium text-gray-500 truncate">Users with Displays</dt>
+                                <dd class="mt-1 text-2xl font-semibold text-gray-900">{{ $allUsers->filter(fn($u) => $u->displays_count > 0)->count() }}</dd>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+                <div class="bg-white overflow-hidden shadow rounded-lg">
+                    <div class="p-5 flex items-center">
+                        <div class="flex-shrink-0">
+                            <!-- Heroicon: CheckCircle (outline) -->
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="h-8 w-8 text-green-500"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                        </div>
+                        <div class="ml-5 w-0 flex-1">
+                            <dl>
+                                <dt class="text-sm font-medium text-gray-500 truncate">Pro Users</dt>
+                                <dd class="mt-1 text-2xl font-semibold text-gray-900">{{ $allUsers->filter(fn($u) => $u->hasPro())->count() }}</dd>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="mt-10">
+                <h2 class="text-xl font-bold mb-4">All Users</h2>
+                <div class="bg-white shadow rounded-lg p-6">
+                    <form method="GET" action="{{ route('admin.index') }}" class="mb-4">
+                        <input
+                            type="text"
+                            name="search"
+                            value="{{ request('search') }}"
+                            placeholder="Search by name or email..."
+                            class="block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm px-3 py-2 border"
+                        >
+                    </form>
+                    <div class="overflow-x-auto">
+                        <table class="min-w-full divide-y divide-gray-300">
+                            <thead>
+                            <tr>
+                                <th class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-0">Name</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Email</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Usage Type</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Displays</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Pro</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Registered</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Last Activity</th>
+                                <th class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Actions</th>
+                            </tr>
+                            </thead>
+                            <tbody class="divide-y divide-gray-200">
+                            @forelse($allUsers as $user)
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-0">{{ $user->name }}</td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{ $user->email }}</td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{ $user->usage_type?->label() ?? '-' }}</td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{ $user->displays_count }}</td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        @if($user->hasPro())
+                                            <span class="inline-flex items-center rounded-md bg-green-50 px-2 py-1 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20">Yes</span>
+                                        @else
+                                            <span class="inline-flex items-center rounded-md bg-gray-50 px-2 py-1 text-xs font-medium text-gray-700 ring-1 ring-inset ring-gray-600/20">No</span>
+                                        @endif
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{ $user->created_at->format('Y-m-d') }}</td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{ $user->last_activity_at ? $user->last_activity_at->format('Y-m-d') : 'Never' }}</td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <div class="flex items-center gap-2">
+                                            <a href="{{ route('admin.users.show', $user) }}" class="text-blue-600 hover:text-blue-900 font-medium">
+                                                View
+                                            </a>
+                                            <form action="{{ route('admin.users.impersonate', $user) }}" method="POST" class="inline">
+                                                @csrf
+                                                <button type="submit" class="text-purple-600 hover:text-purple-900 font-medium" onclick="return confirm('Are you sure you want to impersonate {{ $user->email }}?')">
+                                                    Impersonate
+                                                </button>
+                                            </form>
+                                        </div>
+                                    </td>
+                                </tr>
+                            @empty
+                                <tr>
+                                    <td colspan="8" class="py-8 text-center text-sm text-gray-500">
+                                        @if(request('search'))
+                                            No users found matching "{{ request('search') }}"
+                                        @else
+                                            No users found
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endforelse
+                            </tbody>
+                        </table>
+                    </div>
+                    @if($allUsers->hasPages())
+                        <div class="mt-6">
+                            {{ $allUsers->links('vendor.pagination.tailwind') }}
+                        </div>
+                    @endif
+                </div>
+            </div>
+        </div>
     </div>
 @endsection
diff --git a/backend/resources/views/pages/admin/user.blade.php b/backend/resources/views/pages/admin/user.blade.php
new file mode 100644
index 0000000..66ba6db
--- /dev/null
+++ b/backend/resources/views/pages/admin/user.blade.php
@@ -0,0 +1,208 @@
+@extends('layouts.base')
+@section('title', 'User Details - ' . $user->email)
+@section('container_class', 'max-w-4xl')
+
+@section('content')
+    <x-cards.card>
+        <div class="sm:flex sm:items-center mb-6">
+            <div class="sm:flex-auto">
+                <h1 class="text-lg font-semibold leading-6 text-gray-900">User Details</h1>
+                <p class="mt-1 text-sm text-gray-500">View and manage user account information</p>
+            </div>
+            <div class="mt-4 sm:ml-16 sm:mt-0 sm:flex-none">
+                <a href="{{ route('admin.index') }}" class="inline-flex items-center gap-x-1.5 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50">
+                    <x-icons.arrow-left class="h-4 w-4" />
+                    Back to Admin
+                </a>
+            </div>
+        </div>
+
+        @if(session('error'))
+            <div class="mb-6 bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded">
+                {{ session('error') }}
+            </div>
+        @endif
+
+        @if(session('success'))
+            <div class="mb-6 bg-green-50 border border-green-200 text-green-700 px-4 py-3 rounded">
+                {{ session('success') }}
+            </div>
+        @endif
+
+        <div class="space-y-6">
+            <div class="border border-gray-200 rounded-lg p-6">
+                <h3 class="text-base font-semibold text-gray-900 mb-4">Account Information</h3>
+                <dl class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Email</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->email }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Name</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->name }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">User ID</dt>
+                        <dd class="mt-1 text-sm text-gray-900 font-mono">{{ $user->id }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Usage Type</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->usage_type?->label() ?? 'Not set' }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Created</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->created_at->format('Y-m-d H:i:s') }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Last Activity</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->last_activity_at ? $user->last_activity_at->format('Y-m-d H:i:s') : 'Never' }}</dd>
+                    </div>
+                </dl>
+            </div>
+
+            @if($user->hasPro() || $subscriptionInfo)
+                <div class="border border-gray-200 rounded-lg p-6">
+                    <h3 class="text-base font-semibold text-gray-900 mb-4">Subscription Information</h3>
+                    <dl class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                        <div>
+                            <dt class="text-sm font-medium text-gray-500">Plan</dt>
+                            <dd class="mt-1">
+                                @if($user->is_unlimited)
+                                    <span class="inline-flex items-center rounded-md bg-green-50 px-2 py-1 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20">Unlimited</span>
+                                @elseif($subscriptionInfo)
+                                    <span class="inline-flex items-center rounded-md bg-blue-50 px-2 py-1 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-600/20">Pro</span>
+                                @else
+                                    <span class="inline-flex items-center rounded-md bg-gray-50 px-2 py-1 text-xs font-medium text-gray-700 ring-1 ring-inset ring-gray-600/20">Free</span>
+                                @endif
+                            </dd>
+                        </div>
+                        @if($subscriptionInfo)
+                            <div>
+                                <dt class="text-sm font-medium text-gray-500">Status</dt>
+                                <dd class="mt-1">
+                                    @php
+                                        $status = $subscriptionInfo['status'];
+                                        $statusLabel = ucwords(str_replace('_', ' ', $status));
+                                        $statusColors = match($status) {
+                                            'active' => 'bg-green-50 text-green-700 ring-green-600/20',
+                                            'past_due' => 'bg-yellow-50 text-yellow-700 ring-yellow-600/20',
+                                            'unpaid' => 'bg-red-50 text-red-700 ring-red-600/20',
+                                            'cancelled' => 'bg-gray-50 text-gray-700 ring-gray-600/20',
+                                            'on_trial' => 'bg-blue-50 text-blue-700 ring-blue-600/20',
+                                            'paused' => 'bg-orange-50 text-orange-700 ring-orange-600/20',
+                                            default => 'bg-gray-50 text-gray-700 ring-gray-600/20',
+                                        };
+                                    @endphp
+                                    <span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ring-1 ring-inset {{ $statusColors }}">
+                                        {{ $statusLabel }}
+                                    </span>
+                                </dd>
+                            </div>
+                            <div>
+                                <dt class="text-sm font-medium text-gray-500">Monthly Price</dt>
+                                <dd class="mt-1 text-sm text-gray-900">${{ number_format($subscriptionInfo['price'], 2) }}</dd>
+                            </div>
+                            <div>
+                                <dt class="text-sm font-medium text-gray-500">MRR</dt>
+                                <dd class="mt-1 text-sm text-gray-900">${{ number_format($subscriptionInfo['mrr'], 2) }}</dd>
+                            </div>
+                            @if($subscriptionInfo['ends_at'])
+                                <div>
+                                    <dt class="text-sm font-medium text-gray-500">Subscription Ends</dt>
+                                    <dd class="mt-1 text-sm text-gray-900">{{ \Carbon\Carbon::parse($subscriptionInfo['ends_at'])->format('Y-m-d') }}</dd>
+                                </div>
+                            @endif
+                        @endif
+                    </dl>
+                </div>
+            @endif
+
+            <div class="border border-gray-200 rounded-lg p-6">
+                <h3 class="text-base font-semibold text-gray-900 mb-4">Data Summary</h3>
+                <dl class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Outlook Accounts</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->outlookAccounts->count() }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Google Accounts</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->googleAccounts->count() }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">CalDAV Accounts</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->caldavAccounts->count() }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Displays</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->displays->count() }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Devices</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->devices->count() }}</dd>
+                    </div>
+                    <div>
+                        <dt class="text-sm font-medium text-gray-500">Workspaces</dt>
+                        <dd class="mt-1 text-sm text-gray-900">{{ $user->workspaces->count() }}</dd>
+                    </div>
+                </dl>
+            </div>
+
+            @if($user->id !== auth()->id())
+                <div class="border border-red-200 rounded-lg p-6 bg-red-50">
+                    <h3 class="text-base font-semibold text-red-900 mb-4">⚠️ Delete User Account</h3>
+                    <p class="text-sm text-red-800 mb-3">
+                        This action cannot be undone. All data associated with this user will be permanently deleted:
+                    </p>
+                    <ul class="text-sm text-red-800 list-disc list-inside space-y-1 mb-4">
+                        <li>All connected accounts (Outlook, Google, CalDAV)</li>
+                        <li>All displays and their settings</li>
+                        <li>All devices</li>
+                        <li>All calendars and events</li>
+                        <li>All rooms</li>
+                        <li>All workspace memberships</li>
+                        <li>All personal access tokens</li>
+                    </ul>
+
+                    <form action="{{ route('admin.users.delete', $user) }}" method="POST" class="mt-4">
+                        @csrf
+                        @method('DELETE')
+
+                        <div class="mb-4">
+                            <label for="confirm_email" class="block text-sm font-medium text-gray-700 mb-2">
+                                To confirm deletion, please type the user's email address:
+                            </label>
+                            <input
+                                type="email"
+                                id="confirm_email"
+                                name="confirm_email"
+                                required
+                                class="mt-1 px-3 py-2 block w-full border rounded-md border-gray-300 focus:border-red-500 focus:ring-red-500 sm:text-sm"
+                                placeholder="{{ $user->email }}"
+                            >
+                            @error('confirm_email')
+                                <p class="mt-1 text-sm text-red-600">{{ $message }}</p>
+                            @enderror
+                        </div>
+
+                        <div class="flex justify-end gap-x-3">
+                            <button
+                                type="submit"
+                                class="rounded-md bg-red-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-red-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600"
+                                onclick="return confirm('Are you absolutely sure you want to delete this user account? This action cannot be undone.')"
+                            >
+                                Permanently delete user
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            @else
+                <div class="border border-yellow-200 rounded-lg p-6 bg-yellow-50">
+                    <h3 class="text-base font-semibold text-yellow-900 mb-2">⚠️ Notice</h3>
+                    <p class="text-sm text-yellow-800">
+                        You cannot delete your own account. Please ask another admin to perform this action if needed.
+                    </p>
+                </div>
+            @endif
+        </div>
+    </x-cards.card>
+@endsection
diff --git a/backend/resources/views/pages/dashboard.blade.php b/backend/resources/views/pages/dashboard.blade.php
index 162f0a0..3ebab16 100644
--- a/backend/resources/views/pages/dashboard.blade.php
+++ b/backend/resources/views/pages/dashboard.blade.php
@@ -2,15 +2,42 @@
 @section('title', 'Management dashboard')
 
 @section('actions')
-    {{-- Instruction Banner --}}
-    @if(auth()->user()->hasAnyDisplay())
-        <div class="items-center flex ml-auto">
-            <div class="flex w-full border border-dashed rounded-lg p-4 border-gray-400">
-                <h3 class="text-sm font-semibold text-gray-900 mr-8">Connect code</h3>
-                <div class="max-w-xl text-sm text-gray-500 ml-auto">
-                    <p>{{ chunk_split($connectCode, 3, ' ') }}</p>
+    {{-- Workspace Selector and Connect Code --}}
+    @if($workspaces->count() > 1 || $connectCode)
+        <div class="items-center flex ml-auto gap-4">
+            @if($workspaces->count() > 1)
+                <form action="{{ route('workspaces.switch') }}" method="POST" id="workspace-switch-form">
+                    @csrf
+                    <div class="flex border border-dashed rounded-lg px-4 h-14 items-center border-gray-400">
+                        <label for="workspace-select" class="text-sm font-semibold text-gray-900 mr-4 flex items-center">Workspace</label>
+                        <select 
+                            id="workspace-select"
+                            name="workspace_id" 
+                            onchange="this.form.submit();"
+                            class="flex-1 text-sm font-medium text-gray-900 bg-transparent border bg-white rounded-lg p-1 focus:ring-0 focus:outline-none cursor-pointer"
+                        >
+                            @foreach($workspaces as $workspace)
+                                <option value="{{ $workspace->id }}" {{ ($selectedWorkspace?->id ?? $workspaces->first()->id) === $workspace->id ? 'selected' : '' }}>
+                                    {{ $workspace->name }}
+                                    @if($workspace->pivot->role === \App\Enums\WorkspaceRole::OWNER->value)
+                                        (Owner)
+                                    @elseif($workspace->pivot->role === \App\Enums\WorkspaceRole::ADMIN->value)
+                                        (Admin)
+                                    @endif
+                                </option>
+                            @endforeach
+                        </select>
+                    </div>
+                </form>
+            @endif
+            @if(auth()->user()->hasAnyDisplay() && $connectCode)
+                <div class="flex border border-dashed rounded-lg px-4 h-14 items-center border-gray-400">
+                    <h3 class="text-sm font-semibold text-gray-900 mr-8 flex items-center">Connect code</h3>
+                    <div class="flex-1 text-sm text-gray-500">
+                        <p class="font-mono">{{ chunk_split($connectCode, 3, ' ') }}</p>
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
     @endif
 @endsection
@@ -87,7 +114,7 @@ class="inline-flex items-center rounded-md bg-yellow-600 px-3 py-2 text-sm font-
     <x-modals.license-key />
 
     {{-- Commercial Banner --}}
-    @if(! auth()->user()->hasPro() && auth()->user()->hasAnyDisplay())
+    @if(! auth()->user()->hasProForCurrentWorkspace() && auth()->user()->hasAnyDisplay())
         <div class="mb-4 rounded-lg bg-indigo-50 border border-indigo-200 p-4 flex items-start gap-4">
             <div class="flex-shrink-0 mt-1">
                 <span class="inline-flex items-center justify-center h-10 w-10 rounded-full bg-indigo-100">
@@ -122,7 +149,9 @@ class="inline-flex items-center rounded-md bg-yellow-600 px-3 py-2 text-sm font-
             <div class="sm:flex sm:items-center mb-4">
                 <div class="sm:flex-auto">
                     <h2 class="text-lg font-semibold leading-6 text-gray-900">Displays</h2>
-                    <p class="mt-1 text-sm text-gray-500">Overview of your displays and their status.</p>
+                    <p class="mt-1 text-sm text-gray-500">
+                        Overview of your displays and their status.
+                    </p>
                 </div>
                 <div class="mt-4 sm:ml-16 sm:mt-0 sm:flex-none flex items-center gap-2">
                     @if(auth()->user()->hasAnyDisplay())
@@ -132,7 +161,7 @@ class="inline-flex items-center rounded-md bg-yellow-600 px-3 py-2 text-sm font-
                         </button>
                     @endif
                     @if(auth()->user()->can('create', \App\Models\Display::class))
-                        @if(auth()->user()->shouldUpgrade())
+                        @if(auth()->user()->shouldUpgradeForCurrentWorkspace())
                             <span class="inline-flex items-center rounded-md bg-gray-100 px-3 py-2 text-center text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to create more displays">
                                 <x-icons.plus class="h-5 w-5 mr-1" />
                                 Create new display <span class="ml-2 inline-flex items-center rounded-md bg-blue-50 px-1.5 py-0.5 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-600">Pro</span>
@@ -201,116 +230,7 @@ class="inline-flex items-center rounded-md bg-yellow-600 px-3 py-2 text-sm font-
                             </thead>
                             <tbody class="divide-y divide-gray-200" id="displays-table">
                             @forelse($displays as $display)
-                                <tr>
-                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-0">
-                                        <div class="font-medium text-gray-900">{{ $display->name }}</div>
-                                        <div class="text-gray-500">{{ $display->calendar->name }}</div>
-                                    </td>
-                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                        <div class="flex flex-col gap-1">
-                                            @if($display->calendar->outlookAccount)
-                                                <div class="flex items-center">
-                                                    <x-icons.microsoft class="h-4 w-4 text-gray-900 mr-2" />
-                                                    <span class="text-gray-900">{{ $display->calendar->outlookAccount->name }}</span>
-                                                </div>
-                                            @endif
-                                            @if($display->calendar->googleAccount)
-                                                <div class="flex items-center">
-                                                    <x-icons.google class="h-4 w-4 text-gray-900 mr-2" />
-                                                    <span class="text-gray-900">{{ $display->calendar->googleAccount->name }}</span>
-                                                </div>
-                                            @endif
-                                            @if($display->calendar->caldavAccount)
-                                                <div class="flex items-center">
-                                                    <x-icons.calendar class="h-4 w-4 text-gray-900 mr-2" />
-                                                    <span class="text-gray-900">{{ $display->calendar->caldavAccount->name }}</span>
-                                                </div>
-                                            @endif
-                                        </div>
-                                    </td>
-                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                        <span class="inline-flex items-center rounded-md bg-{{ $display->status->color() }}-50 px-2 py-1 text-xs font-medium text-{{ $display->status->color() }}-700 ring-1 ring-inset ring-{{ $display->status->color() }}-600">
-                                            {{ $display->status->label() }}
-                                        </span>
-                                    </td>
-                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                        <div class="flex flex-col gap-1">
-                                            <div class="flex items-center gap-x-1.5">
-                                                @if($display->devices->isNotEmpty())
-                                                    <div class="flex-none rounded-full bg-emerald-500/20 p-1">
-                                                        <div class="h-2 w-2 rounded-full bg-emerald-500"></div>
-                                                    </div>
-                                                    <div class="group relative">
-                                                        <button type="button" class="flex items-center gap-x-1 text-sm text-gray-500 hover:text-gray-900">
-                                                            <span>{{ $display->devices->count() }} device{{ $display->devices->count() > 1 ? 's' : '' }}</span>
-                                                            <x-icons.information class="h-4 w-4 text-gray-400" />
-                                                        </button>
-                                                        <div class="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 hidden group-hover:block">
-                                                            <div class="rounded-md bg-gray-900 px-2 py-1 text-xs text-white shadow-lg">
-                                                                <div class="whitespace-nowrap">
-                                                                    @foreach($display->devices as $device)
-                                                                        <div class="flex items-center gap-x-1">
-                                                                            <span>{{ $device->name }}</span>
-                                                                            @if($device->last_activity_at)
-                                                                                <span class="text-gray-400">({{ $device->last_activity_at->diffForHumans() }})</span>
-                                                                            @endif
-                                                                        </div>
-                                                                    @endforeach
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                @else
-                                                    <div class="flex-none rounded-full bg-gray-500/20 p-1">
-                                                        <div class="h-2 w-2 rounded-full bg-gray-500"></div>
-                                                    </div>
-                                                    <span class="text-gray-500">No devices</span>
-                                                @endif
-                                            </div>
-                                            @if($display->last_sync_at)
-                                                <div class="text-gray-400 text-xs">Last sync {{ $display->last_sync_at->diffForHumans() }}</div>
-                                            @endif
-                                        </div>
-                                    </td>
-                                    <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-0">
-                                        <div class="flex justify-end gap-x-2">
-                                            <form action="{{ route('displays.updateStatus', $display) }}" method="POST" class="inline">
-                                                @csrf
-                                                @method('PATCH')
-                                                <input type="hidden" name="status" value="{{ $display->status === \App\Enums\DisplayStatus::ACTIVE ? 'deactivated' : 'active' }}">
-                                                <button type="submit" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50">
-                                                    @if($display->status === \App\Enums\DisplayStatus::ACTIVE)
-                                                        <x-icons.pause class="h-4 w-4" />
-                                                    @else
-                                                        <x-icons.play class="h-4 w-4" />
-                                                    @endif
-                                                </button>
-                                            </form>
-                                            @if(auth()->user()->hasPro())
-                                                <a href="{{ route('displays.customization', $display) }}" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-indigo-600 shadow-sm ring-1 ring-inset ring-indigo-300 hover:bg-indigo-50" title="Customize display (Pro)">
-                                                    <x-icons.brush class="h-4 w-4" />
-                                                </a>
-                                                <a href="{{ route('displays.settings.index', $display) }}" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-blue-600 shadow-sm ring-1 ring-inset ring-blue-300 hover:bg-blue-50" title="Display settings (Pro)">
-                                                    <x-icons.settings class="h-4 w-4" />
-                                                </a>
-                                            @else
-                                                <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to unlock customization">
-                                                    <x-icons.brush class="h-4 w-4" />
-                                                </span>
-                                                <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to unlock settings">
-                                                    <x-icons.settings class="h-4 w-4" />
-                                                </span>
-                                            @endif
-                                            <form action="{{ route('displays.delete', $display) }}" method="POST" class="inline">
-                                                @csrf
-                                                @method('DELETE')
-                                                <button type="submit" class="inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-red-600 shadow-sm ring-1 ring-inset ring-red-300 hover:bg-red-50">
-                                                    <x-icons.trash class="h-4 w-4" />
-                                                </button>
-                                            </form>
-                                        </div>
-                                    </td>
-                                </tr>
+                                <x-displays.table-row :display="$display" />
                             @empty
                                 <tr>
                                     <td colspan="5" class="py-16 text-center">
@@ -320,17 +240,18 @@ class="inline-flex items-center rounded-md bg-yellow-600 px-3 py-2 text-sm font-
                                                 One more step and you're set up
                                             </h3>
                                             <p class="mb-6 text-sm text-gray-500 max-w-sm">Pick the calendar or room you would like to synchronize. You are able to connect multiple tablets to one display.</p>
-                                            @if(! $isSelfHosted && auth()->user()->shouldUpgrade())
+                                            @if(! $isSelfHosted && auth()->user()->shouldUpgradeForCurrentWorkspace())
                                                 <span class="inline-flex items-center rounded-md bg-gray-100 px-3 py-2 text-center text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to create more displays">
                                                     <x-icons.plus class="h-5 w-5 mr-1" /> Create new display <span class="ml-2 inline-flex items-center rounded-md bg-blue-50 px-1.5 py-0.5 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-600">Pro</span>
                                                 </span>
-                                            @elseif($isSelfHosted && auth()->user()->shouldUpgrade())
+                                            @elseif($isSelfHosted && auth()->user()->shouldUpgradeForCurrentWorkspace())
                                                 <span class="inline-flex items-center rounded-md bg-gray-100 px-3 py-2 text-center text-sm font-semibold text-gray-400 shadow-sm ring-1 ring-inset ring-gray-200 cursor-not-allowed" title="Upgrade to Pro to create more displays">
                                                     <x-icons.plus class="h-5 w-5 mr-1" /> Create new display <span class="ml-2 inline-flex items-center rounded-md bg-blue-50 px-1.5 py-0.5 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-600">Pro</span>
                                                 </span>
                                             @else
                                                 <a href="{{ route('displays.create') }}" class="inline-flex items-center rounded-md bg-oxford px-3 py-2 text-center text-sm font-semibold text-white">
-                                                    <x-icons.plus class="h-5 w-5 mr-1" /> Create new display
+                                                    <x-icons.plus class="h-5 w-5 mr-1" />
+                                                    Create new display
                                                 </a>
                                             @endif
                                         </div>
@@ -519,6 +440,25 @@ class="grow flex items-center justify-center gap-3 rounded-lg border border-gray
             </div>
         </x-cards.card>
     </div>
+
+    {{-- Server Info (Self-hosted only) --}}
+    @if($isSelfHosted)
+        <div class="mt-8 flex flex-wrap items-center gap-3 text-sm text-gray-500">
+            <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-xs font-medium text-gray-600">
+                Self-hosted
+            </span>
+            @if($version)
+                <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-xs font-medium text-gray-600">
+                    v{{ $version }}
+                </span>
+            @endif
+            @if($appUrl)
+                <span class="inline-flex items-center rounded-md bg-gray-100 px-2.5 py-1.5 text-xs font-medium text-gray-600">
+                    {{ parse_url($appUrl, PHP_URL_HOST) }} ({{ $appEnv }})
+                </span>
+            @endif
+        </div>
+    @endif
 @endsection
 
 @push('scripts')
@@ -562,6 +502,7 @@ function closeConnectModal() {
                 }));
             });
         @endif
+
     </script>
 @endpush
 
diff --git a/backend/resources/views/pages/displays/create.blade.php b/backend/resources/views/pages/displays/create.blade.php
index 8ca07cb..5608afe 100644
--- a/backend/resources/views/pages/displays/create.blade.php
+++ b/backend/resources/views/pages/displays/create.blade.php
@@ -5,7 +5,7 @@
     @php
         $isSelfHosted = config('settings.is_self_hosted');
         $checkout = auth()->user()->getCheckoutUrl(route('displays.create'));
-        $userHasPro = auth()->user()->hasPro();
+        $userHasPro = auth()->user()->hasProForCurrentWorkspace();
     @endphp
 
     {{-- License Key Modal --}}
@@ -41,6 +41,29 @@ class="block w-full rounded-md border-0 py-1.5 px-3 text-gray-900 shadow-sm ring
                         </div>
                     </div>
 
+                    @if($workspaces->count() > 1)
+                        <div class="mb-4">
+                            <label for="workspace_id" class="block text-sm font-medium leading-6 text-gray-900">Workspace</label>
+                            <div class="mt-2">
+                                <select name="workspace_id" id="workspace_id" class="block w-full rounded-md border-0 py-1.5 px-3 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6">
+                                    @foreach($workspaces as $workspace)
+                                        <option value="{{ $workspace->id }}" {{ $workspace->id === $defaultWorkspace?->id ? 'selected' : '' }}>
+                                            {{ $workspace->name }}
+                                            @if($workspace->pivot->role === \App\Enums\WorkspaceRole::OWNER->value)
+                                                (Owner)
+                                            @elseif($workspace->pivot->role === \App\Enums\WorkspaceRole::ADMIN->value)
+                                                (Admin)
+                                            @endif
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
+                            <p class="mt-2 text-sm text-gray-500">Select which workspace this display should belong to.</p>
+                        </div>
+                    @else
+                        <input type="hidden" name="workspace_id" value="{{ $defaultWorkspace?->id }}">
+                    @endif
+
                     <!-- Step 1: Provider Selection -->
                     <div class="mt-4" id="providerSelection">
                         <p class="text-sm font-semibold leading-6 text-gray-900">1. Select a calendar account</p>
diff --git a/backend/resources/views/pages/displays/customization.blade.php b/backend/resources/views/pages/displays/customization.blade.php
index 67c868e..c2c87af 100644
--- a/backend/resources/views/pages/displays/customization.blade.php
+++ b/backend/resources/views/pages/displays/customization.blade.php
@@ -3,7 +3,7 @@
 @section('container_class', 'max-w-2xl')
 
 @section('content')
-    @if(!auth()->user()->hasPro())
+    @if(!auth()->user()->hasProForCurrentWorkspace())
         <x-cards.card>
             <div class="text-center py-12">
                 <x-icons.settings class="h-12 w-12 text-gray-400 mx-auto mb-4" />
diff --git a/backend/resources/views/pages/displays/settings.blade.php b/backend/resources/views/pages/displays/settings.blade.php
index ac0eac5..3e05d86 100644
--- a/backend/resources/views/pages/displays/settings.blade.php
+++ b/backend/resources/views/pages/displays/settings.blade.php
@@ -3,7 +3,7 @@
 @section('container_class', 'max-w-2xl')
 
 @section('content')
-    @if(!auth()->user()->hasPro())
+    @if(!auth()->user()->hasProForCurrentWorkspace())
         <x-cards.card>
             <div class="text-center py-12">
                 <x-icons.settings class="h-12 w-12 text-gray-400 mx-auto mb-4" />
diff --git a/backend/resources/views/vendor/pagination/tailwind.blade.php b/backend/resources/views/vendor/pagination/tailwind.blade.php
new file mode 100644
index 0000000..28274a9
--- /dev/null
+++ b/backend/resources/views/vendor/pagination/tailwind.blade.php
@@ -0,0 +1,107 @@
+@if ($paginator->hasPages())
+    <nav role="navigation" aria-label="Pagination Navigation" class="flex items-center justify-between">
+        <div class="flex justify-between flex-1 sm:hidden">
+            @if ($paginator->onFirstPage())
+                <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
+                    {!! __('pagination.previous') !!}
+                </span>
+            @else
+                <a href="{{ $paginator->previousPageUrl() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                    {!! __('pagination.previous') !!}
+                </a>
+            @endif
+
+            @if ($paginator->hasMorePages())
+                <a href="{{ $paginator->nextPageUrl() }}" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                    {!! __('pagination.next') !!}
+                </a>
+            @else
+                <span class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
+                    {!! __('pagination.next') !!}
+                </span>
+            @endif
+        </div>
+
+        <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+            <div>
+                <p class="text-sm text-gray-700 leading-5">
+                    {!! __('Showing') !!}
+                    @if ($paginator->firstItem())
+                        <span class="font-medium">{{ $paginator->firstItem() }}</span>
+                        {!! __('to') !!}
+                        <span class="font-medium">{{ $paginator->lastItem() }}</span>
+                    @else
+                        {{ $paginator->count() }}
+                    @endif
+                    {!! __('of') !!}
+                    <span class="font-medium">{{ $paginator->total() }}</span>
+                    {!! __('results') !!}
+                </p>
+            </div>
+
+            <div>
+                <span class="relative z-0 inline-flex shadow-sm rounded-md">
+                    {{-- Previous Page Link --}}
+                    @if ($paginator->onFirstPage())
+                        <span aria-disabled="true" aria-label="{{ __('pagination.previous') }}">
+                            <span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-l-md leading-5" aria-hidden="true">
+                                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                                    <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg>
+                            </span>
+                        </span>
+                    @else
+                        <a href="{{ $paginator->previousPageUrl() }}" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.previous') }}">
+                            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                                <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                            </svg>
+                        </a>
+                    @endif
+
+                    {{-- Pagination Elements --}}
+                    @foreach ($elements as $element)
+                        {{-- "Three Dots" Separator --}}
+                        @if (is_string($element))
+                            <span aria-disabled="true">
+                                <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 cursor-default leading-5">{{ $element }}</span>
+                            </span>
+                        @endif
+
+                        {{-- Array Of Links --}}
+                        @if (is_array($element))
+                            @foreach ($element as $page => $url)
+                                @if ($page == $paginator->currentPage())
+                                    <span aria-current="page">
+                                        <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-blue-600 bg-blue-50 border border-blue-500 cursor-default leading-5">{{ $page }}</span>
+                                    </span>
+                                @else
+                                    <a href="{{ $url }}" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
+                                        {{ $page }}
+                                    </a>
+                                @endif
+                            @endforeach
+                        @endif
+                    @endforeach
+
+                    {{-- Next Page Link --}}
+                    @if ($paginator->hasMorePages())
+                        <a href="{{ $paginator->nextPageUrl() }}" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.next') }}">
+                            <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                                <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                            </svg>
+                        </a>
+                    @else
+                        <span aria-disabled="true" aria-label="{{ __('pagination.next') }}">
+                            <span class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-r-md leading-5" aria-hidden="true">
+                                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                                    <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                </svg>
+                            </span>
+                        </span>
+                    @endif
+                </span>
+            </div>
+        </div>
+    </nav>
+@endif
+
diff --git a/backend/routes/web.php b/backend/routes/web.php
index 04d1051..023ee3b 100644
--- a/backend/routes/web.php
+++ b/backend/routes/web.php
@@ -17,6 +17,7 @@
 use App\Http\Controllers\LicenseController;
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\AdminController;
+use App\Http\Controllers\WorkspaceController;
 
 Route::get('/login', [LoginController::class, 'create'])
     ->middleware('guest')
@@ -99,6 +100,8 @@
 
     Route::post('/license/validate', [LicenseController::class, 'validateLicense'])->name('license.validate');
 
+    Route::post('/workspaces/switch', [WorkspaceController::class, 'switch'])->name('workspaces.switch');
+
     Route::get('/billing/thanks', function () {
         \Spatie\GoogleTagManager\GoogleTagManagerFacade::flashPush([
             'event' => 'purchase',
@@ -116,6 +119,10 @@
     })->name('billing.thanks');
 
     Route::get('/admin', [AdminController::class, 'index'])->name('admin.index');
+    Route::get('/admin/users/{user}', [AdminController::class, 'showUser'])->name('admin.users.show');
+    Route::delete('/admin/users/{user}', [AdminController::class, 'deleteUser'])->name('admin.users.delete');
+    Route::post('/admin/users/{user}/impersonate', [AdminController::class, 'impersonate'])->name('admin.users.impersonate');
+    Route::post('/admin/stop-impersonating', [AdminController::class, 'stopImpersonating'])->name('admin.stop-impersonating');
 
     // Display image serving route
     Route::get('/displays/{display}/images/{type}', [DisplaySettingsController::class, 'serveImage'])
diff --git a/backend/tests/Feature/API/EventControllerTest.php b/backend/tests/Feature/API/EventControllerTest.php
index 9218d5f..407cf15 100644
--- a/backend/tests/Feature/API/EventControllerTest.php
+++ b/backend/tests/Feature/API/EventControllerTest.php
@@ -16,11 +16,18 @@
 
 beforeEach(function () {
     $this->user = User::factory()->create();
-    $this->device = Device::factory()->create(['user_id' => $this->user->id]);
+    // User boot method automatically creates a workspace, get the primary workspace
+    $this->workspace = $this->user->primaryWorkspace();
+    
+    $this->device = Device::factory()->create([
+        'user_id' => $this->user->id,
+        'workspace_id' => $this->workspace->id,
+    ]);
 
     // Create calendar first
     $this->calendar = Calendar::factory()->create([
         'user_id' => $this->user->id,
+        'workspace_id' => $this->workspace->id,
         'calendar_id' => 'test@example.com',
         'name' => 'Test Calendar'
     ]);
@@ -28,6 +35,7 @@
     // Then create display with calendar
     $this->display = Display::factory()->create([
         'user_id' => $this->user->id,
+        'workspace_id' => $this->workspace->id,
         'calendar_id' => $this->calendar->id,
         'status' => 'active'
     ]);
@@ -58,6 +66,7 @@
     $outlookAccount = OutlookAccount::factory()->create(['user_id' => $this->user->id]);
     Room::factory()->create([
         'user_id' => $this->user->id,
+        'workspace_id' => $this->workspace->id,
         'calendar_id' => $this->calendar->id,
         'email_address' => 'test@example.com'
     ]);
@@ -128,6 +137,7 @@
     $googleAccount = GoogleAccount::factory()->create(['user_id' => $this->user->id]);
     Room::factory()->create([
         'user_id' => $this->user->id,
+        'workspace_id' => $this->workspace->id,
         'calendar_id' => $this->calendar->id,
         'email_address' => 'test@example.com'
     ]);
@@ -254,6 +264,7 @@
     $outlookAccount = OutlookAccount::factory()->create(['user_id' => $this->user->id]);
     Room::factory()->create([
         'user_id' => $this->user->id,
+        'workspace_id' => $this->workspace->id,
         'calendar_id' => $this->calendar->id,
         'email_address' => 'test@example.com'
     ]);
diff --git a/backend/tests/Feature/DisplaySettingsApiTest.php b/backend/tests/Feature/DisplaySettingsApiTest.php
index 1f65ccb..a508782 100644
--- a/backend/tests/Feature/DisplaySettingsApiTest.php
+++ b/backend/tests/Feature/DisplaySettingsApiTest.php
@@ -19,9 +19,17 @@ public function test_display_api_includes_settings()
         $user = User::factory()->create([
             'usage_type' => UsageType::PERSONAL,
         ]);
+        $workspace = $user->primaryWorkspace();
 
-        $display = Display::factory()->create(['user_id' => $user->id]);
-        $device = Device::factory()->create(['user_id' => $user->id, 'display_id' => $display->id]);
+        $display = Display::factory()->create([
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+        ]);
+        $device = Device::factory()->create([
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+            'display_id' => $display->id,
+        ]);
 
         // Set some display settings
         DisplaySettings::setCheckInEnabled($display, true);
@@ -54,9 +62,17 @@ public function test_display_api_includes_default_settings_when_none_set()
         $user = User::factory()->create([
             'usage_type' => UsageType::PERSONAL,
         ]);
+        $workspace = $user->primaryWorkspace();
 
-        $display = Display::factory()->create(['user_id' => $user->id]);
-        $device = Device::factory()->create(['user_id' => $user->id, 'display_id' => $display->id]);
+        $display = Display::factory()->create([
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+        ]);
+        $device = Device::factory()->create([
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+            'display_id' => $display->id,
+        ]);
 
         $response = $this->actingAs($device)
             ->getJson('/api/displays');
@@ -73,9 +89,17 @@ public function test_display_settings_are_encrypted_in_database()
         $user = User::factory()->create([
             'usage_type' => UsageType::PERSONAL,
         ]);
+        $workspace = $user->primaryWorkspace();
 
-        $display = Display::factory()->create(['user_id' => $user->id]);
-        Device::factory()->create(['user_id' => $user->id, 'display_id' => $display->id]);
+        $display = Display::factory()->create([
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+        ]);
+        Device::factory()->create([
+            'user_id' => $user->id,
+            'workspace_id' => $workspace->id,
+            'display_id' => $display->id,
+        ]);
 
         // Set display settings
         DisplaySettings::setCheckInEnabled($display, true);
diff --git a/backend/tests/Unit/DisplaySettingsTest.php b/backend/tests/Unit/DisplaySettingsTest.php
index 8ece9d3..8d95986 100644
--- a/backend/tests/Unit/DisplaySettingsTest.php
+++ b/backend/tests/Unit/DisplaySettingsTest.php
@@ -12,7 +12,11 @@
 
 test('display settings helper can get and set boolean values', function () {
     $user = User::factory()->create();
-    $display = Display::factory()->create(['user_id' => $user->id]);
+    $workspace = $user->primaryWorkspace();
+    $display = Display::factory()->create([
+        'user_id' => $user->id,
+        'workspace_id' => $workspace->id,
+    ]);
     
     // Test setting check-in enabled
     expect(DisplaySettings::setCheckInEnabled($display, true))->toBeTrue();
@@ -23,14 +27,21 @@
     expect(DisplaySettings::isBookingEnabled($display))->toBeTrue();
     
     // Test default values
-    $newDisplay = Display::factory()->create(['user_id' => $user->id]);
+    $newDisplay = Display::factory()->create([
+        'user_id' => $user->id,
+        'workspace_id' => $workspace->id,
+    ]);
     expect(DisplaySettings::isCheckInEnabled($newDisplay))->toBeFalse();
     expect(DisplaySettings::isBookingEnabled($newDisplay))->toBeFalse();
 });
 
 test('display model convenience methods work correctly', function () {
     $user = User::factory()->create();
-    $display = Display::factory()->create(['user_id' => $user->id]);
+    $workspace = $user->primaryWorkspace();
+    $display = Display::factory()->create([
+        'user_id' => $user->id,
+        'workspace_id' => $workspace->id,
+    ]);
     
     // Test default values
     expect($display->isCheckInEnabled())->toBeFalse();
@@ -47,7 +58,11 @@
 
 test('display settings can be retrieved as array', function () {
     $user = User::factory()->create();
-    $display = Display::factory()->create(['user_id' => $user->id]);
+    $workspace = $user->primaryWorkspace();
+    $display = Display::factory()->create([
+        'user_id' => $user->id,
+        'workspace_id' => $workspace->id,
+    ]);
     
     // Set some settings
     DisplaySettings::setCheckInEnabled($display, true);