diff --git a/package-lock.json b/package-lock.json
index 4d133b4bf..0218a4525 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@bimdata/components": "1.10.1",
         "@bimdata/design-system": "2.4.2",
         "@bimdata/typescript-fetch-api-client": "10.40.0",
-        "@bimdata/viewer": "2.18.0-beta.1",
+        "@bimdata/viewer": "2.17.1-alpha.fragments.2",
         "@paddle/paddle-js": "^1.6.4",
         "async": "^3.2.6",
         "lodash": "^4.18.1",
@@ -1887,15 +1887,15 @@
       "integrity": "sha512-Gf4TfNMzpzNHj8NRMJpqHTw+HMY5Zw14rnxv9P83MobPlChQya0SkAqqVCXa2SA6T8z8w+bxln/HOSOLbc0F0A=="
     },
     "node_modules/@bimdata/viewer": {
-      "version": "2.18.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@bimdata/viewer/-/viewer-2.18.0-beta.1.tgz",
-      "integrity": "sha512-KUdXHVIg9fr5B1IsoVp75heCJ3RPqqmgL3bUqtyhSV1WwvbqfpvxOVjvkMDKipyycqbwk6m/yLwm1EfIl+Omag=="
+      "version": "2.17.1-alpha.fragments.2",
+      "resolved": "https://registry.npmjs.org/@bimdata/viewer/-/viewer-2.17.1-alpha.fragments.2.tgz",
+      "integrity": "sha512-5vo0etr9q0SJkl7cbsTpa8Aou446mE4rkgQy/9GCDiijKyCknTlkV1RbaKoM8XcZ/YRUmkTJ73cukeHTyLLBUA=="
     },
     "node_modules/@bufbuild/protobuf": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.12.0.tgz",
       "integrity": "sha512-B/XlCaFIP8LOwzo+bz5uFzATYokcwCKQcghqnlfwSmM5eX/qTkvDBnDPs+gXtX/RyjxJ4DRikECcPJbyALA8FA==",
-      "devOptional": true,
+      "dev": true,
       "license": "(Apache-2.0 AND BSD-3-Clause)"
     },
     "node_modules/@colors/colors": {
@@ -1963,6 +1963,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
       "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1974,6 +1975,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
       "license": "0BSD",
       "optional": true
     },
@@ -1981,6 +1983,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
       "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1991,6 +1994,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
       "license": "0BSD",
       "optional": true
     },
@@ -1998,6 +2002,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
       "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2008,6 +2013,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
       "license": "0BSD",
       "optional": true
     },
@@ -2809,6 +2815,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
       "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -3001,6 +3008,7 @@
       "version": "2.5.6",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
       "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -3040,6 +3048,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3060,6 +3069,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3080,6 +3090,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3100,6 +3111,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3120,6 +3132,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3140,6 +3153,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3160,6 +3174,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3180,6 +3195,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3200,6 +3216,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3220,6 +3237,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3240,6 +3258,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3260,6 +3279,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3280,6 +3300,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3369,6 +3390,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3385,6 +3407,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3401,6 +3424,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3417,6 +3441,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3433,6 +3458,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3449,6 +3475,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3465,6 +3492,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3481,6 +3509,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3497,6 +3526,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3513,6 +3543,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3529,6 +3560,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3545,6 +3577,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3561,6 +3594,7 @@
       "cpu": [
         "wasm32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -3579,6 +3613,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3595,6 +3630,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4265,6 +4301,7 @@
       "version": "0.10.2",
       "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
       "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -4275,6 +4312,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
       "license": "0BSD",
       "optional": true
     },
@@ -4387,7 +4425,7 @@
       "version": "25.9.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz",
       "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": ">=7.24.0 <7.24.7"
