diff --git a/changelog/entries/unreleased/bug/4601_fix_importing_a_database_with_an_ai_field_associated_with_an.json b/changelog/entries/unreleased/bug/4601_fix_importing_a_database_with_an_ai_field_associated_with_an.json
new file mode 100644
index 0000000000..ee18511d3d
--- /dev/null
+++ b/changelog/entries/unreleased/bug/4601_fix_importing_a_database_with_an_ai_field_associated_with_an.json
@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Fix importing a database with an AI field associated with an ai_auto_update_user",
+    "issue_origin": "github",
+    "issue_number": 4601,
+    "domain": "database",
+    "bullet_points": [],
+    "created_at": "2026-02-05"
+}
\ No newline at end of file
diff --git a/e2e-tests/package.json b/e2e-tests/package.json
index 6a3f884288..04cc2fcb09 100644
--- a/e2e-tests/package.json
+++ b/e2e-tests/package.json
@@ -20,7 +20,7 @@
     "@faker-js/faker": "7.6.0",
     "@nuxt/test-utils": "^3.21.0",
     "@playwright/test": "^1.48.0",
-    "axios": "1.2.3",
+    "axios": "1.13.5",
     "dotenv": "16.0.3"
   }
 }
diff --git a/e2e-tests/yarn.lock b/e2e-tests/yarn.lock
index 76fb935d3d..bf88cc867e 100644
--- a/e2e-tests/yarn.lock
+++ b/e2e-tests/yarn.lock
@@ -277,13 +277,13 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axios@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.3.tgz#31a3d824c0ebf754a004b585e5f04a5f87e6c4ff"
-  integrity sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==
+axios@1.13.5:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.5.tgz#5e464688fa127e11a660a2c49441c009f6567a43"
+  integrity sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==
   dependencies:
-    follow-redirects "^1.15.0"
-    form-data "^4.0.0"
+    follow-redirects "^1.15.11"
+    form-data "^4.0.5"
     proxy-from-env "^1.1.0"
 
 c12@^3.3.2, c12@^3.3.3:
@@ -304,6 +304,14 @@ c12@^3.3.2, c12@^3.3.3:
     pkg-types "^2.3.0"
     rc9 "^2.1.2"
 
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
 chokidar@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-5.0.0.tgz#949c126a9238a80792be9a0265934f098af369a5"
@@ -387,6 +395,15 @@ dotenv@^17.2.3:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.2.3.tgz#ad995d6997f639b11065f419a22fabf567cdb9a2"
   integrity sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==
 
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 entities@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-7.0.1.tgz#26e8a88889db63417dcb9a1e79a3f1bc92b5976b"
@@ -397,6 +414,33 @@ errx@^0.1.0:
   resolved "https://registry.yarnpkg.com/errx/-/errx-0.1.0.tgz#4881e411d90a3b1e1620a07604f50081dd59f3aa"
   integrity sha512-fZmsRiDNv07K6s2KkKFTiD2aIvECa7++PKyD5NC32tpRw46qZA3sOz+aM+/V9V0GDHxVTKLziveV4JhzBHDp9Q==
 
+es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
 estree-walker@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
@@ -424,18 +468,20 @@ fdir@^6.5.0:
   resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
   integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
 
-follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.15.11:
+  version "1.15.11"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
+  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
 
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+form-data@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
+  integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.12"
 
 fsevents@2.3.2:
@@ -443,11 +489,40 @@ fsevents@2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+get-intrinsic@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    function-bind "^1.1.2"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
 get-port-please@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.2.0.tgz#0ce3cee194c448ac640ec39dc357a500f5d7d2bb"
   integrity sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==
 
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
 giget@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/giget/-/giget-2.0.0.tgz#395fc934a43f9a7a29a29d55b99f23e30c14f195"
@@ -460,6 +535,11 @@ giget@^2.0.0:
     nypm "^0.6.0"
     pathe "^2.0.3"
 
+gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
 "h3-next@npm:h3@^2.0.1-rc.7":
   version "2.0.1-rc.11"
   resolved "https://registry.yarnpkg.com/h3/-/h3-2.0.1-rc.11.tgz#32236425f428c2577f8c9d6043499d84280263bb"
@@ -483,6 +563,25 @@ h3@^1.15.4:
     ufo "^1.6.3"
     uncrypto "^0.1.3"
 
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 ignore@^7.0.5:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9"
@@ -524,6 +623,11 @@ magic-string@^0.30.21:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.5"
 
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
 mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/crudTable/fields/HighestPaidRoleField.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/crudTable/fields/HighestPaidRoleField.vue
