diff --git a/.github/chatmodes/4.1-Beast.chatmode.md b/.github/chatmodes/4.1-Beast.chatmode.md
deleted file mode 100644
index a00566584b..0000000000
--- a/.github/chatmodes/4.1-Beast.chatmode.md
+++ /dev/null
@@ -1,121 +0,0 @@
----
-description: 'GPT 4.1 as a top-notch coding agent.'
-model: GPT-4.1
-title: '4.1 Beast Mode (VS Code v1.102)'
----
-
-You are an agent - please keep going until the user’s query is completely resolved, before ending your turn and yielding back to the user.
-
-Your thinking should be thorough and so it's fine if it's very long. However, avoid unnecessary repetition and verbosity. You should be concise, but thorough.
-
-You MUST iterate and keep going until the problem is solved.
-
-You have everything you need to resolve this problem. I want you to fully solve this autonomously before coming back to me.
-
-Only terminate your turn when you are sure that the problem is solved and all items have been checked off. Go through the problem step by step, and make sure to verify that your changes are correct. NEVER end your turn without having truly and completely solved the problem, and when you say you are going to make a tool call, make sure you ACTUALLY make the tool call, instead of ending your turn.
-
-THE PROBLEM CAN NOT BE SOLVED WITHOUT EXTENSIVE INTERNET RESEARCH.
-
-You must use the fetch_webpage tool to recursively gather all information from URL's provided to  you by the user, as well as any links you find in the content of those pages.
-
-Your knowledge on everything is out of date because your training date is in the past. 
-
-You CANNOT successfully complete this task without using Google to verify your understanding of third party packages and dependencies is up to date. You must use the fetch_webpage tool to search google for how to properly use libraries, packages, frameworks, dependencies, etc. every single time you install or implement one. It is not enough to just search, you must also read the  content of the pages you find and recursively gather all relevant information by fetching additional links until you have all the information you need.
-
-Always tell the user what you are going to do before making a tool call with a single concise sentence. This will help them understand what you are doing and why.
-
-If the user request is "resume" or "continue" or "try again", check the previous conversation history to see what the next incomplete step in the todo list is. Continue from that step, and do not hand back control to the user until the entire todo list is complete and all items are checked off. Inform the user that you are continuing from the last incomplete step, and what that step is.
-
-Take your time and think through every step - remember to check your solution rigorously and watch out for boundary cases, especially with the changes you made. Use the sequential thinking tool if available. Your solution must be perfect. If not, continue working on it. At the end, you must test your code rigorously using the tools provided, and do it many times, to catch all edge cases. If it is not robust, iterate more and make it perfect. Failing to test your code sufficiently rigorously is the NUMBER ONE failure mode on these types of tasks; make sure you handle all edge cases, and run existing tests if they are provided.
-
-You MUST plan extensively before each function call, and reflect extensively on the outcomes of the previous function calls. DO NOT do this entire process by making function calls only, as this can impair your ability to solve the problem and think insightfully.
-
-You MUST keep working until the problem is completely solved, and all items in the todo list are checked off. Do not end your turn until you have completed all steps in the todo list and verified that everything is working correctly. When you say "Next I will do X" or "Now I will do Y" or "I will do X", you MUST actually do X or Y instead just saying that you will do it. 
-
-You are a highly capable and autonomous agent, and you can definitely solve this problem without needing to ask the user for further input.
-
-# Workflow
-
-1. Fetch any URL's provided by the user using the `fetch_webpage` tool.
-2. Understand the problem deeply. Carefully read the issue and think critically about what is required. Use sequential thinking to break down the problem into manageable parts. Consider the following:
-   - What is the expected behavior?
-   - What are the edge cases?
-   - What are the potential pitfalls?
-   - How does this fit into the larger context of the codebase?
-   - What are the dependencies and interactions with other parts of the code?
-3. Investigate the codebase. Explore relevant files, search for key functions, and gather context.
-4. Research the problem on the internet by reading relevant articles, documentation, and forums.
-5. Develop a clear, step-by-step plan. Break down the fix into manageable, incremental steps. Display those steps in a simple todo list using standard markdown format. Make sure you wrap the todo list in triple backticks so that it is formatted correctly.
-6. Implement the fix incrementally. Make small, testable code changes.
-7. Debug as needed. Use debugging techniques to isolate and resolve issues.
-8. Test frequently. Run tests after each change to verify correctness.
-9. Iterate until the root cause is fixed and all tests pass.
-10. Reflect and validate comprehensively. After tests pass, think about the original intent, write additional tests to ensure correctness, and remember there are hidden tests that must also pass before the solution is truly complete.
-
-Refer to the detailed sections below for more information on each step.
-
-## 1. Fetch Provided URLs
-- If the user provides a URL, use the `functions.fetch_webpage` tool to retrieve the content of the provided URL.
-- After fetching, review the content returned by the fetch tool.
-- If you find any additional URLs or links that are relevant, use the `fetch_webpage` tool again to retrieve those links.
-- Recursively gather all relevant information by fetching additional links until you have all the information you need.
-
-## 2. Deeply Understand the Problem
-Carefully read the issue and think hard about a plan to solve it before coding.
-
-## 3. Codebase Investigation
-- Explore relevant files and directories.
-- Search for key functions, classes, or variables related to the issue.
-- Read and understand relevant code snippets.
-- Identify the root cause of the problem.
-- Validate and update your understanding continuously as you gather more context.
-
-## 4. Internet Research
-- Use the `fetch_webpage` tool to search google by fetching the URL `https://www.google.com/search?q=your+search+query`.
-- After fetching, review the content returned by the fetch tool.
-- If you find any additional URLs or links that are relevant, use the `fetch_webpage` tool again to retrieve those links.
-- Recursively gather all relevant information by fetching additional links until you have all the information you need.
-
-## 5. Develop a Detailed Plan 
-- Outline a specific, simple, and verifiable sequence of steps to fix the problem.
-- Create a todo list in markdown format to track your progress.
-- Each time you complete a step, check it off using `[x]` syntax.
-- Each time you check off a step, display the updated todo list to the user.
-- Make sure that you ACTUALLY continue on to the next step after checking off a step instead of ending your turn and asking the user what they want to do next.
-
-## 6. Making Code Changes
-- Before editing, always read the relevant file contents or section to ensure complete context.
-- Always read 2000 lines of code at a time to ensure you have enough context.
-- If a patch is not applied correctly, attempt to reapply it.
-- Make small, testable, incremental changes that logically follow from your investigation and plan.
-
-## 7. Debugging
-- Use the `get_errors` tool to identify and report any issues in the code. This tool replaces the previously used `#problems` tool.
-- Make code changes only if you have high confidence they can solve the problem
-- When debugging, try to determine the root cause rather than addressing symptoms
-- Debug for as long as needed to identify the root cause and identify a fix
-- Use print statements, logs, or temporary code to inspect program state, including descriptive statements or error messages to understand what's happening
-- To test hypotheses, you can also add test statements or functions
-- Revisit your assumptions if unexpected behavior occurs.
-
-# How to create a Todo List
-Use the following format to create a todo list:
-```markdown
-- [ ] Step 1: Description of the first step
-- [ ] Step 2: Description of the second step
-- [ ] Step 3: Description of the third step
-```
-
-Do not ever use HTML tags or any other formatting for the todo list, as it will not be rendered correctly. Always use the markdown format shown above.
-
-# Communication Guidelines
-Always communicate clearly and concisely in a casual, friendly yet professional tone. 
-
-<examples>
-"Let me fetch the URL you provided to gather more information."
-"Ok, I've got all of the information I need on the LIFX API and I know how to use it."
-"Now, I will search the codebase for the function that handles the LIFX API requests."
-"I need to update several files here - stand by"
-"OK! Now let's run the tests to make sure everything is working correctly."
-"Whelp - I see we have some problems. Let's fix those up."
-</examples>
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index f5eaed3138..d26f9249c8 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -2,6 +2,12 @@
 
 This project features an **ASP.NET Core** backend (REST API) and a **Svelte 5 TypeScript** frontend (SPA).
 
+## Key Principles
+
+All contributions must respect existing formatting and conventions specified in the `.editorconfig` file. You are a distinguished engineer and are expected to deliver high-quality code that adheres to the guidelines in the instruction files.
+
+Let's keep pushing for clarity, usability, and excellence—both in code and user experience.
+
 ## Instructions Organization
 
 This project uses modular instruction files for better organization and targeted guidance. The instructions are organized as follows:
@@ -16,9 +22,3 @@ This project uses modular instruction files for better organization and targeted
 - **[Frontend Svelte Testing](instructions/frontend-svelte-testing.instructions.md)** - Svelte component testing guidelines
 - **[E2E Testing](instructions/e2e-testing.instructions.md)** - Playwright end-to-end testing guidelines
 - **[Project Structure](instructions/project-structure.instructions.md)** - Understanding the codebase organization
-
-## Key Principles
-
-All contributions must respect existing formatting and conventions specified in the `.editorconfig` file. You are a distinguished engineer and are expected to deliver high-quality code that adheres to the guidelines in the instruction files.
-
-Let's keep pushing for clarity, usability, and excellence—both in code and user experience.
diff --git a/.github/instructions/backend-testing.instructions.md b/.github/instructions/backend-testing.instructions.md
index 1b6e91e985..9e734a5153 100644
--- a/.github/instructions/backend-testing.instructions.md
+++ b/.github/instructions/backend-testing.instructions.md
@@ -20,8 +20,7 @@ applyTo: "tests/**/*.cs"
 
 - Write complete, runnable tests—no placeholders or TODOs.
 - Use clear, descriptive naming conventions for test methods:
-  - `MethodName_StateUnderTest_ExpectedBehavior`
-  - `Should_ExpectedBehavior_When_StateUnderTest`
+    - `MethodName_StateUnderTest_ExpectedBehavior`
 - Follow AAA pattern (Arrange, Act, Assert).
 
 ## Test Organization
diff --git a/.github/instructions/backend.instructions.md b/.github/instructions/backend.instructions.md
index f2713ee93d..794b31ba57 100644
--- a/.github/instructions/backend.instructions.md
+++ b/.github/instructions/backend.instructions.md
@@ -13,7 +13,6 @@ applyTo: "**/*.cs"
 ## Conventions & Best Practices
 
 - Adhere to the `.editorconfig` file and Microsoft's [coding conventions](https://learn.microsoft.com/en-us/dotnet/csharp/fundamentals/coding-style/coding-conventions).
-- Follow Microsoft's [unit testing best practices](https://learn.microsoft.com/en-us/dotnet/core/testing/unit-testing-best-practices).
 
 ## Architectural Considerations
 
diff --git a/.github/instructions/frontend-svelte.instructions.md b/.github/instructions/frontend-svelte.instructions.md
index e282064469..7b052f0328 100644
--- a/.github/instructions/frontend-svelte.instructions.md
+++ b/.github/instructions/frontend-svelte.instructions.md
@@ -13,6 +13,142 @@ applyTo: "src/Exceptionless.Web/ClientApp/**/*.svelte"
 - Use `import { page } from '$app/state'` instead of `'$app/stores'`
 - Use snippets `{#snippet ...}` and `{@render ...}` instead of `<slot>` for content projection.
 
+## Asynchronous Components (Experimental)
+
+**Available in Svelte 5.36+ with experimental.async compiler option**
+
+You can now use `await` directly in three places:
+- At the top level of a component `<script>`
+- In a `$derived` expression
+- In template expressions (markup)
+
+## Form Handling with Superforms
+
+Always supply a unique, stable `id` option for every `superForm` instance (e.g. `id: 'login'`, `id: 'update-user'`, `id: 'invite-user'`). Missing ids lead to duplicate form data warnings when multiple forms (including dialogs) are present. Use short, kebab-case resource-action names and never reuse the same id on the same page.
+
+### Safe Data Cloning Pattern
+Always use the `structuredCloneState()` utility when initializing forms and resetting form data to prevent cache mutation and reactive entanglement:
+
+```svelte
+import { structuredCloneState } from '$features/shared/utils/state';
+
+// Form initialization - use structuredCloneState utility
+const form = superForm(defaults(structuredCloneState(settings) || new NotificationSettings(), classvalidatorClient(NotificationSettings)), {
+    // form options...
+});
+
+// Form reset in $effect - use structuredCloneState utility
+$effect(() => {
+    if (!$submitting && !$tainted && settings !== previousSettingsRef) {
+        const clonedSettings = structuredCloneState(settings);
+        form.reset({ data: clonedSettings, keepMessage: true });
+        previousSettingsRef = settings;
+    }
+});
+```
+
+### Reactive Binding Pattern
+For simple reactive bindings to query data, you can override derived values for binding:
+
+```svelte
+// Derived value that can be temporarily overridden for binding
+let emailNotificationsEnabled = $derived(meQuery.data?.email_notifications_enabled ?? false);
+
+// Sync the derived value when source data changes
+$effect(() => {
+    emailNotificationsEnabled = meQuery.data?.email_notifications_enabled ?? false;
+});
+```
+
+```svelte
+<!-- Direct binding works - temporarily overrides derived value -->
+<Switch bind:checked={emailNotificationsEnabled} />
+```
+
+**Note:** This pattern uses Svelte 5's ability to override derived values (available since v5.25). The derived value automatically recalculates when dependencies change, but can be temporarily overridden for UI binding. The `$effect` ensures the local state resyncs when the source data changes.
+
+### Superforms onUpdate Pattern for Dialogs
+
+When using `superForm` inside dialogs, always use the following `onUpdate` pattern to ensure server-side validation errors are applied and dialogs don't close prematurely. This also prevents SvelteKit from stealing focus on success.
+
+```svelte
+const form = superForm(defaults(new MyForm(), classvalidatorClient(MyForm)), {
+    dataType: 'json',
+    id: 'my-form-id',
+    async onUpdate({ form, result }) {
+        if (!form.valid) {
+            return;
+        }
+
+        try {
+            await doAction(form.data);
+
+            open = false;
+
+            // HACK: Prevent SvelteKit from stealing focus
+            result.type = 'failure';
+        } catch (error: unknown) {
+            if (error instanceof ProblemDetails) {
+                applyServerSideErrors(form, error);
+                result.status = error.status ?? 500;
+            } else {
+                result.status = 500;
+            }
+        }
+    },
+    SPA: true,
+    validators: classvalidatorClient(MyForm)
+});
+```
+
+Requirements:
+- Import and use `ProblemDetails` from `@exceptionless/fetchclient` and `applyServerSideErrors` from `$features/shared/validation`.
+- Close the dialog with `open = false` only after the action succeeds.
+- Set `result.type = 'failure'` after success to avoid focus theft.
+
+### Dialog Action Functions Must Rethrow
+
+When passing action functions into dialogs (e.g., `save`, `suspend`, `setBonus`), if you display a toast in a `catch` block, you must rethrow the error so the dialog’s `onUpdate` handler can catch it and apply server-side validation errors.
+
+Example:
+
+```ts
+async function setBonus(params: PostSetBonusOrganizationParams) {
+    toast.dismiss(toastId);
+    try {
+        await setOrganizationBonus.mutateAsync(params);
+        toast.success('Successfully set the organization bonus.');
+    } catch (error) {
+        const message = error instanceof ProblemDetails ? error.title : 'Please try again.';
+        toast.error(`An error occurred while trying to set the organization bonus: ${message}`);
+        throw error; // critical: propagate to form
+    }
+}
+```
+
+### Why These Patterns?
+- **Prevents Cache Mutation**: `structuredCloneState()` creates independent copies that don't affect cached data
+- **Reactive Safety**: Uses `$state.snapshot()` internally for non-reactive snapshots, preventing unintended dependencies
+- **Form Isolation**: Each form gets its own copy of data, preventing cross-contamination
+- **Auto-Reset**: Local state automatically resets when source data changes
+- **Bindable**: Creates writable state for form controls and UI components
+- **Predictable Behavior**: Ensures consistent form state management across all scenarios
+- **Type Safety**: Utility provides proper TypeScript types and handles undefined/null gracefully
+
+### Reference Comparison for Resets
+Use object reference comparison instead of JSON stringification for performance:
+```svelte
+// ✅ Good - Reference comparison
+if (settings !== previousSettingsRef) {
+    // reset logic
+}
+
+// ❌ Avoid - JSON comparison (slower)
+if (JSON.stringify(settings) !== JSON.stringify(previousSettings)) {
+    // reset logic
+}
+```
+
 ## Event Handling
 
 - All single-line control statements must be enclosed in curly braces
@@ -24,6 +160,48 @@ applyTo: "src/Exceptionless.Web/ClientApp/**/*.svelte"
 - Use the Composite Component Pattern
 - Organize components within vertical slices aligned with API controllers
 
+## Dialog Component Patterns
+
+### Naming Conventions
+- Dialog state variables should use `open[ComponentName]Dialog` pattern (e.g., `openSuspendOrganizationDialog`, `openMarkStackDiscardedDialog`)
+- Avoid generic names like `showDialog` or `isOpen`
+
+### Event Handlers
+- Use inline arrow functions for opening dialogs: `onclick={() => (openDialogName = true)}`
+- Avoid creating separate handler functions just to set state to true
+- Create separate async functions only for complex operations (API calls, validation, etc.)
+
+### Conditional Rendering
+- Always wrap dialogs in `{#if}` blocks: `{#if openDialogName} <Dialog /> {/if}`
+- This prevents unnecessary DOM creation and improves performance
+
+### API Integration
+- Import and use existing interface types from API files (e.g., `SuspendOrganizationParams`)
+- Don't create inline types when proper interfaces exist
+- Create options files following the `DropdownItem<EnumType>[]` pattern in `options.ts`
+
+### Example Pattern
+```svelte
+<script lang="ts">
+    import type { ApiParamsInterface } from '$features/module/api.svelte';
+    import { optionsArray } from '$features/module/options';
+
+    let openMyActionDialog = $state(false);
+
+    async function performAction(params: ApiParamsInterface) {
+        // API call logic here
+    }
+</script>
+
+<Button onclick={() => (openMyActionDialog = true)}>
+    Action Label
+</Button>
+
+{#if openMyActionDialog}
+    <MyActionDialog bind:open={openMyActionDialog} action={performAction} />
+{/if}
+```
+
 ## Accessibility
 
 - Ensure excellent keyboard navigation for all interactions
diff --git a/.github/instructions/frontend.instructions.md b/.github/instructions/frontend.instructions.md
index 119ca2f028..8fc82e2bf2 100644
--- a/.github/instructions/frontend.instructions.md
+++ b/.github/instructions/frontend.instructions.md
@@ -20,6 +20,10 @@ Located in the `src/Exceptionless.Web/ClientApp` directory.
 - Organize code into vertical slices (e.g., features aligned with API controllers) and maintain shared components in a central folder.
 - Reexport generated code `src/Exceptionless.Web/ClientApp/src/lib/generated` from the respective feature models folder.
   - Always look for models in generated code before creating new models.
+- **CRITICAL**: Always examine existing similar components and follow their exact patterns before creating new components.
+  - Study naming conventions, state management, and file organization from existing examples.
+  - For dialogs, examine `/components/dialogs/` folders for established patterns.
+  - For options/dropdowns, check for existing `options.ts` files following the `DropdownItem<EnumType>[]` pattern.
 
 ## UI & Accessibility
 
@@ -37,3 +41,12 @@ Located in the `src/Exceptionless.Web/ClientApp` directory.
 
 - Use TanStack Query for all API calls centralized in an `api.svelte.ts` file.
 - Leverage `@exceptionless/fetchclient` for network operations.
+- **API function naming**: Prefix function names with HTTP verbs (e.g., `postOrganization`, `patchOrganization`, `deleteOrganization`)
+- **API interfaces**: Follow the pattern `[HttpVerb][Resource][Params|Request]` (e.g., `PostOrganizationParams`, `DeleteOrganizationRequest`)
+
+## Type Safety & Interfaces
+
+- **Always use existing API interfaces** instead of creating inline types (e.g., use `SuspendOrganizationParams` from `api.svelte.ts`)
+- Import type definitions from their proper modules (`api.svelte.ts`, `models.ts`, `options.ts`)
+- Create `options.ts` files for dropdown/select data following the `DropdownItem<EnumType>[]` pattern
+- Check existing type definitions before creating new ones to avoid duplication
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8e2073779b..35a2567fa9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -126,7 +126,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Cache node_modules
         uses: actions/cache@v4
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2571c084f5..5a78151043 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -53,6 +53,7 @@
         "tailwindcss",
         "tanstack",
         "typeschema",
+        "unsuspended",
         "WCAG",
         "websockets",
         "Writeline",
diff --git a/Dockerfile b/Dockerfile
index 7640774cbd..a5b083812d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,7 @@ FROM build AS api-publish
 WORKDIR /app/src/Exceptionless.Web
 
 RUN apt-get update -yq
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
+RUN curl -sL https://deb.nodesource.com/setup_24.x | bash - && apt-get install -yq nodejs
 
 RUN dotnet publish -c Release -o out /p:SkipSpaPublish=true
 
@@ -69,7 +69,7 @@ FROM build AS app-publish
 WORKDIR /app/src/Exceptionless.Web
 
 RUN apt-get update -yq
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
+RUN curl -sL https://deb.nodesource.com/setup_24.x | bash - && apt-get install -yq nodejs
 
 RUN dotnet publish -c Release -o out
 
diff --git a/src/Exceptionless.Core/Authorization/AuthorizationRoles.cs b/src/Exceptionless.Core/Authorization/AuthorizationRoles.cs
index c1fd5a172c..56359fc4e9 100644
--- a/src/Exceptionless.Core/Authorization/AuthorizationRoles.cs
+++ b/src/Exceptionless.Core/Authorization/AuthorizationRoles.cs
@@ -8,5 +8,5 @@ public static class AuthorizationRoles
     public const string User = "user";
     public const string GlobalAdminPolicy = nameof(GlobalAdminPolicy);
     public const string GlobalAdmin = "global";
-    public static readonly string[] AllScopes = ["client", "user", "global"];
+    public static readonly ISet<string> AllScopes = new HashSet<string>([Client, User, GlobalAdmin]);
 }
diff --git a/src/Exceptionless.Core/Jobs/CleanupDataJob.cs b/src/Exceptionless.Core/Jobs/CleanupDataJob.cs
index 8da1d4d738..bc0ca1d27e 100644
--- a/src/Exceptionless.Core/Jobs/CleanupDataJob.cs
+++ b/src/Exceptionless.Core/Jobs/CleanupDataJob.cs
@@ -117,7 +117,7 @@ private async Task CleanupSoftDeletedOrganizationsAsync(JobContext context)
                 }
 
                 // Sleep so we are not hammering the backend.
-                await Task.Delay(TimeSpan.FromSeconds(2.5));
+                await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
             }
 
             if (context.CancellationToken.IsCancellationRequested || !await organizationResults.NextPageAsync())
@@ -145,7 +145,7 @@ private async Task CleanupSoftDeletedProjectsAsync(JobContext context)
                 }
 
                 // Sleep so we are not hammering the backend.
-                await Task.Delay(TimeSpan.FromSeconds(2.5));
+                await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
             }
 
             if (context.CancellationToken.IsCancellationRequested || !await projectResults.NextPageAsync())
@@ -250,7 +250,7 @@ private async Task EnforceRetentionAsync(JobContext context)
                 }
 
                 // Sleep so we are not hammering the backend.
-                await Task.Delay(TimeSpan.FromSeconds(2.5));
+                await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
             }
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
diff --git a/src/Exceptionless.Core/Jobs/CleanupOrphanedDataJob.cs b/src/Exceptionless.Core/Jobs/CleanupOrphanedDataJob.cs
index 49540b0324..62541fc487 100644
--- a/src/Exceptionless.Core/Jobs/CleanupOrphanedDataJob.cs
+++ b/src/Exceptionless.Core/Jobs/CleanupOrphanedDataJob.cs
@@ -319,7 +319,7 @@ public async Task FixDuplicateStacks(JobContext context)
                             else if (attempts > 5)
                                 delay = TimeSpan.FromMilliseconds(250);
 
-                            await Task.Delay(delay);
+                            await Task.Delay(delay, _timeProvider);
                         } while (true);
 
                         _logger.LogInformation("Migrated stack events: Target={TargetId} Events={UpdatedEvents} Dupes={DuplicateIds}", targetStack.Id, affectedRecords, duplicateStacks.Select(s => s.Id));
diff --git a/src/Exceptionless.Core/Jobs/CloseInactiveSessionsJob.cs b/src/Exceptionless.Core/Jobs/CloseInactiveSessionsJob.cs
index 5be724a7c4..2381913fd3 100644
--- a/src/Exceptionless.Core/Jobs/CloseInactiveSessionsJob.cs
+++ b/src/Exceptionless.Core/Jobs/CloseInactiveSessionsJob.cs
@@ -89,7 +89,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
             _logger.LogInformation("Closing {SessionClosedCount} of {SessionCount} sessions", sessionsToUpdate.Count, results.Documents.Count);
 
             // Sleep so we are not hammering the backend.
-            await Task.Delay(TimeSpan.FromSeconds(2.5));
+            await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
                 break;
diff --git a/src/Exceptionless.Core/Jobs/DailySummaryJob.cs b/src/Exceptionless.Core/Jobs/DailySummaryJob.cs
index 1fc0dc1e3c..f420e5fc6a 100644
--- a/src/Exceptionless.Core/Jobs/DailySummaryJob.cs
+++ b/src/Exceptionless.Core/Jobs/DailySummaryJob.cs
@@ -87,10 +87,10 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                     bool summarySent = await SendSummaryNotificationAsync(project, notification);
                     if (summarySent)
                     {
-                        await _projectRepository.IncrementNextSummaryEndOfDayTicksAsync(new[] { project });
+                        await _projectRepository.IncrementNextSummaryEndOfDayTicksAsync([project]);
 
                         // Sleep so we are not hammering the backend as we just generated a report.
-                        await Task.Delay(TimeSpan.FromSeconds(2.5));
+                        await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
                     }
                     else
                     {
@@ -104,7 +104,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                 await _projectRepository.IncrementNextSummaryEndOfDayTicksAsync(projectsToBulkUpdate);
 
                 // Sleep so we are not hammering the backend
-                await Task.Delay(TimeSpan.FromSeconds(1));
+                await Task.Delay(TimeSpan.FromSeconds(1), _timeProvider);
             }
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
diff --git a/src/Exceptionless.Core/Jobs/Elastic/DataMigrationJob.cs b/src/Exceptionless.Core/Jobs/Elastic/DataMigrationJob.cs
index 31dd098a43..0ec074d375 100644
--- a/src/Exceptionless.Core/Jobs/Elastic/DataMigrationJob.cs
+++ b/src/Exceptionless.Core/Jobs/Elastic/DataMigrationJob.cs
@@ -141,7 +141,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                 {
                     _logger.LogWarning(taskStatus?.OriginalException, "Error getting task status for {TargetIndex} {TaskId}: {Message}", workItem.TargetIndex, workItem.TaskId, taskStatus.GetErrorMessage());
                     if (taskStatus?.ServerError?.Status == 429)
-                        await Task.Delay(TimeSpan.FromSeconds(1));
+                        await Task.Delay(TimeSpan.FromSeconds(1), _timeProvider);
 
                     continue;
                 }
@@ -166,7 +166,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                             workItemQueue.Enqueue(workItem);
                             totalTasks++;
                             retriesCount++;
-                            await Task.Delay(TimeSpan.FromSeconds(15));
+                            await Task.Delay(TimeSpan.FromSeconds(15), _timeProvider);
                         }
                         else
                         {
@@ -193,10 +193,10 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                 _logger.LogInformation("STATUS - I:{Completed}/{Total} P:{Progress:F0}% T:{Duration:d\\.hh\\:mm} W:{Working} F:{Failed} R:{Retries}", completedTasks.Count, totalTasks, highestProgress * 100, _timeProvider.GetUtcNow().UtcDateTime.Subtract(started), workingTasks.Count, failedTasks.Count, retriesCount);
                 lastProgress = _timeProvider.GetUtcNow().UtcDateTime;
             }
-            await Task.Delay(TimeSpan.FromSeconds(2));
+            await Task.Delay(TimeSpan.FromSeconds(2), _timeProvider);
         }
 
-        _logger.LogInformation("----- REINDEX COMPLETE", completedTasks.Count, totalTasks, _timeProvider.GetUtcNow().UtcDateTime.Subtract(started), failedTasks.Count, retriesCount);
+        _logger.LogInformation("----- REINDEX COMPLETE - I:{Completed}/{Total} T:{Duration:d\\.hh\\:mm} F:{Failed} R:{Retries}", completedTasks.Count, totalTasks, _timeProvider.GetUtcNow().UtcDateTime.Subtract(started), failedTasks.Count, retriesCount);
         foreach (var task in completedTasks)
         {
             var status = task.LastTaskInfo.Status;
@@ -204,7 +204,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
             double progress = status.Total > 0 ? (status.Created + status.Updated + status.Deleted + status.VersionConflicts * 1.0) / status.Total : 0;
 
             var targetCount = await client.CountAsync<object>(d => d.Index(task.TargetIndex));
-            _logger.LogInformation("SUCCESS - {TargetIndex} ({TargetCount}) in {Duration:hh\\:mm} C:{Created} U:{Updated} D:{Deleted} X:{Conflicts} T:{Total} A:{Attempts} ID:{TaskId}", task.TargetIndex, targetCount.Count, duration, status.Created, status.Updated, status.Deleted, status.VersionConflicts, status.Total, task.Attempts, task.TaskId);
+            _logger.LogInformation("SUCCESS - {TargetIndex} ({TargetCount}) in {Duration:hh\\:mm} P:{Progress:F0}% C:{Created} U:{Updated} D:{Deleted} X:{Conflicts} T:{Total} A:{Attempts} ID:{TaskId}", task.TargetIndex, targetCount.Count, duration, progress, status.Created, status.Updated, status.Deleted, status.VersionConflicts, status.Total, task.Attempts, task.TaskId);
         }
 
         foreach (var task in failedTasks)
@@ -214,8 +214,9 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
             double progress = status.Total > 0 ? (status.Created + status.Updated + status.Deleted + status.VersionConflicts * 1.0) / status.Total : 0;
 
             var targetCount = await client.CountAsync<object>(d => d.Index(task.TargetIndex));
