diff --git a/packages/admin-ui/src/TimeAgo/getElapsedSeconds.ts b/packages/admin-ui/src/TimeAgo/getElapsedSeconds.ts
index ce56de78adc..a5f22d7f9d5 100644
--- a/packages/admin-ui/src/TimeAgo/getElapsedSeconds.ts
+++ b/packages/admin-ui/src/TimeAgo/getElapsedSeconds.ts
@@ -2,9 +2,7 @@ import type { TDate } from "./types.js";
 import { toEpochMs } from "./toEpochMs.js";
 
 export function getElapsedSeconds(datetime: TDate, relativeDate?: TDate): number {
-    const now = relativeDate
-        ? Temporal.Instant.fromEpochMilliseconds(toEpochMs(relativeDate))
-        : Temporal.Now.instant();
-    const past = Temporal.Instant.fromEpochMilliseconds(toEpochMs(datetime));
-    return Math.round(now.since(past).total("second"));
+    const nowMs = relativeDate ? toEpochMs(relativeDate) : Date.now();
+    const pastMs = toEpochMs(datetime);
+    return Math.round((nowMs - pastMs) / 1000);
 }
diff --git a/packages/api-headless-cms/src/features/contentEntry/UpdateRevisionDescription/UpdateRevisionDescriptionUseCase.ts b/packages/api-headless-cms/src/features/contentEntry/UpdateRevisionDescription/UpdateRevisionDescriptionUseCase.ts
index 996f3b656b2..f10bd87d40c 100644
--- a/packages/api-headless-cms/src/features/contentEntry/UpdateRevisionDescription/UpdateRevisionDescriptionUseCase.ts
+++ b/packages/api-headless-cms/src/features/contentEntry/UpdateRevisionDescription/UpdateRevisionDescriptionUseCase.ts
@@ -5,12 +5,10 @@ import {
     EntryAfterUpdateRevisionDescriptionEvent,
     EntryBeforeUpdateRevisionDescriptionEvent
 } from "./events.js";
-import { AccessControl, CmsContext } from "~/features/shared/abstractions.js";
-import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
-import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { AccessControl } from "~/features/shared/abstractions.js";
 import { GetRevisionByIdUseCase } from "~/features/contentEntry/GetRevisionById/abstractions.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "~/types/index.js";
-import { EntryLockedError, EntryNotAuthorizedError } from "~/domain/contentEntry/errors.js";
+import { EntryNotAuthorizedError } from "~/domain/contentEntry/errors.js";
 import { UpdateEntryRepository } from "../UpdateEntry/index.js";
 
 class UpdateRevisionDescriptionUseCaseImpl implements UseCaseAbstraction.Interface {
@@ -18,9 +16,6 @@ class UpdateRevisionDescriptionUseCaseImpl implements UseCaseAbstraction.Interfa
         private eventPublisher: EventPublisher.Interface,
         private repository: UpdateEntryRepository.Interface,
         private accessControl: AccessControl.Interface,
-        private cmsContext: CmsContext.Interface,
-        private tenantContext: TenantContext.Interface,
-        private identityContext: IdentityContext.Interface,
         private getRevisionByIdUseCase: GetRevisionByIdUseCase.Interface
     ) {}
 
@@ -44,11 +39,6 @@ class UpdateRevisionDescriptionUseCaseImpl implements UseCaseAbstraction.Interfa
 
             const originalEntry = result.value;
 
