diff --git a/.circleci/config.yml b/.circleci/config.yml
index 251a81ce82..398173d5de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -246,11 +246,10 @@ jobs:
     - post_steps
   e2e-test:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.47.0-jammy
+      - image: mcr.microsoft.com/playwright:v1.48.0-jammy
     steps:
       - checkout
       - run: npm i -D @playwright/test
-      - run: npx playwright install chrome
       - run:
           name: Install dependencies
           command: yarn install
@@ -274,6 +273,7 @@ jobs:
       - run:
           name: Test nuxt ssr catalogue tests
           command: |
+            yarn playwright install chrome
             echo "PR number: ${CIRCLE_PULL_REQUEST##*/}"
             export E2E_BASE_URL=https://preview-emx2-pr-${CIRCLE_PULL_REQUEST##*/}.dev.molgenis.org/
             echo $E2E_BASE_URL
@@ -281,7 +281,8 @@ jobs:
           working_directory: apps/nuxt3-ssr          
       - run:
           name: Run non ssr e2e tests
-          command: | 
+          command: |
+            npx playwright install chrome
             echo "PR number: ${CIRCLE_PULL_REQUEST##*/}"
             export E2E_BASE_URL=https://preview-emx2-pr-${CIRCLE_PULL_REQUEST##*/}.dev.molgenis.org/
             echo $E2E_BASE_URL
diff --git a/apps/central/src/components/Groups.vue b/apps/central/src/components/Groups.vue
index 50430fd574..a66487715b 100644
--- a/apps/central/src/components/Groups.vue
+++ b/apps/central/src/components/Groups.vue
@@ -20,20 +20,6 @@
       />
 
       <label>{{ count }} databases found</label>
-      <ButtonOutline
-        v-if="showChangeColumnButton && !showChangeColumn"
-        @click="showChangeColumn = true"
-        class="float-right"
-      >
-        Show changelog
-      </ButtonOutline>
-      <ButtonOutline
-        v-if="showChangeColumnButton && showChangeColumn"
-        @click="showChangeColumn = false"
-        class="float-right"
-      >
-        Hide changelog
-      </ButtonOutline>
 
       <table class="table table-hover table-bordered bg-white">
         <thead>
@@ -90,14 +76,8 @@
             </td>
             <td v-if="showChangeColumn">
               <LastUpdateField
-                v-if="changelogSchemas.includes(schema.id)"
-                :schema="schema.id"
-                @input="
-                  (i) => {
-                    schema.update = new Date(i);
-                    handleLastUpdateChange();
-                  }
-                "
+                v-if="schema.update"
+                :lastUpdate="schema.update"
               />
             </td>
           </tr>
@@ -167,8 +147,7 @@ export default {
       search: null,
       sortColumn: "name",
       sortOrder: null,
-      changelogSchemas: [],
-      showChangeColumn: false,
+      lastUpdates: [],
     };
   },
   computed: {
@@ -186,8 +165,8 @@ export default {
           this.session.roles.includes("Manager"))
       );
     },