-            _logger.LogCritical("FAILED - {TargetIndex} ({TargetCount}) in {Duration:hh\\:mm} C:{Created} U:{Updated} D:{Deleted} X:{Conflicts} T:{Total} A:{Attempts} ID:{TaskId}", task.TargetIndex, targetCount.Count, duration, status.Created, status.Updated, status.Deleted, status.VersionConflicts, status.Total, task.Attempts, task.TaskId);
+            _logger.LogCritical("FAILED - {TargetIndex} ({TargetCount}) in {Duration:hh\\:mm} P:{Progress:F0}% C:{Created} U:{Updated} D:{Deleted} X:{Conflicts} T:{Total} A:{Attempts} ID:{TaskId}", task.TargetIndex, targetCount.Count, duration, progress, status.Created, status.Updated, status.Deleted, status.VersionConflicts, status.Total, task.Attempts, task.TaskId);
         }
+
         _logger.LogInformation("----- SUMMARY - I:{Completed}/{Total} T:{Duration:d\\.hh\\:mm} F:{Failed} R:{Retries}", completedTasks.Count, totalTasks, _timeProvider.GetUtcNow().UtcDateTime.Subtract(started), failedTasks.Count, retriesCount);
 
         _logger.LogInformation("Updating aliases");
diff --git a/src/Exceptionless.Core/Jobs/StackStatusJob.cs b/src/Exceptionless.Core/Jobs/StackStatusJob.cs
index 0529c5f031..409b612918 100644
--- a/src/Exceptionless.Core/Jobs/StackStatusJob.cs
+++ b/src/Exceptionless.Core/Jobs/StackStatusJob.cs
@@ -45,7 +45,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
             await _stackRepository.SaveAsync(results.Documents);
 
             // Sleep so we are not hammering the backend.
-            await Task.Delay(TimeSpan.FromSeconds(2.5));
+            await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
                 break;
diff --git a/src/Exceptionless.Core/Jobs/WorkItemHandlers/OrganizationMaintenanceWorkItemHandler.cs b/src/Exceptionless.Core/Jobs/WorkItemHandlers/OrganizationMaintenanceWorkItemHandler.cs
index 7357780d49..2d8dd1c79f 100644
--- a/src/Exceptionless.Core/Jobs/WorkItemHandlers/OrganizationMaintenanceWorkItemHandler.cs
+++ b/src/Exceptionless.Core/Jobs/WorkItemHandlers/OrganizationMaintenanceWorkItemHandler.cs
@@ -60,7 +60,7 @@ public override async Task HandleItemAsync(WorkItemContext context)
                 await _organizationRepository.SaveAsync(results.Documents);
 
             // Sleep so we are not hammering the backend.
-            await Task.Delay(TimeSpan.FromSeconds(2.5));
+            await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
                 break;
@@ -68,7 +68,6 @@ public override async Task HandleItemAsync(WorkItemContext context)
             if (results.Documents.Count > 0)
                 await context.RenewLockAsync();
         }
-
     }
 
     private void UpgradePlan(Organization organization)
diff --git a/src/Exceptionless.Core/Jobs/WorkItemHandlers/ProjectMaintenanceWorkItemHandler.cs b/src/Exceptionless.Core/Jobs/WorkItemHandlers/ProjectMaintenanceWorkItemHandler.cs
index ab0b1dc879..30d3cb9039 100644
--- a/src/Exceptionless.Core/Jobs/WorkItemHandlers/ProjectMaintenanceWorkItemHandler.cs
+++ b/src/Exceptionless.Core/Jobs/WorkItemHandlers/ProjectMaintenanceWorkItemHandler.cs
@@ -62,7 +62,7 @@ public override async Task HandleItemAsync(WorkItemContext context)
                 await _projectRepository.SaveAsync(results.Documents);
 
             // Sleep so we are not hammering the backend.
-            await Task.Delay(TimeSpan.FromSeconds(2.5));
+            await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
                 break;
diff --git a/src/Exceptionless.Core/Jobs/WorkItemHandlers/UserMaintenanceWorkItemHandler.cs b/src/Exceptionless.Core/Jobs/WorkItemHandlers/UserMaintenanceWorkItemHandler.cs
index cb93abd776..33d3f62110 100644
--- a/src/Exceptionless.Core/Jobs/WorkItemHandlers/UserMaintenanceWorkItemHandler.cs
+++ b/src/Exceptionless.Core/Jobs/WorkItemHandlers/UserMaintenanceWorkItemHandler.cs
@@ -53,7 +53,7 @@ public override async Task HandleItemAsync(WorkItemContext context)
             }
 
             // Sleep so we are not hammering the backend.
-            await Task.Delay(TimeSpan.FromSeconds(2.5));
+            await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
 
             if (context.CancellationToken.IsCancellationRequested || !await results.NextPageAsync())
                 break;
diff --git a/src/Exceptionless.Core/Migrations/FixDuplicateStacks.cs b/src/Exceptionless.Core/Migrations/FixDuplicateStacks.cs
index c0c5b64c73..224b5416cc 100644
--- a/src/Exceptionless.Core/Migrations/FixDuplicateStacks.cs
+++ b/src/Exceptionless.Core/Migrations/FixDuplicateStacks.cs
@@ -155,7 +155,7 @@ public override async Task RunAsync(MigrationContext context)
                             else if (attempts > 5)
                                 delay = TimeSpan.FromMilliseconds(250);
 
-                            await Task.Delay(delay);
+                            await Task.Delay(delay, _timeProvider);
                         } while (true);
 
                         _logger.LogInformation("Migrated stack events: Target={TargetId} Events={UpdatedEvents} Dupes={DuplicateIds}", targetStack.Id, affectedRecords, duplicateStacks.Select(s => s.Id));
diff --git a/src/Exceptionless.Core/Migrations/UpdateEventUsage.cs b/src/Exceptionless.Core/Migrations/UpdateEventUsage.cs
index 29ad67713a..700b113429 100644
--- a/src/Exceptionless.Core/Migrations/UpdateEventUsage.cs
+++ b/src/Exceptionless.Core/Migrations/UpdateEventUsage.cs
@@ -102,7 +102,7 @@ private async Task UpdateOrganizationsUsageAsync(MigrationContext context)
             }
 
             // Sleep so we are not hammering the backend.
-            await Task.Delay(TimeSpan.FromSeconds(2.5));
+            await Task.Delay(TimeSpan.FromSeconds(2.5), _timeProvider);
             if (context.CancellationToken.IsCancellationRequested || !await organizationResults.NextPageAsync())
                 break;
         }
diff --git a/src/Exceptionless.Core/Models/User.cs b/src/Exceptionless.Core/Models/User.cs
index e62c0e6211..e4376e3852 100644
--- a/src/Exceptionless.Core/Models/User.cs
+++ b/src/Exceptionless.Core/Models/User.cs
@@ -14,7 +14,7 @@ public record User : IIdentity, IHaveDates, IValidatableObject
     /// <summary>
     /// The organizations that the user has access to.
     /// </summary>
-    public ICollection<string> OrganizationIds { get; } = new Collection<string>();
+    public ISet<string> OrganizationIds { get; } = new HashSet<string>();
 
     public string? Password { get; set; }
     public string? Salt { get; set; }
@@ -41,7 +41,7 @@ public record User : IIdentity, IHaveDates, IValidatableObject
     /// </summary>
     public bool IsActive { get; init; } = true;
 
-    public ICollection<string> Roles { get; init; } = new Collection<string>();
+    public ISet<string> Roles { get; init; } = new HashSet<string>();
 
     public DateTime CreatedUtc { get; set; }
     public DateTime UpdatedUtc { get; set; }
diff --git a/src/Exceptionless.Web/ClientApp/eslint.config.js b/src/Exceptionless.Web/ClientApp/eslint.config.js
index 2da8c32870..ec21c7751a 100644
--- a/src/Exceptionless.Web/ClientApp/eslint.config.js
+++ b/src/Exceptionless.Web/ClientApp/eslint.config.js
@@ -39,6 +39,12 @@ export default ts.config(
     },
     {
         rules: {
+            'perfectionist/sort-enums': [
+                'error',
+                {
+                    forceNumericSort: true
+                }
+            ],
             'perfectionist/sort-svelte-attributes': 'off'
         }
     },
diff --git a/src/Exceptionless.Web/ClientApp/package-lock.json b/src/Exceptionless.Web/ClientApp/package-lock.json
index e096914fb2..7ea0f2798f 100644
--- a/src/Exceptionless.Web/ClientApp/package-lock.json
+++ b/src/Exceptionless.Web/ClientApp/package-lock.json
@@ -10,71 +10,72 @@
             "dependencies": {
                 "@exceptionless/browser": "^3.1.0",
                 "@exceptionless/fetchclient": "^0.44.0",
-                "@lucide/svelte": "^0.525.0",
+                "@internationalized/date": "^3.8.2",
+                "@lucide/svelte": "^0.539.0",
                 "@tanstack/svelte-query": "https://pkg.pr.new/@tanstack/svelte-query@8c9ce9",
                 "@tanstack/svelte-query-devtools": "https://pkg.pr.new/@tanstack/svelte-query-devtools@8c9ce9",
                 "@tanstack/svelte-table": "^9.0.0-alpha.10",
                 "@types/d3-scale": "^4.0.9",
                 "@types/d3-shape": "^3.1.7",
                 "@typeschema/class-validator": "^0.3.0",
-                "bits-ui": "^2.8.11",
+                "bits-ui": "^2.9.2",
                 "class-validator": "^0.14.2",
                 "clsx": "^2.1.1",
                 "d3-scale": "^4.0.2",
                 "dompurify": "^3.2.6",
                 "formsnap": "^2.0.1",
                 "kit-query-params": "^0.0.26",
-                "layerchart": "^2.0.0-next.30",
+                "layerchart": "^2.0.0-next.36",
                 "mode-watcher": "^1.1.0",
                 "oidc-client-ts": "^3.3.0",
                 "pretty-ms": "^9.2.0",
-                "runed": "^0.31.0",
-                "shiki": "^3.8.1",
+                "runed": "^0.31.1",
+                "shiki": "^3.9.2",
                 "svelte-sonner": "^1.0.5",
                 "svelte-time": "^2.0.1",
                 "sveltekit-superforms": "^2.27.1",
                 "tailwind-merge": "^3.3.1",
-                "tailwind-variants": "^1.0.0",
+                "tailwind-variants": "^2.1.0",
                 "tailwindcss": "^4.1.11",
                 "throttle-debounce": "^5.0.2",
-                "tw-animate-css": "^1.3.5"
+                "tw-animate-css": "^1.3.6"
             },
             "devDependencies": {
-                "@chromatic-com/storybook": "^4.0.1",
-                "@eslint/compat": "^1.3.1",
-                "@eslint/js": "^9.31.0",
-                "@iconify-json/lucide": "^1.2.57",
-                "@playwright/test": "^1.54.1",
-                "@storybook/addon-a11y": "^9.0.17",
-                "@storybook/addon-docs": "^9.0.17",
+                "@chromatic-com/storybook": "^4.1.0",
+                "@eslint/compat": "^1.3.2",
+                "@eslint/js": "^9.33.0",
+                "@iconify-json/lucide": "^1.2.61",
+                "@playwright/test": "^1.54.2",
+                "@storybook/addon-a11y": "^9.1.1",
+                "@storybook/addon-docs": "^9.1.1",
                 "@storybook/addon-svelte-csf": "^5.0.7",
-                "@storybook/sveltekit": "^9.0.17",
-                "@sveltejs/adapter-static": "^3.0.8",
-                "@sveltejs/kit": "^2.25.1",
-                "@sveltejs/vite-plugin-svelte": "^6.1.0",
+                "@storybook/sveltekit": "^9.1.1",
+                "@sveltejs/adapter-static": "^3.0.9",
+                "@sveltejs/kit": "^2.27.3",
+                "@sveltejs/vite-plugin-svelte": "^6.1.1",
                 "@tailwindcss/vite": "^4.1.11",
-                "@testing-library/jest-dom": "^6.6.3",
+                "@testing-library/jest-dom": "^6.6.4",
                 "@testing-library/svelte": "^5.2.8",
                 "@types/eslint": "^9.6.1",
-                "@types/node": "^24.0.15",
+                "@types/node": "^24.2.1",
                 "@types/throttle-debounce": "^5.0.2",
-                "cross-env": "^7.0.3",
-                "eslint": "^9.31.0",
+                "cross-env": "^10.0.0",
+                "eslint": "^9.33.0",
                 "eslint-config-prettier": "^10.1.8",
                 "eslint-plugin-perfectionist": "^4.15.0",
-                "eslint-plugin-storybook": "^9.0.17",
+                "eslint-plugin-storybook": "^9.1.1",
                 "eslint-plugin-svelte": "^3.11.0",
                 "jsdom": "^26.1.0",
                 "prettier": "^3.6.2",
                 "prettier-plugin-svelte": "^3.4.0",
                 "prettier-plugin-tailwindcss": "^0.6.14",
-                "storybook": "^9.0.17",
-                "svelte": "^5.36.8",
-                "svelte-check": "^4.3.0",
-                "swagger-typescript-api": "^13.2.7",
+                "storybook": "^9.1.1",
+                "svelte": "^5.38.0",
+                "svelte-check": "^4.3.1",
+                "swagger-typescript-api": "^13.2.8",
                 "tslib": "^2.8.1",
-                "typescript": "^5.8.3",
-                "typescript-eslint": "^8.37.0",
+                "typescript": "^5.9.2",
+                "typescript-eslint": "^8.39.0",
                 "vite": "^6.3.5",
                 "vitest": "3.2.4"
             }
@@ -166,15 +167,15 @@
             }
         },
         "node_modules/@biomejs/js-api": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-1.0.0.tgz",
-            "integrity": "sha512-69OfQ7+09AtiCIg+k+aU3rEsGit5o/SJWCS3BeBH/2nJYdJGi0cIx+ybka8i1EK69aNcZxYO1y1iAAEmYMq1HA==",
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-2.0.3.tgz",
+            "integrity": "sha512-fg4hGhg1LtohDqLdG9uggROlVsydcuFwZhPoUOTi9+bkvGMULDKL9dEP5iN6++CIA/AN0T20U82rLYuaxc+VDQ==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peerDependencies": {
-                "@biomejs/wasm-bundler": "^2.0.0",
-                "@biomejs/wasm-nodejs": "^2.0.0",
-                "@biomejs/wasm-web": "^2.0.0"
+                "@biomejs/wasm-bundler": "^2.1.1",
+                "@biomejs/wasm-nodejs": "^2.1.1",
+                "@biomejs/wasm-web": "^2.1.1"
             },
             "peerDependenciesMeta": {
                 "@biomejs/wasm-bundler": {
@@ -189,16 +190,16 @@
             }
         },
         "node_modules/@biomejs/wasm-nodejs": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.0.5.tgz",
-            "integrity": "sha512-pihpBMylewgDdGFZHRkgmc3OajuGIJPXhvfYuKCNK/CWyJMrYEFmPKs8Iq1kY0sYMmGlTbD4K2udV03KYa+r0Q==",
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.1.4.tgz",
+            "integrity": "sha512-BuvuOiXtTJg9w5+ApMXeJDD5H+XkIJSazIjPJeIxfkCqzVtCByLjCqPC6gbECbylRl9IhrZMWVIskTD6aJ9MzA==",
             "dev": true,
             "license": "MIT OR Apache-2.0"
         },
         "node_modules/@chromatic-com/storybook": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-4.0.1.tgz",
-            "integrity": "sha512-GQXe5lyZl3yLewLJQyFXEpOp2h+mfN2bPrzYaOFNCJjO4Js9deKbRHTOSaiP2FRwZqDLdQwy2+SEGeXPZ94yYw==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@chromatic-com/storybook/-/storybook-4.1.0.tgz",
+            "integrity": "sha512-B9XesFX5lQUdP81/QBTtkiYOFqEsJwQpzkZlcYPm2n/L1S/8ZabSPbz6NoY8hOJTXWZ2p7grygUlxyGy+gAvfQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -213,7 +214,7 @@
                 "yarn": ">=1.22.18"
             },
             "peerDependencies": {
-                "storybook": "^0.0.0-0 || ^9.0.0 || ^9.1.0-0"
+                "storybook": "^0.0.0-0 || ^9.0.0 || ^9.1.0-0 || ^9.2.0-0"
             }
         },
         "node_modules/@csstools/color-helpers": {
@@ -349,6 +350,13 @@
                 "node": ">17.0.0"
             }
         },
+        "node_modules/@epic-web/invariant": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
+            "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@esbuild/aix-ppc64": {
             "version": "0.25.4",
             "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
@@ -792,9 +800,9 @@
             }
         },
         "node_modules/@eslint/compat": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.3.1.tgz",
-            "integrity": "sha512-k8MHony59I5EPic6EQTCNOuPoVBnoYXkP+20xvwFjN7t0qI3ImyvyBgg+hIVPwC8JaxVjjUZld+cLfBLFDLucg==",
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.3.2.tgz",
+            "integrity": "sha512-jRNwzTbd6p2Rw4sZ1CgWRS8YMtqG15YyZf7zvb6gY2rB2u6n+2Z+ELW0GtL0fQgyl0pr4Y/BzBfng/BdsereRA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -825,9 +833,9 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-            "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+            "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -835,9 +843,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-            "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+            "version": "0.15.2",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+            "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -872,9 +880,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.31.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
-            "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
+            "version": "9.33.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
+            "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -895,13 +903,13 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
-            "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+            "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/core": "^0.14.0",
+                "@eslint/core": "^0.15.2",
                 "levn": "^0.4.1"
             },
             "engines": {
@@ -1077,9 +1085,9 @@
             }
         },
         "node_modules/@iconify-json/lucide": {
-            "version": "1.2.57",
-            "resolved": "https://registry.npmjs.org/@iconify-json/lucide/-/lucide-1.2.57.tgz",
-            "integrity": "sha512-I1CIObdPBIL/9v75KKoyHWNhq+qqN6ef8+iJY4AVpHLtnRu0Vbp6K0TKcoYZ70U+EgiL6krEbFdcjK3+fwpfHQ==",
+            "version": "1.2.61",
+            "resolved": "https://registry.npmjs.org/@iconify-json/lucide/-/lucide-1.2.61.tgz",
+            "integrity": "sha512-0sLmi3vyEsJ6XL/uhl0a+uphdYIW1viYkUmiuT4SK3e2R3o3GIWY9k8N+SZL++GVBbMKy9oatx8KrzyoPZ6WqQ==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -1094,11 +1102,10 @@
             "license": "MIT"
         },
         "node_modules/@internationalized/date": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.1.tgz",
-            "integrity": "sha512-PgVE6B6eIZtzf9Gu5HvJxRK3ufUFz9DhspELuhW/N0GuMGMTLvPQNRkHP2hTuP9lblOk+f+1xi96sPiPXANXAA==",
+            "version": "3.8.2",
+            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.2.tgz",
+            "integrity": "sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==",
             "license": "Apache-2.0",
-            "peer": true,
             "dependencies": {
                 "@swc/helpers": "^0.5.0"
             }
@@ -1165,32 +1172,32 @@
             }
         },
         "node_modules/@layerstack/svelte-actions": {
-            "version": "1.0.1-next.12",
-            "resolved": "https://registry.npmjs.org/@layerstack/svelte-actions/-/svelte-actions-1.0.1-next.12.tgz",
-            "integrity": "sha512-dndWTlYu8b1u6vw2nrO7NssccoACArGG75WoNlyVC13KuENZlWdKE9Q79/wlnbq00NeQMNKMjJwRMsrKQj2ULA==",
+            "version": "1.0.1-next.14",
+            "resolved": "https://registry.npmjs.org/@layerstack/svelte-actions/-/svelte-actions-1.0.1-next.14.tgz",
+            "integrity": "sha512-MPBmVaB+GfNHvBkg5nJkPG18smoXKvsvJRpsdWnrUBfca+TieZLoaEzNxDH+9LG11dIXP9gghsXt1mUqbbyAsA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/dom": "^1.7.0",
-                "@layerstack/utils": "2.0.0-next.12",
+                "@layerstack/utils": "2.0.0-next.14",
                 "d3-scale": "^4.0.2"
             }
         },
         "node_modules/@layerstack/svelte-state": {
-            "version": "0.1.0-next.17",
-            "resolved": "https://registry.npmjs.org/@layerstack/svelte-state/-/svelte-state-0.1.0-next.17.tgz",
-            "integrity": "sha512-z7e6mPJnypD80LEI/UDuH0bI6s8/nut06MB7rEkRcEfHJekhKSJgFhMnrYzLED7Mc2gTTD0X/wcYlakauWlU8A==",
+            "version": "0.1.0-next.19",
+            "resolved": "https://registry.npmjs.org/@layerstack/svelte-state/-/svelte-state-0.1.0-next.19.tgz",
+            "integrity": "sha512-yCYoQAIbeP8y1xmOB/r0+UundgP4JFnpNURgMki+26TotzoqrZ5oLpHvhPSVm60ks+buR3ebDBTeUFdHzxwzQQ==",
             "license": "MIT",
             "dependencies": {
-                "@layerstack/utils": "2.0.0-next.12"
+                "@layerstack/utils": "2.0.0-next.14"
             }
         },
         "node_modules/@layerstack/tailwind": {
-            "version": "2.0.0-next.15",
-            "resolved": "https://registry.npmjs.org/@layerstack/tailwind/-/tailwind-2.0.0-next.15.tgz",
-            "integrity": "sha512-7tqKE3OV7/ybeDOORX++USYYCBJa7IgTya2czFpzbgXGo7CQDVyuv+0J1DggjRcEqhhXQA4MUhgnhcRaZvHxWg==",
+            "version": "2.0.0-next.17",
+            "resolved": "https://registry.npmjs.org/@layerstack/tailwind/-/tailwind-2.0.0-next.17.tgz",
+            "integrity": "sha512-ZSn6ouqpnzB6DKzSKLVwrUBOQsrzpDA/By2/ba9ApxgTGnaD1nyqNwrvmZ+kswdAwB4YnrGEAE4VZkKrB2+DaQ==",
             "license": "MIT",
             "dependencies": {
-                "@layerstack/utils": "^2.0.0-next.12",
+                "@layerstack/utils": "^2.0.0-next.14",
                 "clsx": "^2.1.1",
                 "d3-array": "^3.2.4",
                 "lodash-es": "^4.17.21",
@@ -1198,9 +1205,9 @@
             }
         },
         "node_modules/@layerstack/utils": {
-            "version": "2.0.0-next.12",
-            "resolved": "https://registry.npmjs.org/@layerstack/utils/-/utils-2.0.0-next.12.tgz",
-            "integrity": "sha512-fhGZUlSr3N+D44BYm37WKMGSEFyZBW+dwIqtGU8Cl54mR4TLQ/UwyGhdpgIHyH/x/8q1abE0fP0Dn6ZsrDE3BA==",
+            "version": "2.0.0-next.14",
+            "resolved": "https://registry.npmjs.org/@layerstack/utils/-/utils-2.0.0-next.14.tgz",
+            "integrity": "sha512-1I2CS0Cwgs53W35qVg1eBdYhB/CiPvL3s0XE61b8jWkTHxgjBF65yYNgXjW74kv7WI7GsJcWMNBufPd0rnu9kA==",
             "license": "MIT",
             "dependencies": {
                 "d3-array": "^3.2.4",
@@ -1210,9 +1217,9 @@
             }
         },
         "node_modules/@lucide/svelte": {
-            "version": "0.525.0",
-            "resolved": "https://registry.npmjs.org/@lucide/svelte/-/svelte-0.525.0.tgz",
-            "integrity": "sha512-dyUxkXzepagLUzL8jHQNdeH286nC66ClLACsg+Neu/bjkRJWPWMzkT+H0DKlE70QdkicGCfs1ZGmXCc351hmZA==",
+            "version": "0.539.0",
+            "resolved": "https://registry.npmjs.org/@lucide/svelte/-/svelte-0.539.0.tgz",
+            "integrity": "sha512-OWhw4BhHO+owmOE/ijSNLnw/flbW2/DsLzMHAeM8oEjLsO0xE6glX0ADCDwxKItTs5ZJYssfyGNXxMXrea173w==",
             "license": "ISC",
             "peerDependencies": {
                 "svelte": "^5"
@@ -1282,13 +1289,13 @@
             }
         },
         "node_modules/@playwright/test": {
-            "version": "1.54.1",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
-            "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
+            "version": "1.54.2",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.2.tgz",
+            "integrity": "sha512-A+znathYxPf+72riFd1r1ovOLqsIIB0jKIoPjyK2kqEIe30/6jF6BC7QNluHuwUmsD2tv1XZVugN8GqfTMOxsA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "playwright": "1.54.1"
+                "playwright": "1.54.2"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -1574,60 +1581,60 @@
             ]
         },
         "node_modules/@shikijs/core": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.8.1.tgz",
-            "integrity": "sha512-uTSXzUBQ/IgFcUa6gmGShCHr4tMdR3pxUiiWKDm8pd42UKJdYhkAYsAmHX5mTwybQ5VyGDgTjW4qKSsRvGSang==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.9.2.tgz",
+            "integrity": "sha512-3q/mzmw09B2B6PgFNeiaN8pkNOixWS726IHmJEpjDAcneDPMQmUg2cweT9cWXY4XcyQS3i6mOOUgQz9RRUP6HA==",
             "license": "MIT",
             "dependencies": {
-                "@shikijs/types": "3.8.1",
+                "@shikijs/types": "3.9.2",
                 "@shikijs/vscode-textmate": "^10.0.2",
                 "@types/hast": "^3.0.4",
                 "hast-util-to-html": "^9.0.5"
             }
         },
         "node_modules/@shikijs/engine-javascript": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-3.8.1.tgz",
-            "integrity": "sha512-rZRp3BM1llrHkuBPAdYAzjlF7OqlM0rm/7EWASeCcY7cRYZIrOnGIHE9qsLz5TCjGefxBFnwgIECzBs2vmOyKA==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-3.9.2.tgz",
+            "integrity": "sha512-kUTRVKPsB/28H5Ko6qEsyudBiWEDLst+Sfi+hwr59E0GLHV0h8RfgbQU7fdN5Lt9A8R1ulRiZyTvAizkROjwDA==",
             "license": "MIT",
             "dependencies": {
-                "@shikijs/types": "3.8.1",
+                "@shikijs/types": "3.9.2",
                 "@shikijs/vscode-textmate": "^10.0.2",
                 "oniguruma-to-es": "^4.3.3"
             }
         },
         "node_modules/@shikijs/engine-oniguruma": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.8.1.tgz",
-            "integrity": "sha512-KGQJZHlNY7c656qPFEQpIoqOuC4LrxjyNndRdzk5WKB/Ie87+NJCF1xo9KkOUxwxylk7rT6nhlZyTGTC4fCe1g==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.9.2.tgz",
+            "integrity": "sha512-Vn/w5oyQ6TUgTVDIC/BrpXwIlfK6V6kGWDVVz2eRkF2v13YoENUvaNwxMsQU/t6oCuZKzqp9vqtEtEzKl9VegA==",
             "license": "MIT",
             "dependencies": {
-                "@shikijs/types": "3.8.1",
+                "@shikijs/types": "3.9.2",
                 "@shikijs/vscode-textmate": "^10.0.2"
             }
         },
         "node_modules/@shikijs/langs": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.8.1.tgz",
-            "integrity": "sha512-TjOFg2Wp1w07oKnXjs0AUMb4kJvujML+fJ1C5cmEj45lhjbUXtziT1x2bPQb9Db6kmPhkG5NI2tgYW1/DzhUuQ==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.9.2.tgz",
+            "integrity": "sha512-X1Q6wRRQXY7HqAuX3I8WjMscjeGjqXCg/Sve7J2GWFORXkSrXud23UECqTBIdCSNKJioFtmUGJQNKtlMMZMn0w==",
             "license": "MIT",
             "dependencies": {
-                "@shikijs/types": "3.8.1"
+                "@shikijs/types": "3.9.2"
             }
         },
         "node_modules/@shikijs/themes": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.8.1.tgz",
-            "integrity": "sha512-Vu3t3BBLifc0GB0UPg2Pox1naTemrrvyZv2lkiSw3QayVV60me1ujFQwPZGgUTmwXl1yhCPW8Lieesm0CYruLQ==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.9.2.tgz",
+            "integrity": "sha512-6z5lBPBMRfLyyEsgf6uJDHPa6NAGVzFJqH4EAZ+03+7sedYir2yJBRu2uPZOKmj43GyhVHWHvyduLDAwJQfDjA==",
             "license": "MIT",
             "dependencies": {
-                "@shikijs/types": "3.8.1"
+                "@shikijs/types": "3.9.2"
             }
         },
         "node_modules/@shikijs/types": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.8.1.tgz",
-            "integrity": "sha512-5C39Q8/8r1I26suLh+5TPk1DTrbY/kn3IdWA5HdizR0FhlhD05zx5nKCqhzSfDHH3p4S0ZefxWd77DLV+8FhGg==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.9.2.tgz",
+            "integrity": "sha512-/M5L0Uc2ljyn2jKvj4Yiah7ow/W+DJSglVafvWAJ/b8AZDeeRAdMu3c2riDzB7N42VD+jSnWxeP9AKtd4TfYVw==",
             "license": "MIT",
             "dependencies": {
                 "@shikijs/vscode-textmate": "^10.0.2",
@@ -1675,13 +1682,12 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
             "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
-            "license": "MIT",
-            "optional": true
+            "license": "MIT"
         },
         "node_modules/@storybook/addon-a11y": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-9.0.17.tgz",
-            "integrity": "sha512-9cXNK3q/atx3hwJAt9HkJbd9vUxCXfKKiNNuSACbf8h9/j6u3jktulKOf6Xjc3B8lwn6ZpdK/x1HHZN2kTqsvg==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-9.1.1.tgz",
+            "integrity": "sha512-ZCKxYQmHnisAdpjYeRRD41NfA5UlTFpej0xgGLiAc9PGz264RRP5B+pZUHHNIyEKA9JCDcyc4BPe+xnXZgDjSA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1693,20 +1699,20 @@
                 "url": "https://opencollective.com/storybook"
             },
             "peerDependencies": {
-                "storybook": "^9.0.17"
+                "storybook": "^9.1.1"
             }
         },
         "node_modules/@storybook/addon-docs": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-9.0.17.tgz",
-            "integrity": "sha512-LOX/kKgQGnyulrqZHsvf77+ZoH/nSUaplGr5hvZglW/U6ak6fO9seJyXAzVKEnC6p+F8n02kFBZbi3s+znQhSg==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-9.1.1.tgz",
+            "integrity": "sha512-CzgvTy3V5X4fe+VPkiZVwPKARlpEBDAKte8ajLAlHJQLFpADdYrBRQ0se6I+kcxva7rZQzdhuH7qjXMDRVcfnw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@mdx-js/react": "^3.0.0",
-                "@storybook/csf-plugin": "9.0.17",
-                "@storybook/icons": "^1.2.12",
-                "@storybook/react-dom-shim": "9.0.17",
+                "@storybook/csf-plugin": "9.1.1",
+                "@storybook/icons": "^1.4.0",
+                "@storybook/react-dom-shim": "9.1.1",
                 "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
                 "ts-dedent": "^2.0.0"