index a6387cf4b9..88cac75faa 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/crudTable/fields/HighestPaidRoleField.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/crudTable/fields/HighestPaidRoleField.vue
@@ -46,7 +46,7 @@ export default {
     },
     roles() {
       // filters out role not for Team subject and not for workspace level
-      return this.workspace ? this.workspace._.roles : []
+      return this.workspace?._.roles || []
     },
     showBillable() {
       return this.$hasPermission(
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/MemberRolesModal.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/MemberRolesModal.vue
index 7568fa7577..5de4a48a3a 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/MemberRolesModal.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/MemberRolesModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <Modal @show="onShow" @hidden="hideError">
+  <Modal ref="modal" @show="onShow" @hidden="hideError">
     <Error v-if="error.visible" :error="error"></Error>
     <Tabs
       v-else
@@ -20,7 +20,9 @@
           scope-type="application"
           @invite-members="inviteDatabaseMembers"
           @invite-teams="inviteDatabaseTeams"
-          @role-updated="updateRole(databaseRoleAssignments, ...arguments)"
+          @role-updated="
+            (ra, role) => updateRole(databaseRoleAssignments, ra, role)
+          "
         />
       </Tab>
       <Tab
@@ -36,7 +38,9 @@
           scope-type="database_table"
           @invite-members="inviteTableMembers"
           @invite-teams="inviteTableTeams"
-          @role-updated="updateRole(tableRoleAssignments, ...arguments)"
+          @role-updated="
+            (ra, role) => updateRole(tableRoleAssignments, ra, role)
+          "
         />
       </Tab>
       <Tab
@@ -52,7 +56,9 @@
           scope-type="database_view"
           @invite-members="inviteViewMembers"
           @invite-teams="inviteViewTeams"
-          @role-updated="updateRole(viewRoleAssignments, ...arguments)"
+          @role-updated="
+            (ra, role) => updateRole(viewRoleAssignments, ra, role)
+          "
         />
       </Tab>
     </Tabs>
@@ -313,8 +319,10 @@ export default {
       }
 
       try {
+        const subjectId =
+          roleAssignment.subject?.id ?? roleAssignment.subject_id
         await RoleAssignmentsService(this.$client).assignRole(
-          roleAssignment.subject.id,
+          subjectId,
           roleAssignment.subject_type,
           this.workspace.id,
           roleAssignment.scope_id,
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/RoleSelector.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/RoleSelector.vue
index 5006c655bf..1a58468823 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/RoleSelector.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/RoleSelector.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
     <span v-if="disabled">
-      {{ value.name }}
+      {{ currentValue.name }}
     </span>
     <a
       v-else
       ref="editRoleContextLink"
       @click="$refs.editRoleContext.toggle($refs.editRoleContextLink)"
     >
-      {{ value.name }}
+      {{ currentValue.name }}
       <i class="iconoir-nav-arrow-down"></i>
     </a>
     <EditRoleContext
       ref="editRoleContext"
-      :subject="value"
+      :subject="currentValue"
       :roles="roles"
       :allow-removing-role="allowRemovingRole"
       :workspace="workspace"
@@ -29,12 +29,16 @@ import EditRoleContext from '@baserow/modules/core/components/settings/members/E
 
 export default {
   name: 'RoleSelector',
-  emits: ['delete', 'input'],
+  emits: ['delete', 'input', 'update:modelValue'],
   components: { EditRoleContext },
   props: {
     value: {
       type: Object,
-      default: () => ({}),
+      default: undefined,
+    },
+    modelValue: {
+      type: Object,
+      default: undefined,
     },
     roles: {
       type: Array,
@@ -53,10 +57,16 @@ export default {
       required: true,
     },
   },
+  computed: {
+    currentValue() {
+      return this.modelValue !== undefined ? this.modelValue : this.value || {}
+    },
+  },
   methods: {
     roleUpdated({ uid }) {
       const role = this.roles.find((role) => role.uid === uid)
       this.$emit('input', role)
+      this.$emit('update:modelValue', role)
     },
   },
 }
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectMembersList.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectMembersList.vue
index 8e14a83d92..3a60a14a82 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectMembersList.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectMembersList.vue
@@ -19,6 +19,7 @@
     <List
       class="margin-top-2 select-members-list__items"
       :items="usersFiltered"
+      :selected-items="usersSelected"
       :attributes="['email']"
       selectable
       @selected="userSelected"
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectTeamsList.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectTeamsList.vue
index 038f66888e..81bda34f3b 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectTeamsList.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectTeamsList.vue
@@ -19,6 +19,7 @@
     <List
       class="margin-top-2 select-teams-list__items"
       :items="teamsFiltered"
+      :selected-items="teamsSelected"
       :attributes="[]"
       selectable
       @selected="teamSelected"
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/integrations/common/components/CommonOIDCSettingForm.vue b/enterprise/web-frontend/modules/baserow_enterprise/integrations/common/components/CommonOIDCSettingForm.vue
index 87b53ae539..935be938c0 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/integrations/common/components/CommonOIDCSettingForm.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/integrations/common/components/CommonOIDCSettingForm.vue
@@ -123,7 +123,11 @@ export default {
       this.$emit('values-changed', values)
     },
     checkValidity() {
-      if (!this.$refs.form.isFormValid() && this.$refs.form.v$.$anyDirty) {
+      if (
+        this.$refs.form &&
+        !this.$refs.form.isFormValid() &&
+        this.$refs.form.v$.$anyDirty
+      ) {
         this.inError = true
       } else {
         this.inError = false
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/plugin.js b/enterprise/web-frontend/modules/baserow_enterprise/plugin.js
index 4fb6c0bd3e..a4bd79f25d 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/plugin.js
+++ b/enterprise/web-frontend/modules/baserow_enterprise/plugin.js
@@ -20,13 +20,6 @@ import {
 } from '@baserow_enterprise/authProviderTypes'
 import { TeamsWorkspaceSettingsPageType } from '@baserow_enterprise/workspaceSettingsPageTypes'
 import { EnterpriseMembersPagePluginType } from '@baserow_enterprise/membersPagePluginTypes'
-import en from '@baserow_enterprise/locales/en.json'
-import fr from '@baserow_enterprise/locales/fr.json'
-import nl from '@baserow_enterprise/locales/nl.json'
-import de from '@baserow_enterprise/locales/de.json'
-import es from '@baserow_enterprise/locales/es.json'
-import it from '@baserow_enterprise/locales/it.json'
-import ko from '@baserow_enterprise/locales/ko.json'
 import {
   AdvancedLicenseType,
   EnterpriseLicenseType,
@@ -100,18 +93,6 @@ export default defineNuxtPlugin({
 
     const context = { app: nuxtApp }
 
-    // Allow locale file hot reloading
-    /*if (isDev && app.i18n) {
-      const { i18n } = app
-      i18n.mergeLocaleMessage('en', en)
-      i18n.mergeLocaleMessage('fr', fr)
-      i18n.mergeLocaleMessage('nl', nl)
-      i18n.mergeLocaleMessage('de', de)
-      i18n.mergeLocaleMessage('es', es)
-      i18n.mergeLocaleMessage('it', it)
-      i18n.mergeLocaleMessage('ko', ko)
-    }*/
-
     $registry.register('plugin', new EnterprisePlugin(context))
 
     $registry.register(
diff --git a/premium/backend/src/baserow_premium/fields/field_types.py b/premium/backend/src/baserow_premium/fields/field_types.py
index 20b0c2bf82..028121ec94 100644
--- a/premium/backend/src/baserow_premium/fields/field_types.py
+++ b/premium/backend/src/baserow_premium/fields/field_types.py
@@ -12,6 +12,9 @@
     ERROR_MODEL_DOES_NOT_BELONG_TO_TYPE,
 )
 from baserow.contrib.database.api.fields.errors import ERROR_FIELD_DOES_NOT_EXIST
+from baserow.contrib.database.fields.dependencies.handler import (
+    FieldDependencyHandler,
+)
 from baserow.contrib.database.fields.dependencies.models import FieldDependency
 from baserow.contrib.database.fields.dependencies.types import FieldDependencies
 from baserow.contrib.database.fields.dependencies.update_collector import (
@@ -348,6 +351,9 @@ def get_field_dependencies(
         self, field_instance: AIField, field_cache: "FieldCache"
     ) -> FieldDependencies:
         field_ids = extract_field_id_dependencies(field_instance.ai_prompt["formula"])
+        existing_field_ids = set(
+            Field.objects.filter(id__in=field_ids).values_list("id", flat=True)
+        )
         return [
             FieldDependency(
                 dependency_id=field_id,
@@ -355,6 +361,7 @@ def get_field_dependencies(
                 via=None,
             )
             for field_id in field_ids
+            if field_id in existing_field_ids
         ]
 
     def _handle_dependent_rows_change(
@@ -490,6 +497,26 @@ def before_update(self, from_field, to_field_values, user, field_kwargs):
 
         return super().before_update(from_field, to_field_values, user, field_kwargs)
 
+    def import_serialized(
+        self,
+        table,
+        serialized_values,
+        import_export_config,
+        id_mapping,
+        deferred_fk_update_collector,
+    ):
+        if not import_export_config.is_duplicate:
+            serialized_values = serialized_values.copy()
+            serialized_values.pop("ai_auto_update_user_id", None)
+            serialized_values["ai_auto_update"] = False
+        return super().import_serialized(
+            table,
+            serialized_values,
+            import_export_config,
+            id_mapping,
+            deferred_fk_update_collector,
+        )
+
     def after_import_serialized(
         self,
         field: AIField,
@@ -518,6 +545,8 @@ def after_import_serialized(
         if save:
             field.save()
 
+        FieldDependencyHandler.rebuild_dependencies([field], field_cache)
+
     def should_backup_field_data_for_same_type_update(
         self, old_field, new_field_attrs
     ) -> bool:
diff --git a/premium/backend/tests/baserow_premium_tests/fields/test_ai_field_type.py b/premium/backend/tests/baserow_premium_tests/fields/test_ai_field_type.py
index 2e9b19c40e..854797c930 100644
--- a/premium/backend/tests/baserow_premium_tests/fields/test_ai_field_type.py
+++ b/premium/backend/tests/baserow_premium_tests/fields/test_ai_field_type.py
@@ -1,4 +1,7 @@
+from unittest.mock import patch
+
 from django.shortcuts import reverse
+from django.test.utils import override_settings
 
 import pytest
 from pytest_unordered import unordered
@@ -7,10 +10,14 @@
 from baserow.contrib.database.fields.dependencies.models import FieldDependency
 from baserow.contrib.database.fields.handler import FieldHandler
 from baserow.contrib.database.fields.registries import field_type_registry
+from baserow.contrib.database.fields.utils.deferred_foreign_key_updater import (
+    DeferredForeignKeyUpdater,
+)
 from baserow.contrib.database.rows.handler import RowHandler
 from baserow.contrib.database.table.handler import TableHandler
 from baserow.core.cache import local_cache
 from baserow.core.db import specific_iterator
+from baserow.core.registries import ImportExportConfig
 from baserow_premium.fields.field_types import AIFieldType
 from baserow_premium.fields.models import AIField
 
@@ -710,11 +717,16 @@ def test_update_ai_field_type_via_api_file_field_doesnt_exist(
     assert response_json["error"] == "ERROR_FIELD_DOES_NOT_EXIST"
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db(transaction=True)
 @pytest.mark.field_ai
-def test_duplicate_table_with_ai_field(premium_data_fixture):
+@override_settings(DEBUG=True)
+@patch("baserow.core.jobs.handler.JobHandler.create_and_start_job")
+def test_duplicate_table_with_ai_field(patched_job_creation, premium_data_fixture):
+    premium_data_fixture.register_fake_generate_ai_type()
     session_id = "session-id"
-    user = premium_data_fixture.create_user(session_id=session_id)
+    user = premium_data_fixture.create_user(
+        session_id=session_id, has_active_premium_license=True
+    )
     database = premium_data_fixture.create_database_application(
         user=user, name="Placeholder"
     )
@@ -735,6 +747,8 @@ def test_duplicate_table_with_ai_field(premium_data_fixture):
         ai_generative_ai_model="test_1",
         ai_file_field=file_field,
         ai_prompt=f"concat('test:',get('fields.field_{text_field.id}'))",
+        ai_auto_update=True,
+        ai_auto_update_user=user,
     )
 
     table_handler = TableHandler()
@@ -754,6 +768,20 @@ def test_duplicate_table_with_ai_field(premium_data_fixture):
         duplicated_ai_field.ai_prompt["formula"]
         == f"concat('test:',get('fields.field_{duplicated_text_field.id}'))"
     )
+    assert duplicated_ai_field.ai_auto_update is True
+    assert duplicated_ai_field.ai_auto_update_user_id == user.id
+
+    # Verify auto-update triggers on the duplicated table's AI field.
+    patched_job_creation.reset_mock()
+    RowHandler().create_rows(
+        user,
+        duplicated_table,
+        rows_values=[{duplicated_text_field.db_column: "test"}],
+        send_webhook_events=False,
+        send_realtime_update=False,
+    )
+    assert patched_job_creation.call_count == 1
+    assert patched_job_creation.call_args.kwargs["field_id"] == duplicated_ai_field.id
 
 
 @pytest.mark.django_db
@@ -780,7 +808,7 @@ def test_duplicate_table_with_ai_field_broken_references(premium_data_fixture):
         ai_generative_ai_type="test_generative_ai",
         ai_generative_ai_model="test_1",
         ai_file_field=file_field,
-        ai_prompt=f"concat('test:',get('fields.field_0'))",
+        ai_prompt="concat('test:',get('fields.field_0'))",
     )
 
     table_handler = TableHandler()
@@ -792,7 +820,7 @@ def test_duplicate_table_with_ai_field_broken_references(premium_data_fixture):
 
     assert (
         duplicated_ai_field.ai_prompt["formula"]
-        == f"concat('test:',get('fields.field_0'))"
+        == "concat('test:',get('fields.field_0'))"
     )
 
 
@@ -1352,3 +1380,142 @@ def test_create_ai_field_auto_doesnt_update_user_if_set(premium_data_fixture):
 
     assert ai_field.ai_auto_update is True
     assert ai_field.ai_auto_update_user_id == user.id  # not changed
+
+
+@pytest.mark.django_db
+@pytest.mark.field_ai
+def test_import_serialized_ai_field_with_auto_update_user(premium_data_fixture):
+    user = premium_data_fixture.create_user()
+    table = premium_data_fixture.create_database_table(user=user)
+    premium_data_fixture.register_fake_generate_ai_type()
+    text_field = premium_data_fixture.create_text_field(
+        table=table, order=0, name="text"
+    )
+
+    ai_field = premium_data_fixture.create_ai_field(
+        table=table,
+        order=1,
+        name="ai",
+        ai_generative_ai_type="test_generative_ai",
+        ai_generative_ai_model="test_1",
+        ai_prompt=f"concat('test:',get('fields.field_{text_field.id}'))",
+        ai_auto_update=True,
+        ai_auto_update_user=user,
+    )
+
+    field_type = field_type_registry.get_by_model(ai_field)
+    serialized = field_type.export_serialized(ai_field)
+
+    serialized["ai_auto_update_user_id"] = 99999
+
+    imported_field = field_type.import_serialized(
+        table,
+        serialized,
+        ImportExportConfig(include_permission_data=False),
+        id_mapping={},
+        deferred_fk_update_collector=DeferredForeignKeyUpdater(),
+    )
+
+    imported_field = AIField.objects.get(id=imported_field.id)
+    assert imported_field.ai_auto_update is False
+    assert imported_field.ai_auto_update_user_id is None
+
+
+@pytest.mark.django_db(transaction=True)
+@pytest.mark.field_ai
+@override_settings(DEBUG=True)
+@patch("baserow.core.jobs.handler.JobHandler.create_and_start_job")
+def test_duplicate_field_with_ai_auto_update_triggers_both(
+    patched_job_creation, premium_data_fixture
+):
+    premium_data_fixture.register_fake_generate_ai_type()
+    user = premium_data_fixture.create_user(has_active_premium_license=True)
+    database = premium_data_fixture.create_database_application(
+        user=user, name="database"
+    )
+    table = premium_data_fixture.create_database_table(name="table", database=database)
+    text_field = premium_data_fixture.create_text_field(table=table, name="text")
+    ai_field = FieldHandler().create_field(
+        table=table,
+        user=user,
+        name="ai",
+        type_name="ai",
+        ai_generative_ai_type="test_generative_ai",
+        ai_generative_ai_model="test_1",
+        ai_prompt=f"get('fields.field_{text_field.id}')",
+        ai_auto_update=True,
+    )
+
+    assert ai_field.ai_auto_update is True
+    assert ai_field.ai_auto_update_user_id == user.id
+
+    RowHandler().create_rows(
+        user,
+        table,
+        rows_values=[{text_field.db_column: "test"}],
+        send_webhook_events=False,
+        send_realtime_update=False,
+    )
+    assert patched_job_creation.call_count == 1
+    assert patched_job_creation.call_args.kwargs["field_id"] == ai_field.id
+
+    duplicated_field, _ = FieldHandler().duplicate_field(user, ai_field)
+    duplicated_field = duplicated_field.specific
+
+    assert duplicated_field.ai_auto_update is True
+    assert duplicated_field.ai_auto_update_user_id == user.id
+
+    patched_job_creation.reset_mock()
+    RowHandler().create_rows(
+        user,
+        table,
+        rows_values=[{text_field.db_column: "test2"}],
+        send_webhook_events=False,
+        send_realtime_update=False,
+    )
+    assert patched_job_creation.call_count == 2
+    triggered_field_ids = {
+        call.kwargs["field_id"] for call in patched_job_creation.call_args_list
+    }
+    assert triggered_field_ids == {ai_field.id, duplicated_field.id}
+
+
+@pytest.mark.django_db
+@pytest.mark.field_ai
+def test_import_ai_field_disables_auto_update(premium_data_fixture):
+    premium_data_fixture.register_fake_generate_ai_type()
+    user = premium_data_fixture.create_user()
+    database = premium_data_fixture.create_database_application(
+        user=user, name="database"
+    )
+    table = premium_data_fixture.create_database_table(name="table", database=database)
+    text_field = premium_data_fixture.create_text_field(table=table, name="text")
+    ai_field = FieldHandler().create_field(
+        table=table,
+        user=user,
+        name="ai",
+        type_name="ai",
+        ai_generative_ai_type="test_generative_ai",
+        ai_generative_ai_model="test_1",
+        ai_prompt=f"get('fields.field_{text_field.id}')",
+        ai_auto_update=True,
+    )
+
+    assert ai_field.ai_auto_update_user_id == user.id
+
+    field_type = field_type_registry.get_by_model(ai_field)
+    serialized = field_type.export_serialized(ai_field)
+
+    serialized["ai_auto_update_user_id"] = 99999
+
+    imported_field = field_type.import_serialized(
+        table,
+        serialized,
+        ImportExportConfig(include_permission_data=False),
+        id_mapping={},
+        deferred_fk_update_collector=DeferredForeignKeyUpdater(),
+    )
+
+    imported_field = AIField.objects.get(id=imported_field.id)
+    assert imported_field.ai_auto_update is False
+    assert imported_field.ai_auto_update_user_id is None
diff --git a/premium/web-frontend/modules/baserow_premium/components/field/GenerateAIValuesModal.vue b/premium/web-frontend/modules/baserow_premium/components/field/GenerateAIValuesModal.vue
index 20bc9793f7..49db2df414 100644
--- a/premium/web-frontend/modules/baserow_premium/components/field/GenerateAIValuesModal.vue
+++ b/premium/web-frontend/modules/baserow_premium/components/field/GenerateAIValuesModal.vue
@@ -177,7 +177,7 @@ export default {
         const { data: viewsData } = await ViewService(this.$client).fetchAll(
           this.table.id
         )
-        viewsData.forEach((v) => populateView(v))
+        viewsData.forEach((v) => populateView(v, this.$registry))
         this.views = viewsData
       } catch (error) {
         this.handleError(error, 'views')
diff --git a/premium/web-frontend/modules/baserow_premium/components/views/PremiumViewOptions.vue b/premium/web-frontend/modules/baserow_premium/components/views/PremiumViewOptions.vue
index 4a05e814bb..41c1acbbba 100644
--- a/premium/web-frontend/modules/baserow_premium/components/views/PremiumViewOptions.vue
+++ b/premium/web-frontend/modules/baserow_premium/components/views/PremiumViewOptions.vue
@@ -12,7 +12,10 @@
         :disabled="!hasPremiumFeatures"
         @input="update('show_logo', !$event)"
       >
-        <img src="@baserow/modules/core/static/img/baserow-icon.svg?url" />
+        <img
+          class="switch__icon"
+          src="@baserow/modules/core/static/img/baserow-icon.svg?url"
+        />
         <span>
           {{ $t('shareLinkOptions.baserowLogo.label') }}
         </span>
@@ -39,7 +42,7 @@
         :disabled="!hasPremiumFeatures"
         @input="update('allow_public_export', $event)"
       >
-        <i class="iconoir iconoir-share-ios"></i>
+        <i class="switch__icon iconoir-share-ios"></i>
         <span>
           {{ $t('shareLinkOptions.allowPublicExportLabel') }}
         </span>
diff --git a/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModeSurvey.vue b/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModeSurvey.vue
index 13b7807903..334fe1517a 100644
--- a/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModeSurvey.vue
+++ b/premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModeSurvey.vue
@@ -173,7 +173,13 @@ export default {
 
       this.questionIndex++
     },
-    validateAndNext(fieldIndex) {
+    async validateAndNext(fieldIndex) {
+      const activeElement = document.activeElement
+      if (activeElement && activeElement !== document.body) {
+        activeElement.blur()
+      }
+      await this.$nextTick()
+
       const field = this.visibleFieldsWithoutHiddenViaQueryParam[fieldIndex]
       field._.touched = true
 
diff --git a/web-frontend/config/nuxt.config.base.ts b/web-frontend/config/nuxt.config.base.ts
index 245803093c..1f51190355 100644
--- a/web-frontend/config/nuxt.config.base.ts
+++ b/web-frontend/config/nuxt.config.base.ts
@@ -107,4 +107,9 @@ export default defineNuxtConfig({
   experimental: {
     appManifest: process.env.NODE_ENV !== 'development',
   },
+  vue: {
+    compilerOptions: {
+      comments: false,
+    },
+  },
 })
diff --git a/web-frontend/justfile b/web-frontend/justfile
index f2d5e4c291..0148f15bd3 100644
--- a/web-frontend/justfile
+++ b/web-frontend/justfile
@@ -105,7 +105,7 @@ ci-test:
 # Update Jest snapshots
 [group('3 - testing')]
 update-snapshots:
-    yarn run jest --updateSnapshot
+    yarn test --update
 
 # =============================================================================
 # Development
diff --git a/web-frontend/modules/automation/components/sidebar/SidebarItemAutomation.vue b/web-frontend/modules/automation/components/sidebar/SidebarItemAutomation.vue
index b5a711049d..2d80daf121 100644
--- a/web-frontend/modules/automation/components/sidebar/SidebarItemAutomation.vue
+++ b/web-frontend/modules/automation/components/sidebar/SidebarItemAutomation.vue
@@ -1,5 +1,5 @@
 <template>
-  <li class="tree__sub" :class="{ active: workflow?._?.selected }">
+  <li class="tree__sub" :class="{ active: workflow?._.selected }">
     <a
       class="tree__sub-link"
       :title="workflow.name"
@@ -152,6 +152,9 @@ export default {
       })
     },
     async selectWorkflow(automation, workflow) {
+      if (workflow?._.selected) {
+        return
+      }
       this.setLoading(automation, true)
       try {
         await this.$nuxt.$router.push({
diff --git a/web-frontend/modules/automation/locales/en.json b/web-frontend/modules/automation/locales/en.json
index 25169a5ef3..44965f7f3c 100644
--- a/web-frontend/modules/automation/locales/en.json
+++ b/web-frontend/modules/automation/locales/en.json
@@ -1,4 +1,7 @@
 {
+  "automationWorkflow": {
+    "title": "Worflow"
+  },
   "automationWelcomeGuidedTourStep": {
     "title": "Welcome to Baserow Automations!",
     "content": "Let's take a quick tour. You'll see how to set up triggers, add actions, test your workflow, and publish it — no coding required."
diff --git a/web-frontend/modules/automation/pages/automationWorkflow.vue b/web-frontend/modules/automation/pages/automationWorkflow.vue
index a3bd9f1d69..154000489e 100644
--- a/web-frontend/modules/automation/pages/automationWorkflow.vue
+++ b/web-frontend/modules/automation/pages/automationWorkflow.vue
@@ -63,6 +63,12 @@ definePageMeta({
   ],
 })
 
+const { t } = useI18n()
+
+useHead(() => ({
+  title: t('automationWorkflow.title'),
+}))
+
 const route = useRoute()
 const { $store, $registry } = useNuxtApp()
 
@@ -317,8 +323,15 @@ onBeforeRouteUpdate((to, from) => {
   onRouteChange(from)
 })
 
+const leavingRoute = ref(false)
 onBeforeRouteLeave((to, from) => {
-  $store.dispatch('automationWorkflow/unselect')
   onRouteChange(from)
+  leavingRoute.value = true
+})
+
+onUnmounted(() => {
+  if (leavingRoute.value) {
+    $store.dispatch('automationWorkflow/unselect')
+  }
 })
 </script>
diff --git a/web-frontend/modules/builder/components/domain/CustomDomainForm.vue b/web-frontend/modules/builder/components/domain/CustomDomainForm.vue
index d5a847601e..7e63e9d402 100644
--- a/web-frontend/modules/builder/components/domain/CustomDomainForm.vue
+++ b/web-frontend/modules/builder/components/domain/CustomDomainForm.vue
@@ -27,7 +27,7 @@ export default {
   mixins: [domainForm],
   emits: ['error'],
   setup() {
-    return { v$: useVuelidate() }
+    return { v$: useVuelidate({ $lazy: true }) }
   },
   data() {
     return {
@@ -47,9 +47,6 @@ export default {
         : ''
     },
   },
-  mounted() {
-    this.$refs.domainName.focus()
-  },
   methods: {
     handleInput() {
       this.serverErrors.domain_name = null
diff --git a/web-frontend/modules/builder/components/elements/baseComponents/ABRadio.vue b/web-frontend/modules/builder/components/elements/baseComponents/ABRadio.vue
index d6df3cfe93..6c7d77e3b3 100644
--- a/web-frontend/modules/builder/components/elements/baseComponents/ABRadio.vue
+++ b/web-frontend/modules/builder/components/elements/baseComponents/ABRadio.vue
@@ -2,7 +2,7 @@
   <div class="ab-radio" @click="toggle">
     <input
       type="radio"
-      :checked="value"
+      :checked="modelValue"
       :required="required"
       class="ab-radio__input"
       :disabled="disabled"
@@ -25,7 +25,7 @@ export default {
     /**
      * The state of the radio.
      */
-    value: {
+    modelValue: {
       type: Boolean,
       required: false,
       default: false,
@@ -63,7 +63,7 @@ export default {
       default: false,
     },
   },
-  emits: ['input'],
+  emits: ['update:modelValue'],
   computed: {
     hasSlot() {
       return !!this.$slots.default
@@ -72,7 +72,7 @@ export default {
   methods: {
     toggle() {
       if (this.disabled || this.readOnly) return
-      this.$emit('input', !this.value)
+      this.$emit('update:modelValue', !this.value)
     },
   },
 }
diff --git a/web-frontend/modules/builder/components/elements/components/ChoiceElement.vue b/web-frontend/modules/builder/components/elements/components/ChoiceElement.vue
index 85d4bc2cc4..2f8a091e3a 100644
--- a/web-frontend/modules/builder/components/elements/components/ChoiceElement.vue
+++ b/web-frontend/modules/builder/components/elements/components/ChoiceElement.vue
@@ -31,8 +31,8 @@
             :key="option.id"
             :read-only="isEditMode"
             :error="displayFormDataError"
-            :value="inputValue.includes(option.value)"
-            @input="onOptionChange(option, $event)"
+            :model-value="inputValue.includes(option.value)"
+            @update:model-value="onOptionChange(option, $event)"
           >
             {{ option.name || option.value }}
           </ABCheckbox>
@@ -43,8 +43,8 @@
             :key="option.id"
             :read-only="isEditMode"
             :error="displayFormDataError"
-            :value="option.value === inputValue"
-            @input="onOptionChange(option, $event)"
+            :model-value="option.value === inputValue"
+            @update:model-value="onOptionChange(option, $event)"
           >
             {{ option.name || option.value }}
           </ABRadio>
diff --git a/web-frontend/modules/builder/components/elements/components/forms/general/ChoiceElementForm.vue b/web-frontend/modules/builder/components/elements/components/forms/general/ChoiceElementForm.vue
index 8466411f9a..d033aac450 100644
--- a/web-frontend/modules/builder/components/elements/components/forms/general/ChoiceElementForm.vue
+++ b/web-frontend/modules/builder/components/elements/components/forms/general/ChoiceElementForm.vue
@@ -76,20 +76,11 @@
       required
       class="margin-bottom-2"
     >
-      <RadioButton
-        v-model="values.option_type"
-        :value="CHOICE_OPTION_TYPES.MANUAL"
-        icon="iconoir-open-select-hand-gesture"
-      >
-        {{ $t('choiceOptionSelector.manual') }}
-      </RadioButton>
-      <RadioButton
+      <RadioGroup
         v-model="values.option_type"
-        :value="CHOICE_OPTION_TYPES.FORMULAS"
-        icon="iconoir-sigma-function"
-      >
-        {{ $t('choiceOptionSelector.formulas') }}
-      </RadioButton>
+        :options="optionTypeOptions"
+        type="button"
+      />
     </FormGroup>
     <template v-if="values.option_type === CHOICE_OPTION_TYPES.MANUAL">
       <template v-if="values.options.length">
@@ -252,6 +243,20 @@ export default {
         },
       ]
     },
+    optionTypeOptions() {
+      return [
+        {
+          label: this.$t('choiceOptionSelector.manual'),
+          value: CHOICE_OPTION_TYPES.MANUAL,
+          icon: 'iconoir-open-select-hand-gesture',
+        },
+        {
+          label: this.$t('choiceOptionSelector.formulas'),
+          value: CHOICE_OPTION_TYPES.FORMULAS,
+          icon: 'iconoir-sigma-function',
+        },
+      ]
+    },
   },
   watch: {
     'element.options'(options) {
diff --git a/web-frontend/modules/builder/components/sidebar/SidebarItemBuilder.vue b/web-frontend/modules/builder/components/sidebar/SidebarItemBuilder.vue
index 55973fd02c..ccc7e7c290 100644
--- a/web-frontend/modules/builder/components/sidebar/SidebarItemBuilder.vue
+++ b/web-frontend/modules/builder/components/sidebar/SidebarItemBuilder.vue
@@ -146,6 +146,9 @@ export default {
       })
     },
     async selectPage(builder, page) {
+      if (page._.selected) {
+        return
+      }
       this.setLoading(builder, true)
       try {
         await this.$nuxt.$router.push({
diff --git a/web-frontend/modules/builder/components/userSource/UpdateUserSourceForm.vue b/web-frontend/modules/builder/components/userSource/UpdateUserSourceForm.vue
index d89e0b373b..f827435b02 100644
--- a/web-frontend/modules/builder/components/userSource/UpdateUserSourceForm.vue
+++ b/web-frontend/modules/builder/components/userSource/UpdateUserSourceForm.vue
@@ -29,7 +29,6 @@
         />
       </FormGroup>
     </FormRow>
-
     <component
       :is="userSourceType.formComponent"
       v-if="integration"
@@ -104,11 +103,11 @@
 import { useVuelidate } from '@vuelidate/core'
 import form from '@baserow/modules/core/mixins/form'
 import IntegrationDropdown from '@baserow/modules/core/components/integrations/IntegrationDropdown'
-import AuthProviderWithModal from '@baserow/modules/builder/components/userSource/AuthProviderWithModal'
 import { required, maxLength, helpers } from '@vuelidate/validators'
+import _ from 'lodash'
 
 export default {
-  components: { IntegrationDropdown, AuthProviderWithModal },
+  components: { IntegrationDropdown },
   mixins: [form],
   props: {
     builder: {
diff --git a/web-frontend/modules/builder/locales/en.json b/web-frontend/modules/builder/locales/en.json
index 3d5c793c15..c0480bd575 100644
--- a/web-frontend/modules/builder/locales/en.json
+++ b/web-frontend/modules/builder/locales/en.json
@@ -494,7 +494,7 @@
     "numericName": "Numeric"
   },
   "pageEditor": {
-    "title": "Baserow | Application Builder",
+    "title": "Application Builder",
     "pageNotFound": "Page not found"
   },
   "publicPage": {
diff --git a/web-frontend/modules/builder/pageActionTypes.js b/web-frontend/modules/builder/pageActionTypes.js
index 247a3a3d84..3bd7aaa000 100644
--- a/web-frontend/modules/builder/pageActionTypes.js
+++ b/web-frontend/modules/builder/pageActionTypes.js
@@ -2,6 +2,7 @@ import { Registerable } from '@baserow/modules/core/registry'
 
 import { compile } from 'path-to-regexp'
 import PublishActionModal from '@baserow/modules/builder/components/page/header/PublishActionModal'
+import { ensureString } from '@baserow/modules/core/utils/validator'
 
 export class PageActionType extends Registerable {
   get label() {
@@ -99,9 +100,14 @@ export class PreviewPageActionType extends PageActionType {
 
     const toPath = compile(page.path, { encode: encodeURIComponent })
     const pageParams = Object.fromEntries(
-      page.path_params.map(({ name, value }) => [name, page.parameters[name]])
+      page.path_params.map(({ name }) => [
+        name,
+        ensureString(page.parameters[name]), // toPath needs strings
+      ])
     )
+
     const resolvedPagePath = toPath(pageParams)
+
     const url = new URL(
       `/builder/${builderId}/preview${resolvedPagePath}`,
       window.location.origin
diff --git a/web-frontend/modules/builder/pages/pageEditor.vue b/web-frontend/modules/builder/pages/pageEditor.vue
index 45225cd3cc..876ba65c84 100644
--- a/web-frontend/modules/builder/pages/pageEditor.vue
+++ b/web-frontend/modules/builder/pages/pageEditor.vue
@@ -42,12 +42,10 @@ definePageMeta({
 
 const mode = 'editing'
 const route = useRoute()
+const { t } = useI18n()
 const { $store, $registry, $i18n } = useNuxtApp()
 
 const panelWidth = ref(360)
-/*const workspace = ref(null)
-const builder = ref(null)
-const currentPage = ref(null)*/
 
 // Provide values for child components
 const applicationContext = computed(() => ({
@@ -57,7 +55,7 @@ const applicationContext = computed(() => ({
 }))
 
 useHead(() => ({
-  title: $i18n.t('pageEditor.title'),
+  title: t('pageEditor.title'),
 }))
 
 // Load page data
diff --git a/web-frontend/modules/builder/plugin.js b/web-frontend/modules/builder/plugin.js
index 9250a00ad8..01a8b90c71 100644
--- a/web-frontend/modules/builder/plugin.js
+++ b/web-frontend/modules/builder/plugin.js
@@ -161,18 +161,6 @@ export default defineNuxtPlugin({
     const { $store, $registry, $clientErrorMap, $i18n } = nuxtApp
     const context = { app: nuxtApp }
 
-    // Merge builder translations into i18n
-    /*if ($i18n) {
-      $i18n.mergeLocaleMessage('en', en)
-      $i18n.mergeLocaleMessage('fr', fr)
-      $i18n.mergeLocaleMessage('nl', nl)
-      $i18n.mergeLocaleMessage('de', de)
-      $i18n.mergeLocaleMessage('es', es)
-      $i18n.mergeLocaleMessage('it', it)
-      $i18n.mergeLocaleMessage('pl', pl)
-      $i18n.mergeLocaleMessage('ko', ko)
-    }*/
-
     $clientErrorMap.setError(
       'ERROR_PAGE_NAME_NOT_UNIQUE',
       $i18n.t('pageErrors.errorNameNotUnique'),
diff --git a/web-frontend/modules/core/assets/scss/components/fields/password.scss b/web-frontend/modules/core/assets/scss/components/fields/password.scss
index 6386e24b43..30a5811f5d 100644
--- a/web-frontend/modules/core/assets/scss/components/fields/password.scss
+++ b/web-frontend/modules/core/assets/scss/components/fields/password.scss
@@ -1,3 +1,4 @@
 .field-password__dots {
   display: inline-block;
+  margin-right: 4px;
 }
diff --git a/web-frontend/modules/core/assets/scss/components/form.scss b/web-frontend/modules/core/assets/scss/components/form.scss
index 51c7d3e0bc..73728d9eca 100644
--- a/web-frontend/modules/core/assets/scss/components/form.scss
+++ b/web-frontend/modules/core/assets/scss/components/form.scss
@@ -26,6 +26,17 @@
     border-color: $palette-red-600;
   }
 
+  // Override a more precise rule in form_input.scss
+  .form-input {
+    &:active:not(.form-input--no-border),
+    &:focus:not(.form-input--no-border),
+    &:focus-within:not(.form-input--no-border) {
+      &:not(.form-input--disabled):not(.form-input--error) {
+        border-color: $palette-red-600;
+      }
+    }
+  }
+
   .form-input__icon {
     color: $palette-red-600;
   }
diff --git a/web-frontend/modules/core/assets/scss/components/rich_text_editor.scss b/web-frontend/modules/core/assets/scss/components/rich_text_editor.scss
index 59ffcb7170..74f5e006b1 100644
--- a/web-frontend/modules/core/assets/scss/components/rich_text_editor.scss
+++ b/web-frontend/modules/core/assets/scss/components/rich_text_editor.scss
@@ -166,6 +166,13 @@ span[data-type='mention'] {
   height: 0;
 }
 
+// The BubbleMenu plugin toggles opacity 0/1 on its container element.
+// Override any transitions to make show/hide instant (no fade).
+.rich-text-editor__menu-container {
+  transition: none !important;
+  z-index: 6;
+}
+
 .rich-text-editor__floating-menu,
 .rich-text-editor__bubble-menu {
   @include elevation($elevation-medium);
diff --git a/web-frontend/modules/core/assets/scss/components/switch_input.scss b/web-frontend/modules/core/assets/scss/components/switch_input.scss
index b823176f6b..7d7b0fdef6 100644
--- a/web-frontend/modules/core/assets/scss/components/switch_input.scss
+++ b/web-frontend/modules/core/assets/scss/components/switch_input.scss
@@ -122,3 +122,7 @@
     color: $palette-neutral-700;
   }
 }
+
+.switch__icon {
+  margin-right: 4px;
+}
diff --git a/web-frontend/modules/core/components/editor/RichTextEditor.vue b/web-frontend/modules/core/components/editor/RichTextEditor.vue
index fc219f28b5..484c8f93fe 100644
--- a/web-frontend/modules/core/components/editor/RichTextEditor.vue
+++ b/web-frontend/modules/core/components/editor/RichTextEditor.vue
@@ -13,11 +13,15 @@
         ref="bubbleMenu"
         :editor="editor"
         :visible="bubbleMenuVisible"
+        :append-to="menuContainer"
+        :scroll-target="scrollElement"
       />
       <RichTextEditorFloatingMenu
         ref="floatingMenu"
         :editor="editor"
         :visible="floatingMenuVisible"
+        :append-to="menuContainer"
+        :scroll-target="scrollElement"
       />
     </div>
     <EditorContent
@@ -61,7 +65,7 @@ import { Text } from '@tiptap/extension-text'
 import { Dropcursor } from '@tiptap/extension-dropcursor'
 import { Gapcursor } from '@tiptap/extension-gapcursor'
 import { History } from '@tiptap/extension-history'
-import { mergeAttributes, isActive } from '@tiptap/core'
+import { mergeAttributes, isActive, posToDOMRect } from '@tiptap/core'
 
 import { Markdown } from 'tiptap-markdown'
 
@@ -169,17 +173,22 @@ export default {
       type: Boolean,
       default: false,
     },
+    menuContainer: {
+      type: [Object, Function],
+      default: undefined,
+    },
   },
   emits: ['blur', 'focus', 'update:modelValue', 'stop-edit'],
   data() {
     return {
       editor: null,
       resizeObserver: null,
-      bubbleMenuVisible: false,
-      floatingMenuVisible: false,
+      bubbleMenuVisible: true,
+      floatingMenuVisible: true,
       loadings: [],
       mousedownEvent: null,
       scrollEvent: null,
+      scrollElement: null,
     }
   },
   computed: {
@@ -205,6 +214,7 @@ export default {
     },
   },
   mounted() {
+    this.scrollElement = this.getScrollElement()
     this.createEditor()
   },
   beforeUnmount() {
@@ -224,8 +234,37 @@ export default {
   },
   methods: {
     registerResizeObserver() {
-      const resizeObserver = new ResizeObserver(() => {
-        this.bubbleMenuVisible = false
+      let lastWidth = null
+      let lastHeight = null
+      const resizeObserver = new ResizeObserver((entries) => {
+        const entry = entries[0]
+        if (!entry) return
+        const newWidth = entry.contentRect.width
+        const newHeight = entry.contentRect.height
+
+        if (lastWidth !== null && lastWidth !== newWidth) {
+          this.bubbleMenuVisible = false
+        }
+
+        const sizeChanged =
+          lastWidth !== null &&
+          (lastWidth !== newWidth || lastHeight !== newHeight)
+        lastWidth = newWidth
+        lastHeight = newHeight
+
+        // Check bounds after resize, deferred so ProseMirror can re-layout
+        if (sizeChanged && this.editor && this.scrollElement) {
+          requestAnimationFrame(() => {
+            if (!this.editor || !this.scrollElement) return
+            const { from, to } = this.editor.state.selection
+            const selectionRect = posToDOMRect(this.editor.view, from, to)
+            const containerRect = this.scrollElement.getBoundingClientRect()
+            const inBounds =
+              selectionRect.bottom > containerRect.top &&
+              selectionRect.top < containerRect.bottom
+            this.setMenuScrollVisibility(inBounds)
+          })
+        }
       })
       resizeObserver.observe(this.$refs.root)
       this.resizeObserver = resizeObserver
@@ -310,47 +349,30 @@ export default {
           this.$emit('update:modelValue', clone(this.editor.getJSON()))
         },
         onFocus: ({ editor, event }) => {
-          if (this.editable && !this.bubbleMenuVisible) {
-            this.floatingMenuVisible = true
-          }
+          this.bubbleMenuVisible = true
+          this.floatingMenuVisible = true
+          this.setMenuScrollVisibility(true)
           this.$emit('focus')
         },
         onBlur: ({ editor, event }) => {
           if (this.isEventFromMenu(event)) {
             return // Do not emit a blur event if it is coming from one of the editor's menu.
           }
-
-          this.bubbleMenuVisible = false
-          this.floatingMenuVisible = false
           this.$emit('blur')
         },
-        onSelectionUpdate: ({ editor }) => {
+        onSelectionUpdate: () => {
           if (!this.editable || !this.enableRichTextFormatting) {
             return
           }
-
-          const emptySelection = editor.state.selection.empty === true
-          const codeBlockActive = editor.isActive('codeBlock')
-          const linkMarkActive = editor.isActive('link')
-
-          if (editor.isActive('image')) {
-            this.bubbleMenuVisible = false
-            this.floatingMenuVisible = false
-          } else if ((!emptySelection && !codeBlockActive) || linkMarkActive) {
-            this.bubbleMenuVisible = true
-            this.floatingMenuVisible = false
-          } else {
-            this.bubbleMenuVisible = false
-            this.floatingMenuVisible = true
-          }
+          this.bubbleMenuVisible = true
+          this.floatingMenuVisible = true
+          this.setMenuScrollVisibility(true)
         },
       })
       this.setupEditor()
     },
     setupEditor() {
       if (this.editable) {
-        this.floatingMenuVisible = true
-
         this.registerResizeObserver()
         this.registerAutoCollapseFloatingMenuHandler()
         this.registerAutoHideBubbleMenuHandler()
@@ -370,9 +392,25 @@ export default {
     getScrollElement() {
       return this.scrollableAreaElement ?? this.$refs.root
     },
+    setMenuScrollVisibility(visible) {
+      const floatingEl = this.$refs.floatingMenu?.$el
+      const bubbleEl = this.$refs.bubbleMenu?.$el
+      if (floatingEl) floatingEl.style.visibility = visible ? '' : 'hidden'
+      if (bubbleEl) bubbleEl.style.visibility = visible ? '' : 'hidden'
+    },
     registerAutoHideBubbleMenuHandler() {
       this.scrollEvent = () => {
-        this.bubbleMenuVisible = false
+        if (!this.editor) return
+
+        const { from, to } = this.editor.state.selection
+        const selectionRect = posToDOMRect(this.editor.view, from, to)
+        const containerRect = this.scrollElement.getBoundingClientRect()
+
+        const inBounds =
+          selectionRect.bottom > containerRect.top &&
+          selectionRect.top < containerRect.bottom
+
+        this.setMenuScrollVisibility(inBounds)
       }
 
       const elem = this.getScrollElement()
diff --git a/web-frontend/modules/core/components/editor/RichTextEditorBubbleMenu.vue b/web-frontend/modules/core/components/editor/RichTextEditorBubbleMenu.vue
index 45749d8298..3870694dfd 100644
--- a/web-frontend/modules/core/components/editor/RichTextEditorBubbleMenu.vue
+++ b/web-frontend/modules/core/components/editor/RichTextEditorBubbleMenu.vue
@@ -1,14 +1,16 @@
 <template>
   <BubbleMenu
     v-if="editor"
+    class="rich-text-editor__menu-container"
     :editor="editor"
-    :should-show="() => visible"
-    :options="{
-      placement: 'top',
-      offset: 5,
-    }"
+    :plugin-key="pluginKey"
+    :append-to="appendTo"
+    :should-show="shouldShowMenu"
+    :update-delay="0"
+    :resize-delay="0"
+    :options="menuOptions"
   >
-    <div :style="{ visibility: 'visible' }">
+    <div>
       <div v-if="editLink" class="rich-text-editor__bubble-menu">
         <div class="rich-text-editor__bubble-menu-link-edit">
           <input
@@ -71,7 +73,7 @@
         >
           <button
             :class="{ 'is-active': editor.isActive('bold') }"
-            @click.stop.prevent="editor.chain().focus().toggleBold().run()"
+            @click.stop.prevent="toggleMark('bold')"
           >
             <i class="iconoir-bold"></i>
           </button>
@@ -82,7 +84,7 @@
         >
           <button
             :class="{ 'is-active': editor.isActive('italic') }"
-            @click.stop.prevent="editor.chain().focus().toggleItalic().run()"
+            @click.stop.prevent="toggleMark('italic')"
           >
             <i class="iconoir-italic"></i>
           </button>
@@ -93,7 +95,7 @@
         >
           <button
             :class="{ 'is-active': editor.isActive('underline') }"
-            @click.stop.prevent="editor.chain().focus().toggleUnderline().run()"
+            @click.stop.prevent="toggleMark('underline')"
           >
             <i class="iconoir-underline"></i>
           </button>
@@ -104,7 +106,7 @@
         >
           <button
             :class="{ 'is-active': editor.isActive('strike') }"
-            @click.stop.prevent="editor.chain().focus().toggleStrike().run()"
+            @click.stop.prevent="toggleMark('strike')"
           >
             <i class="iconoir-strikethrough"></i>
           </button>
@@ -144,6 +146,18 @@ export default {
       type: Boolean,
       default: true,
     },
+    pluginKey: {
+      type: [String, Object],
+      default: 'inlineBubbleMenu',
+    },
+    appendTo: {
+      type: [Object, Function],
+      default: undefined,
+    },
+    scrollTarget: {
+      type: Object,
+      default: null,
+    },
   },
   data() {
     return {
@@ -152,6 +166,19 @@ export default {
       unsetLinkMarkHandler: null,
     }
   },
+  computed: {
+    menuOptions() {
+      const opts = {
+        strategy: 'fixed',
+        placement: 'top',
+        offset: 5,
+      }
+      if (this.scrollTarget) {
+        opts.scrollTarget = this.scrollTarget
+      }
+      return opts
+    },
+  },
   watch: {
     visible(value) {
       if (!value) {
@@ -177,6 +204,50 @@ export default {
     }
   },
   methods: {
+    shouldShowMenu({ editor, view, element }) {
+      if (!this.visible) return false
+
+      const isChildOfMenu = element.contains(document.activeElement)
+      const hasEditorFocus = view.hasFocus() || isChildOfMenu
+
+      if (!hasEditorFocus || !editor.isEditable) {
+        return false
+      }
+
+      if (editor.isActive('image')) {
+        return false
+      }
+
+      const emptySelection = editor.state.selection.empty
+      const codeBlockActive = editor.isActive('codeBlock')
+      const linkMarkActive = editor.isActive('link')
+
+      return (!emptySelection && !codeBlockActive) || linkMarkActive
+    },
+    toggleMark(type) {
+      if (!this.editor) {
+        return
+      }
+
+      const chain = this.editor.chain().focus()
+
+      switch (type) {
+        case 'bold':
+          chain.toggleBold()
+          break
+        case 'italic':
+          chain.toggleItalic()
+          break
+        case 'underline':
+          chain.toggleUnderline()
+          break
+        case 'strike':
+          chain.toggleStrike()
+          break
+      }
+
+      chain.run()
+    },
     isEventTargetInside(event) {
       return (
         isElement(this.$el, event.target) ||
diff --git a/web-frontend/modules/core/components/editor/RichTextEditorFloatingMenu.vue b/web-frontend/modules/core/components/editor/RichTextEditorFloatingMenu.vue
index b37e1c3740..54fa4d1998 100644
--- a/web-frontend/modules/core/components/editor/RichTextEditorFloatingMenu.vue
+++ b/web-frontend/modules/core/components/editor/RichTextEditorFloatingMenu.vue
@@ -3,15 +3,17 @@
     v-if="editor"
     v-show="open"
     ref="menu"
+    class="rich-text-editor__menu-container"
     :editor="editor"
-    :should-show="() => visible"
-    :options="{
-      placement: 'left',
-      offset: { mainAxis: 14, crossAxis: 0 },
-    }"
+    :plugin-key="pluginKey"
+    :append-to="appendTo"
+    :should-show="shouldShowMenu"
+    :update-delay="0"
+    :resize-delay="0"
+    :options="menuOptions"
     :get-referenced-virtual-element="getVirtualElement"
   >
-    <div :style="{ visibility: 'visible' }">
+    <div>
       <div
         v-if="!expanded"
         class="rich-text-editor__floating-menu rich-text-editor__floating-menu--collapsed"
@@ -137,6 +139,18 @@ export default {
       type: Boolean,
       default: true,
     },
+    pluginKey: {
+      type: [String, Object],
+      default: 'floatingBlockMenu',
+    },
+    appendTo: {
+      type: [Object, Function],
+      default: undefined,
+    },
+    scrollTarget: {
+      type: Object,
+      default: null,
+    },
   },
   data() {
     return {
@@ -145,6 +159,19 @@ export default {
     }
   },
   computed: {
+    menuOptions() {
+      const opts = {
+        strategy: 'fixed',
+        placement: 'left',
+        offset: { mainAxis: 14, crossAxis: 0 },
+        flip: false,
+        duration: 0,
+      }
+      if (this.scrollTarget) {
+        opts.scrollTarget = this.scrollTarget
+      }
+      return opts
+    },
     activeNode() {
       if (this.editor.isActive('heading', { level: 1 })) {
         return 'h1'
@@ -186,6 +213,18 @@ export default {
     },
   },
   methods: {
+    shouldShowMenu({ editor }) {
+      if (!this.visible) return false
+      const emptySelection = editor.state.selection.empty
+      if (editor.isActive('image')) return false
+      if (
+        (!emptySelection && !editor.isActive('codeBlock')) ||
+        editor.isActive('link')
+      ) {
+        return false
+      }
+      return true
+    },
     isEventTargetInside(event) {
       return (
         isElement(this.$el, event.target) ||
@@ -198,17 +237,14 @@ export default {
     expand() {
       this.open = true
       this.expanded = true
-      // Trigger position recalculation after DOM updates with expanded menu
-      this.$nextTick(() => {
-        const { tr } = this.editor.state
-        tr.setMeta('bubbleMenu', 'updatePosition')
-        this.editor.view.dispatch(tr)
-      })
+      this.triggerPositionUpdate()
     },
     collapse() {
       this.open = true
       this.expanded = false
-      // Trigger position recalculation after DOM updates with collapsed menu
+      this.triggerPositionUpdate()
+    },
+    triggerPositionUpdate() {
       this.$nextTick(() => {
         const { tr } = this.editor.state
         tr.setMeta('bubbleMenu', 'updatePosition')
@@ -252,32 +288,29 @@ export default {
       chain.run()
       this.open = true
       // Trigger position recalculation after format change (line height may change)
-      this.$nextTick(() => {
-        const { tr } = this.editor.state
-        tr.setMeta('bubbleMenu', 'updatePosition')
-        this.editor.view.dispatch(tr)
-      })
+      this.triggerPositionUpdate()
     },
     getVirtualElement() {
-      const view = this.editor.view
-      const { state } = view
-      const { from } = state.selection
-      const cursorRect = posToDOMRect(view, from, from)
-
-      // Position to the left of the editor
-      const editorRect = view.dom.getBoundingClientRect()
-
+      const editor = this.editor
       return {
-        getBoundingClientRect: () => ({
-          top: cursorRect.top,
-          bottom: cursorRect.bottom,
-          left: editorRect.left,
-          right: editorRect.left,
-          x: editorRect.left,
-          y: cursorRect.top,
-          width: 0,
-          height: cursorRect.height,
-        }),
+        // Compute fresh coordinates on each call so floating-ui's autoUpdate
+        // always gets the current cursor and editor position.
+        getBoundingClientRect: () => {
+          const view = editor.view
+          const { from } = view.state.selection
+          const cursorRect = posToDOMRect(view, from, from)
+          const editorRect = view.dom.getBoundingClientRect()
+          return {
+            top: cursorRect.top,
+            bottom: cursorRect.bottom,
+            left: editorRect.left,
+            right: editorRect.left,
+            x: editorRect.left,
+            y: cursorRect.top,
+            width: 0,
+            height: cursorRect.height,
+          }
+        },
       }
     },
   },
diff --git a/web-frontend/modules/core/components/formula/FormulaInputField.vue b/web-frontend/modules/core/components/formula/FormulaInputField.vue
index 06c6957d4f..07751895fe 100644
--- a/web-frontend/modules/core/components/formula/FormulaInputField.vue
+++ b/web-frontend/modules/core/components/formula/FormulaInputField.vue
@@ -3,7 +3,6 @@
     <div class="formula-input-field__editor" @click="handleEditorClick">
       <EditorContent
         :id="forInput"
-        :key="key"
         ref="editor"
         class="form-input formula-input-field"
         role="textbox"
@@ -75,7 +74,6 @@ import { mergeAttributes } from '@tiptap/core'
 import FormulaInputContext from '@baserow/modules/core/components/formula/FormulaInputContext'
 import { isFormulaValid } from '@baserow/modules/core/formula'
 import NodeHelpTooltip from '@baserow/modules/core/components/nodeExplorer/NodeHelpTooltip'
-import { fixPropertyReactivityForProvide } from '@baserow/modules/core/utils/object'
 import { BASEROW_FORMULA_MODES } from '@baserow/modules/core/formula/constants'
 
 export default {
@@ -87,12 +85,7 @@ export default {
   },
 
   provide() {
-    return fixPropertyReactivityForProvide(
-      {},
-      {
-        nodesHierarchy: () => this.nodesHierarchy,
-      }
-    )
+    return { nodesHierarchy: computed(() => this.nodesHierarchy) }
   },
   inject: {
     forInput: { from: 'forInput', default: null },
@@ -172,7 +165,6 @@ export default {
       hoveredFunctionNode: null,
       isHandlingModeChange: false,
       intersectionObserver: null,
-      key: 0,
     }
   },
   computed: {
@@ -348,11 +340,6 @@ export default {
     },
   },
   watch: {
-    nodesHierarchy() {
-      // fixes reactivity issue with components in tiptap by forcing the input to
-      // render.
-      this.key += 1
-    },
     disabled(newValue) {
       this.editor.setOptions({ editable: !newValue && !this.readOnly })
     },
diff --git a/web-frontend/modules/core/components/notifications/WorkspaceInvitationCreatedNotification.vue b/web-frontend/modules/core/components/notifications/WorkspaceInvitationCreatedNotification.vue
index 77ba28910b..a7d30e7b85 100644
--- a/web-frontend/modules/core/components/notifications/WorkspaceInvitationCreatedNotification.vue
+++ b/web-frontend/modules/core/components/notifications/WorkspaceInvitationCreatedNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <nuxt-link
     class="notification-panel__notification-link"
-    :to="{ name: 'dashboard' }"
+    :to="route"
     @click="markAsReadAndHandleClick"
   >
     <div class="notification-panel__notification-content-title">
diff --git a/web-frontend/modules/core/components/settings/EmailSettings.vue b/web-frontend/modules/core/components/settings/EmailSettings.vue
index 4c66ca2357..65ac36ab14 100644
--- a/web-frontend/modules/core/components/settings/EmailSettings.vue
+++ b/web-frontend/modules/core/components/settings/EmailSettings.vue
@@ -116,11 +116,9 @@ export default {
       this.loading = true
       this.hideError()
 
-      const { runtimeConfig, $client } = useNuxtApp()
-
       try {
-        const baseUrl = `${runtimeConfig.public.publicWebFrontendUrl}/change-email`
-        await AuthService($client).sendChangeEmailConfirmation(
+        const baseUrl = `${this.$config.public.publicWebFrontendUrl}/change-email`
+        await AuthService(this.$client).sendChangeEmailConfirmation(
           this.emailData.newEmail,
           this.emailData.password,
           baseUrl
diff --git a/web-frontend/modules/core/middleware/authenticated.js b/web-frontend/modules/core/middleware/authenticated.js
index 9a1a0b31a7..ff0626fbee 100644
--- a/web-frontend/modules/core/middleware/authenticated.js
+++ b/web-frontend/modules/core/middleware/authenticated.js
@@ -19,22 +19,3 @@ export default defineNuxtRouteMiddleware((to) => {
     return navigateTo({ name: 'login', query })
   }
 })
-
-/*
-Previous Nuxt 2 middleware:
-export default function ({ req, store, route, redirect }) {
-  // If nuxt generate, pass this middleware
-  if (import.meta.server && !req) return
-
-  if (!store.getters['auth/isAuthenticated']) {
-    const query = {}
-    if (req) {
-      query.original = encodeURI(req.originalUrl)
-    } else {
-      query.original = route.path
-    }
-
-    return redirect({ name: 'login', query })
-  }
-}
-*/
diff --git a/web-frontend/modules/core/middleware/impersonate.js b/web-frontend/modules/core/middleware/impersonate.js
index a5d93136a1..7a48d136ec 100644
--- a/web-frontend/modules/core/middleware/impersonate.js
+++ b/web-frontend/modules/core/middleware/impersonate.js
@@ -35,34 +35,3 @@ export default defineNuxtRouteMiddleware(async (to) => {
   // is visible.
   store.dispatch('impersonating/setImpersonating', true)
 })
-
-/*
-Previous Nuxt 2 middleware:
-export default async function ({ store, req, app, route }) {
-  if (!req) return
-
-  // If the query param is not provided, we don't want to do anything.
-  if (
-    !Object.prototype.hasOwnProperty.call(route.query, '__impersonate-user')
-  ) {
-    return
-  }
-
-  const userId = route.query['__impersonate-user']
-
-  // Request the impersonate user data, this contains the `token` and `user` object.
-  // This is needed to impersonate the user.
-  const { data } = await UserService(app.$client).impersonate(userId)
-
-  // Override the existing user data based on the response of the impersonate endpoint.
-  store.dispatch('auth/forceSetUserData', data)
-
-  // Make sure that the auth doesn't override the JWT token cookie because we want
-  // the admin one to persist.
-  store.dispatch('auth/preventSetToken')
-
-  // Set the impersonating state to true so that the warning in the top left corner
-  // is visible.
-  store.dispatch('impersonating/setImpersonating', true)
-}
-*/
diff --git a/web-frontend/modules/core/middleware/pendingJobs.js b/web-frontend/modules/core/middleware/pendingJobs.js
index 060f2118d4..3a12aa39f2 100644
--- a/web-frontend/modules/core/middleware/pendingJobs.js
+++ b/web-frontend/modules/core/middleware/pendingJobs.js
@@ -20,21 +20,3 @@ export default defineNuxtRouteMiddleware(async () => {
     await store.dispatch('job/fetchAllUnfinished')
   }
 })
-
-/*
-Previous Nuxt 2 middleware:
-export default async function ({ req, store }) {
-  // If nuxt generate, pass this middleware
-  if (import.meta.server && !req) return
-
-  if (
-    // If the user is not authenticated we can't fetch unfinished jobs.
-    store.getters['auth/isAuthenticated'] &&
-    //  If the unfinished jobs haven't been loaded we will load them all.
-    !store.getters['job/isLoaded'] &&
-    !store.getters['job/isLoading']
-  ) {
-    await store.dispatch('job/fetchAllUnfinished')
-  }
-}
-*/
diff --git a/web-frontend/modules/core/middleware/staff.js b/web-frontend/modules/core/middleware/staff.js
index c4700c49ab..1133870cd4 100644
--- a/web-frontend/modules/core/middleware/staff.js
+++ b/web-frontend/modules/core/middleware/staff.js
@@ -15,16 +15,3 @@ export default defineNuxtRouteMiddleware(() => {
     throw createError({ statusCode: 403, message: 'Forbidden.' })
   }
 })
-
-/*
-Previous Nuxt 2 middleware:
-export default function ({ store, req, error }) {
-  // If nuxt generate, pass this middleware
-  if (import.meta.server && !req) return
-
-  // If the user is not staff we want to show a forbidden error.
-  if (!store.getters['auth/isStaff']) {
-    return error({ statusCode: 403, message: 'Forbidden.' })
-  }
-}
-*/
diff --git a/web-frontend/modules/core/middleware/workspacesAndApplications.js b/web-frontend/modules/core/middleware/workspacesAndApplications.js
index bc13e45bed..e0c4f5bf4a 100644
--- a/web-frontend/modules/core/middleware/workspacesAndApplications.js
+++ b/web-frontend/modules/core/middleware/workspacesAndApplications.js
@@ -12,68 +12,18 @@ export default defineNuxtRouteMiddleware(async (to) => {
   // If nuxt generate, pass this middleware
   if (import.meta.server && !event) return
 
-  // Prioritize workspaceId from route params if navigating to a workspace page.
-  // This ensures SSR and client select the same workspace, avoiding hydration mismatch.
-  let workspaceId = to.params.workspaceId
-    ? parseInt(to.params.workspaceId, 10)
-    : getWorkspaceCookie(nuxtApp)
+  let workspaceId = getWorkspaceCookie(nuxtApp)
 
-  // If the workspaces haven't already been selected we will
-  if (store.getters['auth/isAuthenticated']) {
-    // If the workspaces haven't been loaded we will load them all.
-    if (!store.getters['workspace/isLoaded']) {
-      await store.dispatch('workspace/fetchAll')
-
-      const workspaces = store.getters['workspace/getAll']
-      const workspaceExists =
-        workspaces.find((w) => w.id === workspaceId) !== undefined
-      if (!workspaceExists) {
-        workspaceId = null
-      }
-
-      // If no workspace was remembered, or the remembered workspace doesn't exist, we
-      // automatically select the first one if it
-      // exists.
-      if (!workspaceExists && store.getters['workspace/getAll'].length > 0) {
-        workspaceId = workspaces[0].id
-      }
-
-      // If there is a workspaceId cookie we will select that workspace.
-      if (workspaceId) {
-        try {
-          await store.dispatch('workspace/selectById', workspaceId)
-        } catch {}
-      }
-    }
-    // If the applications haven't been loaded we will also load them all.
-    if (!store.getters['application/isLoaded']) {
-      await store.dispatch('application/fetchAll')
-    }
-
-    // If the user hasn't completed the onboarding, and the doesn't have any workspaces,
-    // then redirect to the on-boarding page so that the user can create their first
-    // one.
-    const user = store.getters['auth/getUserObject']
-    const workspaces = store.getters['workspace/getAll']
-    if (!user.completed_onboarding && workspaces.length === 0) {
-      return navigateTo({ name: 'onboarding' })
+  // Prefer route param over cookie to avoid double selectById calls on SSR.
+  // Pages can opt out or change param by doing:
+  // `definePageMeta({ useRouteWorkspaceParam: 'none' }).
+  const workspaceIdParam = to.meta.useRouteWorkspaceParam ?? 'workspaceId'
+  if (to.params[workspaceIdParam]) {
+    const routeWorkspaceId = parseInt(to.params[workspaceIdParam], 10)
+    if (!isNaN(routeWorkspaceId)) {
+      workspaceId = routeWorkspaceId
     }
   }
-})
-
-/*
-Previous Nuxt 2 middleware:
-export default async function WorkspacesAndApplications({
-  store,
-  req,
-  app,
-  redirect,
-}) {
-  // If nuxt generate, pass this middleware
-  if (import.meta.server && !req) return
-
-  // Get the selected workspace id
-  let workspaceId = getWorkspaceCookie(app)
 
   // If the workspaces haven't already been selected we will
   if (store.getters['auth/isAuthenticated']) {
@@ -113,8 +63,7 @@ export default async function WorkspacesAndApplications({
     const user = store.getters['auth/getUserObject']
     const workspaces = store.getters['workspace/getAll']
     if (!user.completed_onboarding && workspaces.length === 0) {
-      return redirect({ name: 'onboarding' })
+      return navigateTo({ name: 'onboarding' })
     }
   }
-}
-*/
+})
diff --git a/web-frontend/modules/core/mixins/dropdown.js b/web-frontend/modules/core/mixins/dropdown.js
index aaee5831ab..ec1fe327e9 100644
--- a/web-frontend/modules/core/mixins/dropdown.js
+++ b/web-frontend/modules/core/mixins/dropdown.js
@@ -180,24 +180,22 @@ export default {
       fixedItemsImmutable: this.fixedItems,
       reactiveMultiple: { value: this.multiple }, // Used for provide
       isDropdown: true, // Used for dropdown items to retrieve the parent dropdown component
-      registeredDropdownItems: [], // For storing registered dropdown items
+      selectedName: this.multiple ? [] : '',
+      selectedIcon: null,
+      selectedImage: null,
       hideCleanupFunctions: [], // Store cleanup functions to call on hide
     }
   },
+  created() {
+    // Intentionally non-reactive: stores component instances which would cause
+    // performance issues if wrapped in Vue 3's Proxy reactivity system.
+    this.registeredDropdownItems = []
+  },
   computed: {
     // Support both Vue 2 (value) and Vue 3 (modelValue)
     currentValue() {
       return this.modelValue !== undefined ? this.modelValue : this.value
     },
-    selectedName() {
-      return this.getSelectedProperty(this.currentValue, 'name')
-    },
-    selectedIcon() {
-      return this.getSelectedProperty(this.currentValue, 'icon')
-    },
-    selectedImage() {
-      return this.getSelectedProperty(this.currentValue, 'image')
-    },
     realTabindex() {
       // We don't want to be able focus if the dropdown is disabled or if we have
       // opened it and the search input is currently focused
@@ -209,18 +207,12 @@ export default {
   },
   watch: {
     value() {
-      this.$nextTick(() => {
-        // When the value changes we want to forcefully reload the selectName and
-        // selectedIcon a little bit later because the children might have changed.
-        this.forceRefreshSelectedValue()
-      })
+      // Update selected display properties when value changes
+      this.forceRefreshSelectedValue()
     },
     modelValue() {
-      this.$nextTick(() => {
-        // When the value changes we want to forcefully reload the selectName and
-        // selectedIcon a little bit later because the children might have changed.
-        this.forceRefreshSelectedValue()
-      })
+      // Update selected display properties when modelValue changes
+      this.forceRefreshSelectedValue()
     },
     multiple(newValue) {
       this.reactiveMultiple.value = newValue
@@ -540,30 +532,28 @@ export default {
      * @return {boolean}
      */
     hasValue() {
-      for (const item of this.getDropdownItemComponents()) {
-        if (this.multiple) {
-          for (const value of this.currentValue) {
-            if (_.isEqual(item.value, value)) {
-              return true
-            }
-          }
-        } else if (_.isEqual(item.value, this.currentValue)) {
-          return true
-        }
+      if (this.multiple) {
+        return this.selectedName.some((name) => name !== '')
       }
-      return false
+      return (
+        this.selectedName !== '' || !!this.selectedIcon || !!this.selectedImage
+      )
+    },
+    /**
+     * Updates the selected display properties (name, icon, image) from dropdown items.
+     * Called when value changes or dropdown items are added/removed.
+     */
+    updateSelectedProperties() {
+      this.selectedName = this.getSelectedProperty(this.currentValue, 'name')
+      this.selectedIcon = this.getSelectedProperty(this.currentValue, 'icon')
+      this.selectedImage = this.getSelectedProperty(this.currentValue, 'image')
     },
     /**
-     * A nasty hack, but in some cases the dropdownItemComponents have not yet been loaded when the
-     * `selectName` and `selectIcon` are computed. This would result in an empty
-     * initial value of the Dropdown because the correct value can't be extracted from
-     * the DropdownItem. With this hack we force the computed properties to recompute
-     * when the component is mounted. At this moment the dropdownItemComponents have been added.
+     * Force refresh of selected display values. Called by watchers, mounted hook,
+     * and MutationObserver when dropdown items change.
      */
     forceRefreshSelectedValue() {
-      // TODO MIG this._computedWatchers.selectedName.run()
-      // TODO MIG this._computedWatchers.selectedIcon.run()
-      this.$forceUpdate()
+      this.updateSelectedProperties()
     },
     /**
      * Method that is called when the arrow up or arrow down key is pressed. Based on
diff --git a/web-frontend/modules/core/notificationTypes.js b/web-frontend/modules/core/notificationTypes.js
index 36a38162d7..9648f52033 100644
--- a/web-frontend/modules/core/notificationTypes.js
+++ b/web-frontend/modules/core/notificationTypes.js
@@ -44,6 +44,10 @@ export class WorkspaceInvitationCreatedNotificationType extends NotificationType
   getContentComponent() {
     return WorkspaceInvitationCreatedNotification
   }
+
+  getRoute(notificationData) {
+    return { name: 'dashboard' }
+  }
 }
 
 export class WorkspaceInvitationAcceptedNotificationType extends NotificationType {
diff --git a/web-frontend/modules/core/pages/changeEmail.vue b/web-frontend/modules/core/pages/changeEmail.vue
index 5f4af95a8b..fd9a4d3a2f 100644
--- a/web-frontend/modules/core/pages/changeEmail.vue
+++ b/web-frontend/modules/core/pages/changeEmail.vue
@@ -51,6 +51,8 @@
 </template>
 
 <script>
+import { useI18n } from 'vue-i18n'
+import { useHead } from '#app'
 import LangPicker from '@baserow/modules/core/components/LangPicker'
 import { ResponseErrorMessage } from '@baserow/modules/core/plugins/clientHandler'
 import error from '@baserow/modules/core/mixins/error'
@@ -59,18 +61,18 @@ import AuthService from '@baserow/modules/core/services/auth'
 export default {
   components: { LangPicker },
   mixins: [error],
-  layout: 'login',
+  setup() {
+    const { t } = useI18n()
+    useHead({
+      title: t('changeEmail.title'),
+    })
+  },
   data() {
     return {
       loading: false,
       success: false,
     }
   },
-  head() {
-    return {
-      title: this.$t('changeEmail.title'),
-    }
-  },
   methods: {
     async confirmEmailChange() {
       this.loading = true
diff --git a/web-frontend/modules/core/pages/resetPassword.vue b/web-frontend/modules/core/pages/resetPassword.vue
index 77e4e05a25..f6d04340c4 100644
--- a/web-frontend/modules/core/pages/resetPassword.vue
+++ b/web-frontend/modules/core/pages/resetPassword.vue
@@ -104,6 +104,8 @@
 import { sameAs } from '@vuelidate/validators'
 import { useVuelidate } from '@vuelidate/core'
 import { reactive, computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRuntimeConfig, useRouter, useHead } from '#app'
 
 import PasswordInput from '@baserow/modules/core/components/helpers/PasswordInput'
 import LangPicker from '@baserow/modules/core/components/LangPicker'
@@ -134,6 +136,22 @@ export default {
       },
     }))
 
+    const { t } = useI18n()
+    const config = useRuntimeConfig()
+    const router = useRouter()
+
+    useHead({
+      title: t('resetPassword.title'),
+      link: [
+        {
+          rel: 'canonical',
+          href:
+            config.public.publicWebFrontendUrl +
+            router.resolve({ name: 'reset-password' }).href,
+        },
+      ],
+    })
+
     return {
       v$: useVuelidate(rules, values, { $lazy: true }),
       account: values.account,
@@ -145,11 +163,6 @@ export default {
       success: false,
     }
   },
-  head() {
-    return {
-      title: this.$t('resetPassword.title'),
-    }
-  },
   computed: {
     ...mapGetters({
       settings: 'settings/get',
diff --git a/web-frontend/modules/core/pages/signup.vue b/web-frontend/modules/core/pages/signup.vue
index 45670e2708..0cd86ae2b8 100644
--- a/web-frontend/modules/core/pages/signup.vue
+++ b/web-frontend/modules/core/pages/signup.vue
@@ -68,12 +68,13 @@ import PasswordRegister from '@baserow/modules/core/components/auth/PasswordRegi
 import LangPicker from '@baserow/modules/core/components/LangPicker'
 import LoginButtons from '@baserow/modules/core/components/auth/LoginButtons'
 import LoginActions from '@baserow/modules/core/components/auth/LoginActions'
-import { EMAIL_VERIFICATION_OPTIONS } from '@baserow/modules/core/enums'
 import EmailNotVerified from '@baserow/modules/core/components/auth/EmailNotVerified.vue'
 import WorkspaceService from '@baserow/modules/core/services/workspace'
+import { EMAIL_VERIFICATION_OPTIONS } from '@baserow/modules/core/enums'
 
 definePageMeta({
   layout: 'login',
+  middleware: ['settings'],
 })
 
 const store = useStore()
diff --git a/web-frontend/modules/core/pages/verifyEmailAddress.vue b/web-frontend/modules/core/pages/verifyEmailAddress.vue
index 8901cf742d..ed19a8649d 100644
--- a/web-frontend/modules/core/pages/verifyEmailAddress.vue
+++ b/web-frontend/modules/core/pages/verifyEmailAddress.vue
@@ -20,70 +20,75 @@
   </div>
 </template>
 
-<script>
+<script setup>
+import { computed } from 'vue'
 import AuthService from '@baserow/modules/core/services/auth'
-import { setToken } from '@baserow/modules/core/utils/auth'
+import {
+  setToken,
+  setUserSessionCookie,
+} from '@baserow/modules/core/utils/auth'
 
-export default {
+definePageMeta({
   layout: 'login',
-  async asyncData({ store, params, error, app, redirect }) {
-    const { token } = params
-    try {
-      const isAuthenticated = store.getters['auth/isAuthenticated']
-      const shouldLoginUser = !isAuthenticated
-      const { data } = await AuthService(app.$client).verifyEmail(
-        token,
-        shouldLoginUser
-      )
-      if (shouldLoginUser) {
-        store.dispatch('auth/setUserData', data)
-        await setToken(app, data.refresh_token)
+})
+
+const nuxtApp = useNuxtApp()
+const { $store: store, $client } = nuxtApp
+const route = useRoute()
+const { t } = useI18n()
+
+const { data: result, error } = await useAsyncData('verify-email', async () => {
+  const token = route.params.token
+  try {
+    const isAuthenticated = store.getters['auth/isAuthenticated']
+    const { data } = await AuthService($client).verifyEmail(token)
+
+    if (!isAuthenticated) {
+      store.dispatch('auth/setUserData', data)
+      await setToken(nuxtApp, data.refresh_token)
+      await setUserSessionCookie(nuxtApp, data.user_session)
+    } else {
+      const loggedInUserEmail = store.getters['auth/getUserObject'].username
+      if (data.email !== loggedInUserEmail) {
+        return { emailMismatch: true }
       } else {
-        const loggedInUserEmail = store.getters['auth/getUserObject'].username
-        if (data.email !== loggedInUserEmail) {
-          return {
-            emailMismatchWarning: true,
-          }
-        } else {
-          store.dispatch('auth/forceUpdateUserData', {
-            user: {
-              email_verified: true,
-            },
-          })
-        }
+        store.dispatch('auth/forceUpdateUserData', {
+          user: {
+            email_verified: true,
+          },
+        })
       }
-    } catch (err) {
-      if (err.handler) {
-        const response = err.handler.response
-        if (response && response.status === 401) {
-          if (response.data?.error === 'ERROR_DEACTIVATED_USER') {
-            return error({
-              statusCode: 401,
-              message: app.i18n.t('error.disabledAccountMessage'),
-              content: '',
-            })
-          } else if (response.data?.error === 'ERROR_AUTH_PROVIDER_DISABLED') {
-            return error({
-              statusCode: 401,
-              message: app.i18n.t(
-                'verifyEmailAddress.disabledPasswordProvider'
-              ),
-              content: '',
-            })
-          }
+    }
+    return { emailMismatch: false }
+  } catch (err) {
+    if (err.handler) {
+      const response = err.handler.response
+      if (response && response.status === 401) {
+        if (response.data?.error === 'ERROR_DEACTIVATED_USER') {
+          throw createError({
+            statusCode: 401,
+            message: t('error.disabledAccountMessage'),
+          })
+        } else if (response.data?.error === 'ERROR_AUTH_PROVIDER_DISABLED') {
+          throw createError({
+            statusCode: 401,
+            message: t('verifyEmailAddress.disabledPasswordProvider'),
+          })
         }
       }
-      return error({
-        statusCode: 404,
-        message: app.i18n.t('verifyEmailAddress.invalidToken'),
-        content: '',
-      })
-    }
-  },
-  data() {
-    return {
-      emailMismatchWarning: false,
     }
-  },
+    throw createError({
+      statusCode: 404,
+      message: t('verifyEmailAddress.invalidToken'),
+    })
+  }
+})
+
+if (error.value) {
+  throw error.value
 }
+
+const emailMismatchWarning = computed(
+  () => result.value?.emailMismatch === true
+)
 </script>
diff --git a/web-frontend/modules/core/pages/workspace.vue b/web-frontend/modules/core/pages/workspace.vue
index 0c5bb74b79..c5611bf029 100644
--- a/web-frontend/modules/core/pages/workspace.vue
+++ b/web-frontend/modules/core/pages/workspace.vue
@@ -233,7 +233,13 @@ definePageMeta({
   layout: 'app',
   // Note: these middlewares must be explicitly listed because child pages
   // don't automatically inherit parent middleware in Nuxt 3's page meta
-  middleware: ['authenticated', 'workspacesAndApplications', 'impersonate'],
+  middleware: [
+    'settings',
+    'authenticated',
+    'workspacesAndApplications',
+    'impersonate',
+  ],
+  useRouteWorkspaceParam: 'test',
 })
 
 defineOptions({
diff --git a/web-frontend/modules/core/plugins/clientHandler.js b/web-frontend/modules/core/plugins/clientHandler.js
index b15335a714..53eed07561 100644
--- a/web-frontend/modules/core/plugins/clientHandler.js
+++ b/web-frontend/modules/core/plugins/clientHandler.js
@@ -574,75 +574,6 @@ const createAxiosInstance = (runtimeConfig) => {
   })
 }
 
-/*export default function ({ app, store, error }, inject) {
-  const client = createAxiosInstance(app)
-  // Create and inject the client error map, so that other modules can also register
-  // default error messages.
-  const clientErrorMap = new ClientErrorMap(app)
-  inject('clientErrorMap', clientErrorMap)
-
-  client.interceptors.request.use(prepareRequestHeaders(store))
-
-  // Create a response interceptor to add more detail to the error message
-  // and to create a toast when there is a network error.
-  client.interceptors.response.use(
-    null,
-    makeErrorResponseInterceptor(store, app, clientErrorMap, error)
-  )
-
-  // Main auth refresh token
-  const shouldInterceptRequest = () =>
-    store?.getters?.['auth/shouldRefreshToken']?.()
-
-  const shouldInterceptResponse = (error) =>
-    store?.getters?.['auth/isAuthenticated'] &&
-    error.response?.data?.error === 'ERROR_INVALID_ACCESS_TOKEN'
-
-  const refreshToken = async () => await store.dispatch('auth/refresh')
-
-  const refreshAuthInterceptor = makeRefreshAuthInterceptor(
-    client,
-    refreshToken,
-    shouldInterceptRequest,
-    shouldInterceptResponse
-  )
-  client.interceptors.response.use(null, refreshAuthInterceptor)
-
-  // User source auth refresh token (only active if it's not a double authentication)
-  const shouldInterceptUserSourceRequest = (req) => {
-    const application = store.getters['userSourceUser/getCurrentApplication']
-    return (
-      !store.getters['auth/isAuthenticated'] &&
-      store.getters['userSourceUser/shouldRefreshToken'](application)
-    )
-  }
-
-  const shouldInterceptUserSourceResponse = (error) => {
-    if (!store || !store.getters) return false
-    const application = store.getters['userSourceUser/getCurrentApplication']
-    return (
-      !store.getters['auth/isAuthenticated'] &&
-      store.getters['userSourceUser/isAuthenticated'](application) &&
-      error.response?.data?.error === 'ERROR_INVALID_ACCESS_TOKEN'
-    )
-  }
-  const refreshUserSourceToken = async () =>
-    await store.dispatch('userSourceUser/refreshAuth', {
-      application: store.getters['userSourceUser/getCurrentApplication'],
-    })
-
-  const refreshUserSourceUserInterceptor = makeRefreshAuthInterceptor(
-    client,
-    refreshUserSourceToken,
-    shouldInterceptUserSourceRequest,
-    shouldInterceptUserSourceResponse
-  )
-  client.interceptors.response.use(null, refreshUserSourceUserInterceptor)
-
-  inject('client', client)
-}
-*/
-
 export default defineNuxtPlugin({
   name: 'client-handler',
   dependsOn: ['i18n', 'create-store'],
diff --git a/web-frontend/modules/core/plugins/ensureRender.js b/web-frontend/modules/core/plugins/ensureRender.js
index a5d6fb8c58..c5e182777b 100644
--- a/web-frontend/modules/core/plugins/ensureRender.js
+++ b/web-frontend/modules/core/plugins/ensureRender.js
@@ -1,19 +1,3 @@
-/*import Vue from 'vue'
-import flushPromises from 'flush-promises'
-
-export default function (context, inject) {
-  const ensureRender = async () => {
-    // Ensure the dom is up to date
-    await Vue.nextTick()
-    // Wait until the browser has had a chance to repaint the UI
-    await new Promise((resolve) => requestAnimationFrame(resolve))
-    // And purge all promises created in the meantime
-    await flushPromises()
-  }
-  inject('ensureRender', ensureRender)
-}
-*/
-
 import flushPromises from 'flush-promises'
 import { nextTick } from 'vue'
 
diff --git a/web-frontend/modules/core/plugins/global.js b/web-frontend/modules/core/plugins/global.js
index 72fa53319d..25b22b31cf 100644
--- a/web-frontend/modules/core/plugins/global.js
+++ b/web-frontend/modules/core/plugins/global.js
@@ -1,152 +1,3 @@
-/*import Vue from 'vue'
-
-import Context from '@baserow/modules/core/components/Context'
-import Modal from '@baserow/modules/core/components/Modal'
-import Editable from '@baserow/modules/core/components/Editable'
-import Dropdown from '@baserow/modules/core/components/Dropdown'
-import DropdownSection from '@baserow/modules/core/components/DropdownSection'
-import DropdownItem from '@baserow/modules/core/components/DropdownItem'
-import Picker from '@baserow/modules/core/components/Picker'
-import ProgressBar from '@baserow/modules/core/components/ProgressBar'
-import Checkbox from '@baserow/modules/core/components/Checkbox'
-import Radio from '@baserow/modules/core/components/Radio'
-import RadioGroup from '@baserow/modules/core/components/RadioGroup'
-import RadioCard from '@baserow/modules/core/components/RadioCard'
-import Scrollbars from '@baserow/modules/core/components/Scrollbars'
-import Error from '@baserow/modules/core/components/Error'
-import SwitchInput from '@baserow/modules/core/components/SwitchInput'
-import Copied from '@baserow/modules/core/components/Copied'
-import MarkdownIt from '@baserow/modules/core/components/MarkdownIt'
-import DownloadLink from '@baserow/modules/core/components/DownloadLink'
-import FormElement from '@baserow/modules/core/components/FormElement'
-import Alert from '@baserow/modules/core/components/Alert'
-import Tabs from '@baserow/modules/core/components/Tabs'
-import Tab from '@baserow/modules/core/components/Tab'
-import List from '@baserow/modules/core/components/List'
-import HelpIcon from '@baserow/modules/core/components/HelpIcon'
-import Button from '@baserow/modules/core/components/Button'
-import ButtonText from '@baserow/modules/core/components/ButtonText'
-import ButtonAdd from '@baserow/modules/core/components/ButtonAdd'
-import ButtonIcon from '@baserow/modules/core/components/ButtonIcon'
-import ButtonFloating from '@baserow/modules/core/components/ButtonFloating'
-import Avatar from '@baserow/modules/core/components/Avatar'
-import Chips from '@baserow/modules/core/components/Chips'
-import Presentation from '@baserow/modules/core/components/Presentation'
-import FormInput from '@baserow/modules/core/components/FormInput'
-import ImageInput from '@baserow/modules/core/components/ImageInput'
-import FormTextarea from '@baserow/modules/core/components/FormTextarea'
-import CallToAction from '@baserow/modules/core/components/CallToAction.vue'
-import FormGroup from '@baserow/modules/core/components/FormGroup'
-import FormRow from '@baserow/modules/core/components/FormRow'
-import Logo from '@baserow/modules/core/components/Logo'
-import ReadOnlyForm from '@baserow/modules/core/components/ReadOnlyForm'
-import FormSection from '@baserow/modules/core/components/FormSection'
-import SegmentControl from '@baserow/modules/core/components/SegmentControl'
-
-import lowercase from '@baserow/modules/core/filters/lowercase'
-import uppercase from '@baserow/modules/core/filters/uppercase'
-import nameAbbreviation from '@baserow/modules/core/filters/nameAbbreviation'
-
-import scroll from '@baserow/modules/core/directives/scroll'
-import preventParentScroll from '@baserow/modules/core/directives/preventParentScroll'
-import tooltip from '@baserow/modules/core/directives/tooltip'
-import sortable from '@baserow/modules/core/directives/sortable'
-import autoOverflowScroll from '@baserow/modules/core/directives/autoOverflowScroll'
-import userFileUpload from '@baserow/modules/core/directives/userFileUpload'
-import autoScroll from '@baserow/modules/core/directives/autoScroll'
-import clickOutside from '@baserow/modules/core/directives/clickOutside'
-import Badge from '@baserow/modules/core/components/Badge'
-import BadgeCollaborator from '@baserow/modules/core/components/BadgeCollaborator'
-import Expandable from '@baserow/modules/core/components/Expandable.vue'
-import RadioButton from '@baserow/modules/core/components/RadioButton'
-import Thumbnail from '@baserow/modules/core/components/Thumbnail'
-import ColorInput from '@baserow/modules/core/components/ColorInput'
-import SelectSearch from '@baserow/modules/core/components/SelectSearch'
-import SwitchButton from '@baserow/modules/core/components/SwitchButton'
-import Icon from '@baserow/modules/core/components/Icon'
-
-function setupVue(Vue) {
-  Vue.component('Context', Context)
-  Vue.component('Modal', Modal)
-  Vue.component('Editable', Editable)
-  Vue.component('Dropdown', Dropdown)
-  Vue.component('DropdownSection', DropdownSection)
-  Vue.component('DropdownItem', DropdownItem)
-  Vue.component('Checkbox', Checkbox)
-  Vue.component('Radio', Radio)
-  Vue.component('RadioGroup', RadioGroup)
-  Vue.component('RadioCard', RadioCard)
-  Vue.component('Scrollbars', Scrollbars)
-  Vue.component('Alert', Alert)
-  Vue.component('Error', Error)
-  Vue.component('SwitchInput', SwitchInput)
-  Vue.component('Copied', Copied)
-  Vue.component('MarkdownIt', MarkdownIt)
-  Vue.component('DownloadLink', DownloadLink)
-  Vue.component('FormElement', FormElement)
-  Vue.component('Picker', Picker)
-  Vue.component('ProgressBar', ProgressBar)
-  Vue.component('Tab', Tab)
-  Vue.component('Tabs', Tabs)
-  Vue.component('List', List)
-  Vue.component('HelpIcon', HelpIcon)
-  Vue.component('Badge', Badge)
-  Vue.component('BadgeCollaborator', BadgeCollaborator)
-  Vue.component('Expandable', Expandable)
-  Vue.component('Button', Button)
-  Vue.component('ButtonText', ButtonText)
-  Vue.component('ButtonFloating', ButtonFloating)
-  Vue.component('ButtonAdd', ButtonAdd)
-  Vue.component('ButtonIcon', ButtonIcon)
-  Vue.component('Chips', Chips)
-  Vue.component('RadioButton', RadioButton)
-  Vue.component('Thumbnail', Thumbnail)
-  Vue.component('Avatar', Avatar)
-  Vue.component('Presentation', Presentation)
-  Vue.component('FormInput', FormInput)
-  Vue.component('FormTextarea', FormTextarea)
-  Vue.component('CallToAction', CallToAction)
-  Vue.component('FormGroup', FormGroup)
-  Vue.component('FormRow', FormRow)
-  Vue.component('ColorInput', ColorInput)
-  Vue.component('ImageInput', ImageInput)
-  Vue.component('SelectSearch', SelectSearch)
-  Vue.component('Logo', Logo)
-  Vue.component('ReadOnlyForm', ReadOnlyForm)
-  Vue.component('FormSection', FormSection)
-  Vue.component('SegmentControl', SegmentControl)
-  Vue.component('SwitchButton', SwitchButton)
-  Vue.component('Icon', Icon)
-
-  Vue.filter('lowercase', lowercase)
-  Vue.filter('uppercase', uppercase)
-  Vue.filter('nameAbbreviation', nameAbbreviation)
-
-  Vue.directive('scroll', scroll)
-  Vue.directive('preventParentScroll', preventParentScroll)
-  Vue.directive('tooltip', tooltip)
-  Vue.directive('sortable', sortable)
-  Vue.directive('autoOverflowScroll', autoOverflowScroll)
-  Vue.directive('userFileUpload', userFileUpload)
-  Vue.directive('autoScroll', autoScroll)
-  Vue.directive('clickOutside', clickOutside)
-
-  Vue.prototype.$super = function (options) {
-    return new Proxy(options, {
-      get: (options, name) => {
-        if (options.methods && name in options.methods) {
-          return options.methods[name].bind(this)
-        }
-      },
-    })
-  }
-}
-
-setupVue(Vue)
-
-export { setupVue }
-*/
-
 import Alert from '@baserow/modules/core/components/Alert'
 import Avatar from '@baserow/modules/core/components/Avatar'
 import Badge from '@baserow/modules/core/components/Badge'
diff --git a/web-frontend/modules/core/plugins/hasFeature.js b/web-frontend/modules/core/plugins/hasFeature.js
index 3c05834521..367674ad5d 100644
--- a/web-frontend/modules/core/plugins/hasFeature.js
+++ b/web-frontend/modules/core/plugins/hasFeature.js
@@ -1,14 +1,3 @@
-/*export default function ({ app }, inject) {
-  const { $registry } = app
-  function hasFeature(feature, forSpecificWorkspace) {
-    return Object.values($registry.getAll('plugin')).some((p) =>
-      p.hasFeature(feature, forSpecificWorkspace)
-    )
-  }
-  inject('hasFeature', hasFeature)
-}
-*/
-
 export default defineNuxtPlugin((nuxtApp) => {
   const hasFeature = (feature, forSpecificWorkspace) =>
     Object.values(nuxtApp.$registry.getAll('plugin')).some((plugin) =>
diff --git a/web-frontend/modules/core/plugins/i18n.js b/web-frontend/modules/core/plugins/i18n.js
index bdac3747b9..0745ea13d0 100644
--- a/web-frontend/modules/core/plugins/i18n.js
+++ b/web-frontend/modules/core/plugins/i18n.js
@@ -1,16 +1,3 @@
-/*import moment from '@baserow/modules/core/moment'
-
-export default function ({ app }) {
-  // Set moment locale on load
-  moment.locale(app.i18n.locale)
-
-  app.i18n.onLanguageSwitched = (oldLocale, newLocale) => {
-    // Update moment locale on language switch
-    moment.locale(newLocale)
-  }
-}
-*/
-
 import moment from '@baserow/modules/core/moment'
 
 export default defineNuxtPlugin({
diff --git a/web-frontend/modules/core/plugins/papa.js b/web-frontend/modules/core/plugins/papa.js
index efc3ca98dd..eb645f04d7 100644
--- a/web-frontend/modules/core/plugins/papa.js
+++ b/web-frontend/modules/core/plugins/papa.js
@@ -1,21 +1,3 @@
-/*import Papa from 'papaparse'
-
-export default function (context, inject) {
-  Papa.parsePromise = function (file, config = {}) {
-    return new Promise((resolve, reject) => {
-      Papa.parse(file, { complete: resolve, error: reject, ...config })
-    })
-  }
-  Papa.arrayToString = (array) => {
-    return Papa.unparse([array])
-  }
-  Papa.stringToArray = (str) => {
-    return Papa.parse(str).data[0]
-  }
-  inject('papa', Papa)
-}
-*/
-
 import Papa from 'papaparse'
 
 export default defineNuxtPlugin((nuxtApp) => {
diff --git a/web-frontend/modules/core/plugins/permissions.js b/web-frontend/modules/core/plugins/permissions.js
index 19de99ef66..0b25a0fbe5 100644
--- a/web-frontend/modules/core/plugins/permissions.js
+++ b/web-frontend/modules/core/plugins/permissions.js
@@ -1,57 +1,3 @@
-/*export default function ({ app }, inject) {
-  /**
-   * Check the permission for the given operation with the given context.
-   *
-   * This function uses all the registered permissions to check the permission.
-   * @param {string} operation
-   * @param {object} context
-   * @param {number|null} workspaceId
-   * @returns True if the operation is permitted, false otherwise.
-   *\/
-  const hasPermission = (operation, context, workspaceId = null) => {
-    const { store, $registry } = app
-
-    let perms = []
-
-    // If we receive a null `workspaceId`, then we're testing an operation
-    // that is outside the scope of a workspace, so we'll need to use the
-    // user's permissions for our `perms`.
-    if (workspaceId === null) {
-      perms = store.getters['auth/getGlobalUserPermissions']
-    } else {
-      // If we receive a `workspaceId`, then we can use the
-      // permissions which are specific to this workspace.
-      const workspace = store.getters['workspace/get'](workspaceId)
-      // If the workspace is not found
-      // it might be a template so we return the global perms.
-      if (workspace === undefined || !workspace._.permissionsLoaded) {
-        perms = store.getters['auth/getGlobalUserPermissions']
-      } else {
-        perms = workspace._.permissions
-      }
-    }
-
-    // Check all permission managers whether one accepts or refuses the operation
-    for (const perm of perms) {
-      const { name, permissions } = perm
-      const manager = $registry.get('permissionManager', name)
-      const result = manager.hasPermission(
-        permissions,
-        operation,
-        context,
-        workspaceId
-      )
-
-      if ([true, false].includes(result)) {
-        return result
-      }
-    }
-    return false
-  }
-  inject('hasPermission', hasPermission)
-}
-*/
-
 const alreadyWarned = new Set()
 
 export default defineNuxtPlugin({
diff --git a/web-frontend/modules/core/plugins/posthog.js b/web-frontend/modules/core/plugins/posthog.js
index 711f2aa875..f3d81d8fb8 100644
--- a/web-frontend/modules/core/plugins/posthog.js
+++ b/web-frontend/modules/core/plugins/posthog.js
@@ -1,60 +1,3 @@
-/*// eslint-disable-next-line import/no-named-as-default
-import posthog from 'posthog-js'
-import Vue from 'vue'
-
-export default function ({ app: { router, $config, store } }, inject) {
-  const projectApiKey = $config.POSTHOG_PROJECT_API_KEY
-  const host = $config.POSTHOG_HOST
-
-  if (!import.meta.client || (!projectApiKey && !host)) {
-    return
-  }
-
-  posthog.init(projectApiKey, {
-    api_host: host,
-    capture_pageview: false,
-    capture_pageleave: false,
-    disable_session_recording: true,
-    autocapture: {
-      css_selector_allowlist: ['[ph-autocapture]'],
-    },
-  })
-
-  inject('posthog', posthog)
-
-  router.afterEach((to) => {
-    Vue.nextTick(() => {
-      const isAuthenticated = store.getters['auth/isAuthenticated']
-      const userId = store.getters['auth/getUserId']
-      const userEmail = store.getters['auth/getUsername']
-
-      // Check if the user identification on every page route because they could
-      // have changed accounts. This keeps the Posthog code isolated from the
-      // authenticated system.
-      if (
-        isAuthenticated &&
-        userId &&
-        userId.toString() !== posthog.get_distinct_id()
-      ) {
-        posthog.identify(userId, { user_email: userEmail })
-      }
-
-      // Some pages must not be tracked like the ones that can expose a sensitive token.
-      const preventTracking = !!to.meta.preventPageViewTracking
-      if (preventTracking) {
-        return
-      }
-
-      // Note: this might also be a good place to call posthog.register(...) in
-      // order to update your properties on each page view
-      posthog.capture('$pageview', {
-        $current_url: `${window.location.origin}${to.fullPath}`,
-      })
-    })
-  })
-}
-*/
-
 import posthog from 'posthog-js'
 import { nextTick } from 'vue'
 import { useNuxtApp, useRouter, useRuntimeConfig } from '#imports'
diff --git a/web-frontend/modules/core/plugins/priorityBus.js b/web-frontend/modules/core/plugins/priorityBus.js
index d2f7efd43e..82f776ff09 100644
--- a/web-frontend/modules/core/plugins/priorityBus.js
+++ b/web-frontend/modules/core/plugins/priorityBus.js
@@ -1,19 +1,3 @@
-/**
- * Priority bus is a bus with the same API as $bus but with
- * the ability to specify a priority for the callback.
- *
- * This makes it possible to register multiple callbacks such as
- * "start search" callbacks and invoke only one based on its priority.
- */
-
-/*
-  Tracking global list of listeners per event.
-
-  'event': [{
-    priority: Number, (preference given to higher)
-    callback: Function,
-  }]
-*/
 const listeners = {}
 
 const priorityBus = {
diff --git a/web-frontend/modules/core/plugins/routeMounted.js b/web-frontend/modules/core/plugins/routeMounted.js
index 37fdcab49c..0a5728d116 100644
--- a/web-frontend/modules/core/plugins/routeMounted.js
+++ b/web-frontend/modules/core/plugins/routeMounted.js
@@ -1,36 +1,3 @@
-/*import Vue from 'vue'
-
-/**
- * This is a global mixin that's registered for every component. The purpose is to
- * bind to the `mounted` hook and set the related route to the `routeMounted` store.
- * This is used so that there is a reactive state of the mounted route. It can be
- * used by any other process to reactively check if a route has fully loaded and is
- * mounted, which can be needed if it depends on DOM elements to be rendered.
- *\/
-Vue.mixin({
-  mounted() {
-    if (
-      this.$route &&
-      // Skip components that don't have a layout because those are not Nuxt pages.
-      this.$options.layout !== undefined
-    ) {
-      this.$store.commit('routeMounted/SET_ROUTE_MOUNTED', {
-        mounted: true,
-        route: this.$route,
-      })
-    }
-  },
-  beforeDestroy() {
-    if (this.$route && this.$options.layout !== undefined) {
-      this.$store.commit('routeMounted/SET_ROUTE_MOUNTED', {
-        mounted: false,
-        route: null,
-      })
-    }
-  },
-})
-*/
-
 /**
  * This is a global mixin that's registered for every component. The purpose is to
  * bind to the `mounted` hook and set the related route to the `routeMounted` store.
diff --git a/web-frontend/modules/core/plugins/router.js b/web-frontend/modules/core/plugins/router.js
index 3e3683e831..ab04437131 100644
--- a/web-frontend/modules/core/plugins/router.js
+++ b/web-frontend/modules/core/plugins/router.js
@@ -1,26 +1,3 @@
-/*import VueRouter from 'vue-router'
-
-export default function ({ app }) {
-  const originalPush = app.router.push
-
-  app.router.push = async function push(...args) {
-    try {
-      return await originalPush.call(this, ...args)
-    } catch (error) {
-      // When navigating to a page, it can happen that it redirects to another one.
-      // For some reason, this is causing the router throw an error. In our case, it's
-      // perfectly fine, so we're suppressing this error here. More information:
-      // https://stackoverflow.com/questions/62223195/vue-router-uncaught-in-promise-
-      // error-redirected-from-login-to-via-a
-      const { isNavigationFailure, NavigationFailureType } = VueRouter
-      if (!isNavigationFailure(error, NavigationFailureType.redirected)) {
-        throw error
-      }
-    }
-  }
-}
-*/
-
 import { useRouter } from '#app'
 import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
diff --git a/web-frontend/modules/core/plugins/store.js b/web-frontend/modules/core/plugins/store.js
index 1c2329057a..b5006d788d 100644
--- a/web-frontend/modules/core/plugins/store.js
+++ b/web-frontend/modules/core/plugins/store.js
@@ -18,7 +18,6 @@ import integrationStoreModule from '../store/integration'
 export default defineNuxtPlugin({
   name: 'create-store',
   async setup(nuxtApp) {
-    // TODO MIG check this is not executed twice
     const store = createStore({
       modules: {
         undoRedo: undoRedoStoreModule,
diff --git a/web-frontend/modules/core/plugins/version.js b/web-frontend/modules/core/plugins/version.js
index eeadb3cced..8b51538613 100644
--- a/web-frontend/modules/core/plugins/version.js
+++ b/web-frontend/modules/core/plugins/version.js
@@ -1,10 +1,3 @@
-/*const pkg = require('../package.json')
-
-export default (context, inject) => {
-  inject('baserowVersion', pkg.version)
-}
-*/
-
 import pkg from '../../../package.json'
 
 export default defineNuxtPlugin((nuxtApp) => {
diff --git a/web-frontend/modules/core/plugins/vue2-smooth-scroll.js b/web-frontend/modules/core/plugins/vue2-smooth-scroll.js
index e82dab3ad3..6a53ded984 100644
--- a/web-frontend/modules/core/plugins/vue2-smooth-scroll.js
+++ b/web-frontend/modules/core/plugins/vue2-smooth-scroll.js
@@ -1,9 +1,3 @@
-/*import Vue from 'vue'
-import VueSmoothScroll from 'vue2-smooth-scroll'
-
-Vue.use(VueSmoothScroll)
-*/
-
 import VueSmoothScroll from 'vue2-smooth-scroll'
 
 export default defineNuxtPlugin((nuxtApp) => {
diff --git a/web-frontend/modules/core/plugins/vueDatepicker.js b/web-frontend/modules/core/plugins/vueDatepicker.js
index 1f9c3aecf9..bf1b079c65 100644
--- a/web-frontend/modules/core/plugins/vueDatepicker.js
+++ b/web-frontend/modules/core/plugins/vueDatepicker.js
@@ -1,11 +1,3 @@
-/*import Vue from 'vue'
-import Datepicker from 'vuejs-datepicker'
-
-Vue.component('DatePicker', Datepicker)
-*/
-
-//import Datepicker from 'vuejs3-datepicker'
-
 export default defineNuxtPlugin((nuxtApp) => {
   const Datepicker = defineAsyncComponent(() => import('vuejs3-datepicker'))
   nuxtApp.vueApp.component('DatePicker', Datepicker)
diff --git a/web-frontend/modules/core/routes.js b/web-frontend/modules/core/routes.js
index 412556f34b..28dca233f0 100644
--- a/web-frontend/modules/core/routes.js
+++ b/web-frontend/modules/core/routes.js
@@ -45,7 +45,7 @@ export const routes = [
       {
         name: 'change-email',
         path: '/change-email/:token',
-        component: path.resolve(__dirname, 'pages/changeEmail.vue'),
+        file: path.resolve(__dirname, 'pages/changeEmail.vue'),
         meta: { preventPageViewTracking: true },
       },
       {
diff --git a/web-frontend/modules/core/utils/object.js b/web-frontend/modules/core/utils/object.js
index 2570f8c66b..ba6095b0ee 100644
--- a/web-frontend/modules/core/utils/object.js
+++ b/web-frontend/modules/core/utils/object.js
@@ -151,7 +151,6 @@ export function getValueAtPath(context, path) {
 /**
  * Deeply sets a value in an object (or array) from a dotted path string.
  * Creates any missing intermediate parts if necessary.
- * TODO MIG Use Vue.set to keep reactivity.
  *
  * @param {Object} obj - The object we want to update.
  * @param {String} path - The path, delimited by periods, to the value.
@@ -169,43 +168,14 @@ export function setValueAtPath(obj, path, value) {
     // If we are at the last key, set the value
     if (i === keys.length - 1) {
       current[key] = value
-      // Vue.set(current, key, value)
     } else {
       // If the key does not exist or is not an object, create an empty object or array
       if (!(key in current) || typeof current[key] !== 'object') {
         // Check if the next key is a number to decide between object or array
         current[key] = isNaN(keys[i + 1]) ? {} : []
-        //Vue.set(current, key, isNaN(keys[i + 1]) ? {} : [])
       }
       // Move to the next level in the object
       current = current[key]
     }
   }
 }
-
-/**
- * Uses Object.defineProperty to make Vue provide/inject reactive.
- *
- * @param staticProperties The original object
- * @param reactiveProperties An object containing the properties and values to
- *                           become reactive
- * @return {object} The original object with the updated properties
- * @see https://stackoverflow.com/questions/65718651/how-do-i-make-vue-2-provide-inject-api-reactive
- *
- * @example
- * const obj = { a: "A", b: "B" }
- * fixPropertyReactivityForProvide(obj, { c: () => "C" }
- * console.log(obj.c) // "c" property is now reactive and will return "C"
- */
-export function fixPropertyReactivityForProvide(
-  staticProperties,
-  reactiveProperties
-) {
-  Object.entries(reactiveProperties).forEach(([propertyName, getValue]) => {
-    Object.defineProperty(staticProperties, propertyName, {
-      enumerable: true,
-      get: () => getValue(),
-    })
-  })
-  return staticProperties
-}
diff --git a/web-frontend/modules/database/components/docs/APIDocsFiltersBuilderModal.vue b/web-frontend/modules/database/components/docs/APIDocsFiltersBuilderModal.vue
index 130d47efa7..a21bbfc2e0 100644
--- a/web-frontend/modules/database/components/docs/APIDocsFiltersBuilderModal.vue
+++ b/web-frontend/modules/database/components/docs/APIDocsFiltersBuilderModal.vue
@@ -121,14 +121,8 @@ export default {
     },
   },
   data() {
-    const view = populateView({
-      type: GridViewType.getType(),
-      filters: [this.getNewFilterObject(null)],
-      filter_groups: [],
-      filter_type: 'AND',
-    })
     return {
-      view,
+      view: null,
       mutableUserFieldNames: this.userFieldNames,
     }
   },
@@ -167,6 +161,17 @@ export default {
       return params + 'filters=' + encodeURIComponent(this.JSONFilters)
     },
   },
+  created() {
+    this.view = populateView(
+      {
+        type: GridViewType.getType(),
+        filters: [this.getNewFilterObject(null)],
+        filter_groups: [],
+        filter_type: 'AND',
+      },
+      this.$registry
+    )
+  },
   methods: {
     uuid,
     copyToClipboard,
diff --git a/web-frontend/modules/database/components/export/ExportTableModal.vue b/web-frontend/modules/database/components/export/ExportTableModal.vue
index 53fa2fd812..e5f6cf33ef 100644
--- a/web-frontend/modules/database/components/export/ExportTableModal.vue
+++ b/web-frontend/modules/database/components/export/ExportTableModal.vue
@@ -125,7 +125,7 @@ export default {
         const { data: viewsData } = await ViewService(this.$client).fetchAll(
           this.table.id
         )
-        viewsData.forEach((v) => populateView(v))
+        viewsData.forEach((v) => populateView(v, this.$registry))
         this.views = viewsData
       } catch (error) {
         this.handleError(error, 'views')
diff --git a/web-frontend/modules/database/components/field/FieldSelectOptionsDropdown.vue b/web-frontend/modules/database/components/field/FieldSelectOptionsDropdown.vue
index 7d89adb71e..e2c0107160 100644
--- a/web-frontend/modules/database/components/field/FieldSelectOptionsDropdown.vue
+++ b/web-frontend/modules/database/components/field/FieldSelectOptionsDropdown.vue
@@ -137,22 +137,17 @@ export default {
   data() {
     return {
       createOptionLoading: false,
-      selectedColorRefreshKey: 0,
+      selectedColor: null,
     }
   },
   computed: {
     canCreateOption() {
       return this.allowCreateOption && this.query !== '' && !this.hasItems
     },
-    selectedColor() {
-      this.selectedColorRefreshKey
-      // Adds a dependency to this variable I guess. Is this the best way???
-      return this.getSelectedProperty(this.value, 'color')
-    },
   },
   methods: {
     forceRefreshSelectedValue() {
-      this.selectedColorRefreshKey++
+      this.selectedColor = this.getSelectedProperty(this.value, 'color')
       dropdown.methods.forceRefreshSelectedValue.call(this)
     },
     createOption(value) {
diff --git a/web-frontend/modules/database/components/onboarding/DatabaseTablePreview.vue b/web-frontend/modules/database/components/onboarding/DatabaseTablePreview.vue
index 881148b7be..1223883b7c 100644
--- a/web-frontend/modules/database/components/onboarding/DatabaseTablePreview.vue
+++ b/web-frontend/modules/database/components/onboarding/DatabaseTablePreview.vue
@@ -94,28 +94,31 @@ export default {
       return instances
     },
     views() {
-      const gridView1 = populateView({
-        id: 0,
-        table_id: this.table.id,
-        name: 'Grid',
-        order: 1,
-        type: GridViewType.getType(),
-        table: this.table,
-        filter_type: 'AND',
-        filters: [],
-        filter_groups: [],
-        sortings: [],
-        group_bys: [],
-        decorations: [],
-        filters_disabled: false,
-        public_view_has_password: false,
-        show_logo: true,
-        ownership_type: CollaborativeViewOwnershipType.getType(),
-        owned_by_id: null,
-        row_identifier_type: 'id',
-        public: false,
-        slug: '',
-      })
+      const gridView1 = populateView(
+        {
+          id: 0,
+          table_id: this.table.id,
+          name: 'Grid',
+          order: 1,
+          type: GridViewType.getType(),
+          table: this.table,
+          filter_type: 'AND',
+          filters: [],
+          filter_groups: [],
+          sortings: [],
+          group_bys: [],
+          decorations: [],
+          filters_disabled: false,
+          public_view_has_password: false,
+          show_logo: true,
+          ownership_type: CollaborativeViewOwnershipType.getType(),
+          owned_by_id: null,
+          row_identifier_type: 'id',
+          public: false,
+          slug: '',
+        },
+        this.$registry
+      )
       return [gridView1]
     },
     view() {
diff --git a/web-frontend/modules/database/components/row/RowCreateModal.vue b/web-frontend/modules/database/components/row/RowCreateModal.vue
index a7a3e48318..e09927e213 100644
--- a/web-frontend/modules/database/components/row/RowCreateModal.vue
+++ b/web-frontend/modules/database/components/row/RowCreateModal.vue
@@ -67,7 +67,6 @@
 </template>
 
 <script>
-// TODO MIG import Vue from 'vue'
 import modal from '@baserow/modules/core/mixins/modal'
 import error from '@baserow/modules/core/mixins/error'
 import RowEditModalFieldsList from './RowEditModalFieldsList.vue'
@@ -183,7 +182,6 @@ export default {
       })
       Object.assign(row, defaults)
       this.row = row
-      //Vue.set(this, 'row', row)
       return modal.methods.show.call(this, ...args)
     },
     update(event) {
diff --git a/web-frontend/modules/database/components/row/RowEditFieldDate.vue b/web-frontend/modules/database/components/row/RowEditFieldDate.vue
index 929206aa60..d2800a881b 100644
--- a/web-frontend/modules/database/components/row/RowEditFieldDate.vue
+++ b/web-frontend/modules/database/components/row/RowEditFieldDate.vue
@@ -80,20 +80,10 @@ import TimeSelectContext from '@baserow/modules/core/components/TimeSelectContex
 import rowEditField from '@baserow/modules/database/mixins/rowEditField'
 import rowEditFieldInput from '@baserow/modules/database/mixins/rowEditFieldInput'
 import dateField from '@baserow/modules/database/mixins/dateField'
-// import { en, fr } from 'vuejs-datepicker/dist/locale'
-// TODO MIG
 
 export default {
   components: { TimeSelectContext },
   mixins: [rowEditField, rowEditFieldInput, dateField],
-  data() {
-    return {
-      datePickerLang: {
-        en: {},
-        fr: {},
-      },
-    }
-  },
   methods: {
     focus(...args) {
       this.select()
diff --git a/web-frontend/modules/database/components/sidebar/SidebarItem.vue b/web-frontend/modules/database/components/sidebar/SidebarItem.vue
index 96ba639fdb..9aec38fece 100644
--- a/web-frontend/modules/database/components/sidebar/SidebarItem.vue
+++ b/web-frontend/modules/database/components/sidebar/SidebarItem.vue
@@ -305,18 +305,26 @@ export default {
       })
     },
     async selectTable(database, table) {
+      if (table._.selected) {
+        return
+      }
+
       this.setLoading(database, true)
 
       try {
-        await this.$router.push({
+        // Vue Router 4: push() resolves to undefined on success, or a
+        // NavigationFailure on failure (e.g. duplicate navigation).
+        const failure = await this.$router.push({
           name: 'database-table',
           params: {
             databaseId: database.id,
             tableId: table.id,
           },
         })
-        await pageFinished()
-        await nextTick()
+        if (failure === undefined) {
+          await pageFinished()
+          await nextTick()
+        }
       } finally {
         this.setLoading(database, false)
       }
diff --git a/web-frontend/modules/database/components/table/TableTemplate.vue b/web-frontend/modules/database/components/table/TableTemplate.vue
index 39b9697ed4..02cdb98566 100644
--- a/web-frontend/modules/database/components/table/TableTemplate.vue
+++ b/web-frontend/modules/database/components/table/TableTemplate.vue
@@ -97,7 +97,7 @@ export default {
             true
           )
           viewsData.forEach((part, index, d) => {
-            populateView(viewsData[index])
+            populateView(viewsData[index], this.$registry)
           })
           this.views = viewsData
 
diff --git a/web-frontend/modules/database/components/view/ShareViewLink.vue b/web-frontend/modules/database/components/view/ShareViewLink.vue
index 6d55f4cebe..ec0abbaceb 100644
--- a/web-frontend/modules/database/components/view/ShareViewLink.vue
+++ b/web-frontend/modules/database/components/view/ShareViewLink.vue
@@ -109,7 +109,7 @@
                     @input="toggleShareViewPassword"
                   >
                     <i
-                      class="view-sharing__option-icon"
+                      class="switch__icon view-sharing__option-icon"
                       :class="[
                         view.public_view_has_password
                           ? 'iconoir-lock'
diff --git a/web-frontend/modules/database/components/view/grid/fields/GridViewFieldRichText.vue b/web-frontend/modules/database/components/view/grid/fields/GridViewFieldRichText.vue
index 2d9002b156..5122889afe 100644
--- a/web-frontend/modules/database/components/view/grid/fields/GridViewFieldRichText.vue
+++ b/web-frontend/modules/database/components/view/grid/fields/GridViewFieldRichText.vue
@@ -28,6 +28,7 @@
       :enable-rich-text-formatting="true"
       :mentionable-users="workspace ? workspace.users : null"
       :thin-scrollbar="true"
+      :menu-container="getMenuContainer"
     />
     <i
       v-if="editing && !isModalOpen()"
@@ -86,6 +87,9 @@ export default {
     },
   },
   methods: {
+    getMenuContainer() {
+      return document.body
+    },
     isModalOpen() {
       return this.$refs.expandedModal?.isOpen()
     },
diff --git a/web-frontend/modules/database/pages/table.vue b/web-frontend/modules/database/pages/table.vue
index 97bebb8c1a..94f7969603 100644
--- a/web-frontend/modules/database/pages/table.vue
+++ b/web-frontend/modules/database/pages/table.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="database && table">
-    <DefaultErrorPage v-if="dataError && !view" :error="dataError" />
+    <DefaultErrorPage v-if="dataError && !view?.id" :error="dataError" />
 
     <Table
       v-else
@@ -202,7 +202,8 @@ const dataError = computed(() => data.value?.error)
  */
 useHead(() => ({
   title:
-    (view.value ? view.value.name + ' - ' : '') + (table.value?.name ?? ''),
+    (view.value?.name ? view.value.name + ' - ' : '') +
+    (table.value?.name ?? ''),
 }))
 
 /**
diff --git a/web-frontend/modules/database/store/view.js b/web-frontend/modules/database/store/view.js
index 2ee816299f..86ecf06cd9 100644
--- a/web-frontend/modules/database/store/view.js
+++ b/web-frontend/modules/database/store/view.js
@@ -52,9 +52,8 @@ export function populateDecoration(decoration) {
   return decoration
 }
 
-export function populateView(view) {
-  const { $registry } = useNuxtApp()
-  const type = $registry.get('view', view.type)
+export function populateView(view, registry) {
+  const type = registry.get('view', view.type)
 
   view._ = view._ || {
     type: type.serialize(),
@@ -132,12 +131,12 @@ export const mutations = {
     if (!state.items.some((existingItem) => existingItem.id === item.id))
       state.items = [...state.items, item].sort((a, b) => a.order - b.order)
   },
-  UPDATE_ITEM(state, { id, view, values, repopulate, readOnly }) {
+  UPDATE_ITEM(state, { id, view, values, repopulate, readOnly, registry }) {
     if (!readOnly) {
       const index = state.items.findIndex((item) => item.id === id)
       Object.assign(state.items[index], state.items[index], values)
       if (repopulate === true) {
-        populateView(state.items[index])
+        populateView(state.items[index], registry)
       }
     } else {
       Object.assign(view, view, values)
@@ -334,7 +333,7 @@ export const actions = {
    * selects a different table.
    */
   async fetchAll({ commit, getters, dispatch, state }, table) {
-    const { $client } = this
+    const { $client, $registry } = this
     commit('SET_LOADING', true)
     commit('UNSELECT', {})
 
@@ -347,7 +346,7 @@ export const actions = {
         true
       )
       data.forEach((part, index, d) => {
-        populateView(data[index])
+        populateView(data[index], $registry)
       })
       commit('SET_ITEMS', data)
       commit('SET_LOADING', false)
@@ -360,7 +359,6 @@ export const actions = {
     } catch (error) {
       commit('SET_ITEMS', [])
       commit('SET_LOADING', false)
-
       throw error
     }
   },
@@ -394,7 +392,8 @@ export const actions = {
    * Forcefully create a new view without making a request to the server.
    */
   forceCreate({ commit }, { data }) {
-    populateView(data)
+    const { $registry } = this
+    populateView(data, $registry)
     commit('ADD_ITEM', data)
     return { view: data }
   },
@@ -411,7 +410,7 @@ export const actions = {
       optimisticUpdate = true,
     }
   ) {
-    const { $client } = this
+    const { $client, $registry } = this
     commit('SET_ITEM_LOADING', { view, value: true })
     const oldValues = {}
     const newValues = {}
@@ -445,6 +444,7 @@ export const actions = {
         values: newValues,
         repopulate: true,
         readOnly,
+        registry: $registry,
       })
     }
     try {
@@ -460,7 +460,12 @@ export const actions = {
         const newValues = (await ViewService($client).update(view.id, values))
           .data
         if (refreshFromFetch || !optimisticUpdate) {
-          dispatch('forceUpdate', { view, values: newValues, repopulate: true })
+          dispatch('forceUpdate', {
+            view,
+            values: newValues,
+            repopulate: true,
+            registry: $registry,
+          })
         }
 
         updatePublicViewHasPassword()
@@ -491,7 +496,7 @@ export const actions = {
    */
   forceUpdate(
     { commit },
-    { view, values, repopulate = false, readOnly = false }
+    { view, values, repopulate = false, readOnly = false, registry = null }
   ) {
     commit('UPDATE_ITEM', {
       id: view.id,
@@ -499,13 +504,14 @@ export const actions = {
       values,
       repopulate,
       readOnly,
+      registry: registry || (repopulate ? this.$registry : null),
     })
   },
   /**
    * Duplicates an existing view.
    */
   async duplicate({ commit, dispatch }, view) {
-    const { $registry, $client } = this
+    const { $client } = this
     const { data } = await ViewService($client).duplicate(view.id)
     await dispatch('forceCreate', { data })
     return data
diff --git a/web-frontend/modules/database/store/view/grid.js b/web-frontend/modules/database/store/view/grid.js
index 4e461804e6..82f3ff24e7 100644
--- a/web-frontend/modules/database/store/view/grid.js
+++ b/web-frontend/modules/database/store/view/grid.js
@@ -1,4 +1,3 @@
-// TODO MIG import Vue from 'vue'
 import axios from 'axios'
 import _ from 'lodash'
 import BigNumber from 'bignumber.js'
@@ -353,7 +352,6 @@ export const mutations = {
           }
         })
       } else {
-        // Vue.set(state.fieldOptions, key, fieldOptions[key])
         state.fieldOptions[key] = fieldOptions[key]
       }
     })
@@ -363,7 +361,6 @@ export const mutations = {
       const exists = Object.prototype.hasOwnProperty.call(fieldOptions, key)
       if (!exists) {
         delete state.fieldOptions[key]
-        // Vue.delete(state.fieldOptions, key)
       }
     })
   },
@@ -379,7 +376,6 @@ export const mutations = {
   DELETE_FIELD_OPTIONS(state, fieldId) {
     if (Object.prototype.hasOwnProperty.call(state.fieldOptions, fieldId)) {
       delete state.fieldOptions[fieldId]
-      //Vue.delete(state.fieldOptions, fieldId)
     }
   },
   SET_ROW_HOVER(state, { row, value }) {
@@ -451,7 +447,6 @@ export const mutations = {
   },
   SET_MULTISELECT_ACTIVE(state, value) {
     state.multiSelectActive = value
-    //Vue.set(state, 'multiSelectActive', value)
   },
   CLEAR_AREA_SELECTION(state) {
     state.multiSelectHolding = false
@@ -661,7 +656,6 @@ export const mutations = {
         )
 
         if (existingIndex !== -1) {
-          // Vue.set(existingMetadata[newGroupField], existingIndex, newGroupEntry)
           existingMetadata[newGroupField][existingIndex] = newGroupEntry
         } else {
           existingMetadata[newGroupField].push(newGroupEntry)
@@ -708,7 +702,6 @@ export const mutations = {
             count -= 1
           }
 
-          //Vue.set(entry, 'count', count)
           entry.count = count
           updated = true
         }
@@ -728,12 +721,10 @@ export const mutations = {
   SET_PENDING_FIELD_OPERATIONS(state, { fieldId, rowIds, value }) {
     const addKey = (fieldId, rowId) => {
       const key = getPendingOperationKey(fieldId, rowId)
-      //Vue.set(state.pendingFieldOps, key, [fieldId, rowId])
       state.pendingFieldOps[key] = [fieldId, rowId]
     }
     const deleteKey = (fieldId, rowId) => {
       const key = getPendingOperationKey(fieldId, rowId)
-      //Vue.delete(state.pendingFieldOps, key)
       delete state.pendingFieldOps[key]
     }
     const operation = value ? addKey : deleteKey
@@ -743,7 +734,6 @@ export const mutations = {
   CLEAR_PENDING_FIELD_OPERATIONS(state, { fieldIds, rowId }) {
     fieldIds.forEach((fieldId) => {
       const key = getPendingOperationKey(fieldId, rowId)
-      // Vue.delete(state.pendingFieldOps, key)
       delete state.pendingFieldOps[key]
     })
   },
diff --git a/web-frontend/modules/database/utils/row.js b/web-frontend/modules/database/utils/row.js
index 7afcd363a4..c4e57be0aa 100644
--- a/web-frontend/modules/database/utils/row.js
+++ b/web-frontend/modules/database/utils/row.js
@@ -141,10 +141,8 @@ export function updateRowMetadataType(row, rowMetadataType, updateFunction) {
     const metaDataCopy = clone(row._.metadata)
     metaDataCopy[rowMetadataType] = newValue
     row._['metadata'] = metaDataCopy
-    // TODO MIG Vue.set(row._, 'metadata', metaDataCopy)
   } else {
     row._.metadata[rowMetadataType] = newValue
-    //Vue.set(row._.metadata, rowMetadataType, newValue)
   }
 }
 
diff --git a/web-frontend/test/unit/builder/components/elements/components/__snapshots__/ChoiceElement.spec.js.snap b/web-frontend/test/unit/builder/components/elements/components/__snapshots__/ChoiceElement.spec.js.snap
index fa0e54e7fc..8039f90048 100644
--- a/web-frontend/test/unit/builder/components/elements/components/__snapshots__/ChoiceElement.spec.js.snap
+++ b/web-frontend/test/unit/builder/components/elements/components/__snapshots__/ChoiceElement.spec.js.snap
@@ -104,7 +104,6 @@ exports[`ChoiceElement > as manual checkboxes 1`] = `
           
           <div
             class="ab-checkbox"
-            value="false"
           >
             <input
               aria-disabled="false"
@@ -121,7 +120,6 @@ exports[`ChoiceElement > as manual checkboxes 1`] = `
           </div>
           <div
             class="ab-checkbox"
-            value="false"
           >
             <input
               aria-disabled="false"
diff --git a/web-frontend/test/unit/core/admin/users/__snapshots__/userAdmin.spec.js.snap b/web-frontend/test/unit/core/admin/users/__snapshots__/userAdmin.spec.js.snap
index 95a839081d..7b30a49ffa 100644
--- a/web-frontend/test/unit/core/admin/users/__snapshots__/userAdmin.spec.js.snap
+++ b/web-frontend/test/unit/core/admin/users/__snapshots__/userAdmin.spec.js.snap
@@ -139,8 +139,7 @@ exports[`User Admin Component Tests > A users attributes will be displayed 1`] =
     </table>
   </div>
   <div class="data-table__footer">
-    <div class="paginator">
-      <!-- <div class="paginator__name"></div> --><a class="paginator__button paginator__button--disabled"><i class="iconoir-nav-arrow-left"></i></a>
+    <div class="paginator"><a class="paginator__button paginator__button--disabled"><i class="iconoir-nav-arrow-left"></i></a>
       <div class="paginator__content"><span>paginator.page</span><input type="text" class="paginator__content-input" required="" size="1" value="1"><span>paginator.of</span></div><a class="paginator__button paginator__button--disabled"><i class="iconoir-nav-arrow-right"></i></a>
     </div>
   </div>
@@ -384,8 +383,7 @@ exports[`User Admin Component Tests > you can sort by multiple columns which wil
     </table>
   </div>
   <div class="data-table__footer">
-    <div class="paginator">
-      <!-- <div class="paginator__name"></div> --><a class="paginator__button paginator__button--disabled"><i class="iconoir-nav-arrow-left"></i></a>
+    <div class="paginator"><a class="paginator__button paginator__button--disabled"><i class="iconoir-nav-arrow-left"></i></a>
       <div class="paginator__content"><span>paginator.page</span><input type="text" class="paginator__content-input" required="" size="1" value="1"><span>paginator.of</span></div><a class="paginator__button paginator__button--disabled"><i class="iconoir-nav-arrow-right"></i></a>
     </div>
   </div>
diff --git a/web-frontend/test/unit/database/__snapshots__/publicView.spec.js.snap b/web-frontend/test/unit/database/__snapshots__/publicView.spec.js.snap
index fa4fbdf42f..6f67af75fb 100644
--- a/web-frontend/test/unit/database/__snapshots__/publicView.spec.js.snap
+++ b/web-frontend/test/unit/database/__snapshots__/publicView.spec.js.snap
@@ -18,7 +18,6 @@ exports[`Public View Page Tests > Can see a publicly shared grid view 1`] = `
     <div
       class="toasts__container-bottom"
     >
-      <!-- Bottom toasts-->
       <!--v-if-->
       <!--v-if-->
       <!--v-if-->
@@ -50,9 +49,6 @@ exports[`Public View Page Tests > Can see a publicly shared grid view 1`] = `
               target="_blank"
               title="Baserow - open source no-code database tool and Airtable alternative"
             >
-              
-              <!-- TODO MIG component :is="getComponent()" v-if="getComponent()" /-->
-              <!-- must be in sync with modules/baserow_enterprise/components/EnterpriseLogo.vue -->
               <div
                 alt="Baserow - open source no-code database tool and Airtable alternative"
                 class="logo"
@@ -65,7 +61,6 @@ exports[`Public View Page Tests > Can see a publicly shared grid view 1`] = `
                   src="/modules/core/static/img/logo.svg"
                 />
               </div>
-              
             </a>
           </li>
           <li
diff --git a/web-frontend/test/unit/database/__snapshots__/table.spec.js.snap b/web-frontend/test/unit/database/__snapshots__/table.spec.js.snap
index bfcc0588dc..a2bfd76800 100644
--- a/web-frontend/test/unit/database/__snapshots__/table.spec.js.snap
+++ b/web-frontend/test/unit/database/__snapshots__/table.spec.js.snap
@@ -19,9 +19,7 @@ exports[`Table Component Tests > Adding a row to a table increases the row count
           <div><a class="header__filter-link"><i class="header__filter-icon iconoir-book-stack"></i><span class="header__filter-name">viewGroupBy.groupBy - 0</span></a></div>
         </li>
         <li class="header__filter-item">
-          <!-- toolbar icon -->
-          <div><a class="header__filter-link"><i class="header__filter-icon iconoir-share-android"></i><span class="header__filter-name">shareViewLink.shareView</span></a><!-- modal -->
-          </div>
+          <div><a class="header__filter-link"><i class="header__filter-icon iconoir-share-android"></i><span class="header__filter-name">shareViewLink.shareView</span></a></div>
         </li>
         <li class="header__filter-item">
           <div disable-sort="false"><a class="header__filter-link"><i class="header__filter-icon iconoir-palette"></i><span class="header__filter-name">viewDecorator.decorator - 0</span></a></div>
@@ -106,11 +104,6 @@ exports[`Table Component Tests > Adding a row to a table increases the row count
                         <div class="grid-view__row-drag"></div><a class="grid-view__row-more" row="[object Object]"><i class="baserow-icon-enlarge-row"></i></a>
                       </div>
                     </div>
-                    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
                   </div>
                 </div>
                 <div class="grid-view__row" style="width: 72px; height: 33px;">
@@ -188,24 +181,11 @@ exports[`Table Component Tests > Adding a row to a table increases the row count
                 <div class="grid-view__rows" style="transform: translateY(0px) translateX(0px); left: 0px;">
                   <div class="grid-view__row">
                     <!--v-if-->
-                    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-                    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
                     <div class="grid-view__column" style="width: 200px;">
                       <div class="grid-view__cell" workspace-id="1" row="[object Object]" field="[object Object]" state="[object Object]" read-only="false" store-prefix="page/">
                         <div class="grid-field-text">name</div>
                       </div>
                     </div>
-                    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
                     <div class="grid-view__column" style="width: 200px;">
                       <div class="grid-view__cell" workspace-id="1" row="[object Object]" field="[object Object]" state="[object Object]" read-only="false" store-prefix="page/">
                         <div class="grid-field-text">last_name</div>
@@ -280,9 +260,7 @@ exports[`Table Component Tests > Adding a row to a table increases the row count
           <div><a class="header__filter-link"><i class="header__filter-icon iconoir-book-stack"></i><span class="header__filter-name">viewGroupBy.groupBy - 0</span></a></div>
         </li>
         <li class="header__filter-item">
-          <!-- toolbar icon -->
-          <div><a class="header__filter-link"><i class="header__filter-icon iconoir-share-android"></i><span class="header__filter-name">shareViewLink.shareView</span></a><!-- modal -->
-          </div>
+          <div><a class="header__filter-link"><i class="header__filter-icon iconoir-share-android"></i><span class="header__filter-name">shareViewLink.shareView</span></a></div>
         </li>
         <li class="header__filter-item">
           <div disable-sort="false"><a class="header__filter-link"><i class="header__filter-icon iconoir-palette"></i><span class="header__filter-name">viewDecorator.decorator - 0</span></a></div>
@@ -367,11 +345,6 @@ exports[`Table Component Tests > Adding a row to a table increases the row count
                         <div class="grid-view__row-drag"></div><a class="grid-view__row-more" row="[object Object]"><i class="baserow-icon-enlarge-row"></i></a>
                       </div>
                     </div>
-                    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
                   </div>
                 </div>
                 <div class="grid-view__row" style="width: 72px; height: 33px;">
@@ -449,24 +422,11 @@ exports[`Table Component Tests > Adding a row to a table increases the row count
                 <div class="grid-view__rows" style="transform: translateY(0px) translateX(0px); left: 0px;">
                   <div class="grid-view__row">
                     <!--v-if-->
-                    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-                    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
                     <div class="grid-view__column" style="width: 200px;">
                       <div class="grid-view__cell" workspace-id="1" row="[object Object]" field="[object Object]" state="[object Object]" read-only="false" store-prefix="page/">
                         <div class="grid-field-text">name</div>
                       </div>
                     </div>
-                    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
                     <div class="grid-view__column" style="width: 200px;">
                       <div class="grid-view__cell" workspace-id="1" row="[object Object]" field="[object Object]" state="[object Object]" read-only="false" store-prefix="page/">
                         <div class="grid-field-text">last_name</div>
diff --git a/web-frontend/test/unit/database/components/export/__snapshots__/exportTableModal.spec.js.snap b/web-frontend/test/unit/database/components/export/__snapshots__/exportTableModal.spec.js.snap
index 6db658b2d4..6bf586f484 100644
--- a/web-frontend/test/unit/database/components/export/__snapshots__/exportTableModal.spec.js.snap
+++ b/web-frontend/test/unit/database/components/export/__snapshots__/exportTableModal.spec.js.snap
@@ -172,7 +172,6 @@ exports[`Preview exportTableModal > Modal with no view 1`] = `
             </div>
             
           </div>
-          
           <div
             class="control margin-bottom-2"
             data-form-error="false"
@@ -312,26 +311,6 @@ exports[`Preview exportTableModal > Modal with no view 1`] = `
             </div>
             
           </div>
-          <!-- &lt;div v-if="exporterTypes.length &gt; 0" class="control"&gt;
-    &lt;label class="control__label"&gt;{{
-      $t('exporterTypeChoices.formatLabel')
-    }}&lt;/label&gt;
-    &lt;div class="control__elements"&gt;
-      &lt;ul class="choice-items"&gt;
-        &lt;ExporterTypeChoice
-          v-for="exporterType in exporterTypes"
-          :key="exporterType.type"
-          :exporter-type="exporterType"
-          :active="value !== null && value === exporterType.type"
-          :disabled="loading"
-          :database="database"
-          @selected="switchToExporterType(exporterType.type)"
-        &gt;
-        &lt;/ExporterTypeChoice&gt;
-      &lt;/ul&gt;
-    &lt;/div&gt;
-  &lt;/div&gt; -->
-          
           <!--v-if-->
         </div>
       </div>
@@ -1828,19 +1807,12 @@ exports[`Preview exportTableModal > Modal with view 1`] = `
                       class="dropdown__selected"
                     >
                       
-                      
-                      <i
-                        class="dropdown__selected-icon iconoir-menu"
-                      />
-                      <!--v-if-->
                       <span
-                        class="dropdown__selected-text"
-                        title="mock_view_1"
+                        class="dropdown__selected-placeholder"
                       >
-                        mock_view_1
+                        action.makeChoice
                       </span>
                       
-                      
                       <i
                         class="dropdown__toggle-icon iconoir-nav-arrow-down"
                       />
@@ -1942,7 +1914,6 @@ exports[`Preview exportTableModal > Modal with view 1`] = `
             </div>
             
           </div>
-          
           <div
             class="control margin-bottom-2"
             data-form-error="false"
@@ -2082,26 +2053,6 @@ exports[`Preview exportTableModal > Modal with view 1`] = `
             </div>
             
           </div>
-          <!-- &lt;div v-if="exporterTypes.length &gt; 0" class="control"&gt;
-    &lt;label class="control__label"&gt;{{
-      $t('exporterTypeChoices.formatLabel')
-    }}&lt;/label&gt;
-    &lt;div class="control__elements"&gt;
-      &lt;ul class="choice-items"&gt;
-        &lt;ExporterTypeChoice
-          v-for="exporterType in exporterTypes"
-          :key="exporterType.type"
-          :exporter-type="exporterType"
-          :active="value !== null && value === exporterType.type"
-          :disabled="loading"
-          :database="database"
-          @selected="switchToExporterType(exporterType.type)"
-        &gt;
-        &lt;/ExporterTypeChoice&gt;
-      &lt;/ul&gt;
-    &lt;/div&gt;
-  &lt;/div&gt; -->
-          
           <!--v-if-->
         </div>
       </div>
diff --git a/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewDecoration.spec.js.snap b/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewDecoration.spec.js.snap
index cf6ca122ba..2a93867753 100644
--- a/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewDecoration.spec.js.snap
+++ b/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewDecoration.spec.js.snap
@@ -112,11 +112,6 @@ exports[`GridView component with decoration > Default component with first_cell
                 </div>
               </div>
               
-              <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
               
               
             </div>
@@ -378,17 +373,7 @@ exports[`GridView component with decoration > Default component with first_cell
               class="grid-view__row"
             >
               <!--v-if-->
-              <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
               
-              
-              <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
               <div
                 class="grid-view__column"
                 style="width: 200px;"
@@ -409,12 +394,6 @@ exports[`GridView component with decoration > Default component with first_cell
                   </div>
                 </div>
               </div>
-              
-              
-              <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
               <div
                 class="grid-view__column"
                 style="width: 200px;"
@@ -436,7 +415,6 @@ exports[`GridView component with decoration > Default component with first_cell
                 </div>
               </div>
               
-              
             </div>
             
             
@@ -656,11 +634,6 @@ exports[`GridView component with decoration > Default component with row wrapper
                     </div>
                   </div>
                   
-                  <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
                   
                   
                 </div>
@@ -930,17 +903,7 @@ exports[`GridView component with decoration > Default component with row wrapper
                   class="grid-view__row"
                 >
                   <!--v-if-->
-                  <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-                  
                   
-                  <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
                   <div
                     class="grid-view__column"
                     style="width: 200px;"
@@ -961,12 +924,6 @@ exports[`GridView component with decoration > Default component with row wrapper
                       </div>
                     </div>
                   </div>
-                  
-                  
-                  <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
                   <div
                     class="grid-view__column"
                     style="width: 200px;"
@@ -988,7 +945,6 @@ exports[`GridView component with decoration > Default component with row wrapper
                     </div>
                   </div>
                   
-                  
                 </div>
               </div>
             </div>
@@ -1202,11 +1158,6 @@ exports[`GridView component with decoration > Default component with unavailable
                 </div>
               </div>
               
-              <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
               
               
             </div>
@@ -1468,17 +1419,7 @@ exports[`GridView component with decoration > Default component with unavailable
               class="grid-view__row"
             >
               <!--v-if-->
-              <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-              
               
-              <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
               <div
                 class="grid-view__column"
                 style="width: 200px;"
@@ -1499,12 +1440,6 @@ exports[`GridView component with decoration > Default component with unavailable
                   </div>
                 </div>
               </div>
-              
-              
-              <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
               <div
                 class="grid-view__column"
                 style="width: 200px;"
@@ -1526,7 +1461,6 @@ exports[`GridView component with decoration > Default component with unavailable
                 </div>
               </div>
               
-              
             </div>
             
             
diff --git a/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewRows.spec.js.snap b/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewRows.spec.js.snap
index e02f7b6454..7eb56eebe6 100644
--- a/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewRows.spec.js.snap
+++ b/web-frontend/test/unit/database/components/view/grid/__snapshots__/gridViewRows.spec.js.snap
@@ -11,17 +11,7 @@ exports[`GridViewRows component > Default component 1`] = `
     class="grid-view__row"
   >
     <!--v-if-->
-    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
     
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -42,12 +32,6 @@ exports[`GridViewRows component > Default component 1`] = `
         </div>
       </div>
     </div>
-    
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -67,7 +51,6 @@ exports[`GridViewRows component > Default component 1`] = `
       </div>
     </div>
     
-    
   </div>
   
   
@@ -75,17 +58,7 @@ exports[`GridViewRows component > Default component 1`] = `
     class="grid-view__row"
   >
     <!--v-if-->
-    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-    
     
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -106,12 +79,6 @@ exports[`GridViewRows component > Default component 1`] = `
         </div>
       </div>
     </div>
-    
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -133,7 +100,6 @@ exports[`GridViewRows component > Default component 1`] = `
       </div>
     </div>
     
-    
   </div>
   
   
@@ -141,17 +107,7 @@ exports[`GridViewRows component > Default component 1`] = `
     class="grid-view__row"
   >
     <!--v-if-->
-    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-    
     
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -170,12 +126,6 @@ exports[`GridViewRows component > Default component 1`] = `
         />
       </div>
     </div>
-    
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -197,7 +147,6 @@ exports[`GridViewRows component > Default component 1`] = `
       </div>
     </div>
     
-    
   </div>
   
   
@@ -247,17 +196,7 @@ exports[`GridViewRows component > With row details 1`] = `
       </div>
     </div>
     
-    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
     
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -278,12 +217,6 @@ exports[`GridViewRows component > With row details 1`] = `
         </div>
       </div>
     </div>
-    
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -303,7 +236,6 @@ exports[`GridViewRows component > With row details 1`] = `
       </div>
     </div>
     
-    
   </div>
   
   
@@ -343,17 +275,7 @@ exports[`GridViewRows component > With row details 1`] = `
       </div>
     </div>
     
-    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-    
     
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -374,12 +296,6 @@ exports[`GridViewRows component > With row details 1`] = `
         </div>
       </div>
     </div>
-    
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -401,7 +317,6 @@ exports[`GridViewRows component > With row details 1`] = `
       </div>
     </div>
     
-    
   </div>
   
   
@@ -441,17 +356,7 @@ exports[`GridViewRows component > With row details 1`] = `
       </div>
     </div>
     
-    <!--
-      Somehow re-declaring all the events instead of using v-on="$listeners" speeds
-      everything up because the rows don't need to be updated everytime a new one is
-      rendered, which happens a lot when scrolling.
-      -->
-    
     
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -470,12 +375,6 @@ exports[`GridViewRows component > With row details 1`] = `
         />
       </div>
     </div>
-    
-    
-    <!--
-    The :key property must be set here because it makes sure that the child components
-    are not re-rendered when functional component changes position in the DOM.
-  -->
     <div
       class="grid-view__column"
       style="width: 200px;"
@@ -497,7 +396,6 @@ exports[`GridViewRows component > With row details 1`] = `
       </div>
     </div>
     
-    
   </div>