@@ -6015,7 +6053,7 @@
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
       "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/colors": {
@@ -7686,6 +7724,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -7975,7 +8014,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -8187,7 +8226,7 @@
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
       "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/import-fresh": {
@@ -8351,7 +8390,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -8387,7 +8426,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -9459,6 +9498,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9479,6 +9519,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9499,6 +9540,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9519,6 +9561,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9539,6 +9582,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9559,6 +9603,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9579,6 +9624,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9599,6 +9645,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9619,6 +9666,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9639,6 +9687,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -9659,6 +9708,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -10512,6 +10562,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -13768,7 +13819,7 @@
       "version": "7.8.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
       "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
@@ -13778,7 +13829,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "devOptional": true,
+      "dev": true,
       "license": "0BSD"
     },
     "node_modules/safe-buffer": {
@@ -13813,6 +13864,7 @@
       "version": "1.100.0",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.100.0.tgz",
       "integrity": "sha512-B5j0rYMlinhhOo9tjQebMVVn0TfyXAF+wB3b2ggZUuJ/is/Y+7+JGjirAMxHZ9Z3hIP98NPfamlAkBHa1lAaXQ==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -13834,7 +13886,7 @@
       "version": "1.100.0",
       "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.100.0.tgz",
       "integrity": "sha512-Ut8wlQSk19tm7jMK6mz6cF1+e+E7tUnW2tM02zQDPnOTcVbV8qCQG8UWxZkkNlY50+hV3hqP24OOkUlMz8xBpw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bufbuild/protobuf": "^2.5.0",
@@ -13882,6 +13934,7 @@
         "!riscv64",
         "!x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -13895,6 +13948,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -13911,6 +13965,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -13927,6 +13982,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -13943,6 +13999,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -13959,6 +14016,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -13975,6 +14033,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -13991,6 +14050,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14007,6 +14067,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14023,6 +14084,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14039,6 +14101,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14055,6 +14118,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14071,6 +14135,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14087,6 +14152,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14103,6 +14169,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14116,6 +14183,7 @@
       "version": "1.100.0",
       "resolved": "https://registry.npmjs.org/sass-embedded-unknown-all/-/sass-embedded-unknown-all-1.100.0.tgz",
       "integrity": "sha512-c+naBgWId4MIpToXcI0DgqetjdAkwTTAxFAuOaBz7HUXLdyG1oZRrEvSsbe41nEdQOKH0vgofVFCeSQgoXOG9A==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14135,6 +14203,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14151,6 +14220,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -14164,7 +14234,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -15297,7 +15367,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
       "integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "sync-message-port": "^1.0.0"
@@ -15310,7 +15380,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.2.0.tgz",
       "integrity": "sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=16.0.0"
@@ -15767,7 +15837,7 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",
       "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
@@ -16036,7 +16106,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
       "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/verror": {
diff --git a/package.json b/package.json
index 4a659146c..5401c269b 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@bimdata/components": "1.10.1",
     "@bimdata/design-system": "2.4.2",
     "@bimdata/typescript-fetch-api-client": "10.40.0",
-    "@bimdata/viewer": "2.18.0-beta.1",
+    "@bimdata/viewer": "2.17.1-alpha.fragments.2",
     "@paddle/paddle-js": "^1.6.4",
     "async": "^3.2.6",
     "lodash": "^4.18.1",
diff --git a/src/components/specific/models/models-table/columns.js b/src/components/specific/models/models-table/columns.js
index 940e6f7e4..f5e8d8286 100644
--- a/src/components/specific/models/models-table/columns.js
+++ b/src/components/specific/models/models-table/columns.js
@@ -33,7 +33,7 @@ export default [
   {
     id: "lastupdate",
     text: "t.modifiedOn",
-    width: "160px",
+    width: "140px",
     align: "center",
   },
   {
@@ -45,6 +45,6 @@ export default [
   {
     id: "actions",
     label: " ",
-    width: "200px",
+    width: "220px",
   },
 ];
diff --git a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss
index 962de3cd0..537e79f2a 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss
+++ b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.scss
@@ -3,7 +3,43 @@
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  gap: calc(var(--spacing-unit) * 3 / 2);
+  gap: calc(var(--spacing-unit) / 2);
+
+  .actions-btn {
+    gap: var(--spacing-unit);
+  }
+
+  .separator {
+    width: 1px;
+    height: 30px;
+    background-color: var(--color-primary);
+    flex-shrink: 0;
+  }
+
+  .viewer-fragments {
+    position: relative;
+    &:deep(.bimdata-btn) {
+      display: flex;
+      flex-direction: column;
+      background-color: #fef6df;
+      & > span {
+        line-height: 1;
+      }
+    }
+    .beta-label {
+      font-size: 8px;
+    }
+    ::before {
+      content: "";
+      width: 8px;
+      height: 8px;
+      background: var(--color-secondary);
+      clip-path: polygon(50% 0%, 60% 40%, 100% 50%, 60% 60%, 50% 100%, 40% 60%, 0% 50%, 40% 40%);
+      position: absolute;
+      left: 4%;
+      top: 20%;
+    }
+  }
 
   &__btn {
     color: var(--color-granite-light);
diff --git a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
index cbc5a64c2..1fd3c8108 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
+++ b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
@@ -1,94 +1,113 @@
 <template>
   <div class="model-actions-cell" v-click-away="closeMenu">
-    <template v-if="model.type === MODEL_TYPE.META_BUILDING">
-      <BIMDataButton color="primary" outline radius icon @click="onClick('view-metaBuilding')">
-        <BIMDataIconStructure size="s" />
-      </BIMDataButton>
-    </template>
+    <div v-if="isModelReady" class="actions-btn flex items-center">
+      <template v-if="model.type === MODEL_TYPE.META_BUILDING">
+        <BIMDataButton color="primary" outline radius icon @click="onClick('view-metaBuilding')">
+          <BIMDataIconStructure size="s" />
+        </BIMDataButton>
+      </template>
 
-    <template v-if="model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING">
-      <BIMDataButton
-        color="primary"
-        outline
-        radius
-        icon
-        @click="onClick('view-photosphereBuilding')"
-      >
-        <BIMDataIconStructure size="s" />
-      </BIMDataButton>
-    </template>
+      <template v-if="model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING">
+        <BIMDataButton
+          color="primary"
+          outline
+          radius
+          icon
+          @click="onClick('view-photosphereBuilding')"
+        >
+          <BIMDataIconStructure size="s" />
+        </BIMDataButton>
+      </template>
+
+      <template v-if="model.type === MODEL_TYPE.IFC">
+        <template v-for="window of [WINDOWS.IFC2D, WINDOWS.IFC3D]" :key="window">
+          <ViewerButton
+            :disabled="!isModelReady"
+            :project="project"
+            :model="model"
+            :window="window"
+          />
+        </template>
+      </template>
 
-    <template v-if="model.type === MODEL_TYPE.IFC">
-      <template v-for="window of [WINDOWS.IFC2D, WINDOWS.IFC3D]" :key="window">
+      <template v-else-if="model.type === MODEL_TYPE.DWG">
         <ViewerButton
           :disabled="!isModelReady"
           :project="project"
           :model="model"
-          :window="window"
+          :window="WINDOWS.DWG"
+          text="2D"
         />
       </template>
-    </template>
 
-    <template v-else-if="model.type === MODEL_TYPE.DWG">
-      <ViewerButton
-        :disabled="!isModelReady"
-        :project="project"
-        :model="model"
-        :window="WINDOWS.DWG"
-        text="2D"
-      />
-    </template>
+      <template v-else-if="model.type === MODEL_TYPE.DXF">
+        <ViewerButton
+          :disabled="!isModelReady"
+          :project="project"
+          :model="model"
+          :window="WINDOWS.DXF"
+          text="2D"
+        />
+      </template>
 
-    <template v-else-if="model.type === MODEL_TYPE.DXF">
-      <ViewerButton
-        :disabled="!isModelReady"
-        :project="project"
-        :model="model"
-        :window="WINDOWS.DXF"
-        text="2D"
-      />
-    </template>
+      <template
+        v-else-if="
+          model.type === MODEL_TYPE.JPEG ||
+          model.type === MODEL_TYPE.META_BUILDING ||
+          model.type === MODEL_TYPE.PDF ||
+          model.type === MODEL_TYPE.PNG
+        "
+      >
+        <ViewerButton
+          :disabled="!isModelReady"
+          :project="project"
+          :model="model"
+          :window="WINDOWS.PLAN"
+          text="2D"
+        />
+      </template>
 
-    <template
-      v-else-if="
-        model.type === MODEL_TYPE.JPEG ||
-        model.type === MODEL_TYPE.META_BUILDING ||
-        model.type === MODEL_TYPE.PDF ||
-        model.type === MODEL_TYPE.PNG
-      "
-    >
-      <ViewerButton
-        :disabled="!isModelReady"
-        :project="project"
-        :model="model"
-        :window="WINDOWS.PLAN"
-        text="2D"
-      />
-    </template>
+      <template v-else-if="model.type === MODEL_TYPE.POINT_CLOUD">
+        <ViewerButton
+          :disabled="!isModelReady"
+          :project="project"
+          :model="model"
+          :window="WINDOWS.POINT_CLOUD"
+          text="3D"
+        />
+      </template>
 
-    <template v-else-if="model.type === MODEL_TYPE.POINT_CLOUD">
-      <ViewerButton
-        :disabled="!isModelReady"
-        :project="project"
-        :model="model"
-        :window="WINDOWS.POINT_CLOUD"
-        text="3D"
-      />
-    </template>
+      <template
+        v-else-if="
+          model.type === MODEL_TYPE.PHOTOSPHERE || model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING
+        "
+      >
+        <ViewerButton
+          :disabled="!isModelReady"
+          :project="project"
+          :model="model"
+          :window="WINDOWS.PHOTOSPHERE"
+          text="2D"
+        />
+      </template>
 
-    <template
-      v-else-if="
-        model.type === MODEL_TYPE.PHOTOSPHERE || model.type === MODEL_TYPE.PHOTOSPHERE_BUILDING
-      "
-    >
-      <ViewerButton
-        :disabled="!isModelReady"
-        :project="project"
-        :model="model"
-        :window="WINDOWS.PHOTOSPHERE"
-        text="2D"
-      />
-    </template>
+      <template v-if="model.type === MODEL_TYPE.IFC">
+        <div class="separator"></div>
+        <ViewerButton
+          :disabled="!isModelReady"
+          :project="project"
+          :model="model"
+          :window="WINDOWS.FRAGMENTS"
+          color="secondary"
+          text="3D"
+          class="viewer-fragments"
+        >
+          <template #subtext>
+            <span class="beta-label">Bêta</span>
+          </template>
+        </ViewerButton>
+      </template>
+    </div>
 
     <template v-if="model.document_id">
       <BIMDataButton
@@ -180,7 +199,9 @@ export default {
     const isOpen = ref(false);
     const isModelReady = computed(() => MODEL_STATUS.COMPLETED === props.model.status);
 
-    const modelDocument = computed(() => handler.get({ nature: FILE_TYPE.DOCUMENT, id: props.model.document_id }));
+    const modelDocument = computed(() =>
+      handler.get({ nature: FILE_TYPE.DOCUMENT, id: props.model.document_id }),
+    );
 
     const menuItems = ref([]);
     const openMenu = () => {
diff --git a/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue b/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue
index ac5e9b963..cf3b0b645 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue
+++ b/src/components/specific/models/models-table/model-actions-cell/ViewerButton.vue
@@ -8,22 +8,18 @@
       params: {
         spaceID: project.cloud.id,
         projectID: project.id,
-        modelIDs: model.id
+        modelIDs: model.id,
       },
       query: {
-        window
-      }
+        window,
+      },
     }"
   >
-    <BIMDataButton
-      :disabled="disabled"
-      class="viewer-button"
-      color="granite"
-      outline
-      radius
-      icon
-    >
-      {{ text || window.toUpperCase() }}
+    <BIMDataButton :disabled="disabled" class="viewer-button" :color="color" outline radius icon>
+      <span>
+        {{ text || window.toUpperCase() }}
+      </span>
+      <slot name="subtext"> </slot>
     </BIMDataButton>
   </AppLink>
 </template>
@@ -37,23 +33,27 @@ import AppLink from "../../../app/app-link/AppLink.vue";
 defineProps({
   project: {
     type: Object,
-    required: true
+    required: true,
   },
   model: {
     type: Object,
-    required: true
+    required: true,
   },
   window: {
     type: String,
-    default: DEFAULT_WINDOW
+    default: DEFAULT_WINDOW,
   },
   disabled: {
     type: Boolean,
-    default: false
+    default: false,
   },
   text: {
-    type: String
-  }
+    type: String,
+  },
+  color: {
+    type: String,
+    default: "granite",
+  },
 });
 </script>
 
diff --git a/src/config/viewer.js b/src/config/viewer.js
index 59ff1b11e..6d18ef51d 100644
--- a/src/config/viewer.js
+++ b/src/config/viewer.js
@@ -16,7 +16,8 @@ const WINDOWS = Object.freeze({
   IFC3D: "3d",
   PHOTOSPHERE: "photosphere",
   PLAN: "plan",
-  POINT_CLOUD: "pointCloud"
+  POINT_CLOUD: "pointCloud",
+  FRAGMENTS: "3d-fragments",
 });
 
 /**
@@ -32,9 +33,9 @@ const PLUGINS_CONFIG = {
   "anchor-synchronization": false,
   bcfManager: true,
   buildingMaker: true,
-  "drawing-tools" : true,
+  "drawing-tools": true,
   header: {
-    warnings: false
+    warnings: false,
   },
   pdfExport: false,
   properties: {
@@ -44,7 +45,7 @@ const PLUGINS_CONFIG = {
   split: true,
   structure: {
     export: true,
-    merge: true
+    merge: true,
   },
   "structure-properties": {
     editProperties: true,
@@ -56,8 +57,9 @@ const PLUGINS_CONFIG = {
   viewer3d: {
     enableDTX: true,
   },
+  "viewer3d-fragments": true,
   "zone-editor": true,
-  "zone-editor-button": true
+  "zone-editor-button": true,
 };
 
 export { AVAILABLE_PLUGINS, DEFAULT_WINDOW, PLUGINS_CONFIG, WINDOWS };