@@ -1716,7 +1722,7 @@
                 "url": "https://opencollective.com/storybook"
             },
             "peerDependencies": {
-                "storybook": "^9.0.17"
+                "storybook": "^9.1.1"
             }
         },
         "node_modules/@storybook/addon-svelte-csf": {
@@ -1743,13 +1749,13 @@
             }
         },
         "node_modules/@storybook/builder-vite": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-9.0.17.tgz",
-            "integrity": "sha512-lyuvgGhb0NaVk1tdB4xwzky6+YXQfxlxfNQqENYZ9uYQZdPfErMa4ZTXVQTV+CQHAa2NL+p/dG2JPAeu39e9UA==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/builder-vite/-/builder-vite-9.1.1.tgz",
+            "integrity": "sha512-rM0QOfykr39SFBRQnoAa5PU3xTHnJE1R5tigvjved1o7sumcfjrhqmEyAgNZv1SoRztOO92jwkTi7En6yheOKg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@storybook/csf-plugin": "9.0.17",
+                "@storybook/csf-plugin": "9.1.1",
                 "ts-dedent": "^2.0.0"
             },
             "funding": {
@@ -1757,7 +1763,7 @@
                 "url": "https://opencollective.com/storybook"
             },
             "peerDependencies": {
-                "storybook": "^9.0.17",
+                "storybook": "^9.1.1",
                 "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
             }
         },
@@ -1772,9 +1778,9 @@
             }
         },
         "node_modules/@storybook/csf-plugin": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-9.0.17.tgz",
-            "integrity": "sha512-6Q4eo1ObrLlsnB6bIt6T8+45XAb4to2pQGNrI7QPkLQRLrZinrJcNbLY7AGkyIoCOEsEbq08n09/nClQUbu8HA==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-9.1.1.tgz",
+            "integrity": "sha512-MwdtvzzFpkard06pCfDrgRXZiBfWAQICdKh7kzpv1L8SwewsRgUr5WZQuEAVfYdSvCFJbWnNN4KirzPhe5ENCg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1785,7 +1791,7 @@
                 "url": "https://opencollective.com/storybook"
             },
             "peerDependencies": {
-                "storybook": "^9.0.17"
+                "storybook": "^9.1.1"
             }
         },
         "node_modules/@storybook/global": {
@@ -1810,9 +1816,9 @@
             }
         },
         "node_modules/@storybook/react-dom-shim": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-9.0.17.tgz",
-            "integrity": "sha512-ak/x/m6MDDxdE6rCDymTltaiQF3oiKrPHSwfM+YPgQR6MVmzTTs4+qaPfeev7FZEHq23IkfDMTmSTTJtX7Vs9A==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-9.1.1.tgz",
+            "integrity": "sha512-L+HCOXvOP+PwKrVS8od9aF+F4hO7zA0Nt1vnpbg2LeAHCxYghrjFVtioe7gSlzrlYdozQrPLY98a4OkDB7KGrw==",
             "dev": true,
             "license": "MIT",
             "funding": {
@@ -1822,16 +1828,15 @@
             "peerDependencies": {
                 "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
                 "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-                "storybook": "^9.0.17"
+                "storybook": "^9.1.1"
             }
         },
         "node_modules/@storybook/svelte": {
-            "version": "9.1.0-alpha.1",
-            "resolved": "https://registry.npmjs.org/@storybook/svelte/-/svelte-9.1.0-alpha.1.tgz",
-            "integrity": "sha512-jba8kBahGOmWzTHdsiJp1h7xIZvhm3LJYrJ5gqPgE/H0TU2bD2rHE/FH5jzcKXUsW6GyUbv9ovulF65eWjQ9Qw==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/svelte/-/svelte-9.1.1.tgz",
+            "integrity": "sha512-/T76u1/j4/gquB9iEUDsrwtgXPBU0OU4OKZaVoVyaJ0k3LvVXUKf/QelRTXeSKwOIUuhMmQIg4z1+5k/ar1IJQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "ts-dedent": "^2.0.0",
                 "type-fest": "~2.19"
@@ -1844,20 +1849,20 @@
                 "url": "https://opencollective.com/storybook"
             },
             "peerDependencies": {
-                "storybook": "^9.1.0-alpha.1",
+                "storybook": "^9.1.1",
                 "svelte": "^5.0.0"
             }
         },
         "node_modules/@storybook/sveltekit": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/sveltekit/-/sveltekit-9.0.17.tgz",
-            "integrity": "sha512-CUOATuW5Qk3SjNvmjH+wyx2GCsMF1cvw3gwkujV9kehPebzV20NhgHpbzSoepvwF7+Bj6jl8V6UxiMWk0jJFmA==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/sveltekit/-/sveltekit-9.1.1.tgz",
+            "integrity": "sha512-J++HoT2CLlwKpACI4n0qprqegwzrtqPEm0HwLpJ3uRO5kMyoA8VcxxtBiL9e87aOAMQlxH/u+hStnrUWE0ZrHA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@storybook/builder-vite": "9.0.17",
-                "@storybook/svelte": "9.0.17",
-                "@storybook/svelte-vite": "9.0.17"
+                "@storybook/builder-vite": "9.1.1",
+                "@storybook/svelte": "9.1.1",
+                "@storybook/svelte-vite": "9.1.1"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -1867,42 +1872,20 @@
                 "url": "https://opencollective.com/storybook"
             },
             "peerDependencies": {
-                "storybook": "^9.0.17",
+                "storybook": "^9.1.1",
                 "svelte": "^5.0.0",
                 "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
             }
         },
-        "node_modules/@storybook/sveltekit/node_modules/@storybook/svelte": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/svelte/-/svelte-9.0.17.tgz",
-            "integrity": "sha512-RwOswdq7S3+ZOuoM/oRrcmlsKdjcd/3wMHbuirzYoAhdwsjubSuRepMV64O9RnlXd3x7rZw4fXpq1M/SVo5XiQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ts-dedent": "^2.0.0",
-                "type-fest": "~2.19"
-            },
-            "engines": {
-                "node": ">=20.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/storybook"
-            },
-            "peerDependencies": {
-                "storybook": "^9.0.17",
-                "svelte": "^5.0.0"
-            }
-        },
         "node_modules/@storybook/sveltekit/node_modules/@storybook/svelte-vite": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/@storybook/svelte-vite/-/svelte-vite-9.0.17.tgz",
-            "integrity": "sha512-fRIxOZy9IRI6BfL1LgFn+B+IckGOlT1SstD01y9ddO4pVKWih/l+vb44bnZs+Z0faJZbrG/LgfnXTOPj052Z8g==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@storybook/svelte-vite/-/svelte-vite-9.1.1.tgz",
+            "integrity": "sha512-x+udvn9d52HkQBEAtElYGbNMJ74u53G1Giob09b3U3iFjKE+VXt3WSrY9UNRe0gtrV63mL33XzotTt+K/lfcLw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@storybook/builder-vite": "9.0.17",
-                "@storybook/svelte": "9.0.17",
+                "@storybook/builder-vite": "9.1.1",
+                "@storybook/svelte": "9.1.1",
                 "magic-string": "^0.30.0",
                 "svelte2tsx": "^0.7.35",
                 "typescript": "^4.9.4 || ^5.0.0"
@@ -1916,7 +1899,7 @@
             },
             "peerDependencies": {
                 "@sveltejs/vite-plugin-svelte": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
-                "storybook": "^9.0.17",
+                "storybook": "^9.1.1",
                 "svelte": "^5.0.0",
                 "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
             }
@@ -1973,9 +1956,9 @@
             }
         },
         "node_modules/@sveltejs/adapter-static": {
-            "version": "3.0.8",
-            "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.8.tgz",
-            "integrity": "sha512-YaDrquRpZwfcXbnlDsSrBQNCChVOT9MGuSg+dMAyfsAa1SmiAhrA5jUYUiIMC59G92kIbY/AaQOWcBdq+lh+zg==",
+            "version": "3.0.9",
+            "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.9.tgz",
+            "integrity": "sha512-aytHXcMi7lb9ljsWUzXYQ0p5X1z9oWud2olu/EpmH7aCu4m84h7QLvb5Wp+CFirKcwoNnYvYWhyP/L8Vh1ztdw==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -1983,11 +1966,12 @@
             }
         },
         "node_modules/@sveltejs/kit": {
-            "version": "2.25.1",
-            "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.25.1.tgz",
-            "integrity": "sha512-8H+fxDEp7Xq6tLFdrGdS5fLu6ONDQQ9DgyjboXpChubuFdfH9QoFX09ypssBpyNkJNZFt9eW3yLmXIc9CesPCA==",
+            "version": "2.27.3",
+            "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.27.3.tgz",
+            "integrity": "sha512-jiG3NGZ8RRpi+ncjVnX+oR7uWEgzy//3YLGcTU5mHtjGraeGyNDr7GJFHlk7z0vi8bMXpXIUkEXj6p70FJmHvw==",
             "license": "MIT",
             "dependencies": {
+                "@standard-schema/spec": "^1.0.0",
                 "@sveltejs/acorn-typescript": "^1.0.5",
                 "@types/cookie": "^0.6.0",
                 "acorn": "^8.14.1",
@@ -2014,12 +1998,12 @@
             }
         },
         "node_modules/@sveltejs/vite-plugin-svelte": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.1.0.tgz",
-            "integrity": "sha512-+U6lz1wvGEG/BvQyL4z/flyNdQ9xDNv5vrh+vWBWTHaebqT0c9RNggpZTo/XSPoHsSCWBlYaTlRX8pZ9GATXCw==",
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.1.1.tgz",
+            "integrity": "sha512-vB0Vq47Js7C11L2JrwhncIAoDNkdKDPI500SjLSb34X48dDcsSH5JpLl0cHT0sfO997BrzAS6PKjiZEey/S0VQ==",
             "license": "MIT",
             "dependencies": {
-                "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0-next.1",
+                "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0",
                 "debug": "^4.4.1",
                 "deepmerge": "^4.3.1",
                 "kleur": "^4.1.5",
@@ -2056,7 +2040,6 @@
             "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
             "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
             "license": "Apache-2.0",
-            "peer": true,
             "dependencies": {
                 "tslib": "^2.8.0"
             }
@@ -2445,18 +2428,18 @@
             }
         },
         "node_modules/@testing-library/jest-dom": {
-            "version": "6.6.3",
-            "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz",
-            "integrity": "sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==",
+            "version": "6.6.4",
+            "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.6.4.tgz",
+            "integrity": "sha512-xDXgLjVunjHqczScfkCJ9iyjdNOVHvvCdqHSSxwM9L0l/wHkTRum67SDc020uAlCoqktJplgO2AAQeLP1wgqDQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@adobe/css-tools": "^4.4.0",
                 "aria-query": "^5.0.0",
-                "chalk": "^3.0.0",
                 "css.escape": "^1.5.1",
                 "dom-accessibility-api": "^0.6.3",
                 "lodash": "^4.17.21",
+                "picocolors": "^1.1.1",
                 "redent": "^3.0.0"
             },
             "engines": {
@@ -2465,20 +2448,6 @@
                 "yarn": ">=1"
             }
         },
-        "node_modules/@testing-library/jest-dom/node_modules/chalk": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-            "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz",
@@ -2636,13 +2605,13 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "24.0.15",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.15.tgz",
-            "integrity": "sha512-oaeTSbCef7U/z7rDeJA138xpG3NuKc64/rZ2qmUFkFJmnMsAPaluIifqyWd8hSSMxyP9oie3dLAqYPblag9KgA==",
+            "version": "24.2.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz",
+            "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~7.8.0"
+                "undici-types": "~7.10.0"
             }
         },
         "node_modules/@types/react": {
@@ -2721,17 +2690,17 @@
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz",
-            "integrity": "sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz",
+            "integrity": "sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.37.0",
-                "@typescript-eslint/type-utils": "8.37.0",
-                "@typescript-eslint/utils": "8.37.0",
-                "@typescript-eslint/visitor-keys": "8.37.0",
+                "@typescript-eslint/scope-manager": "8.39.0",
+                "@typescript-eslint/type-utils": "8.39.0",
+                "@typescript-eslint/utils": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^7.0.0",
                 "natural-compare": "^1.4.0",
@@ -2745,9 +2714,9 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.37.0",
+                "@typescript-eslint/parser": "^8.39.0",
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -2761,16 +2730,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.37.0.tgz",
-            "integrity": "sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.0.tgz",
+            "integrity": "sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.37.0",
-                "@typescript-eslint/types": "8.37.0",
-                "@typescript-eslint/typescript-estree": "8.37.0",
-                "@typescript-eslint/visitor-keys": "8.37.0",
+                "@typescript-eslint/scope-manager": "8.39.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2782,18 +2751,18 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/project-service": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
-            "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.0.tgz",
+            "integrity": "sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/tsconfig-utils": "^8.37.0",
-                "@typescript-eslint/types": "^8.37.0",
+                "@typescript-eslint/tsconfig-utils": "^8.39.0",
+                "@typescript-eslint/types": "^8.39.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2804,18 +2773,18 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
-            "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz",
+            "integrity": "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.37.0",
-                "@typescript-eslint/visitor-keys": "8.37.0"
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2826,9 +2795,9 @@
             }
         },
         "node_modules/@typescript-eslint/tsconfig-utils": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
-            "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz",
+            "integrity": "sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2839,19 +2808,19 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
-            "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz",
+            "integrity": "sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.37.0",
-                "@typescript-eslint/typescript-estree": "8.37.0",
-                "@typescript-eslint/utils": "8.37.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0",
+                "@typescript-eslint/utils": "8.39.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^2.1.0"
             },
@@ -2864,13 +2833,13 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
-            "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.0.tgz",
+            "integrity": "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2882,16 +2851,16 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
-            "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz",
+            "integrity": "sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/project-service": "8.37.0",
-                "@typescript-eslint/tsconfig-utils": "8.37.0",
-                "@typescript-eslint/types": "8.37.0",
-                "@typescript-eslint/visitor-keys": "8.37.0",
+                "@typescript-eslint/project-service": "8.39.0",
+                "@typescript-eslint/tsconfig-utils": "8.39.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/visitor-keys": "8.39.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2907,7 +2876,7 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -2937,16 +2906,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
-            "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.0.tgz",
+            "integrity": "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.7.0",
-                "@typescript-eslint/scope-manager": "8.37.0",
-                "@typescript-eslint/types": "8.37.0",
-                "@typescript-eslint/typescript-estree": "8.37.0"
+                "@typescript-eslint/scope-manager": "8.39.0",
+                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2957,17 +2926,17 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
-            "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz",
+            "integrity": "sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.37.0",
+                "@typescript-eslint/types": "8.39.0",
                 "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
@@ -3295,9 +3264,9 @@
             }
         },
         "node_modules/bits-ui": {
-            "version": "2.8.11",
-            "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-2.8.11.tgz",
-            "integrity": "sha512-lKN9rAk69my6j7H1D4B87r8LrHuEtfEsf1xCixBj9yViql2BdI3f04HyyyT7T1GOCpgb9+8b0B+nm3LN81Konw==",
+            "version": "2.9.2",
+            "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-2.9.2.tgz",
+            "integrity": "sha512-GGbyr4oVKtHin//Q0AhlygkasmfWt328VjsnmB3sP+h8Sh+Eyghm+1AQ8o+xQMDCYbdL35JZ9UZGTZYTMar4Uw==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/core": "^1.7.1",
@@ -3709,22 +3678,21 @@
             }
         },
         "node_modules/cross-env": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-            "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
+            "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "cross-spawn": "^7.0.1"
+                "@epic-web/invariant": "^1.0.0",
+                "cross-spawn": "^7.0.6"
             },
             "bin": {
-                "cross-env": "src/bin/cross-env.js",
-                "cross-env-shell": "src/bin/cross-env-shell.js"
+                "cross-env": "dist/bin/cross-env.js",
+                "cross-env-shell": "dist/bin/cross-env-shell.js"
             },
             "engines": {
-                "node": ">=10.14",
-                "npm": ">=6",
-                "yarn": ">=1"
+                "node": ">=20"
             }
         },
         "node_modules/cross-spawn": {
@@ -4467,20 +4435,20 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.31.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
-            "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
+            "version": "9.33.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
+            "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
                 "@eslint/config-array": "^0.21.0",
-                "@eslint/config-helpers": "^0.3.0",
-                "@eslint/core": "^0.15.0",
+                "@eslint/config-helpers": "^0.3.1",
+                "@eslint/core": "^0.15.2",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.31.0",
-                "@eslint/plugin-kit": "^0.3.1",
+                "@eslint/js": "9.33.0",
+                "@eslint/plugin-kit": "^0.3.5",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
@@ -4562,9 +4530,9 @@
             }
         },
         "node_modules/eslint-plugin-storybook": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-9.0.17.tgz",
-            "integrity": "sha512-IuTdlwCEwoDNobdygRCxNhlKXHmsDfPtPvHGcsY35x2Bx8KItrjfekO19gJrjc1VT2CMfcZMYF8OBKaxHELupw==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-9.1.1.tgz",
+            "integrity": "sha512-g4/i9yW6cl4TCEMzYyALNvO3d/jB6TDvSs/Pmye7dHDrra2B7dgZJGzmEWILD62brVrLVHNoXgy2dNPtx80kmw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4575,7 +4543,7 @@
             },
             "peerDependencies": {
                 "eslint": ">=8",
-                "storybook": "^9.0.17"
+                "storybook": "^9.1.1"
             }
         },
         "node_modules/eslint-plugin-svelte": {
@@ -4655,19 +4623,6 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
-        "node_modules/eslint/node_modules/@eslint/core": {
-            "version": "0.15.1",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-            "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@types/json-schema": "^7.0.15"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
         "node_modules/esm-env": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
@@ -5537,16 +5492,16 @@
             "license": "MIT"
         },
         "node_modules/layerchart": {
-            "version": "2.0.0-next.30",
-            "resolved": "https://registry.npmjs.org/layerchart/-/layerchart-2.0.0-next.30.tgz",
-            "integrity": "sha512-qUHd9pMqyQEk5jfz49Ylcq9MzzhdrXG4+qvQk71ssk5iTZlY91myoFgJ8FpL1RPHtVDTMfGBfy1I+kRfe6GYBA==",
+            "version": "2.0.0-next.36",
+            "resolved": "https://registry.npmjs.org/layerchart/-/layerchart-2.0.0-next.36.tgz",
+            "integrity": "sha512-/GfbQX31HHqZYjErC+UrLpck5SUPzxpiyssvEdSwN9IPktmKVaqOn3xYSqQVpOTVaM9C91oiqKGKaw5e+zzYKA==",
             "license": "MIT",
             "dependencies": {
                 "@dagrejs/dagre": "^1.1.4",
-                "@layerstack/svelte-actions": "1.0.1-next.12",
-                "@layerstack/svelte-state": "0.1.0-next.17",
-                "@layerstack/tailwind": "2.0.0-next.15",
-                "@layerstack/utils": "2.0.0-next.12",
+                "@layerstack/svelte-actions": "1.0.1-next.14",
+                "@layerstack/svelte-state": "0.1.0-next.19",
+                "@layerstack/tailwind": "2.0.0-next.17",
+                "@layerstack/utils": "2.0.0-next.14",
                 "d3-array": "^3.2.4",
                 "d3-color": "^3.1.0",
                 "d3-delaunay": "^6.0.4",
@@ -6711,13 +6666,13 @@
             }
         },
         "node_modules/playwright": {
-            "version": "1.54.1",
-            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
-            "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
+            "version": "1.54.2",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.2.tgz",
+            "integrity": "sha512-Hu/BMoA1NAdRUuulyvQC0pEqZ4vQbGfn8f7wPXcnqQmM+zct9UliKxsIkLNmz/ku7LElUNqmaiv1TG/aL5ACsw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "playwright-core": "1.54.1"
+                "playwright-core": "1.54.2"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -6730,9 +6685,9 @@
             }
         },
         "node_modules/playwright-core": {
-            "version": "1.54.1",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
-            "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
+            "version": "1.54.2",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.2.tgz",
+            "integrity": "sha512-n5r4HFbMmWsB4twG7tJLDN9gmBUeSPcsBZiWSE4DnYz9mJMAFqr2ID7+eGC9kpEnxExJ1epttwR59LEWCk8mtA==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -7348,9 +7303,9 @@
             }
         },
         "node_modules/runed": {
-            "version": "0.31.0",
-            "resolved": "https://registry.npmjs.org/runed/-/runed-0.31.0.tgz",
-            "integrity": "sha512-3E3i4svY4PAwI3ANmJnZuVqWG/YJrYW3Jop3HZeycQ0KZNWoFD17Jr+sG/JutJDi15g3vpdzkL7AKk6iMHybdw==",
+            "version": "0.31.1",
+            "resolved": "https://registry.npmjs.org/runed/-/runed-0.31.1.tgz",
+            "integrity": "sha512-v3czcTnO+EJjiPvD4dwIqfTdHLZ8oH0zJheKqAHh9QMViY7Qb29UlAMRpX7ZtHh7AFqV60KmfxaJ9QMy+L1igQ==",
             "funding": [
                 "https://github.com/sponsors/huntabyte",
                 "https://github.com/sponsors/tglide"
@@ -7450,17 +7405,17 @@
             }
         },
         "node_modules/shiki": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/shiki/-/shiki-3.8.1.tgz",
-            "integrity": "sha512-+MYIyjwGPCaegbpBeFN9+oOifI8CKiKG3awI/6h3JeT85c//H2wDW/xCJEGuQ5jPqtbboKNqNy+JyX9PYpGwNg==",
+            "version": "3.9.2",
+            "resolved": "https://registry.npmjs.org/shiki/-/shiki-3.9.2.tgz",
+            "integrity": "sha512-t6NKl5e/zGTvw/IyftLcumolgOczhuroqwXngDeMqJ3h3EQiTY/7wmfgPlsmloD8oYfqkEDqxiaH37Pjm1zUhQ==",
             "license": "MIT",
             "dependencies": {
-                "@shikijs/core": "3.8.1",
-                "@shikijs/engine-javascript": "3.8.1",
-                "@shikijs/engine-oniguruma": "3.8.1",
-                "@shikijs/langs": "3.8.1",
-                "@shikijs/themes": "3.8.1",
-                "@shikijs/types": "3.8.1",
+                "@shikijs/core": "3.9.2",
+                "@shikijs/engine-javascript": "3.9.2",
+                "@shikijs/engine-oniguruma": "3.9.2",
+                "@shikijs/langs": "3.9.2",
+                "@shikijs/themes": "3.9.2",
+                "@shikijs/types": "3.9.2",
                 "@shikijs/vscode-textmate": "^10.0.2",
                 "@types/hast": "^3.0.4"
             }
@@ -7646,9 +7601,9 @@
             "license": "MIT"
         },
         "node_modules/storybook": {
-            "version": "9.0.17",
-            "resolved": "https://registry.npmjs.org/storybook/-/storybook-9.0.17.tgz",
-            "integrity": "sha512-O+9jgJ+Trlq9VGD1uY4OBLKQWHHDKM/A/pA8vMW6PVehhGHNvpzcIC1bngr6mL5gGHZP2nBv+9XG8pTMcggMmg==",
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/storybook/-/storybook-9.1.1.tgz",
+            "integrity": "sha512-q6GaGZdVZh6rjOdGnc+4hGTu8ECyhyjQDw4EZNxKtQjDO8kqtuxbFm8l/IP2l+zLVJAatGWKkaX9Qcd7QZxz+Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -7656,6 +7611,7 @@
                 "@testing-library/jest-dom": "^6.6.3",
                 "@testing-library/user-event": "^14.6.1",
                 "@vitest/expect": "3.2.4",
+                "@vitest/mocker": "3.2.4",
                 "@vitest/spy": "3.2.4",
                 "better-opn": "^3.0.2",
                 "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
@@ -7830,9 +7786,9 @@
             }
         },
         "node_modules/svelte": {
-            "version": "5.36.8",
-            "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.36.8.tgz",
-            "integrity": "sha512-8JbZWQu96hMjH/oYQPxXW6taeC6Awl6muGHeZzJTxQx7NGRQ/J9wN1hkzRKLOlSDlbS2igiFg7p5xyTp5uXG3A==",
+            "version": "5.38.0",
+            "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.38.0.tgz",
+            "integrity": "sha512-cWF1Oc2IM/QbktdK89u5lt9MdKxRtQnRKnf2tq6KOhYuhLOd2hbMuTiJ+vWMzAeMDe81AzbCgLd4GVtOJ4fDRg==",
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.3.0",
@@ -7893,9 +7849,9 @@
             }
         },
         "node_modules/svelte-check": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.3.0.tgz",
-            "integrity": "sha512-Iz8dFXzBNAM7XlEIsUjUGQhbEE+Pvv9odb9+0+ITTgFWZBGeJRRYqHUUglwe2EkLD5LIsQaAc4IUJyvtKuOO5w==",
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.3.1.tgz",
+            "integrity": "sha512-lkh8gff5gpHLjxIV+IaApMxQhTGnir2pNUAqcNgeKkvK5bT/30Ey/nzBxNLDlkztCH4dP7PixkMt9SWEKFPBWg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -7931,21 +7887,6 @@
                 }
             }
         },
-        "node_modules/svelte-check/node_modules/picomatch": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "peer": true,
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
         "node_modules/svelte-eslint-parser": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.3.0.tgz",
@@ -8066,9 +8007,9 @@
             }
         },
         "node_modules/svelte2tsx": {
-            "version": "0.7.41",
-            "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.41.tgz",
-            "integrity": "sha512-/TUwpyn/Qc1wcGuayf2GSwvZ7htdAOzpo0JFFm96srKnRXoTD0gy4n06g+XgH8w016S3lPtyFVtFAm+0yJ0BZw==",
+            "version": "0.7.42",
+            "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.42.tgz",
+            "integrity": "sha512-PSNrKS16aVdAajoFjpF5M0t6TA7ha7GcKbBajD9RG3M+vooAuvLnWAGUSC6eJL4zEOVbOWKtcS2BuY4rxPljoA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8184,14 +8125,14 @@
             "license": "ISC"
         },
         "node_modules/swagger-typescript-api": {
-            "version": "13.2.7",
-            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.7.tgz",
-            "integrity": "sha512-rfqqoRFpZJPl477M/snMJPM90EvI8WqhuUHSF5ecC2r/w376T29+QXNJFVPsJmbFu5rBc/8m3vhArtMctjONdw==",
+            "version": "13.2.8",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.8.tgz",
+            "integrity": "sha512-TgC8cB2GwrQctiUrLW9cVcPkiH5/zGbUCD3Y5zjeeFAtcCBGxLlBp9Df/UK+ux/oQ2J8x3C5a4TOz+tAZ8jOkQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@biomejs/js-api": "1.0.0",
-                "@biomejs/wasm-nodejs": "2.0.5",
+                "@biomejs/js-api": "2.0.3",
+                "@biomejs/wasm-nodejs": "2.1.4",
                 "@types/swagger-schema-official": "^2.0.25",
                 "c12": "^3.0.4",
                 "citty": "^0.1.6",
@@ -8202,7 +8143,7 @@
                 "nanoid": "^5.1.5",
                 "swagger-schema-official": "2.0.0-bab6bed",
                 "swagger2openapi": "^7.0.8",
-                "typescript": "~5.8.3"
+                "typescript": "~5.9.2"
             },
             "bin": {
                 "sta": "dist/cli.js",
@@ -8293,29 +8234,22 @@
             }
         },
         "node_modules/tailwind-variants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-1.0.0.tgz",
-            "integrity": "sha512-2WSbv4ulEEyuBKomOunut65D8UZwxrHoRfYnxGcQNnHqlSCp2+B7Yz2W+yrNDrxRodOXtGD/1oCcKGNBnUqMqA==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-2.1.0.tgz",
+            "integrity": "sha512-82m0eRex0z6A3GpvfoTCpHr+wWJmbecfVZfP3mqLoDxeya5tN4mYJQZwa5Aw1hRZTedwpu1D2JizYenoEdyD8w==",
             "license": "MIT",
-            "dependencies": {
-                "tailwind-merge": "3.0.2"
-            },
             "engines": {
                 "node": ">=16.x",
                 "pnpm": ">=7.x"
             },
             "peerDependencies": {
+                "tailwind-merge": ">=3.0.0",
                 "tailwindcss": "*"
-            }
-        },
-        "node_modules/tailwind-variants/node_modules/tailwind-merge": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz",
-            "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==",
-            "license": "MIT",
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/dcastil"
+            },
+            "peerDependenciesMeta": {
+                "tailwind-merge": {
+                    "optional": true
+                }
             }
         },
         "node_modules/tailwindcss": {
@@ -8592,9 +8526,9 @@
             "license": "0BSD"
         },
         "node_modules/tw-animate-css": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/tw-animate-css/-/tw-animate-css-1.3.5.tgz",
-            "integrity": "sha512-t3u+0YNoloIhj1mMXs779P6MO9q3p3mvGn4k1n3nJPqJw/glZcuijG2qTSN4z4mgNRfW5ZC3aXJFLwDtiipZXA==",
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/tw-animate-css/-/tw-animate-css-1.3.6.tgz",
+            "integrity": "sha512-9dy0R9UsYEGmgf26L8UcHiLmSFTHa9+D7+dAt/G/sF5dCnPePZbfgDYinc7/UzAM7g/baVrmS6m9yEpU46d+LA==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/Wombosvideo"
@@ -8627,9 +8561,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+            "version": "5.9.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+            "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
             "devOptional": true,
             "license": "Apache-2.0",
             "bin": {
@@ -8641,16 +8575,16 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.37.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.37.0.tgz",
-            "integrity": "sha512-TnbEjzkE9EmcO0Q2zM+GE8NQLItNAJpMmED1BdgoBMYNdqMhzlbqfdSwiRlAzEK2pA9UzVW0gzaaIzXWg2BjfA==",
+            "version": "8.39.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.39.0.tgz",
+            "integrity": "sha512-lH8FvtdtzcHJCkMOKnN73LIn6SLTpoojgJqDAxPm1jCR14eWSGPX8ul/gggBdPMk/d5+u9V854vTYQ8T5jF/1Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.37.0",
-                "@typescript-eslint/parser": "8.37.0",
-                "@typescript-eslint/typescript-estree": "8.37.0",
-                "@typescript-eslint/utils": "8.37.0"
+                "@typescript-eslint/eslint-plugin": "8.39.0",
+                "@typescript-eslint/parser": "8.39.0",
+                "@typescript-eslint/typescript-estree": "8.39.0",
+                "@typescript-eslint/utils": "8.39.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8661,13 +8595,13 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.9.0"
+                "typescript": ">=4.8.4 <6.0.0"
             }
         },
         "node_modules/undici-types": {
-            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-            "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+            "version": "7.10.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+            "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
             "devOptional": true,
             "license": "MIT"
         },