-    showChangeColumnButton() {
-      return this.hasManagerPermission;
+    showChangeColumn() {
+      return this.session.email == "admin";
     },
   },
   created() {
@@ -219,34 +198,31 @@ export default {
     },
     getSchemaList() {
       this.loading = true;
-      request("graphql", "{_schemas{id,label,description}}")
+      const schemaFragment = "_schemas{id,label,description}";
+      const lastUpdateFragment =
+        "_lastUpdate{schemaName, tableName, stamp, userId, operation}";
+      request(
+        "graphql",
+        `{${schemaFragment} ${this.showChangeColumn ? lastUpdateFragment : ""}}`
+      )
         .then((data) => {
           this.schemas = data._schemas;
-          this.loading = false;
-          if (this.hasManagerPermission && this.showChangeColumn) {
-            this.fetchChangelogStatus();
-          }
-        })
-        .catch(
-          (error) =>
-            (this.graphqlError = "internal server graphqlError" + error)
-        );
-    },
-    fetchChangelogStatus() {
-      this.schemas.forEach((schema) => {
-        request(
-          `/${schema.id}/settings/graphql`,
-          `{_settings (keys: ["isChangelogEnabled"]){ key, value }}`
-        )
-          .then((data) => {
-            if (data._settings[0].value.toLowerCase() === "true") {
-              this.changelogSchemas.push(schema.id);
+          const lastUpdates = data._lastUpdate ?? [];
+          lastUpdates.forEach((lastUpdate) => {
+            const schemaLastUpdate = this.schemas.find(
+              (schema) => schema.id === lastUpdate.schemaName
+            );
+            if (schemaLastUpdate) {
+              schemaLastUpdate.update = lastUpdate;
             }
-          })
-          .catch((error) => {
-            console.log(error);
           });
-      });
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("internal server error", error);
+          this.graphqlError = "internal server error" + error;
+          this.loading = false;
+        });
     },
     filterSchema(unfiltered) {
       let filtered = unfiltered;
@@ -268,7 +244,7 @@ export default {
       if (this.sortColumn === "lastUpdate") {
         sorted = unsortedCopy.sort((a, b) => {
           if (a.update && b.update) {
-            return a.update.getTime() - b.update.getTime();
+            return new Date(a.update.stamp) - new Date(b.update.stamp);
           } else if (a.update && !b.update) {
             return 1;
           } else if (!a.update && b.update) {
diff --git a/apps/central/src/components/LastUpdateField.vue b/apps/central/src/components/LastUpdateField.vue
index dc6c6a86cb..63384bd52f 100644
--- a/apps/central/src/components/LastUpdateField.vue
+++ b/apps/central/src/components/LastUpdateField.vue
@@ -1,56 +1,23 @@
 <template>
-  <span v-if="loading"><Spinner></Spinner></span>
-  <span v-else-if="update">
-    <a :href="`/${this.schema}/settings/#/changelog`">
-      {{ formatStamp(update.stamp) }} ({{ update.tableName }})
+  <span>
+    <a :href="`/${lastUpdate.schema}/settings/#/changelog`">
+      {{ timeStamp }} ({{ lastUpdate.tableName }})
     </a>
   </span>
-  <span v-else
-    ><em>{{ statusMessage }}</em></span
-  >
 </template>
 
-<script>
-import { request } from "graphql-request";
-import { Spinner } from "molgenis-components";
-export default {
-  name: "LastUpdateField",
-  components: { Spinner },
-  props: {
-    schema: {
-      String,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      update: null,
-      loading: true,
-      statusMessage: "",
-    };
-  },
-  methods: {
-    formatStamp(stamp) {
-      const date = new Date(stamp);
-      return date.toLocaleDateString();
-    },
-  },
-  async created() {
-    const resp = await request(
-      `/${this.schema}/settings/graphql`,
-      "{_changes(limit: 1) {operation, stamp, userId, tableName}}"
-    ).catch((error) => {
-      this.statusMessage = "failed to fetch updated";
-      console.log(error);
-    });
+<script setup lang="ts">
+import { computed } from "vue";
 
-    this.update = resp ? resp["_changes"][0] : null;
+const props = defineProps<{
+  lastUpdate: {
+    stamp: number;
+    tableName: string;
+    schema: string;
+  };
+}>();
 
-    if (this.update && this.update.stamp) {
-      // emit timestamp for use in row sort
-      this.$emit("input", this.update.stamp);
-    }
-    this.loading = false;
-  },
-};
+const timeStamp = computed(() => {
+  return new Date(props.lastUpdate.stamp).toLocaleDateString();
+});
 </script>
diff --git a/apps/tailwind-components/components/content/ContentBlockData.vue b/apps/nuxt3-ssr/components/content/ContentBlockData.vue
similarity index 93%
rename from apps/tailwind-components/components/content/ContentBlockData.vue
rename to apps/nuxt3-ssr/components/content/ContentBlockData.vue
index 8633cf13be..ff2715915d 100644
--- a/apps/tailwind-components/components/content/ContentBlockData.vue
+++ b/apps/nuxt3-ssr/components/content/ContentBlockData.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
+import type { ICollectionEvents } from "~/interfaces/catalogue";
+
 const { collectionEvents } = defineProps<{
   title: string;
   description?: string;
-  collectionEvents?: IResourceCollectionEvent[];
+  collectionEvents?: ICollectionEvents[];
 }>();
 
 const dataCategories = collectionEvents
diff --git a/apps/nuxt3-ssr/components/header/Catalogue.vue b/apps/nuxt3-ssr/components/header/Catalogue.vue
index 89757d05c0..ec49684ba3 100644
--- a/apps/nuxt3-ssr/components/header/Catalogue.vue
+++ b/apps/nuxt3-ssr/components/header/Catalogue.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
+import type { UIResource, UIResourceType } from "~/interfaces/types";
+
 const route = useRoute();
 const config = useRuntimeConfig();
 
 const props = defineProps<{
-  catalogue: any;
+  catalogue?: UIResource;
   variableCount: number;
+  resourceTypes: UIResourceType[];
 }>();
 
 const cohortOnly = computed(() => {
@@ -23,18 +26,16 @@ if (route.params.resourceType) {
   });
 }
 
-if (props.catalogue.resources_groupBy?.length) {
-  props.catalogue.resources_groupBy.forEach(
-    (sub: { type: { name: string }; count: string }) => {
-      const resourceTypeMetadata = getResourceMetadataForType(sub.type.name);
-      menu.push({
-        label: resourceTypeMetadata.plural,
-        link:
-          `/${route.params.schema}/ssr-catalogue/${catalogueRouteParam}/` +
-          resourceTypeMetadata.path,
-      });
-    }
-  );
+if (props.resourceTypes.length > 0) {
+  props.resourceTypes.forEach((resourceType) => {
+    const resourceTypeMetadata = getResourceMetadataForType(
+      resourceType.type.name
+    );
+    menu.push({
+      label: resourceTypeMetadata.plural,
+      link: `/${route.params.schema}/ssr-catalogue/${catalogueRouteParam}/${resourceTypeMetadata.path}`,
+    });
+  });
 }
 
 if (!cohortOnly.value && props.variableCount > 0)
@@ -73,7 +74,9 @@ if (!cohortOnly.value) {
       <div class="items-center justify-between hidden xl:flex h-25">
         <Logo
           :link="`/${route.params.schema}/ssr-catalogue/${catalogueRouteParam}`"
-          :image="catalogueRouteParam === 'all' ? null : catalogue?.logo?.url"
+          :image="
+            catalogueRouteParam === 'all' ? undefined : catalogue?.logo?.url
+          "
         />
         <MainNavigation :navigation="menu" :invert="true" />
         <!--  <div class="w-[450px]">
@@ -91,7 +94,7 @@ if (!cohortOnly.value) {
             <LogoMobile
               :link="`/${route.params.schema}/ssr-catalogue/${catalogueRouteParam}`"
               :image="
-                catalogueRouteParam === 'all' ? null : catalogue?.logo?.url
+                catalogueRouteParam === 'all' ? undefined : catalogue?.logo?.url
               "
             />
           </div>
diff --git a/apps/nuxt3-ssr/components/layouts/DetailPage.vue b/apps/nuxt3-ssr/components/layouts/DetailPage.vue
index 37af0b9161..185107bb52 100644
--- a/apps/nuxt3-ssr/components/layouts/DetailPage.vue
+++ b/apps/nuxt3-ssr/components/layouts/DetailPage.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 const route = useRoute();
 const headerData = await useHeaderData();
-const catalogue = headerData.catalogue;
-const variableCount = headerData.variableCount;
 
 const bannerData = await useBannerData();
 const bannerHtml = computed(() => {
@@ -15,8 +13,9 @@ const bannerHtml = computed(() => {
 
   <HeaderCatalogue
     v-if="route.params.catalogue"
-    :catalogue="catalogue"
-    :variableCount="variableCount"
+    :catalogue="headerData.catalogue"
+    :variableCount="headerData.variableCount"
+    :resourceTypes="headerData.resourceTypes"
   />
 
   <HeaderGlobal v-else />
diff --git a/apps/nuxt3-ssr/components/layouts/LandingPage.vue b/apps/nuxt3-ssr/components/layouts/LandingPage.vue
index 6949828213..efce719671 100644
--- a/apps/nuxt3-ssr/components/layouts/LandingPage.vue
+++ b/apps/nuxt3-ssr/components/layouts/LandingPage.vue
@@ -1,9 +1,6 @@
 <script setup lang="ts">
 const route = useRoute();
 const headerData = await useHeaderData();
-const catalogue = headerData.catalogue;
-const variableCount = headerData.variableCount;
-
 const bannerData = await useBannerData();
 const bannerHtml = computed(() => {
   return bannerData.data;
@@ -15,8 +12,9 @@ const bannerHtml = computed(() => {
 
   <HeaderCatalogue
     v-if="route.params.catalogue"
-    :catalogue="catalogue"
-    :variableCount="variableCount"
+    :catalogue="headerData.catalogue"
+    :variableCount="headerData.variableCount"
+    :resourceTypes="headerData.resourceTypes"
   />
   <HeaderGlobal v-else />
   <Container>
diff --git a/apps/nuxt3-ssr/components/layouts/SearchPage.vue b/apps/nuxt3-ssr/components/layouts/SearchPage.vue
index cdb4aa8516..c83889bdb4 100644
--- a/apps/nuxt3-ssr/components/layouts/SearchPage.vue
+++ b/apps/nuxt3-ssr/components/layouts/SearchPage.vue
@@ -1,9 +1,6 @@
 <script setup>
 const route = useRoute();
 const headerData = await useHeaderData();
-const catalogue = headerData.catalogue;
-const variableCount = headerData.variableCount;
-
 const bannerData = await useBannerData();
 const bannerHtml = computed(() => {
   return bannerData.data;
@@ -15,8 +12,9 @@ const bannerHtml = computed(() => {
 
   <HeaderCatalogue
     v-if="route.params.catalogue"
-    :catalogue="catalogue"
-    :variableCount="variableCount"
+    :catalogue="headerData.catalogue"
+    :variableCount="headerData.variableCount"
+    :resourceTypes="headerData.resourceTypes"
   />
 
   <HeaderGlobal v-else />
diff --git a/apps/nuxt3-ssr/composables/fetchMetadata.ts b/apps/nuxt3-ssr/composables/fetchMetadata.ts
index c452066a01..123c8df2b8 100644
--- a/apps/nuxt3-ssr/composables/fetchMetadata.ts
+++ b/apps/nuxt3-ssr/composables/fetchMetadata.ts
@@ -1,7 +1,7 @@
 import { StorageSerializers, useSessionStorage } from "@vueuse/core";
 
 import metadataGql from "~~/gql/metadata";
-import { type ISchemaMetaData } from "metadata-utils";
+import type { ISchemaMetaData } from "../../metadata-utils/src/types";
 
 const query = moduleToString(metadataGql);
 
diff --git a/apps/nuxt3-ssr/composables/useHeaderData.ts b/apps/nuxt3-ssr/composables/useHeaderData.ts
index 3f5695ff16..f1f1dfc68c 100644
--- a/apps/nuxt3-ssr/composables/useHeaderData.ts
+++ b/apps/nuxt3-ssr/composables/useHeaderData.ts
@@ -1,48 +1,74 @@
+import type { UIResource, UIResourceType } from "~/interfaces/types";
+
+interface Resp<T> {
+  data: T;
+  error?: any;
+}
+
+interface IHeaderQuery {
+  Resources: UIResource[];
+  Variables_agg: { count: number };
+  Resources_groupBy: UIResourceType[];
+}
+
 export async function useHeaderData() {
   const route = useRoute();
   const scoped = route.params.catalogue !== "all";
   const catalogueRouteParam = route.params.catalogue;
 
-  const { data, error } = await $fetch(`/${route.params.schema}/graphql`, {
-    key: `header-${route.params.catalogue}`,
-    method: "POST",
-    body: {
-      query: `
-            query HeaderQuery($networksFilter:ResourcesFilter, $variablesFilter:VariablesFilter) {
-              Resources(filter:$networksFilter) {
+  const { data, error } = await $fetch<Resp<IHeaderQuery>>(
+    `/${route.params.schema}/graphql`,
+    {
+      method: "POST",
+      body: {
+        query: `
+            query HeaderQuery($resourceFilter:ResourcesFilter, $variablesFilter:VariablesFilter) {
+              Resources(filter:$resourceFilter) {
                 id,
-                resources_agg { count }
-                resources_groupBy { count , type {name}}
                 logo { url }
-            }
-            Variables_agg(filter:$variablesFilter) {
+              }
+              Variables_agg(filter:$variablesFilter) {
+                  count
+              }
+              Resources_groupBy(filter:$resourceFilter) {
+                type { name, definition }
                 count
-            }
-          }`,
-      variables: {
-        networksFilter: scoped
-          ? { id: { equals: catalogueRouteParam } }
-          : undefined,
-        variablesFilter: scoped
-          ? {
-              _or: [
-                { resource: { id: { equals: catalogueRouteParam } } },
-                //also include network of networks
-                {
-                  resource: {
-                    type: { name: { equals: "Network" } },
+              }
+            }`,
+        variables: {
+          resourceFilter: scoped
+            ? {
+                _or: [
+                  { partOfResources: { id: { equals: catalogueRouteParam } } },
+                  {
                     partOfResources: {
-                      id: { equals: catalogueRouteParam },
+                      partOfResources: { id: { equals: catalogueRouteParam } },
+                    },
+                  },
+                ],
+              }
+            : undefined,
+          variablesFilter: scoped
+            ? {
+                _or: [
+                  { resource: { id: { equals: catalogueRouteParam } } },
+                  //also include network of networks
+                  {
+                    resource: {
+                      type: { name: { equals: "Network" } },
+                      partOfResources: {
+                        id: { equals: catalogueRouteParam },
+                      },
                     },
                   },
-                },
-              ],
-            }
-          : //should only include harmonised variables
-            { resource: { type: { name: { equals: "Network" } } } },
+                ],
+              }
+            : //should only include harmonised variables
+              { resource: { type: { name: { equals: "Network" } } } },
+        },
       },
-    },
-  });
+    }
+  );
 
   if (error) {
     const contextMsg = "Error on fetching page header data";
@@ -50,8 +76,11 @@ export async function useHeaderData() {
     throw new Error(contextMsg);
   }
 
-  const catalogue = data.Resources ? data.Resources[0] : null;
+  const catalogue = data.Resources ? data.Resources[0] : undefined;
   const variableCount = data.Variables_agg.count || 0;
+  const resourceTypes = data.Resources_groupBy.filter(
+    (resourceType: { count: number }) => resourceType.count > 0
+  );
 
-  return { catalogue, variableCount };
+  return { catalogue, variableCount, resourceTypes };
 }
diff --git a/apps/nuxt3-ssr/interfaces/types.ts b/apps/nuxt3-ssr/interfaces/types.ts
index 7e509d2342..ac08fb5e57 100644
--- a/apps/nuxt3-ssr/interfaces/types.ts
+++ b/apps/nuxt3-ssr/interfaces/types.ts
@@ -3,7 +3,7 @@ import type {
   IFile,
   INode,
 } from "../../tailwind-components/types/types";
-import type { ISubpopulations } from "./catalogue";
+import type { ICollectionEvents, ISubpopulations } from "./catalogue";
 export interface IResource {
   id: string;
   pid: string;
@@ -65,7 +65,7 @@ export interface IResource {
   }[];
   inclusionCriteria?: IOntologyNode[];
   otherInclusionCriteria?: string;
-  collectionEvents: ICollectionEvent[];
+  collectionEvents: ICollectionEvents[];
   collectionEvents_agg: { count: number };
   peopleInvolved: IContributor[];
   networks: INetwork[];
@@ -181,23 +181,6 @@ export interface IUrlObject {
   url: string;
 }
 
-export interface ICollectionEvent {
-  name: string;
-  description: string;
-  startYear: INameObject;
-  endYear: number;
-  numberOfParticipants: number;
-  ageGroups: INameObject[];
-  definition: string;
-  dataCategories: ICollectionEventCategory[];
-  sampleCategories: ICollectionEventCategory[];
-  areasOfInformation: ICollectionEventCategory[];
-  standardizedTools: ICollectionEventCategory[];
-  standardizedToolsOther: string;
-  subpopulations: INameObject[];
-  coreVariables: string[];
-}
-
 export interface ICollectionEventCategory {
   name: string;
   parent?: INameObject;
@@ -485,3 +468,16 @@ export type IResourceTypeMetadata = {
   path: string;
   description?: string;
 };
+
+export interface UIResourceType {
+  type: {
+    name: string;
+    definition?: string;
+  };
+  count: number;
+}
+
+export interface UIResource {
+  id: string;
+  logo: { url: string };
+}
diff --git a/apps/nuxt3-ssr/package.json b/apps/nuxt3-ssr/package.json
index 777e9be738..931cca4be2 100644
--- a/apps/nuxt3-ssr/package.json
+++ b/apps/nuxt3-ssr/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@nuxt/image": "1.7.0",
     "@nuxt/test-utils": "3.14.2",
-    "@playwright/test": "1.47.1",
+    "@playwright/test": "1.48.0",
     "@tailwindcss/forms": "0.5.7",
     "@tailwindcss/typography": "0.5.13",
     "@vitejs/plugin-vue": "4.6.2",
@@ -31,7 +31,7 @@
     "if-env": "^1.0.4",
     "jsdom": "22.1.0",
     "metadata-utils": "*",
-    "playwright-core": "1.47.1",
+    "playwright-core": "1.48.0",
     "postcss": "8.4.39",
     "postcss-custom-properties": "13.3.11",
     "prettier": "2.8.8",
diff --git a/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/index.vue b/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/index.vue
index 2ef28b35ea..5712334185 100644
--- a/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/index.vue
+++ b/apps/nuxt3-ssr/pages/[schema]/ssr-catalogue/index.vue
@@ -5,7 +5,7 @@ useHead({ title: "Health Data and Samples Catalogue" });
 //add redirect middleware for cohortOnly to skip this page
 definePageMeta({
   middleware: [
-    function (to, from) {
+    function (to) {
       const cohortOnly =
         to.query["cohort-only"] === "true" ||
         useRuntimeConfig().public.cohortOnly;
@@ -43,13 +43,42 @@ const query = computed(() => {
   `;
 });
 
+interface Catalogue {
+  network: {
+    id: string;
+    name: string;
+    acronym: string;
+    description: string;
+    logo: {
+      id: string;
+      size: number;
+      extension: string;
+      url: string;
+    };
+  };
+  type: {
+    name: string;
+  };
+}
+
+interface Catalogues_agg {
+  count: number;
+}
+
+interface Resp<T, U> {
+  data: Record<string, T[]>;
+  data_agg: Record<string, U>;
+}
+
 let graphqlURL = computed(() => `/${route.params.schema}/graphql`);
-const { data, pending, error, refresh } = await useFetch(graphqlURL.value, {
-  key: "catalogues",
-  method: "POST",
-  body: { query },
-});
-let activeName = ref("compact");
+const { data } = await useFetch<Resp<Catalogue, Catalogues_agg>>(
+  graphqlURL.value,
+  {
+    key: "catalogues",
+    method: "POST",
+    body: { query },
+  }
+);
 
 const thematicCatalogues = computed(() => {
   let result = data?.value?.data?.Catalogues
diff --git a/apps/nuxt3-ssr/tests/header-items.spec.ts b/apps/nuxt3-ssr/tests/header-items.spec.ts
index b758958156..a342bcac8b 100644
--- a/apps/nuxt3-ssr/tests/header-items.spec.ts
+++ b/apps/nuxt3-ssr/tests/header-items.spec.ts
@@ -16,5 +16,12 @@ test("should show variables in menu if there are variables", async ({
   goto,
 }) => {
   await goto("/catalogue-demo/ssr-catalogue/all", { waitUntil: "hydration" });
-  await expect(page.getByRole("navigation")).toContainText("Variables");
+  await expect(page.getByRole("navigation")).toContainText("Resources");
+  await expect(page.getByRole("navigation")).toContainText("Cohort studies");
+  await expect(page.getByRole("navigation")).toContainText("Cohort studies");
+  await expect(page.getByRole("navigation")).toContainText("Data sources");
+  await expect(page.getByRole("navigation")).toContainText("Databanks");
+  await expect(page.getByRole("navigation")).toContainText("More");
+  await page.getByRole("button", { name: "More" }).hover();
+  await page.locator("li").filter({ hasText: "Variables" });
 });
diff --git a/apps/nuxt3-ssr/utils/ontologyUtils.test.ts b/apps/nuxt3-ssr/utils/ontologyUtils.test.ts
index ac3f9c4f18..1b1bf53b84 100644
--- a/apps/nuxt3-ssr/utils/ontologyUtils.test.ts
+++ b/apps/nuxt3-ssr/utils/ontologyUtils.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
 import type { IOntologyParentTreeItem } from "../interfaces/types";
-import { buildTree, flattenTree } from "./ontologyUtils";
+import { buildTree, flattenTree, sortTree } from "./ontologyUtils";
 
 describe("flattenTree", () => {
   it("passing an instance without parent should return a list containing only the item", () => {
@@ -79,3 +79,34 @@ describe("buildTree", () => {
     expect(tree[0].children[0].name).toEqual("C1");
   });
 });
+
+describe("sortTree", () => {
+  it("empty tree is sorted ", () => {
+    expect(sortTree([])).toEqual([]);
+  });
+
+  it("sorts ", () => {
+    expect(sortTree([{ name: "B" }, { name: "A" }])).toEqual([
+      { name: "A" },
+      { name: "B" },
+    ]);
+  });
+
+  it("preserve the order ", () => {
+    expect(
+      sortTree([
+        { name: "A", order: 2 },
+        { name: "B", order: 1 },
+      ])
+    ).toEqual([
+      { name: "B", order: 1 },
+      { name: "A", order: 2 },
+    ]);
+  });
+
+  it("goes deep ", () => {
+    expect(
+      sortTree([{ name: "A", order: 2, children: [{ name: "B", order: 1 }] }])
+    ).toEqual([{ name: "A", order: 2, children: [{ name: "B", order: 1 }] }]);
+  });
+});
diff --git a/apps/nuxt3-ssr/utils/ontologyUtils.ts b/apps/nuxt3-ssr/utils/ontologyUtils.ts
index b44c127195..dd43d9d722 100644
--- a/apps/nuxt3-ssr/utils/ontologyUtils.ts
+++ b/apps/nuxt3-ssr/utils/ontologyUtils.ts
@@ -45,7 +45,8 @@ export const buildTree = (
   }
 
   const roots = uniqueItems.filter((item) => !item.parent);
-  return roots;
+  const sorted = sortTree(roots);
+  return sorted;
 };
 
 export const flattenTree = (
@@ -60,4 +61,23 @@ export const flattenTree = (
   }
 };
 
+export const sortTree = (tree: IOntologyItem[]): IOntologyItem[] => {
+  const sortBy = tree.every((item) => item.order !== undefined)
+    ? "order"
+    : "name";
+  tree.sort((a, b) => {
+    return sortBy === "order" && a.order !== undefined && b.order !== undefined
+      ? a.order - b.order
+      : a.name.localeCompare(b.name);
+  });
+
+  for (const item of tree) {
+    if (item.children) {
+      item.children = sortTree(item.children as IOntologyItem[]);
+    }
+  }
+
+  return tree;
+};
+
 const equals = (a: IOntologyItem, b: IOntologyItem) => a.name === b.name;
diff --git a/apps/tailwind-components/app.vue b/apps/tailwind-components/app.vue
index 1fcfeac8d2..e3c9ba9cc1 100644
--- a/apps/tailwind-components/app.vue
+++ b/apps/tailwind-components/app.vue
@@ -62,7 +62,11 @@ function toggleLayout () {
           </div>
           <div class="px-1">
             <input class="hover:cursor-pointer mr-2" id="umcg-theme" type="radio" v-model="theme" value="umcg" />
-            <label class="hover:cursor-pointer" for="umcg-theme"> Umcg </label>
+            <label class="hover:cursor-pointer" for="umcg-theme"> UMCG </label>
+          </div>
+          <div class="px-1">
+            <input class="hover:cursor-pointer mr-2" id="umcg-theme" type="radio" v-model="theme" value="aumc" />
+            <label class="hover:cursor-pointer" for="umcg-theme"> AUMC </label>
           </div>
         </fieldset>
       </div>
diff --git a/apps/tailwind-components/components/ColorTile.vue b/apps/tailwind-components/components/ColorTile.vue
new file mode 100644
index 0000000000..3d8fdb8d23
--- /dev/null
+++ b/apps/tailwind-components/components/ColorTile.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+const props = defineProps<{
+  color: string;
+  type: "background" | "text" | "border" | "radius";
+}>();
+
+const backgroundClass = computed(() => {
+  return props.color.startsWith("bg-") ? props.color : `bg-${props.color}`;
+});
+
+const textClass = computed(() => {
+  return props.color.startsWith("text-") ? props.color : `text-${props.color}`;
+});
+
+const borderColorClass = computed(() => {
+  return props.color.startsWith("border-")
+    ? props.color
+    : `border-${props.color}`;
+});
+
+const radiusClass = computed(() => {
+  return props.color.startsWith("rounded-")
+    ? props.color
+    : `rounded-${props.color}`;
+});
+</script>
+<template>
+  <div class="w-full md:w-36 mb-4 md:mr-4">
+    <div
+      v-if="type === 'background'"
+      class="mb-2 flex-none w-full md:w-36 h-16 md:h-36 flex items-center justify-center"
+      :class="backgroundClass"
+    ></div>
+    <div
+      v-else-if="type === 'text'"
+      class="mb-2 flex-none w-full md:w-36 h-16 md:h-36 flex items-center justify-center border border-gray-300"
+      :class="textClass"
+    >
+      <span class="text-3xl" :class="textClass">Aa</span>
+    </div>
+    <div
+      v-else-if="type === 'border'"
+      class="mb-2 flex-none w-full md:w-36 h-16 md:h-36 flex items-center justify-center border-2"
+      :class="borderColorClass"
+    ></div>
+    <div
+      v-else-if="type === 'radius'"
+      class="mb-2 flex-none w-full md:w-36 h-16 md:h-36 flex items-center justify-center border-2 border-gray-300"
+      :class="radiusClass"
+    ></div>
+    <div class="relative">
+      <div
+        class="pointer-events-none absolute z-50 py-1 px-2 text-sm bg-gray-800 dark:bg-midnight text-white rounded transition duration-200 overflow-hidden"
+      >
+        <br /><!---->
+      </div>
+      <div
+        class="inline-block text-sm text-gray-800 dark:text-gray-400 font-mono hover:text-teal-600 dark-hover:text-teal-400 cursor-pointer break-words"
+      >
+        {{ color }}
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/apps/tailwind-components/layouts/default.vue b/apps/tailwind-components/layouts/default.vue
index d6ca022c33..e0f22446fa 100644
--- a/apps/tailwind-components/layouts/default.vue
+++ b/apps/tailwind-components/layouts/default.vue
@@ -39,6 +39,10 @@ const stories = Object.keys(modules)
         <div id="header-place-holder"></div>
         <div class="xl:flex">
           <aside class="xl:min-w-95 xl:w-95 hidden xl:block pl-6">
+            <h2 class="text-2xl font-bold my-5">Theme Styles</h2>
+            <NuxtLink class="hover:underline" to="/Styles.other"
+              >Theme styles</NuxtLink
+            >
             <h2 class="text-2xl font-bold my-5">Components</h2>
             <ul class="list-none">
               <li class="py-2" v-for="story in stories">
diff --git a/apps/tailwind-components/package.json b/apps/tailwind-components/package.json
index 49ac700645..6e61affa47 100644
--- a/apps/tailwind-components/package.json
+++ b/apps/tailwind-components/package.json
@@ -34,7 +34,7 @@
     "if-env": "1.0.4",
     "pa11y-ci": "^3.1.0",
     "pa11y-ci-reporter-html": "^7.0.0",
-    "playwright-core": "1.45.0",
+    "playwright-core": "1.48.0",
     "prettier": "2.8.8",
     "svgo": "2.8.0",
     "typescript": "5.6.2",
diff --git a/apps/tailwind-components/pages/Styles.other.vue b/apps/tailwind-components/pages/Styles.other.vue
new file mode 100644
index 0000000000..d74e82b8e1
--- /dev/null
+++ b/apps/tailwind-components/pages/Styles.other.vue
@@ -0,0 +1,418 @@
+<template>
+  <h1 class="text-heading-3xl">Theme Styles</h1>
+
+  <h2 class="text-heading-2xl py-4">Colors</h2>
+
+  <h3 class="text-heading-1xl py-3">blue</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="blue-50" type="background" />
+    </li>
+    <li>
+      <ColorTile color="blue-100" type="background" />
+    </li>
+    <li>
+      <ColorTile color="blue-200" type="background" />
+    </li>
+    <li>
+      <ColorTile color="blue-300" type="background" />
+    </li>
+    <li>
+      <ColorTile color="blue-500" type="background" />
+    </li>
+    <li>
+      <ColorTile color="blue-700" type="background" />
+    </li>
+    <li>
+      <ColorTile color="blue-800" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">gray</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="gray-100" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-200" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-400" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-600" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-900" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">gray</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="gray-100" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-200" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-400" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-600" type="background" />
+    </li>
+    <li>
+      <ColorTile color="gray-900" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">yellow</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="yellow-200" type="background" />
+    </li>
+    <li>
+      <ColorTile color="yellow-500" type="background" />
+    </li>
+    <li>
+      <ColorTile color="yellow-800" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">green</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="green-500" type="background" />
+    </li>
+    <li>
+      <ColorTile color="green-800" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">orange</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="orange-500" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">red</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="red-500" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">Background colors</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="button-primary" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-primary" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-primary-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-secondary" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-secondary-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-tertiary" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-tertiary-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-outline" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-outline-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-disabled" type="background" />
+    </li>
+    <li>
+      <ColorTile color="button-disabled-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="search-button" type="background" />
+    </li>
+    <li>
+      <ColorTile color="search-button-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="navigation" type="background" />
+    </li>
+    <li>
+      <ColorTile color="search-results-view-tabs" type="background" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-toggle" type="background" />
+    </li>
+    <li>
+      <ColorTile color="app-wrapper" type="background" />
+    </li>
+    <li>
+      <ColorTile color="pagination" type="background" />
+    </li>
+    <li>
+      <ColorTile color="pagination-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="footer" type="background" />
+    </li>
+    <li>
+      <ColorTile color="modal-footer" type="background" />
+    </li>
+    <li>
+      <ColorTile color="tab" type="background" />
+    </li>
+    <li>
+      <ColorTile color="tab-hover" type="background" />
+    </li>
+    <li>
+      <ColorTile color="tab-active" type="background" />
+    </li>
+    <li>
+      <ColorTile color="disabled" type="background" />
+    </li>
+    <li>
+      <ColorTile color="invalid" type="background" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">Text colors</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="button-primary" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-primary-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-secondary" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-secondary-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-tertiary" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-tertiary-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-outline" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-outline-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-disabled" type="text" />
+    </li>
+    <li>
+      <ColorTile color="button-disabled-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="menu" type="text" />
+    </li>
+    <li>
+      <ColorTile color="sub-menu" type="text" />
+    </li>
+    <li>
+      <ColorTile color="sub-menu-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="breadcrumb-arrow" type="text" />
+    </li>
+    <li>
+      <ColorTile color="breadcrumb" type="text" />
+    </li>
+    <li>
+      <ColorTile color="title" type="text" />
+    </li>
+    <li>
+      <ColorTile color="title-contrast" type="text" />
+    </li>
+    <li>
+      <ColorTile color="sub-title-contrast" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-button" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-button-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="favorite" type="text" />
+    </li>
+    <li>
+      <ColorTile color="favorite-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-results-view-tabs" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-results-view-tabs-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-title" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-expand" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-expand-mobile" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-title" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-title-mobile" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-checkbox" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-toggle" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-title-inverted" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-expand-inverted" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-title-inverted" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-checkbox-inverted" type="text" />
+    </li>
+    <li>
+      <ColorTile color="search-filter-group-toggle-inverted" type="text" />
+    </li>
+    <li>
+      <ColorTile color="tooltip-hover-dark" type="text" />
+    </li>
+    <li>
+      <ColorTile color="tooltip-hover-light" type="text" />
+    </li>
+    <li>
+      <ColorTile color="pagination" type="text" />
+    </li>
+    <li>
+      <ColorTile color="pagination-input" type="text" />
+    </li>
+    <li>
+      <ColorTile color="pagination-hover" type="text" />
+    </li>
+    <li>
+      <ColorTile color="footer-link" type="text" />
+    </li>
+    <li>
+      <ColorTile color="invalid" type="text" />
+    </li>
+    <li>
+      <ColorTile color="valid" type="text" />
+    </li>
+    <li>
+      <ColorTile color="disabled" type="text" />
+    </li>
+    <li>
+      <ColorTile color="required" type="text" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">Border colors</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="button-primary" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-primary-hover" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-secondary" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-secondary-hover" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-tertiary" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-tertiary-hover" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-outline" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-outline-hover" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-disabled" type="border" />
+    </li>
+    <li>
+      <ColorTile color="button-disabled-hover" type="border" />
+    </li>
+    <li>
+      <ColorTile color="menu-active" type="border" />
+    </li>
+    <li>
+      <ColorTile color="search-button" type="border" />
+    </li>
+    <li>
+      <ColorTile color="search-input" type="border" />
+    </li>
+    <li>
+      <ColorTile color="search-input-mobile" type="border" />
+    </li>
+    <li>
+      <ColorTile color="pagination" type="border" />
+    </li>
+    <li>
+      <ColorTile color="checkbox" type="border" />
+    </li>
+    <li>
+      <ColorTile color="invalid" type="border" />
+    </li>
+    <li>
+      <ColorTile color="valid" type="border" />
+    </li>
+    <li>
+      <ColorTile color="disabled" type="border" />
+    </li>
+  </ol>
+
+  <h3 class="text-heading-1xl py-3">Border radius</h3>
+  <ol class="flex flex-wrap mb-4 mt-6">
+    <li>
+      <ColorTile color="button-primary" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="3px" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="50px" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="textarea-input" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="search-input" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="search-button" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="pagination" type="radius" />
+    </li>
+    <li>
+      <ColorTile color="landing" type="radius" />
+    </li>
+  </ol>
+</template>
diff --git a/apps/tailwind-components/pages/table/EMX2.story.vue b/apps/tailwind-components/pages/table/EMX2.story.vue
index 09be6b2fdd..f8567d27b2 100644
--- a/apps/tailwind-components/pages/table/EMX2.story.vue
+++ b/apps/tailwind-components/pages/table/EMX2.story.vue
@@ -1,15 +1,5 @@
 <script setup lang="ts">
-import type { ITableSettings } from "~/types/types";
-
-type Resp<T> = {
-  data: Record<string, T[]>;
-};
-
-interface Schema {
-  id: string;
-  label: string;
-  description: string;
-}
+import type { ITableSettings, Resp, Schema } from "~/types/types";
 
 const tableSettings = ref<ITableSettings>({
   page: 1,
diff --git a/apps/tailwind-components/types/types.ts b/apps/tailwind-components/types/types.ts
index 7a9308afe6..3698c32ce2 100644
--- a/apps/tailwind-components/types/types.ts
+++ b/apps/tailwind-components/types/types.ts
@@ -1,4 +1,14 @@
 import type { IColumn } from "../../metadata-utils/dist";
+
+export type Resp<T> = {
+  data: Record<string, T[]>;
+};
+
+export interface Schema {
+  id: string;
+  label: string;
+  description: string;
+}
 export interface INode {
   name: string;
   description?: string;
diff --git a/apps/ui/layouts/default.vue b/apps/ui/layouts/default.vue
index 470650ea78..746acbb510 100644
--- a/apps/ui/layouts/default.vue
+++ b/apps/ui/layouts/default.vue
@@ -11,16 +11,18 @@ const faviconHref = config.public.emx2Theme
 useHead({
   htmlAttrs: {
     "data-theme":
-      (route.query.theme as string) || config.public.emx2Theme || "",
+      (route.query.theme as string) ||
+      (config.public.emx2Theme as string) ||
+      "",
   },
   link: [{ rel: "icon", href: faviconHref }],
-  titleTemplate: (titleChunk) => {
+  titleTemplate: (titleChunk: string | undefined): string | null => {
     if (titleChunk && config.public.siteTitle) {
       return `${titleChunk} | ${config.public.siteTitle}`;
     } else if (titleChunk) {
       return titleChunk;
     } else if (config.public.siteTitle) {
-      return config.public.siteTitle;
+      return config.public.siteTitle as string;
     } else {
       return "Emx2";
     }
diff --git a/apps/ui/pages/[schema]/analytics.vue b/apps/ui/pages/[schema]/analytics.vue
index 0d43a02ef9..48f6d93002 100644
--- a/apps/ui/pages/[schema]/analytics.vue
+++ b/apps/ui/pages/[schema]/analytics.vue
@@ -9,15 +9,7 @@ interface Trigger {
   cssSelector: string;
 }
 
-interface Resp<T> {
-  data: T[];
-  error: string;
-  status: number;
-}
-
-const { data, error, status, refresh } = await useFetch<Trigger[]>(
-  `/${schema}/api/trigger`
-);
+const { data, refresh } = await useFetch<Trigger[]>(`/${schema}/api/trigger`);
 
 const triggers = computed(() => data?.value?.toReversed());
 
diff --git a/apps/ui/pages/index.vue b/apps/ui/pages/index.vue
index 854523ddd3..6af13d2e2d 100644
--- a/apps/ui/pages/index.vue
+++ b/apps/ui/pages/index.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-type Resp<T> = {
-  data: Record<string, T[]>;
-};
+import type { Resp } from "../../tailwind-components/types/types";
 
 interface Schema {
   id: string;
diff --git a/apps/yarn.lock b/apps/yarn.lock
index 1a670ed59a..2f4fecfb60 100644
--- a/apps/yarn.lock
+++ b/apps/yarn.lock
@@ -1711,12 +1711,12 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@playwright/test@1.47.1":
-  version "1.47.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.47.1.tgz#568a46229a5aef54b74977297a7946bb5ac4b67b"
-  integrity sha512-dbWpcNQZ5nj16m+A5UNScYx7HX5trIy7g4phrcitn+Nk83S32EBX/CLU4hiF4RGKX/yRc93AAqtfaXB7JWBd4Q==
+"@playwright/test@1.48.0":
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.48.0.tgz#4b81434a3ca75e2a6f82a645287784223a45434c"
+  integrity sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==
   dependencies:
-    playwright "1.47.1"
+    playwright "1.48.0"
 
 "@polka/url@^1.0.0-next.24":
   version "1.0.0-next.27"
@@ -10388,22 +10388,17 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-playwright-core@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.45.0.tgz#5741a670b7c9060ce06852c0051d84736fb94edc"
-  integrity sha512-lZmHlFQ0VYSpAs43dRq1/nJ9G/6SiTI7VPqidld9TDefL9tX87bTKExWZZUF5PeRyqtXqd8fQi2qmfIedkwsNQ==
+playwright-core@1.48.0:
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.48.0.tgz#34d209dd4aba8fccd4a96116f1c4f7630f868722"
+  integrity sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==
 
-playwright-core@1.47.1:
-  version "1.47.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.47.1.tgz#bb45bdfb0d48412c535501aa3805867282857df8"
-  integrity sha512-i1iyJdLftqtt51mEk6AhYFaAJCDx0xQ/O5NU8EKaWFgMjItPVma542Nh/Aq8aLCjIJSzjaiEQGW/nyqLkGF1OQ==
-
-playwright@1.47.1:
-  version "1.47.1"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.47.1.tgz#cdc1116f5265b8d2ff7be0d8942d49900634dc6c"
-  integrity sha512-SUEKi6947IqYbKxRiqnbUobVZY4bF1uu+ZnZNJX9DfU1tlf2UhWfvVjLf01pQx9URsOr18bFVUKXmanYWhbfkw==
+playwright@1.48.0:
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.48.0.tgz#00855d9a25f1991d422867f1c32af5d90f457b48"
+  integrity sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==
   dependencies:
-    playwright-core "1.47.1"
+    playwright-core "1.48.0"
   optionalDependencies:
     fsevents "2.3.2"
 
diff --git a/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlApiFactory.java b/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlApiFactory.java
index c4d1b66dac..6b5e2d011f 100644
--- a/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlApiFactory.java
+++ b/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlApiFactory.java
@@ -70,6 +70,10 @@ public GraphQL createGraphqlForDatabase(Database database, TaskService taskServi
     queryBuilder.field(db.schemasQuery(database));
     queryBuilder.field(db.settingsQueryField(database));
     queryBuilder.field(db.tasksQueryField(taskService));
+    // todo need to allow for owner ? ( need to filter the query to include only owned schema's)
+    if (database.isAdmin()) {
+      queryBuilder.field(db.lastUpdateQuery(database));
+    }
 
     mutationBuilder.field(db.createMutation(database, taskService));
     mutationBuilder.field(db.deleteMutation(database));
diff --git a/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlDatabaseFieldFactory.java b/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlDatabaseFieldFactory.java
index dae024cc68..abf9c9dd2e 100644
--- a/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlDatabaseFieldFactory.java
+++ b/backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlDatabaseFieldFactory.java
@@ -19,6 +19,27 @@
 
 public class GraphqlDatabaseFieldFactory {
 
+  static final GraphQLType lastUpdateMetadataType =
+      new GraphQLObjectType.Builder()
+          .name("ChangesType")
+          .field(
+              GraphQLFieldDefinition.newFieldDefinition()
+                  .name(OPERATION)
+                  .type(Scalars.GraphQLString))
+          .field(
+              GraphQLFieldDefinition.newFieldDefinition().name(STAMP).type(Scalars.GraphQLString))
+          .field(
+              GraphQLFieldDefinition.newFieldDefinition().name(USERID).type(Scalars.GraphQLString))
+          .field(
+              GraphQLFieldDefinition.newFieldDefinition()
+                  .name(TABLENAME)
+                  .type(Scalars.GraphQLString))
+          .field(
+              GraphQLFieldDefinition.newFieldDefinition()
+                  .name(SCHEMA_NAME)
+                  .type(Scalars.GraphQLString))
+          .build();
+
   public static final GraphQLType outputSchemasType =
       new GraphQLObjectType.Builder()
           .name("SchemaInfo")
@@ -268,6 +289,13 @@ public GraphQLFieldDefinition dropMutation(Database database) {
         .build();
   }
 
+  public GraphQLFieldDefinition.Builder lastUpdateQuery(Database database) {
+    return GraphQLFieldDefinition.newFieldDefinition()
+        .name("_lastUpdate")
+        .type(GraphQLList.list(lastUpdateMetadataType))
+        .dataFetcher(dataFetchingEnvironment -> database.getLastUpdated());
+  }
+
   private static void dropUsers(
       Database database, List<Map<String, String>> userList, StringBuilder messageBuilder) {
     if (userList != null) {
diff --git a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/ChangeLogExecutor.java b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/ChangeLogExecutor.java
index 5a2f734553..86c949195d 100644
--- a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/ChangeLogExecutor.java
+++ b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/ChangeLogExecutor.java
@@ -1,9 +1,6 @@
 package org.molgenis.emx2.sql;
 
-import static org.jooq.impl.DSL.field;
-import static org.jooq.impl.DSL.name;
-import static org.jooq.impl.DSL.select;
-import static org.jooq.impl.DSL.table;
+import static org.jooq.impl.DSL.*;
 import static org.jooq.impl.SQLDataType.CHAR;
 import static org.jooq.impl.SQLDataType.JSON;
 import static org.jooq.impl.SQLDataType.TIMESTAMP;
@@ -15,16 +12,12 @@
 
 import java.sql.Timestamp;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import org.jooq.DSLContext;
-import org.jooq.Field;
+import org.jooq.*;
 import org.jooq.Record;
-import org.jooq.Record6;
-import org.jooq.Result;
-import org.molgenis.emx2.Change;
+import org.molgenis.emx2.*;
 import org.molgenis.emx2.Schema;
-import org.molgenis.emx2.SchemaMetadata;
-import org.molgenis.emx2.TableMetadata;
 
 public class ChangeLogExecutor {
 
@@ -36,6 +29,9 @@ public class ChangeLogExecutor {
   private static final Field<org.jooq.JSON> OLD = field(name("old"), JSON.nullable(true));
   private static final Field<org.jooq.JSON> NEW = field(name("new"), JSON.nullable(true));
 
+  private static final Field<String> SCHEMA_NAME =
+      field(name("table_schema"), VARCHAR.nullable(false));
+
   private ChangeLogExecutor() {
     // hide
   }
@@ -125,6 +121,60 @@ static List<Change> executeGetChanges(DSLContext jooq, SchemaMetadata schema, in
         .toList();
   }
 
+  static List<LastUpdate> executeLastUpdates(DSLContext jooq) {
+
+    // get a list of schema's with changelogs, need due to limited support for cross schema queries
+    List<String> schemasWithChangeLog = getSchemasWithChangeLog(jooq);
+
+    if (schemasWithChangeLog.isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    // get the last updated table and details from all schema's that have a change log
+    SelectLimitPercentStep<Record5<String, Timestamp, String, String, String>> query =
+        jooq.select(
+                OPERATION,
+                STAMP,
+                USERID,
+                TABLENAME,
+                inline(schemasWithChangeLog.get(0)).as(SCHEMA_NAME))
+            .from(table(name(schemasWithChangeLog.get(0), MG_CHANGLOG)))
+            .orderBy(STAMP.desc())
+            .limit(1);
+
+    // union the select for schema's in a loop
+    for (int i = 1; i < schemasWithChangeLog.size(); i++) {
+      query.unionAll(
+          jooq.select(
+                  OPERATION,
+                  STAMP,
+                  USERID,
+                  TABLENAME,
+                  inline(schemasWithChangeLog.get(1)).as(SCHEMA_NAME))
+              .from(table(name(schemasWithChangeLog.get(i), MG_CHANGLOG)))
+              .orderBy(STAMP.desc())
+              .limit(1));
+    }
+
+    // execute to query with all the unions
+    Result<Record5<String, Timestamp, String, String, String>> result = query.fetch();
+
+    // transform the result in to records
+    return result.stream()
+        .map(
+            r -> {
+              char operation = r.getValue(OPERATION, char.class);
+              Timestamp stamp = r.getValue(STAMP, Timestamp.class);
+              String userId = r.getValue(USERID, String.class);
+              String tableName = r.getValue(TABLENAME, String.class);
+              String schemaName = r.getValue(SCHEMA_NAME, String.class);
+
+              return new LastUpdate(operation, stamp, userId, tableName, schemaName);
+            })
+        .sorted(Comparator.comparing(LastUpdate::stamp))
+        .toList();
+  }
+
   static Integer executeGetChangesCount(DSLContext jooq, SchemaMetadata schema) {
     if (hasChangeLogTable(jooq, schema)) {
       return jooq.fetchCount(table(name(schema.getName(), MG_CHANGLOG)));
@@ -141,4 +191,14 @@ static boolean hasChangeLogTable(DSLContext jooq, SchemaMetadata schema) {
             .where(field("table_schema").eq(schema.getName()))
             .and(field("table_name").eq(MG_CHANGLOG)));
   }
+
+  static List<String> getSchemasWithChangeLog(DSLContext jooq) {
+    Result<Record> result =
+        jooq.select()
+            .from(table(name("information_schema", "tables")))
+            .where(field("table_name").eq(MG_CHANGLOG))
+            .fetch();
+
+    return result.stream().map(r -> r.getValue(SCHEMA_NAME, String.class)).toList();
+  }
 }
diff --git a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/Migrations.java b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/Migrations.java
index f8d61b7a50..5c28fbca44 100644
--- a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/Migrations.java
+++ b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/Migrations.java
@@ -22,7 +22,7 @@
 
 public class Migrations {
   // version the current software needs to work
-  private static final int SOFTWARE_DATABASE_VERSION = 22;
+  private static final int SOFTWARE_DATABASE_VERSION = 23;
   public static final int THREE_MINUTES = 180;
   private static Logger logger = LoggerFactory.getLogger(Migrations.class);
 
@@ -148,6 +148,10 @@ public static synchronized void initOrMigrate(SqlDatabase db) {
             }
           }
 
+          if (version < 23) {
+            executeMigrationFile(tdb, "migration23.sql", "add enable state to user metadata");
+          }
+
           // if success, update version to SOFTWARE_DATABASE_VERSION
           updateDatabaseVersion((SqlDatabase) tdb, SOFTWARE_DATABASE_VERSION);
         });
diff --git a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlDatabase.java b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlDatabase.java
index 5c375bba8b..1e859d2f80 100644
--- a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlDatabase.java
+++ b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlDatabase.java
@@ -9,6 +9,7 @@
 import static org.molgenis.emx2.sql.SqlSchemaMetadataExecutor.executeCreateSchema;
 
 import com.zaxxer.hikari.HikariDataSource;
+import java.security.SecureRandom;
 import java.util.*;
 import java.util.function.Supplier;
 import javax.sql.DataSource;
@@ -20,6 +21,7 @@
 import org.molgenis.emx2.*;
 import org.molgenis.emx2.utils.EnvironmentProperty;
 import org.molgenis.emx2.utils.RandomString;
+import org.molgenis.emx2.utils.generator.SnowflakeIdGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +35,7 @@ public class SqlDatabase extends HasSettings<Database> implements Database {
   public static final int TEN_SECONDS = 10;
   private static final Settings DEFAULT_JOOQ_SETTINGS =
       new Settings().withQueryTimeout(TEN_SECONDS);
+  private static final Random random = new SecureRandom();
 
   // shared between all instances
   private static DataSource source;
@@ -181,6 +184,13 @@ public void init() { // setup default stuff
         this.setSetting(Constants.IS_OIDC_ENABLED, String.valueOf(isOidcEnabled));
       }
 
+      String instanceId = getSetting(Constants.MOLGENIS_INSTANCE_ID);
+      if (instanceId == null) {
+        instanceId = String.valueOf(random.nextLong(SnowflakeIdGenerator.MAX_ID));
+        this.setSetting(Constants.MOLGENIS_INSTANCE_ID, instanceId);
+      }
+      if (!SnowflakeIdGenerator.hasInstance()) SnowflakeIdGenerator.init(instanceId);
+
       if (getSetting(Constants.IS_PRIVACY_POLICY_ENABLED) == null) {
         this.setSetting(Constants.IS_PRIVACY_POLICY_ENABLED, String.valueOf(false));
       }
@@ -493,7 +503,8 @@ public void removeUser(String user) {
   public void setEnabledUser(String user, Boolean enabled) {
     long start = System.currentTimeMillis();
     if (user.equals("admin")) throw new MolgenisException("You cant enable or disable admin");
-    if (user.equals("anonymous")) throw new MolgenisException("You cant enable or disable anonymous");
+    if (user.equals("anonymous"))
+      throw new MolgenisException("You cant enable or disable anonymous");
     if (!hasUser(user))
       throw new MolgenisException(
           (enabled ? "Enabling" : "Disabling")
@@ -789,4 +800,9 @@ public TableListener getTableListener(String schemaName, String tableName) {
     }
     return null;
   }
+
+  @Override
+  public List<LastUpdate> getLastUpdated() {
+    return ChangeLogExecutor.executeLastUpdates(jooq);
+  }
 }
diff --git a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlTypeUtils.java b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlTypeUtils.java
index a6df428810..9b28ffee65 100644
--- a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlTypeUtils.java
+++ b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlTypeUtils.java
@@ -9,13 +9,10 @@
 import java.util.stream.Collectors;
 import org.molgenis.emx2.*;
 import org.molgenis.emx2.utils.TypeUtils;
-import org.molgenis.emx2.utils.generator.IdGenerator;
-import org.molgenis.emx2.utils.generator.IdGeneratorImpl;
+import org.molgenis.emx2.utils.generator.SnowflakeIdGenerator;
 
 public class SqlTypeUtils extends TypeUtils {
 
-  public static final IdGenerator idGenerator = new IdGeneratorImpl();
-
   private SqlTypeUtils() {
     // to hide the public constructor
   }
@@ -34,7 +31,7 @@ public static void applyValidationAndComputed(List<Column> columns, Row row) {
         row.setString(
             c.getName(), Constants.MG_USER_PREFIX + row.getString(Constants.MG_EDIT_ROLE));
       } else if (AUTO_ID.equals(c.getColumnType())) {
-        applyAutoid(c, row);
+        applyAutoId(c, row);
       } else if (c.getDefaultValue() != null && !row.notNull(c.getName())) {
         if (c.getDefaultValue().startsWith("=")) {
           try {
@@ -79,16 +76,15 @@ public static void applyValidationAndComputed(List<Column> columns, Row row) {
     }
   }
 
-  private static void applyAutoid(Column c, Row row) {
+  private static void applyAutoId(Column c, Row row) {
     if (row.isNull(c.getName(), c.getPrimitiveColumnType())) {
+      String id = SnowflakeIdGenerator.getInstance().generateId();
       // do we use a template containing ${mg_autoid} for pre/postfixing ?
       if (c.getComputed() != null) {
-        row.set(
-            c.getName(),
-            c.getComputed().replace(Constants.COMPUTED_AUTOID_TOKEN, idGenerator.generateId()));
+        row.set(c.getName(), c.getComputed().replace(Constants.COMPUTED_AUTOID_TOKEN, id));
       }
       // otherwise simply put the id
-      else row.set(c.getName(), idGenerator.generateId());
+      else row.set(c.getName(), id);
     }
   }
 
diff --git a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/TestDatabaseFactory.java b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/TestDatabaseFactory.java
index 804df31e2e..3706c45185 100644
--- a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/TestDatabaseFactory.java
+++ b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/TestDatabaseFactory.java
@@ -1,13 +1,16 @@
 package org.molgenis.emx2.sql;
 
 import org.molgenis.emx2.Database;
+import org.molgenis.emx2.utils.generator.SnowflakeIdGenerator;
 
 public class TestDatabaseFactory {
 
   public static Database getTestDatabase() {
     Database db = new SqlDatabase(false);
     db.setActiveUser(db.getAdminUserName());
+
+    if (!SnowflakeIdGenerator.hasInstance()) SnowflakeIdGenerator.init("123");
+
     return db;
-    // don't share the database between tests because when setting active user that leads to errors
   }
 }
diff --git a/backend/molgenis-emx2-sql/src/main/resources/org/molgenis/emx2/sql/migration23.sql b/backend/molgenis-emx2-sql/src/main/resources/org/molgenis/emx2/sql/migration23.sql
new file mode 100644
index 0000000000..f17a21760f
--- /dev/null
+++ b/backend/molgenis-emx2-sql/src/main/resources/org/molgenis/emx2/sql/migration23.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "MOLGENIS"."users_metadata"
+    ADD COLUMN IF NOT EXISTS enabled BOOLEAN DEFAULT TRUE;
\ No newline at end of file
diff --git a/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/ChangeLogExecutorTest.java b/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/ChangeLogExecutorTest.java
new file mode 100644
index 0000000000..746fd47d3c
--- /dev/null
+++ b/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/ChangeLogExecutorTest.java
@@ -0,0 +1,53 @@
+package org.molgenis.emx2.sql;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.molgenis.emx2.Column.column;
+import static org.molgenis.emx2.Constants.IS_CHANGELOG_ENABLED;
+import static org.molgenis.emx2.Row.row;
+import static org.molgenis.emx2.TableMetadata.table;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.molgenis.emx2.LastUpdate;
+
+class ChangeLogExecutorTest {
+
+  static SqlDatabase sqlDatabase;
+
+  @BeforeEach
+  void setUp() {
+    sqlDatabase = (SqlDatabase) TestDatabaseFactory.getTestDatabase();
+
+    sqlDatabase.dropCreateSchema("ChangeLogExecutorTestA");
+    sqlDatabase.dropCreateSchema("ChangeLogExecutorTestB");
+
+    Map<String, String> settings = new LinkedHashMap<>();
+    settings.put(IS_CHANGELOG_ENABLED, "true");
+    SqlSchema schemaA = sqlDatabase.getSchema("ChangeLogExecutorTestA");
+    schemaA.getMetadata().setSettings(settings);
+    sqlDatabase.getSchema("ChangeLogExecutorTestB").getMetadata().setSettings(settings);
+
+    schemaA.create(table("test", column("A").setPkey(), column("B")));
+    schemaA.getTable("test").insert(List.of(row("A", "a1", "B", "B")));
+  }
+
+  @Test
+  void getSchemasWithChangeLog() {
+    List<String> schemasWithChangeLog =
+        ChangeLogExecutor.getSchemasWithChangeLog(sqlDatabase.getJooq());
+    assertEquals(2, schemasWithChangeLog.size());
+    assertTrue(schemasWithChangeLog.contains("ChangeLogExecutorTestA"));
+    assertTrue(schemasWithChangeLog.contains("ChangeLogExecutorTestB"));
+  }
+
+  @Test
+  void executeLastUpdates() {
+    List<LastUpdate> lastUpdates = ChangeLogExecutor.executeLastUpdates(sqlDatabase.getJooq());
+    assertEquals(1, lastUpdates.size());
+    LastUpdate lastUpdate = lastUpdates.get(0);
+    assertEquals("ChangeLogExecutorTestA", lastUpdate.schemaName());
+  }
+}
diff --git a/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/SnowflakeIdGeneratorTest.java b/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/SnowflakeIdGeneratorTest.java
new file mode 100644
index 0000000000..d372fd4115
--- /dev/null
+++ b/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/SnowflakeIdGeneratorTest.java
@@ -0,0 +1,97 @@
+package org.molgenis.emx2.sql;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.time.Instant;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.molgenis.emx2.utils.generator.SnowflakeIdGenerator;
+
+public class SnowflakeIdGeneratorTest {
+
+  private static SnowflakeIdGenerator generator;
+
+  @BeforeAll
+  public static void before() {
+    if (!SnowflakeIdGenerator.hasInstance()) {
+      generator = SnowflakeIdGenerator.init("123");
+    } else {
+      generator = SnowflakeIdGenerator.getInstance();
+    }
+  }
+
+  @Test
+  public void testIdGenerationIsUnique() {
+    Set<String> generatedIds = new HashSet<>();
+
+    int totalIds = 100000;
+    for (int i = 0; i < totalIds; i++) {
+      String id = generator.generateId();
+      assertFalse(generatedIds.contains(id), "Duplicate ID found: " + id);
+      generatedIds.add(id);
+    }
+  }
+
+  @Test
+  public void testIdGenerationIsSorted() {
+    String[] generatedIds = new String[100000];
+
+    for (int i = 0; i < generatedIds.length; i++) {
+      generatedIds[i] = generator.generateId();
+    }
+
+    // Check if IDs are sorted
+    for (int i = 1; i < generatedIds.length; i++) {
+      assertTrue(
+          generatedIds[i - 1].compareTo(generatedIds[i]) <= 0,
+          "IDs are not sorted at index " + (i - 1) + " and " + i);
+    }
+  }
+
+  @Test
+  public void testUniqueIdsOnFourThreads() throws InterruptedException {
+    Set<String> uniqueIds = new HashSet<>();
+
+    ExecutorService executorService = Executors.newFixedThreadPool(4);
+
+    for (int i = 0; i < 100000; i++) {
+      executorService.submit(
+          () -> {
+            String id = generator.generateId();
+            synchronized (uniqueIds) {
+              uniqueIds.add(id);
+            }
+          });
+    }
+
+    // Shut down the executor and wait for tasks to finish
+    executorService.shutdown();
+    executorService.awaitTermination(1, TimeUnit.MINUTES);
+
+    // Verify that the number of unique IDs matches the total number of generated IDs
+    assertEquals(100000, uniqueIds.size(), "Not all generated IDs are unique.");
+  }
+
+  @Test
+  public void testExtractionInstanceIdFromSnowflake() {
+    String snowflakeId = generator.generateId();
+
+    String instanceIdFromSnowflake = SnowflakeIdGenerator.extractInstanceId(snowflakeId);
+    assertEquals(generator.getInstanceId(), instanceIdFromSnowflake);
+  }
+
+  @Test
+  public void testExtractTimestampFromSnowflake() {
+    long currentTime = Instant.now().toEpochMilli();
+    String snowflakeId = generator.generateId();
+
+    long snowflakeTimestamp = SnowflakeIdGenerator.extractTimestamp(snowflakeId);
+    // Allow a mismatch of 1ms
+    assertTrue(Math.abs(currentTime - snowflakeTimestamp) <= 1);
+  }
+}
diff --git a/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/TestSqlTypeUtils.java b/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/TestSqlTypeUtils.java
index 25a877a414..df04bfe32a 100644
--- a/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/TestSqlTypeUtils.java
+++ b/backend/molgenis-emx2-sql/src/test/java/org/molgenis/emx2/sql/TestSqlTypeUtils.java
@@ -4,14 +4,24 @@
 import static org.molgenis.emx2.TableMetadata.table;
 import static org.molgenis.emx2.sql.SqlTypeUtils.applyValidationAndComputed;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.molgenis.emx2.*;
+import org.molgenis.emx2.utils.generator.SnowflakeIdGenerator;
 
 class TestSqlTypeUtils {
 
+  @BeforeAll
+  static void before() {
+    if (!SnowflakeIdGenerator.hasInstance()) {
+      SnowflakeIdGenerator.init("123");
+    }
+  }
+
   @Test
   void autoIdGetsGenerated() {
     TableMetadata tableMetadata = table("Test", new Column("myCol").setType(ColumnType.AUTO_ID));
+
     final Row row = new Row("myCol", null);
     applyValidationAndComputed(tableMetadata.getColumns(), row);
     assertNotNull(row.getString("myCol"));
diff --git a/backend/molgenis-emx2-webapi/src/main/java/org/molgenis/emx2/web/MolgenisWebservice.java b/backend/molgenis-emx2-webapi/src/main/java/org/molgenis/emx2/web/MolgenisWebservice.java
index 41a6446401..9027b5fe69 100644
--- a/backend/molgenis-emx2-webapi/src/main/java/org/molgenis/emx2/web/MolgenisWebservice.java
+++ b/backend/molgenis-emx2-webapi/src/main/java/org/molgenis/emx2/web/MolgenisWebservice.java
@@ -24,6 +24,7 @@ public class MolgenisWebservice {
   public static final String MANAGER = "Manager";
   public static final String ROLE = "role";
   public static final String VIEWER = "Viewer";
+  public static final long MAX_REQUEST_SIZE = 10_000_000L;
   static final String TEMPFILES_DELETE_ON_EXIT = "tempfiles-delete-on-exit";
   static final Logger logger = LoggerFactory.getLogger(MolgenisWebservice.class);
   private static final String ROBOTS_TXT = "robots.txt";
@@ -42,6 +43,7 @@ public static void start(int port) {
     Javalin app =
         Javalin.create(
                 config -> {
+                  config.http.maxRequestSize = MAX_REQUEST_SIZE;
                   config.router.ignoreTrailingSlashes = true;
                   config.router.treatMultipleSlashesAsSingleSlash = true;
                   config.jetty.modifyServletContextHandler(
diff --git a/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Constants.java b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Constants.java
index 82c9b7b88a..74f5dc79a0 100644
--- a/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Constants.java
+++ b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Constants.java
@@ -49,6 +49,7 @@ public class Constants {
   public static final String MOLGENIS_POSTGRES_PASS = "MOLGENIS_POSTGRES_PASS";
   public static final String MOLGENIS_HTTP_PORT = "MOLGENIS_HTTP_PORT";
   public static final String MOLGENIS_ADMIN_PW = "MOLGENIS_ADMIN_PW";
+  public static final String MOLGENIS_INSTANCE_ID = "MOLGENIS_INSTANCE_ID";
 
   public static final String IS_OIDC_ENABLED = "isOidcEnabled";
   public static final String MOLGENIS_OIDC_CLIENT_ID = "MOLGENIS_OIDC_CLIENT_ID";
diff --git a/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Database.java b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Database.java
index 103de3c278..380cf673cf 100644
--- a/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Database.java
+++ b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Database.java
@@ -99,4 +99,6 @@ public interface Database extends HasSettingsInterface<Database> {
   Database setBindings(Map<String, Supplier<Object>> bindings);
 
   Map<String, Supplier<Object>> getJavaScriptBindings();
+
+  List<LastUpdate> getLastUpdated();
 }
diff --git a/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/LastUpdate.java b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/LastUpdate.java
new file mode 100644
index 0000000000..f1cbaf8cf8
--- /dev/null
+++ b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/LastUpdate.java
@@ -0,0 +1,6 @@
+package org.molgenis.emx2;
+
+import java.sql.Timestamp;
+
+public record LastUpdate(
+    char operation, Timestamp stamp, String userId, String tableName, String schemaName) {}
diff --git a/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/utils/generator/SnowflakeIdGenerator.java b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/utils/generator/SnowflakeIdGenerator.java
new file mode 100644
index 0000000000..f43a4d0f73
--- /dev/null
+++ b/backend/molgenis-emx2/src/main/java/org/molgenis/emx2/utils/generator/SnowflakeIdGenerator.java
@@ -0,0 +1,155 @@
+package org.molgenis.emx2.utils.generator;
+
+import java.math.BigInteger;
+import java.time.Instant;
+import org.molgenis.emx2.MolgenisException;
+
+public class SnowflakeIdGenerator implements IdGenerator {
+
+  private static SnowflakeIdGenerator instance;
+  private final String instanceId;
+
+  private static final String BASE62_CHARACTERS =
+      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+  private static final long EPOCH = 1727740800000L; // 1 October 2024 00:00:00
+
+  public static final int TOTAL_BITS = 64;
+  public static final int TIMESTAMP_BITS = 41; // 69 years of ids
+  public static final int SEQUENCE_BITS = 8; // 2^8 (256) ids per ms
+  public static final int ID_BITS =
+      TOTAL_BITS
+          - TIMESTAMP_BITS
+          - SEQUENCE_BITS; // 15 bits left for the instanceId ~= 32K unique hashes
+
+  public static final long MAX_TIMESTAMP = maxValueForBits(TIMESTAMP_BITS);
+  public static final long MAX_SEQUENCE = maxValueForBits(SEQUENCE_BITS);
+  public static final long MAX_ID = maxValueForBits(ID_BITS);
+
+  private long lastTimestamp = -1L;
+  private long sequence = 0L;
+
+  private SnowflakeIdGenerator(String instanceId) {
+    this.instanceId = instanceId;
+  }
+
+  public static synchronized SnowflakeIdGenerator getInstance() {
+    if (instance == null) {
+      throw new MolgenisException("SnowflakeIdGenerator not initialized");
+    }
+    return instance;
+  }
+
+  public static synchronized SnowflakeIdGenerator init(String instanceId) {
+    if (instance != null) {
+      throw new MolgenisException("SnowflakeIdGenerator is already initialized");
+    }
+    instance = new SnowflakeIdGenerator(instanceId);
+    return instance;
+  }
+
+  public static boolean hasInstance() {
+    return instance != null;
+  }
+
+  public synchronized String generateId() {
+    long currentTimestamp = getCurrentTimestamp();
+
+    if (currentTimestamp == lastTimestamp) {
+      sequence = (sequence + 1) & MAX_SEQUENCE;
+      if (sequence == 0) {
+        currentTimestamp = waitForNextMillis(currentTimestamp);
+      }
+    } else {
+      sequence = 0;
+    }
+    lastTimestamp = currentTimestamp;
+
+    long instanceIdBits = getInstanceIdBits(instanceId);
+
+    BigInteger timePart = BigInteger.valueOf(currentTimestamp).shiftLeft(ID_BITS + SEQUENCE_BITS);
+    BigInteger instancePart = BigInteger.valueOf(instanceIdBits).shiftLeft(SEQUENCE_BITS);
+    BigInteger sequencePart = BigInteger.valueOf(sequence);
+
+    BigInteger snowflakeId = timePart.or(instancePart).or(sequencePart);
+
+    return base62Encode(snowflakeId);
+  }
+
+  public static String extractInstanceId(String snowflakeId) {
+    BigInteger decodedSnowflakeId = base62Decode(snowflakeId);
+    BigInteger instancePart = decodedSnowflakeId.shiftRight(SEQUENCE_BITS);
+    BigInteger instanceIdBits = instancePart.and(BigInteger.valueOf(MAX_ID));
+
+    return instanceIdBits.toString();
+  }
+
+  public static long extractTimestamp(String snowflakeId) {
+    BigInteger decodedSnowflakeId = base62Decode(snowflakeId);
+    BigInteger timestampPart = decodedSnowflakeId.shiftRight(ID_BITS + SEQUENCE_BITS);
+
+    return timestampPart.longValue() + EPOCH;
+  }
+
+  private static long getInstanceIdBits(String instanceId) {
+    long instanceIdBits = Long.parseLong(instanceId);
+    if (instanceIdBits > MAX_ID) {
+      throw new MolgenisException("Instance id too large: " + instanceId);
+    }
+    return instanceIdBits;
+  }
+
+  private static long maxValueForBits(int bits) {
+    return (1L << bits) - 1;
+  }
+
+  private static String base62Encode(BigInteger snowflakeId) {
+    StringBuilder encoded = new StringBuilder();
+    BigInteger base = BigInteger.valueOf(BASE62_CHARACTERS.length());
+
+    while (snowflakeId.compareTo(BigInteger.ZERO) > 0) {
+      int remainder = snowflakeId.mod(base).intValue();
+      encoded.insert(0, BASE62_CHARACTERS.charAt(remainder));
+
+      snowflakeId = snowflakeId.divide(base);
+    }
+
+    return encoded.toString();
+  }
+
+  private static BigInteger base62Decode(String encoded) {
+    BigInteger result = BigInteger.ZERO;
+    BigInteger base = BigInteger.valueOf(BASE62_CHARACTERS.length());
+
+    for (int i = 0; i < encoded.length(); i++) {
+      int charIndex = BASE62_CHARACTERS.indexOf(encoded.charAt(i));
+      if (charIndex == -1) {
+        throw new IllegalArgumentException("Invalid character in Base62 encoded string");
+      }
+      result = result.multiply(base).add(BigInteger.valueOf(charIndex));
+    }
+
+    return result;
+  }
+
+  private long getCurrentTimestamp() {
+    long now = Instant.now().toEpochMilli();
+    long currentTimestamp = now - EPOCH;
+
+    if (currentTimestamp > MAX_TIMESTAMP) {
+      throw new MolgenisException("Snowflake id too old");
+    }
+    return currentTimestamp;
+  }
+
+  private long waitForNextMillis(long currentTimestamp) {
+    long newTimestamp = getCurrentTimestamp();
+    while (newTimestamp <= currentTimestamp) {
+      newTimestamp = getCurrentTimestamp();
+    }
+    return newTimestamp;
+  }
+
+  public String getInstanceId() {
+    return this.instanceId;
+  }
+}
diff --git a/e2e/package.json b/e2e/package.json
index 06963d5d92..7dbf15c0a5 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -13,7 +13,7 @@
     "test:tw-forms": "playwright test --grep '@tw-forms' --reporter=line"
   },
   "dependencies": {
-    "@playwright/test": "1.47.1",
+    "@playwright/test": "1.48.0",
     "install": "0.13.0"
   }
 }