diff --git a/packages/frontend-2/components/feedback/Dialog.vue b/packages/frontend-2/components/feedback/Dialog.vue
index dc9f3792c..2fb608e49 100644
--- a/packages/frontend-2/components/feedback/Dialog.vue
+++ b/packages/frontend-2/components/feedback/Dialog.vue
@@ -6,7 +6,7 @@
     :on-submit="onSubmit"
     max-width="md"
   >
-    <div class="flex flex-col gap-4">
+    <div class="flex flex-col gap-2">
       <p class="text-body-xs text-foreground font-medium">
         How can we improve Speckle? If you have a feature request, please also share how
         you would use it and why it's important to you
@@ -18,6 +18,13 @@
         label="Feedback"
         color="foundation"
       />
+      <p class="text-body-xs !leading-4">
+        Need help? For support, head over to our
+        <FormButton to="https://speckle.community/" target="_blank" link text>
+          community forum
+        </FormButton>
+        where we can chat and solve problems together.
+      </p>
     </div>
   </LayoutDialog>
 </template>
diff --git a/packages/frontend-2/components/header/NavLink.vue b/packages/frontend-2/components/header/NavLink.vue
index 55cced73b..007b41af7 100644
--- a/packages/frontend-2/components/header/NavLink.vue
+++ b/packages/frontend-2/components/header/NavLink.vue
@@ -9,16 +9,16 @@
         viewBox="0 0 8 24"
         fill="none"
         xmlns="http://www.w3.org/2000/svg"
-        class="text-outline-2"
+        class="text-outline-5"
       >
         <path d="M2 18L6 6" stroke="currentColor" />
       </svg>
     </div>
     <NuxtLink
       :to="disableLink ? undefined : to"
-      class="flex gap-1 items-center text-body-xs ml-0.5 text-foreground-2 select-none truncate font-medium"
+      class="flex gap-1 items-center text-body-xs ml-0.5 text-foreground-2 select-none truncate"
       :class="disableLink ? '' : 'hover:!text-foreground'"
-      active-class="group is-active !text-foreground"
+      active-class="group is-active !text-foreground font-medium"
     >
       <div class="truncate">
         {{ name || to }}