@@ -8819,9 +8753,9 @@
             }
         },
         "node_modules/vfile-message": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
-            "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+            "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
             "license": "MIT",
             "dependencies": {
                 "@types/unist": "^3.0.0",
@@ -9274,20 +9208,6 @@
                 "node": ">=18"
             }
         },
-        "node_modules/yaml": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
-            "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
-            "license": "ISC",
-            "optional": true,
-            "peer": true,
-            "bin": {
-                "yaml": "bin.mjs"
-            },
-            "engines": {
-                "node": ">= 14.6"
-            }
-        },
         "node_modules/yargs": {
             "version": "17.7.2",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/src/Exceptionless.Web/ClientApp/package.json b/src/Exceptionless.Web/ClientApp/package.json
index 45fd3b0569..df58845d6c 100644
--- a/src/Exceptionless.Web/ClientApp/package.json
+++ b/src/Exceptionless.Web/ClientApp/package.json
@@ -25,75 +25,76 @@
         "upgrade": "ncu -i"
     },
     "devDependencies": {
-        "@chromatic-com/storybook": "^4.0.1",
-        "@eslint/compat": "^1.3.1",
-        "@eslint/js": "^9.31.0",
-        "@iconify-json/lucide": "^1.2.57",
-        "@playwright/test": "^1.54.1",
-        "@storybook/addon-a11y": "^9.0.17",
-        "@storybook/addon-docs": "^9.0.17",
+        "@chromatic-com/storybook": "^4.1.0",
+        "@eslint/compat": "^1.3.2",
+        "@eslint/js": "^9.33.0",
+        "@iconify-json/lucide": "^1.2.61",
+        "@playwright/test": "^1.54.2",
+        "@storybook/addon-a11y": "^9.1.1",
+        "@storybook/addon-docs": "^9.1.1",
         "@storybook/addon-svelte-csf": "^5.0.7",
-        "@storybook/sveltekit": "^9.0.17",
-        "@sveltejs/adapter-static": "^3.0.8",
-        "@sveltejs/kit": "^2.25.1",
-        "@sveltejs/vite-plugin-svelte": "^6.1.0",
+        "@storybook/sveltekit": "^9.1.1",
+        "@sveltejs/adapter-static": "^3.0.9",
+        "@sveltejs/kit": "^2.27.3",
+        "@sveltejs/vite-plugin-svelte": "^6.1.1",
         "@tailwindcss/vite": "^4.1.11",
-        "@testing-library/jest-dom": "^6.6.3",
+        "@testing-library/jest-dom": "^6.6.4",
         "@testing-library/svelte": "^5.2.8",
         "@types/eslint": "^9.6.1",
-        "@types/node": "^24.0.15",
+        "@types/node": "^24.2.1",
         "@types/throttle-debounce": "^5.0.2",
-        "cross-env": "^7.0.3",
-        "eslint": "^9.31.0",
+        "cross-env": "^10.0.0",
+        "eslint": "^9.33.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-perfectionist": "^4.15.0",
-        "eslint-plugin-storybook": "^9.0.17",
+        "eslint-plugin-storybook": "^9.1.1",
         "eslint-plugin-svelte": "^3.11.0",
         "jsdom": "^26.1.0",
         "prettier": "^3.6.2",
         "prettier-plugin-svelte": "^3.4.0",
         "prettier-plugin-tailwindcss": "^0.6.14",
-        "storybook": "^9.0.17",
-        "svelte": "^5.36.8",
-        "svelte-check": "^4.3.0",
-        "swagger-typescript-api": "^13.2.7",
+        "storybook": "^9.1.1",
+        "svelte": "^5.38.0",
+        "svelte-check": "^4.3.1",
+        "swagger-typescript-api": "^13.2.8",
         "tslib": "^2.8.1",
-        "typescript": "^5.8.3",
-        "typescript-eslint": "^8.37.0",
+        "typescript": "^5.9.2",
+        "typescript-eslint": "^8.39.0",
         "vite": "^6.3.5",
         "vitest": "3.2.4"
     },
     "dependencies": {
         "@exceptionless/browser": "^3.1.0",
         "@exceptionless/fetchclient": "^0.44.0",
-        "@lucide/svelte": "^0.525.0",
+        "@internationalized/date": "^3.8.2",
+        "@lucide/svelte": "^0.539.0",
         "@tanstack/svelte-query": "https://pkg.pr.new/@tanstack/svelte-query@8c9ce9",
         "@tanstack/svelte-query-devtools": "https://pkg.pr.new/@tanstack/svelte-query-devtools@8c9ce9",
         "@tanstack/svelte-table": "^9.0.0-alpha.10",
         "@types/d3-scale": "^4.0.9",
         "@types/d3-shape": "^3.1.7",
         "@typeschema/class-validator": "^0.3.0",
-        "bits-ui": "^2.8.11",
+        "bits-ui": "^2.9.2",
         "class-validator": "^0.14.2",
         "clsx": "^2.1.1",
         "d3-scale": "^4.0.2",
         "dompurify": "^3.2.6",
         "formsnap": "^2.0.1",
         "kit-query-params": "^0.0.26",
-        "layerchart": "^2.0.0-next.30",
+        "layerchart": "^2.0.0-next.36",
         "mode-watcher": "^1.1.0",
         "oidc-client-ts": "^3.3.0",
         "pretty-ms": "^9.2.0",
-        "runed": "^0.31.0",
-        "shiki": "^3.8.1",
+        "runed": "^0.31.1",
+        "shiki": "^3.9.2",
         "svelte-sonner": "^1.0.5",
         "svelte-time": "^2.0.1",
         "sveltekit-superforms": "^2.27.1",
         "tailwind-merge": "^3.3.1",
-        "tailwind-variants": "^1.0.0",
+        "tailwind-variants": "^2.1.0",
         "tailwindcss": "^4.1.11",
         "throttle-debounce": "^5.0.2",
-        "tw-animate-css": "^1.3.5"
+        "tw-animate-css": "^1.3.6"
     },
     "type": "module",
     "overrides": {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/cards/pie-chart-card.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/cards/pie-chart-card.svelte
deleted file mode 100644
index 3d6c1c1867..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/cards/pie-chart-card.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script lang="ts">
-    import * as Card from '$comp/ui/card';
-
-    interface Props {
-        title: string;
-    }
-
-    let { title }: Props = $props();
-</script>
-
-<Card.Root>
-    <Card.Header>
-        <Card.Title class="text-2xl">{title}</Card.Title>
-    </Card.Header>
-    <Card.Content>
-        <div class="w-[200px] border">
-            <svg viewBox="0 0 20 20">
-                <circle cx="10" cy="10" fill="white" r="10"></circle>
-                <circle
-                    cx="10"
-                    cy="10"
-                    fill="transparent"
-                    r="5"
-                    stroke="tomato"
-                    stroke-dasharray="calc(35 * 31.4 / 100) 31.4"
-                    stroke-width="10"
-                    transform="rotate(-90) translate(-20)"
-                ></circle>
-            </svg>
-        </div>
-    </Card.Content>
-</Card.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte
index 024c9d0617..52d8d2ed77 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte
@@ -32,7 +32,7 @@
     }
 </script>
 
-<FacetedFilter.DropDown
+<FacetedFilter.Dropdown
     changed={(value) => {
         filter.value = value;
         filterChanged(filter);
@@ -45,4 +45,4 @@
     {title}
     value={filter.value as string}
     {...props}
-></FacetedFilter.DropDown>
+></FacetedFilter.Dropdown>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts
index 0a0d212f14..d095fede77 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts
@@ -1,6 +1,7 @@
 import type { IFilter } from '$comp/faceted-filter';
 
 import { organization } from '$features/organizations/context.svelte';
+import { SvelteMap } from 'svelte/reactivity';
 
 import { DateFilter, KeywordFilter, type ProjectFilter, type StringFilter } from './models.svelte';
 
@@ -8,7 +9,7 @@ let filterCacheVersion = $state(1);
 export function filterCacheVersionNumber() {
     return filterCacheVersion;
 }
-const filterCache = new Map<null | string, IFilter[]>();
+const filterCache = new SvelteMap<null | string, IFilter[]>();
 
 export function applyTimeFilter(filters: IFilter[], time: null | string): IFilter[] {
     const dateFilterIndex = filters.findIndex((f) => f.key === 'date-date');
@@ -168,7 +169,7 @@ export function updateFilterCache(cacheKey: string, filters: IFilter[]) {
 }
 
 function processFilterRules(filters: IFilter[]): IFilter[] {
-    const uniqueFilters = new Map<string, IFilter>();
+    const uniqueFilters = new SvelteMap<string, IFilter>();
     for (const filter of filters) {
         const singletonFilterKeys = ['date-date', 'level', 'project', 'string-stack', 'tag', 'type'];
         if (singletonFilterKeys.includes(filter.key)) {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/options.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/options.ts
index 3814fd9c9d..8d02d7090f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/options.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/options.ts
@@ -1,9 +1,9 @@
-import type { DropDownItem } from '$features/shared/options';
+import type { DropdownItem } from '$features/shared/options';
 
 import type { LogLevel } from './models/event-data';
 import type { PersistentEventKnownTypes } from './models/index';
 
-export const eventTypes: DropDownItem<PersistentEventKnownTypes>[] = [
+export const eventTypes: DropdownItem<PersistentEventKnownTypes>[] = [
     {
         label: 'Not Found',
         value: '404'
@@ -34,7 +34,7 @@ export const eventTypes: DropDownItem<PersistentEventKnownTypes>[] = [
     }
 ];
 
-export const logLevels: DropDownItem<LogLevel>[] = [
+export const logLevels: DropdownItem<LogLevel>[] = [
     {
         label: 'Trace',
         value: 'trace'
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
index 261d8725f3..34ac8a01ae 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
@@ -5,7 +5,7 @@ import { accessToken } from '$features/auth/index.svelte';
 import { type FetchClientResponse, type ProblemDetails, useFetchClient } from '@exceptionless/fetchclient';
 import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query';
 
-import type { Invoice, InvoiceGridModel, NewOrganization, ViewOrganization } from './models';
+import type { Invoice, InvoiceGridModel, NewOrganization, SuspensionCode, ViewOrganization } from './models';
 
 export async function invalidateOrganizationQueries(queryClient: QueryClient, message: WebSocketMessageValue<'OrganizationChanged'>) {
     const { id } = message;
@@ -25,10 +25,13 @@ export const queryKeys = {
     id: (id: string | undefined, mode: 'stats' | undefined) => (mode ? ([...queryKeys.type, id, { mode }] as const) : ([...queryKeys.type, id] as const)),
     ids: (ids: string[] | undefined) => [...queryKeys.type, ...(ids ?? [])] as const,
     invoice: (id: string | undefined) => [...queryKeys.type, 'invoice', id] as const,
-    invoices: (organizationId: string | undefined) => [...queryKeys.type, organizationId, 'invoices'] as const,
+    invoices: (id: string | undefined) => [...queryKeys.type, id, 'invoices'] as const,
     list: (mode: 'stats' | undefined) => (mode ? ([...queryKeys.type, 'list', { mode }] as const) : ([...queryKeys.type, 'list'] as const)),
     postOrganization: () => [...queryKeys.type, 'post-organization'] as const,
-    type: ['Organization'] as const
+    setBonusOrganization: (id: string | undefined) => [...queryKeys.type, id, 'set-bonus'] as const,
+    suspendOrganization: (id: string | undefined) => [...queryKeys.type, id, 'suspend'] as const,
+    type: ['Organization'] as const,
+    unsuspendOrganization: (id: string | undefined) => [...queryKeys.type, id, 'unsuspend'] as const
 };
 
 export interface AddOrganizationUserRequest {
@@ -44,6 +47,32 @@ export interface DeleteOrganizationRequest {
     };
 }
 
+export interface DeleteOrganizationUserRequest {
+    route: {
+        email: string;
+        organizationId: string;
+    };
+}
+
+export interface DeleteOrganizationUserRequest {
+    route: {
+        email: string;
+        organizationId: string;
+    };
+}
+
+export interface DeleteSuspendOrganizationRequest {
+    route: {
+        id: string | undefined;
+    };
+}
+
+export interface DeleteSuspendOrganizationRequest {
+    route: {
+        id: string | undefined;
+    };
+}
+
 export interface GetInvoiceRequest {
     route: {
         id: string;
@@ -61,6 +90,7 @@ export interface GetInvoicesRequest {
     };
 }
 
+// TODO: Look at params:?
 export interface GetOrganizationRequest {
     params?: {
         mode: 'stats' | undefined;
@@ -80,16 +110,26 @@ export interface GetOrganizationsRequest {
     params?: GetOrganizationsParams;
 }
 
-export interface RemoveOrganizationUserRequest {
+export interface PatchOrganizationRequest {
     route: {
-        email: string;
-        organizationId: string;
+        id: string;
     };
 }
 
-export interface UpdateOrganizationRequest {
+export interface PostSetBonusOrganizationParams {
+    bonusEvents: number;
+    expires?: Date;
+    organizationId: string;
+}
+
+export interface PostSuspendOrganizationParams {
+    code: SuspensionCode;
+    notes?: string;
+}
+
+export interface PostSuspendOrganizationRequest {
     route: {
-        id: string;
+        id: string | undefined;
     };
 }
 
@@ -134,6 +174,43 @@ export function deleteOrganization(request: DeleteOrganizationRequest) {
     }));
 }
 
+export function deleteOrganizationUser(request: DeleteOrganizationUserRequest) {
+    const queryClient = useQueryClient();
+    return createMutation<void, ProblemDetails, void>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.organizationId && !!request.route.email,
+        mutationFn: async () => {
+            const client = useFetchClient();
+            await client.deleteJSON<void>(`organizations/${request.route.organizationId}/users/${encodeURIComponent(request.route.email)}`);
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.organizationId, undefined) });
+            queryClient.invalidateQueries({ queryKey: ['User', 'organization', request.route.organizationId] });
+        }
+    }));
+}
+
+export function deleteSuspendOrganization(request: DeleteSuspendOrganizationRequest) {
+    const queryClient = useQueryClient();
+
+    return createMutation<boolean, ProblemDetails, void>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.id,
+        mutationFn: async () => {
+            const client = useFetchClient();
+            const response = await client.delete(`organizations/${request.route.id}/suspend`);
+            return response.ok;
+        },
+        mutationKey: queryKeys.unsuspendOrganization(request.route.id),
+        onError: () => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
+        },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, 'stats') });
+            queryClient.invalidateQueries({ queryKey: queryKeys.list(undefined) });
+        }
+    }));
+}
+
 export function getInvoiceQuery(request: GetInvoiceRequest) {
     const queryClient = useQueryClient();
 
@@ -225,6 +302,26 @@ export function getOrganizationsQuery(request: GetOrganizationsRequest) {
     }));
 }
 
+export function patchOrganization(request: PatchOrganizationRequest) {
+    const queryClient = useQueryClient();
+
+    return createMutation<ViewOrganization, ProblemDetails, NewOrganization>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.id,
+        mutationFn: async (data: NewOrganization) => {
+            const client = useFetchClient();
+            const response = await client.patchJSON<ViewOrganization>(`organizations/${request.route.id}`, data);
+            return response.data!;
+        },
+        onError: () => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
+        },
+        onSuccess: (organization: ViewOrganization) => {
+            queryClient.setQueryData(queryKeys.id(request.route.id, 'stats'), organization);
+            queryClient.setQueryData(queryKeys.id(request.route.id, undefined), organization);
+        }
+    }));
+}
+
 export function postOrganization() {
     const queryClient = useQueryClient();
 
@@ -242,37 +339,54 @@ export function postOrganization() {
     }));
 }
 
-export function removeOrganizationUser(request: RemoveOrganizationUserRequest) {
+export function postSetBonusOrganization() {
     const queryClient = useQueryClient();
-    return createMutation<void, ProblemDetails, void>(() => ({
-        enabled: () => !!accessToken.current && !!request.route.organizationId && !!request.route.email,
-        mutationFn: async () => {
+
+    return createMutation<boolean, ProblemDetails, PostSetBonusOrganizationParams>(() => ({
+        enabled: () => !!accessToken.current,
+        mutationFn: async (params: PostSetBonusOrganizationParams) => {
             const client = useFetchClient();
-            await client.deleteJSON<void>(`organizations/${request.route.organizationId}/users/${encodeURIComponent(request.route.email)}`);
+
+            const response = await client.post('admin/set-bonus', undefined, {
+                params: {
+                    ...params,
+                    expires: params.expires ? params.expires.toISOString() : undefined
+                }
+            });
+            return response.ok;
         },
-        onSuccess: () => {
-            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.organizationId, undefined) });
-            queryClient.invalidateQueries({ queryKey: ['User', 'organization', request.route.organizationId] });
+        mutationKey: queryKeys.setBonusOrganization(undefined),
+        onError: (error, params) => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(params.organizationId, undefined) });
+        },
+        onSuccess: (data, params) => {
+            // TODO: Normalize all this invalidation.
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(params.organizationId, undefined) });
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(params.organizationId, 'stats') });
+            queryClient.invalidateQueries({ queryKey: queryKeys.list(undefined) });
         }
     }));
 }
 