-            // Check if entry is locked
-            if (originalEntry.locked) {
-                return Result.fail(new EntryLockedError());
-            }
-
             const entry = {
                 ...originalEntry,
                 revisionDescription
@@ -102,13 +92,5 @@ class UpdateRevisionDescriptionUseCaseImpl implements UseCaseAbstraction.Interfa
 export const UpdateRevisionDescriptionUseCase = createImplementation({
     abstraction: UseCaseAbstraction,
     implementation: UpdateRevisionDescriptionUseCaseImpl,
-    dependencies: [
-        EventPublisher,
-        UpdateEntryRepository,
-        AccessControl,
-        CmsContext,
-        TenantContext,
-        IdentityContext,
-        GetRevisionByIdUseCase
-    ]
+    dependencies: [EventPublisher, UpdateEntryRepository, AccessControl, GetRevisionByIdUseCase]
 });
diff --git a/packages/app-website-builder/src/BaseEditor/defaultConfig/Content/Preview/PreviewContainer.tsx b/packages/app-website-builder/src/BaseEditor/defaultConfig/Content/Preview/PreviewContainer.tsx
index 5db6ebd5dcc..aae9bc1284d 100644
--- a/packages/app-website-builder/src/BaseEditor/defaultConfig/Content/Preview/PreviewContainer.tsx
+++ b/packages/app-website-builder/src/BaseEditor/defaultConfig/Content/Preview/PreviewContainer.tsx
@@ -11,38 +11,42 @@ export const PreviewContainer = ({ children }: PreviewContainerProps) => {
     const isDragging = useIsDragging();
 
     return (
-        <div
-            id={"preview-container"}
-            style={{ height: `calc(100vh - ${uiHeight}px)` }}
-            className={
-                "bg-neutral-subtle relative flex flex-col items-center w-full overflow-auto p-[24px]"
-            }
-        >
-            {isDragging && (
-                <>
-                    <div
-                        className={
-                            "absolute z-50 pointer-events-none animate-fade-in top-0 left-0 right-0 h-2 bg-[#f9d8ce]"
-                        }
-                    />
-                    <div
-                        className={
-                            "absolute z-50 pointer-events-none animate-fade-in bottom-0 left-0 right-0 h-2 bg-[#f9d8ce]"
-                        }
-                    />
-                    <div
-                        className={
-                            "absolute z-50 pointer-events-none animate-fade-in top-0 left-0 bottom-0 w-2 bg-[#f9d8ce]"
-                        }
-                    />
-                    <div
-                        className={
-                            "absolute z-50 pointer-events-none animate-fade-in top-0 right-0 bottom-0 w-2 bg-[#f9d8ce]"
-                        }
-                    />
-                </>
-            )}
-            {children}
-        </div>
+        <>
+            <div className={"relative"}>
+                <div
+                    id={"preview-container"}
+                    style={{ height: `calc(100vh - ${uiHeight}px)` }}
+                    className={
+                        "bg-neutral-subtle relative flex flex-col items-center w-full overflow-auto p-[24px]"
+                    }
+                >
+                    {children}
+                </div>
+                {isDragging && (
+                    <>
+                        <div
+                            className={
+                                "absolute z-50 pointer-events-none animate-fade-in top-0 left-0 right-0 h-2 bg-[#f9d8ce]"
+                            }
+                        />
+                        <div
+                            className={
+                                "absolute z-50 pointer-events-none animate-fade-in bottom-0 left-0 right-0 h-2 bg-[#f9d8ce]"
+                            }
+                        />
+                        <div
+                            className={
+                                "absolute z-50 pointer-events-none animate-fade-in top-0 left-0 bottom-0 w-2 bg-[#f9d8ce]"
+                            }
+                        />
+                        <div
+                            className={
+                                "absolute z-50 pointer-events-none animate-fade-in top-0 right-0 bottom-0 w-2 bg-[#f9d8ce]"
+                            }
+                        />
+                    </>
+                )}
+            </div>
+        </>
     );
 };
diff --git a/packages/app-website-builder/src/inputRenderers/FileInput.tsx b/packages/app-website-builder/src/inputRenderers/FileInput.tsx
index 936f8e31895..011ced0640d 100644
--- a/packages/app-website-builder/src/inputRenderers/FileInput.tsx
+++ b/packages/app-website-builder/src/inputRenderers/FileInput.tsx
@@ -38,6 +38,7 @@ export const FileInputRenderer = ({
             onChange={onFileChange}
             render={({ showFileManager }) => (
                 <FilePicker
+                    variant={"secondary"}
                     label={label}
                     description={input.description}
                     type="compact"
diff --git a/packages/app-website-builder/src/inputRenderers/FragmentSelectorInput.tsx b/packages/app-website-builder/src/inputRenderers/FragmentSelectorInput.tsx
index ea111dc609f..15813979740 100644
--- a/packages/app-website-builder/src/inputRenderers/FragmentSelectorInput.tsx
+++ b/packages/app-website-builder/src/inputRenderers/FragmentSelectorInput.tsx
@@ -28,6 +28,8 @@ export const FragmentSelectorInputRenderer = ({
 
     return (
         <Select
+            size={"md"}
+            variant={"secondary"}
             value={value}
             onChange={newValue => {
                 onChange(({ value }) => {
diff --git a/packages/app-website-builder/src/inputRenderers/NumberInput.tsx b/packages/app-website-builder/src/inputRenderers/NumberInput.tsx
index 1653626bdbd..532d37bf752 100644
--- a/packages/app-website-builder/src/inputRenderers/NumberInput.tsx
+++ b/packages/app-website-builder/src/inputRenderers/NumberInput.tsx
@@ -27,6 +27,8 @@ export const NumberInputRenderer = ({
     return (
         <Input
             type={"number"}
+            size={"md"}
+            variant={"secondary"}
             value={value}
             onChange={localOnChange}
             label={label}
diff --git a/packages/app-website-builder/src/inputRenderers/SelectInput.tsx b/packages/app-website-builder/src/inputRenderers/SelectInput.tsx
index f555786a72c..dfbe6cc14ee 100644
--- a/packages/app-website-builder/src/inputRenderers/SelectInput.tsx
+++ b/packages/app-website-builder/src/inputRenderers/SelectInput.tsx
@@ -12,6 +12,8 @@ export const SelectInputRenderer = ({
     const input = props.input as SelectInput;
     return (
         <Select
+            size={"md"}
+            variant={"secondary"}
             value={value}
             onChange={newValue => {
                 onChange(({ value }) => {
diff --git a/packages/app-website-builder/src/inputRenderers/TextareaInput.tsx b/packages/app-website-builder/src/inputRenderers/TextareaInput.tsx
index 5a29fbb65e5..2bece6ca061 100644
--- a/packages/app-website-builder/src/inputRenderers/TextareaInput.tsx
+++ b/packages/app-website-builder/src/inputRenderers/TextareaInput.tsx
@@ -23,6 +23,8 @@ export const TextareaInputRenderer = ({
 
     return (
         <Textarea
+            size={"md"}
+            variant={"secondary"}
             value={value || ""}
             onChange={previewValue}
             onBlur={e => commitValue(e.currentTarget.value)}
diff --git a/packages/build-tools/bundling/importValidatorPlugin.js b/packages/build-tools/bundling/importValidatorPlugin.js
index dbcc8cd7ad6..57e9549078a 100644
--- a/packages/build-tools/bundling/importValidatorPlugin.js
+++ b/packages/build-tools/bundling/importValidatorPlugin.js
@@ -11,7 +11,10 @@ const whitelist = [
     "@webiny/okta",
     "@webiny/plugins",
     "@webiny/sdk",
-    "@webiny/stdlib"
+    "@webiny/stdlib",
+    "@webiny/lexical-converter",
+    "@webiny/lexical-nodes",
+    "@webiny/lexical-theme"
 ];
 
 export const createImportValidatorPlugin = () => {
diff --git a/packages/telemetry/cli.js b/packages/telemetry/cli.js
index 48ac9d57559..511a2c825d7 100644
--- a/packages/telemetry/cli.js
+++ b/packages/telemetry/cli.js
@@ -11,9 +11,14 @@ export const sendEvent = async ({ event, version, properties }) => {
         return;
     }
 
-    // The WTS client reads the machine id from `~/.webiny/config` (user.id field)
-    // via the same path globalConfig writes to. No need to pass user explicitly.
-    const wts = new WTS({ source: "cli" });
+    // Use the canonical Webiny machine id — the top-level `id` field in
+    // `~/.webiny/config`, owned by @webiny/global-config. The admin app
+    // (REACT_APP_WEBINY_TELEMETRY_USER_ID) and the website install/finish alias
+    // both key off this same id, so passing it here keeps CLI, admin, and
+    // website events on a single PostHog person. Without it, the WTS client
+    // falls back to its own `user.id` field, which is a different UUID and
+    // fragments funnels across surfaces.
+    const wts = new WTS({ source: "cli", distinctId: globalConfig.get("id") });
 
     const wcpProperties = {};
     const [wcpOrgId, wcpProjectId] = getWcpOrgProjectId();
diff --git a/packages/webhooks/src/admin/presentation/WebhookForm/WebhookFormPresenter.ts b/packages/webhooks/src/admin/presentation/WebhookForm/WebhookFormPresenter.ts
index 83d77281956..b163079b9f1 100644
--- a/packages/webhooks/src/admin/presentation/WebhookForm/WebhookFormPresenter.ts
+++ b/packages/webhooks/src/admin/presentation/WebhookForm/WebhookFormPresenter.ts
@@ -1,4 +1,5 @@
 import { computed, makeAutoObservable, runInAction } from "mobx";
+import { z } from "zod";
 import type { Webhook } from "~/admin/shared/types.js";
 import type { WebhookEvent } from "~/admin/shared/types.js";
 import {
@@ -71,7 +72,8 @@ class WebhookFormPresenterImpl implements IWebhookFormPresenter {
                             .toLowerCase()
                             .replace(/[^a-z0-9\s-]/g, "")
                             .replace(/\s+/g, "-");
-                    }),
+                    })
+                    .schema(z.string().min(3, "Slug must be at least 3 characters long")),
                 endpointUrl: fields
                     .text()
                     .label("Endpoint URL")
diff --git a/packages/webhooks/src/api/models/WebhookModel.ts b/packages/webhooks/src/api/models/WebhookModel.ts
index e0a189e0839..874d6d87536 100644
--- a/packages/webhooks/src/api/models/WebhookModel.ts
+++ b/packages/webhooks/src/api/models/WebhookModel.ts
@@ -12,11 +12,7 @@ class WebhookModelFactory implements ModelFactory.Interface {
             .tags(["$publishing:false", "$hidden:true"]);
 
         model.fields(fields => ({
-            name: fields
-                .text()
-                .label("Name")
-                .required()
-                .minLength(8, "Name must be at least 8 characters long."),
+            name: fields.text().label("Name").required(),
             slug: fields
                 .text()
                 .label("Slug")
diff --git a/packages/website-builder-vue/src/components/ConnectToEditor.ts b/packages/website-builder-vue/src/components/ConnectToEditor.ts
index 8340cdbed80..e5d25374d1e 100644
--- a/packages/website-builder-vue/src/components/ConnectToEditor.ts
+++ b/packages/website-builder-vue/src/components/ConnectToEditor.ts
@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, h, type PropType } from "vue";
+import { defineComponent, shallowRef, onMounted, h, type PropType } from "vue";
 import { contentSdk, type Component, type Document } from "@webiny/website-builder-sdk";
 import { DocumentStoreProvider } from "./DocumentStoreProvider.js";
 import { ElementRenderer } from "./ElementRenderer.js";
@@ -22,7 +22,7 @@ export const ConnectToEditor = defineComponent({
     },
 
     setup(props) {
-        const data = ref<Document | null>(null);
+        const data = shallowRef<Document | null>(null);
 
         onMounted(() => {
             const path = props.document?.properties?.path ?? window.location.pathname;