diff --git a/packages/frontend-2/components/invite/Banner.vue b/packages/frontend-2/components/invite/Banner.vue
index 0d605747a..74a3b1d65 100644
--- a/packages/frontend-2/components/invite/Banner.vue
+++ b/packages/frontend-2/components/invite/Banner.vue
@@ -98,7 +98,7 @@ const token = computed(
 )
 const mainClasses = computed(() => {
   const classParts = [
-    'flex flex-col space-y-4 px-4 py-5 transition border-x border-b border-outline-2 first:border-t first:rounded-t-lg last:rounded-b-lg'
+    'flex flex-col space-y-4 px-4 py-5 transition bg-foundation border-x border-b border-outline-2 first:border-t first:rounded-t-lg last:rounded-b-lg'
   ]
 
   if (props.block) {
diff --git a/packages/frontend-2/components/projects/DashboardHeader.vue b/packages/frontend-2/components/projects/DashboardHeader.vue
index 39037d8ca..4ab541986 100644
--- a/packages/frontend-2/components/projects/DashboardHeader.vue
+++ b/packages/frontend-2/components/projects/DashboardHeader.vue
@@ -1,9 +1,6 @@
 <template>
   <div>
-    <div
-      v-if="hasBanners"
-      class="bg-foundation divide-y divide-outline-3 mb-8 empty:mb-0"
-    >
+    <div v-if="hasBanners" class="space-y-3 mb-8 empty:mb-0">
       <ProjectsInviteBanners
         v-if="projectsInvites?.projectInvites?.length"
         :invites="projectsInvites"
diff --git a/packages/frontend-2/components/settings/server/ActiveUsers.vue b/packages/frontend-2/components/settings/server/ActiveUsers.vue
index a066f0465..3d9150edc 100644
--- a/packages/frontend-2/components/settings/server/ActiveUsers.vue
+++ b/packages/frontend-2/components/settings/server/ActiveUsers.vue
@@ -161,11 +161,11 @@ const showActionsMenu = ref<Record<string, boolean>>({})
 const actionItems: LayoutMenuItem[][] = [
   [
     {
-      title: 'Change role',
+      title: 'Change role...',
       id: ActionTypes.ChangeRole
     },
     {
-      title: 'Remove user',
+      title: 'Remove user...',
       id: ActionTypes.RemoveUser
     }
   ]
diff --git a/packages/frontend-2/components/settings/server/PendingInvitations.vue b/packages/frontend-2/components/settings/server/PendingInvitations.vue
index 8b0331c75..2644c0156 100644
--- a/packages/frontend-2/components/settings/server/PendingInvitations.vue
+++ b/packages/frontend-2/components/settings/server/PendingInvitations.vue
@@ -129,7 +129,7 @@ const invites = computed(() => result.value?.admin.inviteList.items || [])
 const actionItems: LayoutMenuItem[][] = [
   [
     { title: 'Resend invitation', id: 'resend-invite' },
-    { title: 'Delete invitation', id: 'delete-invite' }
+    { title: 'Delete invitation...', id: 'delete-invite' }
   ]
 ]
 
diff --git a/packages/frontend-2/components/settings/shared/projects/index.vue b/packages/frontend-2/components/settings/shared/projects/index.vue
index 10c6846bc..17d1dd237 100644
--- a/packages/frontend-2/components/settings/shared/projects/index.vue
+++ b/packages/frontend-2/components/settings/shared/projects/index.vue
@@ -177,8 +177,8 @@ const showActionsMenu = ref<Record<string, boolean>>({})
 
 const actionItems: LayoutMenuItem[][] = [
   [
-    { title: 'View project...', id: ActionTypes.ViewProject },
-    { title: 'Edit members...', id: ActionTypes.EditMembers },
+    { title: 'View project', id: ActionTypes.ViewProject },
+    { title: 'Edit members', id: ActionTypes.EditMembers },
     { title: 'Remove project...', id: ActionTypes.RemoveProject }
   ]
 ]
diff --git a/packages/frontend-2/components/settings/workspaces/General.vue b/packages/frontend-2/components/settings/workspaces/General.vue
index 9b233d67d..0c1ab0304 100644
--- a/packages/frontend-2/components/settings/workspaces/General.vue
+++ b/packages/frontend-2/components/settings/workspaces/General.vue
@@ -290,6 +290,8 @@ const updateWorkspaceSlug = async (newSlug: string) => {
       title: 'Workspace short ID updated'
     })
 
+    showEditSlugDialog.value = false
+
     slug.value = newSlug
 
     if (route.params.slug === oldSlug) {
diff --git a/packages/frontend-2/components/settings/workspaces/General/DeleteDialog.vue b/packages/frontend-2/components/settings/workspaces/General/DeleteDialog.vue
index 6de17bd4f..e69523428 100644
--- a/packages/frontend-2/components/settings/workspaces/General/DeleteDialog.vue
+++ b/packages/frontend-2/components/settings/workspaces/General/DeleteDialog.vue
@@ -5,23 +5,36 @@
     max-width="sm"
     :buttons="dialogButtons"
   >
-    <p class="text-body-xs text-foreground">
-      Are you sure you want to
-      <span class="font-medium">permanently delete</span>
-      the selected workspace?
-    </p>
-    <div
-      class="rounded border bg-foundation-2 border-outline-3 text-body-2xs text-foreground font-medium py-3 px-4 my-4"
-    >
-      {{ workspace.name }}
-    </div>
-    <p class="text-body-xs text-foreground">
-      This action
-      <span class="font-medium">cannot</span>
-      be undone.
+    <p class="text-body-xs text-foreground mb-2">
+      Are you sure you want to permanently delete
+      <span class="font-medium">{{ workspace.name }}?</span>
+      This action cannot be undone.
     </p>
+    <FormTextInput
+      v-model="workspaceNameInput"
+      name="workspaceNameConfirm"
+      label="To confirm deletion, type the workspace name below."
+      placeholder="Type the workspace name here..."
+      full-width
+      show-label
+      hide-error-message
+      class="text-sm mb-2"
+      color="foundation"
+    />
+    <FormTextArea
+      v-model="feedback"
+      name="reasonForDeletion"
+      label="Why did you delete this workspace?"
+      placeholder="We want to improve so we're curious about your honest feedback"
+      show-label
+      show-optional
+      full-width
+      class="text-sm mb-2"
+      color="foundation"
+    />
   </LayoutDialog>
 </template>
+
 <script setup lang="ts">
 import { graphql } from '~~/lib/common/generated/gql'
 import type {
@@ -29,7 +42,7 @@ import type {
   UserWorkspacesArgs,
   User
 } from '~/lib/common/generated/gql/graphql'
-import type { LayoutDialogButton } from '@speckle/ui-components'
+import { FormTextInput, type LayoutDialogButton } from '@speckle/ui-components'
 import { useMutation, useApolloClient } from '@vue/apollo-composable'
 import { deleteWorkspaceMutation } from '~/lib/settings/graphql/mutations'
 import {
@@ -43,6 +56,8 @@ import { useActiveUser } from '~~/lib/auth/composables/activeUser'
 import { isUndefined } from 'lodash-es'
 import { useMixpanel } from '~/lib/core/composables/mp'
 import { homeRoute } from '~/lib/common/helpers/route'
+import { useZapier } from '~/lib/core/composables/zapier'
+import { useForm } from 'vee-validate'
 
 graphql(`
   fragment SettingsWorkspaceGeneralDeleteDialog_Workspace on Workspace {
@@ -63,10 +78,14 @@ const { activeUser } = useActiveUser()
 const router = useRouter()
 const apollo = useApolloClient().client
 const mixpanel = useMixpanel()
+const { sendWebhook } = useZapier()
+const { resetForm } = useForm<{ feedback: string }>()
+
+const workspaceNameInput = ref('')
+const feedback = ref('')
 
 const onDelete = async () => {
-  router.push(homeRoute)
-  isOpen.value = false
+  if (workspaceNameInput.value !== props.workspace.name) return
 
   const cache = apollo.cache
   const result = await deleteWorkspace({
@@ -98,16 +117,30 @@ const onDelete = async () => {
       )
     }
 
+    mixpanel.track('Workspace Deleted', {
+      // eslint-disable-next-line camelcase
+      workspace_id: props.workspace.id,
+      feedback: feedback.value
+    })
+
+    // Only send zapier-discord webhook if not in dev environment
+    if (!import.meta.dev) {
+      await sendWebhook('https://hooks.zapier.com/hooks/catch/12120532/2m4okri/', {
+        userId: activeUser.value?.id ?? '',
+        feedback: feedback.value
+          ? `Action: Workspace Deleted(${props.workspace.name}) Feedback: ${feedback.value}`
+          : `Action: Workspace Deleted(${props.workspace.name}) - No feedback provided`
+      })
+    }
+
     triggerNotification({
       type: ToastNotificationType.Success,
       title: 'Workspace deleted',
       description: `The ${props.workspace.name} workspace has been deleted`
     })
 
-    mixpanel.track('Workspace Deleted', {
-      // eslint-disable-next-line camelcase
-      workspace_id: props.workspace.id
-    })
+    router.push(homeRoute)
+    isOpen.value = false
   } else {
     const errorMessage = getFirstErrorMessage(result?.errors)
     triggerNotification({
@@ -129,9 +162,14 @@ const dialogButtons = computed((): LayoutDialogButton[] => [
   {
     text: 'Delete',
     props: {
-      color: 'danger'
+      color: 'danger',
+      disabled: workspaceNameInput.value !== props.workspace.name
     },
     onClick: onDelete
   }
 ])
+
+watch(isOpen, () => {
+  resetForm()
+})
 </script>
diff --git a/packages/frontend-2/components/settings/workspaces/General/EditSlugDialog.vue b/packages/frontend-2/components/settings/workspaces/General/EditSlugDialog.vue
index 85f9f3483..18a482134 100644
--- a/packages/frontend-2/components/settings/workspaces/General/EditSlugDialog.vue
+++ b/packages/frontend-2/components/settings/workspaces/General/EditSlugDialog.vue
@@ -19,11 +19,16 @@
     <FormTextInput
       v-model:model-value="workspaceShortId"
       name="slug"
-      label="Short ID"
+      label="New short ID"
       :help="`${baseUrl}${workspaceRoute(workspaceShortId)}`"
       color="foundation"
-      :rules="[isStringOfLength({ maxLength: 50, minLength: 3 }), isValidWorkspaceSlug]"
+      :rules="[isStringOfLength({ maxLength: 50, minLength: 3 })]"
+      :custom-error-message="
+        workspaceShortId !== originalSlug ? error?.graphQLErrors[0]?.message : undefined
+      "
+      :loading="loading"
       show-label
+      @update:model-value="updateDebouncedShortId"
     />
   </LayoutDialog>
 </template>
@@ -33,11 +38,11 @@ import { useForm } from 'vee-validate'
 import { graphql } from '~~/lib/common/generated/gql'
 import type { LayoutDialogButton } from '@speckle/ui-components'
 import type { SettingsWorkspacesGeneralEditSlugDialog_WorkspaceFragment } from '~/lib/common/generated/gql/graphql'
-import {
-  isStringOfLength,
-  isValidWorkspaceSlug
-} from '~~/lib/common/helpers/validation'
+import { isStringOfLength } from '~~/lib/common/helpers/validation'
 import { workspaceRoute } from '~/lib/common/helpers/route'
+import { useQuery } from '@vue/apollo-composable'
+import { validateWorkspaceSlugQuery } from '~/lib/workspaces/graphql/queries'
+import { debounce } from 'lodash'
 
 graphql(`
   fragment SettingsWorkspacesGeneralEditSlugDialog_Workspace on Workspace {
@@ -57,13 +62,27 @@ const emit = defineEmits<{
   (e: 'update:slug', newSlug: string): void
 }>()
 
-const { handleSubmit } = useForm<{ slug: string }>()
-
+// Main ref that holds the current value of the slug input.
 const workspaceShortId = ref(props.workspace.slug)
+// Used to debounce API calls for slug validation.
+const debouncedWorkspaceShortId = ref(props.workspace.slug)
+// Keeps track of the initially generated slug to prevent unnecessary validations.
+const originalSlug = ref(props.workspace.slug)
+
+const { error, loading } = useQuery(
+  validateWorkspaceSlugQuery,
+  () => ({
+    slug: debouncedWorkspaceShortId.value
+  }),
+  () => ({
+    enabled: debouncedWorkspaceShortId.value !== props.workspace.slug
+  })
+)
+
+const { handleSubmit, resetForm } = useForm<{ slug: string }>()
 
 const updateSlug = handleSubmit(() => {
   emit('update:slug', workspaceShortId.value)
-  isOpen.value = false
 })
 
 const dialogButtons = computed((): LayoutDialogButton[] => [
@@ -78,12 +97,16 @@ const dialogButtons = computed((): LayoutDialogButton[] => [
     text: 'Update',
     props: {
       color: 'primary',
-      disabled: workspaceShortId.value === props.workspace.slug
+      disabled: workspaceShortId.value === props.workspace.slug || error.value !== null
     },
     submit: true
   }
 ])
 
+const updateDebouncedShortId = debounce((value: string) => {
+  debouncedWorkspaceShortId.value = value
+}, 300)
+
 watch(
   () => props.workspace.slug,
   (newValue) => {
@@ -91,4 +114,14 @@ watch(
   },
   { immediate: true }
 )
+
+watch(
+  () => isOpen.value,
+  (newValue) => {
+    if (!newValue) {
+      resetForm()
+      error.value = null
+    }
+  }
+)
 </script>
diff --git a/packages/frontend-2/components/workspace/CreateDialog.vue b/packages/frontend-2/components/workspace/CreateDialog.vue
index fb59bb43b..06b96ec8e 100644
--- a/packages/frontend-2/components/workspace/CreateDialog.vue
+++ b/packages/frontend-2/components/workspace/CreateDialog.vue
@@ -23,12 +23,11 @@
         label="Short ID"
         :help="getShortIdHelp"
         color="foundation"
-        :rules="[
-          isStringOfLength({ maxLength: 50, minLength: 3 }),
-          isValidWorkspaceSlug
-        ]"
+        :loading="loading"
+        :rules="isStringOfLength({ maxLength: 50, minLength: 3 })"
+        :custom-error-message="error?.graphQLErrors[0]?.message"
         show-label
-        @update:model-value="shortIdManuallyEdited = true"
+        @update:model-value="onSlugChange"
       />
       <UserAvatarEditable
         v-model:edit-mode="editAvatarMode"
@@ -49,13 +48,11 @@ import type { MaybeNullOrUndefined } from '@speckle/shared'
 import type { LayoutDialogButton } from '@speckle/ui-components'
 import { useCreateWorkspace } from '~/lib/workspaces/composables/management'
 import { useWorkspacesAvatar } from '~/lib/workspaces/composables/avatar'
-import {
-  isRequired,
-  isStringOfLength,
-  isValidWorkspaceSlug
-} from '~~/lib/common/helpers/validation'
+import { isRequired, isStringOfLength } from '~~/lib/common/helpers/validation'
 import { generateSlugFromName } from '@speckle/shared'
 import { debounce } from 'lodash'
+import { useQuery } from '@vue/apollo-composable'
+import { validateWorkspaceSlugQuery } from '~/lib/workspaces/graphql/queries'
 
 const emit = defineEmits<(e: 'created') => void>()
 
@@ -69,15 +66,25 @@ const isOpen = defineModel<boolean>('open', { required: true })
 
 const createWorkspace = useCreateWorkspace()
 const { generateDefaultLogoIndex, getDefaultAvatar } = useWorkspacesAvatar()
-const { handleSubmit } = useForm<{ name: string; slug: string }>()
+const { handleSubmit, resetForm } = useForm<{ name: string; slug: string }>()
 
 const workspaceName = ref('')
 const workspaceShortId = ref('')
+const debouncedWorkspaceShortId = ref('')
 const editAvatarMode = ref(false)
 const workspaceLogo = ref<MaybeNullOrUndefined<string>>()
 const defaultLogoIndex = ref(0)
 const shortIdManuallyEdited = ref(false)
-const customShortIdError = ref('')
+
+const { error, loading } = useQuery(
+  validateWorkspaceSlugQuery,
+  () => ({
+    slug: debouncedWorkspaceShortId.value
+  }),
+  () => ({
+    enabled: !!debouncedWorkspaceShortId.value
+  })
+)
 
 const baseUrl = useRuntimeConfig().public.baseUrl
 
@@ -105,7 +112,7 @@ const dialogButtons = computed((): LayoutDialogButton[] => [
       disabled:
         !workspaceName.value.trim() ||
         !workspaceShortId.value.trim() ||
-        !!customShortIdError.value
+        error.value !== null
     }
   }
 ])
@@ -122,7 +129,7 @@ const handleCreateWorkspace = handleSubmit(async () => {
     { source: props.eventSource }
   )
 
-  if (newWorkspace) {
+  if (newWorkspace && !newWorkspace?.errors) {
     emit('created')
     isOpen.value = false
   }
@@ -135,21 +142,36 @@ const onLogoSave = (newVal: MaybeNullOrUndefined<string>) => {
 
 const reset = () => {
   defaultLogoIndex.value = generateDefaultLogoIndex()
-  workspaceName.value = ''
-  workspaceShortId.value = ''
+  debouncedWorkspaceShortId.value = ''
   workspaceLogo.value = null
   editAvatarMode.value = false
   shortIdManuallyEdited.value = false
-  customShortIdError.value = ''
+  error.value = null
 }
 
 const updateShortId = debounce((newName: string) => {
   if (!shortIdManuallyEdited.value) {
-    workspaceShortId.value = generateSlugFromName({ name: newName })
+    const newSlug = generateSlugFromName({ name: newName })
+    workspaceShortId.value = newSlug
+    updateDebouncedShortId(newSlug)
   }
 }, 600)
 
+const updateDebouncedShortId = debounce((newSlug: string) => {
+  debouncedWorkspaceShortId.value = newSlug
+}, 300)
+
+const onSlugChange = (newSlug: string) => {
+  workspaceShortId.value = newSlug
+  shortIdManuallyEdited.value = true
+  updateDebouncedShortId(newSlug)
+}
+
+// Seperate resets to avoid a temporary invalid state on submission
 watch(isOpen, (newVal) => {
-  if (newVal) reset()
+  if (!newVal) {
+    reset()
+    resetForm()
+  }
 })
 </script>
diff --git a/packages/frontend-2/components/workspace/MoveProjectsDialog.vue b/packages/frontend-2/components/workspace/MoveProjectsDialog.vue
index 67e9d55ff..5a9e6b9e0 100644
--- a/packages/frontend-2/components/workspace/MoveProjectsDialog.vue
+++ b/packages/frontend-2/components/workspace/MoveProjectsDialog.vue
@@ -29,7 +29,7 @@
         <span
           v-tippy="
             project.role !== Roles.Stream.Owner &&
-            'Only project owners can move projects'
+            'Only the project owner can move this project'
           "
         >
           <FormButton
@@ -44,7 +44,7 @@
       </div>
     </div>
     <p v-else class="py-4 text-body-xs text-foreground-2">
-      You don't have any projects that are moveable to this workspace
+      You don't have any projects that can be moved into this workspace
     </p>
 
     <ProjectsMoveToWorkspaceDialog
diff --git a/packages/frontend-2/components/workspace/page/VersionCount.vue b/packages/frontend-2/components/workspace/page/VersionCount.vue
index abb19f772..c3e9fb277 100644
--- a/packages/frontend-2/components/workspace/page/VersionCount.vue
+++ b/packages/frontend-2/components/workspace/page/VersionCount.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-36 flex flex-col items-center md:mx-4">
+  <div class="w-40 flex flex-col items-center md:mx-4">
     <CommonProgressBar
       class="mb-1"
       :current-value="versionsCount.current"
diff --git a/packages/frontend-2/lib/common/generated/gql/gql.ts b/packages/frontend-2/lib/common/generated/gql/gql.ts
index c768e8e19..b0688ce24 100644
--- a/packages/frontend-2/lib/common/generated/gql/gql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/gql.ts
@@ -325,6 +325,7 @@ const documents = {
     "\n  query WorkspaceProjectsQuery(\n    $workspaceSlug: String!\n    $filter: WorkspaceProjectsFilter\n    $cursor: String\n  ) {\n    workspaceBySlug(slug: $workspaceSlug) {\n      id\n      projects(filter: $filter, cursor: $cursor, limit: 10) {\n        ...WorkspaceProjectList_ProjectCollection\n      }\n    }\n  }\n": types.WorkspaceProjectsQueryDocument,
     "\n  query WorkspaceInvite(\n    $workspaceId: String\n    $token: String\n    $options: WorkspaceInviteLookupOptions\n  ) {\n    workspaceInvite(workspaceId: $workspaceId, token: $token, options: $options) {\n      ...WorkspaceInviteBanner_PendingWorkspaceCollaborator\n      ...WorkspaceInviteBlock_PendingWorkspaceCollaborator\n    }\n  }\n": types.WorkspaceInviteDocument,
     "\n  query MoveProjectsDialog {\n    activeUser {\n      ...MoveProjectsDialog_User\n    }\n  }\n": types.MoveProjectsDialogDocument,
+    "\n  query ValidateWorkspaceSlug($slug: String!) {\n    validateWorkspaceSlug(slug: $slug)\n  }\n": types.ValidateWorkspaceSlugDocument,
     "\n  query LegacyBranchRedirectMetadata($streamId: String!, $branchName: String!) {\n    project(id: $streamId) {\n      modelByName(name: $branchName) {\n        id\n      }\n    }\n  }\n": types.LegacyBranchRedirectMetadataDocument,
     "\n  query LegacyViewerCommitRedirectMetadata($streamId: String!, $commitId: String!) {\n    project(id: $streamId) {\n      version(id: $commitId) {\n        id\n        model {\n          id\n        }\n      }\n    }\n  }\n": types.LegacyViewerCommitRedirectMetadataDocument,
     "\n  query LegacyViewerStreamRedirectMetadata($streamId: String!) {\n    project(id: $streamId) {\n      id\n      versions(limit: 1) {\n        totalCount\n        items {\n          id\n          model {\n            id\n          }\n        }\n      }\n    }\n  }\n": types.LegacyViewerStreamRedirectMetadataDocument,
@@ -1601,6 +1602,10 @@ export function graphql(source: "\n  query WorkspaceInvite(\n    $workspaceId: S
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  query MoveProjectsDialog {\n    activeUser {\n      ...MoveProjectsDialog_User\n    }\n  }\n"): (typeof documents)["\n  query MoveProjectsDialog {\n    activeUser {\n      ...MoveProjectsDialog_User\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  query ValidateWorkspaceSlug($slug: String!) {\n    validateWorkspaceSlug(slug: $slug)\n  }\n"): (typeof documents)["\n  query ValidateWorkspaceSlug($slug: String!) {\n    validateWorkspaceSlug(slug: $slug)\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
index dafb6814f..09134fc74 100644
--- a/packages/frontend-2/lib/common/generated/gql/graphql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -1817,7 +1817,7 @@ export type Project = {
   team: Array<ProjectCollaborator>;
   updatedAt: Scalars['DateTime']['output'];
   /** Retrieve a specific project version by its ID */
-  version?: Maybe<Version>;
+  version: Version;
   /** Returns a flat list of all project versions */
   versions: VersionCollection;
   /** Return metadata about resources being requested in the viewer */
@@ -4749,7 +4749,7 @@ export type GendoAiRenderQueryVariables = Exact<{
 }>;
 
 
-export type GendoAiRenderQuery = { __typename?: 'Query', project: { __typename?: 'Project', id: string, version?: { __typename?: 'Version', id: string, gendoAIRender: { __typename?: 'GendoAIRender', id: string, projectId: string, modelId: string, versionId: string, createdAt: string, updatedAt: string, gendoGenerationId?: string | null, status: string, prompt: string, camera?: {} | null, responseImage?: string | null, user?: { __typename?: 'AvatarUser', name: string, avatar?: string | null, id: string } | null } } | null } };
+export type GendoAiRenderQuery = { __typename?: 'Query', project: { __typename?: 'Project', id: string, version: { __typename?: 'Version', id: string, gendoAIRender: { __typename?: 'GendoAIRender', id: string, projectId: string, modelId: string, versionId: string, createdAt: string, updatedAt: string, gendoGenerationId?: string | null, status: string, prompt: string, camera?: {} | null, responseImage?: string | null, user?: { __typename?: 'AvatarUser', name: string, avatar?: string | null, id: string } | null } } } };
 
 export type GendoAiRendersQueryVariables = Exact<{
   versionId: Scalars['String']['input'];
@@ -4757,7 +4757,7 @@ export type GendoAiRendersQueryVariables = Exact<{
 }>;
 
 
-export type GendoAiRendersQuery = { __typename?: 'Query', project: { __typename?: 'Project', id: string, version?: { __typename?: 'Version', id: string, gendoAIRenders: { __typename?: 'GendoAIRenderCollection', totalCount: number, items: Array<{ __typename?: 'GendoAIRender', id: string, createdAt: string, updatedAt: string, status: string, gendoGenerationId?: string | null, prompt: string, camera?: {} | null } | null> } } | null } };
+export type GendoAiRendersQuery = { __typename?: 'Query', project: { __typename?: 'Project', id: string, version: { __typename?: 'Version', id: string, gendoAIRenders: { __typename?: 'GendoAIRenderCollection', totalCount: number, items: Array<{ __typename?: 'GendoAIRender', id: string, createdAt: string, updatedAt: string, status: string, gendoGenerationId?: string | null, prompt: string, camera?: {} | null } | null> } } } };
 
 export type ProjectVersionGendoAiRenderCreatedSubscriptionVariables = Exact<{
   id: Scalars['String']['input'];
@@ -5702,6 +5702,13 @@ export type MoveProjectsDialogQueryVariables = Exact<{ [key: string]: never; }>;
 
 export type MoveProjectsDialogQuery = { __typename?: 'Query', activeUser?: { __typename?: 'User', projects: { __typename?: 'ProjectCollection', items: Array<{ __typename?: 'Project', role?: string | null, id: string, name: string, workspace?: { __typename?: 'Workspace', id: string } | null, modelCount: { __typename?: 'ModelCollection', totalCount: number }, versions: { __typename?: 'VersionCollection', totalCount: number } }> } } | null };
 
+export type ValidateWorkspaceSlugQueryVariables = Exact<{
+  slug: Scalars['String']['input'];
+}>;
+
+
+export type ValidateWorkspaceSlugQuery = { __typename?: 'Query', validateWorkspaceSlug: boolean };
+
 export type LegacyBranchRedirectMetadataQueryVariables = Exact<{
   streamId: Scalars['String']['input'];
   branchName: Scalars['String']['input'];
@@ -5716,7 +5723,7 @@ export type LegacyViewerCommitRedirectMetadataQueryVariables = Exact<{
 }>;
 
 
-export type LegacyViewerCommitRedirectMetadataQuery = { __typename?: 'Query', project: { __typename?: 'Project', version?: { __typename?: 'Version', id: string, model: { __typename?: 'Model', id: string } } | null } };
+export type LegacyViewerCommitRedirectMetadataQuery = { __typename?: 'Query', project: { __typename?: 'Project', version: { __typename?: 'Version', id: string, model: { __typename?: 'Model', id: string } } } };
 
 export type LegacyViewerStreamRedirectMetadataQueryVariables = Exact<{
   streamId: Scalars['String']['input'];
@@ -6086,6 +6093,7 @@ export const WorkspacePageQueryDocument = {"kind":"Document","definitions":[{"ki
 export const WorkspaceProjectsQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkspaceProjectsQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"WorkspaceProjectsFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceBySlug"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"projects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}},{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"10"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkspaceProjectList_ProjectCollection"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectsPageTeamDialogManagePermissions_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectsModelPageEmbed_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectsPageTeamDialogManagePermissions_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsActions_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectsModelPageEmbed_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsCardProject"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsActions_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectDashboardItemNoModels"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"team"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}}]}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsCardProject"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PendingFileUpload"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FileUpload"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"projectId"}},{"kind":"Field","name":{"kind":"Name","value":"modelName"}},{"kind":"Field","name":{"kind":"Name","value":"convertedStatus"}},{"kind":"Field","name":{"kind":"Name","value":"convertedMessage"}},{"kind":"Field","name":{"kind":"Name","value":"uploadDate"}},{"kind":"Field","name":{"kind":"Name","value":"convertedLastUpdate"}},{"kind":"Field","name":{"kind":"Name","value":"fileType"}},{"kind":"Field","name":{"kind":"Name","value":"fileName"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsCardRenameDialog"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Model"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsCardDeleteDialog"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Model"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsActions"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Model"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"FunctionRunStatusForSummary"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateFunctionRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"TriggeredAutomationsStatusSummary"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TriggeredAutomationsStatus"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"automationRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"functionRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"FunctionRunStatusForSummary"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomateRunsTriggerStatusDialogFunctionRun_AutomateFunctionRun"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateFunctionRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"results"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"statusMessage"}},{"kind":"Field","name":{"kind":"Name","value":"contextView"}},{"kind":"Field","name":{"kind":"Name","value":"function"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomationsStatusOrderedRuns_AutomationRun"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"automation"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"functionRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomateRunsTriggerStatusDialogRunsRows_AutomateRun"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"functionRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomateRunsTriggerStatusDialogFunctionRun_AutomateFunctionRun"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomationsStatusOrderedRuns_AutomationRun"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomateRunsTriggerStatusDialog_TriggeredAutomationsStatus"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TriggeredAutomationsStatus"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"automationRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomateRunsTriggerStatusDialogRunsRows_AutomateRun"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomateRunsTriggerStatus_TriggeredAutomationsStatus"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TriggeredAutomationsStatus"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"TriggeredAutomationsStatusSummary"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomateRunsTriggerStatusDialog_TriggeredAutomationsStatus"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageLatestItemsModelItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Model"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","alias":{"kind":"Name","value":"versionCount"},"name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"0"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","alias":{"kind":"Name","value":"commentThreadCount"},"name":{"kind":"Name","value":"commentThreads"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"0"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pendingImportedVersions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PendingFileUpload"}}]}},{"kind":"Field","name":{"kind":"Name","value":"previewUrl"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsCardRenameDialog"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsCardDeleteDialog"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsActions"}},{"kind":"Field","name":{"kind":"Name","value":"automationsStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomateRunsTriggerStatus_TriggeredAutomationsStatus"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkspaceAvatar_Workspace"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Workspace"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"defaultLogoIndex"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectDashboardItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectDashboardItemNoModels"}},{"kind":"Field","name":{"kind":"Name","value":"models"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"4"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageLatestItemsModelItem"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspace"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkspaceAvatar_Workspace"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pendingImportedModels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"4"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PendingFileUpload"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkspaceProjectList_ProjectCollection"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ProjectCollection"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectDashboardItem"}}]}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}}]}}]} as unknown as DocumentNode<WorkspaceProjectsQueryQuery, WorkspaceProjectsQueryQueryVariables>;
 export const WorkspaceInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkspaceInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"options"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"WorkspaceInviteLookupOptions"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceInvite"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}},{"kind":"Argument","name":{"kind":"Name","value":"options"},"value":{"kind":"Variable","name":{"kind":"Name","value":"options"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkspaceInviteBanner_PendingWorkspaceCollaborator"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"WorkspaceInviteBlock_PendingWorkspaceCollaborator"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserAvatar"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UseWorkspaceInviteManager_PendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceSlug"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkspaceInviteBanner_PendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"UseWorkspaceInviteManager_PendingWorkspaceCollaborator"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"WorkspaceInviteBlock_PendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"UseWorkspaceInviteManager_PendingWorkspaceCollaborator"}}]}}]} as unknown as DocumentNode<WorkspaceInviteQuery, WorkspaceInviteQueryVariables>;
 export const MoveProjectsDialogDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MoveProjectsDialog"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"MoveProjectsDialog_User"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectsMoveToWorkspaceDialog_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"modelCount"},"name":{"kind":"Name","value":"models"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"0"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"0"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"MoveProjectsDialog_User"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"projects"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectsMoveToWorkspaceDialog_Project"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"workspace"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]}}]} as unknown as DocumentNode<MoveProjectsDialogQuery, MoveProjectsDialogQueryVariables>;
+export const ValidateWorkspaceSlugDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ValidateWorkspaceSlug"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"validateWorkspaceSlug"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}]}]}}]} as unknown as DocumentNode<ValidateWorkspaceSlugQuery, ValidateWorkspaceSlugQueryVariables>;
 export const LegacyBranchRedirectMetadataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LegacyBranchRedirectMetadata"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"branchName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"project"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"modelByName"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"branchName"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<LegacyBranchRedirectMetadataQuery, LegacyBranchRedirectMetadataQueryVariables>;
 export const LegacyViewerCommitRedirectMetadataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LegacyViewerCommitRedirectMetadata"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"commitId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"project"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"version"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"commitId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"model"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]}}]} as unknown as DocumentNode<LegacyViewerCommitRedirectMetadataQuery, LegacyViewerCommitRedirectMetadataQueryVariables>;
 export const LegacyViewerStreamRedirectMetadataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LegacyViewerStreamRedirectMetadata"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"project"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"model"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<LegacyViewerStreamRedirectMetadataQuery, LegacyViewerStreamRedirectMetadataQueryVariables>;
diff --git a/packages/frontend-2/lib/workspaces/graphql/queries.ts b/packages/frontend-2/lib/workspaces/graphql/queries.ts
index 0faecce7d..72e9998a8 100644
--- a/packages/frontend-2/lib/workspaces/graphql/queries.ts
+++ b/packages/frontend-2/lib/workspaces/graphql/queries.ts
@@ -72,3 +72,9 @@ export const moveProjectsDialogQuery = graphql(`
     }
   }
 `)
+
+export const validateWorkspaceSlugQuery = graphql(`
+  query ValidateWorkspaceSlug($slug: String!) {
+    validateWorkspaceSlug(slug: $slug)
+  }
+`)
diff --git a/packages/frontend-2/pages/projects/[id]/index.vue b/packages/frontend-2/pages/projects/[id]/index.vue
index eaf19dc67..639ae269d 100644
--- a/packages/frontend-2/pages/projects/[id]/index.vue
+++ b/packages/frontend-2/pages/projects/[id]/index.vue
@@ -171,10 +171,10 @@ const actionsItems = computed<LayoutMenuItem[][]>(() => {
   if (isWorkspacesEnabled.value && !project.value?.workspace?.id) {
     items.push([
       {
-        title: 'Move...',
+        title: 'Move project...',
         id: ActionTypes.Move,
         disabled: !isOwner.value,
-        disabledTooltip: 'Only project owners can move projects into workspaces'
+        disabledTooltip: 'Only the project owner can move this project into a workspace'
       }
     ])
   }
diff --git a/packages/server/assets/core/typedefs/modelsAndVersions.graphql b/packages/server/assets/core/typedefs/modelsAndVersions.graphql
index a10b78598..f03b38464 100644
--- a/packages/server/assets/core/typedefs/modelsAndVersions.graphql
+++ b/packages/server/assets/core/typedefs/modelsAndVersions.graphql
@@ -39,7 +39,7 @@ extend type Project {
   """
   Retrieve a specific project version by its ID
   """
-  version(id: String!): Version
+  version(id: String!): Version!
 
   """
   Retrieve a specific project model by its ID
diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts
index 5db603fcc..f482f2d4f 100644
--- a/packages/server/modules/core/graph/generated/graphql.ts
+++ b/packages/server/modules/core/graph/generated/graphql.ts
@@ -1836,7 +1836,7 @@ export type Project = {
   team: Array<ProjectCollaborator>;
   updatedAt: Scalars['DateTime']['output'];
   /** Retrieve a specific project version by its ID */
-  version?: Maybe<Version>;
+  version: Version;
   /** Returns a flat list of all project versions */
   versions: VersionCollection;
   /** Return metadata about resources being requested in the viewer */
@@ -5508,7 +5508,7 @@ export type ProjectResolvers<ContextType = GraphQLContext, ParentType extends Re
   sourceApps?: Resolver<Array<ResolversTypes['String']>, ParentType, ContextType>;
   team?: Resolver<Array<ResolversTypes['ProjectCollaborator']>, ParentType, ContextType>;
   updatedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
-  version?: Resolver<Maybe<ResolversTypes['Version']>, ParentType, ContextType, RequireFields<ProjectVersionArgs, 'id'>>;
+  version?: Resolver<ResolversTypes['Version'], ParentType, ContextType, RequireFields<ProjectVersionArgs, 'id'>>;
   versions?: Resolver<ResolversTypes['VersionCollection'], ParentType, ContextType, RequireFields<ProjectVersionsArgs, 'limit'>>;
   viewerResources?: Resolver<Array<ResolversTypes['ViewerResourceGroup']>, ParentType, ContextType, RequireFields<ProjectViewerResourcesArgs, 'loadedVersionsOnly' | 'resourceIdString'>>;
   visibility?: Resolver<ResolversTypes['ProjectVisibility'], ParentType, ContextType>;
diff --git a/packages/server/modules/core/graph/resolvers/versions.ts b/packages/server/modules/core/graph/resolvers/versions.ts
index 484380246..294304023 100644
--- a/packages/server/modules/core/graph/resolvers/versions.ts
+++ b/packages/server/modules/core/graph/resolvers/versions.ts
@@ -11,7 +11,7 @@ import {
   batchDeleteCommits,
   batchMoveCommitsFactory
 } from '@/modules/core/services/commit/batchCommitActions'
-import { CommitUpdateError } from '@/modules/core/errors/commit'
+import { CommitNotFoundError, CommitUpdateError } from '@/modules/core/errors/commit'
 import {
   createCommitByBranchIdFactory,
   markCommitReceivedAndNotify,
@@ -106,9 +106,14 @@ const batchMoveCommits = batchMoveCommitsFactory({
 export = {
   Project: {
     async version(parent, args, ctx) {
-      return await ctx.loaders.streams.getStreamCommit
+      const version = await ctx.loaders.streams.getStreamCommit
         .forStream(parent.id)
         .load(args.id)
+      if (!version) {
+        throw new CommitNotFoundError('Version not found')
+      }
+
+      return version
     }
   },
   Version: {
diff --git a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
index a2decff57..b1a487086 100644
--- a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
+++ b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
@@ -1820,7 +1820,7 @@ export type Project = {
   team: Array<ProjectCollaborator>;
   updatedAt: Scalars['DateTime']['output'];
   /** Retrieve a specific project version by its ID */
-  version?: Maybe<Version>;
+  version: Version;
   /** Returns a flat list of all project versions */
   versions: VersionCollection;
   /** Return metadata about resources being requested in the viewer */
diff --git a/packages/server/test/graphql/generated/graphql.ts b/packages/server/test/graphql/generated/graphql.ts
index 9087d829b..aa31005ee 100644
--- a/packages/server/test/graphql/generated/graphql.ts
+++ b/packages/server/test/graphql/generated/graphql.ts
@@ -1821,7 +1821,7 @@ export type Project = {
   team: Array<ProjectCollaborator>;
   updatedAt: Scalars['DateTime']['output'];
   /** Retrieve a specific project version by its ID */
-  version?: Maybe<Version>;
+  version: Version;
   /** Returns a flat list of all project versions */
   versions: VersionCollection;
   /** Return metadata about resources being requested in the viewer */
diff --git a/packages/ui-components/src/components/common/loading/Icon.vue b/packages/ui-components/src/components/common/loading/Icon.vue
index 2dd25d431..911c16ada 100644
--- a/packages/ui-components/src/components/common/loading/Icon.vue
+++ b/packages/ui-components/src/components/common/loading/Icon.vue
@@ -1,8 +1,25 @@
 <template>
-  <ArrowPathIcon :class="iconClasses" />
+  <svg
+    class="spinner"
+    :class="iconClasses"
+    width="32px"
+    height="40px"
+    viewBox="0 0 66 66"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <circle
+      class="path"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="6"
+      stroke-linecap="round"
+      cx="33"
+      cy="33"
+      r="30"
+    ></circle>
+  </svg>
 </template>
 <script setup lang="ts">
-import { ArrowPathIcon } from '@heroicons/vue/24/solid'
 import { computed } from 'vue'
 
 type Size = 'base' | 'sm' | 'lg'
@@ -13,21 +30,57 @@ const props = withDefaults(defineProps<{ loading?: boolean; size?: Size }>(), {
 })
 
 const iconClasses = computed(() => {
-  const classParts: string[] = ['text-primary transition-all animate-spin']
+  const classParts: string[] = ['']
   classParts.push(props.loading ? 'opacity-100' : 'opacity-0')
 
   switch (props.size) {
     case 'base':
-      classParts.push('h-8 w-8')
-      break
-    case 'sm':
       classParts.push('h-5 w-5')
       break
+    case 'sm':
+      classParts.push('h-4 w-4')
+      break
     case 'lg':
-      classParts.push('h-12 w-12')
+      classParts.push('h-8 w-8')
       break
   }
 
   return classParts.join(' ')
 })
 </script>
+
+<style scoped>
+@keyframes rotator {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(270deg);
+  }
+}
+
+@keyframes dash {
+  0% {
+    stroke-dashoffset: 187;
+  }
+  50% {
+    stroke-dashoffset: 46.75;
+    transform: rotate(135deg);
+  }
+  100% {
+    stroke-dashoffset: 187;
+    transform: rotate(450deg);
+  }
+}
+
+.spinner {
+  animation: rotator 1.4s linear infinite;
+}
+
+.path {
+  stroke-dasharray: 187;
+  stroke-dashoffset: 0;
+  transform-origin: center;
+  animation: dash 1.4s ease-in-out infinite;
+}
+</style>
diff --git a/packages/ui-components/src/components/form/Button.vue b/packages/ui-components/src/components/form/Button.vue
index bef07387b..8d2c4043d 100644
--- a/packages/ui-components/src/components/form/Button.vue
+++ b/packages/ui-components/src/components/form/Button.vue
@@ -25,8 +25,8 @@ import { isObjectLike } from 'lodash'
 import type { PropAnyComponent } from '~~/src/helpers/common/components'
 import { computed, resolveDynamicComponent } from 'vue'
 import type { Nullable } from '@speckle/shared'
-import { ArrowPathIcon } from '@heroicons/vue/24/solid'
 import type { FormButtonStyle, FormButtonSize } from '~~/src/helpers/form/button'
+import { CommonLoadingIcon } from '~~/src/lib'
 
 const emit = defineEmits<{
   /**
@@ -122,7 +122,9 @@ const buttonType = computed(() => {
 })
 
 const isDisabled = computed(() => props.disabled || props.loading)
-const finalLeftIcon = computed(() => (props.loading ? ArrowPathIcon : props.iconLeft))
+const finalLeftIcon = computed(() =>
+  props.loading ? CommonLoadingIcon : props.iconLeft
+)
 
 const bgAndBorderClasses = computed(() => {
   const classParts: string[] = []
@@ -266,10 +268,6 @@ const buttonClasses = computed(() => {
 const iconClasses = computed(() => {
   const classParts: string[] = ['shrink-0']
 
-  if (props.loading) {
-    classParts.push('animate-spin')
-  }
-
   switch (props.size) {
     case 'sm':
       classParts.push('h-5 w-5 p-0.5')
diff --git a/packages/ui-components/src/components/form/TextInput.stories.ts b/packages/ui-components/src/components/form/TextInput.stories.ts
index 22337f00f..005b8c7a6 100644
--- a/packages/ui-components/src/components/form/TextInput.stories.ts
+++ b/packages/ui-components/src/components/form/TextInput.stories.ts
@@ -154,6 +154,14 @@ export const LabelLeft = mergeStories(Default, {
   }
 })
 
+export const Loading = mergeStories(Default, {
+  args: {
+    name: generateRandomName('loading'),
+    label: 'With loading spinner',
+    loading: true
+  }
+})
+
 export const WithCustomRightSlot = mergeStories(Default, {
   render: (args) => ({
     components: { FormTextInput, FormButton },
diff --git a/packages/ui-components/src/components/form/TextInput.vue b/packages/ui-components/src/components/form/TextInput.vue
index 27c5c1599..2bcb8ca7a 100644
--- a/packages/ui-components/src/components/form/TextInput.vue
+++ b/packages/ui-components/src/components/form/TextInput.vue
@@ -37,6 +37,13 @@
           aria-hidden="true"
         />
       </div>
+      <div
+        v-if="loading"
+        class="absolute top-0 h-full right-0 flex items-center pr-2 text-foreground-3"
+      >
+        <CommonLoadingIcon />
+      </div>
+
       <input
         :id="name"
         ref="inputElement"
@@ -115,6 +122,7 @@ import { useTextInputCore } from '~~/src/composables/form/textInput'
 import type { PropAnyComponent } from '~~/src/helpers/common/components'
 import type { InputColor } from '~~/src/composables/form/textInput'
 import type { LabelPosition } from '~~/src/composables/form/input'
+import { CommonLoadingIcon } from '~~/src/lib'
 
 type InputType = 'text' | 'email' | 'password' | 'url' | 'search' | 'number' | string
 type InputSize = 'sm' | 'base' | 'lg' | 'xl'
@@ -256,10 +264,18 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  loading: {
+    type: Boolean,
+    default: false
+  },
   hideErrorMessage: {
     type: Boolean,
     default: false
   },
+  customErrorMessage: {
+    type: String,
+    default: null
+  },
   wrapperClasses: {
     type: String,
     default: () => ''
diff --git a/packages/ui-components/src/composables/form/textInput.ts b/packages/ui-components/src/composables/form/textInput.ts
index 0e191e0b6..a9e60bee1 100644
--- a/packages/ui-components/src/composables/form/textInput.ts
+++ b/packages/ui-components/src/composables/form/textInput.ts
@@ -26,6 +26,7 @@ export function useTextInputCore<V extends string | string[] = string>(params: {
     autoFocus?: boolean
     showClear?: boolean
     useLabelInErrors?: boolean
+    customErrorMessage?: string
     hideErrorMessage?: boolean
     color?: InputColor
     labelPosition?: LabelPosition
@@ -41,11 +42,15 @@ export function useTextInputCore<V extends string | string[] = string>(params: {
 }) {
   const { props, inputEl, emit, options } = params
 
-  const { value, errorMessage: error } = useField<V>(props.name, props.rules, {
-    validateOnMount: unref(props.validateOnMount),
-    validateOnValueUpdate: unref(props.validateOnValueUpdate),
-    initialValue: unref(props.modelValue) || undefined
-  })
+  const { value, errorMessage: veeErrorMessage } = useField<V>(
+    props.name,
+    props.rules,
+    {
+      validateOnMount: unref(props.validateOnMount),
+      validateOnValueUpdate: unref(props.validateOnValueUpdate),
+      initialValue: unref(props.modelValue) || undefined
+    }
+  )
 
   const labelClasses = computed(() => {
     const classParts = [
@@ -76,7 +81,7 @@ export function useTextInputCore<V extends string | string[] = string>(params: {
       coreInputClasses.value
     ]
 
-    if (error.value) {
+    if (hasError.value) {
       classParts.push('!border-danger')
     } else {
       classParts.push('border-0 focus:ring-2 focus:ring-outline-2')
@@ -99,12 +104,19 @@ export function useTextInputCore<V extends string | string[] = string>(params: {
   const internalHelpTipId = ref(nanoid())
 
   const title = computed(() => unref(props.label) || unref(props.name))
+
   const errorMessage = computed(() => {
-    const base = error.value
+    if (unref(props.customErrorMessage)) {
+      return unref(props.customErrorMessage)
+    }
+
+    const base = veeErrorMessage.value
     if (!base || !unref(props.useLabelInErrors)) return base
     return base.replace('Value', title.value)
   })
 
+  const hasError = computed(() => !!errorMessage.value)
+
   const hideHelpTip = computed(
     () => errorMessage.value && unref(props.hideErrorMessage)
   )
@@ -115,7 +127,7 @@ export function useTextInputCore<V extends string | string[] = string>(params: {
   )
   const helpTipClasses = computed((): string => {
     const classParts = ['text-body-2xs break-words']
-    classParts.push(error.value ? 'text-danger' : 'text-foreground-2')
+    classParts.push(hasError.value ? 'text-danger' : 'text-foreground-2')
     return classParts.join(' ')
   })
   const shouldShowClear = computed(() => {
@@ -154,7 +166,8 @@ export function useTextInputCore<V extends string | string[] = string>(params: {
     clear,
     focus,
     labelClasses,
-    shouldShowClear
+    shouldShowClear,
+    hasError
   }
 }
 
diff --git a/packages/viewer-sandbox/src/Sandbox.ts b/packages/viewer-sandbox/src/Sandbox.ts
index 20ae1b9f7..1f4e6da35 100644
--- a/packages/viewer-sandbox/src/Sandbox.ts
+++ b/packages/viewer-sandbox/src/Sandbox.ts
@@ -1357,11 +1357,11 @@ export default class Sandbox {
       url.includes('latest') ? 'AuthTokenLatest' : 'AuthToken'
     ) as string
     const objUrls = await UrlHelper.getResourceUrls(url, authToken)
-    for (const url of objUrls) {
+    for (const objUrl of objUrls) {
       console.log(`Loading ${url}`)
       const loader = new SpeckleLoader(
         this.viewer.getWorldTree(),
-        url,
+        objUrl,
         authToken,
         true,
         undefined
@@ -1377,7 +1377,7 @@ export default class Sandbox {
         console.error(`Loader warning: ${arg.message}`)
       })
 
-      await this.viewer.loadObject(loader, true)
+      void this.viewer.loadObject(loader, true)
     }
     localStorage.setItem('last-load-url', url)
   }
diff --git a/packages/viewer-sandbox/src/main.ts b/packages/viewer-sandbox/src/main.ts
index 6859ac6b6..d172c4cd7 100644
--- a/packages/viewer-sandbox/src/main.ts
+++ b/packages/viewer-sandbox/src/main.ts
@@ -105,7 +105,7 @@ const getStream = () => {
     // prettier-ignore
     // 'https://app.speckle.systems/streams/da9e320dad/commits/5388ef24b8?c=%5B-7.66134,10.82932,6.41935,-0.07739,-13.88552,1.8697,0,1%5D'
     // Revit sample house (good for bim-like stuff with many display meshes)
-    // 'https://app.speckle.systems/streams/da9e320dad/commits/5388ef24b8'
+    'https://app.speckle.systems/streams/da9e320dad/commits/5388ef24b8'
     // 'https://latest.speckle.systems/streams/c1faab5c62/commits/ab1a1ab2b6'
     // 'https://app.speckle.systems/streams/da9e320dad/commits/5388ef24b8'
     // 'https://latest.speckle.systems/streams/58b5648c4d/commits/60371ecb2d'
@@ -424,7 +424,8 @@ const getStream = () => {
 
     // 'https://app.speckle.systems/projects/00a5c443d6/models/de56edf901'
 
-    'https://app.speckle.systems/projects/6cf358a40e/models/e01ffbc891@f1ddc19011'
+    // 'https://app.speckle.systems/projects/6cf358a40e/models/e01ffbc891@f1ddc19011'
+    // 'https://latest.speckle.systems/projects/2c5c4cd493/models/cb20c2e87b02003d4b2ddf4df96912b9,8a2c9a45093fecb42273607d0c936d66'
   )
 }
 
diff --git a/packages/viewer/src/modules/batching/Batcher.ts b/packages/viewer/src/modules/batching/Batcher.ts
index 9049fabc0..003c60d43 100644
--- a/packages/viewer/src/modules/batching/Batcher.ts
+++ b/packages/viewer/src/modules/batching/Batcher.ts
@@ -74,7 +74,7 @@ export default class Batcher {
         await pause.wait(50)
       }
 
-      let instancedNodes = worldTree.findId(g)
+      let instancedNodes = worldTree.findId(g, renderTree.subtreeId)
       if (!instancedNodes) {
         continue
       }
@@ -99,7 +99,7 @@ export default class Batcher {
     }
     for (const v in instancedBatches) {
       for (let k = 0; k < instancedBatches[v].length; k++) {
-        const nodes = worldTree.findId(instancedBatches[v][k])
+        const nodes = worldTree.findId(instancedBatches[v][k], renderTree.subtreeId)
         if (!nodes) continue
         /** Make sure entire instance set is instanced */
         let instanced = true
diff --git a/packages/viewer/src/modules/tree/RenderTree.ts b/packages/viewer/src/modules/tree/RenderTree.ts
index 13ea770a9..06beaff53 100644
--- a/packages/viewer/src/modules/tree/RenderTree.ts
+++ b/packages/viewer/src/modules/tree/RenderTree.ts
@@ -15,6 +15,10 @@ export class RenderTree {
     return this.root.model.id
   }
 
+  public get subtreeId(): number {
+    return this.root.model.subtreeId
+  }
+
   public constructor(tree: WorldTree, subtreeRoot: TreeNode) {
     this.tree = tree
     this.root = subtreeRoot
@@ -192,8 +196,11 @@ export class RenderTree {
     })
   }
 
-  public getRenderViewsForNodeId(id: string): NodeRenderView[] | null {
-    const nodes = this.tree.findId(id)
+  public getRenderViewsForNodeId(
+    id: string,
+    subtreeId?: number
+  ): NodeRenderView[] | null {
+    const nodes = this.tree.findId(id, subtreeId)
     if (!nodes) {
       Logger.warn(`Id ${id} does not exist`)
       return null