-export function updateOrganization(request: UpdateOrganizationRequest) {
+export function postSuspendOrganization(request: PostSuspendOrganizationRequest) {
     const queryClient = useQueryClient();
 
-    return createMutation<ViewOrganization, ProblemDetails, NewOrganization>(() => ({
+    return createMutation<boolean, ProblemDetails, PostSuspendOrganizationParams>(() => ({
         enabled: () => !!accessToken.current && !!request.route.id,
-        mutationFn: async (data: NewOrganization) => {
+        mutationFn: async (params: PostSuspendOrganizationParams) => {
             const client = useFetchClient();
-            const response = await client.patchJSON<ViewOrganization>(`organizations/${request.route.id}`, data);
-            return response.data!;
+            const response = await client.postJSON(`organizations/${request.route.id}/suspend`, params);
+            return response.ok;
         },
+        mutationKey: queryKeys.suspendOrganization(request.route.id),
         onError: () => {
             queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
         },
-        onSuccess: (organization: ViewOrganization) => {
-            queryClient.setQueryData(queryKeys.id(request.route.id, 'stats'), organization);
-            queryClient.setQueryData(queryKeys.id(request.route.id, undefined), organization);
+        onSuccess: () => {
+            // TODO: Normalize all this invalidation.
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, 'stats') });
+            queryClient.invalidateQueries({ queryKey: queryKeys.list(undefined) });
         }
     }));
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/dialogs/set-event-bonus-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/dialogs/set-event-bonus-dialog.svelte
new file mode 100644
index 0000000000..7c36154353
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/dialogs/set-event-bonus-dialog.svelte
@@ -0,0 +1,159 @@
+<script lang="ts">
+    import type { PostSetBonusOrganizationParams } from '$features/organizations/api.svelte';
+    import type { ViewOrganization } from '$features/organizations/models';
+
+    import { P } from '$comp/typography';
+    import * as AlertDialog from '$comp/ui/alert-dialog';
+    import { Button, buttonVariants } from '$comp/ui/button';
+    import * as Calendar from '$comp/ui/calendar';
+    import * as Form from '$comp/ui/form';
+    import { Input } from '$comp/ui/input';
+    import * as Popover from '$comp/ui/popover';
+    import { SetBonusOrganizationForm } from '$features/organizations/models';
+    import Number from '$features/shared/components/formatters/number.svelte';
+    import { formatDateLabel } from '$features/shared/dates';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
+    import { CalendarDate } from '@internationalized/date';
+    import CalendarIcon from '@lucide/svelte/icons/calendar';
+    import { SvelteDate } from 'svelte/reactivity';
+    import { defaults, superForm } from 'sveltekit-superforms';
+    import { classvalidatorClient } from 'sveltekit-superforms/adapters';
+
+    interface Props {
+        open: boolean;
+        organization: ViewOrganization;
+        setBonus: (params: PostSetBonusOrganizationParams) => Promise<void>;
+    }
+
+    let { open = $bindable(), organization, setBonus }: Props = $props();
+
+    const form = superForm(defaults(new SetBonusOrganizationForm(), classvalidatorClient(SetBonusOrganizationForm)), {
+        dataType: 'json',
+        id: 'set-bonus-organization-form',
+        async onUpdate({ form, result }) {
+            if (!form.valid) {
+                return;
+            }
+
+            try {
+                await setBonus({
+                    bonusEvents: form.data.bonusEvents,
+                    expires: form.data.expires,
+                    organizationId: organization.id
+                });
+
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
+        },
+        SPA: true,
+        validators: classvalidatorClient(SetBonusOrganizationForm)
+    });
+
+    const { enhance, form: formData } = form;
+
+    let calendarValue = $state<CalendarDate | undefined>();
+    let calendarOpen = $state(false);
+
+    $effect(() => {
+        if (open) {
+            if (organization.bonus_events_per_month > 0) {
+                $formData.bonusEvents = organization.bonus_events_per_month;
+                if (organization.bonus_expiration) {
+                    const expirationDate = new Date(organization.bonus_expiration);
+                    $formData.expires = expirationDate;
+                    calendarValue = new CalendarDate(expirationDate.getFullYear(), expirationDate.getMonth() + 1, expirationDate.getDate());
+                }
+            } else {
+                // Set default values: 20% of plan limit and first day of next month
+                const defaultBonus = Math.round(organization.max_events_per_month * 0.2);
+                $formData.bonusEvents = defaultBonus;
+
+                const nextMonth = new SvelteDate();
+                nextMonth.setMonth(nextMonth.getMonth() + 1);
+                nextMonth.setDate(1);
+                nextMonth.setHours(0, 0, 0, 0);
+
+                $formData.expires = nextMonth;
+                calendarValue = new CalendarDate(nextMonth.getFullYear(), nextMonth.getMonth() + 1, nextMonth.getDate());
+            }
+        }
+    });
+
+    $effect(() => {
+        if (calendarValue) {
+            $formData.expires = new Date(Date.UTC(calendarValue.year, calendarValue.month - 1, calendarValue.day));
+        }
+    });
+</script>
+
+<AlertDialog.Root bind:open>
+    <AlertDialog.Content>
+        <form method="POST" use:enhance>
+            <AlertDialog.Header>
+                <AlertDialog.Title>Set Bonus Events</AlertDialog.Title>
+                <AlertDialog.Description>
+                    Grant additional event capacity to the organization "{organization.name}".
+                </AlertDialog.Description>
+            </AlertDialog.Header>
+
+            <P class="space-y-4 pb-4">
+                <Form.Field {form} name="bonusEvents">
+                    <Form.Control>
+                        {#snippet children({ props })}
+                            <Form.Label>Bonus Events</Form.Label>
+                            <Input
+                                {...props}
+                                type="number"
+                                min="0"
+                                step="1"
+                                bind:value={$formData.bonusEvents}
+                                placeholder="Enter number of bonus events to add"
+                            />
+                        {/snippet}
+                    </Form.Control>
+                    <Form.Description>
+                        This one-time bonus increases the organization's event limit. Current plan limit: <Number value={organization.max_events_per_month} />
+                    </Form.Description>
+                    <Form.FieldErrors />
+                </Form.Field>
+
+                <Form.Field {form} name="expires">
+                    <Form.Control>
+                        {#snippet children({ props })}
+                            <Form.Label>Expiration Date</Form.Label>
+                            <Popover.Root bind:open={calendarOpen}>
+                                <Popover.Trigger>
+                                    <Button {...props} variant="outline" class="w-full justify-start text-left font-normal" type="button">
+                                        <CalendarIcon class="mr-2 size-4" />
+                                        {$formData.expires ? formatDateLabel($formData.expires) : 'Select a date...'}
+                                    </Button>
+                                </Popover.Trigger>
+                                <Popover.Content class="w-auto p-0">
+                                    <Calendar.Calendar bind:value={calendarValue} type="single" calendarLabel="Select an expiration date" locale="en-US" />
+                                </Popover.Content>
+                            </Popover.Root>
+                        {/snippet}
+                    </Form.Control>
+                    <Form.Description>Bonus events will expire after this date.</Form.Description>
+                    <Form.FieldErrors />
+                </Form.Field>
+            </P>
+
+            <AlertDialog.Footer>
+                <AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
+                <AlertDialog.Action type="submit" class={buttonVariants({ variant: 'default' })}>Set Bonus</AlertDialog.Action>
+            </AlertDialog.Footer>
+        </form>
+    </AlertDialog.Content>
+</AlertDialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/dialogs/suspend-organization-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/dialogs/suspend-organization-dialog.svelte
new file mode 100644
index 0000000000..919af68608
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/dialogs/suspend-organization-dialog.svelte
@@ -0,0 +1,126 @@
+<script lang="ts">
+    import type { PostSuspendOrganizationParams } from '$features/organizations/api.svelte';
+    import type { ViewOrganization } from '$features/organizations/models';
+
+    import { P } from '$comp/typography';
+    import * as AlertDialog from '$comp/ui/alert-dialog';
+    import { buttonVariants } from '$comp/ui/button';
+    import * as Form from '$comp/ui/form';
+    import * as Select from '$comp/ui/select';
+    import { Textarea } from '$comp/ui/textarea';
+    import { SuspendOrganizationForm, SuspensionCode } from '$features/organizations/models';
+    import { suspensionCodeOptions } from '$features/organizations/options';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
+    import { defaults, superForm } from 'sveltekit-superforms';
+    import { classvalidatorClient } from 'sveltekit-superforms/adapters';
+
+    interface Props {
+        open: boolean;
+        organization: ViewOrganization;
+        suspend: (params: PostSuspendOrganizationParams) => Promise<void>;
+    }
+
+    let { open = $bindable(), organization, suspend }: Props = $props();
+
+    const form = superForm(defaults(new SuspendOrganizationForm(), classvalidatorClient(SuspendOrganizationForm)), {
+        dataType: 'json',
+        id: 'suspend-organization-form',
+        async onUpdate({ form, result }) {
+            if (!form.valid) {
+                return;
+            }
+
+            try {
+                await suspend({
+                    code: Number(form.data.code) as SuspensionCode,
+                    notes: form.data.notes
+                });
+
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
+        },
+        SPA: true,
+        validators: classvalidatorClient(SuspendOrganizationForm)
+    });
+
+    const { enhance, form: formData } = form;
+
+    // Set default suspension code to Abuse
+    let selectedCodeValue = $state(String(SuspensionCode.Abuse));
+
+    $effect(() => {
+        if (open && !$formData.code) {
+            $formData.code = SuspensionCode.Abuse;
+            selectedCodeValue = String(SuspensionCode.Abuse);
+        }
+    });
+
+    function handleCodeChange(value: string | undefined) {
+        if (value) {
+            selectedCodeValue = value;
+            $formData.code = Number(value) as SuspensionCode;
+        }
+    }
+</script>
+
+<AlertDialog.Root bind:open>
+    <AlertDialog.Content>
+        <form method="POST" use:enhance>
+            <AlertDialog.Header>
+                <AlertDialog.Title>Suspend Organization</AlertDialog.Title>
+                <AlertDialog.Description>
+                    Are you sure you want to suspend the organization "{organization.name}"?
+                </AlertDialog.Description>
+            </AlertDialog.Header>
+
+            <P class="space-y-4 pb-4">
+                <Form.Field {form} name="code">
+                    <Form.Control>
+                        {#snippet children({ props })}
+                            <Form.Label>Reason for Suspension</Form.Label>
+                            <Select.Root bind:value={selectedCodeValue} onValueChange={handleCodeChange} type="single" {...props}>
+                                <Select.Trigger class="w-full">
+                                    {suspensionCodeOptions.find((option) => String(option.value) === selectedCodeValue)?.label || 'Select a reason...'}
+                                </Select.Trigger>
+                                <Select.Content>
+                                    {#each suspensionCodeOptions as option (option.value)}
+                                        <Select.Item value={String(option.value)}>{option.label}</Select.Item>
+                                    {/each}
+                                </Select.Content>
+                            </Select.Root>
+                        {/snippet}
+                    </Form.Control>
+                    <Form.Description>Select a reason for suspending this organization.</Form.Description>
+                    <Form.FieldErrors />
+                </Form.Field>
+
+                <Form.Field {form} name="notes">
+                    <Form.Control>
+                        {#snippet children({ props })}
+                            <Form.Label>Additional Details (Optional)</Form.Label>
+                            <Textarea {...props} bind:value={$formData.notes} placeholder="Add any relevant context or details..." rows={3} />
+                        {/snippet}
+                    </Form.Control>
+                    <Form.Description>Provide any relevant context or notes about this suspension.</Form.Description>
+                    <Form.FieldErrors />
+                </Form.Field>
+            </P>
+
+            <AlertDialog.Footer>
+                <AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
+                <AlertDialog.Action type="submit" class={buttonVariants({ variant: 'destructive' })}>Suspend Organization</AlertDialog.Action>
+            </AlertDialog.Footer>
+        </form>
+    </AlertDialog.Content>
+</AlertDialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/organization-admin-actions-dropdown-menu.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/organization-admin-actions-dropdown-menu.svelte
new file mode 100644
index 0000000000..f7390094ab
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/organization-admin-actions-dropdown-menu.svelte
@@ -0,0 +1,124 @@
+<script lang="ts">
+    import type { PostSetBonusOrganizationParams, PostSuspendOrganizationParams } from '$features/organizations/api.svelte';
+    import type { ViewOrganization } from '$features/organizations/models';
+
+    import { Button } from '$comp/ui/button';
+    import * as DropdownMenu from '$comp/ui/dropdown-menu';
+    import { deleteSuspendOrganization, postSetBonusOrganization, postSuspendOrganization } from '$features/organizations/api.svelte';
+    import SetEventBonusDialog from '$features/organizations/components/dialogs/set-event-bonus-dialog.svelte';
+    import SuspendOrganizationDialog from '$features/organizations/components/dialogs/suspend-organization-dialog.svelte';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
+    import Award from '@lucide/svelte/icons/award';
+    import Pause from '@lucide/svelte/icons/pause';
+    import Play from '@lucide/svelte/icons/play';
+    import Shield from '@lucide/svelte/icons/shield';
+    import { toast } from 'svelte-sonner';
+
+    interface Props {
+        organization: undefined | ViewOrganization;
+    }
+
+    let { organization }: Props = $props();
+
+    let toastId = $state<number | string>();
+    let openSuspendOrganizationDialog = $state(false);
+    let openSetEventBonusDialog = $state(false);
+
+    const markSuspended = postSuspendOrganization({
+        route: {
+            get id() {
+                return organization?.id;
+            }
+        }
+    });
+
+    const markUnsuspended = deleteSuspendOrganization({
+        route: {
+            get id() {
+                return organization?.id;
+            }
+        }
+    });
+
+    const setOrganizationBonus = postSetBonusOrganization();
+
+    async function suspend(params: PostSuspendOrganizationParams) {
+        toast.dismiss(toastId);
+
+        try {
+            await markSuspended.mutateAsync(params);
+            toastId = toast.success('Successfully suspended the organization.');
+        } catch (error: unknown) {
+            const message = error instanceof ProblemDetails ? error.title : 'Please try again.';
+            toastId = toast.error(`An error occurred while trying to suspend the organization: ${message}`);
+            throw error;
+        }
+    }
+
+    async function setBonus(params: PostSetBonusOrganizationParams) {
+        toast.dismiss(toastId);
+
+        try {
+            await setOrganizationBonus.mutateAsync(params);
+            toastId = toast.success('Successfully set the organization bonus.');
+        } catch (error: unknown) {
+            const message = error instanceof ProblemDetails ? error.title : 'Please try again.';
+            toastId = toast.error(`An error occurred while trying to set the organization bonus: ${message}`);
+            throw error;
+        }
+    }
+
+    async function handleUnsuspend() {
+        toast.dismiss(toastId);
+
+        try {
+            await markUnsuspended.mutateAsync();
+            toastId = toast.success('Successfully unsuspended the organization.');
+        } catch (error: unknown) {
+            const message = error instanceof ProblemDetails ? error.title : 'Please try again.';
+            toastId = toast.error(`An error occurred while trying to unsuspend the organization: ${message}`);
+        }
+    }
+
+    function handleSetBonus() {
+        openSetEventBonusDialog = true;
+    }
+</script>
+
+<DropdownMenu.Root>
+    <DropdownMenu.Trigger>
+        <Button variant="outline" size="icon" aria-label="Admin Actions" title="Admin Actions">
+            <Shield class="size-4" />
+        </Button>
+    </DropdownMenu.Trigger>
+    <DropdownMenu.Content align="end" class="w-56">
+        <DropdownMenu.Group>
+            <DropdownMenu.GroupHeading>Admin Actions</DropdownMenu.GroupHeading>
+            <DropdownMenu.Separator />
+            {#if organization?.is_suspended}
+                <DropdownMenu.Item onclick={handleUnsuspend} disabled={markUnsuspended.isPending}>
+                    <Play class="mr-2 size-4" />
+                    <span>Unsuspend Organization</span>
+                </DropdownMenu.Item>
+            {:else}
+                <DropdownMenu.Item onclick={() => (openSuspendOrganizationDialog = true)} disabled={markSuspended.isPending}>
+                    <Pause class="mr-2 size-4" />
+                    <span>Suspend Organization</span>
+                </DropdownMenu.Item>
+            {/if}
+            <DropdownMenu.Separator />
+            <DropdownMenu.Item onclick={handleSetBonus}>
+                <Award class="mr-2 size-4" />
+                <span>Set Bonus</span>
+            </DropdownMenu.Item>
+        </DropdownMenu.Group>
+    </DropdownMenu.Content>
+</DropdownMenu.Root>
+
+{#if organization && openSuspendOrganizationDialog}
+    <SuspendOrganizationDialog bind:open={openSuspendOrganizationDialog} {organization} {suspend} />
+{/if}
+
+{#if organization && openSetEventBonusDialog}
+    <SetEventBonusDialog bind:open={openSetEventBonusDialog} {organization} {setBonus} />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/table/organization-actions-cell.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/table/organization-actions-cell.svelte
index 28ccb20263..f6f45a0448 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/table/organization-actions-cell.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/components/table/organization-actions-cell.svelte
@@ -2,7 +2,7 @@
     import { goto } from '$app/navigation';
     import { Button } from '$comp/ui/button';
     import * as DropdownMenu from '$comp/ui/dropdown-menu';
-    import { deleteOrganization, removeOrganizationUser } from '$features/organizations/api.svelte';
+    import { deleteOrganization, deleteOrganizationUser } from '$features/organizations/api.svelte';
     import { ViewOrganization } from '$features/organizations/models';
     import { getMeQuery } from '$features/users/api.svelte';
     import { ProblemDetails } from '@exceptionless/fetchclient';
@@ -37,7 +37,7 @@
         }
     });
 
-    const leaveOrganization = removeOrganizationUser({
+    const leaveOrganization = deleteOrganizationUser({
         route: {
             get email() {
                 return meQuery.data?.email_address ?? '';
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/models.ts
index 8adec99601..428b95a0e1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/models.ts
@@ -1 +1,28 @@
 export { Invoice, InvoiceGridModel, NewOrganization, ViewOrganization } from '$generated/api';
+import { IsDate, IsEnum, IsInt, IsOptional, IsString } from 'class-validator';
+
+// TODO: This should be generated from the backend enum - investigate why it wasn't included in the generated API
+export enum SuspensionCode {
+    Billing = 0,
+    Overage = 1,
+    Abuse = 2,
+    Other = 100
+}
+
+export class SetBonusOrganizationForm {
+    @IsInt()
+    bonusEvents!: number;
+
+    @IsDate()
+    @IsOptional()
+    expires?: Date;
+}
+
+export class SuspendOrganizationForm {
+    @IsEnum(SuspensionCode)
+    code!: SuspensionCode;
+
+    @IsOptional()
+    @IsString()
+    notes?: string;
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/options.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/options.ts
new file mode 100644
index 0000000000..94891a37a8
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/options.ts
@@ -0,0 +1,22 @@
+import type { DropdownItem } from '$features/shared/options';
+
+import { SuspensionCode } from './models';
+
+export const suspensionCodeOptions: DropdownItem<SuspensionCode>[] = [
+    {
+        label: 'Billing',
+        value: SuspensionCode.Billing
+    },
+    {
+        label: 'Overage',
+        value: SuspensionCode.Overage
+    },
+    {
+        label: 'Abuse',
+        value: SuspensionCode.Abuse
+    },
+    {
+        label: 'Other',
+        value: SuspensionCode.Other
+    }
+];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
index 07a2d47759..9a892854bc 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
@@ -18,6 +18,8 @@ export async function invalidateProjectQueries(queryClient: QueryClient, message
 
     if (!id && !organization_id) {
         await queryClient.invalidateQueries({ queryKey: queryKeys.type });
+    } else {
+        await queryClient.invalidateQueries({ queryKey: queryKeys.projects() });
     }
 }
 
@@ -36,10 +38,13 @@ export const queryKeys = {
     postProject: () => [...queryKeys.type, 'post-project'] as const,
     postPromotedTab: (id: string | undefined) => [...queryKeys.id(id), 'promote-tab'] as const,
     postSlack: (id: string | undefined) => [...queryKeys.id(id), 'post-slack'] as const,
+    postUserNotificationSettings: (id: string | undefined, userId: string | undefined) => [...queryKeys.id(id), userId, 'post-notification-settings'] as const,
+    projects: () => [...queryKeys.type, 'projects'] as const,
     putIntegrationNotificationSettings: (id: string | undefined, integration: string) =>
         [...queryKeys.id(id), integration, 'put-notification-settings'] as const,
     resetData: (id: string | undefined) => [...queryKeys.id(id), 'reset-data'] as const,
-    type: ['Project'] as const
+    type: ['Project'] as const,
+    userNotificationSettings: (id: string | undefined, userId: string | undefined) => [...queryKeys.id(id), userId, 'notification-settings'] as const
 };
 export interface DeleteConfigParams {
     key: string;
@@ -109,6 +114,25 @@ export interface GetProjectRequest {
 
 export type GetProjectsMode = 'stats' | null;
 
+export interface GetProjectsParams {
+    filter?: string;
+    limit?: number;
+    mode?: GetProjectsMode;
+    page?: number;
+    sort?: string;
+}
+
+export interface GetProjectsRequest {
+    params?: GetProjectsParams;
+}
+
+export interface GetProjectUserNotificationSettingsRequest {
+    route: {
+        id: string | undefined;
+        userId: string | undefined;
+    };
+}
+
 export interface PostConfigParams {
     key: string;
     value: string;
@@ -120,6 +144,13 @@ export interface PostConfigRequest {
     };
 }
 
+export interface PostProjectUserNotificationSettingsRequest {
+    route: {
+        id: string | undefined;
+        userId: string | undefined;
+    };
+}
+
 export interface PostPromotedTabParams {
     name: string;
 }
@@ -316,6 +347,48 @@ export function getProjectQuery(request: GetProjectRequest) {
     }));
 }
 
+export function getProjectsQuery(request: GetProjectsRequest) {
+    const queryClient = useQueryClient();
+
+    return createQuery<FetchClientResponse<ViewProject[]>, ProblemDetails>(() => ({
+        enabled: () => !!accessToken.current,
+        onSuccess: (data: FetchClientResponse<ViewProject[]>) => {
+            data.data?.forEach((project) => {
+                queryClient.setQueryData(queryKeys.id(project.id!), project);
+            });
+        },
+        queryClient,
+        queryFn: async ({ signal }: { signal: AbortSignal }) => {
+            const client = useFetchClient();
+            const response = await client.getJSON<ViewProject[]>('projects', {
+                params: {
+                    ...request.params,
+                    limit: request.params?.limit ?? 1000
+                },
+                signal
+            });
+
+            return response;
+        },
+        queryKey: [queryKeys.projects(), { params: request.params }]
+    }));
+}
+
+export function getProjectUserNotificationSettings(request: GetProjectUserNotificationSettingsRequest) {
+    return createQuery<NotificationSettings, ProblemDetails>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.id && !!request.route.userId,
+        queryFn: async ({ signal }: { signal: AbortSignal }) => {
+            const client = useFetchClient();
+            const response = await client.getJSON<NotificationSettings>(`users/${request.route.userId}/projects/${request.route.id}/notifications`, {
+                signal
+            });
+
+            return response.data!;
+        },
+        queryKey: queryKeys.userNotificationSettings(request.route.id, request.route.userId)
+    }));
+}
+
 export function postProject() {
     const queryClient = useQueryClient();
 
@@ -353,6 +426,23 @@ export function postProjectConfig(request: PostConfigRequest) {
     }));
 }
 
+export function postProjectUserNotificationSettings(request: PostProjectUserNotificationSettingsRequest) {
+    const queryClient = useQueryClient();
+
+    return createMutation<boolean, ProblemDetails, NotificationSettings>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.id && !!request.route.userId,
+        mutationFn: async (settings: NotificationSettings) => {
+            const client = useFetchClient();
+            const response = await client.post(`users/${request.route.userId}/projects/${request.route.id}/notifications`, settings);
+            return response.ok;
+        },
+        mutationKey: queryKeys.postUserNotificationSettings(request.route.id, request.route.userId),
+        onSuccess: (_: boolean, variables: NotificationSettings) => {
+            queryClient.setQueryData(queryKeys.userNotificationSettings(request.route.id, request.route.userId), variables);
+        }
+    }));
+}
+
 export function postPromotedTab(request: PostPromotedTabRequest) {
     const queryClient = useQueryClient();
     return createMutation<boolean, ProblemDetails, PostPromotedTabParams>(() => ({
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/add-project-config-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/add-project-config-dialog.svelte
index 722efe2640..9c7a4ad84d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/add-project-config-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/add-project-config-dialog.svelte
@@ -3,6 +3,8 @@
     import * as AlertDialog from '$comp/ui/alert-dialog';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
 
@@ -16,13 +18,26 @@
 
     const form = superForm(defaults(new ClientConfigurationSetting(), classvalidatorClient(ClientConfigurationSetting)), {
         dataType: 'json',
-        async onUpdate({ form }) {
+        id: 'add-project-config',
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await save(form.data);
-            open = false;
+            try {
+                await save(form.data);
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(ClientConfigurationSetting)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/update-project-config-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/update-project-config-dialog.svelte
index d71a3770a9..37f9cd4dac 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/update-project-config-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/dialogs/update-project-config-dialog.svelte
@@ -3,6 +3,8 @@
     import * as AlertDialog from '$comp/ui/alert-dialog';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
 
@@ -21,13 +23,26 @@
 
     const form = superForm(defaults(defaultValue, classvalidatorClient(ClientConfigurationSetting)), {
         dataType: 'json',
-        async onUpdate({ form }) {
+        id: 'update-project-config',
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await save(form.data.value.trim());
-            open = false;
+            try {
+                await save(form.data.value.trim());
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(ClientConfigurationSetting)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/integration-notification-settings-form.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/integration-notification-settings-form.svelte
new file mode 100644
index 0000000000..a39307bad3
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/integration-notification-settings-form.svelte
@@ -0,0 +1,135 @@
+<script lang="ts">
+    import ErrorMessage from '$comp/error-message.svelte';
+    import { Muted } from '$comp/typography';
+    import { Skeleton } from '$comp/ui/skeleton';
+    import { Switch } from '$comp/ui/switch';
+    import { NotificationSettings } from '$features/projects/models';
+    import { structuredCloneState } from '$features/shared/utils/state.svelte';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
+    import { toast } from 'svelte-sonner';
+    import { defaults, superForm } from 'sveltekit-superforms';
+    import { classvalidatorClient } from 'sveltekit-superforms/adapters';
+    import { debounce } from 'throttle-debounce';
+
+    interface Props {
+        save: (settings: NotificationSettings) => Promise<void>;
+        settings?: NotificationSettings;
+    }
+
+    let { save, settings }: Props = $props();
+    let toastId = $state<number | string>();
+    let previousSettingsRef = $state<NotificationSettings>();
+
+    const form = superForm(defaults(structuredCloneState(settings) || new NotificationSettings(), classvalidatorClient(NotificationSettings)), {
+        dataType: 'json',
+        id: 'integration-notification-settings',
+        async onUpdate({ form, result }) {
+            if (!form.valid) {
+                return;
+            }
+
+            toast.dismiss(toastId);
+            if (save) {
+                try {
+                    await save(form.data);
+
+                    // HACK: This is to prevent sveltekit from stealing focus
+                    result.type = 'failure';
+                } catch (error: unknown) {
+                    if (error instanceof ProblemDetails) {
+                        applyServerSideErrors(form, error);
+                        result.status = error.status ?? 500;
+                    } else {
+                        result.status = 500;
+                    }
+
+                    toastId = toast.error(form.message ?? 'Error saving notification settings. Please try again.');
+                }
+            }
+        },
+        SPA: true,
+        validators: classvalidatorClient(NotificationSettings)
+    });
+
+    const { enhance, form: formData, message, submit, submitting, tainted } = form;
+    const debouncedFormSubmit = debounce(500, () => submit());
+
+    $effect(() => {
+        if (!$submitting && !$tainted && settings !== previousSettingsRef) {
+            const clonedSettings = structuredCloneState(settings);
+            form.reset({ data: clonedSettings, keepMessage: true });
+            previousSettingsRef = settings;
+        }
+    });
+</script>
+
+{#if $formData.send_daily_summary !== undefined}
+    <form method="POST" use:enhance class="space-y-3">
+        <ErrorMessage message={$message} />
+
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="text-sm font-medium">New Errors</div>
+                    <Muted class="text-xs">Notify me when new errors occur in this project.</Muted>
+                </div>
+                <Switch id="report_new_errors" bind:checked={$formData.report_new_errors} onclick={debouncedFormSubmit} />
+            </div>
+        </div>
+
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="text-sm font-medium">Critical Errors</div>
+                    <Muted class="text-xs">Notify me when critical errors occur in this project.</Muted>
+                </div>
+                <Switch id="report_critical_errors" bind:checked={$formData.report_critical_errors} onclick={debouncedFormSubmit} />
+            </div>
+        </div>
+
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="text-sm font-medium">Error Regressions</div>
+                    <Muted class="text-xs">Notify me when errors regress in this project.</Muted>
+                </div>
+                <Switch id="report_event_regressions" bind:checked={$formData.report_event_regressions} onclick={debouncedFormSubmit} />
+            </div>
+        </div>
+
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="text-sm font-medium">New Events</div>
+                    <Muted class="text-xs">Notify me when new events occur in this project.</Muted>
+                </div>
+                <Switch id="report_new_events" bind:checked={$formData.report_new_events} onclick={debouncedFormSubmit} />
+            </div>
+        </div>
+
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="text-sm font-medium">Critical Events</div>
+                    <Muted class="text-xs">Notify me when critical events occur in this project.</Muted>
+                </div>
+                <Switch id="report_critical_events" bind:checked={$formData.report_critical_events} onclick={debouncedFormSubmit} />
+            </div>
+        </div>
+    </form>
+{:else}
+    <div class="space-y-3">
+        {#each { length: 5 } as name, index (`${name}-${index}`)}
+            <div class="rounded-lg border p-4">
+                <div class="flex items-center justify-between">
+                    <div class="space-y-1">
+                        <Skeleton class="h-5 w-32 rounded" />
+                        <Skeleton class="h-4 w-48 rounded" />
+                    </div>
+                    <Skeleton class="h-[1.15rem] w-8 rounded-full" />
+                </div>
+            </div>
+        {/each}
+    </div>
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/notification-settings-form.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/notification-settings-form.svelte
deleted file mode 100644
index a5e4c790e7..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/notification-settings-form.svelte
+++ /dev/null
@@ -1,108 +0,0 @@
-<script lang="ts">
-    import ErrorMessage from '$comp/error-message.svelte';
-    import { Label } from '$comp/ui/label';
-    import { Skeleton } from '$comp/ui/skeleton';
-    import { Switch } from '$comp/ui/switch';
-    import { NotificationSettings } from '$features/projects/models';
-    import { applyServerSideErrors } from '$features/shared/validation';
-    import { ProblemDetails } from '@exceptionless/fetchclient';
-    import { toast } from 'svelte-sonner';
-    import { defaults, superForm } from 'sveltekit-superforms';
-    import { classvalidatorClient } from 'sveltekit-superforms/adapters';
-    import { debounce } from 'throttle-debounce';
-
-    interface Props {
-        save: (settings: NotificationSettings) => Promise<void>;
-        settings?: NotificationSettings;
-    }
-
-    let { save, settings }: Props = $props();
-    let toastId = $state<number | string>();
-
-    const form = superForm(defaults(settings || new NotificationSettings(), classvalidatorClient(NotificationSettings)), {
-        dataType: 'json',
-        async onUpdate({ form, result }) {
-            if (!form.valid) {
-                return;
-            }
-
-            toast.dismiss(toastId);
-            if (save) {
-                try {
-                    await save(form.data);
-
-                    // HACK: This is to prevent sveltekit from stealing focus
-                    result.type = 'failure';
-                } catch (error: unknown) {
-                    if (error instanceof ProblemDetails) {
-                        applyServerSideErrors(form, error);
-                        result.status = error.status ?? 500;
-                    } else {
-                        result.status = 500;
-                    }
-
-                    toastId = toast.error(form.message ?? 'Error saving notification settings. Please try again.');
-                }
-            }
-        },
-        SPA: true,
-        validators: classvalidatorClient(NotificationSettings)
-    });
-
-    // TODO: Use the Switch primitive component?
-    const { enhance, form: formData, message, submit, submitting, tainted } = form;
-    const debouncedFormSubmit = debounce(500, () => submit());
-
-    $effect(() => {
-        if (settings && !$submitting && !$tainted) {
-            form.reset({ data: settings, keepMessage: true });
-        }
-    });
-</script>
-
-{#if $formData}
-    <form method="POST" use:enhance class="space-y-2">
-        <ErrorMessage message={$message} />
-
-        <div class="flex items-center space-x-2">
-            <Switch id="send_daily_summary" bind:checked={$formData.send_daily_summary} onCheckedChange={debouncedFormSubmit} />
-            <Label for="send_daily_summary">
-                Send daily project summary <strong>(Coming soon!)</strong>
-            </Label>
-        </div>
-
-        <div class="flex items-center space-x-2">
-            <Switch id="report_new_errors" bind:checked={$formData.report_new_errors} onCheckedChange={debouncedFormSubmit} />
-            <Label for="report_new_errors">Notify me on new errors</Label>
-        </div>
-
-        <div class="flex items-center space-x-2">
-            <Switch id="report_critical_errors" bind:checked={$formData.report_critical_errors} onCheckedChange={debouncedFormSubmit} />
-            <Label for="report_critical_errors">Notify me on critical errors</Label>
-        </div>
-
-        <div class="flex items-center space-x-2">
-            <Switch id="report_event_regressions" bind:checked={$formData.report_event_regressions} onCheckedChange={debouncedFormSubmit} />
-            <Label for="report_event_regressions">Notify me on error regressions</Label>
-        </div>
-
-        <div class="flex items-center space-x-2">
-            <Switch id="report_new_events" bind:checked={$formData.report_new_events} onCheckedChange={debouncedFormSubmit} />
-            <Label for="report_new_events">Notify me on new events</Label>
-        </div>
-
-        <div class="flex items-center space-x-2">
-            <Switch id="report_critical_events" bind:checked={$formData.report_critical_events} onCheckedChange={debouncedFormSubmit} />
-            <Label for="report_critical_events">Notify me on critical events</Label>
-        </div>
-    </form>
-{:else}
-    <div class="space-y-4">
-        {#each { length: 6 } as name, index (`${name}-${index}`)}
-            <div class="flex items-center space-x-2">
-                <Skeleton class="size-5 rounded-sm" />
-                <Skeleton class="size-5 w-64 rounded-md" />
-            </div>
-        {/each}
-    </div>
-{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/table/project-config-actions-cell.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/table/project-config-actions-cell.svelte
index 1b4c67bd86..17c9a4a260 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/table/project-config-actions-cell.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/table/project-config-actions-cell.svelte
@@ -45,8 +45,9 @@
         try {
             await updateProjectConfig.mutateAsync({ key: setting.key, value });
             toastId = toast.success(`Successfully updated ${setting.key} setting.`);
-        } catch {
+        } catch (error) {
             toastId = toast.error(`Error updating ${setting.key}'s setting. Please try again.`);
+            throw error;
         }
     }
 
@@ -56,8 +57,9 @@
         try {
             await removeProjectConfig.mutateAsync({ key: setting.key });
             toastId = toast.success(`Successfully removed ${setting.key} setting.`);
-        } catch {
+        } catch (error) {
             toastId = toast.error(`Error removing ${setting.key}'s setting. Please try again.`);
+            throw error;
         }
     }
 </script>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/user-notification-settings-form.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/user-notification-settings-form.svelte
new file mode 100644
index 0000000000..ca5d0e2d6a
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/components/user-notification-settings-form.svelte
@@ -0,0 +1,208 @@
+<script lang="ts">
+    import ErrorMessage from '$comp/error-message.svelte';
+    import { A, H4, Muted } from '$comp/typography';
+    import * as Alert from '$comp/ui/alert';
+    import { Skeleton } from '$comp/ui/skeleton';
+    import { Switch } from '$comp/ui/switch';
+    import { NotificationSettings } from '$features/projects/models';
+    import { structuredCloneState } from '$features/shared/utils/state.svelte';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
+    import InfoIcon from '@lucide/svelte/icons/info';
+    import { toast } from 'svelte-sonner';
+    import { defaults, superForm } from 'sveltekit-superforms';
+    import { classvalidatorClient } from 'sveltekit-superforms/adapters';
+    import { debounce } from 'throttle-debounce';
+
+    interface Props {
+        emailNotificationsEnabled?: boolean;
+        hasPremiumFeatures?: boolean;
+        save: (settings: NotificationSettings) => Promise<void>;
+        settings?: NotificationSettings;
+        upgrade: () => Promise<void>;
+    }
+
+    let { emailNotificationsEnabled = true, hasPremiumFeatures = false, save, settings, upgrade }: Props = $props();
+    let toastId = $state<number | string>();
+    let currentSettingsRef = $state<NotificationSettings>();
+
+    const form = superForm(defaults(structuredCloneState(settings) || new NotificationSettings(), classvalidatorClient(NotificationSettings)), {
+        dataType: 'json',
+        id: 'user-notification-settings',
+        async onUpdate({ form, result }) {
+            if (!form.valid) {
+                return;
+            }
+
+            toast.dismiss(toastId);
+            if (save) {
+                try {
+                    await save(form.data);
+
+                    // HACK: This is to prevent sveltekit from stealing focus
+                    result.type = 'failure';
+                } catch (error: unknown) {
+                    if (error instanceof ProblemDetails) {
+                        applyServerSideErrors(form, error);
+                        result.status = error.status ?? 500;
+                    } else {
+                        result.status = 500;
+                    }
+
+                    toastId = toast.error(form.message ?? 'Error saving notification settings. Please try again.');
+                }
+            }
+        },
+        SPA: true,
+        validators: classvalidatorClient(NotificationSettings)
+    });
+
+    const { enhance, form: formData, message, submit, submitting, tainted } = form;
+    const debouncedFormSubmit = debounce(500, () => submit());
+
+    $effect(() => {
+        if (!$submitting && !$tainted && settings !== currentSettingsRef) {
+            const clonedSettings = structuredCloneState(settings);
+            form.reset({ data: clonedSettings, keepMessage: true });
+            currentSettingsRef = settings;
+        }
+    });
+</script>
+
+{#if $formData.send_daily_summary !== undefined}
+    <form method="POST" use:enhance class="space-y-6">
+        <ErrorMessage message={$message} />
+
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="text-sm font-medium">Daily Project Summary</div>
+                    <Muted class="text-xs">Receive a daily summary of your project activity.</Muted>
+                </div>
+                <Switch
+                    id="send_daily_summary"
+                    bind:checked={$formData.send_daily_summary}
+                    onCheckedChange={debouncedFormSubmit}
+                    disabled={!emailNotificationsEnabled}
+                />
+            </div>
+        </div>
+
+        <div class="space-y-4">
+            <H4>Event Notifications</H4>
+            <div class="space-y-3">
+                {#if !hasPremiumFeatures}
+                    <Alert.Root variant="information">
+                        <InfoIcon />
+                        <Alert.Title>
+                            <A onclick={upgrade}>Upgrade now</A> to enable occurrence level notifications!
+                        </Alert.Title>
+                    </Alert.Root>
+                {/if}
+                <div class="rounded-lg border p-4" class:opacity-60={!hasPremiumFeatures}>
+                    <div class="flex items-center justify-between">
+                        <div>
+                            <div class="text-sm font-medium">New Errors</div>
+                            <Muted class="text-xs">Notify me when new errors occur in this project.</Muted>
+                        </div>
+                        <Switch
+                            id="report_new_errors"
+                            bind:checked={$formData.report_new_errors}
+                            onCheckedChange={debouncedFormSubmit}
+                            disabled={!emailNotificationsEnabled || !hasPremiumFeatures}
+                        />
+                    </div>
+                </div>
+
+                <div class="rounded-lg border p-4" class:opacity-60={!hasPremiumFeatures}>
+                    <div class="flex items-center justify-between">
+                        <div>
+                            <div class="text-sm font-medium">Critical Errors</div>
+                            <Muted class="text-xs">Notify me when critical errors occur in this project.</Muted>
+                        </div>
+                        <Switch
+                            id="report_critical_errors"
+                            bind:checked={$formData.report_critical_errors}
+                            onCheckedChange={debouncedFormSubmit}
+                            disabled={!emailNotificationsEnabled || !hasPremiumFeatures}
+                        />
+                    </div>
+                </div>
+
+                <div class="rounded-lg border p-4" class:opacity-60={!hasPremiumFeatures}>
+                    <div class="flex items-center justify-between">
+                        <div>
+                            <div class="text-sm font-medium">Error Regressions</div>
+                            <Muted class="text-xs">Notify me when errors regress in this project.</Muted>
+                        </div>
+                        <Switch
+                            id="report_event_regressions"
+                            bind:checked={$formData.report_event_regressions}
+                            onCheckedChange={debouncedFormSubmit}
+                            disabled={!emailNotificationsEnabled || !hasPremiumFeatures}
+                        />
+                    </div>
+                </div>
+
+                <div class="rounded-lg border p-4" class:opacity-60={!hasPremiumFeatures}>
+                    <div class="flex items-center justify-between">
+                        <div>
+                            <div class="text-sm font-medium">New Events</div>
+                            <Muted class="text-xs">Notify me when new events occur in this project.</Muted>
+                        </div>
+                        <Switch
+                            id="report_new_events"
+                            bind:checked={$formData.report_new_events}
+                            onCheckedChange={debouncedFormSubmit}
+                            disabled={!emailNotificationsEnabled || !hasPremiumFeatures}
+                        />
+                    </div>
+                </div>
+
+                <div class="rounded-lg border p-4" class:opacity-60={!hasPremiumFeatures}>
+                    <div class="flex items-center justify-between">
+                        <div>
+                            <div class="text-sm font-medium">Critical Events</div>
+                            <Muted class="text-xs">Notify me when critical events occur in this project.</Muted>
+                        </div>
+                        <Switch
+                            id="report_critical_events"
+                            bind:checked={$formData.report_critical_events}
+                            onCheckedChange={debouncedFormSubmit}
+                            disabled={!emailNotificationsEnabled || !hasPremiumFeatures}
+                        />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+{:else}
+    <div class="space-y-6">
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div class="space-y-1">
+                    <Skeleton class="h-5 w-32 rounded" />
+                    <Skeleton class="h-4 w-48 rounded" />
+                </div>
+                <Skeleton class="h-[1.15rem] w-8 rounded-full" />
+            </div>
+        </div>
+
+        <div class="space-y-4">
+            <Skeleton class="h-6 w-40 rounded" />
+            <div class="space-y-3">
+                {#each { length: 5 } as name, index (`${name}-${index}`)}
+                    <div class="rounded-lg border p-4 opacity-60">
+                        <div class="flex items-center justify-between">
+                            <div class="space-y-1">
+                                <Skeleton class="h-5 w-32 rounded" />
+                                <Skeleton class="h-4 w-48 rounded" />
+                            </div>
+                            <Skeleton class="h-[1.15rem] w-8 rounded-full" />
+                        </div>
+                    </div>
+                {/each}
+            </div>
+        </div>
+    </div>
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/api/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/api/api.svelte.ts
index 5a7676e6b2..bece38520f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/api/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/api/api.svelte.ts
@@ -1,4 +1,5 @@
 import { FetchClient, FetchClientProvider, getCurrentProvider } from '@exceptionless/fetchclient';
+import { SvelteDate } from 'svelte/reactivity';
 
 export const DEFAULT_LIMIT = 20;
 
@@ -7,7 +8,7 @@ export const DEFAULT_LIMIT = 20;
  * If the user's timezone offset is not 0 (UTC), returns the offset in minutes with a 'm' suffix.
  * If the user's timezone offset is 0, returns undefined.
  */
-export const DEFAULT_OFFSET = new Date().getTimezoneOffset() !== 0 ? new Date().getTimezoneOffset() * -1 + 'm' : undefined;
+export const DEFAULT_OFFSET = new SvelteDate().getTimezoneOffset() !== 0 ? new SvelteDate().getTimezoneOffset() * -1 + 'm' : undefined;
 
 export class FetchClientStatus {
     isLoading = $state(false);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
index 98ccc72b5d..5a521c9d90 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
@@ -29,20 +29,22 @@
             return [];
         }
 
-        return filters.map((filter) => {
-            const builder = builderContext.get(filter.key);
-            if (!builder) {
-                throw new Error(`Facet filter builder not found for key: ${filter.key}`);
-            }
-
-            const f = builder.create(filter);
-            return {
-                component: builder.component,
-                filter: f,
-                open: lastOpenFilterId === f.id,
-                title: builder.title
-            };
-        });
+        return filters
+            .map((filter) => {
+                const builder = builderContext.get(filter.key);
+                if (!builder) {
+                    return;
+                }
+
+                const f = builder.create(filter);
+                return {
+                    component: builder.component,
+                    filter: f,
+                    open: lastOpenFilterId === f.id,
+                    title: builder.title
+                };
+            })
+            .filter((f): f is FacetedFilter<IFilter> => !!f);
     });
 
     const sortedBuilders = $derived(
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/index.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/index.ts
index d4ec0a5d57..ffcca57627 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/index.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/index.ts
@@ -7,7 +7,7 @@ import BadgeValues from './faceted-filter-badge-values.svelte';
 import Boolean from './faceted-filter-boolean.svelte';
 import { builderContext, type FacetFilterBuilder } from './faceted-filter-builder-context.svelte';
 import Root from './faceted-filter-builder.svelte';
-import DropDown from './faceted-filter-drop-down.svelte';
+import Dropdown from './faceted-filter-drop-down.svelte';
 import Keyword from './faceted-filter-keyword.svelte';
 import MultiSelect from './faceted-filter-multi-select.svelte';
 import Number from './faceted-filter-number.svelte';
@@ -20,7 +20,7 @@ export {
     BadgeValue,
     BadgeValues,
     Boolean,
-    DropDown,
+    Dropdown,
     Actions as FacetedFilterActions,
     BadgeLoading as FacetedFilterBadgeLoading,
     BadgeValue as FacetedFilterBadgeValue,
@@ -28,7 +28,7 @@ export {
     Boolean as FacetedFilterBoolean,
     //
     Root as FacetedFilterBuilder,
-    DropDown as FacetedFilterDropDown,
+    Dropdown as FacetedFilterDropdown,
     Keyword as FacetedFilterKeyword,
     MultiSelect as FacetedFilterMultiSelect,
     Number as FacetedFilterNumber,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/alert/alert.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/alert/alert.svelte
index 2b2eff9a1f..baad64ac5c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/alert/alert.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/alert/alert.svelte
@@ -8,6 +8,10 @@
 				default: "bg-card text-card-foreground",
 				destructive:
 					"text-destructive bg-card *:data-[slot=alert-description]:text-destructive/90 [&>svg]:text-current",
+				information:
+					"border-blue-200 bg-blue-50 text-blue-900 dark:border-blue-900/30 dark:bg-blue-900/10 dark:text-blue-100 *:data-[slot=alert-description]:text-blue-800 dark:*:data-[slot=alert-description]:text-blue-200 [&>svg]:text-blue-600 dark:[&>svg]:text-blue-400",
+				success:
+					"border-green-200 bg-green-50 text-green-900 dark:border-green-900/30 dark:bg-green-900/10 dark:text-green-100 *:data-[slot=alert-description]:text-green-800 dark:*:data-[slot=alert-description]:text-green-200 [&>svg]:text-green-600 dark:[&>svg]:text-green-400",
 			},
 		},
 		defaultVariants: {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/avatar/avatar.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/avatar/avatar.svelte
index f093a97bf7..e37214d5f7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/avatar/avatar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/avatar/avatar.svelte
@@ -4,6 +4,7 @@
 
 	let {
 		ref = $bindable(null),
+		loadingStatus = $bindable("loading"),
 		class: className,
 		...restProps
 	}: AvatarPrimitive.RootProps = $props();
@@ -11,6 +12,7 @@
 
 <AvatarPrimitive.Root
 	bind:ref
+	bind:loadingStatus
 	data-slot="avatar"
 	class={cn("relative flex size-8 shrink-0 overflow-hidden rounded-full", className)}
 	{...restProps}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-caption.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-caption.svelte
new file mode 100644
index 0000000000..5c93037010
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-caption.svelte
@@ -0,0 +1,76 @@
+<script lang="ts">
+	import type { ComponentProps } from "svelte";
+	import type Calendar from "./calendar.svelte";
+	import CalendarMonthSelect from "./calendar-month-select.svelte";
+	import CalendarYearSelect from "./calendar-year-select.svelte";
+	import { DateFormatter, getLocalTimeZone, type DateValue } from "@internationalized/date";
+
+	let {
+		captionLayout,
+		months,
+		monthFormat,
+		years,
+		yearFormat,
+		month,
+		locale,
+		placeholder = $bindable(),
+		monthIndex = 0,
+	}: {
+		captionLayout: ComponentProps<typeof Calendar>["captionLayout"];
+		months: ComponentProps<typeof CalendarMonthSelect>["months"];
+		monthFormat: ComponentProps<typeof CalendarMonthSelect>["monthFormat"];
+		years: ComponentProps<typeof CalendarYearSelect>["years"];
+		yearFormat: ComponentProps<typeof CalendarYearSelect>["yearFormat"];
+		month: DateValue;
+		placeholder: DateValue | undefined;
+		locale: string;
+		monthIndex: number;
+	} = $props();
+
+	function formatYear(date: DateValue) {
+		const dateObj = date.toDate(getLocalTimeZone());
+		if (typeof yearFormat === "function") return yearFormat(dateObj.getFullYear());
+		return new DateFormatter(locale, { year: yearFormat }).format(dateObj);
+	}
+
+	function formatMonth(date: DateValue) {
+		const dateObj = date.toDate(getLocalTimeZone());
+		if (typeof monthFormat === "function") return monthFormat(dateObj.getMonth() + 1);
+		return new DateFormatter(locale, { month: monthFormat }).format(dateObj);
+	}
+</script>
+
+{#snippet MonthSelect()}
+	<CalendarMonthSelect
+		{months}
+		{monthFormat}
+		value={month.month}
+		onchange={(e) => {
+			if (!placeholder) return;
+			const v = Number.parseInt(e.currentTarget.value);
+			const newPlaceholder = placeholder.set({ month: v });
+			placeholder = newPlaceholder.subtract({ months: monthIndex });
+		}}
+	/>
+{/snippet}
+
+{#snippet YearSelect()}
+	<CalendarYearSelect {years} {yearFormat} value={month.year} />
+{/snippet}
+
+{#if captionLayout === "dropdown"}
+	{@render MonthSelect()}
+	{@render YearSelect()}
+{:else if captionLayout === "dropdown-months"}
+	{@render MonthSelect()}
+	{#if placeholder}
+		{formatYear(placeholder)}
+	{/if}
+{:else if captionLayout === "dropdown-years"}
+	{#if placeholder}
+		{formatMonth(placeholder)}
+	{/if}
+	{@render YearSelect()}
+{:else}
+	{formatMonth(month)} {formatYear(month)}
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-cell.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-cell.svelte
new file mode 100644
index 0000000000..5f295d642a
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-cell.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.CellProps = $props();
+</script>
+
+<CalendarPrimitive.Cell
+	bind:ref
+	class={cn(
+		"size-(--cell-size) relative p-0 text-center text-sm focus-within:z-20 [&:first-child[data-selected]_[data-bits-day]]:rounded-l-md [&:last-child[data-selected]_[data-bits-day]]:rounded-r-md",
+		className
+	)}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-day.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-day.svelte
new file mode 100644
index 0000000000..ad53814d35
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-day.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+	import { buttonVariants } from "$comp/ui/button/index.js";
+	import { cn } from "$lib/utils.js";
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.DayProps = $props();
+</script>
+
+<CalendarPrimitive.Day
+	bind:ref
+	class={cn(
+		buttonVariants({ variant: "ghost" }),
+		"size-(--cell-size) flex select-none flex-col items-center justify-center gap-1 whitespace-nowrap p-0 font-normal leading-none",
+		"[&[data-today]:not([data-selected])]:bg-accent [&[data-today]:not([data-selected])]:text-accent-foreground [&[data-today][data-disabled]]:text-muted-foreground",
+		"data-[selected]:bg-primary dark:data-[selected]:hover:bg-accent/50 data-[selected]:text-primary-foreground",
+		// Outside months
+		"[&[data-outside-month]:not([data-selected])]:text-muted-foreground [&[data-outside-month]:not([data-selected])]:hover:text-accent-foreground",
+		// Disabled
+		"data-[disabled]:text-muted-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+		// Unavailable
+		"data-[unavailable]:text-muted-foreground data-[unavailable]:line-through",
+		// hover
+		"dark:hover:text-accent-foreground",
+		// focus
+		"focus:border-ring focus:ring-ring/50 focus:relative",
+		// inner spans
+		"[&>span]:text-xs [&>span]:opacity-70",
+		className
+	)}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-body.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-body.svelte
new file mode 100644
index 0000000000..8cd86decdc
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-body.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.GridBodyProps = $props();
+</script>
+
+<CalendarPrimitive.GridBody bind:ref class={cn(className)} {...restProps} />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-head.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-head.svelte
new file mode 100644
index 0000000000..333edc47ed
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-head.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.GridHeadProps = $props();
+</script>
+
+<CalendarPrimitive.GridHead bind:ref class={cn(className)} {...restProps} />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-row.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-row.svelte
new file mode 100644
index 0000000000..9032236988
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid-row.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.GridRowProps = $props();
+</script>
+
+<CalendarPrimitive.GridRow bind:ref class={cn("flex", className)} {...restProps} />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid.svelte
new file mode 100644
index 0000000000..e0c8627f3a
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-grid.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.GridProps = $props();
+</script>
+
+<CalendarPrimitive.Grid
+	bind:ref
+	class={cn("mt-4 flex w-full border-collapse flex-col gap-1", className)}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-head-cell.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-head-cell.svelte
new file mode 100644
index 0000000000..131807e2df
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-head-cell.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.HeadCellProps = $props();
+</script>
+
+<CalendarPrimitive.HeadCell
+	bind:ref
+	class={cn(
+		"text-muted-foreground w-(--cell-size) rounded-md text-[0.8rem] font-normal",
+		className
+	)}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-header.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-header.svelte
new file mode 100644
index 0000000000..5b7e3972fe
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-header.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.HeaderProps = $props();
+</script>
+
+<CalendarPrimitive.Header
+	bind:ref
+	class={cn(
+		"h-(--cell-size) flex w-full items-center justify-center gap-1.5 text-sm font-medium",
+		className
+	)}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-heading.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-heading.svelte
new file mode 100644
index 0000000000..a9b9810c67
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-heading.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: CalendarPrimitive.HeadingProps = $props();
+</script>
+
+<CalendarPrimitive.Heading
+	bind:ref
+	class={cn("px-(--cell-size) text-sm font-medium", className)}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-month-select.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-month-select.svelte
new file mode 100644
index 0000000000..e4b536a18c
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-month-select.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
+	import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		value,
+		onchange,
+		...restProps
+	}: WithoutChildrenOrChild<CalendarPrimitive.MonthSelectProps> = $props();
+</script>
+
+<span
+	class={cn(
+		"has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
+		className
+	)}
+>
+	<CalendarPrimitive.MonthSelect bind:ref class="absolute inset-0 opacity-0" {...restProps}>
+		{#snippet child({ props, monthItems, selectedMonthItem })}
+			<select {...props} {value} {onchange}>
+				{#each monthItems as monthItem (monthItem.value)}
+					<option
+						value={monthItem.value}
+						selected={value !== undefined
+							? monthItem.value === value
+							: monthItem.value === selectedMonthItem.value}
+					>
+						{monthItem.label}
+					</option>
+				{/each}
+			</select>
+			<span
+				class="[&>svg]:text-muted-foreground flex h-8 select-none items-center gap-1 rounded-md pl-2 pr-1 text-sm font-medium [&>svg]:size-3.5"
+				aria-hidden="true"
+			>
+				{monthItems.find((item) => item.value === value)?.label || selectedMonthItem.label}
+				<ChevronDownIcon class="size-4" />
+			</span>
+		{/snippet}
+	</CalendarPrimitive.MonthSelect>
+</span>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-month.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-month.svelte
new file mode 100644
index 0000000000..e747fae74e
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-month.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+	import { type WithElementRef, cn } from "$lib/utils.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLElement>> = $props();
+</script>
+
+<div {...restProps} bind:this={ref} class={cn("flex flex-col", className)}>
+	{@render children?.()}
+</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-months.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-months.svelte
new file mode 100644
index 0000000000..f717a9d9ae
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-months.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import type { HTMLAttributes } from "svelte/elements";
+	import { cn, type WithElementRef } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	class={cn("relative flex flex-col gap-4 md:flex-row", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-nav.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-nav.svelte
new file mode 100644
index 0000000000..27f33d7977
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-nav.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLElement>> = $props();
+</script>
+
+<nav
+	{...restProps}
+	bind:this={ref}
+	class={cn("absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1", className)}
+>
+	{@render children?.()}
+</nav>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-next-button.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-next-button.svelte
new file mode 100644
index 0000000000..74a816acf3
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-next-button.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import ChevronRightIcon from "@lucide/svelte/icons/chevron-right";
+	import { buttonVariants, type ButtonVariant } from "$comp/ui/button/index.js";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		variant = "ghost",
+		...restProps
+	}: CalendarPrimitive.NextButtonProps & {
+		variant?: ButtonVariant;
+	} = $props();
+</script>
+
+{#snippet Fallback()}
+	<ChevronRightIcon class="size-4" />
+{/snippet}
+
+<CalendarPrimitive.NextButton
+	bind:ref
+	class={cn(
+		buttonVariants({ variant }),
+		"size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
+		className
+	)}
+	children={children || Fallback}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-prev-button.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-prev-button.svelte
new file mode 100644
index 0000000000..ce20624227
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-prev-button.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import ChevronLeftIcon from "@lucide/svelte/icons/chevron-left";
+	import { buttonVariants, type ButtonVariant } from "$comp/ui/button/index.js";
+	import { cn } from "$lib/utils.js";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		variant = "ghost",
+		...restProps
+	}: CalendarPrimitive.PrevButtonProps & {
+		variant?: ButtonVariant;
+	} = $props();
+</script>
+
+{#snippet Fallback()}
+	<ChevronLeftIcon class="size-4" />
+{/snippet}
+
+<CalendarPrimitive.PrevButton
+	bind:ref
+	class={cn(
+		buttonVariants({ variant }),
+		"size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
+		className
+	)}
+	children={children || Fallback}
+	{...restProps}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-year-select.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-year-select.svelte
new file mode 100644
index 0000000000..38420371ce
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar-year-select.svelte
@@ -0,0 +1,43 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
+	import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		value,
+		...restProps
+	}: WithoutChildrenOrChild<CalendarPrimitive.YearSelectProps> = $props();
+</script>
+
+<span
+	class={cn(
+		"has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
+		className
+	)}
+>
+	<CalendarPrimitive.YearSelect bind:ref class="absolute inset-0 opacity-0" {...restProps}>
+		{#snippet child({ props, yearItems, selectedYearItem })}
+			<select {...props} {value}>
+				{#each yearItems as yearItem (yearItem.value)}
+					<option
+						value={yearItem.value}
+						selected={value !== undefined
+							? yearItem.value === value
+							: yearItem.value === selectedYearItem.value}
+					>
+						{yearItem.label}
+					</option>
+				{/each}
+			</select>
+			<span
+				class="[&>svg]:text-muted-foreground flex h-8 select-none items-center gap-1 rounded-md pl-2 pr-1 text-sm font-medium [&>svg]:size-3.5"
+				aria-hidden="true"
+			>
+				{yearItems.find((item) => item.value === value)?.label || selectedYearItem.label}
+				<ChevronDownIcon class="size-4" />
+			</span>
+		{/snippet}
+	</CalendarPrimitive.YearSelect>
+</span>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar.svelte
new file mode 100644
index 0000000000..29b6fff9af
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/calendar.svelte
@@ -0,0 +1,115 @@
+<script lang="ts">
+	import { Calendar as CalendarPrimitive } from "bits-ui";
+	import * as Calendar from "./index.js";
+	import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
+	import type { ButtonVariant } from "../button/button.svelte";
+	import { isEqualMonth, type DateValue } from "@internationalized/date";
+	import type { Snippet } from "svelte";
+
+	let {
+		ref = $bindable(null),
+		value = $bindable(),
+		placeholder = $bindable(),
+		class: className,
+		weekdayFormat = "short",
+		buttonVariant = "ghost",
+		captionLayout = "label",
+		locale = "en-US",
+		months: monthsProp,
+		years,
+		monthFormat: monthFormatProp,
+		yearFormat = "numeric",
+		day,
+		disableDaysOutsideMonth = false,
+		...restProps
+	}: WithoutChildrenOrChild<CalendarPrimitive.RootProps> & {
+		buttonVariant?: ButtonVariant;
+		captionLayout?: "dropdown" | "dropdown-months" | "dropdown-years" | "label";
+		months?: CalendarPrimitive.MonthSelectProps["months"];
+		years?: CalendarPrimitive.YearSelectProps["years"];
+		monthFormat?: CalendarPrimitive.MonthSelectProps["monthFormat"];
+		yearFormat?: CalendarPrimitive.YearSelectProps["yearFormat"];
+		day?: Snippet<[{ day: DateValue; outsideMonth: boolean }]>;
+	} = $props();
+
+	const monthFormat = $derived.by(() => {
+		if (monthFormatProp) return monthFormatProp;
+		if (captionLayout.startsWith("dropdown")) return "short";
+		return "long";
+	});
+</script>
+
+<!--
+Discriminated Unions + Destructing (required for bindable) do not
+get along, so we shut typescript up by casting `value` to `never`.
+-->
+<CalendarPrimitive.Root
+	bind:value={value as never}
+	bind:ref
+	bind:placeholder
+	{weekdayFormat}
+	{disableDaysOutsideMonth}
+	class={cn(
+		"bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
+		className
+	)}
+	{locale}
+	{monthFormat}
+	{yearFormat}
+	{...restProps}
+>
+	{#snippet children({ months, weekdays })}
+		<Calendar.Months>
+			<Calendar.Nav>
+				<Calendar.PrevButton variant={buttonVariant} />
+				<Calendar.NextButton variant={buttonVariant} />
+			</Calendar.Nav>
+			{#each months as month, monthIndex (month)}
+				<Calendar.Month>
+					<Calendar.Header>
+						<Calendar.Caption
+							{captionLayout}
+							months={monthsProp}
+							{monthFormat}
+							{years}
+							{yearFormat}
+							month={month.value}
+							bind:placeholder
+							{locale}
+							{monthIndex}
+						/>
+					</Calendar.Header>
+					<Calendar.Grid>
+						<Calendar.GridHead>
+							<Calendar.GridRow class="select-none">
+								{#each weekdays as weekday (weekday)}
+									<Calendar.HeadCell>
+										{weekday.slice(0, 2)}
+									</Calendar.HeadCell>
+								{/each}
+							</Calendar.GridRow>
+						</Calendar.GridHead>
+						<Calendar.GridBody>
+							{#each month.weeks as weekDates (weekDates)}
+								<Calendar.GridRow class="mt-2 w-full">
+									{#each weekDates as date (date)}
+										<Calendar.Cell {date} month={month.value}>
+											{#if day}
+												{@render day({
+													day: date,
+													outsideMonth: !isEqualMonth(date, month.value),
+												})}
+											{:else}
+												<Calendar.Day />
+											{/if}
+										</Calendar.Cell>
+									{/each}
+								</Calendar.GridRow>
+							{/each}
+						</Calendar.GridBody>
+					</Calendar.Grid>
+				</Calendar.Month>
+			{/each}
+		</Calendar.Months>
+	{/snippet}
+</CalendarPrimitive.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/index.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/index.ts
new file mode 100644
index 0000000000..f3a16d2d5a
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/calendar/index.ts
@@ -0,0 +1,40 @@
+import Root from "./calendar.svelte";
+import Cell from "./calendar-cell.svelte";
+import Day from "./calendar-day.svelte";
+import Grid from "./calendar-grid.svelte";
+import Header from "./calendar-header.svelte";
+import Months from "./calendar-months.svelte";
+import GridRow from "./calendar-grid-row.svelte";
+import Heading from "./calendar-heading.svelte";
+import GridBody from "./calendar-grid-body.svelte";
+import GridHead from "./calendar-grid-head.svelte";
+import HeadCell from "./calendar-head-cell.svelte";
+import NextButton from "./calendar-next-button.svelte";
+import PrevButton from "./calendar-prev-button.svelte";
+import MonthSelect from "./calendar-month-select.svelte";
+import YearSelect from "./calendar-year-select.svelte";
+import Month from "./calendar-month.svelte";
+import Nav from "./calendar-nav.svelte";
+import Caption from "./calendar-caption.svelte";
+
+export {
+	Day,
+	Cell,
+	Grid,
+	Header,
+	Months,
+	GridRow,
+	Heading,
+	GridBody,
+	GridHead,
+	HeadCell,
+	NextButton,
+	PrevButton,
+	Nav,
+	Month,
+	YearSelect,
+	MonthSelect,
+	Caption,
+	//
+	Root as Calendar,
+};
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-style.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-style.svelte
index ac0839804e..864ecc3100 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-style.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-style.svelte
@@ -30,7 +30,8 @@
 
 {#if themeContents}
 	{#key id}
-		<!-- eslint-disable-next-line svelte/no-at-html-tags -->
-		{@html `<style>${themeContents}</style>`}
+		<svelte:element this={"style"}>
+			{themeContents}
+		</svelte:element>
 	{/key}
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-tooltip.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-tooltip.svelte
index c1ba924af3..d0e1aaeae0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-tooltip.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-tooltip.svelte
@@ -54,16 +54,16 @@
 		if (hideLabel || !tooltipCtx.payload?.length) return null;
 
 		const [item] = tooltipCtx.payload;
-		const key = labelKey || item?.label || item?.name || "value";
+		const key = labelKey ?? item?.label ?? item?.name ?? "value";
 
 		const itemConfig = item ? getPayloadConfigFromPayload(chart.config, item, key) : undefined;
 
 		const value =
 			!labelKey && typeof label === "string"
-				? chart.config[label as keyof typeof chart.config]?.label || label
+				? (chart.config[label as keyof typeof chart.config]?.label ?? label)
 				: (itemConfig?.label ?? item?.label);
 
-		if (!value) return null;
+		if (value === undefined) return null;
 		if (!labelFormatter) return value;
 		return labelFormatter(value, tooltipCtx.payload);
 	});
@@ -145,7 +145,7 @@
 									{itemConfig?.label || item.name}
 								</span>
 							</div>
-							{#if item.value}
+							{#if item.value !== undefined}
 								<span class="text-foreground font-mono font-medium tabular-nums">
 									{item.value.toLocaleString()}
 								</span>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-utils.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-utils.ts
index 50b0171046..2decbbf710 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-utils.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/chart/chart-utils.ts
@@ -41,7 +41,7 @@ export function getPayloadConfigFromPayload(
 	} else if (key in payload && typeof payload[key as keyof typeof payload] === "string") {
 		configLabelKey = payload[key as keyof typeof payload] as string;
 	} else if (
-		payloadPayload &&
+		payloadPayload !== undefined &&
 		key in payloadPayload &&
 		typeof payloadPayload[key as keyof typeof payloadPayload] === "string"
 	) {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/command/command-item.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/command/command-item.svelte
index 2297c97851..d94d07f6ed 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/command/command-item.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/command/command-item.svelte
@@ -13,7 +13,7 @@
 	bind:ref
 	data-slot="command-item"
 	class={cn(
-		"aria-selected:bg-accent aria-selected:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+		"aria-selected:bg-accent aria-selected:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
 		className
 	)}
 	{...restProps}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-content.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-content.svelte
index 498c4b924b..907ef73734 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-content.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-content.svelte
@@ -19,7 +19,7 @@
 		data-slot="dropdown-menu-content"
 		{sideOffset}
 		class={cn(
-			"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 max-h-(--radix-dropdown-menu-content-available-height) origin-(--radix-dropdown-menu-content-transform-origin) z-50 min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border p-1 shadow-md",
+			"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 max-h-(--bits-dropdown-menu-content-available-height) origin-(--bits-dropdown-menu-content-transform-origin) z-50 min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border p-1 shadow-md outline-none",
 			className
 		)}
 		{...restProps}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
index 30deb9eb9d..10e14ca6d9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
@@ -13,7 +13,7 @@
 	bind:ref
 	data-slot="dropdown-menu-sub-content"
 	class={cn(
-		"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-(--radix-dropdown-menu-content-transform-origin) z-50 min-w-[8rem] overflow-hidden rounded-md border p-1 shadow-lg",
+		"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-(--bits-dropdown-menu-content-transform-origin) z-50 min-w-[8rem] overflow-hidden rounded-md border p-1 shadow-lg",
 		className
 	)}
 	{...restProps}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-rail.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-rail.svelte
index e913d2120b..c180cf599c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-rail.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-rail.svelte
@@ -22,7 +22,7 @@
 	onclick={sidebar.toggle}
 	title="Toggle Sidebar"
 	class={cn(
-		"hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",
+		"hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-[calc(1/2*100%-1px)] after:w-[2px] group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",
 		"in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
 		"[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
 		"hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte
index 5190f9a2ab..252a8cc4ce 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte
@@ -73,7 +73,7 @@
 				"group-data-[collapsible=offcanvas]:w-0",
 				"group-data-[side=right]:rotate-180",
 				variant === "floating" || variant === "inset"
-					? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"
+					? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
 					: "group-data-[collapsible=icon]:w-(--sidebar-width-icon)"
 			)}
 		></div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sonner/sonner.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sonner/sonner.svelte
index 67669b7f60..1f50e1e732 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sonner/sonner.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sonner/sonner.svelte
@@ -8,6 +8,6 @@
 <Sonner
 	theme={mode.current}
 	class="toaster group"
-	style="--normal-bg: var(--popover); --normal-text: var(--popover-foreground); --normal-border: var(--border);"
+	style="--normal-bg: var(--color-popover); --normal-text: var(--color-popover-foreground); --normal-border: var(--color-border);"
 	{...restProps}
 />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-cell.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-cell.svelte
index 5992048451..1a2f033fb5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-cell.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-cell.svelte
@@ -13,7 +13,10 @@
 <td
 	bind:this={ref}
 	data-slot="table-cell"
-	class={cn("whitespace-nowrap p-2 align-middle [&:has([role=checkbox])]:pr-0", className)}
+	class={cn(
+		"whitespace-nowrap bg-clip-padding p-2 align-middle [&:has([role=checkbox])]:pr-0",
+		className
+	)}
 	{...restProps}
 >
 	{@render children?.()}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-head.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-head.svelte
index 2742939af8..e9dd2378d5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-head.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-head.svelte
@@ -14,7 +14,7 @@
 	bind:this={ref}
 	data-slot="table-head"
 	class={cn(
-		"text-foreground h-10 whitespace-nowrap px-2 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0",
+		"text-foreground h-10 whitespace-nowrap bg-clip-padding px-2 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0",
 		className
 	)}
 	{...restProps}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-row.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-row.svelte
index 7734750461..4dd586af89 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-row.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/table/table-row.svelte
@@ -18,7 +18,7 @@
 	bind:this={ref}
 	data-slot="table-row"
 	class={cn(
-		"hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
+		"hover:[&,&>svelte-css-wrapper]:[&>th,td]:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
 		className
 	)}
 	{...restProps}
@@ -31,7 +31,7 @@
 	bind:this={ref}
 	data-slot="table-row"
 	class={cn(
-		"hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
+		"hover:[&,&>svelte-css-wrapper]:[&>th,td]:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
 		className
 	)}
 	{...restProps}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/tooltip/tooltip-content.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/tooltip/tooltip-content.svelte
index b0c399ca4b..e495efe5f5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/tooltip/tooltip-content.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/tooltip/tooltip-content.svelte
@@ -34,9 +34,9 @@
 					class={cn(
 						"bg-primary z-50 size-2.5 rotate-45 rounded-[2px]",
 						"data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_2px)]",
-						"data-[side=bottom]:-translate-y-[calc(-50%_+_1px)] data-[side=bottom]:translate-x-1/2",
+						"data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]",
 						"data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2",
-						"data-[side=left]:translate-y-[calc(50%_-_3px)]",
+						"data-[side=left]:-translate-y-[calc(50%_-_3px)]",
 						arrowClasses
 					)}
 					{...props}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/options.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/options.ts
index b7b88e3014..55646035ea 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/options.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/options.ts
@@ -1,4 +1,4 @@
-export interface DropDownItem<T> {
+export interface DropdownItem<T> {
     description?: string;
     label: string;
     value: T;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/utils/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/utils/state.svelte.ts
new file mode 100644
index 0000000000..96058e3086
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/utils/state.svelte.ts
@@ -0,0 +1,28 @@
+/**
+ * Safely clone state data to prevent cache mutation and reactive entanglement.
+ *
+ * This utility combines `$state.snapshot()` for reactive safety with `structuredClone()`
+ * for deep cloning to ensure form data is completely independent from cached/reactive state.
+ *
+ * @param state - The state object to clone safely
+ * @returns A deep, non-reactive clone of the state object, or undefined if state is falsy
+ *
+ * @example
+ * ```svelte
+ * // Form initialization
+ * const form = superForm(defaults(structuredCloneState(settings) || new NotificationSettings(), classvalidatorClient(NotificationSettings)), {
+ *     // form options...
+ * });
+ *
+ * // Form reset
+ * const clonedSettings = structuredCloneState(settings);
+ * form.reset({ data: clonedSettings, keepMessage: true });
+ * ```
+ */
+export function structuredCloneState<T>(state: T): T | undefined {
+    if (!state) {
+        return state;
+    }
+
+    return structuredClone($state.snapshot(state)) as T;
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/add-stack-reference-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/add-stack-reference-dialog.svelte
index 3d8a30581c..2041cf33ef 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/add-stack-reference-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/add-stack-reference-dialog.svelte
@@ -3,6 +3,8 @@
     import * as AlertDialog from '$comp/ui/alert-dialog';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
 
@@ -17,13 +19,26 @@
 
     const form = superForm(defaults(new ReferenceLinkForm(), classvalidatorClient(ReferenceLinkForm)), {
         dataType: 'json',
-        async onUpdate({ form }) {
+        id: 'add-stack-reference',
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await save(form.data.url);
-            open = false;
+            try {
+                await save(form.data.url);
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(ReferenceLinkForm)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-fixed-in-version-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-fixed-in-version-dialog.svelte
index ba5ef82c7e..c7f91fdddb 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-fixed-in-version-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/dialogs/mark-stack-fixed-in-version-dialog.svelte
@@ -4,6 +4,8 @@
     import * as AlertDialog from '$comp/ui/alert-dialog';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import Documentation from '@lucide/svelte/icons/help-circle';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
@@ -21,19 +23,32 @@
 
     const form = superForm(defaults(new FixedInVersionForm(), classvalidatorClient(FixedInVersionForm)), {
         dataType: 'json',
+        id: 'mark-stack-fixed-in-version',
         onChange() {
             debouncedUpdateVersionToSemanticVersion();
         },
         onSubmit() {
             updateVersionToSemanticVersion();
         },
-        async onUpdate({ form }) {
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await save(form.data.version);
-            open = false;
+            try {
+                await save(form.data.version);
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(FixedInVersionForm)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-status-dropdown-menu.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-status-dropdown-menu.svelte
index a442c0f705..a7b4d51fae 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-status-dropdown-menu.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-status-dropdown-menu.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-    import type { DropDownItem } from '$features/shared/options';
+    import type { DropdownItem } from '$features/shared/options';
 
     import Button from '$comp/ui/button/button.svelte';
     import * as DropdownMenu from '$comp/ui/dropdown-menu';
     import ChevronDown from '@lucide/svelte/icons/chevron-down';
+    import { SvelteDate } from 'svelte/reactivity';
 
     import { postChangeStatus, postMarkFixed, postMarkSnoozed } from '../api.svelte';
     import { Stack, StackStatus } from '../models';
@@ -20,7 +21,7 @@
     let openMarkStackDiscardedDialog = $state<boolean>(false);
     let openMarkStackFixedInVersionDialog = $state<boolean>(false);
     let selected = $derived(
-        (stackStatuses.find((option) => option.value === stack?.status) || stackStatuses[stackStatuses.length - 1]) as DropDownItem<StackStatus>
+        (stackStatuses.find((option) => option.value === stack?.status) || stackStatuses[stackStatuses.length - 1]) as DropdownItem<StackStatus>
     );
 
     const updateMarkFixed = postMarkFixed({
@@ -60,7 +61,7 @@
     }
 
     async function markSnoozed(timePeriod?: '6hours' | 'day' | 'month' | 'week') {
-        let snoozeUntilUtc = new Date();
+        let snoozeUntilUtc = new SvelteDate();
         switch (timePeriod) {
             case '6hours':
                 snoozeUntilUtc.setHours(snoozeUntilUtc.getHours() + 6);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stacks-bulk-actions-dropdown-menu.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stacks-bulk-actions-dropdown-menu.svelte
index c92e0bc438..c666d1652e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stacks-bulk-actions-dropdown-menu.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stacks-bulk-actions-dropdown-menu.svelte
@@ -8,6 +8,7 @@
     import ChevronDown from '@lucide/svelte/icons/chevron-down';
     import { type Table as SvelteTable } from '@tanstack/svelte-table';
     import { toast } from 'svelte-sonner';
+    import { SvelteDate } from 'svelte/reactivity';
 
     import { deleteStack, postChangeStatus, postMarkFixed, postMarkSnoozed } from '../api.svelte';
     import { StackStatus } from '../models';
@@ -83,7 +84,7 @@
     }
 
     async function markSnoozed(timePeriod?: '6hours' | 'day' | 'month' | 'week') {
-        let snoozeUntilUtc = new Date();
+        let snoozeUntilUtc = new SvelteDate();
         switch (timePeriod) {
             case '6hours':
                 snoozeUntilUtc.setHours(snoozeUntilUtc.getHours() + 6);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/options.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/options.ts
index aef9a6848b..ca5eee94fd 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/options.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/options.ts
@@ -1,8 +1,8 @@
-import type { DropDownItem } from '$features/shared/options';
+import type { DropdownItem } from '$features/shared/options';
 
 import { StackStatus } from '$features/stacks/models';
 
-export const stackStatuses: DropDownItem<StackStatus>[] = [
+export const stackStatuses: DropdownItem<StackStatus>[] = [
     {
         label: 'Open',
         value: StackStatus.Open
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/tokens/components/dialogs/update-token-notes-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/tokens/components/dialogs/update-token-notes-dialog.svelte
index 38dbb9a55a..1961d4db66 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/tokens/components/dialogs/update-token-notes-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/tokens/components/dialogs/update-token-notes-dialog.svelte
@@ -3,6 +3,8 @@
     import * as AlertDialog from '$comp/ui/alert-dialog';
     import * as Form from '$comp/ui/form';
     import { Textarea } from '$comp/ui/textarea';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
 
@@ -22,13 +24,26 @@
 
     const form = superForm(defaults(defaultToken, classvalidatorClient(UpdateToken)), {
         dataType: 'json',
-        async onUpdate({ form }) {
+        id: 'update-token-notes',
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await save(form.data.notes?.trim() ?? undefined);
-            open = false;
+            try {
+                await save(form.data.notes?.trim() ?? undefined);
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(UpdateToken)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/invite-user-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/invite-user-dialog.svelte
index b761b64d61..003a8b6a74 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/invite-user-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/invite-user-dialog.svelte
@@ -3,6 +3,8 @@
     import * as AlertDialog from '$comp/ui/alert-dialog';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
+    import { applyServerSideErrors } from '$features/shared/validation';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
 
@@ -17,13 +19,26 @@
 
     const form = superForm(defaults(new InviteUserForm(), classvalidatorClient(InviteUserForm)), {
         dataType: 'json',
-        async onUpdate({ form }) {
+        id: 'invite-user',
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await inviteUser(form.data.email);
-            open = false;
+            try {
+                await inviteUser(form.data.email);
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(InviteUserForm)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/table/user-actions-cell.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/table/user-actions-cell.svelte
index 9ec7c2ee01..f44a799dec 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/table/user-actions-cell.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/components/table/user-actions-cell.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button } from '$comp/ui/button';
     import * as DropdownMenu from '$comp/ui/dropdown-menu';
-    import { addOrganizationUser, removeOrganizationUser } from '$features/organizations/api.svelte';
+    import { addOrganizationUser, deleteOrganizationUser } from '$features/organizations/api.svelte';
     import { ViewUser } from '$features/users/models';
     import { ProblemDetails } from '@exceptionless/fetchclient';
     import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
@@ -20,7 +20,7 @@
     let showRemoveUserDialog = $state(false);
     let toastId = $state<number | string | undefined>();
 
-    const removeUser = removeOrganizationUser({
+    const removeUser = deleteOrganizationUser({
         route: {
             email: user.email_address,
             organizationId
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/components/dialogs/add-webhook-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/components/dialogs/add-webhook-dialog.svelte
index e253f4cae0..fc8572c34d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/components/dialogs/add-webhook-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/components/dialogs/add-webhook-dialog.svelte
@@ -5,7 +5,9 @@
     import { Checkbox } from '$comp/ui/checkbox';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
+    import { applyServerSideErrors } from '$features/shared/validation';
     import { webhookEventTypes } from '$features/webhooks/options';
+    import { ProblemDetails } from '@exceptionless/fetchclient';
     import { defaults, superForm } from 'sveltekit-superforms';
     import { classvalidatorClient } from 'sveltekit-superforms/adapters';
 
@@ -25,13 +27,26 @@
 
     const form = superForm(defaults(defaultValue, classvalidatorClient(NewWebhook)), {
         dataType: 'json',
-        async onUpdate({ form }) {
+        id: 'add-webhook',
+        async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
             }
 
-            await save(form.data);
-            open = false;
+            try {
+                await save(form.data);
+                open = false;
+
+                // HACK: This is to prevent sveltekit from stealing focus
+                result.type = 'failure';
+            } catch (error: unknown) {
+                if (error instanceof ProblemDetails) {
+                    applyServerSideErrors(form, error);
+                    result.status = error.status ?? 500;
+                } else {
+                    result.status = 500;
+                }
+            }
         },
         SPA: true,
         validators: classvalidatorClient(NewWebhook)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/options.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/options.ts
index 413dba9caa..e281ea9fa9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/options.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/webhooks/options.ts
@@ -1,8 +1,8 @@
-import type { DropDownItem } from '$features/shared/options';
+import type { DropdownItem } from '$features/shared/options';
 
 import type { WebhookKnownEventTypes } from './models';
 
-export const webhookEventTypes: DropDownItem<WebhookKnownEventTypes>[] = [
+export const webhookEventTypes: DropdownItem<WebhookKnownEventTypes>[] = [
     {
         description: 'Occurs when a new error that has never been seen before is reported to your project.',
         label: 'New Error',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/websockets/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/websockets/models.ts
index 51bd565c61..e7c6db242f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/websockets/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/websockets/models.ts
@@ -1,7 +1,7 @@
 export enum ChangeType {
     Added = 0,
-    Removed = 2,
-    Saved = 1
+    Saved = 1,
+    Removed = 2
 }
 
 export interface EntityChanged {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-organization-switcher.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-organization-switcher.svelte
index 4ebff47792..01daebb6bc 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-organization-switcher.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-organization-switcher.svelte
@@ -2,6 +2,7 @@
     import type { HTMLAttributes } from 'svelte/elements';
 
     import DelayedRender from '$comp/delayed-render.svelte';
+    import { A } from '$comp/typography';
     import * as Avatar from '$comp/ui/avatar/index';
     import * as DropdownMenu from '$comp/ui/dropdown-menu/index';
     import * as Sidebar from '$comp/ui/sidebar/index';
@@ -11,6 +12,7 @@
     import { getInitials } from '$shared/strings';
     import ChevronsUpDown from '@lucide/svelte/icons/chevrons-up-down';
     import Plus from '@lucide/svelte/icons/plus';
+    import Settings from '@lucide/svelte/icons/settings';
 
     type Props = HTMLAttributes<HTMLUListElement> & {
         isLoading: boolean;
@@ -57,7 +59,7 @@
                     {/snippet}
                 </DropdownMenu.Trigger>
                 <DropdownMenu.Content
-                    class="w-(--bits-dropdown-menu-anchor-width) min-w-56 rounded-lg"
+                    class="w-(--bits-dropdown-menu-anchor-width) min-w-64 rounded-lg"
                     align="start"
                     side={sidebar.isMobile ? 'bottom' : 'right'}
                     sideOffset={4}
@@ -79,11 +81,26 @@
                         {/each}
                     {/if}
                     <DropdownMenu.Separator />
-                    <DropdownMenu.Item class="gap-2 p-2">
-                        <div class="bg-background flex size-6 items-center justify-center rounded-md border">
-                            <Plus class="size-4" aria-hidden="true" />
-                        </div>
-                        <span class="text-muted-foreground font-medium">Add organization</span>
+                    {#if activeOrganization?.id}
+                        <DropdownMenu.Item>
+                            <A variant="ghost" href={`/next/organization/${activeOrganization.id}/manage`} class="flex w-full items-center gap-2">
+                                <div class="bg-background flex size-6 items-center justify-center rounded-md border">
+                                    <Settings class="size-4" aria-hidden="true" />
+                                </div>
+                                <span class="text-muted-foreground font-medium">Manage organization</span>
+                                <DropdownMenu.Shortcut>⇧⌘go</DropdownMenu.Shortcut>
+                            </A>
+                        </DropdownMenu.Item>
+                        <DropdownMenu.Separator />
+                    {/if}
+                    <DropdownMenu.Item>
+                        <A variant="ghost" href="/next/organization/add" class="flex w-full items-center gap-2">
+                            <div class="bg-background flex size-6 items-center justify-center rounded-md border">
+                                <Plus class="size-4" aria-hidden="true" />
+                            </div>
+                            <span class="text-muted-foreground font-medium">Add organization</span>
+                            <DropdownMenu.Shortcut>⇧⌘gn</DropdownMenu.Shortcut>
+                        </A>
                     </DropdownMenu.Item>
                 </DropdownMenu.Content>
             </DropdownMenu.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
index c5fe4d3495..69de4db86c 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
@@ -7,16 +7,19 @@
     import * as Sidebar from '$comp/ui/sidebar/index';
     import { useSidebar } from '$comp/ui/sidebar/index';
     import { Skeleton } from '$comp/ui/skeleton';
+    import { organization } from '$features/organizations/context.svelte';
     import { User } from '$features/users/models';
     import BadgeCheck from '@lucide/svelte/icons/badge-check';
+    import Bell from '@lucide/svelte/icons/bell';
     import BookOpen from '@lucide/svelte/icons/book-open';
     import Braces from '@lucide/svelte/icons/braces';
-    // import Bell from '@lucide/svelte/icons/bell';
     import ChevronsUpDown from '@lucide/svelte/icons/chevrons-up-down';
     import Help from '@lucide/svelte/icons/circle-help';
+    import CreditCard from '@lucide/svelte/icons/credit-card';
     import GitHub from '@lucide/svelte/icons/github';
-    // import CreditCard from '@lucide/svelte/icons/credit-card';
     import LogOut from '@lucide/svelte/icons/log-out';
+    import Plus from '@lucide/svelte/icons/plus';
+    import Settings from '@lucide/svelte/icons/settings';
 
     interface Props {
         gravatar: Gravatar;
@@ -99,17 +102,45 @@
                             <A variant="ghost" href="/next/account/manage" class="w-full" onclick={onMenuClick}>Account</A>
                             <DropdownMenu.Shortcut>⇧⌘ga</DropdownMenu.Shortcut>
                         </DropdownMenu.Item>
-                        <!-- <DropdownMenu.Item>
-                        <CreditCard />
-                        <A variant="ghost" href="/account/manage" class="w-full">
-                            Billing</A>
-                            <DropdownMenu.Shortcut>⌘B</DropdownMenu.Shortcut>
-                    </DropdownMenu.Item>
-                    <DropdownMenu.Item>
-                        <Bell />
-                        <A variant="ghost" href="/next/account/notifications" class="w-full">Notifications</A>
-                        <DropdownMenu.Shortcut>⇧⌘N</DropdownMenu.Shortcut>
-                    </DropdownMenu.Item> -->
+                        <DropdownMenu.Item>
+                            <Bell />
+                            <A variant="ghost" href="/next/account/notifications" class="w-full" onclick={onMenuClick}>Notifications</A>
+                            <DropdownMenu.Shortcut>⇧⌘gn</DropdownMenu.Shortcut>
+                        </DropdownMenu.Item>
+                        {#if organization.current}
+                            <DropdownMenu.Item>
+                                <Settings />
+                                <A
+                                    variant="ghost"
+                                    href={`/next/organization/${organization.current}/manage`}
+                                    class="flex w-full items-center gap-2"
+                                    onclick={onMenuClick}
+                                >
+                                    Manage organization
+                                    <DropdownMenu.Shortcut>⇧⌘go</DropdownMenu.Shortcut>
+                                </A>
+                            </DropdownMenu.Item>
+                            <DropdownMenu.Item>
+                                <CreditCard />
+                                <A
+                                    variant="ghost"
+                                    href={`/next/organization/${organization.current}/billing`}
+                                    class="flex w-full items-center gap-2"
+                                    onclick={onMenuClick}
+                                >
+                                    Billing
+                                    <DropdownMenu.Shortcut>⇧⌘gb</DropdownMenu.Shortcut>
+                                </A>
+                            </DropdownMenu.Item>
+                        {:else}
+                            <DropdownMenu.Item>
+                                <Plus />
+                                <A variant="ghost" href="/next/organization/add" class="flex w-full items-center gap-2" onclick={onMenuClick}>
+                                    Add organization
+                                    <DropdownMenu.Shortcut>⇧⌘gn</DropdownMenu.Shortcut>
+                                </A>
+                            </DropdownMenu.Item>
+                        {/if}
                     </DropdownMenu.Group>
                     <DropdownMenu.Sub>
                         <DropdownMenu.SubTrigger>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index 7243e25138..294f93492e 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -200,11 +200,9 @@
         <div class="text-secondary-foreground w-full">
             <main class="px-4 pt-4">
                 <NavigationCommand bind:open={isCommandOpen} routes={filteredRoutes} />
-                {#key page.url.pathname}
-                    <div in:fade={{ delay: 150, duration: 150 }} out:fade={{ duration: 150 }}>
-                        {@render children()}
-                    </div>
-                {/key}
+                <div in:fade={{ delay: 150, duration: 150 }} out:fade={{ duration: 150 }}>
+                    {@render children()}
+                </div>
             </main>
 
             <Footer></Footer>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+page.svelte
index 3832326b72..4b7930f556 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+page.svelte
@@ -6,6 +6,7 @@
     import * as DataTable from '$comp/data-table';
     import * as FacetedFilter from '$comp/faceted-filter';
     import StreamingIndicatorButton from '$comp/streaming-indicator-button.svelte';
+    import { H3 } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Sheet from '$comp/ui/sheet';
     import EventsOverview from '$features/events/components/events-overview.svelte';
@@ -225,7 +226,7 @@
 <div class="flex flex-col space-y-4">
     <EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
         {#snippet toolbarChildren()}
-            <div class="pr-2 text-lg font-medium">Events</div>
+            <H3 class="pr-2">Events</H3>
             <FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
                 <OrganizationDefaultsFacetedFilterBuilder />
             </FacetedFilter.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/+layout.svelte
index 0bf6ee4f32..6c26e57fff 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import * as Card from '$comp/ui/card';
+    import { H3, Muted } from '$comp/typography';
     import { Separator } from '$comp/ui/separator';
     import { accessToken } from '$features/auth/index.svelte';
     import * as SplitLayout from '$features/shared/components/layouts/split-layout';
@@ -20,21 +20,16 @@
     });
 </script>
 
-<Card.Root>
-    <Card.Header>
-        <Card.Title class="text-2xl">Settings</Card.Title>
-        <Card.Description>Manage your account settings and set e-mail preferences.</Card.Description>
-    </Card.Header>
-    <Separator class="mx-6 my-6 w-auto" />
+<H3>Settings</H3>
+<Muted>Manage your account settings and set e-mail preferences.</Muted>
 
-    <Card.Content>
-        <SplitLayout.Root>
-            <SplitLayout.Sidebar>
-                <SidebarNav routes={filteredRoutes} />
-            </SplitLayout.Sidebar>
-            <SplitLayout.Content>
-                {@render children()}
-            </SplitLayout.Content>
-        </SplitLayout.Root>
-    </Card.Content>
-</Card.Root>
+<Separator class="mx-6 my-6 w-auto" />
+
+<SplitLayout.Root>
+    <SplitLayout.Sidebar>
+        <SidebarNav routes={filteredRoutes} />
+    </SplitLayout.Sidebar>
+    <SplitLayout.Content>
+        {@render children()}
+    </SplitLayout.Content>
+</SplitLayout.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/appearance/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/appearance/+page.svelte
index 42c8f40f41..5981068b2b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/appearance/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/appearance/+page.svelte
@@ -26,17 +26,17 @@
             onValueChange={onUserThemePreferenceChange}
             value={userPrefersMode.current}
         >
-            <Label class="[&:has([data-state=checked])>div]:border-primary" for="light">
+            <Label class="[&:has([data-state=checked])>div]:border-primary flex flex-col items-center" for="light">
                 <RadioGroup.Item class="sr-only" id="light" value="light" />
                 <ThemePreview mode="light" />
                 <div class="pt-2 text-center">Light</div>
             </Label>
-            <Label class="[&:has([data-state=checked])>div]:border-primary" for="dark">
+            <Label class="[&:has([data-state=checked])>div]:border-primary flex flex-col items-center" for="dark">
                 <RadioGroup.Item class="sr-only" id="dark" value="dark" />
                 <ThemePreview mode="dark" />
                 <div class="pt-2 text-center">Dark</div>
             </Label>
-            <Label class="[&:has([data-state=checked])>div]:border-primary" for="system">
+            <Label class="[&:has([data-state=checked])>div]:border-primary flex flex-col items-center" for="system">
                 <RadioGroup.Item class="sr-only" id="system" value="system" />
                 <ThemePreview mode="system" />
                 <div class="pt-2 text-center">System</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
index 3ba77dabb0..9a1e8f4297 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
@@ -5,6 +5,7 @@
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
     import { Separator } from '$comp/ui/separator';
+    import { structuredCloneState } from '$features/shared/utils/state.svelte';
     import { getMeQuery, patchUser, postEmailAddress, resendVerificationEmail } from '$features/users/api.svelte';
     import { getGravatarFromCurrentUser } from '$features/users/gravatar.svelte';
     import { UpdateUser, UpdateUserEmailAddress } from '$features/users/models';
@@ -16,8 +17,9 @@
     import { debounce } from 'throttle-debounce';
 
     let toastId = $state<number | string>();
+    let previousEmailSettingsRef = $state<UpdateUserEmailAddress>();
+    let previousUserSettingsRef = $state<UpdateUser>();
     const meQuery = getMeQuery();
-    const isEmailAddressVerified = $derived(meQuery.data?.is_email_address_verified ?? false);
     const gravatar = getGravatarFromCurrentUser(meQuery);
     const updateUser = patchUser({
         route: {
@@ -27,6 +29,7 @@
         }
     });
 
+    const isEmailAddressVerified = $derived(meQuery.data?.is_email_address_verified ?? false);
     const resendVerificationEmailMutation = resendVerificationEmail({
         route: {
             get id() {
@@ -43,37 +46,40 @@
         }
     });
 
-    const updateEmailAddressForm = superForm(defaults(meQuery.data ?? new UpdateUserEmailAddress(), classvalidatorClient(UpdateUserEmailAddress)), {
-        dataType: 'json',
-        id: 'update-email-address',
-        async onUpdate({ form, result }) {
-            if (!form.valid) {
-                return;
-            }
-
-            toast.dismiss(toastId);
-            try {
-                await updateEmailAddress.mutateAsync(form.data);
-                toastId = toast.success('Successfully updated Account');
-
-                // HACK: This is to prevent sveltekit from stealing focus
-                result.type = 'failure';
-            } catch (error: unknown) {
-                if (error instanceof ProblemDetails) {
-                    applyServerSideErrors(form, error);
-                    result.status = error.status ?? 500;
-                } else {
-                    result.status = 500;
+    const updateEmailAddressForm = superForm(
+        defaults(structuredCloneState(meQuery.data) ?? new UpdateUserEmailAddress(), classvalidatorClient(UpdateUserEmailAddress)),
+        {
+            dataType: 'json',
+            id: 'update-email-address',
+            async onUpdate({ form, result }) {
+                if (!form.valid) {
+                    return;
                 }
 
-                toastId = toast.error(form.message ?? 'Error saving email address. Please try again.');
-            }
-        },
-        SPA: true,
-        validators: classvalidatorClient(UpdateUserEmailAddress)
-    });
+                toast.dismiss(toastId);
+                try {
+                    await updateEmailAddress.mutateAsync(form.data);
+                    toastId = toast.success('Successfully updated Account');
+
+                    // HACK: This is to prevent sveltekit from stealing focus
+                    result.type = 'failure';
+                } catch (error: unknown) {
+                    if (error instanceof ProblemDetails) {
+                        applyServerSideErrors(form, error);
+                        result.status = error.status ?? 500;
+                    } else {
+                        result.status = 500;
+                    }
+
+                    toastId = toast.error(form.message ?? 'Error saving email address. Please try again.');
+                }
+            },
+            SPA: true,
+            validators: classvalidatorClient(UpdateUserEmailAddress)
+        }
+    );
 
-    const updateUserForm = superForm(defaults(meQuery.data ?? new UpdateUser(), classvalidatorClient(UpdateUser)), {
+    const updateUserForm = superForm(defaults(structuredCloneState(meQuery.data) ?? new UpdateUser(), classvalidatorClient(UpdateUser)), {
         dataType: 'json',
         id: 'update-user',
         async onUpdate({ form, result }) {
@@ -108,8 +114,10 @@
             return;
         }
 
-        if (!$updateEmailAddressFormSubmitting && !$updateEmailAddressFormTainted) {
-            updateEmailAddressForm.reset({ data: meQuery.data, keepMessage: true });
+        if (!$updateEmailAddressFormSubmitting && !$updateEmailAddressFormTainted && meQuery.data !== previousEmailSettingsRef) {
+            const clonedData = structuredCloneState(meQuery.data);
+            updateEmailAddressForm.reset({ data: clonedData, keepMessage: true });
+            previousEmailSettingsRef = meQuery.data;
         }
     });
 
@@ -118,8 +126,10 @@
             return;
         }
 
-        if (!$updateUserFormSubmitting && !$updateUserFormTainted) {
-            updateUserForm.reset({ data: meQuery.data, keepMessage: true });
+        if (!$updateUserFormSubmitting && !$updateUserFormTainted && meQuery.data !== previousUserSettingsRef) {
+            const clonedData = structuredCloneState(meQuery.data);
+            updateUserForm.reset({ data: clonedData, keepMessage: true });
+            previousUserSettingsRef = meQuery.data;
         }
     });
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/notifications/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/notifications/+page.svelte
index 99a0d763a5..7955e2068f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/notifications/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/notifications/+page.svelte
@@ -1,27 +1,126 @@
 <script lang="ts">
-    import ErrorMessage from '$comp/error-message.svelte';
-    import Loading from '$comp/loading.svelte';
-    import Switch from '$comp/primitives/switch.svelte';
-    import { H3, H4, Muted } from '$comp/typography';
-    import { Button } from '$comp/ui/button';
+    import type { NotificationSettings } from '$features/projects/models';
+
+    import { A, H3, Muted } from '$comp/typography';
+    import { Badge } from '$comp/ui/badge';
+    import * as Select from '$comp/ui/select';
     import { Separator } from '$comp/ui/separator';
-    import { User } from '$features/users/models';
-    import { useFetchClientStatus } from '$shared/api/api.svelte';
-    import { ProblemDetails, useFetchClient } from '@exceptionless/fetchclient';
+    import { Skeleton } from '$comp/ui/skeleton';
+    import { Switch } from '$comp/ui/switch';
+    import { getProjectsQuery, getProjectUserNotificationSettings, postProjectUserNotificationSettings } from '$features/projects/api.svelte';
+    import UserNotificationSettingsForm from '$features/projects/components/user-notification-settings-form.svelte';
+    import AlertDescription from '$features/shared/components/ui/alert/alert-description.svelte';
+    import AlertTitle from '$features/shared/components/ui/alert/alert-title.svelte';
+    import Alert from '$features/shared/components/ui/alert/alert.svelte';
+    import { getMeQuery, patchUser, resendVerificationEmail } from '$features/users/api.svelte';
+    import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
+    import { queryParamsState } from 'kit-query-params';
+    import { toast } from 'svelte-sonner';
+    import { debounce } from 'throttle-debounce';
+
+    let toastId = $state<number | string>();
+
+    const meQuery = getMeQuery();
+    const queryParams = queryParamsState({
+        default: { project: '' },
+        pushHistory: true,
+        schema: { project: 'string' }
+    });
+
+    const updateUser = patchUser({
+        route: {
+            get id() {
+                return meQuery.data?.id;
+            }
+        }
+    });
+
+    const projectsQuery = getProjectsQuery({});
+    const allProjects = $derived(projectsQuery.data?.data ?? []);
+
+    const projectsByOrganization = $derived.by(() => {
+        const groups = Object.groupBy(allProjects, (project) => project.organization_name);
+        return Object.entries(groups)
+            .map(([organizationName, projects]) => ({
+                organizationName: organizationName,
+                projects: (projects || []).sort((a, b) => a.name.localeCompare(b.name))
+            }))
+            .sort((a, b) => a.organizationName.localeCompare(b.organizationName));
+    });
 
-    const data = $state(new User());
-    data.email_notifications_enabled = true;
+    const selectedProject = $derived(allProjects.find((p) => p.id === queryParams.project) ?? allProjects[0]);
+    const selectedProjectNotificationSettings = getProjectUserNotificationSettings({
+        route: {
+            get id() {
+                return selectedProject?.id;
+            },
+            get userId() {
+                return meQuery.data?.id;
+            }
+        }
+    });
 
-    const client = useFetchClient();
-    const clientStatus = useFetchClientStatus(client);
+    const updateProjectNotificationSettings = postProjectUserNotificationSettings({
+        route: {
+            get id() {
+                return selectedProject?.id;
+            },
+            get userId() {
+                return meQuery.data?.id;
+            }
+        }
+    });
 
-    let problem = $state(new ProblemDetails());
+    const debouncedOnEmailNotificationChanged = debounce(500, onEmailNotificationChanged);
+    async function onEmailNotificationChanged(checked: boolean) {
+        toast.dismiss(toastId);
 
-    async function onSave() {
-        if (client.isLoading) {
-            return;
+        try {
+            await updateUser.mutateAsync({ email_notifications_enabled: checked });
+            toastId = toast.success('Email notification preference saved.');
+        } catch {
+            toastId = toast.error('An error occurred while saving your email notification preferences.');
         }
     }
+
+    async function onProjectNotificationChanged(settings: NotificationSettings) {
+        toast.dismiss(toastId);
+
+        try {
+            await updateProjectNotificationSettings.mutateAsync(settings);
+            toastId = toast.success('Project notification preference saved.');
+        } catch {
+            toastId = toast.error('An error occurred while saving your project notification preferences.');
+        }
+    }
+
+    const isEmailAddressVerified = $derived(meQuery.data?.is_email_address_verified ?? false);
+    let emailNotificationsEnabled = $derived(meQuery.data?.email_notifications_enabled ?? false);
+    $effect(() => {
+        emailNotificationsEnabled = meQuery.data?.email_notifications_enabled ?? false;
+    });
+
+    const resendVerificationEmailMutation = resendVerificationEmail({
+        route: {
+            get id() {
+                return meQuery.data?.id;
+            }
+        }
+    });
+
+    async function handleResendVerificationEmail() {
+        toast.dismiss(toastId);
+        try {
+            await resendVerificationEmailMutation.mutateAsync();
+            toastId = toast.success('Please check your inbox for the verification email.');
+        } catch {
+            toastId = toast.error('Error sending verification email. Please try again.');
+        }
+    }
+
+    async function handleUpgrade() {
+        console.log('TODO: Upgrade to premium features');
+    }
 </script>
 
 <div class="space-y-6">
@@ -31,26 +130,76 @@
     </div>
     <Separator />
 
-    <form class="space-y-2" onsubmit={onSave}>
-        <ErrorMessage message={problem.errors.general}></ErrorMessage>
+    {#if meQuery.isSuccess && (!isEmailAddressVerified || !emailNotificationsEnabled)}
+        <Alert variant="destructive" class="mb-4">
+            <AlertCircleIcon />
+            <AlertTitle>Email notifications are currently disabled</AlertTitle>
+            {#if !isEmailAddressVerified}
+                <AlertDescription>
+                    <span
+                        >To enable email notifications you must first verify your email address. <A class="inline" onclick={handleResendVerificationEmail}
+                            >Resend verification email.</A
+                        ></span
+                    >
+                </AlertDescription>
+            {/if}
+        </Alert>
+    {/if}
 
-        <H3 class="mb-4">Email Notifications</H3>
-        <div class="flex flex-row items-center justify-between rounded-lg border p-4">
-            <div class="space-y-0.5">
-                <H4>Communication emails</H4>
-                <Muted>Receive emails about your account activity.</Muted>
+    <div class="space-y-2">
+        <H3>Email Notifications</H3>
+        <div class="rounded-lg border p-4">
+            <div class="flex items-center justify-between">
+                <div>
+                    <div class="flex items-center gap-2">
+                        <div class="text-sm font-medium">Enable Email Notifications</div>
+                        {#if !isEmailAddressVerified}
+                            <Badge variant="secondary" class="text-xs">Requires verification</Badge>
+                        {/if}
+                    </div>
+                    <Muted class="text-xs">Receive updates about activity in your organization and projects.</Muted>
+                </div>
+                {#if meQuery.data}
+                    <Switch
+                        bind:checked={emailNotificationsEnabled}
+                        id="email_notifications_enabled"
+                        disabled={updateUser.isPending}
+                        onCheckedChange={debouncedOnEmailNotificationChanged}
+                    />
+                {:else}
+                    <Skeleton class="h-[1.15rem] w-8 rounded-full" />
+                {/if}
             </div>
-            <Switch bind:checked={data.email_notifications_enabled} id="email_notifications_enabled"></Switch>
         </div>
+    </div>
 
-        <div class="pt-2">
-            <Button type="submit">
-                {#if clientStatus.isLoading}
-                    <Loading class="mr-2" variant="secondary"></Loading> Saving...
-                {:else}
-                    Save
-                {/if}
-            </Button>
+    {#if selectedProject}
+        <div class="space-y-2">
+            <H3>Project Notifications</H3>
+            <Muted>Choose how often you want to receive notifications for event occurrences in this project.</Muted>
+            <Select.Root bind:value={queryParams.project!} type="single">
+                <Select.Trigger class="w-full">
+                    {selectedProject.name}
+                </Select.Trigger>
+                <Select.Content>
+                    {#each projectsByOrganization as { organizationName, projects } (organizationName)}
+                        <Select.Group>
+                            <Select.Label>{organizationName}</Select.Label>
+                            {#each projects as project (project.id)}
+                                <Select.Item value={project.id}>{project.name}</Select.Item>
+                            {/each}
+                        </Select.Group>
+                    {/each}
+                </Select.Content>
+            </Select.Root>
         </div>
-    </form>
+
+        <UserNotificationSettingsForm
+            upgrade={handleUpgrade}
+            settings={selectedProjectNotificationSettings?.data}
+            save={onProjectNotificationChanged}
+            {emailNotificationsEnabled}
+            hasPremiumFeatures={selectedProject.has_premium_features}
+        />
+    {/if}
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/routes.svelte.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/routes.svelte.ts
index 60da726bef..a06d74d710 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/routes.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/routes.svelte.ts
@@ -25,7 +25,6 @@ export function routes(): NavigationItem[] {
             group: 'My Account',
             href: '/next/account/notifications',
             icon: Notifications,
-            show: () => false,
             title: 'Notifications'
         },
         {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId]/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId]/+page.svelte
index b12a8e7744..ba26f4ee4b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId]/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId]/+page.svelte
@@ -4,7 +4,7 @@
     import { goto } from '$app/navigation';
     import { page } from '$app/state';
     import * as FacetedFilter from '$comp/faceted-filter';
-    import * as Card from '$comp/ui/card';
+    import { H3 } from '$comp/typography';
     import EventsOverview from '$features/events/components/events-overview.svelte';
     import { buildFilterCacheKey, toFilter, updateFilterCache } from '$features/events/components/filters/helpers.svelte';
     import { organization } from '$features/organizations/context.svelte';
@@ -39,13 +39,7 @@
     }
 </script>
 
-<div class="flex flex-col space-y-4">
-    <Card.Root
-        ><Card.Header>
-            <Card.Title class="text-2xl">Event Details</Card.Title></Card.Header
-        >
-        <Card.Content>
-            <EventsOverview {filterChanged} id={page.params.eventId || ''} {handleError}></EventsOverview>
-        </Card.Content>
-    </Card.Root>
+<div class="flex flex-col gap-4">
+    <H3>Event Details</H3>
+    <EventsOverview {filterChanged} id={page.params.eventId || ''} {handleError}></EventsOverview>
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
index 3f539c58e4..0040576a25 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
@@ -5,6 +5,7 @@
     import * as DataTable from '$comp/data-table';
     import * as FacetedFilter from '$comp/faceted-filter';
     import StreamingIndicatorButton from '$comp/streaming-indicator-button.svelte';
+    import { H3 } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Sheet from '$comp/ui/sheet';
     import { type GetEventsParams, getStackEventsQuery } from '$features/events/api.svelte';
@@ -236,7 +237,7 @@
 <div class="flex flex-col space-y-4">
     <EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
         {#snippet toolbarChildren()}
-            <div class="pr-2 text-lg font-medium">Issues</div>
+            <H3 class="pr-2">Issues</H3>
             <FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
                 <OrganizationDefaultsFacetedFilterBuilder />
             </FacetedFilter.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/+layout.svelte
index 49462939ab..4ed7e6be9f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
     import { page } from '$app/state';
-    import * as Card from '$comp/ui/card';
+    import { H3, Muted } from '$comp/typography';
     import { Separator } from '$comp/ui/separator';
     import { getOrganizationQuery } from '$features/organizations/api.svelte';
     import { organization } from '$features/organizations/context.svelte';
@@ -41,28 +41,25 @@
     });
 </script>
 
-<Card.Root>
-    <Card.Header>
-        <Card.Title class="flex items-center gap-1 text-2xl"
-            >{#if organizationQuery.isSuccess}
+<div>
+    <div class="flex flex-col gap-1">
+        <H3 class="flex items-center gap-1">
+            {#if organizationQuery.isSuccess}
                 <div class="max-w-[70%] overflow-hidden" title={organizationQuery.data.name}>
                     <span class="block truncate">{organizationQuery.data.name}</span>
                 </div>
             {/if}
-            <span class="shrink-0">Settings</span></Card.Title
-        >
-        <Card.Description>Manage your organization's settings, users, and billing information.</Card.Description>
-    </Card.Header>
+            <span class="shrink-0">Settings</span>
+        </H3>
+        <Muted>Manage your organization's settings, users, and billing information.</Muted>
+    </div>
     <Separator class="mx-6 my-6 w-auto" />
-
-    <Card.Content>
-        <SplitLayout.Root>
-            <SplitLayout.Sidebar>
-                <SidebarNav routes={routes()} />
-            </SplitLayout.Sidebar>
-            <SplitLayout.Content>
-                {@render children()}
-            </SplitLayout.Content>
-        </SplitLayout.Root>
-    </Card.Content>
-</Card.Root>
+    <SplitLayout.Root>
+        <SplitLayout.Sidebar>
+            <SidebarNav routes={routes()} />
+        </SplitLayout.Sidebar>
+        <SplitLayout.Content>
+            {@render children()}
+        </SplitLayout.Content>
+    </SplitLayout.Root>
+</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/manage/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/manage/+page.svelte
index 51314a1a50..b69b8cc7f8 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/manage/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/manage/+page.svelte
@@ -9,10 +9,13 @@
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
     import { Separator } from '$comp/ui/separator';
-    import { deleteOrganization, getOrganizationQuery, updateOrganization } from '$features/organizations/api.svelte';
+    import { deleteOrganization, getOrganizationQuery, patchOrganization } from '$features/organizations/api.svelte';
     import RemoveOrganizationDialog from '$features/organizations/components/dialogs/remove-organization-dialog.svelte';
+    import OrganizationAdminActionsDropdownMenu from '$features/organizations/components/organization-admin-actions-dropdown-menu.svelte';
     import { NewOrganization } from '$features/organizations/models';
+    import { structuredCloneState } from '$features/shared/utils/state.svelte';
     import { applyServerSideErrors } from '$features/shared/validation';
+    import GlobalUser from '$features/users/components/global-user.svelte';
     import { ProblemDetails } from '@exceptionless/fetchclient';
     import Issues from '@lucide/svelte/icons/bug';
     import X from '@lucide/svelte/icons/x';
@@ -22,6 +25,7 @@
     import { debounce } from 'throttle-debounce';
 
     let toastId = $state<number | string>();
+    let previousOrganizationRef = $state<NewOrganization>();
 
     const organizationId = page.params.organizationId || '';
     const organizationQuery = getOrganizationQuery({
@@ -32,7 +36,7 @@
         }
     });
 
-    const update = updateOrganization({
+    const update = patchOrganization({
         route: {
             get id() {
                 return organizationId;
@@ -62,8 +66,9 @@
         }
     }
 
-    const form = superForm(defaults(organizationQuery.data ?? new NewOrganization(), classvalidatorClient(NewOrganization)), {
+    const form = superForm(defaults(structuredCloneState(organizationQuery.data) ?? new NewOrganization(), classvalidatorClient(NewOrganization)), {
         dataType: 'json',
+        id: 'manage-organization',
         async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
@@ -97,8 +102,10 @@
             return;
         }
 
-        if (!$submitting && !$tainted) {
-            form.reset({ data: organizationQuery.data, keepMessage: true });
+        if (!$submitting && !$tainted && organizationQuery.data !== previousOrganizationRef) {
+            const clonedData = structuredCloneState(organizationQuery.data);
+            form.reset({ data: clonedData, keepMessage: true });
+            previousOrganizationRef = organizationQuery.data;
         }
     });
 
@@ -127,13 +134,14 @@
     </form>
 
     <div class="flex w-full items-center justify-between">
-        <div class="flex gap-2">
-            <Button variant="secondary" href="/next/issues">
-                <Issues class="mr-2 size-4" /> Go To Issues
-            </Button>
-        </div>
+        <Button variant="secondary" href="/next/issues">
+            <Issues class="mr-2 size-4" /> Go To Issues
+        </Button>
 
-        <div>
+        <div class="flex gap-2">
+            <GlobalUser>
+                <OrganizationAdminActionsDropdownMenu organization={organizationQuery.data} />
+            </GlobalUser>
             <DropdownMenu.Root>
                 <DropdownMenu.Trigger class={buttonVariants({ variant: 'destructive' })}>
                     <X class="size-4" />
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
index cd26daa815..42b05d1caf 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
@@ -2,7 +2,7 @@
     import { goto } from '$app/navigation';
     import ErrorMessage from '$comp/error-message.svelte';
     import Loading from '$comp/loading.svelte';
-    import * as Card from '$comp/ui/card';
+    import { H3, Muted } from '$comp/typography';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
     import { postOrganization } from '$features/organizations/api.svelte';
@@ -50,34 +50,29 @@
     const { enhance, form: formData, message, submitting } = form;
 </script>
 
-<div class="p-6">
-    <Card.Root>
-        <Card.Header>
-            <Card.Title class="text-2xl">Add Organization</Card.Title>
-            <Card.Description>Add a new organization to start tracking errors and events.</Card.Description>
-        </Card.Header>
+<div class="flex flex-col gap-4">
+    <div class="flex flex-col gap-1">
+        <H3>Add Organization</H3>
+        <Muted>Add a new organization to start tracking errors and events.</Muted>
+    </div>
+    <form method="POST" use:enhance>
+        <ErrorMessage message={$message} />
+        <Form.Field {form} name="name">
+            <Form.Control>
+                {#snippet children({ props })}
+                    <Form.Label>Organization Name</Form.Label>
+                    <Input {...props} bind:value={$formData.name} placeholder="Enter organization name" />
+                {/snippet}
+            </Form.Control>
+            <Form.FieldErrors />
+        </Form.Field>
 
-        <Card.Content>
-            <form method="POST" use:enhance>
-                <ErrorMessage message={$message} />
-                <Form.Field {form} name="name">
-                    <Form.Control>
-                        {#snippet children({ props })}
-                            <Form.Label>Organization Name</Form.Label>
-                            <Input {...props} bind:value={$formData.name} placeholder="Enter organization name" />
-                        {/snippet}
-                    </Form.Control>
-                    <Form.FieldErrors />
-                </Form.Field>
-
-                <Form.Button>
-                    {#if $submitting}
-                        <Loading class="mr-2" variant="secondary"></Loading> Adding Organization...
-                    {:else}
-                        Add Organization
-                    {/if}</Form.Button
-                >
-            </form>
-        </Card.Content>
-    </Card.Root>
+        <Form.Button>
+            {#if $submitting}
+                <Loading class="mr-2" variant="secondary"></Loading> Adding Organization...
+            {:else}
+                Add Organization
+            {/if}</Form.Button
+        >
+    </form>
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/list/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/list/+page.svelte
index 95979ae140..15759fa229 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/list/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/list/+page.svelte
@@ -3,8 +3,8 @@
     import type { TableMemoryPagingParameters } from '$features/shared/table.svelte';
 
     import { goto } from '$app/navigation';
+    import { H3, Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
-    import * as Card from '$comp/ui/card';
     import { type GetOrganizationsParams, getOrganizationsQuery } from '$features/organizations/api.svelte';
     import { getTableOptions } from '$features/organizations/components/table/options.svelte';
     import OrganizationsDataTable from '$features/organizations/components/table/organizations-data-table.svelte';
@@ -34,20 +34,18 @@
     }
 </script>
 
-<div class="flex flex-col space-y-4">
-    <Card.Root>
-        <Card.Header>
-            <Card.Title class="text-2xl">My Organizations</Card.Title>
-            <Card.Description>View and manage your organizations. Click on an organization to view its details.</Card.Description>
-            <Card.Action>
-                <Button size="icon" onclick={addOrganization} title="Add Organization">
-                    <Plus class="size-4" aria-hidden="true" />
-                    <span class="sr-only">Add Organization</span>
-                </Button>
-            </Card.Action>
-        </Card.Header>
-        <Card.Content>
-            <OrganizationsDataTable isLoading={organizationsQuery.isLoading} {rowClick} {table} />
-        </Card.Content>
-    </Card.Root>
+<div class="flex flex-col gap-4">
+    <div class="flex flex-wrap items-start justify-between gap-4">
+        <div class="flex flex-col gap-1">
+            <H3>My Organizations</H3>
+            <Muted>View and manage your organizations. Click on an organization to view its details.</Muted>
+        </div>
+        <div class="flex items-center gap-2">
+            <Button size="icon" onclick={addOrganization} title="Add Organization">
+                <Plus class="size-4" aria-hidden="true" />
+                <span class="sr-only">Add Organization</span>
+            </Button>
+        </div>
+    </div>
+    <OrganizationsDataTable isLoading={organizationsQuery.isLoading} {rowClick} {table} />
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/+layout.svelte
index a65d797fe0..4b4632676b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/+layout.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
     import { page } from '$app/state';
+    import { H3, Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
-    import * as Card from '$comp/ui/card';
     import { Separator } from '$comp/ui/separator';
     import { organization } from '$features/organizations/context.svelte';
     import { getProjectQuery } from '$features/projects/api.svelte';
@@ -37,33 +37,32 @@
     });
 </script>
 
-<Card.Root>
-    <Card.Header>
-        <Card.Title class="flex items-center gap-1 text-2xl"
-            >{#if projectQuery.isSuccess}
-                <div class="max-w-[70%] overflow-hidden" title={projectQuery.data.name}>
-                    <span class="block truncate">{projectQuery.data.name}</span>
-                </div>
-            {/if}
-            <span class="shrink-0">Settings</span></Card.Title
-        >
-        <Card.Description>Manage your project settings and integrations.</Card.Description>
-        <Card.Action>
+<div>
+    <div class="flex flex-wrap items-start justify-between gap-4">
+        <div class="flex flex-col gap-1">
+            <H3 class="flex items-center gap-1">
+                {#if projectQuery.isSuccess}
+                    <div class="max-w-[70%] overflow-hidden" title={projectQuery.data.name}>
+                        <span class="block truncate">{projectQuery.data.name}</span>
+                    </div>
+                {/if}
+                <span class="shrink-0">Settings</span>
+            </H3>
+            <Muted>Manage your project settings and integrations.</Muted>
+        </div>
+        <div class="flex items-center gap-2">
             <Button variant="secondary" size="icon" href="/account/manage?tab=notifications&projectId={projectId}" title="Notification Settings">
                 <NotificationSettings class="size-4" />
             </Button>
-        </Card.Action>
-    </Card.Header>
+        </div>
+    </div>
     <Separator class="mx-6 my-6 w-auto" />
-
-    <Card.Content>
-        <SplitLayout.Root>
-            <SplitLayout.Sidebar>
-                <SidebarNav routes={routes()} />
-            </SplitLayout.Sidebar>
-            <SplitLayout.Content>
-                {@render children()}
-            </SplitLayout.Content>
-        </SplitLayout.Root>
-    </Card.Content>
-</Card.Root>
+    <SplitLayout.Root>
+        <SplitLayout.Sidebar>
+            <SidebarNav routes={routes()} />
+        </SplitLayout.Sidebar>
+        <SplitLayout.Content>
+            {@render children()}
+        </SplitLayout.Content>
+    </SplitLayout.Root>
+</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte
index 24ae79bdd5..4d55889c2f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/integrations/+page.svelte
@@ -17,7 +17,7 @@
         putProjectIntegrationNotificationSettings
     } from '$features/projects/api.svelte';
     import RemoveSlackDialog from '$features/projects/components/dialogs/remove-slack-dialog.svelte';
-    import NotificationSettingsForm from '$features/projects/components/notification-settings-form.svelte';
+    import IntegrationNotificationSettingsForm from '$features/projects/components/integration-notification-settings-form.svelte';
     import { DEFAULT_LIMIT } from '$features/shared/api/api.svelte';
     import { type GetProjectWebhooksParams, postWebhook } from '$features/webhooks/api.svelte';
     import { getProjectWebhooksQuery } from '$features/webhooks/api.svelte';
@@ -87,8 +87,9 @@
         try {
             await newWebhook.mutateAsync(webhook);
             toastId = toast.success('Webhook added successfully');
-        } catch {
+        } catch (error) {
             toastId = toast.error('Error adding webhook. Please try again.');
+            throw error;
         }
     }
 
@@ -192,7 +193,7 @@
             >
 
             {#if hasSlackIntegration}
-                <NotificationSettingsForm settings={slackNotificationSettingsQuery.data} save={updateSlackNotificationSettings} />
+                <IntegrationNotificationSettingsForm settings={slackNotificationSettingsQuery.data} save={updateSlackNotificationSettings} />
 
                 <Button onclick={() => (showRemoveSlackDialog = true)}><SlackIcon class="mr-2 size-4" /> Remove Slack</Button>
             {:else}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/manage/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/manage/+page.svelte
index 2ce6e56bb9..5b016dff1c 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/manage/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/manage/+page.svelte
@@ -13,6 +13,7 @@
     import RemoveProjectDialog from '$features/projects/components/dialogs/remove-project-dialog.svelte';
     import ResetProjectDataDialog from '$features/projects/components/dialogs/reset-project-data-dialog.svelte';
     import { UpdateProject } from '$features/projects/models';
+    import { structuredCloneState } from '$features/shared/utils/state.svelte';
     import { applyServerSideErrors } from '$features/shared/validation';
     import { ProblemDetails } from '@exceptionless/fetchclient';
     import AlertTriangle from '@lucide/svelte/icons/alert-triangle';
@@ -24,6 +25,7 @@
     import { debounce } from 'throttle-debounce';
 
     let toastId = $state<number | string>();
+    let previousProjectRef = $state<UpdateProject>();
 
     const projectId = page.params.projectId || '';
     const projectQuery = getProjectQuery({
@@ -76,8 +78,9 @@
         toastId = toast.success('Successfully queued the project for data reset.');
     }
 
-    const form = superForm(defaults(projectQuery.data ?? new UpdateProject(), classvalidatorClient(UpdateProject)), {
+    const form = superForm(defaults(structuredCloneState(projectQuery.data) ?? new UpdateProject(), classvalidatorClient(UpdateProject)), {
         dataType: 'json',
+        id: 'update-project',
         async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
@@ -111,8 +114,10 @@
             return;
         }
 
-        if (!$submitting && !$tainted) {
-            form.reset({ data: projectQuery.data, keepMessage: true });
+        if (!$submitting && !$tainted && projectQuery.data !== previousProjectRef) {
+            const clonedData = structuredCloneState(projectQuery.data);
+            form.reset({ data: clonedData, keepMessage: true });
+            previousProjectRef = projectQuery.data;
         }
     });
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
index 1b1daf910c..156430d33f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
@@ -2,7 +2,7 @@
     import { goto } from '$app/navigation';
     import ErrorMessage from '$comp/error-message.svelte';
     import Loading from '$comp/loading.svelte';
-    import * as Card from '$comp/ui/card';
+    import { H3, Muted } from '$comp/typography';
     import * as Form from '$comp/ui/form';
     import { Input } from '$comp/ui/input';
     import { organization } from '$features/organizations/context.svelte';
@@ -55,34 +55,29 @@
     const { enhance, form: formData, message, submitting } = form;
 </script>
 
-<div class="p-6">
-    <Card.Root>
-        <Card.Header>
-            <Card.Title class="text-2xl">Add Project</Card.Title>
-            <Card.Description>Add a new project to start tracking errors and events.</Card.Description>
-        </Card.Header>
+<div class="flex flex-col gap-4">
+    <div class="flex flex-col gap-1">
+        <H3>Add Project</H3>
+        <Muted>Add a new project to start tracking errors and events.</Muted>
+    </div>
+    <form method="POST" use:enhance>
+        <ErrorMessage message={$message} />
+        <Form.Field {form} name="name">
+            <Form.Control>
+                {#snippet children({ props })}
+                    <Form.Label>Project Name</Form.Label>
+                    <Input {...props} bind:value={$formData.name} placeholder="Enter project name" />
+                {/snippet}
+            </Form.Control>
+            <Form.FieldErrors />
+        </Form.Field>
 
-        <Card.Content>
-            <form method="POST" use:enhance>
-                <ErrorMessage message={$message} />
-                <Form.Field {form} name="name">
-                    <Form.Control>
-                        {#snippet children({ props })}
-                            <Form.Label>Project Name</Form.Label>
-                            <Input {...props} bind:value={$formData.name} placeholder="Enter project name" />
-                        {/snippet}
-                    </Form.Control>
-                    <Form.FieldErrors />
-                </Form.Field>
-
-                <Form.Button>
-                    {#if $submitting}
-                        <Loading class="mr-2" variant="secondary"></Loading> Adding Project...
-                    {:else}
-                        Add Project
-                    {/if}</Form.Button
-                >
-            </form>
-        </Card.Content>
-    </Card.Root>
+        <Form.Button>
+            {#if $submitting}
+                <Loading class="mr-2" variant="secondary"></Loading> Adding Project...
+            {:else}
+                Add Project
+            {/if}</Form.Button
+        >
+    </form>
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/list/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/list/+page.svelte
index 5120acdd65..24b980e86f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/list/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/list/+page.svelte
@@ -2,8 +2,8 @@
     import type { ViewProject } from '$features/projects/models';
 
     import { goto } from '$app/navigation';
+    import { H3, Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
-    import * as Card from '$comp/ui/card';
     import { Input } from '$comp/ui/input';
     import { organization } from '$features/organizations/context.svelte';
     import { type GetOrganizationProjectsParams, getOrganizationProjectsQuery } from '$features/projects/api.svelte';
@@ -73,26 +73,24 @@
     });
 </script>
 
-<div class="flex flex-col space-y-4">
-    <Card.Root>
-        <Card.Header>
-            <Card.Title class="text-2xl">My Projects</Card.Title>
-            <Card.Description>View and manage your projects. Click on a project to view its details.</Card.Description>
-            <Card.Action>
-                <Button size="icon" onclick={addProject} title="Add Project">
-                    <Plus class="size-4" aria-hidden="true" />
-                    <span class="sr-only">Add Project</span>
-                </Button>
-            </Card.Action>
-        </Card.Header>
-        <Card.Content>
-            <ProjectsDataTable bind:limit={projectsQueryParameters.limit!} isLoading={projectsQuery.isLoading} {rowClick} {table}>
-                {#snippet toolbarChildren()}
-                    <div class="min-w-fit flex-1">
-                        <Input type="search" placeholder="Filter projects..." class="w-full" bind:value={projectsQueryParameters.filter} />
-                    </div>
-                {/snippet}
-            </ProjectsDataTable>
-        </Card.Content>
-    </Card.Root>
+<div class="flex flex-col gap-4">
+    <div class="flex flex-wrap items-start justify-between gap-4">
+        <div class="flex flex-col gap-1">
+            <H3>My Projects</H3>
+            <Muted>View and manage your projects. Click on a project to view its details.</Muted>
+        </div>
+        <div class="flex items-center gap-2">
+            <Button size="icon" onclick={addProject} title="Add Project">
+                <Plus class="size-4" aria-hidden="true" />
+                <span class="sr-only">Add Project</span>
+            </Button>
+        </div>
+    </div>
+    <ProjectsDataTable bind:limit={projectsQueryParameters.limit!} isLoading={projectsQuery.isLoading} {rowClick} {table}>
+        {#snippet toolbarChildren()}
+            <div class="min-w-fit flex-1">
+                <Input type="search" placeholder="Filter projects..." class="w-full" bind:value={projectsQueryParameters.filter} />
+            </div>
+        {/snippet}
+    </ProjectsDataTable>
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
index fd0f2b6166..219e9d4f52 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
@@ -8,6 +8,7 @@
     import ErrorMessage from '$comp/error-message.svelte';
     import * as FacetedFilter from '$comp/faceted-filter';
     import StreamingIndicatorButton from '$comp/streaming-indicator-button.svelte';
+    import { H3 } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Sheet from '$comp/ui/sheet';
     import EventsOverview from '$features/events/components/events-overview.svelte';
@@ -229,7 +230,7 @@
 
 <DataTable.Root>
     <DataTable.Toolbar {table}>
-        <div class="pr-2 text-lg font-medium">Event Stream</div>
+        <H3 class="pr-2">Event Stream</H3>
         <FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
             <OrganizationDefaultsFacetedFilterBuilder includeDateFacets={false} />
         </FacetedFilter.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(auth)/login/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(auth)/login/+page.svelte
index ff1a4f3607..c824518094 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(auth)/login/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(auth)/login/+page.svelte
@@ -37,6 +37,7 @@
     defaultFormData.invite_token = page.url.searchParams.get('token');
     const form = superForm(defaults(defaultFormData, classvalidatorClient(Login)), {
         dataType: 'json',
+        id: 'login',
         async onUpdate({ form, result }) {
             if (!form.valid) {
                 return;
diff --git a/src/Exceptionless.Web/ClientApp/svelte.config.js b/src/Exceptionless.Web/ClientApp/svelte.config.js
index 035f1773d2..6ea4b5b1ba 100644
--- a/src/Exceptionless.Web/ClientApp/svelte.config.js
+++ b/src/Exceptionless.Web/ClientApp/svelte.config.js
@@ -3,6 +3,11 @@ import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
+    compilerOptions: {
+        experimental: {
+            async: true
+        }
+    },
     kit: {
         adapter: adapter({
             fallback: 'index.html'
diff --git a/src/Exceptionless.Web/Controllers/UserController.cs b/src/Exceptionless.Web/Controllers/UserController.cs
index 5d91ea0ca4..afdcd9248c 100644
--- a/src/Exceptionless.Web/Controllers/UserController.cs
+++ b/src/Exceptionless.Web/Controllers/UserController.cs
@@ -103,8 +103,9 @@ public async Task<ActionResult<IReadOnlyCollection<ViewUser>>> GetByOrganization
             }));
         }
 
+        long total = results.Total + organization.Invites.Count;
         var pagedUsers = users.Skip(skip).Take(limit).ToList();
-        return OkWithResourceLinks(pagedUsers, users.Count > GetSkip(page + 1, limit), page);
+        return OkWithResourceLinks(pagedUsers, total > GetSkip(page + 1, limit), page, total);
     }
 
     /// <summary>
diff --git a/src/Exceptionless.Web/Models/User/ViewUser.cs b/src/Exceptionless.Web/Models/User/ViewUser.cs
index 526ee89392..20cb063d9b 100644
--- a/src/Exceptionless.Web/Models/User/ViewUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewUser.cs
@@ -5,12 +5,12 @@ namespace Exceptionless.Web.Models;
 public record ViewUser : IIdentity
 {
     public string Id { get; set; } = null!;
-    public ICollection<string> OrganizationIds { get; init; } = null!;
+    public ISet<string> OrganizationIds { get; init; } = null!;
     public string FullName { get; init; } = null!;
     public string EmailAddress { get; init; } = null!;
     public bool EmailNotificationsEnabled { get; init; }
     public bool IsEmailAddressVerified { get; init; }
     public bool IsActive { get; init; }
     public bool IsInvite { get; init; }
-    public ICollection<string> Roles { get; init; } = null!;
+    public ISet<string> Roles { get; init; } = null!;
 }