diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ccc89b44..81386c2e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/ui-bff-build.yml b/.github/workflows/ui-bff-build.yml
index 9248d2dee..e3e4727ed 100644
--- a/.github/workflows/ui-bff-build.yml
+++ b/.github/workflows/ui-bff-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22.2"
+          go-version: "1.23.5"
 
       - name: Clean
         working-directory: clients/ui/bff
@@ -27,7 +27,7 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.57.2
+          version: v1.63.4
           working-directory: clients/ui/bff/
 
       - name: Build
diff --git a/README.md b/README.md
index f7faef0cb..39b94336c 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Model registry provides a central repository for model developers to store and m
 8. [UI](.clients/ui/README.md)
 
 ## Pre-requisites:
-- go >= 1.21
+- go >= 1.22
 - protoc v24.3 - [Protocol Buffers v24.3 Release](https://github.com/protocolbuffers/protobuf/releases/tag/v24.3)
 - npm >= 10.2.0 - [Installing Node.js and npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
 - Java >= 11.0
@@ -173,7 +173,7 @@ To delete something, simply update its status.
 ## Tips
 ### Pull image rate limiting
 
-Ocassionally you may encounter an 'ImagePullBackOff' error when deploying the Model Registry manifests. See example below for the `model-registry-db` container. 
+Ocassionally you may encounter an 'ImagePullBackOff' error when deploying the Model Registry manifests. See example below for the `model-registry-db` container.
 
 ```
 Failed to pull image “mysql:8.3.0”: rpc error: code = Unknown desc = fetching target platform image selected from image index: reading manifest sha256:f9097d95a4ba5451fff79f4110ea6d750ac17ca08840f1190a73320b84ca4c62 in docker.io/library/mysql: toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
diff --git a/clients/python/poetry.lock b/clients/python/poetry.lock
index 71cce3eba..31f9dc4c4 100644
--- a/clients/python/poetry.lock
+++ b/clients/python/poetry.lock
@@ -1053,43 +1053,49 @@ files = [
 
 [[package]]
 name = "mypy"
-version = "1.14.0"
+version = "1.14.1"
 description = "Optional static typing for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "mypy-1.14.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e971c1c667007f9f2b397ffa80fa8e1e0adccff336e5e77e74cb5f22868bee87"},
-    {file = "mypy-1.14.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e86aaeaa3221a278c66d3d673b297232947d873773d61ca3ee0e28b2ff027179"},
-    {file = "mypy-1.14.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1628c5c3ce823d296e41e2984ff88c5861499041cb416a8809615d0c1f41740e"},
-    {file = "mypy-1.14.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:7fadb29b77fc14a0dd81304ed73c828c3e5cde0016c7e668a86a3e0dfc9f3af3"},
-    {file = "mypy-1.14.0-cp310-cp310-win_amd64.whl", hash = "sha256:3fa76988dc760da377c1e5069200a50d9eaaccf34f4ea18428a3337034ab5a44"},
-    {file = "mypy-1.14.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6e73c8a154eed31db3445fe28f63ad2d97b674b911c00191416cf7f6459fd49a"},
-    {file = "mypy-1.14.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:273e70fcb2e38c5405a188425aa60b984ffdcef65d6c746ea5813024b68c73dc"},
-    {file = "mypy-1.14.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1daca283d732943731a6a9f20fdbcaa927f160bc51602b1d4ef880a6fb252015"},
-    {file = "mypy-1.14.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:7e68047bedb04c1c25bba9901ea46ff60d5eaac2d71b1f2161f33107e2b368eb"},
-    {file = "mypy-1.14.0-cp311-cp311-win_amd64.whl", hash = "sha256:7a52f26b9c9b1664a60d87675f3bae00b5c7f2806e0c2800545a32c325920bcc"},
-    {file = "mypy-1.14.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d5326ab70a6db8e856d59ad4cb72741124950cbbf32e7b70e30166ba7bbf61dd"},
-    {file = "mypy-1.14.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:bf4ec4980bec1e0e24e5075f449d014011527ae0055884c7e3abc6a99cd2c7f1"},
-    {file = "mypy-1.14.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:390dfb898239c25289495500f12fa73aa7f24a4c6d90ccdc165762462b998d63"},
-    {file = "mypy-1.14.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7e026d55ddcd76e29e87865c08cbe2d0104e2b3153a523c529de584759379d3d"},
-    {file = "mypy-1.14.0-cp312-cp312-win_amd64.whl", hash = "sha256:585ed36031d0b3ee362e5107ef449a8b5dfd4e9c90ccbe36414ee405ee6b32ba"},
-    {file = "mypy-1.14.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e9f6f4c0b27401d14c483c622bc5105eff3911634d576bbdf6695b9a7c1ba741"},
-    {file = "mypy-1.14.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b2280cedcb312c7a79f5001ae5325582d0d339bce684e4a529069d0e7ca1e7"},
-    {file = "mypy-1.14.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:342de51c48bab326bfc77ce056ba08c076d82ce4f5a86621f972ed39970f94d8"},
-    {file = "mypy-1.14.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:00df23b42e533e02a6f0055e54de9a6ed491cd8b7ea738647364fd3a39ea7efc"},
-    {file = "mypy-1.14.0-cp313-cp313-win_amd64.whl", hash = "sha256:e8c8387e5d9dff80e7daf961df357c80e694e942d9755f3ad77d69b0957b8e3f"},
-    {file = "mypy-1.14.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b16738b1d80ec4334654e89e798eb705ac0c36c8a5c4798496cd3623aa02286"},
-    {file = "mypy-1.14.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:10065fcebb7c66df04b05fc799a854b1ae24d9963c8bb27e9064a9bdb43aa8ad"},
-    {file = "mypy-1.14.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fbb7d683fa6bdecaa106e8368aa973ecc0ddb79a9eaeb4b821591ecd07e9e03c"},
-    {file = "mypy-1.14.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:3498cb55448dc5533e438cd13d6ddd28654559c8c4d1fd4b5ca57a31b81bac01"},
-    {file = "mypy-1.14.0-cp38-cp38-win_amd64.whl", hash = "sha256:c7b243408ea43755f3a21a0a08e5c5ae30eddb4c58a80f415ca6b118816e60aa"},
-    {file = "mypy-1.14.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:14117b9da3305b39860d0aa34b8f1ff74d209a368829a584eb77524389a9c13e"},
-    {file = "mypy-1.14.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:af98c5a958f9c37404bd4eef2f920b94874507e146ed6ee559f185b8809c44cc"},
-    {file = "mypy-1.14.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f0b343a1d3989547024377c2ba0dca9c74a2428ad6ed24283c213af8dbb0710b"},
-    {file = "mypy-1.14.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:cdb5563c1726c85fb201be383168f8c866032db95e1095600806625b3a648cb7"},
-    {file = "mypy-1.14.0-cp39-cp39-win_amd64.whl", hash = "sha256:74e925649c1ee0a79aa7448baf2668d81cc287dc5782cff6a04ee93f40fb8d3f"},
-    {file = "mypy-1.14.0-py3-none-any.whl", hash = "sha256:2238d7f93fc4027ed1efc944507683df3ba406445a2b6c96e79666a045aadfab"},
-    {file = "mypy-1.14.0.tar.gz", hash = "sha256:822dbd184d4a9804df5a7d5335a68cf7662930e70b8c1bc976645d1509f9a9d6"},
+    {file = "mypy-1.14.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:52686e37cf13d559f668aa398dd7ddf1f92c5d613e4f8cb262be2fb4fedb0fcb"},
+    {file = "mypy-1.14.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1fb545ca340537d4b45d3eecdb3def05e913299ca72c290326be19b3804b39c0"},
+    {file = "mypy-1.14.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:90716d8b2d1f4cd503309788e51366f07c56635a3309b0f6a32547eaaa36a64d"},
+    {file = "mypy-1.14.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2ae753f5c9fef278bcf12e1a564351764f2a6da579d4a81347e1d5a15819997b"},
+    {file = "mypy-1.14.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:e0fe0f5feaafcb04505bcf439e991c6d8f1bf8b15f12b05feeed96e9e7bf1427"},
+    {file = "mypy-1.14.1-cp310-cp310-win_amd64.whl", hash = "sha256:7d54bd85b925e501c555a3227f3ec0cfc54ee8b6930bd6141ec872d1c572f81f"},
+    {file = "mypy-1.14.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f995e511de847791c3b11ed90084a7a0aafdc074ab88c5a9711622fe4751138c"},
+    {file = "mypy-1.14.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d64169ec3b8461311f8ce2fd2eb5d33e2d0f2c7b49116259c51d0d96edee48d1"},
+    {file = "mypy-1.14.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ba24549de7b89b6381b91fbc068d798192b1b5201987070319889e93038967a8"},
+    {file = "mypy-1.14.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:183cf0a45457d28ff9d758730cd0210419ac27d4d3f285beda038c9083363b1f"},
+    {file = "mypy-1.14.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f2a0ecc86378f45347f586e4163d1769dd81c5a223d577fe351f26b179e148b1"},
+    {file = "mypy-1.14.1-cp311-cp311-win_amd64.whl", hash = "sha256:ad3301ebebec9e8ee7135d8e3109ca76c23752bac1e717bc84cd3836b4bf3eae"},
+    {file = "mypy-1.14.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:30ff5ef8519bbc2e18b3b54521ec319513a26f1bba19a7582e7b1f58a6e69f14"},
+    {file = "mypy-1.14.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cb9f255c18052343c70234907e2e532bc7e55a62565d64536dbc7706a20b78b9"},
+    {file = "mypy-1.14.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8b4e3413e0bddea671012b063e27591b953d653209e7a4fa5e48759cda77ca11"},
+    {file = "mypy-1.14.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:553c293b1fbdebb6c3c4030589dab9fafb6dfa768995a453d8a5d3b23784af2e"},
+    {file = "mypy-1.14.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fad79bfe3b65fe6a1efaed97b445c3d37f7be9fdc348bdb2d7cac75579607c89"},
+    {file = "mypy-1.14.1-cp312-cp312-win_amd64.whl", hash = "sha256:8fa2220e54d2946e94ab6dbb3ba0a992795bd68b16dc852db33028df2b00191b"},
+    {file = "mypy-1.14.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:92c3ed5afb06c3a8e188cb5da4984cab9ec9a77ba956ee419c68a388b4595255"},
+    {file = "mypy-1.14.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:dbec574648b3e25f43d23577309b16534431db4ddc09fda50841f1e34e64ed34"},
+    {file = "mypy-1.14.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8c6d94b16d62eb3e947281aa7347d78236688e21081f11de976376cf010eb31a"},
+    {file = "mypy-1.14.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d4b19b03fdf54f3c5b2fa474c56b4c13c9dbfb9a2db4370ede7ec11a2c5927d9"},
+    {file = "mypy-1.14.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:0c911fde686394753fff899c409fd4e16e9b294c24bfd5e1ea4675deae1ac6fd"},
+    {file = "mypy-1.14.1-cp313-cp313-win_amd64.whl", hash = "sha256:8b21525cb51671219f5307be85f7e646a153e5acc656e5cebf64bfa076c50107"},
+    {file = "mypy-1.14.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7084fb8f1128c76cd9cf68fe5971b37072598e7c31b2f9f95586b65c741a9d31"},
+    {file = "mypy-1.14.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:8f845a00b4f420f693f870eaee5f3e2692fa84cc8514496114649cfa8fd5e2c6"},
+    {file = "mypy-1.14.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:44bf464499f0e3a2d14d58b54674dee25c031703b2ffc35064bd0df2e0fac319"},
+    {file = "mypy-1.14.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c99f27732c0b7dc847adb21c9d47ce57eb48fa33a17bc6d7d5c5e9f9e7ae5bac"},
+    {file = "mypy-1.14.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:bce23c7377b43602baa0bd22ea3265c49b9ff0b76eb315d6c34721af4cdf1d9b"},
+    {file = "mypy-1.14.1-cp38-cp38-win_amd64.whl", hash = "sha256:8edc07eeade7ebc771ff9cf6b211b9a7d93687ff892150cb5692e4f4272b0837"},
+    {file = "mypy-1.14.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3888a1816d69f7ab92092f785a462944b3ca16d7c470d564165fe703b0970c35"},
+    {file = "mypy-1.14.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:46c756a444117c43ee984bd055db99e498bc613a70bbbc120272bd13ca579fbc"},
+    {file = "mypy-1.14.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:27fc248022907e72abfd8e22ab1f10e903915ff69961174784a3900a8cba9ad9"},
+    {file = "mypy-1.14.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:499d6a72fb7e5de92218db961f1a66d5f11783f9ae549d214617edab5d4dbdbb"},
+    {file = "mypy-1.14.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:57961db9795eb566dc1d1b4e9139ebc4c6b0cb6e7254ecde69d1552bf7613f60"},
+    {file = "mypy-1.14.1-cp39-cp39-win_amd64.whl", hash = "sha256:07ba89fdcc9451f2ebb02853deb6aaaa3d2239a236669a63ab3801bbf923ef5c"},
+    {file = "mypy-1.14.1-py3-none-any.whl", hash = "sha256:b66a60cc4073aeb8ae00057f9c1f64d49e90f918fbcef9a977eb121da8b8f1d1"},
+    {file = "mypy-1.14.1.tar.gz", hash = "sha256:7ec88144fe9b510e8475ec2f5f251992690fcf89ccb4500b214b4226abcd32d6"},
 ]
 
 [package.dependencies]
@@ -1315,13 +1321,13 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.10.4"
+version = "2.10.6"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.10.4-py3-none-any.whl", hash = "sha256:597e135ea68be3a37552fb524bc7d0d66dcf93d395acd93a00682f1efcb8ee3d"},
-    {file = "pydantic-2.10.4.tar.gz", hash = "sha256:82f12e9723da6de4fe2ba888b5971157b3be7ad914267dea8f05f82b28254f06"},
+    {file = "pydantic-2.10.6-py3-none-any.whl", hash = "sha256:427d664bf0b8a2b34ff5dd0f5a18df00591adcee7198fbd71981054cef37b584"},
+    {file = "pydantic-2.10.6.tar.gz", hash = "sha256:ca5daa827cce33de7a42be142548b0096bf05a7e7b365aebfa5f8eeec7128236"},
 ]
 
 [package.dependencies]
@@ -1615,29 +1621,29 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "ruff"
-version = "0.9.2"
+version = "0.9.3"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.9.2-py3-none-linux_armv6l.whl", hash = "sha256:80605a039ba1454d002b32139e4970becf84b5fee3a3c3bf1c2af6f61a784347"},
-    {file = "ruff-0.9.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b9aab82bb20afd5f596527045c01e6ae25a718ff1784cb92947bff1f83068b00"},
-    {file = "ruff-0.9.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:fbd337bac1cfa96be615f6efcd4bc4d077edbc127ef30e2b8ba2a27e18c054d4"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82b35259b0cbf8daa22a498018e300b9bb0174c2bbb7bcba593935158a78054d"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b6a9701d1e371bf41dca22015c3f89769da7576884d2add7317ec1ec8cb9c3c"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9cc53e68b3c5ae41e8faf83a3b89f4a5d7b2cb666dff4b366bb86ed2a85b481f"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:8efd9da7a1ee314b910da155ca7e8953094a7c10d0c0a39bfde3fcfd2a015684"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3292c5a22ea9a5f9a185e2d131dc7f98f8534a32fb6d2ee7b9944569239c648d"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1a605fdcf6e8b2d39f9436d343d1f0ff70c365a1e681546de0104bef81ce88df"},
-    {file = "ruff-0.9.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c547f7f256aa366834829a08375c297fa63386cbe5f1459efaf174086b564247"},
-    {file = "ruff-0.9.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:d18bba3d3353ed916e882521bc3e0af403949dbada344c20c16ea78f47af965e"},
-    {file = "ruff-0.9.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b338edc4610142355ccf6b87bd356729b62bf1bc152a2fad5b0c7dc04af77bfe"},
-    {file = "ruff-0.9.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:492a5e44ad9b22a0ea98cf72e40305cbdaf27fac0d927f8bc9e1df316dcc96eb"},
-    {file = "ruff-0.9.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:af1e9e9fe7b1f767264d26b1075ac4ad831c7db976911fa362d09b2d0356426a"},
-    {file = "ruff-0.9.2-py3-none-win32.whl", hash = "sha256:71cbe22e178c5da20e1514e1e01029c73dc09288a8028a5d3446e6bba87a5145"},
-    {file = "ruff-0.9.2-py3-none-win_amd64.whl", hash = "sha256:c5e1d6abc798419cf46eed03f54f2e0c3adb1ad4b801119dedf23fcaf69b55b5"},
-    {file = "ruff-0.9.2-py3-none-win_arm64.whl", hash = "sha256:a1b63fa24149918f8b37cef2ee6fff81f24f0d74b6f0bdc37bc3e1f2143e41c6"},
-    {file = "ruff-0.9.2.tar.gz", hash = "sha256:b5eceb334d55fae5f316f783437392642ae18e16dcf4f1858d55d3c2a0f8f5d0"},
+    {file = "ruff-0.9.3-py3-none-linux_armv6l.whl", hash = "sha256:7f39b879064c7d9670197d91124a75d118d00b0990586549949aae80cdc16624"},
+    {file = "ruff-0.9.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:a187171e7c09efa4b4cc30ee5d0d55a8d6c5311b3e1b74ac5cb96cc89bafc43c"},
+    {file = "ruff-0.9.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c59ab92f8e92d6725b7ded9d4a31be3ef42688a115c6d3da9457a5bda140e2b4"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2dc153c25e715be41bb228bc651c1e9b1a88d5c6e5ed0194fa0dfea02b026439"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:646909a1e25e0dc28fbc529eab8eb7bb583079628e8cbe738192853dbbe43af5"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a5a46e09355695fbdbb30ed9889d6cf1c61b77b700a9fafc21b41f097bfbba4"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:c4bb09d2bbb394e3730d0918c00276e79b2de70ec2a5231cd4ebb51a57df9ba1"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:96a87ec31dc1044d8c2da2ebbed1c456d9b561e7d087734336518181b26b3aa5"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9bb7554aca6f842645022fe2d301c264e6925baa708b392867b7a62645304df4"},
+    {file = "ruff-0.9.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cabc332b7075a914ecea912cd1f3d4370489c8018f2c945a30bcc934e3bc06a6"},
+    {file = "ruff-0.9.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:33866c3cc2a575cbd546f2cd02bdd466fed65118e4365ee538a3deffd6fcb730"},
+    {file = "ruff-0.9.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:006e5de2621304c8810bcd2ee101587712fa93b4f955ed0985907a36c427e0c2"},
+    {file = "ruff-0.9.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ba6eea4459dbd6b1be4e6bfc766079fb9b8dd2e5a35aff6baee4d9b1514ea519"},
+    {file = "ruff-0.9.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:90230a6b8055ad47d3325e9ee8f8a9ae7e273078a66401ac66df68943ced029b"},
+    {file = "ruff-0.9.3-py3-none-win32.whl", hash = "sha256:eabe5eb2c19a42f4808c03b82bd313fc84d4e395133fb3fc1b1516170a31213c"},
+    {file = "ruff-0.9.3-py3-none-win_amd64.whl", hash = "sha256:040ceb7f20791dfa0e78b4230ee9dce23da3b64dd5848e40e3bf3ab76468dcf4"},
+    {file = "ruff-0.9.3-py3-none-win_arm64.whl", hash = "sha256:800d773f6d4d33b0a3c60e2c6ae8f4c202ea2de056365acfa519aa48acf28e0b"},
+    {file = "ruff-0.9.3.tar.gz", hash = "sha256:8293f89985a090ebc3ed1064df31f3b4b56320cdfcec8b60d3295bddb955c22a"},
 ]
 
 [[package]]
diff --git a/clients/python/pyproject.toml b/clients/python/pyproject.toml
index ce11ea1c9..d246fbb19 100644
--- a/clients/python/pyproject.toml
+++ b/clients/python/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "model-registry"
-version = "0.2.12"
+version = "0.2.13"
 description = "Client for Kubeflow Model Registry"
 authors = ["Isabella Basso do Amaral <idoamara@redhat.com>"]
 license = "Apache-2.0"
diff --git a/clients/python/src/model_registry/__init__.py b/clients/python/src/model_registry/__init__.py
index 552b844ce..74be16c6d 100644
--- a/clients/python/src/model_registry/__init__.py
+++ b/clients/python/src/model_registry/__init__.py
@@ -1,6 +1,6 @@
 """Main package for the Kubeflow model registry."""
 
-__version__ = "0.2.12"
+__version__ = "0.2.13"
 
 from ._client import ModelRegistry
 
diff --git a/clients/python/src/model_registry/core.py b/clients/python/src/model_registry/core.py
index 19da2af02..ac6dfc4f8 100644
--- a/clients/python/src/model_registry/core.py
+++ b/clients/python/src/model_registry/core.py
@@ -78,7 +78,7 @@ def insecure_connection(
             user_token: The PEM-encoded user token as a string.
         """
         return cls(
-            Configuration(host=f"{server_address}:{port}", access_token=user_token)
+            Configuration(host=f"{server_address}:{port}", access_token=user_token, verify_ssl=False)
         )
 
     @asynccontextmanager
diff --git a/clients/python/src/mr_openapi/configuration.py b/clients/python/src/mr_openapi/configuration.py
index 6b6a378a0..f569dfb20 100644
--- a/clients/python/src/mr_openapi/configuration.py
+++ b/clients/python/src/mr_openapi/configuration.py
@@ -53,8 +53,11 @@ class Configuration:
       string values to replace variables in templated server configuration.
       The validation of enums is performed for variables with defined enum
       values before.
-    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
+    :param ssl_ca_cert: str - The path to a file of concatenated CA certificates
       in PEM format.
+    :param verify_ssl: bool - Whether to verify the SSL certificate when making API 
+      requests to an HTTPS server.
+      Set to False to disable verification, default=True.
 
     :Example:
     """
@@ -74,6 +77,7 @@ def __init__(
         server_operation_index=None,
         server_operation_variables=None,
         ssl_ca_cert=None,
+        verify_ssl=True,
     ) -> None:
         """Constructor."""
         self._base_path = "https://localhost:8080" if host is None else host
@@ -133,7 +137,7 @@ def __init__(
         """Debug switch
         """
 
-        self.verify_ssl = True
+        self.verify_ssl = verify_ssl
         """SSL/TLS verification
            Set this to false to skip verifying SSL certificate when calling API
            from https server.
diff --git a/clients/python/tests/regression_test.py b/clients/python/tests/regression_test.py
index 0310f3879..4645833ea 100644
--- a/clients/python/tests/regression_test.py
+++ b/clients/python/tests/regression_test.py
@@ -1,4 +1,5 @@
 import pytest
+import requests
 
 from model_registry import ModelRegistry
 from model_registry.types.artifacts import ModelArtifact
@@ -99,3 +100,35 @@ async def test_create_standalone_model_artifact(client: ModelRegistry):
     assert mv.id
     mv_ma = await client._api.upsert_model_version_artifact(new_ma, mv.id)
     assert mv_ma.id == new_ma.id
+
+@pytest.mark.e2e
+async def test_patch_model_artifacts_artifact_type(client: ModelRegistry):
+    """Patching Artifacts makes the model registry server panic.
+
+    reported with https://issues.redhat.com/browse/RHOAIENG-16932
+    """
+    name = "test_model"
+    version = "1.0.0"
+    rm = client.register_model(
+        name,
+        "s3",
+        model_format_name="test_format",
+        model_format_version="test_version",
+        version=version,
+    )
+    assert rm.id
+    mv = client.get_model_version(name, version)
+    assert mv
+    assert mv.id
+    ma = client.get_model_artifact(name, version)
+    assert ma
+    assert ma.id
+
+    payload = { "modelFormatName": "foo", "artifactType": "model-artifact" }
+    from .conftest import REGISTRY_HOST, REGISTRY_PORT
+    response = requests.patch(url=f"{REGISTRY_HOST}:{REGISTRY_PORT}/api/model_registry/v1alpha3/artifacts/{ma.id}", json=payload, timeout=10, headers={"Content-Type": "application/json"})
+    assert response.status_code == 200
+    ma = client.get_model_artifact(name, version)
+    assert ma
+    assert ma.id
+    assert ma.model_format_name == "foo"
diff --git a/clients/ui/Dockerfile b/clients/ui/Dockerfile
index 21a9af3b3..99cb90598 100644
--- a/clients/ui/Dockerfile
+++ b/clients/ui/Dockerfile
@@ -4,13 +4,15 @@ ARG BFF_SOURCE_CODE=./bff
 
 # Set the base images for the build stages
 ARG NODE_BASE_IMAGE=node:20
-ARG GOLANG_BASE_IMAGE=golang:1.22.2
+ARG GOLANG_BASE_IMAGE=golang:1.23.5
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
 
 # UI build stage
 FROM ${NODE_BASE_IMAGE} AS ui-builder
 
 ARG UI_SOURCE_CODE
+ARG DEPLOYMENT_MODE
+ARG MOCK_AUTH
 
 WORKDIR /usr/src/app
 
diff --git a/clients/ui/Makefile b/clients/ui/Makefile
index 06498fb53..de125cc7d 100644
--- a/clients/ui/Makefile
+++ b/clients/ui/Makefile
@@ -50,7 +50,7 @@ docker-build:
 
 .PHONY: docker-build-standalone
 docker-build-standalone:
-	MOCK_AUTH=true DEPLOYMENT_MODE=standalone $(CONTAINER_TOOL) build -t ${IMG_UI_STANDALONE} .
+	$(CONTAINER_TOOL) build --build-arg MOCK_AUTH=true --build-arg DEPLOYMENT_MODE=standalone -t ${IMG_UI_STANDALONE} .
 
 .PHONY: docker-buildx
 docker-buildx:
@@ -58,7 +58,7 @@ docker-buildx:
 
 .PHONY: docker-buildx-standalone
 docker-buildx-standalone:
-	MOCK_AUTH=true DEPLOYMENT_MODE=standalone docker buildx build --platform ${PLATFORM} -t ${IMG_UI_STANDALONE} --push .
+	docker buildx build --build-arg MOCK_AUTH=true --build-arg DEPLOYMENT_MODE=standalone --platform ${PLATFORM} -t ${IMG_UI_STANDALONE} --push .
 
 ############ Push ############
 
@@ -83,7 +83,7 @@ frontend-build:
 
 .PHONY: frontend-build-standalone
 frontend-build-standalone:
-	MOCK_AUTH=true DEPLOYMENT_MODE=standalone cd frontend && npm run build:prod
+	cd frontend && MOCK_AUTH=true DEPLOYMENT_MODE=standalone npm run build:prod
 
 .PHONY: bff-build
 bff-build:
diff --git a/clients/ui/bff/Makefile b/clients/ui/bff/Makefile
index 4cbf7d79e..2d53af2da 100644
--- a/clients/ui/bff/Makefile
+++ b/clients/ui/bff/Makefile
@@ -64,7 +64,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest-$(ENVTEST_VERSION)
 GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 
 ## Tool Versions
-GOLANGCI_LINT_VERSION ?= v1.57.2
+GOLANGCI_LINT_VERSION ?= v1.63.4
 ENVTEST_VERSION ?= release-0.17
 
 .PHONY: envtest
diff --git a/clients/ui/bff/README.md b/clients/ui/bff/README.md
index 474bbde35..4a910a90f 100644
--- a/clients/ui/bff/README.md
+++ b/clients/ui/bff/README.md
@@ -1,13 +1,16 @@
 # Kubeflow Model Registry UI BFF
+
 The Kubeflow Model Registry UI BFF is the _backend for frontend_ (BFF) used by the Kubeflow Model Registry UI.
 
 ## Pre-requisites:
 
-### Dependencies 
+### Dependencies
+
 - Go >= 1.22.2
 
 ### Running model registry & ml-metadata
-To be operational, our BFF needs the Model Registry & Ml-metadata backend running. 
+
+To be operational, our BFF needs the Model Registry & Ml-metadata backend running.
 
 > **NOTE:** Docker compose must be installed in your environment.
 
@@ -24,37 +27,46 @@ When shutting down the docker compose, you might want to clean-up the SQLite db
 # Development
 
 Run the following command to build the BFF:
+
 ```shell
 make build
 ```
+
 After building it, you can run our app with:
+
 ```shell
 make run
 ```
+
 If you want to use a different port, mock kubernetes client or model registry client - useful for front-end development, you can run:
+
 ```shell
 make run PORT=8000 MOCK_K8S_CLIENT=true MOCK_MR_CLIENT=true
 ```
+
 If you want to change the log level on deployment, add the LOG_LEVEL argument when running, supported levels are: ERROR, WARN, INFO, DEBUG. The default level is INFO.
+
 ```shell
 # Run with debug logging
-make run LOG_LEVEL=DEBUG  
+make run LOG_LEVEL=DEBUG
 ```
 
 # Building and Deploying
 
 Run the following command to build the BFF:
+
 ```shell
 make build
 ```
+
 The BFF binary will be inside `bin` directory
 
 You can also build BFF docker image with:
+
 ```shell
 make docker-build
 ```
 
-
 ## Getting started
 
 ### Endpoints
@@ -66,33 +78,40 @@ See the [OpenAPI specification](../api/openapi/mod-arch.yaml) for a complete lis
 You will need to inject your requests with a `kubeflow-userid` header and namespace for authorization purposes.
 
 When running the service with the mocked Kubernetes client (MOCK_K8S_CLIENT=true), the user `user@example.com` is preconfigured with the necessary RBAC permissions to perform these actions.
+
 ```
 # GET /v1/healthcheck
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/healthcheck"
 ```
+
 ```
 # GET /v1/user
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/user"
 ```
+
 ```
 # GET /v1/namespaces (only works when DEV_MODE=true)
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/namespaces"
 ```
+
 ```
-# GET /v1/model_registry 
+# GET /v1/model_registry
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/model_registry?namespace=kubeflow"
 ```
+
 ```
 # GET /v1/model_registry using groups permissions
-curl -i \                                                                                                                                      
+curl -i \
   -H "kubeflow-userid: non-user@example.com" \
   -H "kubeflow-groups: dora-namespace-group ,group2,group3" \
   "http://localhost:4000/api/v1/model_registry?namespace=dora-namespace"
 ```
+
 ```
 # GET /v1/model_registry/{model_registry_id}/registered_models
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/model_registry/model-registry/registered_models?namespace=kubeflow"
 ```
+
 ```
 # GET /v1/model_registry/{model_registry_id}/registered_models using group permissions
 curl -i \
@@ -100,6 +119,7 @@ curl -i \
   -H "kubeflow-groups: dora-namespace-group ,dora-service-group,group3" \
   "http://localhost:4000/api/v1/model_registry/model-registry-dora/registered_models?namespace=dora-namespace"
 ```
+
 ```
 #POST /v1/model_registry/{model_registry_id}/registered_models
 curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/api/v1/model_registry/model-registry/registered_models?namespace=kubeflow" \
@@ -118,10 +138,12 @@ curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/ap
   "state": "LIVE"
 }}'
 ```
+
 ```
 # GET /v1/model_registry/{model_registry_id}/registered_models/{registered_model_id}
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/model_registry/model-registry/registered_models/1?namespace=kubeflow"
 ```
+
 ```
 # PATCH /v1/model_registry/{model_registry_id}/registered_models/{registered_model_id}
 curl -i -H "kubeflow-userid: user@example.com" -X PATCH "http://localhost:4000/api/v1/model_registry/model-registry/registered_models/1?namespace=kubeflow" \
@@ -130,14 +152,17 @@ curl -i -H "kubeflow-userid: user@example.com" -X PATCH "http://localhost:4000/a
   "description": "New description"
 }}'
 ```
+
 ```
 # GET /api/v1/model_registry/{model_registry_id}/model_versions
 curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/model_versions?namespace=kubeflow"
 ```
+
 ```
-# GET /api/v1/model_registry/{model_registry_id}/model_versions/{model_version_id} 
+# GET /api/v1/model_registry/{model_registry_id}/model_versions/{model_version_id}
 curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/model_versions/1?namespace=kubeflow"
 ```
+
 ```
 # POST /api/v1/model_registry/{model_registry_id}/model_versions
 curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/api/v1/model_registry/model-registry/model_versions?namespace=kubeflow" \
@@ -157,6 +182,7 @@ curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/ap
   "registeredModelId": "1"
 }}'
 ```
+
 ```
 # PATCH /api/v1/model_registry/{model_registry_id}/model_versions/{model_version_id}
 curl -i -H "kubeflow-userid: user@example.com" -X PATCH "http://localhost:4000/api/v1/model_registry/model-registry/model_versions/1?namespace=kubeflow" \
@@ -165,10 +191,12 @@ curl -i -H "kubeflow-userid: user@example.com" -X PATCH "http://localhost:4000/a
   "description": "New description 2"
 }}'
 ```
+
 ```
 # GET /v1/model_registry/{model_registry_id}/registered_models/{registered_model_id}/versions
 curl -i -H "kubeflow-userid: user@example.com" "localhost:4000/api/v1/model_registry/model-registry/registered_models/1/versions?namespace=kubeflow"
 ```
+
 ```
 # POST /v1/model_registry/{model_registry_id}/registered_models/{registered_model_id}/versions
 curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/api/v1/model_registry/model-registry/registered_models/1/versions?namespace=kubeflow" \
@@ -188,10 +216,12 @@ curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/ap
   "registeredModelId": "1"
 }}'
 ```
+
 ```
-# GET /api/v1/model_registry/{model_registry_id}/model_versions/{model_version_id}/artifacts 
+# GET /api/v1/model_registry/{model_registry_id}/model_versions/{model_version_id}/artifacts
 curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/model_versions/1/artifacts?namespace=kubeflow"
 ```
+
 ```
 # POST /api/v1/model_registry/{model_registry_id}/model_versions/{model_version_id}/artifacts
 curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/api/v1/model_registry/model-registry/model_versions/1/artifacts?namespace=kubeflow" \
@@ -211,27 +241,72 @@ curl -i -H "kubeflow-userid: user@example.com" -X POST "http://localhost:4000/ap
 }}'
 ```
 
+```
+# GET /api/v1/model_registry/{model_registry_id}/artifacts
+curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/artifacts?namespace=kubeflow"
+
+```
+
+```
+# GET /api/v1/model_registry/{model_registry_id}/artifacts/{artifact_id}
+curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/artifacts/{artifact_id}?namespace=kubeflow"
+
+```
+
+```
+# POST /api/v1/model_registry/{model_registry_id}/artifacts
+curl -i \
+  -H "kubeflow-userid: user@example.com" \
+  -X POST "http://localhost:4000/api/v1/model_registry/model-registry/artifacts?namespace=kubeflow" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "data": {
+      "artifactType": "model-artifact",
+      "name": "dora-classifier-v2",
+      "description": "MNIST digit classification model trained on TensorFlow",
+      "uri": "gs://my-models/mnist-classifier/v2",
+      "externalId": "model-12345678",
+      "modelFormatName": "tensorflow",
+      "modelFormatVersion": "2.9.0",
+      "storageKey": "models/mnist/1.0.0",
+      "storagePath": "/models/mnist/1.0.0/model.savedmodel"
+    }
+  }'
+```
+
+```
+# PATCH /api/v1/model_registry/{model_registry_id}/artifacts/{artifact_id}
+curl -i -H "kubeflow-userid: user@example.com" -X PATCH "http://localhost:4000/api/v1/model_registry/model-registry/artifacts/1?namespace=kubeflow" \
+     -H "Content-Type: application/json" \
+-d '{ "data": {
+  "artifactType": "model-artifact",
+  "description": "New description 2"
+}}'
+```
+
 ### Pagination
+
 The following query parameters are supported by "Get All" style endpoints to control pagination.
 
 | Parameter Name | Description                                                                                               |
-|----------------|-----------------------------------------------------------------------------------------------------------|
+| -------------- | --------------------------------------------------------------------------------------------------------- |
 | pageSize       | Number of entities in each page                                                                           |
 | orderBy        | Specifies the order by criteria for listing entities. Available values: CREATE_TIME, LAST_UPDATE_TIME, ID |
 | sortOrder      | Specifies the sort order for listing entities. Available values: ASC, DESC. Default: ASC                  |
-| nextPageToken  | Token to use to retrieve next page of results.                                                            | 
+| nextPageToken  | Token to use to retrieve next page of results.                                                            |
 
 ### Sample local calls
+
 ```
 # Get with a page size of 5 getting a specific page.
 curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/registered_models?pageSize=5&nextPageToken=CAEQARoCCAE"
 ```
+
 ```
 # Get with a page size of 5, order by last update time in descending order.
 curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/model_registry/model-registry/registered_models?pageSize=5&orderBy=LAST_UPDATE_TIME&sortOrder=DESC"
 ```
 
-
 ### FAQ
 
 #### 1. How do we filter model registry services from other Kubernetes services?
@@ -239,6 +314,7 @@ curl -i -H "kubeflow-userid: user@example.com" "http://localhost:4000/api/v1/mod
 We filter Model Registry services by using the Kubernetes label `component: model-registry. This label helps distinguish Model Registry services from other services in the cluster.
 
 For example, in our service manifest, the `component label is defined as follows:
+
 ```yaml
 # ...
 labels:
@@ -246,6 +322,7 @@ labels:
   component: model-registry
 #...
 ```
+
 You can view the complete Model Registry service manifest [here](https://github.com/kubeflow/model-registry/blob/main/manifests/kustomize/base/model-registry-service.yaml#L10).
 
 #### 2. What is the structure of the mock Kubernetes environment?
@@ -253,23 +330,24 @@ You can view the complete Model Registry service manifest [here](https://github.
 The mock Kubernetes environment is activated when the environment variable `MOCK_K8S_CLIENT` is set to `true`. It is based on `env-test` and is designed to simulate a realistic Kubernetes setup for testing. The mock has the following characteristics:
 
 - **Namespaces**:
+
   - `kubeflow`
   - `dora-namespace`
   - `bella-namespace`
 
 - **Users**:
+
   - `user@example.com` (has `cluster-admin` privileges)
   - `doraNonAdmin@example.com` (restricted to the `dora-namespace`)
   - `bellaNonAdmin@example.com` (restricted to the `bella-namespace`)
 
 - **Groups**:
   - `dora-service-group` (has access to `model-registry-dora` inside `dora-namespace`)
-  - `dora-namespace-group` (has access to the `dora-namespace`) 
-  
+  - `dora-namespace-group` (has access to the `dora-namespace`)
 - **Services (Model Registries)**:
   - `model-registry`: resides in the `kubeflow` namespace with the label `component: model-registry`.
   - `model-registry-one`: resides in the `kubeflow` namespace with the label `component: model-registry`.
-  - `non-model-registry`: resides in the `kubeflow` namespace *without* the label `component: model-registry`.
+  - `non-model-registry`: resides in the `kubeflow` namespace _without_ the label `component: model-registry`.
   - `model-registry-dora`: resides in the `dora-namespace` namespace with the label `component: model-registry`.
 
 #### 3. How BFF authorization works for kubeflow-userid and kubeflow-groups?
@@ -279,22 +357,24 @@ Authorization is performed using Kubernetes SubjectAccessReview (SAR), which val
 - `kubeflow-userid`: Required header that specifies the user’s email. Access is checked directly for the user via SAR.
 - `kubeflow-groups`: Optional header with a comma-separated list of groups. If the user does not have access, SAR checks group permissions using OR logic. If any group has access, the request is authorized.
 
-
 Access to Model Registry List:
+
 - To list all model registries (/v1/model_registry), we perform a SAR check for get and list verbs on services within the specified namespace.
 - If the user or any group has permission to get and list services in the namespace, the request is authorized.
 
 Access to Specific Model Registry Endpoints:
+
 - For other endpoints (e.g., /v1/model_registry/{model_registry_id}/...), we perform a SAR check for get and list verbs on the specific service (identified by model_registry_id) within the namespace.
 - If the user or any group has permission to get or list the specific service, the request is authorized.
 
 #### 4. How do I allow CORS requests from other origins
 
-When serving the UI directly from the BFF there is no need for any CORS headers to be served, by default they are turned off for security reasons. 
+When serving the UI directly from the BFF there is no need for any CORS headers to be served, by default they are turned off for security reasons.
 
 If you need to enable CORS for any reasons you can add origins to the allow-list in several ways:
 
 ##### Via the make command
+
 Add the following parameter to your command: `ALLOWED_ORIGINS` this takes a comma separated list of origins to permit serving to, alterantively you can specify the value `*` to allow all origins, **Note this is not recommended in production deployments as it poses a security risk**
 
 Examples:
@@ -314,6 +394,7 @@ make run ALLOWED_ORIGINS=""
 ```
 
 #### Via environment variable
+
 Setting CORS via environment variable follows the same rules as using the Makefile, simply set the environment variable `ALLOWED_ORIGINS` with the same value as above.
 
 #### Via the command line arguments
@@ -321,7 +402,7 @@ Setting CORS via environment variable follows the same rules as using the Makefi
 Setting CORS via command line arguments follows the same rules as using the Makefile. Simply add the `--allowed-origins=` flag to your command.
 
 Examples:
+
 ```shell
 ./bff --allowed-origins="http://my-domain.com,http://my-other-domain.com"
 ```
-
diff --git a/clients/ui/bff/go.mod b/clients/ui/bff/go.mod
index 64204468a..110d296fb 100644
--- a/clients/ui/bff/go.mod
+++ b/clients/ui/bff/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubeflow/model-registry/ui/bff
 
-go 1.22.2
+go 1.23.5
 
 require (
 	github.com/brianvoe/gofakeit/v7 v7.1.2
@@ -12,7 +12,7 @@ require (
 	github.com/rs/cors v1.11.1
 	github.com/stretchr/testify v1.9.0
 	k8s.io/api v0.31.2
-	k8s.io/apimachinery v0.31.4
+	k8s.io/apimachinery v0.32.1
 	k8s.io/client-go v0.31.2
 	sigs.k8s.io/controller-runtime v0.19.1
 )
@@ -27,9 +27,9 @@ require (
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -62,18 +62,17 @@ require (
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.31.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
diff --git a/clients/ui/bff/go.sum b/clients/ui/bff/go.sum
index 94e1cc65c..c1712caae 100644
--- a/clients/ui/bff/go.sum
+++ b/clients/ui/bff/go.sum
@@ -23,13 +23,14 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
 github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -151,8 +152,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -174,7 +175,6 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -184,21 +184,21 @@ k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
 k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
 k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
 k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
-k8s.io/apimachinery v0.31.4 h1:8xjE2C4CzhYVm9DGf60yohpNUh5AEBnPxCryPBECmlM=
-k8s.io/apimachinery v0.31.4/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs=
+k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
 k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
 k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
-k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
+k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
 sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/clients/ui/bff/internal/api/app.go b/clients/ui/bff/internal/api/app.go
index 054434e08..1742e9a9c 100644
--- a/clients/ui/bff/internal/api/app.go
+++ b/clients/ui/bff/internal/api/app.go
@@ -3,13 +3,14 @@ package api
 import (
 	"context"
 	"fmt"
-	"github.com/kubeflow/model-registry/ui/bff/internal/config"
-	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
-	"github.com/kubeflow/model-registry/ui/bff/internal/repositories"
 	"log/slog"
 	"net/http"
 	"path"
 
+	"github.com/kubeflow/model-registry/ui/bff/internal/config"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/repositories"
+
 	"github.com/julienschmidt/httprouter"
 	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 )
@@ -22,6 +23,7 @@ const (
 	RegisteredModelId            = "registered_model_id"
 	ModelVersionId               = "model_version_id"
 	ModelArtifactId              = "model_artifact_id"
+	ArtifactId                   = "artifact_id"
 	HealthCheckPath              = PathPrefix + "/healthcheck"
 	UserPath                     = PathPrefix + "/user"
 	ModelRegistryListPath        = PathPrefix + "/model_registry"
@@ -35,6 +37,9 @@ const (
 	ModelVersionArtifactListPath = ModelVersionPath + "/artifacts"
 	ModelArtifactListPath        = ModelRegistryPath + "/model_artifacts"
 	ModelArtifactPath            = ModelArtifactListPath + "/:" + ModelArtifactId
+
+	ArtifactListPath = ModelRegistryPath + "/artifacts"
+	ArtifactPath     = ArtifactListPath + "/:" + ArtifactId
 )
 
 type App struct {
@@ -105,13 +110,17 @@ func (app *App) Routes() http.Handler {
 	apiRouter.GET(ModelVersionListPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.GetAllModelVersionHandler))))
 	apiRouter.GET(ModelVersionPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.GetModelVersionHandler))))
 	apiRouter.PATCH(ModelVersionPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.UpdateModelVersionHandler))))
+	apiRouter.GET(ArtifactListPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.GetAllArtifactsHandler))))
+	apiRouter.GET(ArtifactPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.GetArtifactHandler))))
+	apiRouter.POST(ArtifactListPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.CreateArtifactHandler))))
+	apiRouter.PATCH(ArtifactPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.UpdateArtifactHandler))))
 	apiRouter.GET(ModelVersionArtifactListPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.GetAllModelArtifactsByModelVersionHandler))))
 	apiRouter.POST(ModelVersionArtifactListPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.CreateModelArtifactByModelVersionHandler))))
 	apiRouter.PATCH(ModelRegistryPath, app.AttachNamespace(app.PerformSARonSpecificService(app.AttachRESTClient(app.UpdateModelVersionHandler))))
 
 	// Kubernetes routes
 	apiRouter.GET(UserPath, app.UserHandler)
-	// Perform SAR to Get List Services by Namspace
+	// Perform SAR to Get List Services by Namespace
 	apiRouter.GET(ModelRegistryListPath, app.AttachNamespace(app.PerformSARonGetListServicesByNamespace(app.ModelRegistryHandler)))
 	if app.config.StandaloneMode {
 		apiRouter.GET(NamespaceListPath, app.GetNamespacesHandler)
diff --git a/clients/ui/bff/internal/api/artifacts_handler.go b/clients/ui/bff/internal/api/artifacts_handler.go
new file mode 100644
index 000000000..5e9d54c8f
--- /dev/null
+++ b/clients/ui/bff/internal/api/artifacts_handler.go
@@ -0,0 +1,168 @@
+package api
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/julienschmidt/httprouter"
+	"github.com/kubeflow/model-registry/pkg/openapi"
+	"github.com/kubeflow/model-registry/ui/bff/internal/constants"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+)
+
+type ArtifactListEnvelope Envelope[*openapi.ArtifactList, None]
+type ArtifactEnvelope Envelope[*openapi.Artifact, None]
+type ArtifactUpdateEnvelope Envelope[*openapi.ArtifactUpdate, None]
+
+func (app *App) CreateArtifactHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+	client, ok := r.Context().Value(constants.ModelRegistryHttpClientKey).(integrations.HTTPClientInterface)
+	if !ok {
+		app.serverErrorResponse(w, r, errors.New("REST client not found"))
+		return
+	}
+
+	var envelope ArtifactEnvelope
+	if err := json.NewDecoder(r.Body).Decode(&envelope); err != nil {
+		app.serverErrorResponse(w, r, fmt.Errorf("error decoding JSON:: %v", err.Error()))
+		return
+	}
+
+	data := *envelope.Data
+
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		app.serverErrorResponse(w, r, fmt.Errorf("error marshaling model to JSON: %w", err))
+		return
+	}
+
+	createdArtifact, err := app.repositories.ModelRegistryClient.CreateArtifact(client, jsonData)
+	if err != nil {
+		var httpErr *integrations.HTTPError
+		if errors.As(err, &httpErr) {
+			app.errorResponse(w, r, httpErr)
+		} else {
+			app.serverErrorResponse(w, r, err)
+		}
+		return
+	}
+
+	if createdArtifact == nil || (createdArtifact.DocArtifact == nil && createdArtifact.ModelArtifact == nil) {
+		app.serverErrorResponse(w, r, fmt.Errorf("created artifact is nil or does not contain valid data"))
+		return
+	}
+
+	response := ArtifactEnvelope{
+		Data: createdArtifact,
+	}
+
+	if createdArtifact.DocArtifact != nil && createdArtifact.DocArtifact.Id != nil {
+		w.Header().Set("Location", r.URL.JoinPath(*createdArtifact.DocArtifact.Id).String())
+	} else if createdArtifact.ModelArtifact != nil && createdArtifact.ModelArtifact.Id != nil {
+		w.Header().Set("Location", r.URL.JoinPath(*createdArtifact.ModelArtifact.Id).String())
+	} else {
+		app.serverErrorResponse(w, r, fmt.Errorf("artifact ID is missing"))
+		return
+	}
+
+	err = app.WriteJSON(w, http.StatusCreated, response, nil)
+	if err != nil {
+		app.serverErrorResponse(w, r, err)
+	}
+}
+
+func (app *App) GetArtifactHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	client, ok := r.Context().Value(constants.ModelRegistryHttpClientKey).(integrations.HTTPClientInterface)
+	if !ok {
+		app.serverErrorResponse(w, r, errors.New("REST client not found"))
+		return
+	}
+
+	model, err := app.repositories.ModelRegistryClient.GetArtifact(client, ps.ByName(ArtifactId))
+	if err != nil {
+		app.serverErrorResponse(w, r, err)
+		return
+	}
+
+	result := ArtifactEnvelope{
+		Data: model,
+	}
+
+	err = app.WriteJSON(w, http.StatusOK, result, nil)
+	if err != nil {
+		app.serverErrorResponse(w, r, err)
+	}
+}
+
+func (app *App) GetAllArtifactsHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	client, ok := r.Context().Value(constants.ModelRegistryHttpClientKey).(integrations.HTTPClientInterface)
+
+	if !ok {
+		app.serverErrorResponse(w, r, errors.New("REST client not found"))
+		return
+	}
+
+	artifactList, err := app.repositories.ModelRegistryClient.GetAllArtifacts(client, r.URL.Query())
+
+	if err != nil {
+		app.serverErrorResponse(w, r, err)
+		return
+	}
+
+	artifactsRes := ArtifactListEnvelope{
+		Data: artifactList,
+	}
+
+	err = app.WriteJSON(w, http.StatusOK, artifactsRes, nil)
+	if err != nil {
+		app.serverErrorResponse(w, r, err)
+	}
+}
+
+func (app *App) UpdateArtifactHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	client, ok := r.Context().Value(constants.ModelRegistryHttpClientKey).(integrations.HTTPClientInterface)
+	if !ok {
+		app.serverErrorResponse(w, r, errors.New("REST client not found"))
+		return
+	}
+
+	var envelope ArtifactUpdateEnvelope
+	if err := json.NewDecoder(r.Body).Decode(&envelope); err != nil {
+		app.serverErrorResponse(w, r, fmt.Errorf("error decoding JSON:: %v", err.Error()))
+		return
+	}
+
+	data := *envelope.Data
+
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		app.serverErrorResponse(w, r, fmt.Errorf("error marshaling model to JSON: %w", err))
+		return
+	}
+
+	patchedArtifact, err := app.repositories.ModelRegistryClient.UpdateArtifact(client, ps.ByName(ArtifactId), jsonData)
+	if err != nil {
+		var httpErr *integrations.HTTPError
+		if errors.As(err, &httpErr) {
+			app.errorResponse(w, r, httpErr)
+		} else {
+			app.serverErrorResponse(w, r, err)
+		}
+		return
+	}
+
+	if patchedArtifact == nil || (patchedArtifact.DocArtifact == nil && patchedArtifact.ModelArtifact == nil) {
+		app.serverErrorResponse(w, r, fmt.Errorf("created artifact is nil or does not contain valid data"))
+		return
+	}
+
+	responseBody := ArtifactEnvelope{
+		Data: patchedArtifact,
+	}
+
+	err = app.WriteJSON(w, http.StatusOK, responseBody, nil)
+	if err != nil {
+		app.serverErrorResponse(w, r, err)
+	}
+}
diff --git a/clients/ui/bff/internal/api/artifacts_handler_test.go b/clients/ui/bff/internal/api/artifacts_handler_test.go
new file mode 100644
index 000000000..09dae9c94
--- /dev/null
+++ b/clients/ui/bff/internal/api/artifacts_handler_test.go
@@ -0,0 +1,52 @@
+package api
+
+import (
+	"net/http"
+
+	"github.com/brianvoe/gofakeit/v7"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("TestArtifactsHandler", func() {
+	Context("testing artifacts", Ordered, func() {
+		Context("successful operations", func() {
+			It("should retrieve an artifact", func() {
+				By("fetching a specific artifact")
+				_ = gofakeit.Seed(123)
+				data := mocks.GenerateMockArtifact()
+				expected := ArtifactEnvelope{Data: &data}
+
+				_ = gofakeit.Seed(123)
+				actual, rs, err := setupApiTest[ArtifactEnvelope](http.MethodGet, "/api/v1/model_registry/model-registry/artifacts/1?namespace=kubeflow", nil, k8sClient, mocks.KubeflowUserIDHeaderValue, "kubeflow")
+				Expect(err).NotTo(HaveOccurred())
+
+				By("should match the expected artifact")
+				Expect(rs.StatusCode).To(Equal(http.StatusOK))
+				Expect(actual.Data.ModelArtifact.GetName()).To(Equal(expected.Data.ModelArtifact.GetName()))
+				Expect(actual.Data.ModelArtifact.GetArtifactType()).To(Equal(expected.Data.ModelArtifact.GetArtifactType()))
+				Expect(actual.Data.ModelArtifact.GetDescription()).To(Equal(expected.Data.ModelArtifact.GetDescription()))
+			})
+
+			It("should list all artifacts", func() {
+				By("fetching all artifacts")
+				_ = gofakeit.Seed(123)
+
+				actual, rs, err := setupApiTest[ArtifactListEnvelope](http.MethodGet, "/api/v1/model_registry/model-registry/artifacts?namespace=kubeflow", nil, k8sClient, mocks.KubeflowUserIDHeaderValue, "kubeflow")
+				Expect(err).NotTo(HaveOccurred())
+
+				By("should return success status and valid data")
+				Expect(rs.StatusCode).To(Equal(http.StatusOK))
+				Expect(actual.Data).NotTo(BeNil())
+				Expect(actual.Data.Items).NotTo(BeEmpty())
+
+				By("should contain valid artifacts")
+				for _, item := range actual.Data.Items {
+					Expect(*item.ModelArtifact.Name).NotTo(BeEmpty())
+					Expect(item.ModelArtifact.ArtifactType).NotTo(BeEmpty())
+				}
+			})
+		})
+	})
+})
diff --git a/clients/ui/bff/internal/api/suite_test.go b/clients/ui/bff/internal/api/suite_test.go
index a81975935..d24c88413 100644
--- a/clients/ui/bff/internal/api/suite_test.go
+++ b/clients/ui/bff/internal/api/suite_test.go
@@ -2,17 +2,17 @@ package api
 
 import (
 	"context"
-	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
-	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	"log/slog"
 	"os"
+	"testing"
+
+	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	"testing"
-)
 
-import (
 	. "github.com/onsi/ginkgo/v2"
+
 	. "github.com/onsi/gomega"
 )
 
diff --git a/clients/ui/bff/internal/api/test_utils.go b/clients/ui/bff/internal/api/test_utils.go
index 1f8f0cc93..b24ef4493 100644
--- a/clients/ui/bff/internal/api/test_utils.go
+++ b/clients/ui/bff/internal/api/test_utils.go
@@ -4,15 +4,16 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"github.com/kubeflow/model-registry/ui/bff/internal/constants"
-	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
-	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
-	"github.com/kubeflow/model-registry/ui/bff/internal/repositories"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+
+	"github.com/kubeflow/model-registry/ui/bff/internal/constants"
+	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+	"github.com/kubeflow/model-registry/ui/bff/internal/mocks"
+	"github.com/kubeflow/model-registry/ui/bff/internal/repositories"
 )
 
 func setupApiTest[T any](method string, url string, body interface{}, k8sClient k8s.KubernetesClientInterface, kubeflowUserIDHeaderValue string, namespace string) (T, *http.Response, error) {
diff --git a/clients/ui/bff/internal/mocks/k8s_mock.go b/clients/ui/bff/internal/mocks/k8s_mock.go
index 7a74e65df..0cb014446 100644
--- a/clients/ui/bff/internal/mocks/k8s_mock.go
+++ b/clients/ui/bff/internal/mocks/k8s_mock.go
@@ -3,16 +3,17 @@ package mocks
 import (
 	"context"
 	"fmt"
+	"log/slog"
+	"os"
+	"path/filepath"
+	"runtime"
+
 	k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
-	"log/slog"
-	"os"
-	"path/filepath"
-	"runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 )
@@ -274,9 +275,6 @@ func createService(k8sClient client.Client, ctx context.Context, name string, na
 		return fmt.Errorf("failed to list services: %w", err)
 	}
 
-	if err != nil {
-		return err
-	}
 	return nil
 }
 
diff --git a/clients/ui/bff/internal/mocks/model_registry_client_mock.go b/clients/ui/bff/internal/mocks/model_registry_client_mock.go
index d9fcfd48a..714b71824 100644
--- a/clients/ui/bff/internal/mocks/model_registry_client_mock.go
+++ b/clients/ui/bff/internal/mocks/model_registry_client_mock.go
@@ -85,3 +85,23 @@ func (m *ModelRegistryClientMock) CreateModelArtifactByModelVersion(_ integratio
 	mockData := GetModelArtifactMocks()[0]
 	return &mockData, nil
 }
+
+func (m *ModelRegistryClientMock) GetAllArtifacts(_ integrations.HTTPClientInterface, _ url.Values) (*openapi.ArtifactList, error) {
+	mockData := GenerateMockArtifactList()
+	return &mockData, nil
+}
+
+func (m *ModelRegistryClientMock) GetArtifact(_ integrations.HTTPClientInterface, _ string) (*openapi.Artifact, error) {
+	mockData := GenerateMockArtifact()
+	return &mockData, nil
+}
+
+func (m *ModelRegistryClientMock) CreateArtifact(_ integrations.HTTPClientInterface, _ []byte) (*openapi.Artifact, error) {
+	mockData := GenerateMockArtifact()
+	return &mockData, nil
+}
+
+func (m *ModelRegistryClientMock) UpdateArtifact(_ integrations.HTTPClientInterface, _ string, _ []byte) (*openapi.Artifact, error) {
+	mockData := GenerateMockArtifact()
+	return &mockData, nil
+}
diff --git a/clients/ui/bff/internal/mocks/static_data_mock.go b/clients/ui/bff/internal/mocks/static_data_mock.go
index 252a285e8..92a24c6f2 100644
--- a/clients/ui/bff/internal/mocks/static_data_mock.go
+++ b/clients/ui/bff/internal/mocks/static_data_mock.go
@@ -2,11 +2,13 @@ package mocks
 
 import (
 	"context"
+	"log/slog"
+	"os"
+
+	"github.com/brianvoe/gofakeit/v7"
 	"github.com/google/uuid"
 	"github.com/kubeflow/model-registry/pkg/openapi"
 	"github.com/kubeflow/model-registry/ui/bff/internal/constants"
-	"log/slog"
-	"os"
 )
 
 func GetRegisteredModelMocks() []openapi.RegisteredModel {
@@ -221,3 +223,27 @@ func NewMockSessionContext(parent context.Context) context.Context {
 func NewMockSessionContextNoParent() context.Context {
 	return NewMockSessionContext(context.TODO())
 }
+
+func GenerateMockArtifactList() openapi.ArtifactList {
+	var artifacts []openapi.Artifact
+	for i := 0; i < 2; i++ {
+		artifact := GenerateMockArtifact()
+		artifacts = append(artifacts, artifact)
+	}
+
+	return openapi.ArtifactList{
+		NextPageToken: gofakeit.UUID(),
+		PageSize:      int32(gofakeit.Number(1, 20)),
+		Size:          int32(len(artifacts)),
+		Items:         artifacts,
+	}
+}
+
+func GenerateMockArtifact() openapi.Artifact {
+	modelArtifact := GenerateMockModelArtifact()
+
+	mockData := openapi.Artifact{
+		ModelArtifact: &modelArtifact,
+	}
+	return mockData
+}
diff --git a/clients/ui/bff/internal/mocks/types_mock.go b/clients/ui/bff/internal/mocks/types_mock.go
index 096d3dfe0..c96a034c3 100644
--- a/clients/ui/bff/internal/mocks/types_mock.go
+++ b/clients/ui/bff/internal/mocks/types_mock.go
@@ -2,10 +2,11 @@ package mocks
 
 import (
 	"fmt"
-	"github.com/brianvoe/gofakeit/v7"
-	"github.com/kubeflow/model-registry/pkg/openapi"
 	"net/url"
 	"strconv"
+
+	"github.com/brianvoe/gofakeit/v7"
+	"github.com/kubeflow/model-registry/pkg/openapi"
 )
 
 func GenerateMockRegisteredModelList() openapi.RegisteredModelList {
@@ -85,7 +86,7 @@ func GenerateMockModelVersionList() openapi.ModelVersionList {
 
 func GenerateMockModelArtifact() openapi.ModelArtifact {
 	artifact := openapi.ModelArtifact{
-		ArtifactType: gofakeit.Word(),
+		ArtifactType: "model-artifact",
 		CustomProperties: &map[string]openapi.MetadataValue{
 			"example_key": {
 				MetadataStringValue: &openapi.MetadataStringValue{
diff --git a/clients/ui/bff/internal/repositories/artifacts.go b/clients/ui/bff/internal/repositories/artifacts.go
new file mode 100644
index 000000000..7069427f3
--- /dev/null
+++ b/clients/ui/bff/internal/repositories/artifacts.go
@@ -0,0 +1,91 @@
+package repositories
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/url"
+
+	"github.com/kubeflow/model-registry/pkg/openapi"
+	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
+)
+
+const artifactPath = "/artifacts"
+
+type ArtifactInterface interface {
+	GetAllArtifacts(client integrations.HTTPClientInterface, pageValues url.Values) (*openapi.ArtifactList, error)
+	GetArtifact(client integrations.HTTPClientInterface, id string) (*openapi.Artifact, error)
+	CreateArtifact(client integrations.HTTPClientInterface, jsonData []byte) (*openapi.Artifact, error)
+	UpdateArtifact(client integrations.HTTPClientInterface, id string, jsonData []byte) (*openapi.Artifact, error)
+}
+
+type Artifact struct {
+	ArtifactInterface
+}
+
+func (a Artifact) GetAllArtifacts(client integrations.HTTPClientInterface, pageValues url.Values) (*openapi.ArtifactList, error) {
+	responseData, err := client.GET(UrlWithPageParams(artifactPath, pageValues))
+	if err != nil {
+		return nil, fmt.Errorf("error fetching artifacts: %w", err)
+	}
+
+	var artifacts openapi.ArtifactList
+	if err := json.Unmarshal(responseData, &artifacts); err != nil {
+		return nil, fmt.Errorf("error decoding response data: %w", err)
+	}
+
+	return &artifacts, nil
+}
+
+func (a Artifact) GetArtifact(client integrations.HTTPClientInterface, id string) (*openapi.Artifact, error) {
+	path, err := url.JoinPath(artifactPath, id)
+	if err != nil {
+		return nil, err
+	}
+
+	responseData, err := client.GET(path)
+	if err != nil {
+		return nil, fmt.Errorf("error fetching artifacts: %w", err)
+	}
+
+	var artifact openapi.Artifact
+	if err := json.Unmarshal(responseData, &artifact); err != nil {
+		return nil, fmt.Errorf("error decoding response data: %w", err)
+	}
+
+	return &artifact, nil
+}
+
+func (a Artifact) CreateArtifact(client integrations.HTTPClientInterface, jsonData []byte) (*openapi.Artifact, error) {
+	responseData, err := client.POST(artifactPath, bytes.NewBuffer(jsonData))
+
+	if err != nil {
+		return nil, fmt.Errorf("error creating artifact: %w", err)
+	}
+
+	var artifact openapi.Artifact
+	if err := json.Unmarshal(responseData, &artifact); err != nil {
+		return nil, fmt.Errorf("error decoding response data: %w", err)
+	}
+
+	return &artifact, nil
+}
+
+func (a Artifact) UpdateArtifact(client integrations.HTTPClientInterface, id string, jsonData []byte) (*openapi.Artifact, error) {
+	path, err := url.JoinPath(artifactPath, id)
+	if err != nil {
+		return nil, err
+	}
+
+	responseData, err := client.PATCH(path, bytes.NewBuffer(jsonData))
+	if err != nil {
+		return nil, fmt.Errorf("error patching registered model: %w", err)
+	}
+
+	var artifact openapi.Artifact
+	if err := json.Unmarshal(responseData, &artifact); err != nil {
+		return nil, fmt.Errorf("error decoding response data: %w", err)
+	}
+
+	return &artifact, nil
+}
diff --git a/clients/ui/bff/internal/repositories/model_registry_client.go b/clients/ui/bff/internal/repositories/model_registry_client.go
index fe1a0158b..775dafbc5 100644
--- a/clients/ui/bff/internal/repositories/model_registry_client.go
+++ b/clients/ui/bff/internal/repositories/model_registry_client.go
@@ -7,12 +7,14 @@ import (
 type ModelRegistryClientInterface interface {
 	RegisteredModelInterface
 	ModelVersionInterface
+	ArtifactInterface
 }
 
 type ModelRegistryClient struct {
 	logger *slog.Logger
 	RegisteredModel
 	ModelVersion
+	Artifact
 }
 
 func NewModelRegistryClient(logger *slog.Logger) (ModelRegistryClientInterface, error) {
diff --git a/clients/ui/docs/local-deployment-guide-ui.md b/clients/ui/docs/local-deployment-guide-ui.md
index 10e9298a9..570454e85 100644
--- a/clients/ui/docs/local-deployment-guide-ui.md
+++ b/clients/ui/docs/local-deployment-guide-ui.md
@@ -26,15 +26,18 @@ kubectl create namespace kubeflow
 
 ### 3. Deploy Model Registry UI to cluster
 
-You can now deploy the UI and BFF to your newly created cluster using the kustomize configs in this directory:
-
+You can now deploy the UI and BFF to your newly created cluster using the kustomize configs in the root manifest directory:
 ```shell
-cd clients/ui
-
-kubectl apply -k manifests/overlay/standalone -n kubeflow
+cd manifests/kustomize/options/ui/overlays/standalone
+```
+```shell
+kustomize edit set namespace kubeflow
+```
+```shell
+kubectl apply -k .
 ```
 
-After a few seconds you should see 2 pods running (1 for BFF and 1 for UI):
+After a few seconds you should see 1 pod running:
 
 ```shell
 kubectl get pods -n kubeflow
@@ -95,5 +98,5 @@ To fix this, you'll need to increase the amount of memory available to the VM. T
 Alternatively, if you'd like to run the UI and BFF pods with an Istio configuration for the KF Central Dashboard, you can apply the manifests by running:
 
 ```shell
-kubectl apply -k overlays/istio -n kubeflow
+kubectl apply -k manifests/kustomize/options/ui/overlays/istio -n kubeflow
 ```
diff --git a/clients/ui/frontend/.env b/clients/ui/frontend/.env
index cf90978c5..7ff436e10 100644
--- a/clients/ui/frontend/.env
+++ b/clients/ui/frontend/.env
@@ -7,4 +7,5 @@ LOGO_DARK=logo-dark-theme.svg
 FAVICON=favicon.ico
 PRODUCT_NAME="Model Registry"
 STYLE_THEME=mui-theme
+PLATFORM_MODE=kubeflow
 
diff --git a/clients/ui/frontend/package-lock.json b/clients/ui/frontend/package-lock.json
index 99e3eb0bc..ea762de2a 100644
--- a/clients/ui/frontend/package-lock.json
+++ b/clients/ui/frontend/package-lock.json
@@ -32,7 +32,7 @@
         "@babel/preset-react": "^7.18.6",
         "@babel/preset-typescript": "^7.21.5",
         "@cypress/code-coverage": "^3.13.8",
-        "@mui/icons-material": "^6.1.10",
+        "@mui/icons-material": "^6.4.1",
         "@mui/material": "^6.1.7",
         "@mui/types": "^7.2.20",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
@@ -41,7 +41,7 @@
         "@testing-library/dom": "^10.4.0",
         "@testing-library/jest-dom": "^6.6.2",
         "@testing-library/react": "^16.1.0",
-        "@testing-library/user-event": "14.5.2",
+        "@testing-library/user-event": "14.6.1",
         "@types/classnames": "^2.3.1",
         "@types/dompurify": "^3.2.0",
         "@types/jest": "^29.5.13",
@@ -76,7 +76,7 @@
         "prop-types": "^15.8.1",
         "raw-loader": "^4.0.2",
         "react-refresh": "^0.14.2",
-        "react-router-dom": "^7.1.1",
+        "react-router-dom": "^7.1.3",
         "regenerator-runtime": "^0.14.1",
         "sass": "^1.83.0",
         "sass-loader": "^13.2.0",
@@ -102,8 +102,8 @@
         "node": ">=20.0.0"
       },
       "optionalDependencies": {
-        "@typescript-eslint/eslint-plugin": "^8.17.0",
-        "@typescript-eslint/parser": "^8.17.0",
+        "@typescript-eslint/eslint-plugin": "^8.20.0",
+        "@typescript-eslint/parser": "^8.20.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-import-resolver-node": "^0.3.7",
@@ -115,7 +115,7 @@
         "eslint-plugin-no-relative-import-paths": "^1.5.2",
         "eslint-plugin-prettier": "^5.0.0",
         "eslint-plugin-react": "^7.37.2",
-        "eslint-plugin-react-hooks": "^5.0.0"
+        "eslint-plugin-react-hooks": "^5.1.0"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -3031,20 +3031,22 @@
       "license": "MIT"
     },
     "node_modules/@mui/core-downloads-tracker": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.10.tgz",
-      "integrity": "sha512-LY5wdiLCBDY7u+Od8UmFINZFGN/5ZU90fhAslf/ZtfP+5RhuY45f679pqYIxe0y54l6Gkv9PFOc8Cs10LDTBYg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.1.tgz",
+      "integrity": "sha512-SfDLWMV5b5oXgDf3NTa2hCTPC1d2defhDH2WgFKmAiejC4mSfXYbyi+AFCLzpizauXhgBm8OaZy9BHKnrSpahQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mui-org"
       }
     },
     "node_modules/@mui/icons-material": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.1.10.tgz",
-      "integrity": "sha512-G6P1BCSt6EQDcKca47KwvKjlqgOXFbp2I3oWiOlFgKYTANBH89yk7ttMQ5ysqNxSYAB+4TdM37MlPYp4+FkVrQ==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.4.1.tgz",
+      "integrity": "sha512-wsxFcUTQxt4s+7Bg4GgobqRjyaHLmZGNOs+HJpbwrwmLbT6mhIJxhpqsKzzWq9aDY8xIe7HCjhpH7XI5UD6teA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0"
       },
@@ -3056,7 +3058,7 @@
         "url": "https://opencollective.com/mui-org"
       },
       "peerDependencies": {
-        "@mui/material": "^6.1.10",
+        "@mui/material": "^6.4.1",
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
       },
@@ -3067,22 +3069,23 @@
       }
     },
     "node_modules/@mui/material": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.10.tgz",
-      "integrity": "sha512-txnwYObY4N9ugv5T2n5h1KcbISegZ6l65w1/7tpSU5OB6MQCU94YkP8n/3slDw2KcEfRk4+4D8EUGfhSPMODEQ==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.4.1.tgz",
+      "integrity": "sha512-MFBfia6UiKxyoLeGkAh8M15bkeDmfnsUTMRJd/vTQue6YQ8AQ6lw9HqDthyYghzDEWIvZO/lQQzLrZE8XwNJLA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0",
-        "@mui/core-downloads-tracker": "^6.1.10",
-        "@mui/system": "^6.1.10",
-        "@mui/types": "^7.2.19",
-        "@mui/utils": "^6.1.10",
+        "@mui/core-downloads-tracker": "^6.4.1",
+        "@mui/system": "^6.4.1",
+        "@mui/types": "^7.2.21",
+        "@mui/utils": "^6.4.1",
         "@popperjs/core": "^2.11.8",
-        "@types/react-transition-group": "^4.4.11",
+        "@types/react-transition-group": "^4.4.12",
         "clsx": "^2.1.1",
         "csstype": "^3.1.3",
         "prop-types": "^15.8.1",
-        "react-is": "^18.3.1",
+        "react-is": "^19.0.0",
         "react-transition-group": "^4.4.5"
       },
       "engines": {
@@ -3095,7 +3098,7 @@
       "peerDependencies": {
         "@emotion/react": "^11.5.0",
         "@emotion/styled": "^11.3.0",
-        "@mui/material-pigment-css": "^6.1.10",
+        "@mui/material-pigment-css": "^6.4.1",
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -3115,14 +3118,22 @@
         }
       }
     },
+    "node_modules/@mui/material/node_modules/react-is": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz",
+      "integrity": "sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@mui/private-theming": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.1.10.tgz",
-      "integrity": "sha512-DqgsH0XFEweeG3rQfVkqTkeXcj/E76PGYWag8flbPdV8IYdMo+DfVdFlZK8JEjsaIVD2Eu1kJg972XnH5pfnBQ==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.4.1.tgz",
+      "integrity": "sha512-DcT7mwK89owwgcEuiE7w458te4CIjHbYWW6Kn6PiR6eLtxBsoBYphA968uqsQAOBQDpbYxvkuFLwhgk4bxoN/Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0",
-        "@mui/utils": "^6.1.10",
+        "@mui/utils": "^6.4.1",
         "prop-types": "^15.8.1"
       },
       "engines": {
@@ -3143,10 +3154,11 @@
       }
     },
     "node_modules/@mui/styled-engine": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.1.10.tgz",
-      "integrity": "sha512-+NV9adKZYhslJ270iPjf2yzdVJwav7CIaXcMlPSi1Xy1S/zRe5xFgZ6BEoMdmGRpr34lIahE8H1acXP2myrvRw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.4.0.tgz",
+      "integrity": "sha512-ek/ZrDujrger12P6o4luQIfRd2IziH7jQod2WMbLqGE03Iy0zUwYmckRTVhRQTLPNccpD8KXGcALJF+uaUQlbg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0",
         "@emotion/cache": "^11.13.5",
@@ -3177,16 +3189,17 @@
       }
     },
     "node_modules/@mui/system": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.1.10.tgz",
-      "integrity": "sha512-5YNIqxETR23SIkyP7MY2fFnXmplX/M4wNi2R+10AVRd3Ub+NLctWY/Vs5vq1oAMF0eSDLhRTGUjaUe+IGSfWqg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.4.1.tgz",
+      "integrity": "sha512-rgQzgcsHCTtzF9MZ+sL0tOhf2ZBLazpjrujClcb4Siju5lTrK0xX4PsiropActzCemNfM+mOu+0jezAVnfRK8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0",
-        "@mui/private-theming": "^6.1.10",
-        "@mui/styled-engine": "^6.1.10",
-        "@mui/types": "^7.2.19",
-        "@mui/utils": "^6.1.10",
+        "@mui/private-theming": "^6.4.1",
+        "@mui/styled-engine": "^6.4.0",
+        "@mui/types": "^7.2.21",
+        "@mui/utils": "^6.4.1",
         "clsx": "^2.1.1",
         "csstype": "^3.1.3",
         "prop-types": "^15.8.1"
@@ -3217,10 +3230,11 @@
       }
     },
     "node_modules/@mui/types": {
-      "version": "7.2.20",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.20.tgz",
-      "integrity": "sha512-straFHD7L8v05l/N5vcWk+y7eL9JF0C2mtph/y4BPm3gn2Eh61dDwDB65pa8DLss3WJfDXYC7Kx5yjP0EmXpgw==",
+      "version": "7.2.21",
+      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.21.tgz",
+      "integrity": "sha512-6HstngiUxNqLU+/DPqlUJDIPbzUBxIVHb1MmXP0eTWDIROiCR2viugXpEif0PPe2mLqqakPzzRClWAnK+8UJww==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
       },
@@ -3231,17 +3245,18 @@
       }
     },
     "node_modules/@mui/utils": {
-      "version": "6.1.10",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.1.10.tgz",
-      "integrity": "sha512-1ETuwswGjUiAf2dP9TkBy8p49qrw2wXa+RuAjNTRE5+91vtXJ1HKrs7H9s8CZd1zDlQVzUcUAPm9lpQwF5ogTw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.1.tgz",
+      "integrity": "sha512-iQUDUeYh87SvR4lVojaRaYnQix8BbRV51MxaV6MBmqthecQoxwSbS5e2wnbDJUeFxY2ppV505CiqPLtd0OWkqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0",
-        "@mui/types": "^7.2.19",
-        "@types/prop-types": "^15.7.13",
+        "@mui/types": "^7.2.21",
+        "@types/prop-types": "^15.7.14",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
-        "react-is": "^18.3.1"
+        "react-is": "^19.0.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -3260,6 +3275,13 @@
         }
       }
     },
+    "node_modules/@mui/utils/node_modules/react-is": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.0.0.tgz",
+      "integrity": "sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4266,9 +4288,9 @@
       }
     },
     "node_modules/@testing-library/user-event": {
-      "version": "14.5.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.2.tgz",
-      "integrity": "sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==",
+      "version": "14.6.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
+      "integrity": "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4679,9 +4701,9 @@
       "license": "MIT"
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.13",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
-      "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==",
+      "version": "15.7.14",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -4744,12 +4766,12 @@
       }
     },
     "node_modules/@types/react-transition-group": {
-      "version": "4.4.11",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz",
-      "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==",
+      "version": "4.4.12",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
+      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
+      "peerDependencies": {
         "@types/react": "*"
       }
     },
@@ -4883,21 +4905,21 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz",
-      "integrity": "sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz",
+      "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.18.0",
-        "@typescript-eslint/type-utils": "8.18.0",
-        "@typescript-eslint/utils": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/scope-manager": "8.21.0",
+        "@typescript-eslint/type-utils": "8.21.0",
+        "@typescript-eslint/utils": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4913,16 +4935,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz",
-      "integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==",
-      "license": "MITClause",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz",
+      "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.0",
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/typescript-estree": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/scope-manager": "8.21.0",
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/typescript-estree": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4938,14 +4960,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz",
-      "integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz",
+      "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0"
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4956,16 +4978,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.0.tgz",
-      "integrity": "sha512-er224jRepVAVLnMF2Q7MZJCq5CsdH2oqjP4dT7K6ij09Kyd+R21r7UVJrF0buMVdZS5QRhDzpvzAxHxabQadow==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz",
+      "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.18.0",
-        "@typescript-eslint/utils": "8.18.0",
+        "@typescript-eslint/typescript-estree": "8.21.0",
+        "@typescript-eslint/utils": "8.21.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4980,9 +5002,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
-      "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz",
+      "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -4994,20 +5016,20 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz",
-      "integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz",
+      "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5034,16 +5056,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.0.tgz",
-      "integrity": "sha512-p6GLdY383i7h5b0Qrfbix3Vc3+J2k6QWw6UMUeY5JGfm3C5LbZ4QIZzJNoNOfgyRe0uuYKjvVOsO/jD4SJO+xg==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz",
+      "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.18.0",
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/typescript-estree": "8.18.0"
+        "@typescript-eslint/scope-manager": "8.21.0",
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/typescript-estree": "8.21.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5058,13 +5080,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz",
-      "integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
+      "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
+        "@typescript-eslint/types": "8.21.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -7057,6 +7079,7 @@
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
       "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -9418,9 +9441,9 @@
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0.tgz",
-      "integrity": "sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz",
+      "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -17238,9 +17261,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.1.tgz",
-      "integrity": "sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.3.tgz",
+      "integrity": "sha512-EezYymLY6Guk/zLQ2vRA8WvdUhWFEj5fcE3RfWihhxXBW7+cd1LsIiA3lmx+KCmneAGQuyBv820o44L2+TtkSA==",
       "dependencies": {
         "@types/cookie": "^0.6.0",
         "cookie": "^1.0.1",
@@ -17261,12 +17284,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.1.tgz",
-      "integrity": "sha512-vSrQHWlJ5DCfyrhgo0k6zViOe9ToK8uT5XGSmnuC2R3/g261IdIMpZVqfjD6vWSXdnf5Czs4VA/V60oVR6/jnA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.3.tgz",
+      "integrity": "sha512-qQGTE+77hleBzv9SIUIkGRvuFBQGagW+TQKy53UTZAO/3+YFNBYvRsNIZ1GT17yHbc63FylMOdS+m3oUriF1GA==",
       "dev": true,
       "dependencies": {
-        "react-router": "7.1.1"
+        "react-router": "7.1.3"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -19705,16 +19728,16 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz",
-      "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
+      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
       "license": "MIT",
       "optional": true,
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/ts-jest": {
diff --git a/clients/ui/frontend/package.json b/clients/ui/frontend/package.json
index bc5bd2e1c..ed269a898 100644
--- a/clients/ui/frontend/package.json
+++ b/clients/ui/frontend/package.json
@@ -38,13 +38,13 @@
     "@babel/preset-typescript": "^7.21.5",
     "@cypress/code-coverage": "^3.13.8",
     "@mui/material": "^6.1.7",
-    "@mui/icons-material": "^6.1.10",
+    "@mui/icons-material": "^6.4.1",
     "@mui/types": "^7.2.20",
     "@testing-library/cypress": "^10.0.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.2",
     "@testing-library/react": "^16.1.0",
-    "@testing-library/user-event": "14.5.2",
+    "@testing-library/user-event": "14.6.1",
     "@types/classnames": "^2.3.1",
     "@types/dompurify": "^3.2.0",
     "@types/jest": "^29.5.13",
@@ -79,7 +79,7 @@
     "prop-types": "^15.8.1",
     "raw-loader": "^4.0.2",
     "react-refresh": "^0.14.2",
-    "react-router-dom": "^7.1.1",
+    "react-router-dom": "^7.1.3",
     "regenerator-runtime": "^0.14.1",
     "sass": "^1.83.0",
     "sass-loader": "^13.2.0",
@@ -121,8 +121,8 @@
     "classnames": "^2.2.6"
   },
   "optionalDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.17.0",
-    "@typescript-eslint/parser": "^8.17.0",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-node": "^0.3.7",
@@ -134,7 +134,7 @@
     "eslint-plugin-no-relative-import-paths": "^1.5.2",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0"
+    "eslint-plugin-react-hooks": "^5.1.0"
   },
   "overrides": {
     "serve": {
diff --git a/clients/ui/frontend/src/__mocks__/mockModelRegistry.ts b/clients/ui/frontend/src/__mocks__/mockModelRegistry.ts
index 56fed2e3f..ade07d64f 100644
--- a/clients/ui/frontend/src/__mocks__/mockModelRegistry.ts
+++ b/clients/ui/frontend/src/__mocks__/mockModelRegistry.ts
@@ -8,7 +8,7 @@ type MockModelRegistry = {
 
 export const mockModelRegistry = ({
   name = 'modelregistry-sample',
-  description = 'New model registry',
+  description = 'Model registry description',
   displayName = 'Model Registry Sample',
 }: MockModelRegistry): ModelRegistry => ({
   name,
diff --git a/clients/ui/frontend/src/__mocks__/mockModelVersion.ts b/clients/ui/frontend/src/__mocks__/mockModelVersion.ts
index 80a6f3107..018b12f01 100644
--- a/clients/ui/frontend/src/__mocks__/mockModelVersion.ts
+++ b/clients/ui/frontend/src/__mocks__/mockModelVersion.ts
@@ -1,23 +1,22 @@
-import { ModelVersion, ModelState } from '~/app/types';
-import { createModelRegistryLabelsObject } from './utils';
+import { ModelVersion, ModelState, ModelRegistryCustomProperties } from '~/app/types';
 
 type MockModelVersionType = {
   author?: string;
   id?: string;
   registeredModelId?: string;
   name?: string;
-  labels?: string[];
   state?: ModelState;
   description?: string;
   createTimeSinceEpoch?: string;
   lastUpdateTimeSinceEpoch?: string;
+  customProperties?: ModelRegistryCustomProperties;
 };
 
 export const mockModelVersion = ({
   author = 'Test author',
   registeredModelId = '1',
   name = 'new model version',
-  labels = [],
+  customProperties = {},
   id = '1',
   state = ModelState.LIVE,
   description = 'Description of model version',
@@ -26,7 +25,7 @@ export const mockModelVersion = ({
 }: MockModelVersionType): ModelVersion => ({
   author,
   createTimeSinceEpoch,
-  customProperties: createModelRegistryLabelsObject(labels),
+  customProperties,
   id,
   lastUpdateTimeSinceEpoch,
   name,
diff --git a/clients/ui/frontend/src/__mocks__/mockRegisteredModel.ts b/clients/ui/frontend/src/__mocks__/mockRegisteredModel.ts
index 7c45fbe57..61886e311 100644
--- a/clients/ui/frontend/src/__mocks__/mockRegisteredModel.ts
+++ b/clients/ui/frontend/src/__mocks__/mockRegisteredModel.ts
@@ -1,5 +1,4 @@
-import { ModelState, RegisteredModel } from '~/app/types';
-import { createModelRegistryLabelsObject } from './utils';
+import { ModelRegistryCustomProperties, ModelState, RegisteredModel } from '~/app/types';
 
 type MockRegisteredModelType = {
   id?: string;
@@ -7,7 +6,7 @@ type MockRegisteredModelType = {
   owner?: string;
   state?: ModelState;
   description?: string;
-  labels?: string[];
+  customProperties?: ModelRegistryCustomProperties;
 };
 
 export const mockRegisteredModel = ({
@@ -15,7 +14,7 @@ export const mockRegisteredModel = ({
   owner = 'Author 1',
   state = ModelState.LIVE,
   description = '',
-  labels = [],
+  customProperties = {},
   id = '1',
 }: MockRegisteredModelType): RegisteredModel => ({
   createTimeSinceEpoch: '1710404288975',
@@ -26,5 +25,5 @@ export const mockRegisteredModel = ({
   name,
   state,
   owner,
-  customProperties: createModelRegistryLabelsObject(labels),
+  customProperties,
 });
diff --git a/clients/ui/frontend/src/__mocks__/mockRegisteredModelsList.ts b/clients/ui/frontend/src/__mocks__/mockRegisteredModelsList.ts
index ddb525afe..1695c410d 100644
--- a/clients/ui/frontend/src/__mocks__/mockRegisteredModelsList.ts
+++ b/clients/ui/frontend/src/__mocks__/mockRegisteredModelsList.ts
@@ -1,4 +1,4 @@
-import { RegisteredModelList } from '~/app/types';
+import { ModelRegistryMetadataType, RegisteredModelList } from '~/app/types';
 import { mockRegisteredModel } from './mockRegisteredModel';
 
 export const mockRegisteredModelList = ({
@@ -10,39 +10,35 @@ export const mockRegisteredModelList = ({
       name: 'Fraud detection model',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          // eslint-disable-next-line camelcase
+          string_value: '',
+        },
+      },
     }),
     mockRegisteredModel({
       name: 'Credit Scoring',
-      labels: [
-        'Credit Score Predictor',
-        'Creditworthiness scoring system',
-        'Default Risk Analyzer',
-        'Portfolio Management',
-        'Risk Assessment',
-      ],
+      customProperties: {
+        'Credit Score Predictor': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          // eslint-disable-next-line camelcase
+          string_value: '',
+        },
+      },
     }),
     mockRegisteredModel({
       name: 'Label modal',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Testing label',
-        'Financial data',
-        'Fraud detection',
-        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ],
+      customProperties: {
+        'Testing label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          // eslint-disable-next-line camelcase
+          string_value: '',
+        },
+      },
     }),
   ],
 }: Partial<RegisteredModelList>): RegisteredModelList => ({
diff --git a/clients/ui/frontend/src/__mocks__/utils.ts b/clients/ui/frontend/src/__mocks__/utils.ts
index 43d1768e8..f1599462b 100644
--- a/clients/ui/frontend/src/__mocks__/utils.ts
+++ b/clients/ui/frontend/src/__mocks__/utils.ts
@@ -1,20 +1,4 @@
-import {
-  ModelRegistryMetadataType,
-  ModelRegistryBody,
-  ModelRegistryStringCustomProperties,
-} from '~/app/types';
-
-export const createModelRegistryLabelsObject = (
-  labels: string[],
-): ModelRegistryStringCustomProperties =>
-  labels.reduce((acc, label) => {
-    acc[label] = {
-      metadataType: ModelRegistryMetadataType.STRING,
-      // eslint-disable-next-line camelcase
-      string_value: '',
-    };
-    return acc;
-  }, {} as ModelRegistryStringCustomProperties);
+import { ModelRegistryBody } from '~/app/types';
 
 export const mockBFFResponse = <T>(data: T): ModelRegistryBody<T> => ({
   data,
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/components/subComponents/SearchSelector.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/components/subComponents/SearchSelector.ts
new file mode 100644
index 000000000..21591ae2a
--- /dev/null
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/components/subComponents/SearchSelector.ts
@@ -0,0 +1,59 @@
+import { SubComponentBase } from '~/__tests__/cypress/cypress/pages/components/subComponents/SubComponentBase';
+
+export class SearchSelector extends SubComponentBase {
+  constructor(
+    private selectorId: string,
+    contextSelectorId?: string,
+  ) {
+    super(contextSelectorId);
+  }
+
+  private findContextualItem(suffix: string): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findScope().document().findByTestId(`${this.selectorId}-${suffix}`);
+  }
+
+  findItem(name: string, useMenuList: boolean): Cypress.Chainable<JQuery<HTMLElement>> {
+    const list = useMenuList ? this.findMenuList() : this.findResultTableList();
+    return list.contains(name).should('exist');
+  }
+
+  selectItem(name: string, useMenuList = false): void {
+    this.findItem(name, useMenuList).click();
+  }
+
+  findSearchInput(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findContextualItem('search');
+  }
+
+  findToggleButton(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findContextualItem('toggle');
+  }
+
+  findResultTableList(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findContextualItem('table-list');
+  }
+
+  findSearchHelpText(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findContextualItem('searchHelpText');
+  }
+
+  findMenu(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findContextualItem('menu');
+  }
+
+  findMenuList(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findContextualItem('menuList');
+  }
+
+  // Search for an item by typing into the search input
+  searchItem(name: string): void {
+    this.findSearchInput().clear().type(name);
+  }
+
+  // Perform the entire process: open, search, and select
+  openAndSelectItem(name: string, useMenuList = false): void {
+    this.findToggleButton().click();
+    this.searchItem(name);
+    this.selectItem(name, useMenuList);
+  }
+}
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/components/subComponents/SubComponentBase.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/components/subComponents/SubComponentBase.ts
new file mode 100644
index 000000000..e1706e07e
--- /dev/null
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/components/subComponents/SubComponentBase.ts
@@ -0,0 +1,35 @@
+/**
+ * A SubComponent is a component that doesn't make up a full page and will be consumed in other page
+ * objects. This could be a complex field, a group of fields, or some section. Typically not large
+ * enough to warrant its own standalone page object.
+ *
+ * Primary use-case example:
+ *   class Foo extends SubComponentBase {
+ *     constructor(private myTestId: string, scopedTestId?: string) {
+ *       super(scopedTestId);
+ *     }
+ *
+ *     private find(suffix: string) {
+ *       return this.findScope().getByTestId(`${this.myTestId}-${suffix}`);
+ *     }
+ *
+ *     selectItem(name: string) {
+ *       // "list" would be an internal suffix for your component to know where the "items" are
+ *       return this.find('list').findDropdownItem(name);
+ *     }
+ *   }
+ *
+ * Search uses of this component to see further examples
+ */
+export class SubComponentBase {
+  constructor(private scopedBaseTestId?: string) {}
+
+  /** Allows for extended classes to make use of a simple one-check for their `find()` calls */
+  protected findScope(): (Cypress.cy & CyEventEmitter) | Cypress.Chainable<JQuery<HTMLElement>> {
+    if (this.scopedBaseTestId) {
+      return cy.findByTestId(this.scopedBaseTestId);
+    }
+
+    return cy;
+  }
+}
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
index 6e4b28591..fa8a72adc 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
@@ -87,14 +87,38 @@ class ModelRegistry {
     return cy.findByTestId('empty-model-registries-state');
   }
 
+  findModelRegistryEmptyTableState() {
+    return cy.findByTestId('dashboard-empty-table-state');
+  }
+
   shouldregisteredModelsEmpty() {
     cy.findByTestId('empty-registered-models').should('exist');
   }
 
+  findViewDetailsButton() {
+    return cy.findByTestId('view-details-button');
+  }
+
+  findDetailsPopover() {
+    return cy.findByTestId('mr-details-popover');
+  }
+
+  findHelpContentButton() {
+    return cy.findByTestId('model-registry-help-button');
+  }
+
+  findHelpContentPopover() {
+    return cy.findByTestId('model-registry-help-content');
+  }
+
   shouldmodelVersionsEmpty() {
     cy.findByTestId('empty-model-versions').should('exist');
   }
 
+  shouldArchiveModelVersionsEmpty() {
+    cy.findByTestId('empty-archive-model-versions').should('exist');
+  }
+
   shouldModelRegistrySelectorExist() {
     cy.findByTestId('model-registry-selector-dropdown').should('exist');
   }
@@ -103,10 +127,6 @@ class ModelRegistry {
     cy.findByTestId('registered-models-table-toolbar').should('exist');
   }
 
-  shouldArchiveModelVersionsEmpty() {
-    cy.findByTestId('empty-archive-model-versions').should('exist');
-  }
-
   tabEnabled() {
     appChrome.findNavItem('Model Registry').should('exist');
     return this;
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts
index 951b3b04c..a52fe97e1 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts
@@ -97,6 +97,14 @@ class ModelVersionArchive {
     return cy.findByTestId('archive-version-page-breadcrumb');
   }
 
+  findVersionDetailsTab() {
+    return cy.findByTestId('model-versions-details-tab');
+  }
+
+  findVersionDeploymentTab() {
+    return cy.findByTestId('deployments-tab');
+  }
+
   findArchiveVersionTable() {
     return cy.findByTestId('model-versions-archive-table');
   }
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails.ts
index c3d44c5f7..5106f1948 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails.ts
@@ -1,3 +1,5 @@
+import { TableRow } from '~/__tests__/cypress/cypress/pages/components/table';
+
 class ModelVersionDetails {
   visit() {
     const preferredModelRegistry = 'modelregistry-sample';
@@ -20,6 +22,14 @@ class ModelVersionDetails {
     return cy.findByTestId('model-version-description');
   }
 
+  findSourceModelFormat(subComponent: 'group' | 'edit' | 'save' | 'cancel') {
+    return cy.findByTestId(`source-model-format-${subComponent}`);
+  }
+
+  findSourceModelVersion(subComponent: 'group' | 'edit' | 'save' | 'cancel') {
+    return cy.findByTestId(`source-model-version-${subComponent}`);
+  }
+
   findMoreLabelsButton() {
     return cy.findByTestId('label-group').find('button');
   }
@@ -68,6 +78,78 @@ class ModelVersionDetails {
   findRegisteredDeploymentsTab() {
     return cy.findByTestId('deployments-tab');
   }
+
+  findAddPropertyButton() {
+    return cy.findByTestId('add-property-button');
+  }
+
+  findAddKeyInput() {
+    return cy.findByTestId('add-property-key-input');
+  }
+
+  findAddValueInput() {
+    return cy.findByTestId('add-property-value-input');
+  }
+
+  findKeyEditInput(key: string) {
+    return cy.findByTestId(['edit-property-key-input', key]);
+  }
+
+  findValueEditInput(value: string) {
+    return cy.findByTestId(['edit-property-value-input', value]);
+  }
+
+  findSaveButton() {
+    return cy.findByTestId('save-edit-button-property');
+  }
+
+  findCancelButton() {
+    return cy.findByTestId('discard-edit-button-property');
+  }
+
+  findExpandControlButton() {
+    return cy.findByTestId('expand-control-button');
+  }
+
+  private findTable() {
+    return cy.findByTestId('properties-table');
+  }
+
+  findPropertiesTableRows() {
+    return this.findTable().find('tbody tr');
+  }
+
+  getRow(name: string) {
+    return new PropertyRow(() =>
+      this.findTable().find(`[data-label=Key]`).contains(name).parents('tr'),
+    );
+  }
+
+  findEditLabelsButton() {
+    return cy.findByTestId('editable-labels-group-edit');
+  }
+
+  findAddLabelButton() {
+    return cy.findByTestId('add-label-button');
+  }
+
+  findLabelInput(label: string) {
+    return cy.findByTestId(`edit-label-input-${label}`);
+  }
+
+  findLabel(label: string) {
+    return cy.findByTestId(`editable-label-${label}`);
+  }
+
+  findLabelErrorAlert() {
+    return cy.findByTestId('label-error-alert');
+  }
+
+  findSaveLabelsButton() {
+    return cy.findByTestId('editable-labels-group-save');
+  }
 }
 
+class PropertyRow extends TableRow {}
+
 export const modelVersionDetails = new ModelVersionDetails();
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerModelPage.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerModelPage.ts
index 80d38bd61..4e9f4af7c 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerModelPage.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerModelPage.ts
@@ -1,3 +1,5 @@
+import { SearchSelector } from '~/__tests__/cypress/cypress/pages/components/subComponents/SearchSelector';
+
 export enum FormFieldSelector {
   MODEL_NAME = '#model-name',
   MODEL_DESCRIPTION = '#model-description',
@@ -15,6 +17,8 @@ export enum FormFieldSelector {
 }
 
 class RegisterModelPage {
+  projectDropdown = new SearchSelector('project-selector', 'connection-autofill-modal');
+
   visit() {
     const preferredModelRegistry = 'modelregistry-sample';
     cy.visit(`/model-registry/${preferredModelRegistry}/registerModel`);
@@ -41,10 +45,6 @@ class RegisterModelPage {
     return cy.findByTestId('connection-autofill-modal');
   }
 
-  findProjectSelector() {
-    return this.findConnectionAutofillModal().findByTestId('project-selector-dropdown');
-  }
-
   findConnectionSelector() {
     return this.findConnectionAutofillModal().findByTestId('select-data-connection');
   }
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerVersionPage.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerVersionPage.ts
new file mode 100644
index 000000000..3b9df6e9a
--- /dev/null
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerVersionPage.ts
@@ -0,0 +1,51 @@
+export enum FormFieldSelector {
+  REGISTERED_MODEL = '#registered-model-container .pf-m-typeahead',
+  VERSION_NAME = '#version-name',
+  VERSION_DESCRIPTION = '#version-description',
+  SOURCE_MODEL_FORMAT = '#source-model-format',
+  SOURCE_MODEL_FORMAT_VERSION = '#source-model-format-version',
+  LOCATION_TYPE_OBJECT_STORAGE = '#location-type-object-storage',
+  LOCATION_ENDPOINT = '#location-endpoint',
+  LOCATION_BUCKET = '#location-bucket',
+  LOCATION_REGION = '#location-region',
+  LOCATION_PATH = '#location-path',
+  LOCATION_TYPE_URI = '#location-type-uri',
+  LOCATION_URI = '#location-uri',
+}
+
+class RegisterVersionPage {
+  visit(registeredModelId?: string) {
+    const preferredModelRegistry = 'modelregistry-sample';
+    cy.visit(
+      registeredModelId
+        ? `/model-registry/${preferredModelRegistry}/registeredModels/${registeredModelId}/registerVersion`
+        : `/model-registry/${preferredModelRegistry}/registerVersion`,
+    );
+    this.wait();
+  }
+
+  private wait() {
+    const preferredModelRegistry = 'modelregistry-sample';
+    cy.findByTestId('app-page-title').should('exist');
+    cy.findByTestId('app-page-title').contains('Register new version');
+    cy.findByText(`Model registry - ${preferredModelRegistry}`).should('exist');
+    cy.testA11y();
+  }
+
+  findFormField(selector: FormFieldSelector) {
+    return cy.get(selector);
+  }
+
+  selectRegisteredModel(name: string) {
+    this.findFormField(FormFieldSelector.REGISTERED_MODEL)
+      .findByRole('button', { name: 'Typeahead menu toggle' })
+      .findSelectOption(name)
+      .click();
+  }
+
+  findSubmitButton() {
+    return cy.findByTestId('create-button');
+  }
+}
+
+export const registerVersionPage = new RegisterVersionPage();
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/api.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/api.ts
index f4fc6018d..e560ebf26 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/api.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/api.ts
@@ -50,6 +50,13 @@ declare global {
           },
           response: ApiResponse<ModelVersionList>,
         ) => Cypress.Chainable<null>) &
+        ((
+          type: 'GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions',
+          options: {
+            path: { modelRegistryName: string; apiVersion: string };
+          },
+          response: ApiResponse<ModelVersionList>,
+        ) => Cypress.Chainable<null>) &
         ((
           type: 'POST /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId/versions',
           options: {
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
index 897b01148..abbb30e23 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
@@ -5,7 +5,12 @@ import { mockModelVersionList } from '~/__mocks__/mockModelVersionList';
 import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
 import { mockRegisteredModelList } from '~/__mocks__/mockRegisteredModelsList';
 import { labelModal, modelRegistry } from '~/__tests__/cypress/cypress/pages/modelRegistry';
-import type { ModelRegistry, ModelVersion, RegisteredModel } from '~/app/types';
+import {
+  ModelRegistryMetadataType,
+  type ModelRegistry,
+  type ModelVersion,
+  type RegisteredModel,
+} from '~/app/types';
 import { be } from '~/__tests__/cypress/cypress/utils/should';
 import { MODEL_REGISTRY_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
 
@@ -19,13 +24,11 @@ const initIntercepts = ({
   modelRegistries = [
     mockModelRegistry({
       name: 'modelregistry-sample',
-      description: 'New model registry',
-      displayName: 'Model Registry Sample',
     }),
     mockModelRegistry({
       name: 'modelregistry-sample-2',
-      description: 'New model registry 2',
-      displayName: 'Model Registry Sample 2',
+      description: '',
+      displayName: 'modelregistry-sample-2',
     }),
   ],
   registeredModels = [
@@ -33,29 +36,72 @@ const initIntercepts = ({
       name: 'Fraud detection model',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
     }),
     mockRegisteredModel({
       name: 'Label modal',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Testing label',
-        'Financial data',
-        'Fraud detection',
-        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ],
+      customProperties: {
+        'Testing label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc':
+          {
+            metadataType: ModelRegistryMetadataType.STRING,
+            string_value: '',
+          },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Label x': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Label y': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Label z': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
     }),
   ],
   modelVersions = [
@@ -71,6 +117,14 @@ const initIntercepts = ({
     modelRegistries,
   );
 
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions`,
+    {
+      path: { modelRegistryName: 'modelregistry-sample', apiVersion: MODEL_REGISTRY_API_VERSION },
+    },
+    mockModelVersionList({ items: modelVersions }),
+  );
+
   cy.interceptApi(
     `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models`,
     {
@@ -95,20 +149,7 @@ const initIntercepts = ({
 describe('Model Registry core', () => {
   it('Model Registry Enabled in the cluster', () => {
     initIntercepts({
-      registeredModels: [
-        mockRegisteredModel({
-          name: 'Fraud detection model',
-          description:
-            'A machine learning model trained to detect fraudulent transactions in financial data',
-          labels: [
-            'Financial data',
-            'Fraud detection',
-            'Test label',
-            'Machine learning',
-            'Next data to be overflow',
-          ],
-        }),
-      ],
+      registeredModels: [],
     });
 
     modelRegistry.visit();
@@ -126,7 +167,6 @@ describe('Model Registry core', () => {
     modelRegistry.navigate();
     modelRegistry.findModelRegistryEmptyState().should('exist');
   });
-
   it('No registered models in the selected Model Registry', () => {
     initIntercepts({
       registeredModels: [],
@@ -136,6 +176,26 @@ describe('Model Registry core', () => {
     modelRegistry.navigate();
     modelRegistry.shouldModelRegistrySelectorExist();
     modelRegistry.shouldregisteredModelsEmpty();
+
+    modelRegistry.findViewDetailsButton().click();
+    modelRegistry.findDetailsPopover().should('exist');
+    modelRegistry.findDetailsPopover().findByText('Model registry description').should('exist');
+
+    // Model registry with no description
+    modelRegistry.findModelRegistry().findSelectOption('modelregistry-sample-2').click();
+    modelRegistry.findViewDetailsButton().click();
+    modelRegistry.findDetailsPopover().should('exist');
+    modelRegistry.findDetailsPopover().findByText('No description').should('exist');
+
+    //  Model registry help content
+    modelRegistry.findHelpContentButton().click();
+    modelRegistry.findHelpContentPopover().should('exist');
+    modelRegistry
+      .findHelpContentPopover()
+      .findByText(
+        'To request access to a new or existing model registry, contact your administrator.',
+      )
+      .should('exist');
   });
 
   describe('Registered model table', () => {
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionArchive.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionArchive.cy.ts
similarity index 86%
rename from clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionArchive.cy.ts
rename to clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionArchive.cy.ts
index eeed18eda..278281f2a 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionArchive.cy.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionArchive.cy.ts
@@ -6,7 +6,7 @@ import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
 import { verifyRelativeURL } from '~/__tests__/cypress/cypress/utils/url';
 import { labelModal, modelRegistry } from '~/__tests__/cypress/cypress/pages/modelRegistry';
 import type { ModelRegistry, ModelVersion } from '~/app/types';
-import { ModelState } from '~/app/types';
+import { ModelRegistryMetadataType, ModelState } from '~/app/types';
 import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
 import { mockBFFResponse } from '~/__mocks__/utils';
 import {
@@ -30,16 +30,40 @@ const initIntercepts = ({
       name: 'model version 1',
       author: 'Author 1',
       id: '1',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-        'Test label x',
-        'Test label y',
-        'Test label z',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label x': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label y': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label z': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
       state: ModelState.ARCHIVED,
     }),
     mockModelVersion({ id: '2', name: 'model version 2', state: ModelState.ARCHIVED }),
@@ -202,7 +226,7 @@ describe('Restoring archive version', () => {
     modelVersionArchive.visit();
 
     const archiveVersionRow = modelVersionArchive.getRow('model version 2');
-    archiveVersionRow.findKebabAction('Restore version').click();
+    archiveVersionRow.findKebabAction('Restore model version').click();
 
     restoreVersionModal.findRestoreButton().click();
 
@@ -273,6 +297,13 @@ describe('Archiving version', () => {
     });
   });
 
+  it('Archived version details page does not have the Deployments tab', () => {
+    initIntercepts({});
+    modelVersionArchive.visitArchiveVersionDetail();
+    modelVersionArchive.findVersionDetailsTab().should('exist');
+    modelVersionArchive.findVersionDeploymentTab().should('not.exist');
+  });
+
   it('Archive version from versions details', () => {
     cy.interceptApi(
       'PATCH /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId',
@@ -290,7 +321,7 @@ describe('Archiving version', () => {
     modelVersionArchive.visitModelVersionDetails();
     modelVersionArchive
       .findModelVersionsDetailsHeaderAction()
-      .findDropdownItem('Archive version')
+      .findDropdownItem('Archive model version')
       .click();
 
     archiveVersionModal.findArchiveButton().should('be.disabled');
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionDetails.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionDetails.cy.ts
new file mode 100644
index 000000000..3b5771d50
--- /dev/null
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionDetails.cy.ts
@@ -0,0 +1,397 @@
+/* eslint-disable camelcase */
+import { verifyRelativeURL } from '~/__tests__/cypress/cypress/utils/url';
+import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
+import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
+import { mockModelVersionList } from '~/__mocks__/mockModelVersionList';
+import { mockModelVersion } from '~/__mocks__/mockModelVersion';
+import { mockModelArtifactList } from '~/__mocks__/mockModelArtifactList';
+import { ModelRegistryMetadataType, ModelState, type ModelRegistry } from '~/app/types';
+import { MODEL_REGISTRY_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
+import { modelVersionDetails } from '~/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails';
+import { mockBFFResponse } from '~/__mocks__/utils';
+
+const mockModelVersions = mockModelVersion({
+  id: '1',
+  name: 'Version 1',
+  customProperties: {
+    a1: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v1',
+    },
+    a2: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v2',
+    },
+    a3: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v3',
+    },
+    a4: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v4',
+    },
+    a5: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v5',
+    },
+    a6: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v1',
+    },
+    a7: {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: 'v7',
+    },
+    'Testing label': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Financial data': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Fraud detection': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc':
+      {
+        metadataType: ModelRegistryMetadataType.STRING,
+        string_value: '',
+      },
+    'Machine learning': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Next data to be overflow': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Label x': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Label y': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+    'Label z': {
+      metadataType: ModelRegistryMetadataType.STRING,
+      string_value: '',
+    },
+  },
+});
+
+type HandlersProps = {
+  modelRegistries?: ModelRegistry[];
+};
+
+const initIntercepts = ({
+  modelRegistries = [
+    mockModelRegistry({
+      name: 'modelregistry-sample',
+      description: 'New model registry',
+      displayName: 'Model Registry Sample',
+    }),
+    mockModelRegistry({
+      name: 'modelregistry-sample-2',
+      description: 'New model registry 2',
+      displayName: 'Model Registry Sample 2',
+    }),
+  ],
+}: HandlersProps) => {
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry`,
+    {
+      path: { apiVersion: MODEL_REGISTRY_API_VERSION },
+    },
+    modelRegistries,
+  );
+
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId`,
+    {
+      path: {
+        modelRegistryName: 'modelregistry-sample',
+        apiVersion: MODEL_REGISTRY_API_VERSION,
+        registeredModelId: 1,
+      },
+    },
+    mockRegisteredModel({}),
+  );
+
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId/versions`,
+    {
+      path: {
+        modelRegistryName: 'modelregistry-sample',
+        apiVersion: MODEL_REGISTRY_API_VERSION,
+        registeredModelId: 1,
+      },
+    },
+    mockModelVersionList({
+      items: [
+        mockModelVersion({ name: 'Version 1', author: 'Author 1', registeredModelId: '1' }),
+        mockModelVersion({
+          author: 'Author 2',
+          registeredModelId: '1',
+          id: '2',
+          name: 'Version 2',
+        }),
+        mockModelVersion({
+          author: 'Author 3',
+          registeredModelId: '1',
+          id: '3',
+          name: 'Version 3',
+          state: ModelState.ARCHIVED,
+        }),
+      ],
+    }),
+  );
+
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId`,
+    {
+      path: {
+        modelRegistryName: 'modelregistry-sample',
+        apiVersion: MODEL_REGISTRY_API_VERSION,
+        modelVersionId: 1,
+      },
+    },
+    mockModelVersions,
+  );
+
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId`,
+    {
+      path: {
+        modelRegistryName: 'modelregistry-sample',
+        apiVersion: MODEL_REGISTRY_API_VERSION,
+        modelVersionId: 2,
+      },
+    },
+    mockModelVersion({ id: '2', name: 'Version 2' }),
+  );
+
+  cy.interceptApi(
+    `PATCH /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId`,
+    {
+      path: {
+        modelRegistryName: 'modelregistry-sample',
+        apiVersion: MODEL_REGISTRY_API_VERSION,
+        modelVersionId: 1,
+      },
+    },
+    mockModelVersions,
+  ).as('UpdatePropertyRow');
+
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId/artifacts`,
+    {
+      path: {
+        modelRegistryName: 'modelregistry-sample',
+        apiVersion: MODEL_REGISTRY_API_VERSION,
+        modelVersionId: 1,
+      },
+    },
+    mockModelArtifactList({}),
+  );
+};
+
+describe('Model version details', () => {
+  describe('Details tab', () => {
+    beforeEach(() => {
+      initIntercepts({});
+      modelVersionDetails.visit();
+    });
+
+    it('Model version details page header', () => {
+      verifyRelativeURL(
+        '/model-registry/modelregistry-sample/registeredModels/1/versions/1/details',
+      );
+      cy.findByTestId('app-page-title').should('have.text', 'Version 1');
+      cy.findByTestId('breadcrumb-version-name').should('have.text', 'Version 1');
+    });
+
+    it('should add a property', () => {
+      modelVersionDetails.findAddPropertyButton().click();
+      modelVersionDetails.findAddKeyInput().type('new_key');
+      modelVersionDetails.findAddValueInput().type('new_value');
+      modelVersionDetails.findCancelButton().click();
+
+      modelVersionDetails.findAddPropertyButton().click();
+      modelVersionDetails.findAddKeyInput().type('new_key');
+      modelVersionDetails.findAddValueInput().type('new_value');
+      modelVersionDetails.findSaveButton().click();
+      cy.wait('@UpdatePropertyRow');
+    });
+
+    it('should edit a property row', () => {
+      modelVersionDetails.findExpandControlButton().should('have.text', 'Show 2 more properties');
+      modelVersionDetails.findExpandControlButton().click();
+      const propertyRow = modelVersionDetails.getRow('a6');
+      propertyRow.find().findKebabAction('Edit').click();
+      modelVersionDetails.findKeyEditInput('a6').clear().type('edit_key');
+      modelVersionDetails.findValueEditInput('v1').clear().type('edit_value');
+
+      modelVersionDetails.findCancelButton().click();
+      propertyRow.find().findKebabAction('Edit').click();
+      modelVersionDetails.findKeyEditInput('a6').clear().type('edit_key');
+      modelVersionDetails.findValueEditInput('v1').clear().type('edit_value');
+      modelVersionDetails.findSaveButton().click();
+      cy.wait('@UpdatePropertyRow').then((interception) => {
+        expect(interception.request.body).to.eql(
+          mockBFFResponse({
+            customProperties: {
+              a1: { metadataType: 'MetadataStringValue', string_value: 'v1' },
+              a2: { metadataType: 'MetadataStringValue', string_value: 'v2' },
+              a3: { metadataType: 'MetadataStringValue', string_value: 'v3' },
+              a4: { metadataType: 'MetadataStringValue', string_value: 'v4' },
+              a5: { metadataType: 'MetadataStringValue', string_value: 'v5' },
+              a7: { metadataType: 'MetadataStringValue', string_value: 'v7' },
+              'Testing label': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Financial data': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Fraud detection': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc':
+                { metadataType: 'MetadataStringValue', string_value: '' },
+              'Machine learning': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Next data to be overflow': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Label x': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Label y': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Label z': { metadataType: 'MetadataStringValue', string_value: '' },
+              edit_key: { string_value: 'edit_value', metadataType: 'MetadataStringValue' },
+            },
+          }),
+        );
+      });
+    });
+
+    it('should delete a property row', () => {
+      modelVersionDetails.findExpandControlButton().should('have.text', 'Show 2 more properties');
+      modelVersionDetails.findExpandControlButton().click();
+      const propertyRow = modelVersionDetails.getRow('a6');
+      modelVersionDetails.findPropertiesTableRows().should('have.length', 7);
+      propertyRow.find().findKebabAction('Delete').click();
+      cy.wait('@UpdatePropertyRow').then((interception) => {
+        expect(interception.request.body).to.eql(
+          mockBFFResponse({
+            customProperties: {
+              a1: { metadataType: 'MetadataStringValue', string_value: 'v1' },
+              a2: { metadataType: 'MetadataStringValue', string_value: 'v2' },
+              a3: { metadataType: 'MetadataStringValue', string_value: 'v3' },
+              a4: { metadataType: 'MetadataStringValue', string_value: 'v4' },
+              a5: { metadataType: 'MetadataStringValue', string_value: 'v5' },
+              a7: { metadataType: 'MetadataStringValue', string_value: 'v7' },
+              'Testing label': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Financial data': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Fraud detection': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc':
+                { metadataType: 'MetadataStringValue', string_value: '' },
+              'Machine learning': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Next data to be overflow': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Label x': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Label y': { metadataType: 'MetadataStringValue', string_value: '' },
+              'Label z': { metadataType: 'MetadataStringValue', string_value: '' },
+            },
+          }),
+        );
+      });
+    });
+
+    it('Switching model versions', () => {
+      cy.interceptApi(
+        `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId/artifacts`,
+        {
+          path: {
+            modelRegistryName: 'modelregistry-sample',
+            apiVersion: MODEL_REGISTRY_API_VERSION,
+            modelVersionId: 2,
+          },
+        },
+        mockModelArtifactList({}),
+      );
+      modelVersionDetails.findVersionId().contains('1');
+      modelVersionDetails.findModelVersionDropdownButton().click();
+      modelVersionDetails.findModelVersionDropdownItem('Version 3').should('not.exist');
+      modelVersionDetails.findModelVersionDropdownSearch().fill('Version 2');
+      modelVersionDetails.findModelVersionDropdownItem('Version 2').click();
+      modelVersionDetails.findVersionId().contains('2');
+    });
+
+    it('should handle label editing', () => {
+      modelVersionDetails.findEditLabelsButton().click();
+
+      modelVersionDetails.findAddLabelButton().click();
+      cy.findByTestId('editable-label-group')
+        .should('exist')
+        .within(() => {
+          cy.contains('New Label').should('exist').click();
+          cy.focused().type('First Label{enter}');
+        });
+
+      modelVersionDetails.findAddLabelButton().click();
+      cy.findByTestId('editable-label-group')
+        .should('exist')
+        .within(() => {
+          cy.contains('New Label').should('exist').click();
+          cy.focused().type('Second Label{enter}');
+        });
+
+      cy.findByTestId('editable-label-group').within(() => {
+        cy.contains('First Label').should('exist').click();
+        cy.focused().type('Updated First Label{enter}');
+      });
+
+      cy.findByTestId('editable-label-group').within(() => {
+        cy.contains('Second Label').parent().find('[data-testid^="remove-label-"]').click();
+      });
+
+      modelVersionDetails.findSaveLabelsButton().should('exist').click();
+    });
+
+    it('should validate label length', () => {
+      modelVersionDetails.findEditLabelsButton().click();
+
+      const longLabel = 'a'.repeat(64);
+      modelVersionDetails.findAddLabelButton().click();
+      cy.findByTestId('editable-label-group')
+        .should('exist')
+        .within(() => {
+          cy.contains('New Label').should('exist').click();
+          cy.focused().type(`${longLabel}{enter}`);
+        });
+
+      cy.findByTestId('label-error-alert')
+        .should('be.visible')
+        .within(() => {
+          cy.contains(`can't exceed 63 characters`).should('exist');
+        });
+    });
+
+    it('should validate duplicate labels', () => {
+      modelVersionDetails.findEditLabelsButton().click();
+
+      modelVersionDetails.findAddLabelButton().click();
+      cy.findByTestId('editable-label-group')
+        .should('exist')
+        .within(() => {
+          cy.get('[data-testid^="editable-label-"]').last().click();
+          cy.focused().type('{selectall}{backspace}Testing label{enter}');
+        });
+
+      modelVersionDetails.findAddLabelButton().click();
+      cy.findByTestId('editable-label-group')
+        .should('exist')
+        .within(() => {
+          cy.get('[data-testid^="editable-label-"]').last().click();
+          cy.focused().type('{selectall}{backspace}Testing label{enter}');
+        });
+
+      cy.findByTestId('label-error-alert')
+        .should('be.visible')
+        .within(() => {
+          cy.contains('Testing label already exists').should('exist');
+        });
+    });
+  });
+});
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersions.cy.ts
similarity index 85%
rename from clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts
rename to clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersions.cy.ts
index 842392f6b..292cbee0c 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersions.cy.ts
@@ -4,7 +4,7 @@ import { mockRegisteredModelList } from '~/__mocks__/mockRegisteredModelsList';
 import { labelModal, modelRegistry } from '~/__tests__/cypress/cypress/pages/modelRegistry';
 import { be } from '~/__tests__/cypress/cypress/utils/should';
 import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
-import type { ModelRegistry, ModelVersion } from '~/app/types';
+import { ModelRegistryMetadataType, type ModelRegistry, type ModelVersion } from '~/app/types';
 import { verifyRelativeURL } from '~/__tests__/cypress/cypress/utils/url';
 import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
 import { mockModelVersion } from '~/__mocks__/mockModelVersion';
@@ -34,16 +34,40 @@ const initIntercepts = ({
     mockModelVersion({
       author: 'Author 1',
       id: '1',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-        'Test label x',
-        'Test label y',
-        'Test label z',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label x': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label y': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label z': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
     }),
     mockModelVersion({ id: '2', name: 'model version' }),
   ],
@@ -56,6 +80,14 @@ const initIntercepts = ({
     modelRegistries,
   );
 
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions`,
+    {
+      path: { modelRegistryName: 'modelregistry-sample', apiVersion: MODEL_REGISTRY_API_VERSION },
+    },
+    mockModelVersionList({ items: modelVersions }),
+  );
+
   cy.interceptApi(
     `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models`,
     {
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/registeredModelArchive.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registeredModelArchive.cy.ts
similarity index 90%
rename from clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/registeredModelArchive.cy.ts
rename to clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registeredModelArchive.cy.ts
index 6601e3290..74cfd6471 100644
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/registeredModelArchive.cy.ts
+++ b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registeredModelArchive.cy.ts
@@ -7,7 +7,7 @@ import { labelModal, modelRegistry } from '~/__tests__/cypress/cypress/pages/mod
 import { mockModelVersionList } from '~/__mocks__/mockModelVersionList';
 import { be } from '~/__tests__/cypress/cypress/utils/should';
 import type { ModelRegistry, ModelVersion, RegisteredModel } from '~/app/types';
-import { ModelState } from '~/app/types';
+import { ModelRegistryMetadataType, ModelState } from '~/app/types';
 import { mockBFFResponse } from '~/__mocks__/utils';
 import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
 import { MODEL_REGISTRY_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
@@ -29,16 +29,40 @@ const initIntercepts = ({
     mockRegisteredModel({
       name: 'model 1',
       id: '1',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-        'Test label x',
-        'Test label y',
-        'Test label z',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label x': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label y': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label z': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
       state: ModelState.ARCHIVED,
     }),
     mockRegisteredModel({ id: '2', name: 'model 2', state: ModelState.ARCHIVED }),
@@ -70,6 +94,14 @@ const initIntercepts = ({
     modelRegistries,
   );
 
+  cy.interceptApi(
+    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions`,
+    {
+      path: { modelRegistryName: 'modelregistry-sample', apiVersion: MODEL_REGISTRY_API_VERSION },
+    },
+    mockModelVersionList({ items: modelVersions }),
+  );
+
   cy.interceptApi(
     `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models`,
     {
diff --git a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionDetails.cy.ts b/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionDetails.cy.ts
deleted file mode 100644
index 58f28ac6a..000000000
--- a/clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionDetails.cy.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/* eslint-disable camelcase */
-import { verifyRelativeURL } from '~/__tests__/cypress/cypress/utils/url';
-import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
-import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
-import { mockModelVersionList } from '~/__mocks__/mockModelVersionList';
-import { mockModelVersion } from '~/__mocks__/mockModelVersion';
-import { mockModelArtifactList } from '~/__mocks__/mockModelArtifactList';
-import { mockModelArtifact } from '~/__mocks__/mockModelArtifact';
-import type { ModelRegistry } from '~/app/types';
-import { MODEL_REGISTRY_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
-import { modelVersionDetails } from '~/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails';
-
-type HandlersProps = {
-  modelRegistries?: ModelRegistry[];
-};
-
-const initIntercepts = ({
-  modelRegistries = [
-    mockModelRegistry({
-      name: 'modelregistry-sample',
-      description: 'New model registry',
-      displayName: 'Model Registry Sample',
-    }),
-    mockModelRegistry({
-      name: 'modelregistry-sample-2',
-      description: 'New model registry 2',
-      displayName: 'Model Registry Sample 2',
-    }),
-  ],
-}: HandlersProps) => {
-  cy.interceptApi(
-    `GET /api/:apiVersion/model_registry`,
-    {
-      path: { apiVersion: MODEL_REGISTRY_API_VERSION },
-    },
-    modelRegistries,
-  );
-
-  cy.interceptApi(
-    `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId`,
-    {
-      path: {
-        modelRegistryName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        registeredModelId: 1,
-      },
-    },
-    mockRegisteredModel({}),
-  );
-
-  cy.interceptApi(
-    `GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId/versions`,
-    {
-      path: {
-        modelRegistryName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        registeredModelId: 1,
-      },
-    },
-    mockModelVersionList({
-      items: [
-        mockModelVersion({ name: 'Version 1', author: 'Author 1', registeredModelId: '1' }),
-        mockModelVersion({
-          author: 'Author 2',
-          registeredModelId: '1',
-          id: '2',
-          name: 'Version 2',
-        }),
-      ],
-    }),
-  );
-
-  cy.interceptApi(
-    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId`,
-    {
-      path: {
-        modelRegistryName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        modelVersionId: 1,
-      },
-    },
-    mockModelVersion({
-      id: '1',
-      name: 'Version 1',
-      labels: [
-        'Testing label',
-        'Financial data',
-        'Fraud detection',
-        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ],
-    }),
-  );
-
-  cy.interceptApi(
-    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId`,
-    {
-      path: {
-        modelRegistryName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        modelVersionId: 2,
-      },
-    },
-    mockModelVersion({ id: '2', name: 'Version 2' }),
-  );
-
-  cy.interceptApi(
-    `GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId/artifacts`,
-    {
-      path: {
-        modelRegistryName: 'modelregistry-sample',
-        apiVersion: MODEL_REGISTRY_API_VERSION,
-        modelVersionId: 1,
-      },
-    },
-    mockModelArtifactList({
-      items: [
-        mockModelArtifact({}),
-        mockModelArtifact({
-          author: 'Author 2',
-          id: '2',
-          name: 'Artifact 2',
-        }),
-      ],
-    }),
-  );
-};
-
-describe('Model version details', () => {
-  describe('Details tab', () => {
-    beforeEach(() => {
-      initIntercepts({});
-      modelVersionDetails.visit();
-    });
-
-    it('Model version details page header', () => {
-      verifyRelativeURL(
-        '/model-registry/modelregistry-sample/registeredModels/1/versions/1/details',
-      );
-      cy.findByTestId('app-page-title').should('have.text', 'Version 1');
-      cy.findByTestId('breadcrumb-version-name').should('have.text', 'Version 1');
-    });
-
-    it('Model version details tab', () => {
-      modelVersionDetails.findVersionId().contains('1');
-      modelVersionDetails.findDescription().should('have.text', 'Description of model version');
-      modelVersionDetails.findMoreLabelsButton().contains('6 more');
-      modelVersionDetails.findMoreLabelsButton().click();
-      modelVersionDetails.shouldContainsModalLabels([
-        'Testing label',
-        'Financial',
-        'Financial data',
-        'Fraud detection',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ]);
-      modelVersionDetails.findStorageEndpoint().contains('test-endpoint');
-      modelVersionDetails.findStorageRegion().contains('test-region');
-      modelVersionDetails.findStorageBucket().contains('test-bucket');
-      modelVersionDetails.findStoragePath().contains('demo-models/test-path');
-    });
-
-    it('Switching model versions', () => {
-      modelVersionDetails.findVersionId().contains('1');
-      modelVersionDetails.findModelVersionDropdownButton().click();
-      modelVersionDetails.findModelVersionDropdownSearch().fill('Version 2');
-      modelVersionDetails.findModelVersionDropdownItem('Version 2').click();
-      modelVersionDetails.findVersionId().contains('2');
-    });
-  });
-});
diff --git a/clients/ui/frontend/src/app/AppRoutes.tsx b/clients/ui/frontend/src/app/AppRoutes.tsx
index 60a69d480..2be853ffb 100644
--- a/clients/ui/frontend/src/app/AppRoutes.tsx
+++ b/clients/ui/frontend/src/app/AppRoutes.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
-import { NotFound } from './pages/notFound/NotFound';
+import NotFound from '~/shared/components/notFound/NotFound';
 import ModelRegistrySettingsRoutes from './pages/settings/ModelRegistrySettingsRoutes';
 import ModelRegistryRoutes from './pages/modelRegistry/ModelRegistryRoutes';
 import useUser from './hooks/useUser';
diff --git a/clients/ui/frontend/src/app/NavBar.tsx b/clients/ui/frontend/src/app/NavBar.tsx
index b9e52df62..673707376 100644
--- a/clients/ui/frontend/src/app/NavBar.tsx
+++ b/clients/ui/frontend/src/app/NavBar.tsx
@@ -6,14 +6,17 @@ import {
   Masthead,
   MastheadContent,
   MastheadMain,
+  MastheadToggle,
   MenuToggle,
   MenuToggleElement,
+  PageToggleButton,
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
   ToolbarItem,
 } from '@patternfly/react-core';
 import { SimpleSelect } from '@patternfly/react-templates';
+import { BarsIcon } from '@patternfly/react-icons';
 import { NamespaceSelectorContext } from '~/shared/context/NamespaceSelectorContext';
 
 interface NavBarProps {
@@ -46,7 +49,13 @@ const NavBar: React.FC<NavBarProps> = ({ username, onLogout }) => {
 
   return (
     <Masthead>
-      <MastheadMain />
+      <MastheadMain>
+        <MastheadToggle>
+          <PageToggleButton id="page-nav-toggle" variant="plain" aria-label="Dashboard navigation">
+            <BarsIcon />
+          </PageToggleButton>
+        </MastheadToggle>
+      </MastheadMain>
       <MastheadContent>
         <Toolbar>
           <ToolbarContent>
diff --git a/clients/ui/frontend/src/app/__tests__/updateTimestamps.test.ts b/clients/ui/frontend/src/app/__tests__/updateTimestamps.test.ts
new file mode 100644
index 000000000..7824ed5a3
--- /dev/null
+++ b/clients/ui/frontend/src/app/__tests__/updateTimestamps.test.ts
@@ -0,0 +1,132 @@
+import {
+  ModelRegistryAPIs,
+  ModelState,
+  ModelRegistryMetadataType,
+  ModelVersion,
+  RegisteredModel,
+} from '~/app/types';
+import {
+  bumpModelVersionTimestamp,
+  bumpRegisteredModelTimestamp,
+  bumpBothTimestamps,
+} from '~/app/utils/updateTimestamps';
+
+describe('updateTimestamps', () => {
+  const mockApi = jest.mocked<ModelRegistryAPIs>({
+    createRegisteredModel: jest.fn(),
+    createModelVersionForRegisteredModel: jest.fn(),
+    createModelArtifactForModelVersion: jest.fn(),
+    getRegisteredModel: jest.fn(),
+    getModelVersion: jest.fn(),
+    listModelVersions: jest.fn(),
+    listRegisteredModels: jest.fn(),
+    getModelVersionsByRegisteredModel: jest.fn(),
+    getModelArtifactsByModelVersion: jest.fn(),
+    patchRegisteredModel: jest.fn(),
+    patchModelVersion: jest.fn(),
+    patchModelArtifact: jest.fn(),
+  });
+  const fakeModelVersionId = 'test-model-version-id';
+  const fakeRegisteredModelId = 'test-registered-model-id';
+
+  beforeEach(() => {
+    jest.spyOn(Date.prototype, 'toISOString').mockReturnValue('2024-01-01T00:00:00.000Z');
+  });
+
+  describe('bumpModelVersionTimestamp', () => {
+    it('should successfully update model version timestamp', async () => {
+      await bumpModelVersionTimestamp(mockApi, fakeModelVersionId);
+
+      expect(mockApi.patchModelVersion).toHaveBeenCalledWith(
+        {},
+        {
+          state: ModelState.LIVE,
+          customProperties: {
+            _lastModified: {
+              metadataType: ModelRegistryMetadataType.STRING,
+              // eslint-disable-next-line camelcase
+              string_value: '2024-01-01T00:00:00.000Z',
+            },
+          },
+        },
+        fakeModelVersionId,
+      );
+    });
+
+    it('should throw error if modelVersionId is empty', async () => {
+      await expect(bumpModelVersionTimestamp(mockApi, '')).rejects.toThrow(
+        'Model version ID is required',
+      );
+    });
+
+    it('should handle API errors appropriately', async () => {
+      const errorMessage = 'API Error';
+      // Use proper type for mock function
+      const mockFn = mockApi.patchModelVersion;
+      mockFn.mockRejectedValue(new Error(errorMessage));
+
+      await expect(bumpModelVersionTimestamp(mockApi, fakeModelVersionId)).rejects.toThrow(
+        `Failed to update model version timestamp: ${errorMessage}`,
+      );
+    });
+  });
+
+  describe('bumpRegisteredModelTimestamp', () => {
+    it('should successfully update registered model timestamp', async () => {
+      await bumpRegisteredModelTimestamp(mockApi, fakeRegisteredModelId);
+
+      expect(mockApi.patchRegisteredModel).toHaveBeenCalledWith(
+        {},
+        {
+          state: ModelState.LIVE,
+          customProperties: {
+            _lastModified: {
+              metadataType: ModelRegistryMetadataType.STRING,
+              // eslint-disable-next-line camelcase
+              string_value: '2024-01-01T00:00:00.000Z',
+            },
+          },
+        },
+        fakeRegisteredModelId,
+      );
+    });
+
+    it('should throw error if registeredModelId is empty', async () => {
+      await expect(bumpRegisteredModelTimestamp(mockApi, '')).rejects.toThrow(
+        'Registered model ID is required',
+      );
+    });
+
+    it('should handle API errors appropriately', async () => {
+      const errorMessage = 'API Error';
+      // Use proper type for mock function
+      const mockFn = mockApi.patchRegisteredModel;
+      mockFn.mockRejectedValue(new Error(errorMessage));
+
+      await expect(bumpRegisteredModelTimestamp(mockApi, fakeRegisteredModelId)).rejects.toThrow(
+        `Failed to update registered model timestamp: ${errorMessage}`,
+      );
+    });
+  });
+
+  describe('bumpBothTimestamps', () => {
+    it('should update both timestamps successfully', async () => {
+      mockApi.patchModelVersion.mockResolvedValue({} as ModelVersion);
+      mockApi.patchRegisteredModel.mockResolvedValue({} as RegisteredModel);
+
+      await bumpBothTimestamps(mockApi, fakeModelVersionId, fakeRegisteredModelId);
+
+      expect(mockApi.patchModelVersion).toHaveBeenCalled();
+      expect(mockApi.patchRegisteredModel).toHaveBeenCalled();
+    });
+
+    it('should handle errors from either update', async () => {
+      const errorMessage = 'API Error';
+      mockApi.patchModelVersion.mockRejectedValue(new Error(errorMessage));
+
+      await expect(
+        bumpBothTimestamps(mockApi, fakeModelVersionId, fakeRegisteredModelId),
+      ).rejects.toThrow();
+    });
+  });
+});
diff --git a/clients/ui/frontend/src/app/__tests__/utils.spec.ts b/clients/ui/frontend/src/app/__tests__/utils.spec.ts
new file mode 100644
index 000000000..82cf97644
--- /dev/null
+++ b/clients/ui/frontend/src/app/__tests__/utils.spec.ts
@@ -0,0 +1,230 @@
+import { mockModelVersion } from '~/__mocks__/mockModelVersion';
+import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
+import {
+  filterArchiveModels,
+  filterArchiveVersions,
+  filterLiveModels,
+  filterLiveVersions,
+  getLastCreatedItem,
+  ObjectStorageFields,
+  objectStorageFieldsToUri,
+  uriToObjectStorageFields,
+} from '~/app/utils';
+import { RegisteredModel, ModelState, ModelVersion } from '~/app/types';
+
+describe('objectStorageFieldsToUri', () => {
+  it('converts fields to URI with all fields present', () => {
+    const uri = objectStorageFieldsToUri({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: 'test-bucket',
+      region: 'us-east-1',
+      path: 'demo-models/flan-t5-small-caikit',
+    });
+    expect(uri).toEqual(
+      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
+    );
+  });
+
+  it('converts fields to URI with region missing', () => {
+    const uri = objectStorageFieldsToUri({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: 'test-bucket',
+      path: 'demo-models/flan-t5-small-caikit',
+    });
+    expect(uri).toEqual(
+      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F',
+    );
+  });
+
+  it('converts fields to URI with region empty', () => {
+    const uri = objectStorageFieldsToUri({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: 'test-bucket',
+      region: '',
+      path: 'demo-models/flan-t5-small-caikit',
+    });
+    expect(uri).toEqual(
+      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F',
+    );
+  });
+
+  it('falls back to null if endpoint is empty', () => {
+    const uri = objectStorageFieldsToUri({
+      endpoint: '',
+      bucket: 'test-bucket',
+      region: 'us-east-1',
+      path: 'demo-models/flan-t5-small-caikit',
+    });
+    expect(uri).toEqual(null);
+  });
+
+  it('falls back to null if bucket is empty', () => {
+    const uri = objectStorageFieldsToUri({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: '',
+      region: 'us-east-1',
+      path: 'demo-models/flan-t5-small-caikit',
+    });
+    expect(uri).toEqual(null);
+  });
+
+  it('falls back to null if path is empty', () => {
+    const uri = objectStorageFieldsToUri({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: 'test-bucket',
+      region: 'us-east-1',
+      path: '',
+    });
+    expect(uri).toEqual(null);
+  });
+});
+
+describe('uriToObjectStorageFields', () => {
+  it('converts URI to fields with all params present', () => {
+    const fields = uriToObjectStorageFields(
+      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
+    );
+    expect(fields).toEqual({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: 'test-bucket',
+      region: 'us-east-1',
+      path: 'demo-models/flan-t5-small-caikit',
+    } satisfies ObjectStorageFields);
+  });
+
+  it('converts URI to fields with region missing', () => {
+    const fields = uriToObjectStorageFields(
+      's3://test-bucket/demo-models/flan-t5-small-caikit?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F',
+    );
+    expect(fields).toEqual({
+      endpoint: 'http://s3.amazonaws.com/',
+      bucket: 'test-bucket',
+      path: 'demo-models/flan-t5-small-caikit',
+      region: undefined,
+    } satisfies ObjectStorageFields);
+  });
+
+  it('falls back to null if endpoint is missing', () => {
+    const fields = uriToObjectStorageFields('s3://test-bucket/demo-models/flan-t5-small-caikit');
+    expect(fields).toBeNull();
+  });
+
+  it('falls back to null if path is missing', () => {
+    const fields = uriToObjectStorageFields(
+      's3://test-bucket/?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
+    );
+    expect(fields).toBeNull();
+  });
+
+  it('falls back to null if bucket is missing', () => {
+    const fields = uriToObjectStorageFields(
+      's3://?endpoint=http%3A%2F%2Fs3.amazonaws.com%2F&defaultRegion=us-east-1',
+    );
+    expect(fields).toBeNull();
+  });
+
+  it('falls back to null if the URI is malformed', () => {
+    const fields = uriToObjectStorageFields('test-bucket/demo-models/flan-t5-small-caikit');
+    expect(fields).toBeNull();
+  });
+});
+
+describe('getLastCreatedItem', () => {
+  it('returns the latest item correctly', () => {
+    const items = [
+      {
+        foo: 'a',
+        createTimeSinceEpoch: '1712234877179', // Apr 04 2024
+      },
+      {
+        foo: 'b',
+        createTimeSinceEpoch: '1723659611927', // Aug 14 2024
+      },
+    ];
+    expect(getLastCreatedItem(items)).toBe(items[1]);
+  });
+
+  it('returns first item if items have no createTimeSinceEpoch', () => {
+    const items = [
+      { foo: 'a', createTimeSinceEpoch: undefined },
+      { foo: 'b', createTimeSinceEpoch: undefined },
+    ];
+    expect(getLastCreatedItem(items)).toBe(items[0]);
+  });
+});
+
+describe('Filter model state', () => {
+  const models: RegisteredModel[] = [
+    mockRegisteredModel({ name: 'Test 1', state: ModelState.ARCHIVED }),
+    mockRegisteredModel({
+      name: 'Test 2',
+      state: ModelState.LIVE,
+      description: 'Description2',
+    }),
+    mockRegisteredModel({ name: 'Test 3', state: ModelState.ARCHIVED }),
+    mockRegisteredModel({ name: 'Test 4', state: ModelState.ARCHIVED }),
+    mockRegisteredModel({ name: 'Test 5', state: ModelState.LIVE }),
+  ];
+
+  describe('filterArchiveModels', () => {
+    it('should filter out only the archived versions', () => {
+      const archivedModels = filterArchiveModels(models);
+      expect(archivedModels).toEqual([models[0], models[2], models[3]]);
+    });
+
+    it('should return an empty array if the input array is empty', () => {
+      const result = filterArchiveModels([]);
+      expect(result).toEqual([]);
+    });
+  });
+
+  describe('filterLiveModels', () => {
+    it('should filter out only the live models', () => {
+      const liveModels = filterLiveModels(models);
+      expect(liveModels).toEqual([models[1], models[4]]);
+    });
+
+    it('should return an empty array if the input array is empty', () => {
+      const result = filterLiveModels([]);
+      expect(result).toEqual([]);
+    });
+  });
+});
+
+describe('Filter model version state', () => {
+  const modelVersions: ModelVersion[] = [
+    mockModelVersion({ name: 'Test 1', state: ModelState.ARCHIVED }),
+    mockModelVersion({
+      name: 'Test 2',
+      state: ModelState.LIVE,
+      description: 'Description2',
+    }),
+    mockModelVersion({ name: 'Test 3', author: 'Author3', state: ModelState.ARCHIVED }),
+    mockModelVersion({ name: 'Test 4', state: ModelState.ARCHIVED }),
+    mockModelVersion({ name: 'Test 5', state: ModelState.LIVE }),
+  ];
+
+  describe('filterArchiveVersions', () => {
+    it('should filter out only the archived versions', () => {
+      const archivedVersions = filterArchiveVersions(modelVersions);
+      expect(archivedVersions).toEqual([modelVersions[0], modelVersions[2], modelVersions[3]]);
+    });
+
+    it('should return an empty array if the input array is empty', () => {
+      const result = filterArchiveVersions([]);
+      expect(result).toEqual([]);
+    });
+  });
+
+  describe('filterLiveVersions', () => {
+    it('should filter out only the live versions', () => {
+      const liveVersions = filterLiveVersions(modelVersions);
+      expect(liveVersions).toEqual([modelVersions[1], modelVersions[4]]);
+    });
+
+    it('should return an empty array if the input array is empty', () => {
+      const result = filterLiveVersions([]);
+      expect(result).toEqual([]);
+    });
+  });
+});
diff --git a/clients/ui/frontend/src/app/context/ModelRegistrySelectorContext.tsx b/clients/ui/frontend/src/app/context/ModelRegistrySelectorContext.tsx
index 9b1309dbf..941881b91 100644
--- a/clients/ui/frontend/src/app/context/ModelRegistrySelectorContext.tsx
+++ b/clients/ui/frontend/src/app/context/ModelRegistrySelectorContext.tsx
@@ -9,6 +9,7 @@ export type ModelRegistrySelectorContextType = {
   modelRegistries: ModelRegistry[];
   preferredModelRegistry: ModelRegistry | undefined;
   updatePreferredModelRegistry: (modelRegistry: ModelRegistry | undefined) => void;
+  //refreshRulesReview: () => void; TODO: [Midstream] Reimplement this
 };
 
 type ModelRegistrySelectorContextProviderProps = {
@@ -21,6 +22,7 @@ export const ModelRegistrySelectorContext = React.createContext<ModelRegistrySel
   modelRegistries: [],
   preferredModelRegistry: undefined,
   updatePreferredModelRegistry: () => undefined,
+  //refreshRulesReview: () => undefined,
 });
 
 export const ModelRegistrySelectorContextProvider: React.FC<
@@ -34,6 +36,8 @@ export const ModelRegistrySelectorContextProvider: React.FC<
 const EnabledModelRegistrySelectorContextProvider: React.FC<
   ModelRegistrySelectorContextProviderProps
 > = ({ children }) => {
+  // TODO: [Midstream] Add area check for enablement
+
   const queryParams = useQueryParamNamespaces();
 
   const [modelRegistries, isLoaded, error] = useModelRegistries(queryParams);
@@ -49,6 +53,7 @@ const EnabledModelRegistrySelectorContextProvider: React.FC<
       modelRegistries,
       preferredModelRegistry: preferredModelRegistry ?? firstModelRegistry ?? undefined,
       updatePreferredModelRegistry: setPreferredModelRegistry,
+      // refreshRulesReview,
     }),
     [isLoaded, error, modelRegistries, preferredModelRegistry, firstModelRegistry],
   );
diff --git a/clients/ui/frontend/src/app/hooks/__tests__/useModelArtifactsByVersionId.spec.ts b/clients/ui/frontend/src/app/hooks/__tests__/useModelArtifactsByVersionId.spec.ts
index aefe82671..ebaca234a 100644
--- a/clients/ui/frontend/src/app/hooks/__tests__/useModelArtifactsByVersionId.spec.ts
+++ b/clients/ui/frontend/src/app/hooks/__tests__/useModelArtifactsByVersionId.spec.ts
@@ -19,11 +19,13 @@ const mockModelRegistryAPIs: ModelRegistryAPIs = {
   createModelArtifactForModelVersion: jest.fn(),
   getRegisteredModel: jest.fn(),
   getModelVersion: jest.fn(),
+  listModelVersions: jest.fn(),
   listRegisteredModels: jest.fn(),
   getModelVersionsByRegisteredModel: jest.fn(),
   getModelArtifactsByModelVersion: jest.fn(),
   patchRegisteredModel: jest.fn(),
   patchModelVersion: jest.fn(),
+  patchModelArtifact: jest.fn(),
 };
 
 describe('useModelArtifactsByVersionId', () => {
@@ -47,7 +49,7 @@ describe('useModelArtifactsByVersionId', () => {
     });
   });
 
-  it('should return NotReadyError if modelVersionId is not provided', async () => {
+  it('should silently fail if modelVersionId is not provided', async () => {
     mockUseModelRegistryAPI.mockReturnValue({
       api: mockModelRegistryAPIs,
       apiAvailable: true,
@@ -58,8 +60,7 @@ describe('useModelArtifactsByVersionId', () => {
 
     await waitFor(() => {
       const [, , error] = result.current;
-      expect(error?.message).toBe('No model registeredModel id');
-      expect(error).toBeInstanceOf(Error);
+      expect(error?.message).toBe(undefined);
     });
   });
 
diff --git a/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts b/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts
index ffe8ee241..962984b8f 100644
--- a/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelArtifactsByVersionId.ts
@@ -2,6 +2,7 @@ import * as React from 'react';
 import useFetchState, {
   FetchState,
   FetchStateCallbackPromise,
+  NotReadyError,
 } from '~/shared/utilities/useFetchState';
 import { ModelArtifactList } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
@@ -14,7 +15,7 @@ const useModelArtifactsByVersionId = (modelVersionId?: string): FetchState<Model
         return Promise.reject(new Error('API not yet available'));
       }
       if (!modelVersionId) {
-        return Promise.reject(new Error('No model registeredModel id'));
+        return Promise.reject(new NotReadyError('No model registeredModel id'));
       }
       return api.getModelArtifactsByModelVersion(opts, modelVersionId);
     },
diff --git a/clients/ui/frontend/src/app/hooks/useModelVersionById.ts b/clients/ui/frontend/src/app/hooks/useModelVersionById.ts
index 6a7928499..e48102851 100644
--- a/clients/ui/frontend/src/app/hooks/useModelVersionById.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelVersionById.ts
@@ -2,6 +2,7 @@ import * as React from 'react';
 import useFetchState, {
   FetchState,
   FetchStateCallbackPromise,
+  NotReadyError,
 } from '~/shared/utilities/useFetchState';
 import { ModelVersion } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
@@ -15,7 +16,7 @@ const useModelVersionById = (modelVersionId?: string): FetchState<ModelVersion |
         return Promise.reject(new Error('API not yet available'));
       }
       if (!modelVersionId) {
-        return Promise.reject(new Error('No model version id'));
+        return Promise.reject(new NotReadyError('No model version id'));
       }
 
       return api.getModelVersion(opts, modelVersionId);
diff --git a/clients/ui/frontend/src/app/hooks/useModelVersions.ts b/clients/ui/frontend/src/app/hooks/useModelVersions.ts
new file mode 100644
index 000000000..d4b59b73c
--- /dev/null
+++ b/clients/ui/frontend/src/app/hooks/useModelVersions.ts
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import useFetchState, {
+  FetchState,
+  FetchStateCallbackPromise,
+} from '~/shared/utilities/useFetchState';
+import { ModelVersionList } from '~/app/types';
+import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
+
+const useModelVersions = (): FetchState<ModelVersionList> => {
+  const { api, apiAvailable } = useModelRegistryAPI();
+  const callback = React.useCallback<FetchStateCallbackPromise<ModelVersionList>>(
+    (opts) => {
+      if (!apiAvailable) {
+        return Promise.reject(new Error('API not yet available'));
+      }
+      return api.listModelVersions(opts).then((r) => r);
+    },
+    [api, apiAvailable],
+  );
+  return useFetchState(
+    callback,
+    { items: [], size: 0, pageSize: 0, nextPageToken: '' },
+    { initialPromisePurity: true },
+  );
+};
+
+export default useModelVersions;
diff --git a/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts b/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts
index c1c1cf6b4..0dd50cd15 100644
--- a/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts
+++ b/clients/ui/frontend/src/app/hooks/useModelVersionsByRegisteredModel.ts
@@ -2,6 +2,7 @@ import * as React from 'react';
 import useFetchState, {
   FetchState,
   FetchStateCallbackPromise,
+  NotReadyError,
 } from '~/shared/utilities/useFetchState';
 import { ModelVersionList } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
@@ -17,7 +18,7 @@ const useModelVersionsByRegisteredModel = (
         return Promise.reject(new Error('API not yet available'));
       }
       if (!registeredModelId) {
-        return Promise.reject(new Error('No model registeredModel id'));
+        return Promise.reject(new NotReadyError('No model registeredModel id'));
       }
 
       return api.getModelVersionsByRegisteredModel(opts, registeredModelId);
diff --git a/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts b/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts
index b95be220f..01f959a8e 100644
--- a/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts
+++ b/clients/ui/frontend/src/app/hooks/useRegisteredModelById.ts
@@ -2,6 +2,7 @@ import * as React from 'react';
 import useFetchState, {
   FetchState,
   FetchStateCallbackPromise,
+  NotReadyError,
 } from '~/shared/utilities/useFetchState';
 import { RegisteredModel } from '~/app/types';
 import { useModelRegistryAPI } from '~/app/hooks/useModelRegistryAPI';
@@ -15,7 +16,7 @@ const useRegisteredModelById = (registeredModel?: string): FetchState<Registered
         return Promise.reject(new Error('API not yet available'));
       }
       if (!registeredModel) {
-        return Promise.reject(new Error('No registered model id'));
+        return Promise.reject(new NotReadyError('No registered model id'));
       }
 
       return api.getRegisteredModel(opts, registeredModel);
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx
index 0e6cac17a..1066ab20d 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryCoreLoader.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { Navigate, Outlet, useParams } from 'react-router-dom';
-import { Bullseye, Alert, Popover, List, ListItem, Button } from '@patternfly/react-core';
-import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+import { Bullseye, Alert } from '@patternfly/react-core';
 import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ProjectObjectType, typedEmptyImage } from '~/shared/components/design/utils';
 import { ModelRegistryContextProvider } from '~/app/context/ModelRegistryContext';
 import TitleWithIcon from '~/shared/components/design/TitleWithIcon';
+import WhosMyAdministrator from '~/shared/components/WhosMyAdministrator';
 import EmptyModelRegistryState from './screens/components/EmptyModelRegistryState';
 import InvalidModelRegistry from './screens/InvalidModelRegistry';
 import ModelRegistrySelectorNavigator from './screens/ModelRegistrySelectorNavigator';
@@ -27,7 +27,6 @@ const ModelRegistryCoreLoader: React.FC<ModelRegistryCoreLoaderProps> = ({
   getInvalidRedirectPath,
 }) => {
   const { modelRegistry } = useParams<{ modelRegistry: string }>();
-
   const {
     modelRegistriesLoaded,
     modelRegistriesLoadError,
@@ -69,27 +68,7 @@ const ModelRegistryCoreLoader: React.FC<ModelRegistryCoreLoaderProps> = ({
           headerIcon={() => (
             <img src={typedEmptyImage(ProjectObjectType.registeredModels)} alt="" />
           )}
-          customAction={
-            <Popover
-              showClose
-              position="bottom"
-              headerContent="Your administrator might be:"
-              bodyContent={
-                <List>
-                  <ListItem>
-                    The person who gave you your username, or who helped you to log in for the first
-                    time
-                  </ListItem>
-                  <ListItem>Someone in your IT department or help desk</ListItem>
-                  <ListItem>A project manager or developer</ListItem>
-                </List>
-              }
-            >
-              <Button variant="link" icon={<OutlinedQuestionCircleIcon />}>
-                Who&apos;s my administrator?
-              </Button>
-            </Popover>
-          }
+          customAction={<WhosMyAdministrator />}
         />
       ),
       headerContent: null,
@@ -104,7 +83,6 @@ const ModelRegistryCoreLoader: React.FC<ModelRegistryCoreLoaderProps> = ({
         </ModelRegistryContextProvider>
       );
     }
-
     // They ended up on a non-valid project path
     renderStateProps = {
       empty: true,
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx
index f6fd0f486..d23e5feb8 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/ModelRegistryRoutes.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
+import { isPlatformDefault } from '~/shared/utilities/const';
 import ModelRegistry from './screens/ModelRegistry';
 import ModelRegistryCoreLoader from './ModelRegistryCoreLoader';
 import { modelRegistryUrl } from './screens/routeUtils';
@@ -44,6 +45,14 @@ const ModelRegistryRoutes: React.FC = () => (
             path={ModelVersionDetailsTab.DETAILS}
             element={<ModelVersionsDetails tab={ModelVersionDetailsTab.DETAILS} empty={false} />}
           />
+          {isPlatformDefault() && (
+            <Route
+              path={ModelVersionDetailsTab.DEPLOYMENTS}
+              element={
+                <ModelVersionsDetails tab={ModelVersionDetailsTab.DEPLOYMENTS} empty={false} />
+              }
+            />
+          )}
           <Route path="*" element={<Navigate to="." />} />
         </Route>
         <Route path="versions/archive">
@@ -56,6 +65,18 @@ const ModelRegistryRoutes: React.FC = () => (
                 <ModelVersionsArchiveDetails tab={ModelVersionDetailsTab.DETAILS} empty={false} />
               }
             />
+            {isPlatformDefault() && (
+              <Route
+                path={ModelVersionDetailsTab.DEPLOYMENTS}
+                element={
+                  <ModelVersionsArchiveDetails
+                    tab={ModelVersionDetailsTab.DEPLOYMENTS}
+                    empty={false}
+                  />
+                }
+              />
+            )}
+
             <Route path="*" element={<Navigate to="." />} />
           </Route>
           <Route path="*" element={<Navigate to="." />} />
@@ -86,6 +107,18 @@ const ModelRegistryRoutes: React.FC = () => (
                 <ArchiveModelVersionDetails tab={ModelVersionDetailsTab.DETAILS} empty={false} />
               }
             />
+            {isPlatformDefault() && (
+              <Route
+                path={ModelVersionDetailsTab.DEPLOYMENTS}
+                element={
+                  <ArchiveModelVersionDetails
+                    tab={ModelVersionDetailsTab.DEPLOYMENTS}
+                    empty={false}
+                  />
+                }
+              />
+            )}
+
             <Route path="*" element={<Navigate to="." />} />
           </Route>
           <Route path="*" element={<Navigate to="." />} />
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx
index 60a11b82c..115c5cd3f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup.tsx
@@ -55,12 +55,15 @@ const ModelPropertiesDescriptionListGroup: React.FC<ModelPropertiesDescriptionLi
       action={
         !isArchive && (
           <Button
-            isInline
             variant="link"
+            data-testid="add-property-button"
             icon={<PlusCircleIcon />}
             iconPosition="start"
             isDisabled={isAdding || isSavingEdits}
-            onClick={() => setIsAdding(true)}
+            onClick={() => {
+              setIsShowingMoreProperties(true);
+              setIsAdding(true);
+            }}
           >
             Add property
           </Button>
@@ -120,6 +123,7 @@ const ModelPropertiesDescriptionListGroup: React.FC<ModelPropertiesDescriptionLi
         <Button
           variant="link"
           className={spacing.mtSm}
+          data-testid="expand-control-button"
           onClick={() => setIsShowingMoreProperties(!isShowingMoreProperties)}
         >
           {isShowingMoreProperties
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
index 9cde58d83..7d92932f4 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
@@ -93,12 +93,13 @@ const ModelPropertiesTableRow: React.FC<ModelPropertiesTableRowProps> = ({
 
   const propertyKeyInput = (
     <TextInput
-      data-testid={isAddRow ? `add-property-key-input` : `edit-property-${key}-key-input`}
+      data-testid={isAddRow ? `add-property-key-input` : `edit-property-key-input ${key}`}
       aria-label={
         isAddRow ? 'Key input for new property' : `Key input for editing property with key ${key}`
       }
       isRequired
       type="text"
+      autoFocus
       value={unsavedKey}
       onChange={(_event, str) => setUnsavedKey(str)}
       validated={keyValidationError ? 'error' : 'default'}
@@ -107,7 +108,7 @@ const ModelPropertiesTableRow: React.FC<ModelPropertiesTableRowProps> = ({
 
   const propertyValueInput = (
     <TextInput
-      data-testid={isAddRow ? `add-property-value-input` : `edit-property-${key}-value-input`}
+      data-testid={isAddRow ? `add-property-value-input` : `edit-property-value-input ${value}`}
       aria-label={
         isAddRow
           ? 'Value input for new property'
@@ -168,25 +169,23 @@ const ModelPropertiesTableRow: React.FC<ModelPropertiesTableRowProps> = ({
             <ActionList isIconList>
               <ActionListItem>
                 <Button
-                  data-testid={`save-edit-button-property-${key}`}
+                  data-testid="save-edit-button-property"
+                  icon={<CheckIcon />}
                   aria-label={`Save edits to property with key ${key}`}
                   variant="link"
                   onClick={onSaveEditsClick}
                   isDisabled={isSavingEdits || !unsavedKey || !unsavedValue || !!keyValidationError}
-                >
-                  <CheckIcon />
-                </Button>
+                />
               </ActionListItem>
               <ActionListItem>
                 <Button
-                  data-testid={`discard-edit-button-property-${key}`}
+                  data-testid="discard-edit-button-property"
+                  icon={<TimesIcon />}
                   aria-label={`Discard edits to property with key ${key}`}
                   variant="plain"
                   onClick={onDiscardEditsClick}
                   isDisabled={isSavingEdits}
-                >
-                  <TimesIcon />
-                </Button>
+                />
               </ActionListItem>
             </ActionList>
           ) : (
@@ -195,6 +194,7 @@ const ModelPropertiesTableRow: React.FC<ModelPropertiesTableRowProps> = ({
               popperProps={{ direction: 'up' }}
               items={[
                 { title: 'Edit', onClick: onEditClick, isDisabled: isSavingEdits },
+                { isSeparator: true },
                 { title: 'Delete', onClick: onDeleteClick, isDisabled: isSavingEdits },
               ]}
             />
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx
index 4c55f9f8d..d089b444f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistry.tsx
@@ -3,7 +3,7 @@ import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import TitleWithIcon from '~/shared/components/design/TitleWithIcon';
 import { ProjectObjectType } from '~/shared/components/design/utils';
 import useRegisteredModels from '~/app/hooks/useRegisteredModels';
-import { filterLiveModels } from '~/app/pages/modelRegistry/screens/utils';
+import useModelVersions from '~/app/hooks/useModelVersions';
 import ModelRegistrySelectorNavigator from './ModelRegistrySelectorNavigator';
 import RegisteredModelListView from './RegisteredModels/RegisteredModelListView';
 import { modelRegistryUrl } from './routeUtils';
@@ -20,7 +20,16 @@ type ModelRegistryProps = Omit<
 >;
 
 const ModelRegistry: React.FC<ModelRegistryProps> = ({ ...pageProps }) => {
-  const [registeredModels, loaded, loadError, refresh] = useRegisteredModels();
+  const [registeredModels, modelsLoaded, modelsLoadError, refreshModels] = useRegisteredModels();
+  const [modelVersions, versionsLoaded, versionsLoadError, refreshVersions] = useModelVersions();
+
+  const loaded = modelsLoaded && versionsLoaded;
+  const loadError = modelsLoadError || versionsLoadError;
+
+  const refresh = React.useCallback(() => {
+    refreshModels();
+    refreshVersions();
+  }, [refreshModels, refreshVersions]);
 
   return (
     <ApplicationsPage
@@ -40,7 +49,8 @@ const ModelRegistry: React.FC<ModelRegistryProps> = ({ ...pageProps }) => {
       removeChildrenTopPadding
     >
       <RegisteredModelListView
-        registeredModels={filterLiveModels(registeredModels.items)}
+        registeredModels={registeredModels.items}
+        modelVersions={modelVersions.items}
         refresh={refresh}
       />
     </ApplicationsPage>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx
index 303135b4d..267d9498a 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelector.tsx
@@ -6,23 +6,21 @@ import {
   DescriptionListDescription,
   DescriptionListGroup,
   DescriptionListTerm,
-  Divider,
   Flex,
   FlexItem,
   Icon,
-  MenuToggle,
   Popover,
-  Select,
-  SelectGroup,
-  SelectList,
-  SelectOption,
+  PopoverPosition,
   Tooltip,
 } from '@patternfly/react-core';
+import text from '@patternfly/react-styles/css/utilities/Text/text';
 import truncateStyles from '@patternfly/react-styles/css/components/Truncate/truncate';
 import { InfoCircleIcon, BlueprintIcon } from '@patternfly/react-icons';
 import { useBrowserStorage } from '~/shared/components/browserStorage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ModelRegistry } from '~/app/types';
+import SimpleSelect, { SimpleSelectOption } from '~/shared/components/SimpleSelect';
+import WhosMyAdministrator from '~/shared/components/WhosMyAdministrator';
 
 const MODEL_REGISTRY_FAVORITE_STORAGE_KEY = 'kubeflow.dashboard.model.registry.favorite';
 
@@ -42,7 +40,6 @@ const ModelRegistrySelector: React.FC<ModelRegistrySelectorProps> = ({
   );
 
   const selection = modelRegistries.find((mr) => mr.name === modelRegistry);
-  const [isOpen, setIsOpen] = React.useState(false);
   const [favorites, setFavorites] = useBrowserStorage<string[]>(
     MODEL_REGISTRY_FAVORITE_STORAGE_KEY,
     [],
@@ -53,7 +50,7 @@ const ModelRegistrySelector: React.FC<ModelRegistrySelectorProps> = ({
   const toggleLabel = modelRegistries.length === 0 ? 'No model registries' : selectionDisplayName;
 
   const getMRSelectDescription = (mr: ModelRegistry) => {
-    const desc = mr.description || mr.name;
+    const desc = mr.description || '';
     if (!desc) {
       return;
     }
@@ -74,69 +71,48 @@ const ModelRegistrySelector: React.FC<ModelRegistrySelectorProps> = ({
     );
   };
 
-  const options = [
-    <SelectGroup label="Select a model registry" key="all">
-      <SelectList>
-        {modelRegistries.map((mr) => (
-          <SelectOption
-            id={mr.name}
-            key={mr.name}
-            value={mr.name}
-            description={getMRSelectDescription(mr)}
-            isFavorited={favorites.includes(mr.name)}
-          >
-            {mr.displayName}
-          </SelectOption>
-        ))}
-      </SelectList>
-    </SelectGroup>,
-  ];
-
-  const createFavorites = (favIds: string[]) => {
-    const favorite: JSX.Element[] = [];
+  const allOptions: SimpleSelectOption[] = modelRegistries.map((mr) => ({
+    key: mr.name,
+    label: mr.name,
+    dropdownLabel: mr.displayName,
+    description: getMRSelectDescription(mr),
+    isFavorited: favorites.includes(mr.name),
+  }));
 
-    options.forEach((item) => {
-      if (item.type === SelectList) {
-        item.props.children.filter(
-          (child: JSX.Element) => favIds.includes(child.props.value) && favorite.push(child),
-        );
-      } else if (item.type === SelectGroup) {
-        item.props.children.props.children.filter(
-          (child: JSX.Element) => favIds.includes(child.props.value) && favorite.push(child),
-        );
-      } else if (favIds.includes(item.props.value)) {
-        favorite.push(item);
-      }
-    });
-
-    return favorite;
-  };
+  const favoriteOptions = (favIds: string[]) =>
+    allOptions.filter((option) => favIds.includes(option.key));
 
   const selector = (
-    <Select
-      toggle={(toggleRef) => (
-        <MenuToggle
-          ref={toggleRef}
-          data-testid="model-registry-selector-dropdown"
-          aria-label="Model registry toggle"
-          id="download-steps-logs-toggle"
-          onClick={() => setIsOpen(!isOpen)}
-          isExpanded={isOpen}
-          isDisabled={modelRegistries.length === 0}
-        >
-          {toggleLabel}
-        </MenuToggle>
-      )}
-      onSelect={(_e, value) => {
-        setIsOpen(false);
-        updatePreferredModelRegistry(modelRegistries.find((obj) => obj.name === value));
-        if (typeof value === 'string') {
-          onSelection(value);
-        }
+    <SimpleSelect
+      isScrollable
+      dataTestId="model-registry-selector-dropdown"
+      toggleProps={{ id: 'download-steps-logs-toggle' }}
+      toggleLabel={toggleLabel}
+      aria-label="Model registry toggle"
+      previewDescription={false}
+      onChange={(key) => {
+        updatePreferredModelRegistry(modelRegistries.find((obj) => obj.name === key));
+        onSelection(key);
       }}
-      selected={toggleLabel}
-      onOpenChange={(open) => setIsOpen(open)}
-      isOpen={isOpen}
+      maxMenuHeight="300px"
+      popperProps={{ maxWidth: '400px' }}
+      value={selection?.name}
+      groupedOptions={[
+        ...(favorites.length > 0
+          ? [
+              {
+                key: 'favorites-group',
+                label: 'Favorites',
+                options: favoriteOptions(favorites),
+              },
+            ]
+          : []),
+        {
+          key: 'all',
+          label: 'All model registries',
+          options: allOptions,
+        },
+      ]}
       onActionClick={(event: React.MouseEvent, value: string, actionId: string) => {
         event.stopPropagation();
         if (actionId === 'fav') {
@@ -148,17 +124,7 @@ const ModelRegistrySelector: React.FC<ModelRegistrySelectorProps> = ({
           }
         }
       }}
-    >
-      {favorites.length > 0 && (
-        <React.Fragment key="favorites-group">
-          <SelectGroup label="Favorites">
-            <SelectList>{createFavorites(favorites)}</SelectList>
-          </SelectGroup>
-          <Divider />
-        </React.Fragment>
-      )}
-      {options}
-    </Select>
+    />
   );
 
   if (primary) {
@@ -166,29 +132,52 @@ const ModelRegistrySelector: React.FC<ModelRegistrySelectorProps> = ({
   }
 
   return (
-    <Flex spaceItems={{ default: 'spaceItemsXs' }} alignItems={{ default: 'alignItemsCenter' }}>
-      <Icon>
-        <BlueprintIcon />
-      </Icon>
-      <Flex spaceItems={{ default: 'spaceItemsSm' }} alignItems={{ default: 'alignItemsCenter' }}>
+    <Flex spaceItems={{ default: 'spaceItemsSm' }} alignItems={{ default: 'alignItemsCenter' }}>
+      <FlexItem>
+        <Icon>
+          <BlueprintIcon />
+        </Icon>
+      </FlexItem>
+      <FlexItem>
+        <Bullseye>Model registry</Bullseye>
+      </FlexItem>
+      <FlexItem>{selector}</FlexItem>
+      {selection && (
         <FlexItem>
-          <Bullseye>Model registry</Bullseye>
+          <Popover
+            aria-label="Model registry description popover"
+            data-testid="mr-details-popover"
+            position="right"
+            headerContent={`${selection.displayName} details`}
+            bodyContent={
+              <DescriptionList>
+                <DescriptionListGroup>
+                  <DescriptionListTerm>Description</DescriptionListTerm>
+                  <DescriptionListDescription
+                    className={!selection.description ? text.textColorDisabled : ''}
+                  >
+                    {selection.description || 'No description'}
+                  </DescriptionListDescription>
+                </DescriptionListGroup>
+              </DescriptionList>
+            }
+          >
+            <Button variant="link" icon={<InfoCircleIcon />} data-testid="view-details-button">
+              View details
+            </Button>
+          </Popover>
         </FlexItem>
-        <FlexItem>{selector}</FlexItem>
-        {selection && selection.description && (
-          <FlexItem>
-            <Popover
-              aria-label="Model registry description popover"
-              headerContent={selection.displayName}
-              bodyContent={selection.description}
-            >
-              <Button variant="link" icon={<InfoCircleIcon />}>
-                View Description
-              </Button>
-            </Popover>
-          </FlexItem>
-        )}
-      </Flex>
+      )}
+      <FlexItem align={{ default: 'alignRight' }}>
+        <WhosMyAdministrator
+          buttonLabel="Need another registry?"
+          headerContent="Need another registry?"
+          leadText="To request access to a new or existing model registry, contact your administrator."
+          contentTestId="model-registry-help-content"
+          linkTestId="model-registry-help-button"
+          popoverPosition={PopoverPosition.left}
+        />
+      </FlexItem>
     </Flex>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelectorNavigator.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelectorNavigator.tsx
index 7c606fd31..262bef4eb 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelectorNavigator.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelRegistrySelectorNavigator.tsx
@@ -11,15 +11,17 @@ const ModelRegistrySelectorNavigator: React.FC<ModelRegistrySelectorNavigatorPro
   ...modelRegistrySelectorProps
 }) => {
   const navigate = useNavigate();
-  const { modelRegistry } = useParams<{ modelRegistry: string }>();
+  const { modelRegistry: currentModelRegistry } = useParams<{ modelRegistry: string }>();
 
   return (
     <ModelRegistrySelector
       {...modelRegistrySelectorProps}
       onSelection={(modelRegistryName) => {
-        navigate(getRedirectPath(modelRegistryName));
+        if (modelRegistryName !== currentModelRegistry) {
+          navigate(getRedirectPath(modelRegistryName));
+        }
       }}
-      modelRegistry={modelRegistry ?? ''}
+      modelRegistry={currentModelRegistry ?? ''}
     />
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx
index 61523b501..53ff6ba22 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetails.tsx
@@ -90,7 +90,7 @@ const ModelVersionsDetails: React.FC<ModelVersionsDetailProps> = ({ tab, ...page
               />
             </FlexItem>
             <FlexItem>
-              <ModelVersionsDetailsHeaderActions mv={mv} />
+              <ModelVersionsDetailsHeaderActions mv={mv} hasDeployment={false} />
             </FlexItem>
           </Flex>
         )
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
index 740f0538a..8b1863500 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
@@ -1,18 +1,27 @@
 import * as React from 'react';
-import { Dropdown, DropdownList, MenuToggle, DropdownItem } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownList,
+  MenuToggle,
+  DropdownItem,
+  ButtonVariant,
+  ActionList,
+} from '@patternfly/react-core';
 import { useNavigate } from 'react-router';
 import { ModelState, ModelVersion } from '~/app/types';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ArchiveModelVersionModal } from '~/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal';
-import { modelVersionArchiveDetailsUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
+import { modelVersionListUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
 
 interface ModelVersionsDetailsHeaderActionsProps {
   mv: ModelVersion;
+  hasDeployment?: boolean;
 }
 
 const ModelVersionsDetailsHeaderActions: React.FC<ModelVersionsDetailsHeaderActionsProps> = ({
   mv,
+  hasDeployment = false,
 }) => {
   const { apiState } = React.useContext(ModelRegistryContext);
   const { preferredModelRegistry } = React.useContext(ModelRegistrySelectorContext);
@@ -23,15 +32,15 @@ const ModelVersionsDetailsHeaderActions: React.FC<ModelVersionsDetailsHeaderActi
   const tooltipRef = React.useRef<HTMLButtonElement>(null);
 
   return (
-    <>
+    <ActionList>
       <Dropdown
         isOpen={isOpenActionDropdown}
         onSelect={() => setOpenActionDropdown(false)}
         onOpenChange={(open) => setOpenActionDropdown(open)}
-        popperProps={{ position: 'right' }}
+        popperProps={{ position: 'right', appendTo: 'inline' }}
         toggle={(toggleRef) => (
           <MenuToggle
-            variant="primary"
+            variant={ButtonVariant.secondary}
             ref={toggleRef}
             onClick={() => setOpenActionDropdown(!isOpenActionDropdown)}
             isExpanded={isOpenActionDropdown}
@@ -44,41 +53,40 @@ const ModelVersionsDetailsHeaderActions: React.FC<ModelVersionsDetailsHeaderActi
       >
         <DropdownList>
           <DropdownItem
+            isAriaDisabled={hasDeployment}
             id="archive-version-button"
-            aria-label="Archive version"
+            aria-label="Archive model version"
             key="archive-version-button"
             onClick={() => setIsArchiveModalOpen(true)}
+            tooltipProps={
+              hasDeployment ? { content: 'Deployed model versions cannot be archived' } : undefined
+            }
             ref={tooltipRef}
           >
-            Archive version
+            Archive model version
           </DropdownItem>
         </DropdownList>
       </Dropdown>
-      <ArchiveModelVersionModal
-        onCancel={() => setIsArchiveModalOpen(false)}
-        onSubmit={() =>
-          apiState.api
-            .patchModelVersion(
-              {},
-              {
-                state: ModelState.ARCHIVED,
-              },
-              mv.id,
-            )
-            .then(() =>
-              navigate(
-                modelVersionArchiveDetailsUrl(
-                  mv.id,
-                  mv.registeredModelId,
-                  preferredModelRegistry?.name,
-                ),
-              ),
-            )
-        }
-        isOpen={isArchiveModalOpen}
-        modelVersionName={mv.name}
-      />
-    </>
+      {isArchiveModalOpen ? (
+        <ArchiveModelVersionModal
+          onCancel={() => setIsArchiveModalOpen(false)}
+          onSubmit={() =>
+            apiState.api
+              .patchModelVersion(
+                {},
+                {
+                  state: ModelState.ARCHIVED,
+                },
+                mv.id,
+              )
+              .then(() =>
+                navigate(modelVersionListUrl(mv.registeredModelId, preferredModelRegistry?.name)),
+              )
+          }
+          modelVersionName={mv.name}
+        />
+      ) : null}
+    </ActionList>
   );
 };
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsTabs.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsTabs.tsx
index 2747ce088..4aaa05097 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsTabs.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsTabs.tsx
@@ -34,8 +34,8 @@ const ModelVersionDetailsTabs: React.FC<ModelVersionDetailTabsProps> = ({
         data-testid="model-versions-details-tab"
       >
         <PageSection
-          isFilled
           hasBodyWrapper={false}
+          isFilled
           data-testid="model-versions-details-tab-content"
         >
           <ModelVersionDetailsView
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
index a88b77643..b83d22477 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsView.tsx
@@ -1,20 +1,27 @@
 import * as React from 'react';
-import { DescriptionList, Flex, FlexItem, ContentVariants, Title } from '@patternfly/react-core';
+import {
+  DescriptionList,
+  Divider,
+  Flex,
+  FlexItem,
+  ContentVariants,
+  Title,
+  Bullseye,
+  Spinner,
+  Alert,
+} from '@patternfly/react-core';
 import DashboardDescriptionListGroup from '~/shared/components/DashboardDescriptionListGroup';
 import EditableTextDescriptionListGroup from '~/shared/components/EditableTextDescriptionListGroup';
-import EditableLabelsDescriptionListGroup from '~/shared/components/EditableLabelsDescriptionListGroup';
+import { EditableLabelsDescriptionListGroup } from '~/shared/components/EditableLabelsDescriptionListGroup';
 import { ModelVersion } from '~/app/types';
 import useModelArtifactsByVersionId from '~/app/hooks/useModelArtifactsByVersionId';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
 import InlineTruncatedClipboardCopy from '~/shared/components/InlineTruncatedClipboardCopy';
-import DashboardHelpTooltip from '~/shared/components/DashboardHelpTooltip';
-import {
-  getLabels,
-  mergeUpdatedLabels,
-  uriToObjectStorageFields,
-} from '~/app/pages/modelRegistry/screens/utils';
+import { getLabels, mergeUpdatedLabels } from '~/app/pages/modelRegistry/screens/utils';
+import { uriToObjectStorageFields } from '~/app/utils';
 import ModelPropertiesDescriptionListGroup from '~/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup';
 import ModelTimestamp from '~/app/pages/modelRegistry/screens/components/ModelTimestamp';
+import { bumpBothTimestamps, bumpRegisteredModelTimestamp } from '~/app/utils/updateTimestamps';
 
 type ModelVersionDetailsViewProps = {
   modelVersion: ModelVersion;
@@ -27,9 +34,42 @@ const ModelVersionDetailsView: React.FC<ModelVersionDetailsViewProps> = ({
   isArchiveVersion,
   refresh,
 }) => {
-  const [modelArtifact] = useModelArtifactsByVersionId(mv.id);
+  const [modelArtifacts, modelArtifactsLoaded, modelArtifactsLoadError, refreshModelArtifacts] =
+    useModelArtifactsByVersionId(mv.id);
+
+  const modelArtifact = modelArtifacts.items.length ? modelArtifacts.items[0] : null;
   const { apiState } = React.useContext(ModelRegistryContext);
-  const storageFields = uriToObjectStorageFields(modelArtifact.items[0]?.uri || '');
+  const storageFields = uriToObjectStorageFields(modelArtifact?.uri || '');
+
+  if (!modelArtifactsLoaded) {
+    return (
+      <Bullseye>
+        <Spinner size="xl" />
+      </Bullseye>
+    );
+  }
+  const handleVersionUpdate = async (updatePromise: Promise<unknown>): Promise<void> => {
+    await updatePromise;
+
+    if (!mv.registeredModelId) {
+      return;
+    }
+
+    await bumpRegisteredModelTimestamp(apiState.api, mv.registeredModelId);
+    refresh();
+  };
+
+  const handleArtifactUpdate = async (updatePromise: Promise<unknown>): Promise<void> => {
+    try {
+      await updatePromise;
+      await bumpBothTimestamps(apiState.api, mv.id, mv.registeredModelId);
+      refreshModelArtifacts();
+    } catch (error) {
+      throw new Error(
+        `Failed to update artifact: ${error instanceof Error ? error.message : String(error)}`,
+      );
+    }
+  };
 
   return (
     <Flex
@@ -40,38 +80,32 @@ const ModelVersionDetailsView: React.FC<ModelVersionDetailsViewProps> = ({
       <FlexItem flex={{ default: 'flex_1' }}>
         <DescriptionList isFillColumns>
           <EditableTextDescriptionListGroup
-            testid="model-version-description"
+            editableVariant="TextArea"
+            baseTestId="model-version-description"
             isArchive={isArchiveVersion}
             title="Description"
             contentWhenEmpty="No description"
             value={mv.description || ''}
             saveEditedValue={(value) =>
-              apiState.api
-                .patchModelVersion(
-                  {},
-                  {
-                    description: value,
-                  },
-                  mv.id,
-                )
-                .then(refresh)
+              handleVersionUpdate(apiState.api.patchModelVersion({}, { description: value }, mv.id))
             }
           />
           <EditableLabelsDescriptionListGroup
             labels={getLabels(mv.customProperties)}
             isArchive={isArchiveVersion}
             allExistingKeys={Object.keys(mv.customProperties)}
-            saveEditedLabels={(editedLabels) =>
-              apiState.api
-                .patchModelVersion(
+            title="Labels"
+            contentWhenEmpty="No labels"
+            onLabelsChange={(editedLabels) =>
+              handleVersionUpdate(
+                apiState.api.patchModelVersion(
                   {},
-                  {
-                    customProperties: mergeUpdatedLabels(mv.customProperties, editedLabels),
-                  },
+                  { customProperties: mergeUpdatedLabels(mv.customProperties, editedLabels) },
                   mv.id,
-                )
-                .then(refresh)
+                ),
+              )
             }
+            data-testid="model-version-labels"
           />
           <ModelPropertiesDescriptionListGroup
             isArchive={isArchiveVersion}
@@ -94,80 +128,122 @@ const ModelVersionDetailsView: React.FC<ModelVersionDetailsViewProps> = ({
             <InlineTruncatedClipboardCopy testId="model-version-id" textToCopy={mv.id} />
           </DashboardDescriptionListGroup>
         </DescriptionList>
-        <Title style={{ marginTop: '1em' }} headingLevel={ContentVariants.h3}>
+        <Title style={{ margin: '1em 0' }} headingLevel={ContentVariants.h3}>
           Model location
         </Title>
-        <DescriptionList isFillColumns>
-          {storageFields && (
-            <>
-              <DashboardDescriptionListGroup
-                title="Endpoint"
-                isEmpty={modelArtifact.size === 0 || !storageFields.endpoint}
-                contentWhenEmpty="No endpoint"
-              >
-                <InlineTruncatedClipboardCopy
-                  testId="storage-endpoint"
-                  textToCopy={storageFields.endpoint}
-                />
-              </DashboardDescriptionListGroup>
-              <DashboardDescriptionListGroup
-                title="Region"
-                isEmpty={modelArtifact.size === 0 || !storageFields.region}
-                contentWhenEmpty="No region"
-              >
-                <InlineTruncatedClipboardCopy
-                  testId="storage-region"
-                  textToCopy={storageFields.region || ''}
-                />
-              </DashboardDescriptionListGroup>
-              <DashboardDescriptionListGroup
-                title="Bucket"
-                isEmpty={modelArtifact.size === 0 || !storageFields.bucket}
-                contentWhenEmpty="No bucket"
-              >
-                <InlineTruncatedClipboardCopy
-                  testId="storage-bucket"
-                  textToCopy={storageFields.bucket}
-                />
-              </DashboardDescriptionListGroup>
-              <DashboardDescriptionListGroup
-                title="Path"
-                isEmpty={modelArtifact.size === 0 || !storageFields.path}
-                contentWhenEmpty="No path"
-              >
-                <InlineTruncatedClipboardCopy
-                  testId="storage-path"
-                  textToCopy={storageFields.path}
-                />
-              </DashboardDescriptionListGroup>
-            </>
-          )}
-          {!storageFields && (
-            <>
-              <DashboardDescriptionListGroup
-                title="URI"
-                isEmpty={modelArtifact.size === 0 || !modelArtifact.items[0].uri}
-                contentWhenEmpty="No URI"
-              >
-                <InlineTruncatedClipboardCopy
-                  testId="storage-uri"
-                  textToCopy={modelArtifact.items[0]?.uri || ''}
-                />
-              </DashboardDescriptionListGroup>
-            </>
-          )}
-          <DashboardDescriptionListGroup
-            title="Source model format"
-            isEmpty={modelArtifact.size === 0 || !modelArtifact.items[0].modelFormatName}
-            contentWhenEmpty="No source model format"
-          >
-            {modelArtifact.items[0]?.modelFormatName}
-          </DashboardDescriptionListGroup>
+        {modelArtifactsLoadError ? (
+          <Alert variant="danger" isInline title={modelArtifactsLoadError.name}>
+            {modelArtifactsLoadError.message}
+          </Alert>
+        ) : (
+          <>
+            <DescriptionList>
+              {storageFields && (
+                <>
+                  <DashboardDescriptionListGroup
+                    title="Endpoint"
+                    isEmpty={modelArtifacts.size === 0 || !storageFields.endpoint}
+                    contentWhenEmpty="No endpoint"
+                  >
+                    <InlineTruncatedClipboardCopy
+                      testId="storage-endpoint"
+                      textToCopy={storageFields.endpoint}
+                    />
+                  </DashboardDescriptionListGroup>
+                  <DashboardDescriptionListGroup
+                    title="Region"
+                    isEmpty={modelArtifacts.size === 0 || !storageFields.region}
+                    contentWhenEmpty="No region"
+                  >
+                    <InlineTruncatedClipboardCopy
+                      testId="storage-region"
+                      textToCopy={storageFields.region || ''}
+                    />
+                  </DashboardDescriptionListGroup>
+                  <DashboardDescriptionListGroup
+                    title="Bucket"
+                    isEmpty={modelArtifacts.size === 0 || !storageFields.bucket}
+                    contentWhenEmpty="No bucket"
+                  >
+                    <InlineTruncatedClipboardCopy
+                      testId="storage-bucket"
+                      textToCopy={storageFields.bucket}
+                    />
+                  </DashboardDescriptionListGroup>
+                  <DashboardDescriptionListGroup
+                    title="Path"
+                    isEmpty={modelArtifacts.size === 0 || !storageFields.path}
+                    contentWhenEmpty="No path"
+                  >
+                    <InlineTruncatedClipboardCopy
+                      testId="storage-path"
+                      textToCopy={storageFields.path}
+                    />
+                  </DashboardDescriptionListGroup>
+                </>
+              )}
+              {!storageFields && (
+                <>
+                  <DashboardDescriptionListGroup
+                    title="URI"
+                    isEmpty={modelArtifacts.size === 0 || !modelArtifact?.uri}
+                    contentWhenEmpty="No URI"
+                  >
+                    <InlineTruncatedClipboardCopy
+                      testId="storage-uri"
+                      textToCopy={modelArtifact?.uri || ''}
+                    />
+                  </DashboardDescriptionListGroup>
+                </>
+              )}
+            </DescriptionList>
+            <Divider style={{ marginTop: '1em' }} />
+            <Title style={{ margin: '1em 0' }} headingLevel={ContentVariants.h3}>
+              Source model format
+            </Title>
+            <DescriptionList>
+              <EditableTextDescriptionListGroup
+                editableVariant="TextInput"
+                baseTestId="source-model-format"
+                isArchive={isArchiveVersion}
+                value={modelArtifact?.modelFormatName || ''}
+                saveEditedValue={(value) =>
+                  handleArtifactUpdate(
+                    apiState.api.patchModelArtifact(
+                      {},
+                      { modelFormatName: value },
+                      modelArtifact?.id || '',
+                    ),
+                  )
+                }
+                title="Model Format"
+                contentWhenEmpty="No model format specified"
+              />
+              <EditableTextDescriptionListGroup
+                editableVariant="TextInput"
+                baseTestId="source-model-version"
+                value={modelArtifact?.modelFormatVersion || ''}
+                isArchive={isArchiveVersion}
+                saveEditedValue={(newVersion) =>
+                  handleArtifactUpdate(
+                    apiState.api.patchModelArtifact(
+                      {},
+                      { modelFormatVersion: newVersion },
+                      modelArtifact?.id || '',
+                    ),
+                  )
+                }
+                title="Version"
+                contentWhenEmpty="No source model format version"
+              />
+            </DescriptionList>
+          </>
+        )}
+        <Divider style={{ marginTop: '1em' }} />
+        <DescriptionList isFillColumns style={{ marginTop: '1em' }}>
           <DashboardDescriptionListGroup
             title="Author"
-            tooltip={
-              <DashboardHelpTooltip content="The author is the user who registered the model version." />
-            }
+            popover="The author is the user who registered the model version."
           >
             {mv.author}
           </DashboardDescriptionListGroup>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionSelector.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionSelector.tsx
index 119b9a843..bdf2556b9 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionSelector.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionSelector.tsx
@@ -14,6 +14,7 @@ import {
 } from '@patternfly/react-core';
 import { ModelVersion } from '~/app/types';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
+import { filterLiveVersions } from '~/app/utils';
 
 type ModelVersionSelectorProps = {
   rmId?: string;
@@ -33,8 +34,9 @@ const ModelVersionSelector: React.FC<ModelVersionSelectorProps> = ({
   const menuRef = React.useRef(null);
 
   const [modelVersions] = useModelVersionsByRegisteredModel(rmId);
+  const liveModelVersions = filterLiveVersions(modelVersions.items);
 
-  const menuListItems = modelVersions.items
+  const menuListItems = liveModelVersions
     .filter((item) => !input || item.name.toLowerCase().includes(input.toString().toLowerCase()))
     .map((mv, index) => (
       <MenuItem isSelected={mv.id === selection.id} itemId={mv.id} key={index}>
@@ -42,7 +44,7 @@ const ModelVersionSelector: React.FC<ModelVersionSelectorProps> = ({
       </MenuItem>
     ));
 
-  if (input && modelVersions.size === 0) {
+  if (input && liveModelVersions.length === 0) {
     menuListItems.push(
       <MenuItem isDisabled key="no result">
         No results found
@@ -74,8 +76,8 @@ const ModelVersionSelector: React.FC<ModelVersionSelectorProps> = ({
             />
           </MenuSearchInput>
           <HelperText style={{ paddingTop: '0.5rem' }}>
-            <HelperTextItem variant="indeterminate">
-              {`Type a name to search your ${modelVersions.size} versions.`}
+            <HelperTextItem>
+              {`Type a name to search your ${liveModelVersions.length} versions.`}
             </HelperTextItem>
           </HelperText>
         </MenuSearch>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/const.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/const.ts
index ded505d14..30b76e22b 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/const.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionDetails/const.ts
@@ -1,7 +1,9 @@
 export enum ModelVersionDetailsTab {
   DETAILS = 'details',
+  DEPLOYMENTS = 'deployments',
 }
 
 export enum ModelVersionDetailsTabTitle {
   DETAILS = 'Details',
+  DEPLOYMENTS = 'Deployments',
 }
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx
index 0f97fc080..89b8b280d 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx
@@ -3,7 +3,7 @@ import { ClipboardCopy, DescriptionList, Flex, FlexItem, Content } from '@patter
 import { RegisteredModel } from '~/app/types';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
 import EditableTextDescriptionListGroup from '~/shared/components/EditableTextDescriptionListGroup';
-import EditableLabelsDescriptionListGroup from '~/shared/components/EditableLabelsDescriptionListGroup';
+import { EditableLabelsDescriptionListGroup } from '~/shared/components/EditableLabelsDescriptionListGroup';
 import { getLabels, mergeUpdatedLabels } from '~/app/pages/modelRegistry/screens/utils';
 import ModelPropertiesDescriptionListGroup from '~/app/pages/modelRegistry/screens/ModelPropertiesDescriptionListGroup';
 import DashboardDescriptionListGroup from '~/shared/components/DashboardDescriptionListGroup';
@@ -30,6 +30,7 @@ const ModelDetailsView: React.FC<ModelDetailsViewProps> = ({
       <FlexItem flex={{ default: 'flex_1' }}>
         <DescriptionList isFillColumns>
           <EditableTextDescriptionListGroup
+            editableVariant="TextArea"
             title="Description"
             isArchive={isArchiveModel}
             contentWhenEmpty="No description"
@@ -50,7 +51,9 @@ const ModelDetailsView: React.FC<ModelDetailsViewProps> = ({
             labels={getLabels(rm.customProperties)}
             isArchive={isArchiveModel}
             allExistingKeys={Object.keys(rm.customProperties)}
-            saveEditedLabels={(editedLabels) =>
+            title="Labels"
+            contentWhenEmpty="No labels"
+            onLabelsChange={(editedLabels) =>
               apiState.api
                 .patchRegisteredModel(
                   {},
@@ -86,7 +89,10 @@ const ModelDetailsView: React.FC<ModelDetailsViewProps> = ({
               {rm.id}
             </ClipboardCopy>
           </DashboardDescriptionListGroup>
-          <DashboardDescriptionListGroup title="Owner">
+          <DashboardDescriptionListGroup
+            title="Owner"
+            popover="The owner is the user who registered the model."
+          >
             <Content component="p" data-testid="registered-model-owner">
               {rm.owner || '-'}
             </Content>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
index fd927bddb..b8a11ce4f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
@@ -30,25 +30,31 @@ import {
   modelVersionArchiveUrl,
   registerVersionForModelUrl,
 } from '~/app/pages/modelRegistry/screens/routeUtils';
-import { asEnumMember } from '~/app/utils';
+import { asEnumMember } from '~/shared/utilities/utils';
 import ModelVersionsTable from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable';
 import SimpleSelect from '~/shared/components/SimpleSelect';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { isMUITheme } from '~/shared/utilities/const';
+import { filterArchiveVersions, filterLiveVersions } from '~/app/utils';
 
 type ModelVersionListViewProps = {
   modelVersions: ModelVersion[];
-  registeredModel?: RegisteredModel;
+  registeredModel: RegisteredModel;
   isArchiveModel?: boolean;
   refresh: () => void;
 };
 
 const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
-  modelVersions: unfilteredModelVersions,
+  modelVersions,
   registeredModel: rm,
   isArchiveModel,
   refresh,
 }) => {
+  const unfilteredModelVersions = isArchiveModel
+    ? modelVersions
+    : filterLiveVersions(modelVersions);
+
+  const archiveModelVersions = filterArchiveVersions(modelVersions);
   const navigate = useNavigate();
   const { preferredModelRegistry } = React.useContext(ModelRegistrySelectorContext);
 
@@ -61,7 +67,7 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
     React.useState(false);
 
   const filteredModelVersions = filterModelVersions(unfilteredModelVersions, search, searchType);
-  const date = rm?.lastUpdateTimeSinceEpoch && new Date(parseInt(rm.lastUpdateTimeSinceEpoch));
+  const date = rm.lastUpdateTimeSinceEpoch && new Date(parseInt(rm.lastUpdateTimeSinceEpoch));
 
   if (unfilteredModelVersions.length === 0) {
     if (isArchiveModel) {
@@ -75,7 +81,7 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
               alt="missing version"
             />
           )}
-          description={`${rm?.name} has no registered versions.`}
+          description={`${rm.name} has no registered versions.`}
         />
       );
     }
@@ -89,14 +95,16 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
             alt="missing version"
           />
         )}
-        description={`${rm?.name} has no registered versions. Register a version to this model.`}
+        description={`${rm.name} has no registered versions. Register a version to this model.`}
         primaryActionText="Register new version"
-        secondaryActionText="View archived versions"
         primaryActionOnClick={() => {
-          navigate(registerVersionForModelUrl(rm?.id, preferredModelRegistry?.name));
+          navigate(registerVersionForModelUrl(rm.id, preferredModelRegistry?.name));
         }}
+        secondaryActionText={
+          archiveModelVersions.length !== 0 ? 'View archived versions' : undefined
+        }
         secondaryActionOnClick={() => {
-          navigate(modelVersionArchiveUrl(rm?.id, preferredModelRegistry?.name));
+          navigate(modelVersionArchiveUrl(rm.id, preferredModelRegistry?.name));
         }}
       />
     );
@@ -186,9 +194,9 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
               <>
                 <ToolbarItem>
                   <Button
-                    variant="secondary"
+                    variant="primary"
                     onClick={() => {
-                      navigate(registerVersionForModelUrl(rm?.id, preferredModelRegistry?.name));
+                      navigate(registerVersionForModelUrl(rm.id, preferredModelRegistry?.name));
                     }}
                   >
                     Register new version
@@ -214,11 +222,12 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
                       </MenuToggle>
                     )}
                     shouldFocusToggleOnSelect
+                    popperProps={{ appendTo: 'inline' }}
                   >
                     <DropdownList>
                       <DropdownItem
                         onClick={() =>
-                          navigate(modelVersionArchiveUrl(rm?.id, preferredModelRegistry?.name))
+                          navigate(modelVersionArchiveUrl(rm.id, preferredModelRegistry?.name))
                         }
                       >
                         View archived versions
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx
index 1ccd87420..7b1c09451 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersions.tsx
@@ -7,7 +7,6 @@ import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
-import { filterLiveVersions } from '~/app/pages/modelRegistry/screens/utils';
 import ModelVersionsHeaderActions from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions';
 import { ModelState } from '~/app/types';
 import { registeredModelArchiveDetailsUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
@@ -51,7 +50,7 @@ const ModelVersions: React.FC<ModelVersionsProps> = ({ tab, ...pageProps }) => {
         </Breadcrumb>
       }
       title={rm?.name}
-      headerAction={rm && <ModelVersionsHeaderActions rm={rm} />}
+      headerAction={rm && <ModelVersionsHeaderActions hasDeployments={false} rm={rm} />}
       description={<Truncate content={rm?.description || ''} />}
       loadError={loadError}
       loaded={loaded}
@@ -63,7 +62,7 @@ const ModelVersions: React.FC<ModelVersionsProps> = ({ tab, ...pageProps }) => {
           registeredModel={rm}
           refresh={rmRefresh}
           mvRefresh={mvRefresh}
-          modelVersions={filterLiveVersions(modelVersions.items)}
+          modelVersions={modelVersions.items}
         />
       )}
     </ApplicationsPage>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
index 1a383430f..df708fc75 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
@@ -16,9 +16,13 @@ import { registeredModelsUrl } from '~/app/pages/modelRegistry/screens/routeUtil
 
 interface ModelVersionsHeaderActionsProps {
   rm: RegisteredModel;
+  hasDeployments?: boolean;
 }
 
-const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({ rm }) => {
+const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({
+  rm,
+  hasDeployments = false,
+}) => {
   const { apiState } = React.useContext(ModelRegistryContext);
   const { preferredModelRegistry } = React.useContext(ModelRegistrySelectorContext);
 
@@ -35,10 +39,10 @@ const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({
             isOpen={isOpen}
             onSelect={() => setOpen(false)}
             onOpenChange={(open) => setOpen(open)}
-            popperProps={{ position: 'end' }}
+            popperProps={{ position: 'end', appendTo: 'inline' }}
             toggle={(toggleRef) => (
               <MenuToggle
-                variant="primary"
+                variant="secondary"
                 ref={toggleRef}
                 onClick={() => setOpen(!isOpen)}
                 isExpanded={isOpen}
@@ -56,6 +60,12 @@ const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({
                 key="archive-model-button"
                 onClick={() => setIsArchiveModalOpen(true)}
                 ref={tooltipRef}
+                isAriaDisabled={hasDeployments}
+                tooltipProps={
+                  hasDeployments
+                    ? { content: 'Models with deployed versions cannot be archived.' }
+                    : undefined
+                }
               >
                 Archive model
               </DropdownItem>
@@ -63,22 +73,23 @@ const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({
           </Dropdown>
         </FlexItem>
       </Flex>
-      <ArchiveRegisteredModelModal
-        onCancel={() => setIsArchiveModalOpen(false)}
-        onSubmit={() =>
-          apiState.api
-            .patchRegisteredModel(
-              {},
-              {
-                state: ModelState.ARCHIVED,
-              },
-              rm.id,
-            )
-            .then(() => navigate(registeredModelsUrl(preferredModelRegistry?.name)))
-        }
-        isOpen={isArchiveModalOpen}
-        registeredModelName={rm.name}
-      />
+      {isArchiveModalOpen ? (
+        <ArchiveRegisteredModelModal
+          onCancel={() => setIsArchiveModalOpen(false)}
+          onSubmit={() =>
+            apiState.api
+              .patchRegisteredModel(
+                {},
+                {
+                  state: ModelState.ARCHIVED,
+                },
+                rm.id,
+              )
+              .then(() => navigate(registeredModelsUrl(preferredModelRegistry?.name)))
+          }
+          registeredModelName={rm.name}
+        />
+      ) : null}
     </>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx
index ea595e370..8575129e5 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable.tsx
@@ -25,10 +25,12 @@ const ModelVersionsTable: React.FC<ModelVersionsTableProps> = ({
     columns={mvColumns}
     toolbarContent={toolbarContent}
     defaultSortColumn={3}
-    enablePagination="compact"
+    enablePagination
+    onClearFilters={clearFilters}
     emptyTableView={<DashboardEmptyTableView onClearFilters={clearFilters} />}
     rowRenderer={(mv) => (
       <ModelVersionsTableRow
+        hasDeployment={false}
         key={mv.name}
         modelVersion={mv}
         isArchiveModel={isArchiveModel}
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts
index 479317c0c..599e57b59 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableColumns.ts
@@ -25,6 +25,9 @@ export const mvColumns: SortableData<ModelVersion>[] = [
       const second = b.author || '';
       return first.localeCompare(second);
     },
+    info: {
+      popover: 'The author is the user who registered the model version.',
+    },
   },
   {
     field: 'labels',
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
index 743adc4cb..8b711563f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
@@ -19,6 +19,7 @@ type ModelVersionsTableRowProps = {
   modelVersion: ModelVersion;
   isArchiveRow?: boolean;
   isArchiveModel?: boolean;
+  hasDeployment?: boolean;
   refresh: () => void;
 };
 
@@ -26,6 +27,7 @@ const ModelVersionsTableRow: React.FC<ModelVersionsTableRowProps> = ({
   modelVersion: mv,
   isArchiveRow,
   isArchiveModel,
+  hasDeployment = false,
   refresh,
 }) => {
   const navigate = useNavigate();
@@ -37,7 +39,7 @@ const ModelVersionsTableRow: React.FC<ModelVersionsTableRowProps> = ({
   const actions: IAction[] = isArchiveRow
     ? [
         {
-          title: 'Restore version',
+          title: 'Restore model version',
           onClick: () => setIsRestoreModalOpen(true),
         },
       ]
@@ -45,6 +47,10 @@ const ModelVersionsTableRow: React.FC<ModelVersionsTableRowProps> = ({
         {
           title: 'Archive model version',
           onClick: () => setIsArchiveModalOpen(true),
+          isAriaDisabled: hasDeployment,
+          tooltipProps: hasDeployment
+            ? { content: 'Deployed versions cannot be archived' }
+            : undefined,
         },
       ];
 
@@ -90,42 +96,44 @@ const ModelVersionsTableRow: React.FC<ModelVersionsTableRowProps> = ({
       {!isArchiveModel && (
         <Td isActionCell>
           <ActionsColumn items={actions} />
-          <ArchiveModelVersionModal
-            onCancel={() => setIsArchiveModalOpen(false)}
-            onSubmit={() =>
-              apiState.api
-                .patchModelVersion(
-                  {},
-                  {
-                    state: ModelState.ARCHIVED,
-                  },
-                  mv.id,
-                )
-                .then(refresh)
-            }
-            isOpen={isArchiveModalOpen}
-            modelVersionName={mv.name}
-          />
-          <RestoreModelVersionModal
-            onCancel={() => setIsRestoreModalOpen(false)}
-            onSubmit={() =>
-              apiState.api
-                .patchModelVersion(
-                  {},
-                  {
-                    state: ModelState.LIVE,
-                  },
-                  mv.id,
-                )
-                .then(() =>
-                  navigate(
-                    modelVersionUrl(mv.id, mv.registeredModelId, preferredModelRegistry?.name),
-                  ),
-                )
-            }
-            isOpen={isRestoreModalOpen}
-            modelVersionName={mv.name}
-          />
+          {isArchiveModalOpen ? (
+            <ArchiveModelVersionModal
+              onCancel={() => setIsArchiveModalOpen(false)}
+              onSubmit={() =>
+                apiState.api
+                  .patchModelVersion(
+                    {},
+                    {
+                      state: ModelState.ARCHIVED,
+                    },
+                    mv.id,
+                  )
+                  .then(refresh)
+              }
+              modelVersionName={mv.name}
+            />
+          ) : null}
+          {isRestoreModalOpen ? (
+            <RestoreModelVersionModal
+              onCancel={() => setIsRestoreModalOpen(false)}
+              onSubmit={() =>
+                apiState.api
+                  .patchModelVersion(
+                    {},
+                    {
+                      state: ModelState.LIVE,
+                    },
+                    mv.id,
+                  )
+                  .then(() =>
+                    navigate(
+                      modelVersionUrl(mv.id, mv.registeredModelId, preferredModelRegistry?.name),
+                    ),
+                  )
+              }
+              modelVersionName={mv.name}
+            />
+          ) : null}
         </Td>
       )}
     </Tr>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTabs.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTabs.tsx
index 2bf57bd0e..cf93846bb 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTabs.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTabs.tsx
@@ -41,7 +41,7 @@ const ModelVersionsTabs: React.FC<ModelVersionsTabProps> = ({
         aria-label="Model versions tab"
         data-testid="model-versions-tab"
       >
-        <PageSection hasBodyWrapper={false} isFilled data-testid="model-versions-tab-content">
+        <PageSection hasBodyWrapper isFilled data-testid="model-versions-tab-content">
           <ModelVersionListView
             isArchiveModel={isArchiveModel}
             modelVersions={modelVersions}
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
index b6d2028ef..af4fc1ba5 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router';
-import { Button, Flex, FlexItem, Label, Content, Truncate } from '@patternfly/react-core';
+import { Button, Flex, FlexItem, Label, Truncate } from '@patternfly/react-core';
 import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
@@ -60,19 +60,15 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
         }
         title={
           mv && (
-            <Flex>
-              <FlexItem>
-                <Content>{mv.name}</Content>
-              </FlexItem>
-              <FlexItem>
-                <Label>Archived</Label>
-              </FlexItem>
+            <Flex alignItems={{ default: 'alignItemsCenter' }}>
+              <FlexItem>{mv.name}</FlexItem>
+              <Label>Archived</Label>
             </Flex>
           )
         }
         headerAction={
           <Button data-testid="restore-button" onClick={() => setIsRestoreModalOpen(true)}>
-            Restore version
+            Restore model version
           </Button>
         }
         description={<Truncate content={mv?.description || ''} />}
@@ -89,7 +85,7 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
           />
         )}
       </ApplicationsPage>
-      {mv !== null && (
+      {mv !== null && isRestoreModalOpen ? (
         <RestoreModelVersionModal
           onCancel={() => setIsRestoreModalOpen(false)}
           onSubmit={() =>
@@ -103,10 +99,9 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
               )
               .then(() => navigate(modelVersionUrl(mv.id, rm?.id, preferredModelRegistry?.name)))
           }
-          isOpen={isRestoreModalOpen}
           modelVersionName={mv.name}
         />
-      )}
+      ) : null}
     </>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx
index 3d57fe309..7bf680180 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchive.tsx
@@ -7,7 +7,7 @@ import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelecto
 import useRegisteredModelById from '~/app/hooks/useRegisteredModelById';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
 import { registeredModelUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
-import { filterArchiveVersions } from '~/app/pages/modelRegistry/screens/utils';
+import { filterArchiveVersions } from '~/app/utils';
 import ModelVersionsArchiveListView from './ModelVersionsArchiveListView';
 
 type ModelVersionsArchiveProps = Omit<
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx
index 097d60f1a..ad834c5d0 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveListView.tsx
@@ -8,11 +8,11 @@ import {
   ToolbarItem,
   ToolbarToggleGroup,
 } from '@patternfly/react-core';
-import { FilterIcon } from '@patternfly/react-icons';
+import { FilterIcon, SearchIcon } from '@patternfly/react-icons';
 import { ModelVersion } from '~/app/types';
 import { SearchType } from '~/shared/components/DashboardSearchField';
 import SimpleSelect from '~/shared/components/SimpleSelect';
-import { asEnumMember } from '~/app/utils';
+import { asEnumMember } from '~/shared/utilities/utils';
 import { filterModelVersions } from '~/app/pages/modelRegistry/screens/utils';
 import EmptyModelRegistryState from '~/app/pages/modelRegistry/screens/components/EmptyModelRegistryState';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
@@ -38,9 +38,10 @@ const ModelVersionsArchiveListView: React.FC<ModelVersionsArchiveListViewProps>
   if (unfilteredmodelVersions.length === 0) {
     return (
       <EmptyModelRegistryState
+        headerIcon={SearchIcon}
         testid="empty-archive-state"
         title="No archived versions"
-        description="You can archive the active versions that you no longer use. You can restore an archived version to make it active."
+        description="You can archive the active versions that you no longer use. You can restore archived versions to make it active."
       />
     );
   }
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx
index 932f50480..d44f87e71 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionsArchiveTable.tsx
@@ -22,10 +22,11 @@ const ModelVersionsArchiveTable: React.FC<ModelVersionsArchiveTableProps> = ({
     data={modelVersions}
     columns={mvColumns}
     toolbarContent={toolbarContent}
-    enablePagination="compact"
+    enablePagination
+    onClearFilters={clearFilters}
     emptyTableView={<DashboardEmptyTableView onClearFilters={clearFilters} />}
     defaultSortColumn={1}
-    rowRenderer={(mv: ModelVersion) => (
+    rowRenderer={(mv) => (
       <ModelVersionsTableRow key={mv.name} modelVersion={mv} isArchiveRow refresh={refresh} />
     )}
   />
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
index 230e9b7cc..a93fc98b8 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModel.tsx
@@ -4,6 +4,9 @@ import {
   BreadcrumbItem,
   Form,
   FormGroup,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
   PageSection,
   Stack,
   StackItem,
@@ -17,36 +20,53 @@ import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormField
 import FormSection from '~/shared/components/pf-overrides/FormSection';
 import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { modelRegistryUrl, registeredModelUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
-import { ValueOf } from '~/shared/typeHelpers';
 import { isMUITheme } from '~/shared/utilities/const';
-import { useRegisterModelData, RegistrationCommonFormData } from './useRegisterModelData';
-import { isRegisterModelSubmitDisabled, registerModel } from './utils';
-import { useRegistrationCommonState } from './useRegistrationCommonState';
+import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
+import { AppContext } from '~/app/AppContext';
+import { useRegisterModelData } from './useRegisterModelData';
+import { isNameValid, isRegisterModelSubmitDisabled, registerModel } from './utils';
 import RegistrationCommonFormSections from './RegistrationCommonFormSections';
 import RegistrationFormFooter from './RegistrationFormFooter';
+import { MR_CHARACTER_LIMIT, SubmitLabel } from './const';
+import PrefilledModelRegistryField from './PrefilledModelRegistryField';
 
 const RegisterModel: React.FC = () => {
   const { modelRegistry: mrName } = useParams();
   const navigate = useNavigate();
-
-  const { isSubmitting, submitError, setSubmitError, handleSubmit, apiState, author } =
-    useRegistrationCommonState();
-
+  const { apiState } = React.useContext(ModelRegistryContext);
+  const { user } = React.useContext(AppContext);
+  const author = user.userId || '';
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [submitError, setSubmitError] = React.useState<Error | undefined>(undefined);
   const [formData, setData] = useRegisterModelData();
+  const isModelNameValid = isNameValid(formData.modelName);
   const isSubmitDisabled = isSubmitting || isRegisterModelSubmitDisabled(formData);
   const { modelName, modelDescription } = formData;
+  const [registeredModelName, setRegisteredModelName] = React.useState<string>('');
+  const [versionName, setVersionName] = React.useState<string>('');
+  const [errorName, setErrorName] = React.useState<string | undefined>(undefined);
 
-  const onSubmit = () =>
-    handleSubmit(async () => {
-      const { registeredModel } = await registerModel(apiState, formData, author);
+  const handleSubmit = async () => {
+    setIsSubmitting(true);
+    setSubmitError(undefined);
+
+    const {
+      data: { registeredModel, modelVersion, modelArtifact },
+      errors,
+    } = await registerModel(apiState, formData, author);
+    if (registeredModel && modelVersion && modelArtifact) {
       navigate(registeredModelUrl(registeredModel.id, mrName));
-    });
+    } else if (Object.keys(errors).length > 0) {
+      setIsSubmitting(false);
+      setRegisteredModelName(formData.modelName);
+      setVersionName(formData.versionName);
+      const resourceName = Object.keys(errors)[0];
+      setErrorName(resourceName);
+      setSubmitError(errors[resourceName]);
+    }
+  };
   const onCancel = () => navigate(modelRegistryUrl(mrName));
 
-  const modelRegistryInput = (
-    <TextInput isDisabled isRequired type="text" id="mr-name" name="mr-name" value={mrName} />
-  );
-
   const modelNameInput = (
     <TextInput
       isRequired
@@ -87,18 +107,7 @@ const RegisterModel: React.FC = () => {
         <Form isWidthLimited>
           <Stack hasGutter>
             <StackItem className={spacing.mbLg}>
-              <FormGroup
-                className="form-group-disabled"
-                label="Model registry"
-                isRequired
-                fieldId="mr-name"
-              >
-                {isMUITheme() ? (
-                  <FormFieldset component={modelRegistryInput} field="Model Registry" />
-                ) : (
-                  modelRegistryInput
-                )}
-              </FormGroup>
+              <PrefilledModelRegistryField mrName={mrName} />
             </StackItem>
             <StackItem>
               <FormSection
@@ -111,6 +120,15 @@ const RegisterModel: React.FC = () => {
                   ) : (
                     modelNameInput
                   )}
+                  {!isModelNameValid && (
+                    <FormHelperText>
+                      <HelperText>
+                        <HelperTextItem variant="error">
+                          Cannot exceed {MR_CHARACTER_LIMIT} characters
+                        </HelperTextItem>
+                      </HelperText>
+                    </FormHelperText>
+                  )}
                 </FormGroup>
                 <FormGroup
                   className="model-description"
@@ -126,10 +144,7 @@ const RegisterModel: React.FC = () => {
               </FormSection>
               <RegistrationCommonFormSections
                 formData={formData}
-                setData={(
-                  propKey: keyof RegistrationCommonFormData,
-                  propValue: ValueOf<RegistrationCommonFormData>,
-                ) => setData(propKey, propValue)}
+                setData={setData}
                 isFirstVersion
               />
             </StackItem>
@@ -137,13 +152,15 @@ const RegisterModel: React.FC = () => {
         </Form>
       </PageSection>
       <RegistrationFormFooter
-        submitLabel="Register model"
+        submitLabel={SubmitLabel.REGISTER_MODEL}
         submitError={submitError}
-        setSubmitError={setSubmitError}
         isSubmitDisabled={isSubmitDisabled}
         isSubmitting={isSubmitting}
-        onSubmit={onSubmit}
+        onSubmit={handleSubmit}
         onCancel={onCancel}
+        errorName={errorName}
+        versionName={versionName}
+        modelName={registeredModelName}
       />
     </ApplicationsPage>
   );
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelErrors.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelErrors.tsx
new file mode 100644
index 000000000..d14b8548f
--- /dev/null
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelErrors.tsx
@@ -0,0 +1,114 @@
+import React from 'react';
+import { Alert, AlertActionCloseButton, StackItem } from '@patternfly/react-core';
+import { ErrorName, SubmitLabel } from './const';
+
+type RegisterModelErrorProp = {
+  submitLabel: string;
+  submitError: Error;
+  errorName?: string;
+  versionName?: string;
+  modelName?: string;
+};
+
+const RegisterModelErrors: React.FC<RegisterModelErrorProp> = ({
+  submitLabel,
+  submitError,
+  errorName,
+  versionName = '',
+  modelName = '',
+}) => {
+  const [showAlert, setShowAlert] = React.useState<boolean>(true);
+
+  if (submitLabel === SubmitLabel.REGISTER_MODEL && errorName === ErrorName.MODEL_VERSION) {
+    return (
+      <>
+        {showAlert && (
+          <StackItem>
+            <Alert
+              isInline
+              variant="success"
+              title={`${modelName} model registered`}
+              actionClose={<AlertActionCloseButton onClose={() => setShowAlert(false)} />}
+            />
+          </StackItem>
+        )}
+        <StackItem>
+          <Alert isInline variant="danger" title={`Failed to register ${versionName} version`}>
+            {submitError.message}
+          </Alert>
+        </StackItem>
+      </>
+    );
+  }
+
+  if (submitLabel === SubmitLabel.REGISTER_VERSION && errorName === ErrorName.MODEL_VERSION) {
+    return (
+      <StackItem>
+        <Alert isInline variant="danger" title={`Failed to register ${versionName} version`}>
+          {submitError.message}
+        </Alert>
+      </StackItem>
+    );
+  }
+
+  if (submitLabel === SubmitLabel.REGISTER_MODEL && errorName === ErrorName.MODEL_ARTIFACT) {
+    return (
+      <>
+        {showAlert && (
+          <StackItem>
+            <Alert
+              isInline
+              variant="success"
+              title={`${modelName} model and ${versionName} version registered`}
+              actionClose={<AlertActionCloseButton onClose={() => setShowAlert(false)} />}
+            />
+          </StackItem>
+        )}
+        <StackItem>
+          <Alert
+            isInline
+            variant="danger"
+            title={`Failed to create artifact for ${versionName} version`}
+          >
+            {submitError.message}
+          </Alert>
+        </StackItem>
+      </>
+    );
+  }
+
+  if (submitLabel === SubmitLabel.REGISTER_VERSION && errorName === ErrorName.MODEL_ARTIFACT) {
+    return (
+      <>
+        {showAlert && (
+          <StackItem>
+            <Alert
+              isInline
+              variant="success"
+              title={`${versionName} version registered`}
+              actionClose={<AlertActionCloseButton onClose={() => setShowAlert(false)} />}
+            />
+          </StackItem>
+        )}
+        <StackItem>
+          <Alert
+            isInline
+            variant="danger"
+            title={`Failed to create artifact for ${versionName} version`}
+          >
+            {submitError.message}
+          </Alert>
+        </StackItem>
+      </>
+    );
+  }
+
+  return (
+    <StackItem>
+      <Alert isInline variant="danger" title={`Failed to register ${modelName} model`}>
+        {submitError.message}
+      </Alert>
+    </StackItem>
+  );
+};
+export default RegisterModelErrors;
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
index 6a3524588..e25072a8d 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterVersion.tsx
@@ -15,27 +15,31 @@ import { Link } from 'react-router-dom';
 import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { modelRegistryUrl, registeredModelUrl } from '~/app/pages/modelRegistry/screens/routeUtils';
 import useRegisteredModels from '~/app/hooks/useRegisteredModels';
-import { ValueOf } from '~/shared/typeHelpers';
-import { filterLiveModels } from '~/app/pages/modelRegistry/screens/utils';
-import { RegistrationCommonFormData, useRegisterVersionData } from './useRegisterModelData';
+import { filterLiveModels } from '~/app/utils';
+import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
+import { AppContext } from '~/app/AppContext';
+import { useRegisterVersionData } from './useRegisterModelData';
 import { isRegisterVersionSubmitDisabled, registerVersion } from './utils';
 import RegistrationCommonFormSections from './RegistrationCommonFormSections';
-import { useRegistrationCommonState } from './useRegistrationCommonState';
 import PrefilledModelRegistryField from './PrefilledModelRegistryField';
 import RegistrationFormFooter from './RegistrationFormFooter';
 import RegisteredModelSelector from './RegisteredModelSelector';
 import { usePrefillRegisterVersionFields } from './usePrefillRegisterVersionFields';
+import { SubmitLabel } from './const';
 
 const RegisterVersion: React.FC = () => {
   const { modelRegistry: mrName, registeredModelId: prefilledRegisteredModelId } = useParams();
-
   const navigate = useNavigate();
-
-  const { isSubmitting, submitError, setSubmitError, handleSubmit, apiState, author } =
-    useRegistrationCommonState();
-
+  const { apiState } = React.useContext(ModelRegistryContext);
+  const { user } = React.useContext(AppContext);
+  const author = user.userId || '';
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
   const [formData, setData] = useRegisterVersionData(prefilledRegisteredModelId);
   const isSubmitDisabled = isSubmitting || isRegisterVersionSubmitDisabled(formData);
+  const [submitError, setSubmitError] = React.useState<Error | undefined>(undefined);
+  const [errorName, setErrorName] = React.useState<string | undefined>(undefined);
+  const [versionName, setVersionName] = React.useState<string>('');
+
   const { registeredModelId } = formData;
 
   const [allRegisteredModels, loadedRegisteredModels, loadRegisteredModelsError] =
@@ -49,15 +53,29 @@ const RegisterVersion: React.FC = () => {
       setData,
     });
 
-  const onSubmit = () => {
+  const handleSubmit = async () => {
     if (!registeredModel) {
       return; // We shouldn't be able to hit this due to form validation
     }
-    handleSubmit(async () => {
-      await registerVersion(apiState, registeredModel, formData, author);
+    setIsSubmitting(true);
+    setSubmitError(undefined);
+
+    const {
+      data: { modelVersion, modelArtifact },
+      errors,
+    } = await registerVersion(apiState, registeredModel, formData, author);
+
+    if (modelVersion && modelArtifact) {
       navigate(registeredModelUrl(registeredModel.id, mrName));
-    });
+    } else if (Object.keys(errors).length > 0) {
+      const resourceName = Object.keys(errors)[0];
+      setVersionName(formData.versionName);
+      setErrorName(resourceName);
+      setSubmitError(errors[resourceName]);
+      setIsSubmitting(false);
+    }
   };
+
   const onCancel = () =>
     navigate(
       prefilledRegisteredModelId && registeredModel
@@ -101,6 +119,7 @@ const RegisterVersion: React.FC = () => {
             <StackItem className={spacing.mbLg}>
               <FormGroup
                 id="registered-model-container"
+                label="Model name"
                 isRequired
                 fieldId="model-name"
                 labelHelp={
@@ -118,10 +137,7 @@ const RegisterVersion: React.FC = () => {
             <StackItem>
               <RegistrationCommonFormSections
                 formData={formData}
-                setData={(
-                  propKey: keyof RegistrationCommonFormData,
-                  propValue: ValueOf<RegistrationCommonFormData>,
-                ) => setData(propKey, propValue)}
+                setData={setData}
                 isFirstVersion={false}
                 latestVersion={latestVersion}
               />
@@ -130,13 +146,14 @@ const RegisterVersion: React.FC = () => {
         </Form>
       </PageSection>
       <RegistrationFormFooter
-        submitLabel="Register new version"
+        submitLabel={SubmitLabel.REGISTER_VERSION}
+        errorName={errorName}
         submitError={submitError}
-        setSubmitError={setSubmitError}
         isSubmitDisabled={isSubmitDisabled}
         isSubmitting={isSubmitting}
-        onSubmit={onSubmit}
+        onSubmit={handleSubmit}
         onCancel={onCancel}
+        versionName={versionName}
       />
     </ApplicationsPage>
   );
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx
index 9ea05f4e8..80fed1ab7 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormGroup, TextInput } from '@patternfly/react-core';
-import { TypeaheadSelect, TypeaheadSelectOption } from '@patternfly/react-templates';
 import { RegisteredModel } from '~/app/types';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { isMUITheme } from '~/shared/utilities/const';
+import TypeaheadSelect, { TypeaheadSelectOption } from '~/shared/components/TypeaheadSelect';
 
 type RegisteredModelSelectorProps = {
   registeredModels: RegisteredModel[];
@@ -60,7 +60,8 @@ const RegisteredModelSelector: React.FC<RegisteredModelSelectorProps> = ({
   return (
     <TypeaheadSelect
       id="model-name"
-      initialOptions={options}
+      onClearSelection={() => setRegisteredModelId('')}
+      selectOptions={options}
       placeholder="Select a registered model"
       noOptionsFoundMessage={(filter) => `No results found for "${filter}"`}
       onSelect={(_event, selection) => {
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
index 8a1063259..e8e169477 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
@@ -9,8 +9,8 @@ import {
   HelperText,
   HelperTextItem,
   FormHelperText,
-  TextInputGroup,
-  TextInputGroupMain,
+  InputGroupItem,
+  InputGroupText,
 } from '@patternfly/react-core';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
 import { UpdateObjectAtPropAndValue } from '~/shared/types';
@@ -21,25 +21,33 @@ import FormSection from '~/shared/components/pf-overrides/FormSection';
 import { ModelVersion } from '~/app/types';
 import { isMUITheme } from '~/shared/utilities/const';
 import { ModelLocationType, RegistrationCommonFormData } from './useRegisterModelData';
+import { isNameValid } from './utils';
+import { MR_CHARACTER_LIMIT } from './const';
 // import { ConnectionModal } from './ConnectionModal';
 
-type RegistrationCommonFormSectionsProps = {
-  formData: RegistrationCommonFormData;
-  setData: UpdateObjectAtPropAndValue<RegistrationCommonFormData>;
+type RegistrationCommonFormSectionsProps<D extends RegistrationCommonFormData> = {
+  formData: D;
+  setData: UpdateObjectAtPropAndValue<D>;
   isFirstVersion: boolean;
   latestVersion?: ModelVersion;
 };
 
-const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsProps> = ({
+const RegistrationCommonFormSections = <D extends RegistrationCommonFormData>({
   formData,
   setData,
   isFirstVersion,
   latestVersion,
-}) => {
-  // TODO: [Data connections] Check wether we should use data connections
+}: RegistrationCommonFormSectionsProps<D>): React.ReactNode => {
   // const [isAutofillModalOpen, setAutofillModalOpen] = React.useState(false);
+  const isVersionNameValid = isNameValid(formData.versionName);
 
-  // const connectionDataMap: Record<string, keyof RegistrationCommonFormData> = {
+  // const connectionDataMap: Record<
+  //   string,
+  //   keyof Pick<
+  //     RegistrationCommonFormData,
+  //     'modelLocationEndpoint' | 'modelLocationBucket' | 'modelLocationRegion'
+  //   >
+  // > = {
   //   AWS_S3_ENDPOINT: 'modelLocationEndpoint',
   //   AWS_S3_BUCKET: 'modelLocationBucket',
   //   AWS_DEFAULT_REGION: 'modelLocationRegion',
@@ -72,6 +80,7 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
       name="version-name"
       value={versionName}
       onChange={(_e, value) => setData('versionName', value)}
+      validated={isVersionNameValid ? 'default' : 'error'}
     />
   );
 
@@ -140,16 +149,16 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
   );
 
   const pathInput = (
-    <TextInputGroup>
-      <TextInputGroupMain
-        icon="/"
+    <InputGroupItem>
+      <TextInput
+        isRequired
         type="text"
         id="location-path"
         name="location-path"
         value={modelLocationPath}
         onChange={(_e, value) => setData('modelLocationPath', value)}
       />
-    </TextInputGroup>
+    </InputGroupItem>
   );
 
   const uriInput = (
@@ -179,19 +188,22 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
           ) : (
             versionNameInput
           )}
-        </FormGroup>
-        {latestVersion && (
           <FormHelperText>
-            <HelperText>
-              <HelperTextItem>Current version is {latestVersion.name}</HelperTextItem>
-            </HelperText>
+            {latestVersion && (
+              <HelperText>
+                <HelperTextItem>Current version is {latestVersion.name}</HelperTextItem>
+              </HelperText>
+            )}
+            {!isVersionNameValid && (
+              <HelperText>
+                <HelperTextItem variant="error">
+                  Cannot exceed {MR_CHARACTER_LIMIT} characters
+                </HelperTextItem>
+              </HelperText>
+            )}
           </FormHelperText>
-        )}
-        <FormGroup
-          className="version-description"
-          label="Version description"
-          fieldId="version-description"
-        >
+        </FormGroup>
+        <FormGroup label="Version description" fieldId="version-description">
           {isMUITheme() ? (
             <FormFieldset component={versionDescriptionInput} field="Version Description" />
           ) : (
@@ -267,46 +279,50 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
               {isMUITheme() ? <FormFieldset component={regionInput} field="Region" /> : regionInput}
             </FormGroup>
             <FormGroup className={spacing.mlLg} label="Path" isRequired fieldId="location-path">
-              {isMUITheme() ? <FormFieldset component={pathInput} field="Path" /> : pathInput}
-            </FormGroup>
-            <FormHelperText className="path-helper-text">
+              <Split hasGutter>
+                <SplitItem>
+                  <InputGroupText isPlain>/</InputGroupText>
+                </SplitItem>
+                <SplitItem isFilled>
+                  {isMUITheme() ? <FormFieldset component={pathInput} field="Path" /> : pathInput}
+                </SplitItem>
+              </Split>
               <HelperText>
                 <HelperTextItem>
                   Enter a path to a model or folder. This path cannot point to a root folder.
                 </HelperTextItem>
               </HelperText>
-            </FormHelperText>
-          </>
-        )}
-        <Split>
-          <SplitItem isFilled>
-            <Radio
-              isChecked={modelLocationType === ModelLocationType.URI}
-              name="location-type-uri"
-              onChange={() => {
-                setData('modelLocationType', ModelLocationType.URI);
-              }}
-              label="URI"
-              id="location-type-uri"
-            />
-          </SplitItem>
-        </Split>
-        {modelLocationType === ModelLocationType.URI && (
-          <>
-            <FormGroup className={spacing.mlLg} label="URI" isRequired fieldId="location-uri">
-              {isMUITheme() ? <FormFieldset component={uriInput} field="URI" /> : uriInput}
             </FormGroup>
           </>
         )}
+        <Radio
+          isChecked={modelLocationType === ModelLocationType.URI}
+          name="location-type-uri"
+          onChange={() => {
+            setData('modelLocationType', ModelLocationType.URI);
+          }}
+          label="URI"
+          id="location-type-uri"
+          body={
+            modelLocationType === ModelLocationType.URI && (
+              <>
+                <FormGroup label="URI" isRequired fieldId="location-uri">
+                  {isMUITheme() ? <FormFieldset component={uriInput} field="URI" /> : uriInput}
+                </FormGroup>
+              </>
+            )
+          }
+        />
       </FormSection>
-      {/* <ConnectionModal
-        isOpen={isAutofillModalOpen}
-        onClose={() => setAutofillModalOpen(false)}
-        onSubmit={(connection) => {
-          fillObjectStorageByConnection(connection);
-          setAutofillModalOpen(false);
-        }}
-      /> */}
+      {/* {isAutofillModalOpen ? (
+        <ConnectionModal
+          onClose={() => setAutofillModalOpen(false)}
+          onSubmit={(connection) => {
+            fillObjectStorageByConnection(connection);
+            setAutofillModalOpen(false);
+          }}
+        />
+      ) : null} */}
     </>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationFormFooter.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationFormFooter.tsx
index 86ca64789..3430df9ef 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationFormFooter.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationFormFooter.tsx
@@ -3,61 +3,74 @@ import {
   PageSection,
   Stack,
   StackItem,
-  Alert,
-  AlertActionCloseButton,
-  ActionGroup,
   Button,
+  ActionList,
+  ActionListItem,
+  ActionListGroup,
 } from '@patternfly/react-core';
+import RegisterModelErrors from './RegisterModelErrors';
 
 type RegistrationFormFooterProps = {
   submitLabel: string;
   submitError?: Error;
-  setSubmitError: (e?: Error) => void;
   isSubmitDisabled: boolean;
   isSubmitting: boolean;
   onSubmit: () => void;
   onCancel: () => void;
+  errorName?: string;
+  versionName?: string;
+  modelName?: string;
 };
 
 const RegistrationFormFooter: React.FC<RegistrationFormFooterProps> = ({
   submitLabel,
   submitError,
-  setSubmitError,
   isSubmitDisabled,
   isSubmitting,
   onSubmit,
   onCancel,
+  errorName,
+  versionName,
+  modelName,
 }) => (
   <PageSection hasBodyWrapper={false} stickyOnBreakpoint={{ default: 'bottom' }}>
     <Stack hasGutter>
       {submitError && (
-        <StackItem>
-          <Alert
-            isInline
-            variant="danger"
-            title={submitError.name}
-            actionClose={<AlertActionCloseButton onClose={() => setSubmitError(undefined)} />}
-          >
-            {submitError.message}
-          </Alert>
-        </StackItem>
+        <RegisterModelErrors
+          submitLabel={submitLabel}
+          submitError={submitError}
+          errorName={errorName}
+          versionName={versionName}
+          modelName={modelName}
+        />
       )}
       <StackItem>
-        <ActionGroup>
-          <Button
-            isDisabled={isSubmitDisabled}
-            variant="primary"
-            id="create-button"
-            data-testid="create-button"
-            isLoading={isSubmitting}
-            onClick={onSubmit}
-          >
-            {submitLabel}
-          </Button>
-          <Button isDisabled={isSubmitting} variant="link" id="cancel-button" onClick={onCancel}>
-            Cancel
-          </Button>
-        </ActionGroup>
+        <ActionList>
+          <ActionListGroup>
+            <ActionListItem>
+              <Button
+                isDisabled={isSubmitDisabled}
+                variant="primary"
+                id="create-button"
+                data-testid="create-button"
+                isLoading={isSubmitting}
+                onClick={onSubmit}
+              >
+                {submitLabel}
+              </Button>
+            </ActionListItem>
+            <ActionListItem>
+              <Button
+                isDisabled={isSubmitting}
+                variant="link"
+                id="cancel-button"
+                onClick={onCancel}
+              >
+                Cancel
+              </Button>
+            </ActionListItem>
+          </ActionListGroup>
+        </ActionList>
       </StackItem>
     </Stack>
   </PageSection>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/const.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/const.ts
new file mode 100644
index 000000000..a2ca8196b
--- /dev/null
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/const.ts
@@ -0,0 +1,12 @@
+export const MR_CHARACTER_LIMIT = 128;
+
+export enum SubmitLabel {
+  REGISTER_MODEL = 'Register model',
+  REGISTER_VERSION = 'Register new version',
+}
+
+export enum ErrorName {
+  REGISTERED_MODEL = 'registeredModel',
+  MODEL_VERSION = 'modelVersion',
+  MODEL_ARTIFACT = 'modelArtifact',
+}
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts
index be9e3601b..61538c5f1 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/usePrefillRegisterVersionFields.ts
@@ -1,10 +1,6 @@
 import React from 'react';
 import { RegisteredModel, ModelVersion, ModelArtifact } from '~/app/types';
-import {
-  filterLiveVersions,
-  getLastCreatedItem,
-  uriToObjectStorageFields,
-} from '~/app/pages/modelRegistry/screens/utils';
+import { filterLiveVersions, getLastCreatedItem, uriToObjectStorageFields } from '~/app/utils';
 import { UpdateObjectAtPropAndValue } from '~/shared/types';
 import useModelArtifactsByVersionId from '~/app/hooks/useModelArtifactsByVersionId';
 import useModelVersionsByRegisteredModel from '~/app/hooks/useModelVersionsByRegisteredModel';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts
deleted file mode 100644
index 8d3510d68..000000000
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/useRegistrationCommonState.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
-import { ModelRegistryAPIState } from '~/app/hooks/useModelRegistryAPIState';
-import useUser from '~/app/hooks/useUser';
-
-type RegistrationCommonState = {
-  isSubmitting: boolean;
-  setIsSubmitting: React.Dispatch<React.SetStateAction<boolean>>;
-  submitError: Error | undefined;
-  setSubmitError: React.Dispatch<React.SetStateAction<Error | undefined>>;
-  handleSubmit: (doSubmit: () => Promise<unknown>) => void;
-  apiState: ModelRegistryAPIState;
-  author: string;
-};
-
-export const useRegistrationCommonState = (): RegistrationCommonState => {
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const [submitError, setSubmitError] = React.useState<Error | undefined>(undefined);
-
-  const { apiState } = React.useContext(ModelRegistryContext);
-  const { userId } = useUser();
-
-  const handleSubmit = (doSubmit: () => Promise<unknown>) => {
-    setIsSubmitting(true);
-    setSubmitError(undefined);
-    doSubmit().catch((e: Error) => {
-      setIsSubmitting(false);
-      setSubmitError(e);
-    });
-  };
-
-  return {
-    isSubmitting,
-    setIsSubmitting,
-    submitError,
-    setSubmitError,
-    handleSubmit,
-    apiState,
-    author: userId,
-  };
-};
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/utils.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/utils.ts
index 22fef4d04..bf6ffc282 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/utils.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/utils.ts
@@ -6,45 +6,60 @@ import {
   RegisteredModel,
 } from '~/app/types';
 import { ModelRegistryAPIState } from '~/app/hooks/useModelRegistryAPIState';
-import { objectStorageFieldsToUri } from '~/app/pages/modelRegistry/screens/utils';
+import { objectStorageFieldsToUri } from '~/app/utils';
 import {
   ModelLocationType,
   RegisterModelFormData,
   RegisterVersionFormData,
   RegistrationCommonFormData,
 } from './useRegisterModelData';
+import { ErrorName, MR_CHARACTER_LIMIT } from './const';
 
 export type RegisterModelCreatedResources = RegisterVersionCreatedResources & {
-  registeredModel: RegisteredModel;
+  registeredModel?: RegisteredModel;
 };
 
 export type RegisterVersionCreatedResources = {
-  modelVersion: ModelVersion;
-  modelArtifact: ModelArtifact;
+  modelVersion?: ModelVersion;
+  modelArtifact?: ModelArtifact;
 };
 
 export const registerModel = async (
   apiState: ModelRegistryAPIState,
   formData: RegisterModelFormData,
   author: string,
-): Promise<RegisterModelCreatedResources> => {
-  const registeredModel = await apiState.api.createRegisteredModel(
-    {},
-    {
-      name: formData.modelName,
-      description: formData.modelDescription,
-      customProperties: {},
-      owner: author,
-      state: ModelState.LIVE,
-    },
-  );
-  const { modelVersion, modelArtifact } = await registerVersion(
-    apiState,
-    registeredModel,
-    formData,
-    author,
-  );
-  return { registeredModel, modelVersion, modelArtifact };
+): Promise<{
+  data: RegisterModelCreatedResources;
+  errors: { [key: string]: Error | undefined };
+}> => {
+  let registeredModel;
+  const error: { [key: string]: Error | undefined } = {};
+  try {
+    registeredModel = await apiState.api.createRegisteredModel(
+      {},
+      {
+        name: formData.modelName,
+        description: formData.modelDescription,
+        customProperties: {},
+        owner: author,
+        state: ModelState.LIVE,
+      },
+    );
+  } catch (e) {
+    if (e instanceof Error) {
+      error[ErrorName.REGISTERED_MODEL] = e;
+    }
+    return { data: { registeredModel }, errors: error };
+  }
+  const {
+    data: { modelVersion, modelArtifact },
+    errors,
+  } = await registerVersion(apiState, registeredModel, formData, author);
+
+  return {
+    data: { registeredModel, modelVersion, modelArtifact },
+    errors,
+  };
 };
 
 export const registerVersion = async (
@@ -52,39 +67,58 @@ export const registerVersion = async (
   registeredModel: RegisteredModel,
   formData: Omit<RegisterVersionFormData, 'registeredModelId'>,
   author: string,
-): Promise<RegisterVersionCreatedResources> => {
-  const modelVersion = await apiState.api.createModelVersionForRegisteredModel(
-    {},
-    registeredModel.id,
-    {
+): Promise<{
+  data: RegisterVersionCreatedResources;
+  errors: { [key: string]: Error | undefined };
+}> => {
+  let modelVersion;
+  let modelArtifact;
+  const errors: { [key: string]: Error | undefined } = {};
+  try {
+    modelVersion = await apiState.api.createModelVersionForRegisteredModel({}, registeredModel.id, {
       name: formData.versionName,
       description: formData.versionDescription,
       customProperties: {},
       state: ModelState.LIVE,
       author,
       registeredModelId: registeredModel.id,
-    },
-  );
-  const modelArtifact = await apiState.api.createModelArtifactForModelVersion({}, modelVersion.id, {
-    name: `${registeredModel.name}-${formData.versionName}-artifact`,
-    description: formData.versionDescription,
-    customProperties: {},
-    state: ModelArtifactState.LIVE,
-    author,
-    modelFormatName: formData.sourceModelFormat,
-    modelFormatVersion: formData.sourceModelFormatVersion,
-    uri:
-      formData.modelLocationType === ModelLocationType.ObjectStorage
-        ? objectStorageFieldsToUri({
-            endpoint: formData.modelLocationEndpoint,
-            bucket: formData.modelLocationBucket,
-            region: formData.modelLocationRegion,
-            path: formData.modelLocationPath,
-          }) || '' // We'll only hit this case if required fields are empty strings, so form validation should catch it.
-        : formData.modelLocationURI,
-    artifactType: 'model-artifact',
-  });
-  return { modelVersion, modelArtifact };
+    });
+  } catch (e) {
+    if (e instanceof Error) {
+      errors[ErrorName.MODEL_VERSION] = e;
+    }
+    return { data: { modelVersion, modelArtifact }, errors };
+  }
+
+  try {
+    modelArtifact = await apiState.api.createModelArtifactForModelVersion({}, modelVersion.id, {
+      name: `${formData.versionName}`,
+      description: formData.versionDescription,
+      customProperties: {},
+      state: ModelArtifactState.LIVE,
+      author,
+      modelFormatName: formData.sourceModelFormat,
+      modelFormatVersion: formData.sourceModelFormatVersion,
+      // TODO fill in the name of the data connection we used to prefill if we used one
+      // storageKey: 'TODO',
+      uri:
+        formData.modelLocationType === ModelLocationType.ObjectStorage
+          ? objectStorageFieldsToUri({
+              endpoint: formData.modelLocationEndpoint,
+              bucket: formData.modelLocationBucket,
+              region: formData.modelLocationRegion,
+              path: formData.modelLocationPath,
+            }) || '' // We'll only hit this case if required fields are empty strings, so form validation should catch it.
+          : formData.modelLocationURI,
+      artifactType: 'model-artifact',
+    });
+  } catch (e) {
+    if (e instanceof Error) {
+      errors[ErrorName.MODEL_ARTIFACT] = e;
+    }
+  }
+
+  return { data: { modelVersion, modelArtifact }, errors };
 };
 
 const isSubmitDisabledForCommonFields = (formData: RegistrationCommonFormData): boolean => {
@@ -100,12 +134,17 @@ const isSubmitDisabledForCommonFields = (formData: RegistrationCommonFormData):
     !versionName ||
     (modelLocationType === ModelLocationType.URI && !modelLocationURI) ||
     (modelLocationType === ModelLocationType.ObjectStorage &&
-      (!modelLocationBucket || !modelLocationEndpoint || !modelLocationPath))
+      (!modelLocationBucket || !modelLocationEndpoint || !modelLocationPath)) ||
+    !isNameValid(versionName)
   );
 };
 
 export const isRegisterModelSubmitDisabled = (formData: RegisterModelFormData): boolean =>
-  !formData.modelName || isSubmitDisabledForCommonFields(formData);
+  !formData.modelName ||
+  isSubmitDisabledForCommonFields(formData) ||
+  !isNameValid(formData.modelName);
 
 export const isRegisterVersionSubmitDisabled = (formData: RegisterVersionFormData): boolean =>
   !formData.registeredModelId || isSubmitDisabledForCommonFields(formData);
+
+export const isNameValid = (name: string): boolean => name.length <= MR_CHARACTER_LIMIT;
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx
index 4dbfcbeb1..1d921acbb 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx
@@ -8,11 +8,10 @@ import {
 } from '@patternfly/react-core';
 import { FilterIcon } from '@patternfly/react-icons';
 import { useNavigate } from 'react-router-dom';
-import { RegisteredModel } from '~/app/types';
+import { ModelVersion, RegisteredModel } from '~/app/types';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { SearchType } from '~/shared/components/DashboardSearchField';
 import { ProjectObjectType, typedEmptyImage } from '~/shared/components/design/utils';
-import { asEnumMember, filterRegisteredModels } from '~/app/utils';
 import SimpleSelect from '~/shared/components/SimpleSelect';
 import {
   registeredModelArchiveUrl,
@@ -21,23 +20,29 @@ import {
 import EmptyModelRegistryState from '~/app/pages/modelRegistry/screens/components/EmptyModelRegistryState';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { isMUITheme } from '~/shared/utilities/const';
+import { filterRegisteredModels } from '~/app/pages/modelRegistry/screens/utils';
+import { asEnumMember } from '~/shared/utilities/utils';
+import { filterArchiveModels, filterLiveModels } from '~/app/utils';
 import RegisteredModelTable from './RegisteredModelTable';
 import RegisteredModelsTableToolbar from './RegisteredModelsTableToolbar';
 
 type RegisteredModelListViewProps = {
   registeredModels: RegisteredModel[];
+  modelVersions: ModelVersion[];
   refresh: () => void;
 };
 
 const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
-  registeredModels: unfilteredRegisteredModels,
+  registeredModels,
+  modelVersions,
   refresh,
 }) => {
   const navigate = useNavigate();
   const { preferredModelRegistry } = React.useContext(ModelRegistrySelectorContext);
   const [searchType, setSearchType] = React.useState<SearchType>(SearchType.KEYWORD);
   const [search, setSearch] = React.useState('');
-
+  const unfilteredRegisteredModels = filterLiveModels(registeredModels);
+  const archiveRegisteredModels = filterArchiveModels(registeredModels);
   const searchTypes = React.useMemo(() => [SearchType.KEYWORD, SearchType.OWNER], []);
 
   if (unfilteredRegisteredModels.length === 0) {
@@ -51,9 +56,13 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
             alt="missing model"
           />
         )}
-        description={`${preferredModelRegistry?.name} has no active registered models. Register a model in this registry, or select a different registry.`}
+        description={`${
+          preferredModelRegistry?.name ?? ''
+        } has no active registered models. Register a model in this registry, or select a different registry.`}
         primaryActionText="Register model"
-        secondaryActionText="View archived models"
+        secondaryActionText={
+          archiveRegisteredModels.length !== 0 ? 'View archived models' : undefined
+        }
         primaryActionOnClick={() => {
           navigate(registerModelUrl(preferredModelRegistry?.name));
         }}
@@ -66,6 +75,7 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
 
   const filteredRegisteredModels = filterRegisteredModels(
     unfilteredRegisteredModels,
+    modelVersions,
     search,
     searchType,
   );
@@ -78,8 +88,8 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
     <ToolbarGroup variant="filter-group">
       <ToolbarFilter
         labels={search === '' ? [] : [search]}
-        deleteLabel={() => setSearch('')}
-        deleteLabelGroup={() => setSearch('')}
+        deleteLabel={resetFilters}
+        deleteLabelGroup={resetFilters}
         categoryName="Keyword"
       >
         <SimpleSelect
@@ -97,7 +107,7 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
           icon={<FilterIcon />}
         />
       </ToolbarFilter>
-      <ToolbarItem variant="label-group">
+      <ToolbarItem>
         {isMUITheme() ? (
           <FormFieldset
             className="toolbar-fieldset-wrapper"
@@ -122,7 +132,7 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
             onChange={(_, searchValue) => {
               setSearch(searchValue);
             }}
-            onClear={() => setSearch('')}
+            onClear={resetFilters}
             style={{ minWidth: '200px' }}
             data-testid="registered-model-table-search"
           />
@@ -136,7 +146,12 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
       refresh={refresh}
       clearFilters={resetFilters}
       registeredModels={filteredRegisteredModels}
-      toolbarContent={<RegisteredModelsTableToolbar toggleGroupItems={toggleGroupItems} />}
+      toolbarContent={
+        <RegisteredModelsTableToolbar
+          toggleGroupItems={toggleGroupItems}
+          onClearAllFilters={resetFilters}
+        />
+      }
     />
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx
index 6ef939886..c842fc1e4 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTable.tsx
@@ -23,10 +23,16 @@ const RegisteredModelTable: React.FC<RegisteredModelTableProps> = ({
     columns={rmColumns}
     toolbarContent={toolbarContent}
     defaultSortColumn={2}
-    enablePagination="compact"
+    onClearFilters={clearFilters}
+    enablePagination
     emptyTableView={<DashboardEmptyTableView onClearFilters={clearFilters} />}
     rowRenderer={(rm) => (
-      <RegisteredModelTableRow key={rm.name} registeredModel={rm} refresh={refresh} />
+      <RegisteredModelTableRow
+        key={rm.name}
+        hasDeploys={false}
+        registeredModel={rm}
+        refresh={refresh}
+      />
     )}
   />
 );
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
index feab14d6c..cc5e3dd91 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
@@ -19,12 +19,14 @@ import { ModelVersionsTab } from '~/app/pages/modelRegistry/screens/ModelVersion
 type RegisteredModelTableRowProps = {
   registeredModel: RegisteredModel;
   isArchiveRow?: boolean;
+  hasDeploys?: boolean;
   refresh: () => void;
 };
 
 const RegisteredModelTableRow: React.FC<RegisteredModelTableRowProps> = ({
   registeredModel: rm,
   isArchiveRow,
+  hasDeploys = false,
   refresh,
 }) => {
   const { apiState } = React.useContext(ModelRegistryContext);
@@ -49,15 +51,24 @@ const RegisteredModelTableRow: React.FC<RegisteredModelTableRowProps> = ({
         }
       },
     },
-    isArchiveRow
-      ? {
-          title: 'Restore model',
-          onClick: () => setIsRestoreModalOpen(true),
-        }
-      : {
-          title: 'Archive model',
-          onClick: () => setIsArchiveModalOpen(true),
-        },
+    ...(isArchiveRow
+      ? [
+          {
+            title: 'Restore model',
+            onClick: () => setIsRestoreModalOpen(true),
+          },
+        ]
+      : [
+          { isSeparator: true },
+          {
+            title: 'Archive model',
+            onClick: () => setIsArchiveModalOpen(true),
+            isAriaDisabled: hasDeploys,
+            tooltipProps: hasDeploys
+              ? { content: 'Models with deployed versions cannot be archived.' }
+              : undefined,
+          },
+        ]),
   ];
 
   return (
@@ -95,38 +106,40 @@ const RegisteredModelTableRow: React.FC<RegisteredModelTableRowProps> = ({
       </Td>
       <Td isActionCell>
         <ActionsColumn items={actions} />
-        <ArchiveRegisteredModelModal
-          onCancel={() => setIsArchiveModalOpen(false)}
-          onSubmit={() =>
-            apiState.api
-              .patchRegisteredModel(
-                {},
-                {
-                  state: ModelState.ARCHIVED,
-                },
-                rm.id,
-              )
-              .then(refresh)
-          }
-          isOpen={isArchiveModalOpen}
-          registeredModelName={rm.name}
-        />
-        <RestoreRegisteredModelModal
-          onCancel={() => setIsRestoreModalOpen(false)}
-          onSubmit={() =>
-            apiState.api
-              .patchRegisteredModel(
-                {},
-                {
-                  state: ModelState.LIVE,
-                },
-                rm.id,
-              )
-              .then(() => navigate(registeredModelUrl(rm.id, preferredModelRegistry?.name)))
-          }
-          isOpen={isRestoreModalOpen}
-          registeredModelName={rm.name}
-        />
+        {isArchiveModalOpen ? (
+          <ArchiveRegisteredModelModal
+            onCancel={() => setIsArchiveModalOpen(false)}
+            onSubmit={() =>
+              apiState.api
+                .patchRegisteredModel(
+                  {},
+                  {
+                    state: ModelState.ARCHIVED,
+                  },
+                  rm.id,
+                )
+                .then(refresh)
+            }
+            registeredModelName={rm.name}
+          />
+        ) : null}
+        {isRestoreModalOpen ? (
+          <RestoreRegisteredModelModal
+            onCancel={() => setIsRestoreModalOpen(false)}
+            onSubmit={() =>
+              apiState.api
+                .patchRegisteredModel(
+                  {},
+                  {
+                    state: ModelState.LIVE,
+                  },
+                  rm.id,
+                )
+                .then(() => navigate(registeredModelUrl(rm.id, preferredModelRegistry?.name)))
+            }
+            registeredModelName={rm.name}
+          />
+        ) : null}
       </Td>
     </Tr>
   );
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts
index 7ca6bce8e..af228730b 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts
@@ -28,9 +28,9 @@ export const rmColumns: SortableData<RegisteredModel>[] = [
     label: 'Owner',
     sortable: true,
     info: {
-      tooltip: 'The owner is the user who registered the model.',
-      tooltipProps: {
-        isContentLeftAligned: true,
+      popover: 'The owner is the user who registered the model.',
+      popoverProps: {
+        position: 'left',
       },
     },
   },
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx
index 3209d51e2..66b3a4677 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableToolbar.tsx
@@ -22,10 +22,12 @@ import {
 
 type RegisteredModelsTableToolbarProps = {
   toggleGroupItems?: React.ReactNode;
+  onClearAllFilters?: () => void;
 };
 
 const RegisteredModelsTableToolbar: React.FC<RegisteredModelsTableToolbarProps> = ({
   toggleGroupItems: tableToggleGroupItems,
+  onClearAllFilters,
 }) => {
   const navigate = useNavigate();
   const { preferredModelRegistry } = React.useContext(ModelRegistrySelectorContext);
@@ -35,7 +37,7 @@ const RegisteredModelsTableToolbar: React.FC<RegisteredModelsTableToolbarProps>
   const tooltipRef = React.useRef<HTMLButtonElement>(null);
 
   return (
-    <Toolbar data-testid="registered-models-table-toolbar">
+    <Toolbar data-testid="registered-models-table-toolbar" clearAllFilters={onClearAllFilters}>
       <ToolbarContent>
         <ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
           {tableToggleGroupItems}
@@ -45,7 +47,7 @@ const RegisteredModelsTableToolbar: React.FC<RegisteredModelsTableToolbarProps>
             isOpen={isRegisterNewVersionOpen}
             onSelect={() => setIsRegisterNewVersionOpen(false)}
             onOpenChange={(isOpen) => setIsRegisterNewVersionOpen(isOpen)}
-            toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
+            toggle={(toggleRef) => (
               <MenuToggle
                 isFullWidth
                 variant="primary"
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
index 521e0a980..385246745 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelArchiveDetails.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router';
-import { Button, Flex, FlexItem, Label, Content, Truncate } from '@patternfly/react-core';
+import { Button, Flex, FlexItem, Label, Truncate } from '@patternfly/react-core';
 import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
 import { ModelRegistryContext } from '~/app/context/ModelRegistryContext';
@@ -52,13 +52,9 @@ const RegisteredModelsArchiveDetails: React.FC<RegisteredModelsArchiveDetailsPro
         }
         title={
           rm && (
-            <Flex>
-              <FlexItem>
-                <Content>{rm.name}</Content>
-              </FlexItem>
-              <FlexItem>
-                <Label>Archived</Label>
-              </FlexItem>
+            <Flex alignItems={{ default: 'alignItemsCenter' }}>
+              <FlexItem>{rm.name}</FlexItem>
+              <Label>Archived</Label>
             </Flex>
           )
         }
@@ -84,7 +80,7 @@ const RegisteredModelsArchiveDetails: React.FC<RegisteredModelsArchiveDetailsPro
         )}
       </ApplicationsPage>
 
-      {rm !== null && (
+      {rm !== null && isRestoreModalOpen ? (
         <RestoreRegisteredModelModal
           onCancel={() => setIsRestoreModalOpen(false)}
           onSubmit={() =>
@@ -98,10 +94,9 @@ const RegisteredModelsArchiveDetails: React.FC<RegisteredModelsArchiveDetailsPro
               )
               .then(() => navigate(registeredModelUrl(rm.id, preferredModelRegistry?.name)))
           }
-          isOpen={isRestoreModalOpen}
           registeredModelName={rm.name}
         />
-      )}
+      ) : null}
     </>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx
index 0311e5cbb..566e6b7e0 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchive.tsx
@@ -3,8 +3,9 @@ import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
 import ApplicationsPage from '~/shared/components/ApplicationsPage';
 import { ModelRegistrySelectorContext } from '~/app/context/ModelRegistrySelectorContext';
-import { filterArchiveModels } from '~/app/pages/modelRegistry/screens/utils';
+import { filterArchiveModels } from '~/app/utils';
 import useRegisteredModels from '~/app/hooks/useRegisteredModels';
+import useModelVersions from '~/app/hooks/useModelVersions';
 import RegisteredModelsArchiveListView from './RegisteredModelsArchiveListView';
 
 type RegisteredModelsArchiveProps = Omit<
@@ -14,7 +15,16 @@ type RegisteredModelsArchiveProps = Omit<
 
 const RegisteredModelsArchive: React.FC<RegisteredModelsArchiveProps> = ({ ...pageProps }) => {
   const { preferredModelRegistry } = React.useContext(ModelRegistrySelectorContext);
-  const [registeredModels, loaded, loadError, refresh] = useRegisteredModels();
+  const [registeredModels, modelsLoaded, modelsLoadError, refreshModels] = useRegisteredModels();
+  const [modelVersions, versionsLoaded, versionsLoadError, refreshVersions] = useModelVersions();
+
+  const loaded = modelsLoaded && versionsLoaded;
+  const loadError = modelsLoadError || versionsLoadError;
+
+  const refresh = React.useCallback(() => {
+    refreshModels();
+    refreshVersions();
+  }, [refreshModels, refreshVersions]);
 
   return (
     <ApplicationsPage
@@ -31,13 +41,14 @@ const RegisteredModelsArchive: React.FC<RegisteredModelsArchiveProps> = ({ ...pa
           </BreadcrumbItem>
         </Breadcrumb>
       }
-      title={`Archived models of ${preferredModelRegistry?.name}`}
+      title={`Archived models of ${preferredModelRegistry?.name ?? ''}`}
       loadError={loadError}
       loaded={loaded}
       provideChildrenPadding
     >
       <RegisteredModelsArchiveListView
         registeredModels={filterArchiveModels(registeredModels.items)}
+        modelVersions={modelVersions.items}
         refresh={refresh}
       />
     </ApplicationsPage>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx
index 74eeb07d7..a49aa4aa5 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveListView.tsx
@@ -8,33 +8,35 @@ import {
   ToolbarItem,
   ToolbarToggleGroup,
 } from '@patternfly/react-core';
-import { FilterIcon } from '@patternfly/react-icons';
-import { RegisteredModel } from '~/app/types';
+import { FilterIcon, SearchIcon } from '@patternfly/react-icons';
+import { ModelVersion, RegisteredModel } from '~/app/types';
 import { SearchType } from '~/shared/components/DashboardSearchField';
 import { filterRegisteredModels } from '~/app/pages/modelRegistry/screens/utils';
 import EmptyModelRegistryState from '~/app/pages/modelRegistry/screens/components/EmptyModelRegistryState';
 import SimpleSelect from '~/shared/components/SimpleSelect';
-import { asEnumMember } from '~/app/utils';
+import { asEnumMember } from '~/shared/utilities/utils';
 import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { isMUITheme } from '~/shared/utilities/const';
 import RegisteredModelsArchiveTable from './RegisteredModelsArchiveTable';
 
 type RegisteredModelsArchiveListViewProps = {
   registeredModels: RegisteredModel[];
+  modelVersions: ModelVersion[];
   refresh: () => void;
 };
 
 const RegisteredModelsArchiveListView: React.FC<RegisteredModelsArchiveListViewProps> = ({
   registeredModels: unfilteredRegisteredModels,
+  modelVersions,
   refresh,
 }) => {
   const [searchType, setSearchType] = React.useState<SearchType>(SearchType.KEYWORD);
   const [search, setSearch] = React.useState('');
 
-  const searchTypes = [SearchType.KEYWORD, SearchType.AUTHOR];
-
+  const searchTypes = [SearchType.KEYWORD, SearchType.OWNER];
   const filteredRegisteredModels = filterRegisteredModels(
     unfilteredRegisteredModels,
+    modelVersions,
     search,
     searchType,
   );
@@ -42,6 +44,7 @@ const RegisteredModelsArchiveListView: React.FC<RegisteredModelsArchiveListViewP
   if (unfilteredRegisteredModels.length === 0) {
     return (
       <EmptyModelRegistryState
+        headerIcon={SearchIcon}
         testid="empty-archive-model-state"
         title="No archived models"
         description="You can archive the active models that you no longer use. You can restore an archived
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx
index 74f4ed4aa..dbf9c56e6 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisteredModelsArchive/RegisteredModelsArchiveTable.tsx
@@ -23,7 +23,8 @@ const RegisteredModelsArchiveTable: React.FC<RegisteredModelsArchiveTableProps>
     columns={rmColumns}
     toolbarContent={toolbarContent}
     defaultSortColumn={2}
-    enablePagination="compact"
+    onClearFilters={clearFilters}
+    enablePagination
     emptyTableView={<DashboardEmptyTableView onClearFilters={clearFilters} />}
     rowRenderer={(rm) => (
       <RegisteredModelTableRow key={rm.name} registeredModel={rm} isArchiveRow refresh={refresh} />
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts
index 77c5726eb..7760389e7 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/__tests__/utils.spec.ts
@@ -297,28 +297,39 @@ describe('filterModelVersions', () => {
 
 describe('filterRegisteredModels', () => {
   const registeredModels: RegisteredModel[] = [
-    mockRegisteredModel({ name: 'Test 1', state: ModelState.ARCHIVED }),
+    mockRegisteredModel({ name: 'Test 1', state: ModelState.ARCHIVED, owner: 'Alice' }),
     mockRegisteredModel({
       name: 'Test 2',
       description: 'Description2',
+      owner: 'Bob',
     }),
-    mockRegisteredModel({ name: 'Test 3', state: ModelState.ARCHIVED }),
-    mockRegisteredModel({ name: 'Test 4', state: ModelState.ARCHIVED }),
-    mockRegisteredModel({ name: 'Test 5' }),
+    mockRegisteredModel({ name: 'Test 3', state: ModelState.ARCHIVED, owner: 'Charlie' }),
+    mockRegisteredModel({ name: 'Test 4', state: ModelState.ARCHIVED, owner: 'Alice' }),
+    mockRegisteredModel({ name: 'Test 5', owner: 'Bob' }),
   ];
 
   test('filters by name', () => {
-    const filtered = filterRegisteredModels(registeredModels, 'Test 1', SearchType.KEYWORD);
+    const filtered = filterRegisteredModels(registeredModels, [], 'Test 1', SearchType.KEYWORD);
     expect(filtered).toEqual([registeredModels[0]]);
   });
 
   test('filters by description', () => {
-    const filtered = filterRegisteredModels(registeredModels, 'Description2', SearchType.KEYWORD);
+    const filtered = filterRegisteredModels(
+      registeredModels,
+      [],
+      'Description2',
+      SearchType.KEYWORD,
+    );
     expect(filtered).toEqual([registeredModels[1]]);
   });
 
+  test('filters by owner', () => {
+    const filtered = filterRegisteredModels(registeredModels, [], 'Alice', SearchType.OWNER);
+    expect(filtered).toEqual([registeredModels[0], registeredModels[3]]);
+  });
+
   test('does not filter when search is empty', () => {
-    const filtered = filterRegisteredModels(registeredModels, '', SearchType.KEYWORD);
+    const filtered = filterRegisteredModels(registeredModels, [], '', SearchType.KEYWORD);
     expect(filtered).toEqual(registeredModels);
   });
 });
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
index f4e018cb6..8fae89be0 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveModelVersionModal.tsx
@@ -1,34 +1,25 @@
 import * as React from 'react';
-import {
-  Alert,
-  Form,
-  FormGroup,
-  Modal,
-  ModalBody,
-  ModalHeader,
-  TextInput,
-} from '@patternfly/react-core';
+import { Flex, FlexItem, Stack, StackItem, TextInput } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface ArchiveModelVersionModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   modelVersionName: string;
 }
 
 export const ArchiveModelVersionModal: React.FC<ArchiveModelVersionModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   modelVersionName,
 }) => {
+  const notification = useNotification();
   const [isSubmitting, setIsSubmitting] = React.useState(false);
   const [error, setError] = React.useState<Error>();
   const [confirmInputValue, setConfirmInputValue] = React.useState('');
   const isDisabled = confirmInputValue.trim() !== modelVersionName || isSubmitting;
-  const notification = useNotification();
 
   const onClose = React.useCallback(() => {
     setConfirmInputValue('');
@@ -49,34 +40,37 @@ export const ArchiveModelVersionModal: React.FC<ArchiveModelVersionModalProps> =
     } finally {
       setIsSubmitting(false);
     }
-  }, [notification, modelVersionName, onSubmit, onClose]);
-
-  const description = (
-    <>
-      <b>{modelVersionName}</b> will be archived and unavailable for use unless it is restored.
-      <br />
-      <br />
-      Type <strong>{modelVersionName}</strong> to confirm archiving:
-    </>
-  );
+  }, [onSubmit, onClose, notification, modelVersionName]);
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
+      title="Archive model version?"
+      titleIconVariant="warning"
       variant="small"
       onClose={onClose}
+      footer={
+        <DashboardModalFooter
+          onCancel={onClose}
+          onSubmit={onConfirm}
+          submitLabel="Archive"
+          isSubmitLoading={isSubmitting}
+          isSubmitDisabled={isDisabled}
+          error={error}
+          alertTitle="Error"
+        />
+      }
       data-testid="archive-model-version-modal"
     >
-      <ModalHeader title="Archive version?" titleIconVariant="warning" />
-      <ModalBody>
-        <Form>
-          {error && (
-            <Alert data-testid="error-message-alert" isInline variant="danger" title="Error">
-              {error.message}
-            </Alert>
-          )}
-          <FormGroup>
-            {description}
+      <Stack hasGutter>
+        <StackItem>
+          <b>{modelVersionName}</b> will be archived and unavailable for use unless it is restored.
+        </StackItem>
+        <StackItem>
+          <Flex direction={{ default: 'column' }} spaceItems={{ default: 'spaceItemsSm' }}>
+            <FlexItem>
+              Type <strong>{modelVersionName}</strong> to confirm archiving:
+            </FlexItem>
             <TextInput
               id="confirm-archive-input"
               data-testid="confirm-archive-input"
@@ -89,16 +83,9 @@ export const ArchiveModelVersionModal: React.FC<ArchiveModelVersionModalProps> =
                 }
               }}
             />
-          </FormGroup>
-        </Form>
-      </ModalBody>
-      <DashboardModalFooter
-        onCancel={onClose}
-        onSubmit={onConfirm}
-        submitLabel="Archive"
-        isSubmitLoading={isSubmitting}
-        isSubmitDisabled={isDisabled}
-      />
+          </Flex>
+        </StackItem>
+      </Stack>
     </Modal>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
index e5de53054..2a6738ed8 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal.tsx
@@ -1,27 +1,18 @@
 import * as React from 'react';
-import {
-  Alert,
-  Form,
-  FormGroup,
-  Modal,
-  ModalBody,
-  ModalHeader,
-  TextInput,
-} from '@patternfly/react-core';
+import { Flex, FlexItem, Stack, StackItem, TextInput } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface ArchiveRegisteredModelModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   registeredModelName: string;
 }
 
 export const ArchiveRegisteredModelModal: React.FC<ArchiveRegisteredModelModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   registeredModelName,
 }) => {
   const notification = useNotification();
@@ -49,36 +40,38 @@ export const ArchiveRegisteredModelModal: React.FC<ArchiveRegisteredModelModalPr
     } finally {
       setIsSubmitting(false);
     }
-  }, [notification, registeredModelName, onSubmit, onClose]);
-
-  const description = (
-    <>
-      <b>{registeredModelName}</b> and all of its versions will be archived and unavailable for use
-      unless it is restored.
-      <br />
-      <br />
-      Type <strong>{registeredModelName}</strong> to confirm archiving:
-    </>
-  );
+  }, [onSubmit, onClose, notification, registeredModelName]);
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       title="Archive model?"
+      titleIconVariant="warning"
       variant="small"
       onClose={onClose}
+      footer={
+        <DashboardModalFooter
+          onCancel={onClose}
+          onSubmit={onConfirm}
+          submitLabel="Archive"
+          isSubmitLoading={isSubmitting}
+          isSubmitDisabled={isDisabled}
+          error={error}
+          alertTitle="Error"
+        />
+      }
       data-testid="archive-registered-model-modal"
     >
-      <ModalHeader title="Archive model?" titleIconVariant="warning" />
-      <ModalBody>
-        <Form>
-          {error && (
-            <Alert data-testid="error-message-alert" isInline variant="danger" title="Error">
-              {error.message}
-            </Alert>
-          )}
-          <FormGroup>
-            {description}
+      <Stack hasGutter>
+        <StackItem>
+          <b>{registeredModelName}</b> and all of its versions will be archived and unavailable for
+          use unless it is restored.
+        </StackItem>
+        <StackItem>
+          <Flex direction={{ default: 'column' }} spaceItems={{ default: 'spaceItemsSm' }}>
+            <FlexItem>
+              Type <strong>{registeredModelName}</strong> to confirm archiving:
+            </FlexItem>
             <TextInput
               id="confirm-archive-input"
               data-testid="confirm-archive-input"
@@ -91,16 +84,9 @@ export const ArchiveRegisteredModelModal: React.FC<ArchiveRegisteredModelModalPr
                 }
               }}
             />
-          </FormGroup>
-        </Form>
-      </ModalBody>
-      <DashboardModalFooter
-        onCancel={onClose}
-        onSubmit={onConfirm}
-        submitLabel="Archive"
-        isSubmitLoading={isSubmitting}
-        isSubmitDisabled={isDisabled}
-      />
+          </Flex>
+        </StackItem>
+      </Stack>
     </Modal>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx
index 10983cc11..081ba5d30 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelLabels.tsx
@@ -65,11 +65,11 @@ const ModelLabels: React.FC<ModelLabelsProps> = ({ name, customProperties }) =>
     </Label>
   );
 
-  const labelModal = (
+  const labelModal = isLabelModalOpen ? (
     <Modal
       variant={ModalVariant.small}
       title="Labels"
-      isOpen={isLabelModalOpen}
+      isOpen
       onClose={() => setIsLabelModalOpen(false)}
       description={
         <Content component="p">
@@ -100,7 +100,7 @@ const ModelLabels: React.FC<ModelLabelsProps> = ({ name, customProperties }) =>
         {labelsComponent(filteredLabels, '50ch')}
       </LabelGroup>
     </Modal>
-  );
+  ) : null;
 
   if (Object.keys(customProperties).length === 0) {
     return '-';
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
index e7dc7a341..f1f382564 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreModelVersionModal.tsx
@@ -1,24 +1,22 @@
 import * as React from 'react';
-import { Form, Modal, ModalHeader, ModalBody, Alert } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface RestoreModelVersionModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   modelVersionName: string;
 }
 
 export const RestoreModelVersionModal: React.FC<RestoreModelVersionModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   modelVersionName,
 }) => {
+  const notification = useNotification();
   const [isSubmitting, setIsSubmitting] = React.useState(false);
   const [error, setError] = React.useState<Error>();
-  const notification = useNotification();
 
   const onClose = React.useCallback(() => {
     onCancel();
@@ -38,40 +36,28 @@ export const RestoreModelVersionModal: React.FC<RestoreModelVersionModalProps> =
     } finally {
       setIsSubmitting(false);
     }
-  }, [notification, modelVersionName, onSubmit, onClose]);
-
-  const description = (
-    <>
-      <b>{modelVersionName}</b> will be restored and returned to the versions list.
-    </>
-  );
+  }, [onSubmit, onClose, notification, modelVersionName]);
 
   return (
     <Modal
-      isOpen={isOpen}
-      title="Restore version?"
+      isOpen
+      title="Restore model version?"
       variant="small"
       onClose={onClose}
+      footer={
+        <DashboardModalFooter
+          onCancel={onClose}
+          onSubmit={onConfirm}
+          submitLabel="Restore"
+          isSubmitLoading={isSubmitting}
+          error={error}
+          alertTitle="Error"
+          isSubmitDisabled={isSubmitting}
+        />
+      }
       data-testid="restore-model-version-modal"
     >
-      <ModalHeader title="Restore version?" />
-      <ModalBody>
-        <Form>
-          {error && (
-            <Alert data-testid="error-message-alert" isInline variant="danger" title="Error">
-              {error.message}
-            </Alert>
-          )}
-        </Form>
-        {description}
-      </ModalBody>
-      <DashboardModalFooter
-        onCancel={onClose}
-        onSubmit={onConfirm}
-        submitLabel="Restore"
-        isSubmitLoading={isSubmitting}
-        isSubmitDisabled={isSubmitting}
-      />
+      <b>{modelVersionName}</b> will be restored and returned to the versions list.
     </Modal>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
index e1348b4ee..8eb3e23a1 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/RestoreRegisteredModel.tsx
@@ -1,19 +1,17 @@
 import * as React from 'react';
-import { Alert, Form, ModalHeader, Modal, ModalBody } from '@patternfly/react-core';
+import { Modal } from '@patternfly/react-core/deprecated';
 import DashboardModalFooter from '~/shared/components/DashboardModalFooter';
 import { useNotification } from '~/app/hooks/useNotification';
 
 interface RestoreRegisteredModelModalProps {
   onCancel: () => void;
   onSubmit: () => void;
-  isOpen: boolean;
   registeredModelName: string;
 }
 
 export const RestoreRegisteredModelModal: React.FC<RestoreRegisteredModelModalProps> = ({
   onCancel,
   onSubmit,
-  isOpen,
   registeredModelName,
 }) => {
   const notification = useNotification();
@@ -38,40 +36,29 @@ export const RestoreRegisteredModelModal: React.FC<RestoreRegisteredModelModalPr
     } finally {
       setIsSubmitting(false);
     }
-  }, [notification, registeredModelName, onSubmit, onClose]);
-
-  const description = (
-    <>
-      <b>{registeredModelName}</b> and all of its versions will be restored and returned to the
-      registered models list.
-    </>
-  );
+  }, [onSubmit, onClose, notification, registeredModelName]);
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
+      title="Restore model?"
       variant="small"
       onClose={onClose}
+      footer={
+        <DashboardModalFooter
+          onCancel={onClose}
+          onSubmit={onConfirm}
+          submitLabel="Restore"
+          isSubmitLoading={isSubmitting}
+          error={error}
+          alertTitle="Error"
+          isSubmitDisabled={isSubmitting}
+        />
+      }
       data-testid="restore-registered-model-modal"
     >
-      <ModalHeader title="Restore model?" />
-      <ModalBody>
-        <Form>
-          {error && (
-            <Alert data-testid="error-message-alert" isInline variant="danger" title="Error">
-              {error.message}
-            </Alert>
-          )}
-        </Form>
-        {description}
-      </ModalBody>
-      <DashboardModalFooter
-        onCancel={onClose}
-        onSubmit={onConfirm}
-        submitLabel="Restore"
-        isSubmitLoading={isSubmitting}
-        isSubmitDisabled={isSubmitting}
-      />
+      <b>{registeredModelName}</b> and all of its versions will be restored and returned to the
+      registered models list.
     </Modal>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/routeUtils.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/routeUtils.ts
index 30d531ec5..0a6d34862 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/routeUtils.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/routeUtils.ts
@@ -1,23 +1,28 @@
-export const modelRegistryUrl = (preferredModelRegistry?: string): string =>
+export const modelRegistryUrl = (preferredModelRegistry = ''): string =>
   `/model-registry/${preferredModelRegistry}`;
 
 export const registeredModelsUrl = (preferredModelRegistry?: string): string =>
   `${modelRegistryUrl(preferredModelRegistry)}/registeredModels`;
 
-export const registeredModelUrl = (rmId?: string, preferredModelRegistry?: string): string =>
+export const registeredModelUrl = (rmId = '', preferredModelRegistry?: string): string =>
   `${registeredModelsUrl(preferredModelRegistry)}/${rmId}`;
 
 export const registeredModelArchiveUrl = (preferredModelRegistry?: string): string =>
   `${registeredModelsUrl(preferredModelRegistry)}/archive`;
 
 export const registeredModelArchiveDetailsUrl = (
-  rmId?: string,
+  rmId = '',
   preferredModelRegistry?: string,
 ): string => `${registeredModelArchiveUrl(preferredModelRegistry)}/${rmId}`;
 
 export const modelVersionListUrl = (rmId?: string, preferredModelRegistry?: string): string =>
   `${registeredModelUrl(rmId, preferredModelRegistry)}/versions`;
 
+export const archiveModelVersionListUrl = (
+  rmId?: string,
+  preferredModelRegistry?: string,
+): string => `${registeredModelArchiveDetailsUrl(rmId, preferredModelRegistry)}/versions`;
+
 export const modelVersionUrl = (
   mvId: string,
   rmId?: string,
@@ -27,6 +32,12 @@ export const modelVersionUrl = (
 export const modelVersionArchiveUrl = (rmId?: string, preferredModelRegistry?: string): string =>
   `${modelVersionListUrl(rmId, preferredModelRegistry)}/archive`;
 
+export const archiveModelVersionDetailsUrl = (
+  mvId: string,
+  rmId?: string,
+  preferredModelRegistry?: string,
+): string => `${archiveModelVersionListUrl(rmId, preferredModelRegistry)}/${mvId}`;
+
 export const modelVersionArchiveDetailsUrl = (
   mvId: string,
   rmId?: string,
@@ -44,13 +55,8 @@ export const registerVersionForModelUrl = (
   preferredModelRegistry?: string,
 ): string => `${registeredModelUrl(rmId, preferredModelRegistry)}/registerVersion`;
 
-export const archiveModelVersionListUrl = (
-  rmId?: string,
-  preferredModelRegistry?: string,
-): string => `${registeredModelArchiveDetailsUrl(rmId, preferredModelRegistry)}/versions`;
-
-export const archiveModelVersionDetailsUrl = (
+export const modelVersionDeploymentsUrl = (
   mvId: string,
   rmId?: string,
   preferredModelRegistry?: string,
-): string => `${archiveModelVersionListUrl(rmId, preferredModelRegistry)}/${mvId}`;
+): string => `${modelVersionUrl(mvId, rmId, preferredModelRegistry)}/deployments`;
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts b/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts
index 964cd1ea0..4696acaee 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/utils.ts
@@ -3,7 +3,6 @@ import {
   ModelRegistryCustomProperties,
   ModelRegistryMetadataType,
   ModelRegistryStringCustomProperties,
-  ModelState,
   ModelVersion,
   RegisteredModel,
 } from '~/app/types';
@@ -51,6 +50,12 @@ export const getProperties = <T extends ModelRegistryCustomProperties>(
 ): ModelRegistryStringCustomProperties => {
   const initial: ModelRegistryStringCustomProperties = {};
   return Object.keys(customProperties).reduce((acc, key) => {
+    // _lastModified is a property that is required to update the timestamp on the backend and we have a workaround for it. It should be resolved by
+    // backend team
+    if (key === '_lastModified') {
+      return acc;
+    }
+
     const prop = customProperties[key];
     if (prop.metadataType === ModelRegistryMetadataType.STRING && prop.string_value !== '') {
       return { ...acc, [key]: prop };
@@ -87,8 +92,10 @@ export const filterModelVersions = (
   unfilteredModelVersions: ModelVersion[],
   search: string,
   searchType: SearchType,
-): ModelVersion[] =>
-  unfilteredModelVersions.filter((mv: ModelVersion) => {
+): ModelVersion[] => {
+  const searchLower = search.toLowerCase();
+
+  return unfilteredModelVersions.filter((mv: ModelVersion) => {
     if (!search) {
       return true;
     }
@@ -96,21 +103,20 @@ export const filterModelVersions = (
     switch (searchType) {
       case SearchType.KEYWORD:
         return (
-          mv.name.toLowerCase().includes(search.toLowerCase()) ||
-          (mv.description && mv.description.toLowerCase().includes(search.toLowerCase()))
+          mv.name.toLowerCase().includes(searchLower) ||
+          (mv.description && mv.description.toLowerCase().includes(searchLower)) ||
+          getLabels(mv.customProperties).some((label) => label.toLowerCase().includes(searchLower))
         );
 
-      case SearchType.AUTHOR:
-        return (
-          mv.author &&
-          (mv.author.toLowerCase().includes(search.toLowerCase()) ||
-            (mv.author && mv.author.toLowerCase().includes(search.toLowerCase())))
-        );
+      case SearchType.AUTHOR: {
+        return mv.author && mv.author.toLowerCase().includes(searchLower);
+      }
 
       default:
         return true;
     }
   });
+};
 
 export const sortModelVersionsByCreateTime = (registeredModels: ModelVersion[]): ModelVersion[] =>
   registeredModels.toSorted((a, b) => {
@@ -121,82 +127,46 @@ export const sortModelVersionsByCreateTime = (registeredModels: ModelVersion[]):
 
 export const filterRegisteredModels = (
   unfilteredRegisteredModels: RegisteredModel[],
+  unfilteredModelVersions: ModelVersion[],
   search: string,
   searchType: SearchType,
-): RegisteredModel[] =>
-  unfilteredRegisteredModels.filter((rm: RegisteredModel) => {
+): RegisteredModel[] => {
+  const searchLower = search.toLowerCase();
+
+  return unfilteredRegisteredModels.filter((rm: RegisteredModel) => {
     if (!search) {
       return true;
     }
 
+    const modelVersions = unfilteredModelVersions.filter((mv) => mv.registeredModelId === rm.id);
+
     switch (searchType) {
-      case SearchType.KEYWORD:
-        return (
-          rm.name.toLowerCase().includes(search.toLowerCase()) ||
-          (rm.description && rm.description.toLowerCase().includes(search.toLowerCase()))
+      case SearchType.KEYWORD: {
+        const matchesModel =
+          rm.name.toLowerCase().includes(searchLower) ||
+          (rm.description && rm.description.toLowerCase().includes(searchLower)) ||
+          getLabels(rm.customProperties).some((label) => label.toLowerCase().includes(searchLower));
+
+        const matchesVersion = modelVersions.some(
+          (mv: ModelVersion) =>
+            mv.name.toLowerCase().includes(searchLower) ||
+            (mv.description && mv.description.toLowerCase().includes(searchLower)) ||
+            getLabels(mv.customProperties).some((label) =>
+              label.toLowerCase().includes(searchLower),
+            ),
         );
 
-      case SearchType.OWNER:
-        return rm.owner && rm.owner.toLowerCase().includes(search.toLowerCase());
+        return matchesModel || matchesVersion;
+      }
+      case SearchType.OWNER: {
+        return rm.owner && rm.owner.toLowerCase().includes(searchLower);
+      }
 
       default:
         return true;
     }
   });
-
-export const objectStorageFieldsToUri = (fields: ObjectStorageFields): string | null => {
-  const { endpoint, bucket, region, path } = fields;
-  if (!endpoint || !bucket || !path) {
-    return null;
-  }
-  const searchParams = new URLSearchParams();
-  searchParams.set('endpoint', endpoint);
-  if (region) {
-    searchParams.set('defaultRegion', region);
-  }
-  return `s3://${bucket}/${path}?${searchParams.toString()}`;
 };
 
-export const getLastCreatedItem = <T extends { createTimeSinceEpoch?: string }>(
-  items?: T[],
-): T | undefined =>
-  items?.toSorted(
-    ({ createTimeSinceEpoch: createTimeA }, { createTimeSinceEpoch: createTimeB }) => {
-      if (!createTimeA || !createTimeB) {
-        return 0;
-      }
-      return Number(createTimeB) - Number(createTimeA);
-    },
-  )[0];
-
-export const filterArchiveVersions = (modelVersions: ModelVersion[]): ModelVersion[] =>
-  modelVersions.filter((mv) => mv.state === ModelState.ARCHIVED);
-
-export const filterLiveVersions = (modelVersions: ModelVersion[]): ModelVersion[] =>
-  modelVersions.filter((mv) => mv.state === ModelState.LIVE);
-
-export const filterArchiveModels = (registeredModels: RegisteredModel[]): RegisteredModel[] =>
-  registeredModels.filter((rm) => rm.state === ModelState.ARCHIVED);
-
-export const filterLiveModels = (registeredModels: RegisteredModel[]): RegisteredModel[] =>
-  registeredModels.filter((rm) => rm.state === ModelState.LIVE);
-
-export const uriToObjectStorageFields = (uri: string): ObjectStorageFields | null => {
-  try {
-    const urlObj = new URL(uri);
-    // Some environments include the first token after the protocol (our bucket) in the pathname and some have it as the hostname
-    const [bucket, ...pathSplit] = `${urlObj.hostname}/${urlObj.pathname}`
-      .split('/')
-      .filter(Boolean);
-    const path = pathSplit.join('/');
-    const searchParams = new URLSearchParams(urlObj.search);
-    const endpoint = searchParams.get('endpoint');
-    const region = searchParams.get('defaultRegion');
-    if (endpoint && bucket && path) {
-      return { endpoint, bucket, region: region || undefined, path };
-    }
-    return null;
-  } catch {
-    return null;
-  }
-};
+// export const getServerAddress = (resource: ServiceKind): string =>
+//   resource.metadata.annotations?.['routing.opendatahub.io/external-address-rest'] || '';
diff --git a/clients/ui/frontend/src/app/pages/notFound/NotFound.tsx b/clients/ui/frontend/src/app/pages/notFound/NotFound.tsx
deleted file mode 100644
index 794b06422..000000000
--- a/clients/ui/frontend/src/app/pages/notFound/NotFound.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from 'react';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
-import {
-  Button,
-  EmptyState,
-  EmptyStateBody,
-  EmptyStateFooter,
-  PageSection,
-} from '@patternfly/react-core';
-import { useNavigate } from 'react-router-dom';
-
-const NotFound: React.FunctionComponent = () => {
-  function GoHomeBtn() {
-    const navigate = useNavigate();
-
-    function handleClick() {
-      navigate('/');
-    }
-
-    return <Button onClick={handleClick}>Take me home</Button>;
-  }
-
-  return (
-    <PageSection>
-      <EmptyState titleText="404 Page not found" variant="full" icon={ExclamationTriangleIcon}>
-        <EmptyStateBody>
-          We didn&apos;t find a page that matches the address you navigated to.
-        </EmptyStateBody>
-        <EmptyStateFooter>
-          <GoHomeBtn />
-        </EmptyStateFooter>
-      </EmptyState>
-    </PageSection>
-  );
-};
-
-export { NotFound };
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx
index e05cacd6a..e9096cb3c 100644
--- a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTable.tsx
@@ -9,12 +9,21 @@ type ModelRegistriesTableProps = {
 };
 
 const ModelRegistriesTable: React.FC<ModelRegistriesTableProps> = ({ modelRegistries }) => (
-  // TODO: [Model Registry RBAC] Add toolbar once we manage permissions
+  // TODO: [Midstream] Complete once we have permissions
   <Table
     data-testid="model-registries-table"
     data={modelRegistries}
     columns={modelRegistryColumns}
-    rowRenderer={(mr) => <ModelRegistriesTableRow key={mr.name} modelRegistry={mr} />}
+    rowRenderer={(mr) => (
+      <ModelRegistriesTableRow
+        key={mr.name}
+        modelRegistry={mr}
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        onDeleteRegistry={() => {}}
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        onEditRegistry={() => {}}
+      />
+    )}
     variant="compact"
   />
 );
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx
index 6289a6c61..f1bc0b10d 100644
--- a/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistriesTableRow.tsx
@@ -1,22 +1,92 @@
 import React from 'react';
-import { Td, Tr } from '@patternfly/react-table';
+import { ActionsColumn, Td, Tr } from '@patternfly/react-table';
+import { Button, Tooltip } from '@patternfly/react-core';
+import { useNavigate } from 'react-router';
 import { ModelRegistry } from '~/app/types';
+import ResourceNameTooltip from '~/shared/components/ResourceNameTooltip';
+import { convertToK8sResourceCommon } from '~/app/utils';
+import { isPlatformDefault } from '~/shared/utilities/const';
+import { ModelRegistryTableRowStatus } from './ModelRegistryTableRowStatus';
 
 type ModelRegistriesTableRowProps = {
   modelRegistry: ModelRegistry;
+  // roleBindings: ContextResourceData<RoleBindingKind>; // TODO: [Midstream] Filter role bindings for this model registry
+  onEditRegistry: (obj: ModelRegistry) => void;
+  onDeleteRegistry: (obj: ModelRegistry) => void;
 };
 
-const ModelRegistriesTableRow: React.FC<ModelRegistriesTableRowProps> = ({ modelRegistry: mr }) => (
-  <>
+const ModelRegistriesTableRow: React.FC<ModelRegistriesTableRowProps> = ({
+  modelRegistry: mr,
+  // roleBindings, // TODO: [Midstream] Filter role bindings for this model registry
+  onEditRegistry,
+  onDeleteRegistry,
+}) => {
+  const navigate = useNavigate();
+  const filteredRoleBindings = []; // TODO: [Midstream] Filter role bindings for this model registry
+
+  return (
     <Tr>
       <Td dataLabel="Model registry name">
-        <strong>{mr.displayName || mr.name}</strong>
+        <ResourceNameTooltip resource={convertToK8sResourceCommon(mr)}>
+          <strong>{mr.displayName || mr.name}</strong>
+        </ResourceNameTooltip>
         {mr.description && <p>{mr.description}</p>}
       </Td>
+      <Td dataLabel="Status">
+        <ModelRegistryTableRowStatus
+          conditions={[
+            {
+              type: 'Available',
+              status: 'True',
+              reason: 'Ready',
+              message: 'Model registry is ready.',
+            },
+          ]}
+        />
+      </Td>
+      {isPlatformDefault() && (
+        <Td modifier="fitContent">
+          {filteredRoleBindings.length === 0 ? (
+            <Tooltip content="You can manage permissions when the model registry becomes available.">
+              <Button isAriaDisabled variant="link">
+                Manage permissions
+              </Button>
+            </Tooltip>
+          ) : (
+            <Button
+              variant="link"
+              onClick={() => navigate(`/model-registry-settings/permissions/${mr.name}`)}
+            >
+              Manage permissions
+            </Button>
+          )}
+        </Td>
+      )}
+      {isPlatformDefault() && (
+        <Td isActionCell>
+          <ActionsColumn
+            disabled={!isPlatformDefault()}
+            items={[
+              {
+                title: 'Edit model registry',
+                disabled: !isPlatformDefault(),
+                onClick: () => {
+                  onEditRegistry(mr);
+                },
+              },
+              {
+                title: 'Delete model registry',
+                disabled: !isPlatformDefault(),
+                onClick: () => {
+                  onDeleteRegistry(mr);
+                },
+              },
+            ]}
+          />
+        </Td>
+      )}
     </Tr>
-  </>
-);
-
-// TODO: [Model Registry RBAC] Get rest of columns once we manage permissions
+  );
+};
 
 export default ModelRegistriesTableRow;
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx
index 6e320bb2a..95068a0bb 100644
--- a/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistrySettings.tsx
@@ -10,18 +10,20 @@ import ModelRegistriesTable from './ModelRegistriesTable';
 
 const ModelRegistrySettings: React.FC = () => {
   const queryParams = useQueryParamNamespaces();
+  const [modelRegistries, mrloaded, loadError] = useModelRegistries(queryParams);
+  // TODO: [Midstream] Implement this when adding logic for rules review
+  const loaded = mrloaded; //&& roleBindings.loaded;
 
-  const [modelRegistries, loaded, loadError] = useModelRegistries(queryParams);
   return (
     <>
       <ApplicationsPage
         title={
           <TitleWithIcon
             title="Model Registry Settings"
-            objectType={ProjectObjectType.registeredModels}
+            objectType={ProjectObjectType.modelRegistrySettings}
           />
         }
-        description="List all the model registries deployed in your environment."
+        description="Manage model registry settings for all users in your organization."
         loaded={loaded}
         loadError={loadError}
         errorMessage="Unable to load model registries."
@@ -34,7 +36,9 @@ const ModelRegistrySettings: React.FC = () => {
             variant={EmptyStateVariant.lg}
             data-testid="mr-settings-empty-state"
           >
-            <EmptyStateBody>To get started, create a model registry.</EmptyStateBody>
+            <EmptyStateBody>
+              To get started, create a model registry. You can manage permissions after creation.
+            </EmptyStateBody>
           </EmptyState>
         }
         provideChildrenPadding
diff --git a/clients/ui/frontend/src/app/pages/settings/ModelRegistryTableRowStatus.tsx b/clients/ui/frontend/src/app/pages/settings/ModelRegistryTableRowStatus.tsx
new file mode 100644
index 000000000..e6468ae88
--- /dev/null
+++ b/clients/ui/frontend/src/app/pages/settings/ModelRegistryTableRowStatus.tsx
@@ -0,0 +1,164 @@
+import React from 'react';
+
+import { Label, Popover, Stack, StackItem } from '@patternfly/react-core';
+import {
+  CheckCircleIcon,
+  ExclamationCircleIcon,
+  ExclamationTriangleIcon,
+  InProgressIcon,
+} from '@patternfly/react-icons';
+
+import { K8sCondition } from '~/shared/k8sTypes';
+
+enum ModelRegistryStatus {
+  Progressing = 'Progressing',
+  Degraded = 'Degraded',
+  Available = 'Available',
+  IstioAvailable = 'IstioAvailable',
+  GatewayAvailable = 'GatewayAvailable',
+}
+
+enum ModelRegistryStatusLabel {
+  Progressing = 'Progressing',
+  Available = 'Available',
+  Degrading = 'Degrading',
+  Unavailable = 'Unavailable',
+}
+
+enum ConditionStatus {
+  True = 'True',
+  False = 'False',
+}
+interface ModelRegistryTableRowStatusProps {
+  conditions: K8sCondition[] | undefined;
+}
+
+export const ModelRegistryTableRowStatus: React.FC<ModelRegistryTableRowStatusProps> = ({
+  conditions,
+}) => {
+  const conditionsMap =
+    conditions?.reduce((acc: Record<string, K8sCondition | undefined>, condition) => {
+      acc[condition.type] = condition;
+      return acc;
+    }, {}) ?? {};
+  let statusLabel: string = ModelRegistryStatusLabel.Progressing;
+  let icon = <InProgressIcon />;
+  let status: React.ComponentProps<typeof Label>['status'];
+  let popoverMessages: string[] = [];
+  let popoverTitle = '';
+
+  if (Object.values(conditionsMap).length) {
+    const {
+      [ModelRegistryStatus.Available]: availableCondition,
+      [ModelRegistryStatus.Progressing]: progressCondition,
+      [ModelRegistryStatus.Degraded]: degradedCondition,
+    } = conditionsMap;
+
+    popoverMessages =
+      availableCondition?.status === ConditionStatus.False
+        ? Object.values(conditionsMap).reduce((messages: string[], condition) => {
+            if (condition?.status === ConditionStatus.False && condition.message) {
+              messages.push(condition.message);
+            }
+            return messages;
+          }, [])
+        : [];
+
+    // Unavailable
+    if (
+      availableCondition?.status === ConditionStatus.False &&
+      !popoverMessages.some((message) => message.includes('ContainerCreating'))
+    ) {
+      statusLabel = ModelRegistryStatusLabel.Unavailable;
+      icon = <ExclamationTriangleIcon />;
+      status = 'warning';
+    }
+    // Degrading
+    else if (degradedCondition?.status === ConditionStatus.True) {
+      statusLabel = ModelRegistryStatusLabel.Degrading;
+      icon = <InProgressIcon className="kubeflow-u-spin" />;
+      popoverTitle = 'Service is degrading';
+    }
+    // Available
+    else if (availableCondition?.status === ConditionStatus.True) {
+      statusLabel = ModelRegistryStatusLabel.Available;
+      icon = <CheckCircleIcon />;
+      status = 'success';
+    }
+    // Progressing
+    else if (progressCondition?.status === ConditionStatus.True) {
+      statusLabel = ModelRegistryStatusLabel.Progressing;
+      icon = <InProgressIcon className="kubeflow-u-spin" />;
+      status = 'info';
+    }
+  }
+  // Handle popover logic for Unavailable status
+  if (statusLabel === ModelRegistryStatusLabel.Unavailable) {
+    const {
+      [ModelRegistryStatus.IstioAvailable]: istioAvailableCondition,
+      [ModelRegistryStatus.GatewayAvailable]: gatewayAvailableCondition,
+    } = conditionsMap;
+
+    if (
+      istioAvailableCondition?.status === ConditionStatus.False &&
+      gatewayAvailableCondition?.status === ConditionStatus.False
+    ) {
+      popoverTitle = 'Istio resources and Istio Gateway resources are both unavailable';
+    } else if (istioAvailableCondition?.status === ConditionStatus.False) {
+      popoverTitle = 'Istio resources are unavailable';
+    } else if (gatewayAvailableCondition?.status === ConditionStatus.False) {
+      popoverTitle = 'Istio Gateway resources are unavailable';
+    } else if (
+      istioAvailableCondition?.status === ConditionStatus.True &&
+      gatewayAvailableCondition?.status === ConditionStatus.True
+    ) {
+      popoverTitle = 'Deployment is unavailable';
+    } else {
+      popoverTitle = 'Service is unavailable';
+    }
+  }
+
+  const isClickable = popoverTitle && popoverMessages.length;
+
+  const label = (
+    <Label
+      {...(isClickable
+        ? {
+            onClick: () => {
+              /* intentional no-op - Click event is handled by the Popover parent,
+              this prop enables clickable styles in the PatternFly Label */
+            },
+          }
+        : {})}
+      data-testid="model-registry-label"
+      icon={icon}
+      status={status}
+      isCompact
+    >
+      {statusLabel}
+    </Label>
+  );
+
+  return popoverTitle && popoverMessages.length ? (
+    <Popover
+      headerContent={popoverTitle}
+      {...(statusLabel === ModelRegistryStatusLabel.Degrading
+        ? {
+            alertSeverityVariant: 'warning',
+            headerIcon: <ExclamationTriangleIcon />,
+          }
+        : { alertSeverityVariant: 'danger', headerIcon: <ExclamationCircleIcon /> })}
+      bodyContent={
+        <Stack hasGutter>
+          {popoverMessages.map((message, index) => (
+            <StackItem key={`message-${index}`}>{message}</StackItem>
+          ))}
+        </Stack>
+      }
+    >
+      {label}
+    </Popover>
+  ) : (
+    label
+  );
+};
diff --git a/clients/ui/frontend/src/app/pages/settings/columns.ts b/clients/ui/frontend/src/app/pages/settings/columns.ts
index 36ae2ea29..57092e765 100644
--- a/clients/ui/frontend/src/app/pages/settings/columns.ts
+++ b/clients/ui/frontend/src/app/pages/settings/columns.ts
@@ -1,5 +1,6 @@
-import { SortableData } from '~/shared/components/table';
+import { kebabTableColumn, SortableData } from '~/shared/components/table';
 import { ModelRegistry } from '~/app/types';
+import { isPlatformDefault } from '~/shared/utilities/const';
 
 export const modelRegistryColumns: SortableData<ModelRegistry>[] = [
   {
@@ -8,16 +9,19 @@ export const modelRegistryColumns: SortableData<ModelRegistry>[] = [
     sortable: (a, b) => a.name.localeCompare(b.name),
     width: 30,
   },
-  // TODO: [Model Registry RBAC] Add once we manage permissions
-  // {
-  //   field: 'status',
-  //   label: 'Status',
-  //   sortable: false,
-  // },
-  // {
-  //   field: 'manage permissions',
-  //   label: '',
-  //   sortable: false,
-  // },
-  // kebabTableColumn(),
+  {
+    field: 'status',
+    label: 'Status',
+    sortable: false,
+  },
+  ...(isPlatformDefault()
+    ? [
+        {
+          field: 'manage permissions',
+          label: '',
+          sortable: false,
+        },
+        kebabTableColumn(),
+      ]
+    : []),
 ];
diff --git a/clients/ui/frontend/src/app/types.ts b/clients/ui/frontend/src/app/types.ts
index a2c1dafb0..0a2ee0da9 100644
--- a/clients/ui/frontend/src/app/types.ts
+++ b/clients/ui/frontend/src/app/types.ts
@@ -162,6 +162,8 @@ export type GetRegisteredModel = (
 
 export type GetModelVersion = (opts: APIOptions, modelversionId: string) => Promise<ModelVersion>;
 
+export type GetListModelVersions = (opts: APIOptions) => Promise<ModelVersionList>;
+
 export type GetListRegisteredModels = (opts: APIOptions) => Promise<RegisteredModelList>;
 
 export type GetModelVersionsByRegisteredModel = (
@@ -186,17 +188,25 @@ export type PatchModelVersion = (
   modelversionId: string,
 ) => Promise<ModelVersion>;
 
+export type PatchModelArtifact = (
+  opts: APIOptions,
+  data: Partial<ModelArtifact>,
+  modelartifactId: string,
+) => Promise<ModelArtifact>;
+
 export type ModelRegistryAPIs = {
   createRegisteredModel: CreateRegisteredModel;
   createModelVersionForRegisteredModel: CreateModelVersionForRegisteredModel;
   createModelArtifactForModelVersion: CreateModelArtifactForModelVersion;
   getRegisteredModel: GetRegisteredModel;
   getModelVersion: GetModelVersion;
+  listModelVersions: GetListModelVersions;
   listRegisteredModels: GetListRegisteredModels;
   getModelVersionsByRegisteredModel: GetModelVersionsByRegisteredModel;
   getModelArtifactsByModelVersion: GetModelArtifactsByModelVersion;
   patchRegisteredModel: PatchRegisteredModel;
   patchModelVersion: PatchModelVersion;
+  patchModelArtifact: PatchModelArtifact;
 };
 
 export type Notification = {
diff --git a/clients/ui/frontend/src/app/utils.ts b/clients/ui/frontend/src/app/utils.ts
index cc2e412e3..7da7d2c78 100644
--- a/clients/ui/frontend/src/app/utils.ts
+++ b/clients/ui/frontend/src/app/utils.ts
@@ -1,45 +1,86 @@
-import { SearchType } from '~/shared/components/DashboardSearchField';
-import { RegisteredModel } from '~/app/types';
-
-export const asEnumMember = <T extends object>(
-  member: T[keyof T] | string | number | undefined | null,
-  e: T,
-): T[keyof T] | null => (isEnumMember(member, e) ? member : null);
-
-export const isEnumMember = <T extends object>(
-  member: T[keyof T] | string | number | undefined | unknown | null,
-  e: T,
-): member is T[keyof T] => {
-  if (member != null) {
-    return Object.entries(e)
-      .filter(([key]) => Number.isNaN(Number(key)))
-      .map(([, value]) => value)
-      .includes(member);
+import { ModelRegistry, ModelState, ModelVersion, RegisteredModel } from '~/app/types';
+import { K8sResourceCommon } from '~/shared/types';
+
+export type ObjectStorageFields = {
+  endpoint: string;
+  bucket: string;
+  region?: string;
+  path: string;
+};
+
+export const objectStorageFieldsToUri = (fields: ObjectStorageFields): string | null => {
+  const { endpoint, bucket, region, path } = fields;
+  if (!endpoint || !bucket || !path) {
+    return null;
   }
-  return false;
+  const searchParams = new URLSearchParams();
+  searchParams.set('endpoint', endpoint);
+  if (region) {
+    searchParams.set('defaultRegion', region);
+  }
+  return `s3://${bucket}/${path}?${searchParams.toString()}`;
 };
 
-export const filterRegisteredModels = (
-  unfilteredRegisteredModels: RegisteredModel[],
-  search: string,
-  searchType: SearchType,
-): RegisteredModel[] =>
-  unfilteredRegisteredModels.filter((rm: RegisteredModel) => {
-    if (!search) {
-      return true;
+export const uriToObjectStorageFields = (uri: string): ObjectStorageFields | null => {
+  try {
+    const urlObj = new URL(uri);
+    // Some environments include the first token after the protocol (our bucket) in the pathname and some have it as the hostname
+    const [bucket, ...pathSplit] = `${urlObj.hostname}/${urlObj.pathname}`
+      .split('/')
+      .filter(Boolean);
+    const path = pathSplit.join('/');
+    const searchParams = new URLSearchParams(urlObj.search);
+    const endpoint = searchParams.get('endpoint');
+    const region = searchParams.get('defaultRegion');
+    if (endpoint && bucket && path) {
+      return { endpoint, bucket, region: region || undefined, path };
     }
+    return null;
+  } catch {
+    return null;
+  }
+};
 
-    switch (searchType) {
-      case SearchType.KEYWORD:
-        return (
-          rm.name.toLowerCase().includes(search.toLowerCase()) ||
-          (rm.description && rm.description.toLowerCase().includes(search.toLowerCase()))
-        );
+export const getLastCreatedItem = <T extends { createTimeSinceEpoch?: string }>(
+  items?: T[],
+): T | undefined =>
+  items?.toSorted(
+    ({ createTimeSinceEpoch: createTimeA }, { createTimeSinceEpoch: createTimeB }) => {
+      if (!createTimeA || !createTimeB) {
+        return 0;
+      }
+      return Number(createTimeB) - Number(createTimeA);
+    },
+  )[0];
 
-      case SearchType.OWNER:
-        return rm.owner && rm.owner.toLowerCase().includes(search.toLowerCase());
+export const filterArchiveVersions = (modelVersions: ModelVersion[]): ModelVersion[] =>
+  modelVersions.filter((mv) => mv.state === ModelState.ARCHIVED);
 
-      default:
-        return true;
-    }
-  });
+export const filterLiveVersions = (modelVersions: ModelVersion[]): ModelVersion[] =>
+  modelVersions.filter((mv) => mv.state === ModelState.LIVE);
+
+export const filterArchiveModels = (registeredModels: RegisteredModel[]): RegisteredModel[] =>
+  registeredModels.filter((rm) => rm.state === ModelState.ARCHIVED);
+
+export const filterLiveModels = (registeredModels: RegisteredModel[]): RegisteredModel[] =>
+  registeredModels.filter((rm) => rm.state === ModelState.LIVE);
+
+export const convertToK8sResourceCommon = (modelRegistry: ModelRegistry): K8sResourceCommon => ({
+  apiVersion: 'v1',
+  kind: 'ModelRegistry',
+  metadata: {
+    name: modelRegistry.name,
+  },
+  spec: {
+    // Add any additional fields from ModelRegistry to K8sResourceCommon spec if needed
+  },
+  status: {
+    conditions: [
+      {
+        type: 'Degrading',
+        status: 'True',
+        lastTransitionTime: new Date().toISOString(),
+      },
+    ],
+  },
+});
diff --git a/clients/ui/frontend/src/app/utils/updateTimestamps.ts b/clients/ui/frontend/src/app/utils/updateTimestamps.ts
new file mode 100644
index 000000000..ca03bac0c
--- /dev/null
+++ b/clients/ui/frontend/src/app/utils/updateTimestamps.ts
@@ -0,0 +1,84 @@
+import { ModelRegistryAPIs, ModelState, ModelRegistryMetadataType } from '~/app/types';
+
+type MinimalModelRegistryAPI = Pick<ModelRegistryAPIs, 'patchRegisteredModel'>;
+
+export const bumpModelVersionTimestamp = async (
+  api: ModelRegistryAPIs,
+  modelVersionId: string,
+): Promise<void> => {
+  if (!modelVersionId) {
+    throw new Error('Model version ID is required');
+  }
+
+  try {
+    const currentTime = new Date().toISOString();
+    await api.patchModelVersion(
+      {},
+      {
+        // This is a workaround to update the timestamp on the backend. There is a bug opened for model registry team
+        // to fix this issue.
+        state: ModelState.LIVE,
+        customProperties: {
+          _lastModified: {
+            metadataType: ModelRegistryMetadataType.STRING,
+            // eslint-disable-next-line camelcase
+            string_value: currentTime,
+          },
+        },
+      },
+      modelVersionId,
+    );
+  } catch (error) {
+    throw new Error(
+      `Failed to update model version timestamp: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
+  }
+};
+
+export const bumpRegisteredModelTimestamp = async (
+  api: MinimalModelRegistryAPI,
+  registeredModelId: string,
+): Promise<void> => {
+  if (!registeredModelId) {
+    throw new Error('Registered model ID is required');
+  }
+
+  try {
+    const currentTime = new Date().toISOString();
+    await api.patchRegisteredModel(
+      {},
+      {
+        state: ModelState.LIVE,
+        customProperties: {
+          // This is a workaround to update the timestamp on the backend. There is a bug opened for model registry team
+          // to fix this issue.
+          _lastModified: {
+            metadataType: ModelRegistryMetadataType.STRING,
+            // eslint-disable-next-line camelcase
+            string_value: currentTime,
+          },
+        },
+      },
+      registeredModelId,
+    );
+  } catch (error) {
+    throw new Error(
+      `Failed to update registered model timestamp: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
+  }
+};
+
+export const bumpBothTimestamps = async (
+  api: ModelRegistryAPIs,
+  modelVersionId: string,
+  registeredModelId: string,
+): Promise<void> => {
+  await Promise.all([
+    bumpModelVersionTimestamp(api, modelVersionId),
+    bumpRegisteredModelTimestamp(api, registeredModelId),
+  ]);
+};
diff --git a/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx b/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx
index a9ab8b55e..0bc340634 100644
--- a/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/shared/components/DashboardDescriptionListGroup.tsx
@@ -8,13 +8,20 @@ import {
   DescriptionListTerm,
   Flex,
   FlexItem,
+  Popover,
   Split,
   SplitItem,
 } from '@patternfly/react-core';
 import text from '@patternfly/react-styles/css/utilities/Text/text';
-import { CheckIcon, PencilAltIcon, TimesIcon } from '@patternfly/react-icons';
+import {
+  CheckIcon,
+  PencilAltIcon,
+  TimesIcon,
+  OutlinedQuestionCircleIcon,
+} from '@patternfly/react-icons';
 
-import '~/shared/components/DashboardDescriptionListGroup.scss';
+import './DashboardDescriptionListGroup.scss';
+import DashboardPopupIconButton from '~/shared/components/dashboard/DashboardPopupIconButton';
 
 type EditableProps = {
   isEditing: boolean;
@@ -23,21 +30,27 @@ type EditableProps = {
   onEditClick: () => void;
   onSaveEditsClick: () => void;
   onDiscardEditsClick: () => void;
+  editButtonTestId?: string;
+  saveButtonTestId?: string;
+  cancelButtonTestId?: string;
+  discardButtonTestId?: string;
 };
 
 export type DashboardDescriptionListGroupProps = {
   title: string;
-  tooltip?: React.ReactNode;
+  popover?: React.ReactNode;
   action?: React.ReactNode;
   isEmpty?: boolean;
   contentWhenEmpty?: React.ReactNode;
   children: React.ReactNode;
+  groupTestId?: string;
+  isSaveDisabled?: boolean;
 } & (({ isEditable: true } & EditableProps) | ({ isEditable?: false } & Partial<EditableProps>));
 
 const DashboardDescriptionListGroup: React.FC<DashboardDescriptionListGroupProps> = (props) => {
   const {
     title,
-    tooltip,
+    popover,
     action,
     isEmpty,
     contentWhenEmpty,
@@ -49,9 +62,14 @@ const DashboardDescriptionListGroup: React.FC<DashboardDescriptionListGroupProps
     onSaveEditsClick,
     onDiscardEditsClick,
     children,
+    groupTestId,
+    editButtonTestId,
+    saveButtonTestId,
+    cancelButtonTestId,
+    isSaveDisabled,
   } = props;
   return (
-    <DescriptionListGroup>
+    <DescriptionListGroup data-testid={groupTestId}>
       {action || isEditable ? (
         <DescriptionListTerm className="kubeflow-custom-description-list-term-with-action">
           <Split>
@@ -62,35 +80,32 @@ const DashboardDescriptionListGroup: React.FC<DashboardDescriptionListGroupProps
                   <ActionList isIconList>
                     <ActionListItem>
                       <Button
-                        data-testid={`save-edit-button-${title}`}
+                        data-testid={saveButtonTestId}
+                        icon={<CheckIcon />}
                         aria-label={`Save edits to ${title}`}
                         variant="link"
                         onClick={onSaveEditsClick}
-                        isDisabled={isSavingEdits}
-                      >
-                        <CheckIcon />
-                      </Button>
+                        isDisabled={isSavingEdits || isSaveDisabled}
+                      />
                     </ActionListItem>
                     <ActionListItem>
                       <Button
-                        data-testid={`discard-edit-button-${title}`}
+                        data-testid={cancelButtonTestId}
+                        icon={<TimesIcon />}
                         aria-label={`Discard edits to ${title} `}
                         variant="plain"
                         onClick={onDiscardEditsClick}
                         isDisabled={isSavingEdits}
-                      >
-                        <TimesIcon />
-                      </Button>
+                      />
                     </ActionListItem>
                   </ActionList>
                 ) : (
                   <Button
-                    data-testid={`edit-button-${title}`}
+                    data-testid={editButtonTestId}
                     aria-label={`Edit ${title}`}
-                    isInline
                     variant="link"
                     icon={<PencilAltIcon />}
-                    iconPosition="end"
+                    iconPosition="start"
                     onClick={onEditClick}
                   >
                     Edit
@@ -102,11 +117,18 @@ const DashboardDescriptionListGroup: React.FC<DashboardDescriptionListGroupProps
       ) : (
         <DescriptionListTerm>
           <Flex
-            spaceItems={{ default: 'spaceItemsSm' }}
+            spaceItems={{ default: 'spaceItemsNone' }}
             alignItems={{ default: 'alignItemsCenter' }}
           >
             <FlexItem>{title}</FlexItem>
-            {tooltip}
+            {popover && (
+              <Popover bodyContent={popover}>
+                <DashboardPopupIconButton
+                  icon={<OutlinedQuestionCircleIcon />}
+                  aria-label="More info"
+                />
+              </Popover>
+            )}
           </Flex>
         </DescriptionListTerm>
       )}
diff --git a/clients/ui/frontend/src/shared/components/DashboardModalFooter.tsx b/clients/ui/frontend/src/shared/components/DashboardModalFooter.tsx
index d0cf0dafc..f4a4aff15 100644
--- a/clients/ui/frontend/src/shared/components/DashboardModalFooter.tsx
+++ b/clients/ui/frontend/src/shared/components/DashboardModalFooter.tsx
@@ -1,14 +1,25 @@
 import * as React from 'react';
-import { Button, ButtonProps, ModalFooter } from '@patternfly/react-core';
+import {
+  ActionList,
+  ActionListItem,
+  ActionListGroup,
+  Alert,
+  Button,
+  ButtonProps,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
 
 type DashboardModalFooterProps = {
   submitLabel: string;
   submitButtonVariant?: ButtonProps['variant'];
   onSubmit: () => void;
   onCancel: () => void;
-  isSubmitDisabled: boolean;
+  isSubmitDisabled?: boolean;
   isSubmitLoading?: boolean;
   isCancelDisabled?: boolean;
+  alertTitle?: string;
+  error?: Error;
 };
 
 const DashboardModalFooter: React.FC<DashboardModalFooterProps> = ({
@@ -19,28 +30,48 @@ const DashboardModalFooter: React.FC<DashboardModalFooterProps> = ({
   isSubmitDisabled,
   isSubmitLoading,
   isCancelDisabled,
+  error,
+  alertTitle,
 }) => (
-  <ModalFooter>
-    <Button
-      key="submit"
-      variant={submitButtonVariant}
-      isDisabled={isSubmitDisabled}
-      onClick={onSubmit}
-      isLoading={isSubmitLoading}
-      data-testid="modal-submit-button"
-    >
-      {submitLabel}
-    </Button>
-    <Button
-      key="cancel"
-      variant="link"
-      isDisabled={isCancelDisabled}
-      onClick={onCancel}
-      data-testid="modal-cancel-button"
-    >
-      Cancel
-    </Button>
-  </ModalFooter>
+  // make sure alert uses the full width
+  <Stack hasGutter style={{ flex: 'auto' }}>
+    {error && (
+      <StackItem>
+        <Alert data-testid="error-message-alert" isInline variant="danger" title={alertTitle}>
+          {error.message}
+        </Alert>
+      </StackItem>
+    )}
+    <StackItem>
+      <ActionList>
+        <ActionListGroup>
+          <ActionListItem>
+            <Button
+              key="submit"
+              variant={submitButtonVariant}
+              isDisabled={isSubmitDisabled}
+              onClick={onSubmit}
+              isLoading={isSubmitLoading}
+              data-testid="modal-submit-button"
+            >
+              {submitLabel}
+            </Button>
+          </ActionListItem>
+          <ActionListItem>
+            <Button
+              key="cancel"
+              variant="link"
+              isDisabled={isCancelDisabled}
+              onClick={onCancel}
+              data-testid="modal-cancel-button"
+            >
+              Cancel
+            </Button>
+          </ActionListItem>
+        </ActionListGroup>
+      </ActionList>
+    </StackItem>
+  </Stack>
 );
 
 export default DashboardModalFooter;
diff --git a/clients/ui/frontend/src/shared/components/DashboardSearchField.tsx b/clients/ui/frontend/src/shared/components/DashboardSearchField.tsx
index 82f8f4359..f74d5a81e 100644
--- a/clients/ui/frontend/src/shared/components/DashboardSearchField.tsx
+++ b/clients/ui/frontend/src/shared/components/DashboardSearchField.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { InputGroup, InputGroupItem, SearchInput } from '@patternfly/react-core';
 import SimpleSelect from '~/shared/components/SimpleSelect';
-import { asEnumMember } from '~/app/utils';
+import { asEnumMember } from '~/shared/utilities/utils';
 
 // List all the possible search fields here
 export enum SearchType {
diff --git a/clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx b/clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx
index 392987637..bbdfc7d67 100644
--- a/clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/shared/components/EditableLabelsDescriptionListGroup.tsx
@@ -1,220 +1,248 @@
-import * as React from 'react';
-import {
-  Button,
-  Form,
-  FormGroup,
-  FormHelperText,
-  HelperText,
-  HelperTextItem,
-  Label,
-  LabelGroup,
-  TextInput,
-} from '@patternfly/react-core';
-import { Modal } from '@patternfly/react-core/deprecated';
-import { ExclamationCircleIcon } from '@patternfly/react-icons';
-import DashboardDescriptionListGroup, {
-  DashboardDescriptionListGroupProps,
-} from '~/shared/components/DashboardDescriptionListGroup';
-
-type EditableTextDescriptionListGroupProps = Partial<
-  Pick<DashboardDescriptionListGroupProps, 'title' | 'contentWhenEmpty'>
-> & {
+import React, { useState } from 'react';
+import { Label, LabelGroup, Alert, AlertVariant } from '@patternfly/react-core';
+import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
+import DashboardDescriptionListGroup from '~/shared/components/DashboardDescriptionListGroup';
+
+interface EditableLabelsProps {
   labels: string[];
-  saveEditedLabels: (labels: string[]) => Promise<unknown>;
-  allExistingKeys?: string[];
+  onLabelsChange: (labels: string[]) => Promise<void>;
   isArchive?: boolean;
-};
+  title?: string;
+  contentWhenEmpty?: string;
+  allExistingKeys: string[];
+}
 
-const EditableLabelsDescriptionListGroup: React.FC<EditableTextDescriptionListGroupProps> = ({
+export const EditableLabelsDescriptionListGroup: React.FC<EditableLabelsProps> = ({
   title = 'Labels',
   contentWhenEmpty = 'No labels',
   labels,
-  saveEditedLabels,
+  onLabelsChange,
   isArchive,
-  allExistingKeys = labels,
+  allExistingKeys,
 }) => {
-  const [isEditing, setIsEditing] = React.useState(false);
-  const [unsavedLabels, setUnsavedLabels] = React.useState(labels);
-  const [isSavingEdits, setIsSavingEdits] = React.useState(false);
+  const [isEditing, setIsEditing] = useState(false);
+  const [isSavingEdits, setIsSavingEdits] = useState(false);
+  const [hasSavedEdits, setHasSavedEdits] = useState(false);
+  const [unsavedLabels, setUnsavedLabels] = useState(labels);
 
-  const editUnsavedLabel = (newText: string, index: number) => {
-    if (isSavingEdits) {
+  const validateLabels = (): string[] => {
+    const errors: string[] = [];
+
+    const duplicatesMap = new Map<string, number>();
+    unsavedLabels.forEach((label) => {
+      duplicatesMap.set(label, (duplicatesMap.get(label) || 0) + 1);
+    });
+
+    const duplicateLabels: string[] = [];
+    duplicatesMap.forEach((count, label) => {
+      if (count > 1) {
+        duplicateLabels.push(label);
+      }
+    });
+
+    if (duplicateLabels.length > 0) {
+      if (duplicateLabels.length === 1) {
+        const label = duplicateLabels[0] ?? '';
+        errors.push(`**${label}** already exists as a label. Ensure that each label is unique.`);
+      } else {
+        const lastLabel = duplicateLabels.pop() ?? '';
+        const formattedLabels = duplicateLabels.map((label) => `**${label}**`).join(', ');
+        errors.push(
+          `${formattedLabels} and **${lastLabel}** already exist as labels. Ensure that each label is unique.`,
+        );
+      }
+    }
+    unsavedLabels.forEach((label) => {
+      if (allExistingKeys.includes(label) && !labels.includes(label)) {
+        errors.push(
+          `**${label}** already exists as a property key. Labels cannot use the same name as existing properties.`,
+        );
+      }
+      if (label.length > 63) {
+        errors.push(`**${label}** can't exceed 63 characters`);
+      }
+    });
+
+    return errors;
+  };
+
+  const handleEditComplete = (
+    _event: MouseEvent | KeyboardEvent,
+    newText: string,
+    currentLabel?: string,
+  ) => {
+    if (!newText) {
       return;
     }
-    const copy = [...unsavedLabels];
-    copy[index] = newText;
-    setUnsavedLabels(copy);
+
+    setUnsavedLabels((prev) => {
+      if (currentLabel) {
+        const index = prev.indexOf(currentLabel);
+        if (index === -1) {
+          return [...prev, newText];
+        }
+
+        const newLabels = [...prev];
+        newLabels[index] = newText;
+        return newLabels;
+      }
+      return [...prev, newText];
+    });
   };
+
   const removeUnsavedLabel = (text: string) => {
     if (isSavingEdits) {
       return;
     }
     setUnsavedLabels(unsavedLabels.filter((label) => label !== text));
   };
-  const addUnsavedLabel = (text: string) => {
+
+  const addNewLabel = () => {
     if (isSavingEdits) {
       return;
     }
-    setUnsavedLabels([...unsavedLabels, text]);
-  };
+    const baseLabel = 'New Label';
+    let counter = 1;
+    let newLabel = baseLabel;
 
-  // Don't allow a label that matches a non-label property key or another label (as they stand before saving)
-  // Note that this means if you remove a label and add it back before saving, that is valid
-  const reservedKeys = [
-    ...allExistingKeys.filter((key) => !labels.includes(key)),
-    ...unsavedLabels,
-  ];
-
-  const [isAddLabelModalOpen, setIsAddLabelModalOpen] = React.useState(false);
-  const [addLabelInputValue, setAddLabelInputValue] = React.useState('');
-  const addLabelInputRef = React.useRef<HTMLInputElement>(null);
-  let addLabelValidationError: string | null = null;
-  if (reservedKeys.includes(addLabelInputValue)) {
-    addLabelValidationError = 'Label must not match an existing label or property key';
-  } else if (addLabelInputValue.length > 63) {
-    addLabelValidationError = "Label text can't exceed 63 characters";
-  }
-
-  const toggleAddLabelModal = () => {
-    setAddLabelInputValue('');
-    setIsAddLabelModalOpen(!isAddLabelModalOpen);
+    while (unsavedLabels.includes(newLabel)) {
+      newLabel = `${baseLabel} ${counter}`;
+      counter++;
+    }
+
+    setUnsavedLabels((prev) => {
+      const updated = [...prev, newLabel];
+      return updated;
+    });
   };
-  React.useEffect(() => {
-    if (isAddLabelModalOpen && addLabelInputRef.current) {
-      addLabelInputRef.current.focus();
+
+  const labelErrors = validateLabels();
+  const shouldBeRed = (label: string, index: number): boolean => {
+    const firstIndex = unsavedLabels.findIndex((l) => l === label);
+
+    if (firstIndex !== index) {
+      return true;
     }
-  }, [isAddLabelModalOpen]);
-
-  const addLabelModalSubmitDisabled = !addLabelInputValue || !!addLabelValidationError;
-  const submitAddLabelModal = (event?: React.FormEvent) => {
-    event?.preventDefault();
-    if (!addLabelModalSubmitDisabled) {
-      addUnsavedLabel(addLabelInputValue);
-      toggleAddLabelModal();
+
+    if (allExistingKeys.includes(label) && !labels.includes(label)) {
+      return true;
     }
+
+    return false;
   };
 
+  // Add a ref for the alert
+  const alertRef = React.useRef<HTMLDivElement>(null);
+
   return (
-    <>
-      <DashboardDescriptionListGroup
-        title={title}
-        isEmpty={labels.length === 0}
-        contentWhenEmpty={contentWhenEmpty}
-        isEditable={!isArchive}
-        isEditing={isEditing}
-        isSavingEdits={isSavingEdits}
-        contentWhenEditing={
+    <DashboardDescriptionListGroup
+      editButtonTestId="editable-labels-group-edit"
+      saveButtonTestId="editable-labels-group-save"
+      title={title}
+      isEmpty={labels.length === 0}
+      contentWhenEmpty={contentWhenEmpty}
+      isEditable={!isArchive}
+      isEditing={isEditing}
+      isSavingEdits={isSavingEdits}
+      contentWhenEditing={
+        <>
           <LabelGroup
-            data-testid="label-group"
+            data-testid="editable-label-group"
             isEditable={!isSavingEdits}
             numLabels={unsavedLabels.length}
             addLabelControl={
-              !isSavingEdits && (
+              !isSavingEdits ? (
                 <Label
-                  textMaxWidth="40ch"
-                  color="blue"
                   variant="overflow"
-                  onClick={toggleAddLabelModal}
+                  color="blue"
+                  onClick={addNewLabel}
+                  data-testid="add-label-button"
                 >
                   Add label
                 </Label>
-              )
+              ) : undefined
             }
           >
             {unsavedLabels.map((label, index) => (
               <Label
-                key={label}
-                color="blue"
-                data-testid="label"
+                data-testid={`editable-label-${label}`}
+                key={label + index}
+                color={shouldBeRed(label, index) ? 'red' : 'blue'}
                 isEditable={!isSavingEdits}
-                editableProps={{ 'aria-label': `Editable label with text ${label}` }}
                 onClose={() => removeUnsavedLabel(label)}
-                closeBtnProps={{ isDisabled: isSavingEdits }}
-                onEditComplete={(_event, newText) => {
-                  if (!reservedKeys.includes(newText) && newText.length <= 63) {
-                    editUnsavedLabel(newText, index);
-                  }
+                closeBtnProps={{
+                  isDisabled: isSavingEdits,
+                  'data-testid': `remove-label-${label}`,
+                }}
+                onEditComplete={(event, newText) => handleEditComplete(event, newText, label)}
+                editableProps={{
+                  defaultValue: label,
+                  'aria-label': 'Edit label',
+                  'data-testid': `edit-label-input-${label}`,
                 }}
               >
                 {label}
               </Label>
             ))}
           </LabelGroup>
+          {labelErrors.length > 0 && (
+            <Alert
+              ref={alertRef}
+              data-testid="label-error-alert"
+              variant={AlertVariant.danger}
+              isInline
+              title="Label validation errors:"
+              aria-live="polite"
+              isPlain
+              tabIndex={-1}
+              className={spacing.mtMd}
+            >
+              <ul>
+                {labelErrors.map((error, index) => (
+                  <li key={index}>
+                    {error
+                      .split('**')
+                      .map((part, i) => (i % 2 === 0 ? part : <strong key={i}>{part}</strong>))}
+                  </li>
+                ))}
+              </ul>
+            </Alert>
+          )}
+        </>
+      }
+      onEditClick={() => {
+        setUnsavedLabels(labels);
+        setIsEditing(true);
+      }}
+      onSaveEditsClick={async () => {
+        if (labelErrors.length > 0) {
+          return;
         }
-        onEditClick={() => {
-          setUnsavedLabels(labels);
-          setIsEditing(true);
-        }}
-        onSaveEditsClick={async () => {
-          setIsSavingEdits(true);
-          try {
-            await saveEditedLabels(unsavedLabels);
-          } finally {
-            setIsSavingEdits(false);
-          }
+        setIsSavingEdits(true);
+        try {
+          await onLabelsChange(unsavedLabels);
+        } finally {
+          setHasSavedEdits(true);
+          setIsSavingEdits(false);
           setIsEditing(false);
-        }}
-        onDiscardEditsClick={() => {
-          setUnsavedLabels(labels);
-          setIsEditing(false);
-        }}
-      >
-        <LabelGroup data-testid="label-group">
-          {labels.map((label) => (
-            <Label textMaxWidth="40ch" key={label} color="blue" data-testid="label">
-              {label}
-            </Label>
-          ))}
-        </LabelGroup>
-      </DashboardDescriptionListGroup>
-      <Modal
-        variant="small"
-        title="Add label"
-        isOpen={isAddLabelModalOpen}
-        onClose={toggleAddLabelModal}
-        actions={[
-          <Button
-            key="save"
-            variant="primary"
-            form="add-label-form"
-            onClick={submitAddLabelModal}
-            isDisabled={addLabelModalSubmitDisabled}
-          >
-            Save
-          </Button>,
-          <Button key="cancel" variant="link" onClick={toggleAddLabelModal}>
-            Cancel
-          </Button>,
-        ]}
+        }
+      }}
+      onDiscardEditsClick={() => {
+        setUnsavedLabels(labels);
+        setIsEditing(false);
+      }}
+    >
+      <LabelGroup
+        data-testid="display-label-group"
+        defaultIsOpen={hasSavedEdits}
+        key={String(hasSavedEdits)} // Force this to fully remount when we change defaultIsOpen
       >
-        <Form id="add-label-form" onSubmit={submitAddLabelModal}>
-          <FormGroup label="Label text" fieldId="add-label-form-label-text" isRequired>
-            <TextInput
-              type="text"
-              id="add-label-form-label-text"
-              name="add-label-form-label-text"
-              value={addLabelInputValue}
-              onChange={(_event: React.FormEvent<HTMLInputElement>, value: string) =>
-                setAddLabelInputValue(value)
-              }
-              ref={addLabelInputRef}
-              isRequired
-              validated={addLabelValidationError ? 'error' : 'default'}
-            />
-            {addLabelValidationError && (
-              <FormHelperText>
-                <HelperText>
-                  <HelperTextItem icon={<ExclamationCircleIcon />} variant="error">
-                    {addLabelValidationError}
-                  </HelperTextItem>
-                </HelperText>
-              </FormHelperText>
-            )}
-          </FormGroup>
-        </Form>
-      </Modal>
-    </>
+        {labels.map((label) => (
+          <Label key={label} color="blue" data-testid="label">
+            {label}
+          </Label>
+        ))}
+      </LabelGroup>
+    </DashboardDescriptionListGroup>
   );
 };
-
-export default EditableLabelsDescriptionListGroup;
diff --git a/clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx b/clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx
index be1527d79..112ede6fc 100644
--- a/clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/shared/components/EditableTextDescriptionListGroup.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ExpandableSection, TextArea } from '@patternfly/react-core';
+import { ExpandableSection, TextArea, TextInput } from '@patternfly/react-core';
 import DashboardDescriptionListGroup, {
   DashboardDescriptionListGroupProps,
 } from '~/shared/components/DashboardDescriptionListGroup';
@@ -12,8 +12,9 @@ type EditableTextDescriptionListGroupProps = Pick<
 > & {
   value: string;
   saveEditedValue: (value: string) => Promise<void>;
-  testid?: string;
+  baseTestId?: string;
   isArchive?: boolean;
+  editableVariant: 'TextInput' | 'TextArea';
 };
 
 const EditableTextDescriptionListGroup: React.FC<EditableTextDescriptionListGroupProps> = ({
@@ -22,23 +23,36 @@ const EditableTextDescriptionListGroup: React.FC<EditableTextDescriptionListGrou
   value,
   isArchive,
   saveEditedValue,
-  testid,
+  baseTestId,
+  editableVariant,
 }) => {
   const [isEditing, setIsEditing] = React.useState(false);
   const [unsavedValue, setUnsavedValue] = React.useState(value);
   const [isSavingEdits, setIsSavingEdits] = React.useState(false);
   const [isTextExpanded, setIsTextExpanded] = React.useState(false);
 
-  const editableTextArea = (
-    <TextArea
-      data-testid={`edit-text-area-${title}`}
-      aria-label={`Text box for editing ${title}`}
-      value={unsavedValue}
-      onChange={(_event, v) => setUnsavedValue(v)}
-      isDisabled={isSavingEdits}
-      rows={24}
-    />
-  );
+  const editableTextArea =
+    editableVariant === 'TextInput' ? (
+      <TextInput
+        autoFocus
+        data-testid={baseTestId && `${baseTestId}-input`}
+        aria-label={`Text input for editing ${title}`}
+        value={unsavedValue}
+        onChange={(_event, v) => setUnsavedValue(v)}
+        isDisabled={isSavingEdits}
+      />
+    ) : (
+      <TextArea
+        autoFocus
+        data-testid={baseTestId && `${baseTestId}-input`}
+        aria-label={`Text box for editing ${title}`}
+        value={unsavedValue}
+        onChange={(_event, v) => setUnsavedValue(v)}
+        isDisabled={isSavingEdits}
+        rows={24}
+        resizeOrientation="vertical"
+      />
+    );
   return (
     <DashboardDescriptionListGroup
       title={title}
@@ -47,6 +61,10 @@ const EditableTextDescriptionListGroup: React.FC<EditableTextDescriptionListGrou
       isEditable={!isArchive}
       isEditing={isEditing}
       isSavingEdits={isSavingEdits}
+      groupTestId={baseTestId && `${baseTestId}-group`}
+      editButtonTestId={baseTestId && `${baseTestId}-edit`}
+      saveButtonTestId={baseTestId && `${baseTestId}-save`}
+      cancelButtonTestId={baseTestId && `${baseTestId}-cancel`}
       contentWhenEditing={
         isMUITheme() ? <FormFieldset component={editableTextArea} /> : editableTextArea
       }
@@ -69,7 +87,7 @@ const EditableTextDescriptionListGroup: React.FC<EditableTextDescriptionListGrou
       }}
     >
       <ExpandableSection
-        data-testid={testid}
+        data-testid={baseTestId}
         variant="truncate"
         truncateMaxLines={12}
         toggleText={isTextExpanded ? 'Show less' : 'Show more'}
diff --git a/clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.tsx b/clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.tsx
index db376b647..0e2b76d0c 100644
--- a/clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.tsx
+++ b/clients/ui/frontend/src/shared/components/InlineTruncatedClipboardCopy.tsx
@@ -1,10 +1,11 @@
-import { ClipboardCopy, Truncate } from '@patternfly/react-core';
+import { ClipboardCopy, ClipboardCopyVariant, Truncate } from '@patternfly/react-core';
 import * as React from 'react';
-import './InlineTruncatedClipboardCopy.scss';
 
 type Props = {
   textToCopy: string;
+  truncatePosition?: 'middle' | 'end';
   testId?: string;
+  maxWidth?: number;
 };
 
 /** Hopefully PF will add some flexibility with ClipboardCopy
@@ -12,19 +13,26 @@ type Props = {
  * https://github.com/patternfly/patternfly-react/issues/10890
  **/
 
-const InlineTruncatedClipboardCopy: React.FC<Props> = ({ textToCopy, testId }) => (
-  // @ts-expect-error ClipboardCopy expects children of type string in PF v6
+// TODO: Fix this when PF 6 supports a ReactNode as a child for the ClipboardCopy component
+const InlineTruncatedClipboardCopy: React.FC<Props> = ({
+  textToCopy,
+  testId,
+  maxWidth,
+  truncatePosition,
+}) => (
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   <ClipboardCopy
-    variant="inline-compact"
-    style={{ display: 'inline-flex', alignItems: 'center' }}
+    variant={ClipboardCopyVariant.inlineCompact}
+    style={{ display: 'inline-flex', maxWidth }}
     hoverTip="Copy"
     clickTip="Copied"
+    data-testid={testId}
     onCopy={() => {
       navigator.clipboard.writeText(textToCopy);
     }}
-    data-testid={testId}
   >
-    <Truncate content={textToCopy} />
+    <Truncate content={textToCopy} position={truncatePosition} />
   </ClipboardCopy>
 );
 
diff --git a/clients/ui/frontend/src/shared/components/NotebookController.scss b/clients/ui/frontend/src/shared/components/NotebookController.scss
new file mode 100644
index 000000000..52010ccfc
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/NotebookController.scss
@@ -0,0 +1,113 @@
+.kubeflow-notebook-controller {
+  &__page {
+    &-content {
+      max-width: 1000px;
+    }
+    .pf-v6-c-menu-toggle {
+      width: 70%;
+    }
+    .pf-v6-c-form__section:not(:first-child) {
+      margin-top: var(--pf-t--global--spacer--sm);
+      padding-top: var(--pf-t--global--spacer--sm);
+      border-top: 1px solid var(--pf-t--global--border--color--default);
+    }
+  }
+  &__env-var {
+    gap: var(--pf-t--global--spacer--gutter--default);
+    .pf-v6-c-form__section-title {
+      margin-bottom: var(--pf-t--global--spacer--sm);
+    }
+    &-add-button {
+      margin-left: var(--pf-t--global--spacer--md);
+    }
+    &-row {
+      width: 85%;
+      .pf-v6-c-menu-toggle {
+        width: 70%;
+      }
+      & ~ & {
+        padding-top: var(--pf-t--global--spacer--md);
+        border-top: 1px solid var(--pf-t--global--border--color--default);
+      }
+    }
+    &-field {
+      margin-left: var(--pf-t--global--spacer--md);
+      .pf-v6-c-form-control,
+      .pf-v6-c-input-group {
+        width: calc(70%);
+      }
+      &__value .pf-v6-c-form-control {
+        width: 100%;
+      }
+    }
+  }
+  &__server-details {
+    &-title {
+      font-size: var(--pf-t--global--font--size--lg);
+      padding-bottom: var(--pf-t--global--spacer--md);
+    }
+    &-image-name {
+      padding-bottom: var(--pf-t--global--spacer--md);
+    }
+    .pf-v6-c-description-list {
+      font-size: small;
+      padding-bottom: var(--pf-t--global--spacer--xl);
+    }
+  }
+  &__notebook-image {
+    &-option {
+      .pf-v6-c-radio__label {
+        white-space: nowrap;
+      }
+    }
+    &-tags {
+      margin-left: var(--pf-t--global--spacer--md);
+      .pf-v6-c-expandable-section__content {
+        margin-top: 0;
+        margin-left: var(--pf-t--global--spacer--md);
+      }
+      .kubeflow-data-projects__notebook-image-option:not(:last-of-type) {
+        margin-bottom: var(--pf-t--global--spacer--sm);
+      }
+    }
+    &-title {
+      > svg,
+      &-version {
+        margin-left: var(--pf-t--global--spacer--xs);
+      }
+      .pf-v6-c-label {
+        margin-left: var(--pf-t--global--spacer--sm);
+      }
+    }
+    &-popover {
+      &-title {
+        font-weight: var(--pf-t--global--font--weight--heading--bold);
+        margin-bottom: var(--pf-t--global--spacer--sm);
+      }
+      &-package-title {
+        font-weight: var(--pf-t--global--font--weight--heading--bold);
+      }
+    }
+  }
+  &__start-server-modal {
+    .pf-v6-c-list {
+      font-size: var(--pf-t--global--font--size--body--sm);
+    }
+    .pf-v6-c-expandable-section {
+      width: 100%;
+      padding-right: var(--pf-t--global--spacer--lg);
+      margin-top: var(--pf-t--global--spacer--sm);
+      &__content {
+        margin-top: 0;
+        max-height: 250px;
+        overflow: auto;
+      }
+    }
+    .pf-v6-c-progress {
+      margin-bottom: var(--pf-t--global--spacer--md);
+    }
+    .pf-v6-c-alert {
+      margin-bottom: var(--pf-t--global--spacer--md);
+    }
+  }
+}
diff --git a/clients/ui/frontend/src/shared/components/PopoverListContent.tsx b/clients/ui/frontend/src/shared/components/PopoverListContent.tsx
new file mode 100644
index 000000000..a56325339
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/PopoverListContent.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react';
+import { Content, ContentProps } from '@patternfly/react-core';
+
+type PopoverListContentProps = ContentProps & {
+  leadText?: React.ReactNode;
+  listHeading?: React.ReactNode;
+  listItems: React.ReactNode[];
+};
+
+const ContentText: React.FC<{ children: React.ReactNode }> = ({ children }) => (
+  <Content component="small" style={{ color: 'var(--pf-t--global--text--color--regular)' }}>
+    {children}
+  </Content>
+);
+
+const PopoverListContent: React.FC<PopoverListContentProps> = ({
+  leadText,
+  listHeading,
+  listItems,
+  ...props
+}) => (
+  <Content {...props}>
+    {leadText ? <ContentText>{leadText}</ContentText> : null}
+    {listHeading ? <Content component="h4">{listHeading}</Content> : null}
+    <Content component="ul" style={{ margin: 0 }}>
+      {listItems.map((item, index) => (
+        <Content component="li" key={index}>
+          <ContentText>{item}</ContentText>
+        </Content>
+      ))}
+    </Content>
+  </Content>
+);
+
+export default PopoverListContent;
diff --git a/clients/ui/frontend/src/shared/components/ResourceNameTooltip.tsx b/clients/ui/frontend/src/shared/components/ResourceNameTooltip.tsx
new file mode 100644
index 000000000..62d23c12b
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/ResourceNameTooltip.tsx
@@ -0,0 +1,79 @@
+import * as React from 'react';
+import {
+  ClipboardCopy,
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  Flex,
+  FlexItem,
+  Popover,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+import { K8sResourceCommon } from '~/shared/types';
+import '~/shared/components/NotebookController.scss';
+import DashboardPopupIconButton from '~/shared/components/dashboard/DashboardPopupIconButton';
+
+type ResourceNameTooltipProps = {
+  resource: K8sResourceCommon;
+  children: React.ReactNode;
+  wrap?: boolean;
+};
+
+const ResourceNameTooltip: React.FC<ResourceNameTooltipProps> = ({
+  children,
+  resource,
+  wrap = true,
+}) => (
+  <div style={{ display: wrap ? 'block' : 'inline-flex' }}>
+    <Flex gap={{ default: 'gapXs' }} alignItems={{ default: 'alignItemsCenter' }}>
+      <FlexItem>{children}</FlexItem>
+      {resource.metadata?.name && (
+        <Popover
+          position="right"
+          bodyContent={
+            <Stack hasGutter>
+              <StackItem>
+                Resource names and types are used to find your resources in the cluster.
+              </StackItem>
+              <StackItem>
+                <DescriptionList isCompact isHorizontal>
+                  <DescriptionListGroup>
+                    <DescriptionListTerm>Resource name</DescriptionListTerm>
+                    <DescriptionListDescription>
+                      <ClipboardCopy
+                        hoverTip="Copy"
+                        clickTip="Copied"
+                        variant="inline-compact"
+                        data-testid="resource-name-text"
+                      >
+                        {resource.metadata.name}
+                      </ClipboardCopy>
+                    </DescriptionListDescription>
+                  </DescriptionListGroup>
+                  <DescriptionListGroup>
+                    <DescriptionListTerm>Resource type</DescriptionListTerm>
+                    <DescriptionListDescription data-testid="resource-kind-text">
+                      {resource.kind}
+                    </DescriptionListDescription>
+                  </DescriptionListGroup>
+                </DescriptionList>
+              </StackItem>
+            </Stack>
+          }
+        >
+          <DashboardPopupIconButton
+            data-testid="resource-name-icon-button"
+            icon={<OutlinedQuestionCircleIcon />}
+            aria-label="More info"
+            style={{ paddingTop: 0, paddingBottom: 0 }}
+          />
+        </Popover>
+      )}
+    </Flex>
+  </div>
+);
+
+export default ResourceNameTooltip;
diff --git a/clients/ui/frontend/src/shared/components/SimpleSelect.tsx b/clients/ui/frontend/src/shared/components/SimpleSelect.tsx
index 27960895f..8a7ae451e 100644
--- a/clients/ui/frontend/src/shared/components/SimpleSelect.tsx
+++ b/clients/ui/frontend/src/shared/components/SimpleSelect.tsx
@@ -2,13 +2,19 @@ import * as React from 'react';
 import {
   Truncate,
   MenuToggle,
+  // eslint-disable-next-line no-restricted-imports
   Select,
   SelectList,
   SelectOption,
   SelectGroup,
   Divider,
   MenuToggleProps,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
+  Skeleton,
 } from '@patternfly/react-core';
+import TruncatedText from '~/shared/components/TruncatedText';
 
 import './SimpleSelect.scss';
 
@@ -19,6 +25,9 @@ export type SimpleSelectOption = {
   dropdownLabel?: React.ReactNode;
   isPlaceholder?: boolean;
   isDisabled?: boolean;
+  isFavorited?: boolean;
+  dataTestId?: string;
+  optionKey?: string; // Used to differentiate the only option with the same key to trigger the one-option hook in the component
 };
 
 export type SimpleGroupSelectOption = {
@@ -39,6 +48,8 @@ type SimpleSelectProps = {
   isDisabled?: boolean;
   icon?: React.ReactNode;
   dataTestId?: string;
+  previewDescription?: boolean;
+  isSkeleton?: boolean;
 } & Omit<
   React.ComponentProps<typeof Select>,
   'isOpen' | 'toggle' | 'dropdownItems' | 'onChange' | 'selected'
@@ -56,88 +67,146 @@ const SimpleSelect: React.FC<SimpleSelectProps> = ({
   icon,
   dataTestId,
   toggleProps,
+  previewDescription = true,
+  popperProps,
+  isSkeleton,
   ...props
 }) => {
   const [open, setOpen] = React.useState(false);
 
+  const groupedOptionsFlat = React.useMemo(
+    () =>
+      groupedOptions?.reduce<SimpleSelectOption[]>((acc, group) => [...acc, ...group.options], []),
+    [groupedOptions],
+  );
+
   const findOptionForKey = (key: string) =>
-    options?.find((option) => option.key === key) ||
-    groupedOptions
-      ?.reduce<SimpleSelectOption[]>((acc, group) => [...acc, ...group.options], [])
-      .find((o) => o.key === key);
+    options?.find((option) => option.key === key) || groupedOptionsFlat?.find((o) => o.key === key);
 
   const selectedOption = value ? findOptionForKey(value) : undefined;
   const selectedLabel = selectedOption?.label ?? placeholder;
 
+  const totalOptions = React.useMemo(
+    () => [...(options || []), ...(groupedOptionsFlat || [])],
+    [options, groupedOptionsFlat],
+  );
+
+  const singleOptionKey =
+    totalOptions.length === 1 ? totalOptions[0].optionKey || totalOptions[0].key : null;
+  // If there is only one option, call the onChange function
+  React.useEffect(() => {
+    if (singleOptionKey && !isSkeleton) {
+      onChange(totalOptions[0].key, false);
+    }
+    // We don't want the callback function to be a dependency
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [singleOptionKey, isSkeleton]);
+
+  if (isSkeleton) {
+    return <Skeleton style={{ minWidth: 100 }} />;
+  }
+
   return (
-    <Select
-      {...props}
-      isOpen={open}
-      selected={value || toggleLabel}
-      onSelect={(e, selectValue) => {
-        onChange(
-          String(selectValue),
-          !!selectValue && (findOptionForKey(String(selectValue))?.isPlaceholder ?? false),
-        );
-        setOpen(false);
-      }}
-      onOpenChange={setOpen}
-      toggle={(toggleRef) => (
-        <MenuToggle
-          ref={toggleRef}
-          data-testid={dataTestId}
-          aria-label="Options menu"
-          onClick={() => setOpen(!open)}
-          icon={icon}
-          isExpanded={open}
-          isDisabled={isDisabled}
-          isFullWidth={isFullWidth}
-          {...toggleProps}
-        >
-          {toggleLabel || <Truncate content={selectedLabel} className="truncate-no-min-width" />}
-        </MenuToggle>
-      )}
-      shouldFocusToggleOnSelect
-    >
-      {groupedOptions?.map((group, index) => (
-        <>
-          {index > 0 ? <Divider /> : null}
-          <SelectGroup key={group.key} label={group.label}>
-            <SelectList>
-              {group.options.map(
-                ({ key, label, dropdownLabel, description, isDisabled: optionDisabled }) => (
-                  <SelectOption
-                    key={key}
-                    value={key}
-                    description={description}
-                    isDisabled={optionDisabled}
-                    data-testid={key}
-                  >
-                    {dropdownLabel || label}
-                  </SelectOption>
-                ),
-              )}
-            </SelectList>
-          </SelectGroup>
-        </>
-      )) ?? null}
-      {options?.length ? (
-        <SelectList>
-          {groupedOptions?.length ? <Divider /> : null}
-          {options.map(({ key, label, dropdownLabel, description, isDisabled: optionDisabled }) => (
-            <SelectOption
-              key={key}
-              value={key}
-              description={description}
-              isDisabled={optionDisabled}
-              data-testid={key}
-            >
-              {dropdownLabel || label}
-            </SelectOption>
-          ))}
-        </SelectList>
+    <>
+      <Select
+        {...props}
+        isOpen={open}
+        selected={value || toggleLabel}
+        onSelect={(e, selectValue) => {
+          onChange(
+            String(selectValue),
+            !!selectValue && (findOptionForKey(String(selectValue))?.isPlaceholder ?? false),
+          );
+          setOpen(false);
+        }}
+        onOpenChange={setOpen}
+        toggle={(toggleRef) => (
+          <MenuToggle
+            ref={toggleRef}
+            data-testid={dataTestId}
+            aria-label="Options menu"
+            onClick={() => setOpen(!open)}
+            icon={icon}
+            isExpanded={open}
+            isDisabled={totalOptions.length <= 1 || isDisabled}
+            isFullWidth={isFullWidth}
+            {...toggleProps}
+          >
+            {toggleLabel || <Truncate content={selectedLabel} className="truncate-no-min-width" />}
+          </MenuToggle>
+        )}
+        shouldFocusToggleOnSelect
+        popperProps={{ maxWidth: 'trigger', ...popperProps }}
+      >
+        {groupedOptions?.map((group, index) => (
+          <React.Fragment key={group.key}>
+            {index > 0 ? <Divider /> : null}
+            <SelectGroup label={group.label}>
+              <SelectList>
+                {group.options.map(
+                  ({
+                    key,
+                    label,
+                    dropdownLabel,
+                    description,
+                    isFavorited,
+                    isDisabled: optionDisabled,
+                    dataTestId: optionDataTestId,
+                  }) => (
+                    <SelectOption
+                      key={key}
+                      value={key}
+                      description={<TruncatedText maxLines={2} content={description} />}
+                      isDisabled={optionDisabled}
+                      isFavorited={isFavorited}
+                      data-testid={optionDataTestId || key}
+                    >
+                      {dropdownLabel || label}
+                    </SelectOption>
+                  ),
+                )}
+              </SelectList>
+            </SelectGroup>
+          </React.Fragment>
+        )) ?? null}
+        {options?.length ? (
+          <SelectList>
+            {groupedOptions?.length ? <Divider /> : null}
+            {options.map(
+              ({
+                key,
+                label,
+                dropdownLabel,
+                description,
+                isFavorited,
+                isDisabled: optionDisabled,
+                dataTestId: optionDataTestId,
+              }) => (
+                <SelectOption
+                  key={key}
+                  value={key}
+                  description={<TruncatedText maxLines={2} content={description} />}
+                  isFavorited={isFavorited}
+                  isDisabled={optionDisabled}
+                  data-testid={optionDataTestId || key}
+                >
+                  {dropdownLabel || label}
+                </SelectOption>
+              ),
+            )}
+          </SelectList>
+        ) : null}
+      </Select>
+      {previewDescription && selectedOption?.description ? (
+        <FormHelperText>
+          <HelperText>
+            <HelperTextItem>
+              <TruncatedText maxLines={2} content={selectedOption.description} />
+            </HelperTextItem>
+          </HelperText>
+        </FormHelperText>
       ) : null}
-    </Select>
+    </>
   );
 };
 
diff --git a/clients/ui/frontend/src/shared/components/ToastNotification.tsx b/clients/ui/frontend/src/shared/components/ToastNotification.tsx
index 7f34e7411..d9ebb9d2e 100644
--- a/clients/ui/frontend/src/shared/components/ToastNotification.tsx
+++ b/clients/ui/frontend/src/shared/components/ToastNotification.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Alert, AlertActionCloseButton, AlertVariant } from '@patternfly/react-core';
 import { Notification } from '~/app/types';
-import { asEnumMember } from '~/app/utils';
+import { asEnumMember } from '~/shared/utilities/utils';
 import { useNotification } from '~/app/hooks/useNotification';
 
 const TOAST_NOTIFICATION_TIMEOUT = 8 * 1000;
diff --git a/clients/ui/frontend/src/shared/components/TruncatedText.tsx b/clients/ui/frontend/src/shared/components/TruncatedText.tsx
new file mode 100644
index 000000000..47f4e54f8
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/TruncatedText.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { Tooltip } from '@patternfly/react-core';
+
+type TruncatedTextProps = {
+  maxLines: number;
+  content: React.ReactNode;
+} & Omit<React.HTMLProps<HTMLSpanElement>, 'content'>;
+
+const TruncatedText: React.FC<TruncatedTextProps> = ({ maxLines, content, ...props }) => {
+  const outerElementRef = React.useRef<HTMLElement>(null);
+  const textElementRef = React.useRef<HTMLElement>(null);
+  const [isTruncated, setIsTruncated] = React.useState<boolean>(false);
+
+  const updateTruncation = React.useCallback(() => {
+    if (textElementRef.current && outerElementRef.current) {
+      setIsTruncated(textElementRef.current.offsetHeight > outerElementRef.current.offsetHeight);
+    }
+  }, []);
+
+  const truncateBody = (
+    <span
+      {...props}
+      style={{
+        display: '-webkit-box',
+        WebkitBoxOrient: 'vertical',
+        overflowWrap: 'anywhere',
+        overflow: 'hidden',
+        WebkitLineClamp: maxLines,
+        ...(props.style || {}),
+      }}
+      ref={outerElementRef}
+      onMouseEnter={(e) => {
+        props.onMouseEnter?.(e);
+        updateTruncation();
+      }}
+      onFocus={(e) => {
+        props.onFocus?.(e);
+        updateTruncation();
+      }}
+    >
+      <span ref={textElementRef}>{content}</span>
+    </span>
+  );
+
+  return (
+    <Tooltip hidden={!isTruncated ? true : undefined} content={content}>
+      {truncateBody}
+    </Tooltip>
+  );
+};
+
+export default TruncatedText;
diff --git a/clients/ui/frontend/src/shared/components/TypeaheadSelect.tsx b/clients/ui/frontend/src/shared/components/TypeaheadSelect.tsx
new file mode 100644
index 000000000..77acb8530
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/TypeaheadSelect.tsx
@@ -0,0 +1,469 @@
+import React from 'react';
+import {
+  /**
+   * The Select component is used to build another generic component here
+   */
+  // eslint-disable-next-line no-restricted-imports
+  Select,
+  SelectOption,
+  SelectList,
+  SelectOptionProps,
+  MenuToggle,
+  MenuToggleElement,
+  TextInputGroup,
+  TextInputGroupMain,
+  TextInputGroupUtilities,
+  Button,
+  MenuToggleProps,
+  SelectProps,
+  FormHelperText,
+  HelperTextItem,
+  HelperText,
+} from '@patternfly/react-core';
+import { TimesIcon } from '@patternfly/react-icons';
+import TruncatedText from '~/shared/components/TruncatedText';
+
+export interface TypeaheadSelectOption extends Omit<SelectOptionProps, 'content' | 'isSelected'> {
+  /** Content of the select option. */
+  content: string | number;
+  /** Value of the select option. */
+  value: string | number;
+  /** Indicator for option being selected */
+  isSelected?: boolean;
+}
+
+export interface TypeaheadSelectProps extends Omit<SelectProps, 'toggle' | 'onSelect'> {
+  /** Options of the select */
+  selectOptions: TypeaheadSelectOption[];
+  /** Callback triggered on selection. */
+  onSelect?: (
+    _event:
+      | React.MouseEvent<Element, MouseEvent>
+      | React.KeyboardEvent<HTMLInputElement>
+      | undefined,
+    selection: string | number,
+  ) => void;
+  /** Callback triggered when the select opens or closes. */
+  onToggle?: (nextIsOpen: boolean) => void;
+  /** Callback triggered when the text in the input field changes. */
+  onInputChange?: (newValue: string) => void;
+  /** Function to return items matching the current filter value */
+  filterFunction?: (
+    filterValue: string,
+    options: TypeaheadSelectOption[],
+  ) => TypeaheadSelectOption[];
+  /** Callback triggered when the clear button is selected */
+  onClearSelection?: () => void;
+  /** Flag to allow clear current selection */
+  allowClear?: boolean;
+  /** Placeholder text for the select input. */
+  placeholder?: string;
+  /** Flag to indicate if the typeahead select allows new items */
+  isCreatable?: boolean;
+  /** Flag to indicate if create option should be at top of typeahead */
+  isCreateOptionOnTop?: boolean;
+  /** Message to display to create a new option */
+  createOptionMessage?: string | ((newValue: string) => string);
+  /** Message to display when no options are available. */
+  noOptionsAvailableMessage?: string;
+  /** Message to display when no options match the filter. */
+  noOptionsFoundMessage?: string | ((filter: string) => string);
+  /** Flag indicating the select should be disabled. */
+  isDisabled?: boolean;
+  /** Width of the toggle. */
+  toggleWidth?: string;
+  /** Additional props passed to the toggle. */
+  toggleProps?: MenuToggleProps;
+  /** Flag to indicate if the selection is required or not */
+  isRequired?: boolean;
+  /** Test id of the toggle */
+  dataTestId?: string;
+  /** Flag to indicate if showing the description under the toggle */
+  previewDescription?: boolean;
+}
+
+const defaultNoOptionsFoundMessage = (filter: string) => `No results found for "${filter}"`;
+const defaultCreateOptionMessage = (newValue: string) => `Create "${newValue}"`;
+const defaultFilterFunction = (filterValue: string, options: TypeaheadSelectOption[]) =>
+  options.filter((o) => String(o.content).toLowerCase().includes(filterValue.toLowerCase()));
+
+const TypeaheadSelect: React.FunctionComponent<TypeaheadSelectProps> = ({
+  innerRef,
+  selectOptions,
+  onSelect,
+  onToggle,
+  onInputChange,
+  filterFunction = defaultFilterFunction,
+  onClearSelection,
+  allowClear,
+  placeholder = 'Select an option',
+  noOptionsAvailableMessage = 'No options are available',
+  noOptionsFoundMessage = defaultNoOptionsFoundMessage,
+  isCreatable = false,
+  isCreateOptionOnTop = false,
+  createOptionMessage = defaultCreateOptionMessage,
+  isDisabled,
+  toggleWidth,
+  toggleProps,
+  isRequired = true,
+  dataTestId,
+  previewDescription = true,
+  ...props
+}: TypeaheadSelectProps) => {
+  const [isOpen, setIsOpen] = React.useState(false);
+  const [filterValue, setFilterValue] = React.useState<string>('');
+  const [isFiltering, setIsFiltering] = React.useState<boolean>(false);
+  const [focusedItemIndex, setFocusedItemIndex] = React.useState<number | null>(null);
+  const [activeItemId, setActiveItemId] = React.useState<string | null>(null);
+  const textInputRef = React.useRef<HTMLInputElement>();
+
+  const NO_RESULTS = 'no results';
+
+  const selected = React.useMemo(
+    () => selectOptions.find((option) => option.value === props.selected || option.isSelected),
+    [props.selected, selectOptions],
+  );
+
+  const filteredSelections = React.useMemo(() => {
+    let newSelectOptions: TypeaheadSelectOption[] = selectOptions;
+
+    // Filter menu items based on the text input value when one exists
+    if (isFiltering && filterValue) {
+      newSelectOptions = filterFunction(filterValue, selectOptions);
+
+      if (
+        isCreatable &&
+        filterValue.trim() &&
+        !newSelectOptions.find((o) => String(o.content).toLowerCase() === filterValue.toLowerCase())
+      ) {
+        const createOption = {
+          content:
+            typeof createOptionMessage === 'string'
+              ? createOptionMessage
+              : createOptionMessage(filterValue),
+          value: filterValue,
+        };
+        newSelectOptions = isCreateOptionOnTop
+          ? [createOption, ...newSelectOptions]
+          : [...newSelectOptions, createOption];
+      }
+
+      // When no options are found after filtering, display 'No results found'
+      if (!newSelectOptions.length) {
+        newSelectOptions = [
+          {
+            isAriaDisabled: true,
+            content:
+              typeof noOptionsFoundMessage === 'string'
+                ? noOptionsFoundMessage
+                : noOptionsFoundMessage(filterValue),
+            value: NO_RESULTS,
+          },
+        ];
+      }
+    }
+
+    // When no options are  available,  display 'No options available'
+    if (!newSelectOptions.length) {
+      newSelectOptions = [
+        {
+          isAriaDisabled: true,
+          content: noOptionsAvailableMessage,
+          value: NO_RESULTS,
+        },
+      ];
+    }
+
+    return newSelectOptions;
+  }, [
+    isFiltering,
+    filterValue,
+    filterFunction,
+    selectOptions,
+    noOptionsFoundMessage,
+    isCreatable,
+    isCreateOptionOnTop,
+    createOptionMessage,
+    noOptionsAvailableMessage,
+  ]);
+
+  React.useEffect(() => {
+    if (isFiltering) {
+      openMenu();
+    }
+    // Don't update on openMenu changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isFiltering]);
+
+  const setActiveAndFocusedItem = (itemIndex: number) => {
+    setFocusedItemIndex(itemIndex);
+    const focusedItem = selectOptions[itemIndex];
+    setActiveItemId(String(focusedItem.value));
+  };
+
+  const resetActiveAndFocusedItem = () => {
+    setFocusedItemIndex(null);
+    setActiveItemId(null);
+  };
+
+  const openMenu = () => {
+    if (!isOpen) {
+      if (onToggle) {
+        onToggle(true);
+      }
+      setIsOpen(true);
+    }
+  };
+
+  const closeMenu = () => {
+    if (onToggle) {
+      onToggle(false);
+    }
+    setIsOpen(false);
+    resetActiveAndFocusedItem();
+    setIsFiltering(false);
+    setFilterValue(String(selected?.content ?? ''));
+  };
+
+  const onInputClick = () => {
+    if (!isOpen) {
+      openMenu();
+    }
+    setTimeout(() => {
+      textInputRef.current?.focus();
+    }, 100);
+  };
+
+  const selectOption = (
+    _event:
+      | React.MouseEvent<Element, MouseEvent>
+      | React.KeyboardEvent<HTMLInputElement>
+      | undefined,
+    option: TypeaheadSelectOption,
+  ) => {
+    if (onSelect) {
+      onSelect(_event, option.value);
+    }
+    closeMenu();
+  };
+
+  const notAllowEmpty = !isCreatable && isRequired;
+  // Only when the field is required, not creatable and there is one option, we auto select the first option
+  const isSingleOption = selectOptions.length === 1 && notAllowEmpty;
+  const singleOptionValue = isSingleOption ? selectOptions[0].value : null;
+  // If there is only one option, call the onChange function
+  React.useEffect(() => {
+    if (singleOptionValue && onSelect) {
+      onSelect(undefined, singleOptionValue);
+    }
+    // We don't want the callback function to be a dependency
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [singleOptionValue]);
+
+  const handleSelect = (
+    _event: React.MouseEvent<Element, MouseEvent> | undefined,
+    value: string | number | undefined,
+  ) => {
+    if (value && value !== NO_RESULTS) {
+      const optionToSelect = selectOptions.find((option) => option.value === value);
+      if (optionToSelect) {
+        selectOption(_event, optionToSelect);
+      } else if (isCreatable) {
+        selectOption(_event, { value, content: value });
+      }
+    }
+  };
+
+  const onTextInputChange = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
+    setFilterValue(value || '');
+    setIsFiltering(true);
+    if (onInputChange) {
+      onInputChange(value);
+    }
+
+    resetActiveAndFocusedItem();
+  };
+
+  const handleMenuArrowKeys = (key: string) => {
+    let indexToFocus = 0;
+
+    openMenu();
+
+    if (filteredSelections.every((option) => option.isDisabled)) {
+      return;
+    }
+
+    if (key === 'ArrowUp') {
+      // When no index is set or at the first index, focus to the last, otherwise decrement focus index
+      if (focusedItemIndex === null || focusedItemIndex === 0) {
+        indexToFocus = filteredSelections.length - 1;
+      } else {
+        indexToFocus = focusedItemIndex - 1;
+      }
+
+      // Skip disabled options
+      while (filteredSelections[indexToFocus].isDisabled) {
+        indexToFocus--;
+        if (indexToFocus === -1) {
+          indexToFocus = filteredSelections.length - 1;
+        }
+      }
+    }
+
+    if (key === 'ArrowDown') {
+      // When no index is set or at the last index, focus to the first, otherwise increment focus index
+      if (focusedItemIndex === null || focusedItemIndex === filteredSelections.length - 1) {
+        indexToFocus = 0;
+      } else {
+        indexToFocus = focusedItemIndex + 1;
+      }
+
+      // Skip disabled options
+      while (filteredSelections[indexToFocus].isDisabled) {
+        indexToFocus++;
+        if (indexToFocus === filteredSelections.length) {
+          indexToFocus = 0;
+        }
+      }
+    }
+
+    setActiveAndFocusedItem(indexToFocus);
+  };
+
+  const onInputKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    const focusedItem = focusedItemIndex !== null ? filteredSelections[focusedItemIndex] : null;
+
+    switch (event.key) {
+      case 'Enter':
+        if (
+          isOpen &&
+          focusedItem &&
+          focusedItem.value !== NO_RESULTS &&
+          !focusedItem.isAriaDisabled
+        ) {
+          selectOption(event, focusedItem);
+        }
+
+        openMenu();
+
+        break;
+      case 'ArrowUp':
+      case 'ArrowDown':
+        event.preventDefault();
+        handleMenuArrowKeys(event.key);
+        break;
+    }
+  };
+
+  const onToggleClick = () => {
+    if (!isOpen) {
+      openMenu();
+    } else {
+      closeMenu();
+    }
+    textInputRef.current?.focus();
+  };
+
+  const onClearButtonClick = () => {
+    if (isFiltering && filterValue) {
+      if (selected && onSelect) {
+        onSelect(undefined, selected.value);
+      }
+      setFilterValue('');
+      if (onInputChange) {
+        onInputChange('');
+      }
+      setIsFiltering(false);
+    }
+
+    resetActiveAndFocusedItem();
+    textInputRef.current?.focus();
+
+    if (onClearSelection) {
+      onClearSelection();
+    }
+  };
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      ref={toggleRef}
+      variant="typeahead"
+      aria-label="Typeahead menu toggle"
+      data-testid={dataTestId}
+      onClick={onToggleClick}
+      isExpanded={isOpen}
+      isDisabled={isDisabled || (selectOptions.length <= 1 && notAllowEmpty)}
+      isFullWidth
+      style={{ width: toggleWidth }}
+      {...toggleProps}
+    >
+      <TextInputGroup isPlain>
+        <TextInputGroupMain
+          value={isFiltering ? filterValue : (selected?.content ?? '')}
+          onClick={onInputClick}
+          onChange={onTextInputChange}
+          onKeyDown={onInputKeyDown}
+          autoComplete="off"
+          innerRef={textInputRef}
+          placeholder={placeholder}
+          {...(activeItemId && { 'aria-activedescendant': activeItemId })}
+          role="combobox"
+          isExpanded={isOpen}
+          aria-controls="select-typeahead-listbox"
+        />
+        {(isFiltering && filterValue) || (allowClear && selected) ? (
+          <TextInputGroupUtilities>
+            <Button
+              icon={<TimesIcon aria-hidden />}
+              variant="plain"
+              onClick={onClearButtonClick}
+              aria-label="Clear input value"
+            />
+          </TextInputGroupUtilities>
+        ) : null}
+      </TextInputGroup>
+    </MenuToggle>
+  );
+
+  return (
+    <>
+      <Select
+        isOpen={isOpen}
+        selected={selected}
+        onSelect={handleSelect}
+        onOpenChange={(open) => !open && closeMenu()}
+        toggle={toggle}
+        shouldFocusFirstItemOnOpen={false}
+        ref={innerRef}
+        {...props}
+      >
+        <SelectList>
+          {filteredSelections.map((option, index) => {
+            const { content, value, ...optionProps } = option;
+            return (
+              <SelectOption
+                key={value}
+                value={value}
+                isFocused={focusedItemIndex === index}
+                {...optionProps}
+              >
+                {content}
+              </SelectOption>
+            );
+          })}
+        </SelectList>
+      </Select>
+      {previewDescription && isSingleOption && selected?.description ? (
+        <FormHelperText>
+          <HelperText>
+            <HelperTextItem>
+              <TruncatedText maxLines={2} content={selected.description} />
+            </HelperTextItem>
+          </HelperText>
+        </FormHelperText>
+      ) : null}
+    </>
+  );
+};
+
+export default TypeaheadSelect;
diff --git a/clients/ui/frontend/src/shared/components/WhosMyAdministrator.tsx b/clients/ui/frontend/src/shared/components/WhosMyAdministrator.tsx
new file mode 100644
index 000000000..48e093b2a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/WhosMyAdministrator.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react';
+import { Button, Popover, PopoverPosition } from '@patternfly/react-core';
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+import PopoverListContent from '~/shared/components/PopoverListContent';
+import { FindAdministratorOptions } from '~/shared/utilities/const';
+
+type Props = {
+  buttonLabel?: string;
+  headerContent?: string;
+  leadText?: string;
+  isInline?: boolean;
+  contentTestId?: string;
+  linkTestId?: string;
+  popoverPosition?: PopoverPosition;
+};
+
+const WhosMyAdministrator: React.FC<Props> = ({
+  buttonLabel = "Who's my administrator?",
+  headerContent,
+  leadText,
+  isInline,
+  contentTestId,
+  linkTestId,
+  popoverPosition = PopoverPosition.bottom,
+}) => (
+  <Popover
+    showClose
+    position={popoverPosition}
+    headerContent={headerContent || 'Your administrator might be:'}
+    hasAutoWidth
+    maxWidth="370px"
+    bodyContent={
+      <PopoverListContent
+        data-testid={contentTestId}
+        leadText={leadText}
+        listHeading={headerContent ? 'Your administrator might be:' : undefined}
+        listItems={FindAdministratorOptions}
+      />
+    }
+  >
+    <Button
+      isInline={isInline}
+      variant="link"
+      icon={<OutlinedQuestionCircleIcon />}
+      data-testid={linkTestId}
+    >
+      {buttonLabel}
+    </Button>
+  </Popover>
+);
+
+export default WhosMyAdministrator;
diff --git a/clients/ui/frontend/src/shared/components/dashboard/DashboardPopupIconButton.tsx b/clients/ui/frontend/src/shared/components/dashboard/DashboardPopupIconButton.tsx
new file mode 100644
index 000000000..eb5b0db48
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/dashboard/DashboardPopupIconButton.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Button, ButtonProps, Icon, IconComponentProps } from '@patternfly/react-core';
+
+type DashboardPopupIconButtonProps = Omit<ButtonProps, 'variant' | 'isInline'> & {
+  icon: React.ReactNode;
+  iconProps?: Omit<IconComponentProps, 'isInline'>;
+};
+
+/**
+ * Overriding PF's button styles to allow for a11y in opening tooltips or popovers on a single item
+ */
+const DashboardPopupIconButton = ({
+  icon,
+  iconProps,
+  ...props
+}: DashboardPopupIconButtonProps): React.JSX.Element => (
+  <Button
+    icon={
+      <Icon isInline {...iconProps}>
+        {icon}
+      </Icon>
+    }
+    variant="plain"
+    isInline
+    {...props}
+  />
+);
+
+export default DashboardPopupIconButton;
diff --git a/clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx b/clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx
index ce72a7502..8ae717502 100644
--- a/clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx
+++ b/clients/ui/frontend/src/shared/components/design/HeaderIcon.tsx
@@ -2,29 +2,31 @@ import * as React from 'react';
 import {
   sectionTypeBackgroundColor,
   typedBackgroundColor,
-  typedObjectImage,
   ProjectObjectType,
   SectionType,
+  sectionTypeIconColor,
+  typedIconColor,
 } from '~/shared/components/design/utils';
+import TypedObjectIcon from '~/shared/components/design/TypedObjectIcon';
 
 interface HeaderIconProps {
   size?: number;
   padding?: number;
-  image?: string;
+  display?: string;
   type: ProjectObjectType;
   sectionType?: SectionType;
 }
 
 const HeaderIcon: React.FC<HeaderIconProps> = ({
   size = 40,
-  padding = 2,
-  image,
+  padding = 4,
+  display = 'inline-block',
   type,
   sectionType,
 }) => (
   <div
     style={{
-      display: 'inline-block',
+      display,
       width: size,
       height: size,
       padding,
@@ -32,13 +34,12 @@ const HeaderIcon: React.FC<HeaderIconProps> = ({
       background: sectionType
         ? sectionTypeBackgroundColor(sectionType)
         : typedBackgroundColor(type),
+      color: sectionType ? sectionTypeIconColor(sectionType) : typedIconColor(type),
     }}
   >
-    <img
-      width={size - padding * 2}
-      height={size - padding * 2}
-      src={image || typedObjectImage(type)}
-      alt=""
+    <TypedObjectIcon
+      resourceType={type}
+      style={{ width: size - padding * 2, height: size - padding * 2 }}
     />
   </div>
 );
diff --git a/clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx b/clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx
index c40bd8089..d0a3149f3 100644
--- a/clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx
+++ b/clients/ui/frontend/src/shared/components/design/TitleWithIcon.tsx
@@ -5,6 +5,7 @@ import {
   typedBackgroundColor,
   typedObjectImage,
 } from '~/shared/components/design/utils';
+import TypedObjectIcon from '~/shared/components/design/TypedObjectIcon';
 
 interface TitleWithIconProps {
   title: React.ReactNode;
@@ -30,7 +31,11 @@ const TitleWithIcon: React.FC<TitleWithIconProps> = ({
           height: iconSize,
         }}
       >
-        <img style={{ height: iconSize - padding * 2 }} src={typedObjectImage(objectType)} alt="" />
+        <TypedObjectIcon
+          resourceType={objectType}
+          style={{ width: iconSize - padding * 2, height: iconSize - padding * 2 }}
+          src={typedObjectImage(objectType)}
+        />
       </div>
     </FlexItem>
     <FlexItem>{title}</FlexItem>
diff --git a/clients/ui/frontend/src/shared/components/design/TypedObjectIcon.tsx b/clients/ui/frontend/src/shared/components/design/TypedObjectIcon.tsx
new file mode 100644
index 000000000..1047f9cd2
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/design/TypedObjectIcon.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
+import { ProjectObjectType, typedColor } from '~/shared/components/design/utils';
+import { RegisteredModelIcon } from '~/shared/images/icons';
+
+type TypedObjectIconProps = SVGIconProps & {
+  resourceType: ProjectObjectType;
+  useTypedColor?: boolean;
+  size?: number;
+};
+const TypedObjectIcon: React.FC<TypedObjectIconProps> = ({
+  resourceType,
+  useTypedColor,
+  style,
+  ...rest
+}) => {
+  let Icon;
+
+  switch (resourceType) {
+    case ProjectObjectType.registeredModels:
+    case ProjectObjectType.modelRegistrySettings:
+      Icon = RegisteredModelIcon;
+      break;
+    default:
+      return null;
+  }
+
+  return (
+    <Icon
+      style={{
+        color: useTypedColor ? typedColor(resourceType) : undefined,
+        ...(style || {}),
+      }}
+      {...rest}
+    />
+  );
+};
+
+export default TypedObjectIcon;
diff --git a/clients/ui/frontend/src/shared/components/design/utils.ts b/clients/ui/frontend/src/shared/components/design/utils.ts
index 36d390559..06880e7e5 100644
--- a/clients/ui/frontend/src/shared/components/design/utils.ts
+++ b/clients/ui/frontend/src/shared/components/design/utils.ts
@@ -1,7 +1,25 @@
-import registerModelImg from '~/images/UI_icon-Cubes-RGB.svg';
-import modelRegistryEmptyStateImg from '~/images/empty-state-model-registries.svg';
-import modelRegistryMissingModelImg from '~/images/no-models-model-registry.svg';
-import modelRegistryMissingVersionImg from '~/images/no-versions-model-registry.svg';
+import projectImg from '~/shared/images/UI_icon-Red_Hat-Folder-RGB.svg';
+import notebookImg from '~/shared/images/UI_icon-Red_Hat-Wrench-RGB.svg';
+import pipelineImg from '~/shared/images/UI_icon-Red_Hat-Branch-RGB.svg';
+import pipelineRunImg from '~/shared/images/UI_icon-Red_Hat-Double_arrow_right-RGB.svg';
+import clusterStorageImg from '~/shared/images/UI_icon-Red_Hat-Storage-RGB.svg';
+import modelServerImg from '~/shared/images/UI_icon-Red_Hat-Server-RGB.svg';
+import registeredModelsImg from '~/shared/images/Icon-Red_Hat-Layered_A_Black-RGB.svg';
+import deployedModelsImg from '~/shared/images/UI_icon-Red_Hat-Cubes-RGB.svg';
+import deployingModelsImg from '~/shared/images/UI_icon-Red_Hat-Server_upload-RGB.svg';
+import dataConnectionImg from '~/shared/images/UI_icon-Red_Hat-Connected-RGB.svg';
+import userImg from '~/shared/images/UI_icon-Red_Hat-User-RGB.svg';
+import groupImg from '~/shared/images/UI_icon-Red_Hat-Shared_workspace-RGB.svg';
+import projectEmptyStateImg from '~/shared/images/empty-state-project-overview.svg';
+import notebookEmptyStateImg from '~/shared/images/empty-state-notebooks.svg';
+import pipelineEmptyStateImg from '~/shared/images/empty-state-pipelines.svg';
+import clusterStorageEmptyStateImg from '~/shared/images/empty-state-cluster-storage.svg';
+import modelServerEmptyStateImg from '~/shared/images/empty-state-model-serving.svg';
+import dataConnectionEmptyStateImg from '~/shared/images/empty-state-data-connections.svg';
+import modelRegistryEmptyStateImg from '~/shared/images/empty-state-model-registries.svg';
+import storageClassesEmptyStateImg from '~/shared/images/empty-state-storage-classes.svg';
+import modelRegistryMissingModelImg from '~/shared/images/no-models-model-registry.svg';
+import modelRegistryMissingVersionImg from '~/shared/images/no-versions-model-registry.svg';
 
 import './vars.scss';
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
@@ -16,13 +34,189 @@ export enum SectionType {
 }
 
 export enum ProjectObjectType {
+  project = 'project',
+  projectContext = 'projectContext',
+  notebook = 'notebook',
+  notebookImage = 'notebookImage',
+  build = 'build',
+  pipelineSetup = 'pipeline-setup',
+  pipeline = 'pipeline',
+  pipelineRun = 'pipeline-run',
+  pipelineExperiment = 'pipeline-experiment',
+  pipelineExecution = 'pipeline-execution',
+  pipelineArtifact = 'pipeline-artifact',
+  clusterStorage = 'cluster-storage',
+  model = 'model',
+  singleModel = 'single-model',
+  multiModel = 'multi-model',
+  modelServer = 'model-server',
   registeredModels = 'registered-models',
+  deployedModels = 'deployed-models',
+  deployingModels = 'deploying-models',
+  modelRegistrySettings = 'model-registry-settings',
+  servingRuntime = 'serving-runtime',
+  distributedWorkload = 'distributed-workload',
+  dataConnection = 'data-connection',
+  connections = 'connections',
+  clusterSettings = 'cluster-settings',
+  acceleratorProfile = 'accelerator-profile',
+  permissions = 'permissions',
+  user = 'user',
+  group = 'group',
+  storageClasses = 'storageClasses',
+  enabledApplications = 'enabled-applications',
+  exploreApplications = 'explore-applications',
+  resources = 'resources',
 }
 
+export const typedIconColor = (objectType: ProjectObjectType): string => {
+  switch (objectType) {
+    case ProjectObjectType.project:
+      return 'var(--ai-project--IconColor)';
+    case ProjectObjectType.projectContext:
+      return 'var(--ai-project-context--IconColor)';
+    case ProjectObjectType.notebook:
+      return 'var(--ai-notebook--IconColor)';
+    case ProjectObjectType.notebookImage:
+      return 'var(--ai-set-up--IconColor)';
+    case ProjectObjectType.pipeline:
+    case ProjectObjectType.pipelineRun:
+    case ProjectObjectType.pipelineExperiment:
+    case ProjectObjectType.pipelineExecution:
+    case ProjectObjectType.pipelineArtifact:
+      return 'var(--ai-pipeline--IconColor)';
+    case ProjectObjectType.pipelineSetup:
+      return 'var(--ai-set-up--IconColor)';
+    case ProjectObjectType.clusterStorage:
+    case ProjectObjectType.storageClasses:
+      return 'var(--ai-cluster-storage--IconColor)';
+    case ProjectObjectType.model:
+    case ProjectObjectType.singleModel:
+    case ProjectObjectType.multiModel:
+    case ProjectObjectType.modelServer:
+    case ProjectObjectType.registeredModels:
+    case ProjectObjectType.deployedModels:
+    case ProjectObjectType.deployingModels:
+      return 'var(--ai-model-server--IconColor)';
+    case ProjectObjectType.modelRegistrySettings:
+      return 'var(--ai-set-up--IconColor)';
+    case ProjectObjectType.dataConnection:
+    case ProjectObjectType.connections:
+      return 'var(--ai-data-connection--IconColor)';
+    case ProjectObjectType.user:
+      return 'var(--ai-user--IconColor)';
+    case ProjectObjectType.group:
+      return 'var(--ai-group--IconColor)';
+    case ProjectObjectType.permissions:
+      return 'var(--ai-set-up--IconColor)';
+    case ProjectObjectType.enabledApplications:
+    case ProjectObjectType.exploreApplications:
+      return 'var(--ai-config--IconColor)';
+    case ProjectObjectType.resources:
+      return 'var(--ai-general--IconColor)';
+    case ProjectObjectType.distributedWorkload:
+      return 'var(--ai-serving--IconColor)';
+    case ProjectObjectType.clusterSettings:
+    case ProjectObjectType.acceleratorProfile:
+      return 'var(--ai-set-up--IconColor)';
+    case ProjectObjectType.servingRuntime:
+      return 'var(--ai-set-up--IconColor)';
+    default:
+      return '';
+  }
+};
+
 export const typedBackgroundColor = (objectType: ProjectObjectType): string => {
   switch (objectType) {
+    case ProjectObjectType.project:
+      return 'var(--ai-project--BackgroundColor)';
+    case ProjectObjectType.projectContext:
+      return 'var(--ai-project-context--BackgroundColor)';
+    case ProjectObjectType.notebook:
+      return 'var(--ai-notebook--BackgroundColor)';
+    case ProjectObjectType.notebookImage:
+      return 'var(--ai-set-up--BackgroundColor)';
+    case ProjectObjectType.pipeline:
+    case ProjectObjectType.pipelineRun:
+    case ProjectObjectType.pipelineExperiment:
+    case ProjectObjectType.pipelineExecution:
+    case ProjectObjectType.pipelineArtifact:
+      return 'var(--ai-pipeline--BackgroundColor)';
+    case ProjectObjectType.pipelineSetup:
+      return 'var(--ai-set-up--BackgroundColor)';
+    case ProjectObjectType.clusterStorage:
+    case ProjectObjectType.storageClasses:
+      return 'var(--ai-cluster-storage--BackgroundColor)';
+    case ProjectObjectType.model:
+    case ProjectObjectType.singleModel:
+    case ProjectObjectType.multiModel:
+    case ProjectObjectType.modelServer:
     case ProjectObjectType.registeredModels:
+    case ProjectObjectType.deployedModels:
+    case ProjectObjectType.deployingModels:
       return 'var(--ai-model-server--BackgroundColor)';
+    case ProjectObjectType.modelRegistrySettings:
+      return 'var(--ai-set-up--BackgroundColor)';
+    case ProjectObjectType.dataConnection:
+    case ProjectObjectType.connections:
+      return 'var(--ai-data-connection--BackgroundColor)';
+    case ProjectObjectType.user:
+      return 'var(--ai-user--BackgroundColor)';
+    case ProjectObjectType.group:
+      return 'var(--ai-group--BackgroundColor)';
+    case ProjectObjectType.permissions:
+      return 'var(--ai-set-up--BackgroundColor)';
+    case ProjectObjectType.enabledApplications:
+    case ProjectObjectType.exploreApplications:
+      return 'var(--ai-config--BackgroundColor)';
+    case ProjectObjectType.resources:
+      return 'var(--ai-general--BackgroundColor)';
+    case ProjectObjectType.distributedWorkload:
+      return 'var(--ai-serving--BackgroundColor)';
+    case ProjectObjectType.clusterSettings:
+    case ProjectObjectType.acceleratorProfile:
+      return 'var(--ai-set-up--BackgroundColor)';
+    case ProjectObjectType.servingRuntime:
+      return 'var(--ai-set-up--BackgroundColor)';
+    default:
+      return '';
+  }
+};
+
+export const typedColor = (objectType: ProjectObjectType): string => {
+  switch (objectType) {
+    case ProjectObjectType.project:
+      return 'var(--ai-project--Color)';
+    case ProjectObjectType.projectContext:
+      return 'var(--ai-project-context--Color)';
+    case ProjectObjectType.notebook:
+    case ProjectObjectType.notebookImage:
+      return 'var(--ai-training--BackgroundColor)';
+    case ProjectObjectType.build:
+      return 'var(--ai-model-server--Color)';
+    case ProjectObjectType.pipeline:
+    case ProjectObjectType.pipelineRun:
+    case ProjectObjectType.pipelineExecution:
+    case ProjectObjectType.pipelineArtifact:
+      return 'var(--ai-pipeline--Color)';
+    case ProjectObjectType.pipelineSetup:
+      return 'var(--ai-set-up--Color)';
+    case ProjectObjectType.clusterStorage:
+      return 'var(--ai-cluster-storage--Color)';
+    case ProjectObjectType.modelServer:
+    case ProjectObjectType.registeredModels:
+    case ProjectObjectType.deployedModels:
+    case ProjectObjectType.deployingModels:
+      return 'var(--ai-model-server--Color)';
+    case ProjectObjectType.modelRegistrySettings:
+      return 'var(--ai-set-up--Color)';
+    case ProjectObjectType.dataConnection:
+    case ProjectObjectType.connections:
+      return 'var(--ai-data-connection--Color)';
+    case ProjectObjectType.user:
+      return 'var(--ai-user--Color)';
+    case ProjectObjectType.group:
+      return 'var(--ai-group--Color)';
     default:
       return '';
   }
@@ -30,8 +224,33 @@ export const typedBackgroundColor = (objectType: ProjectObjectType): string => {
 
 export const typedObjectImage = (objectType: ProjectObjectType): string => {
   switch (objectType) {
+    case ProjectObjectType.project:
+    case ProjectObjectType.projectContext:
+      return projectImg;
+    case ProjectObjectType.notebook:
+      return notebookImg;
+    case ProjectObjectType.pipeline:
+    case ProjectObjectType.pipelineSetup:
+      return pipelineImg;
+    case ProjectObjectType.pipelineRun:
+      return pipelineRunImg;
+    case ProjectObjectType.clusterStorage:
+      return clusterStorageImg;
+    case ProjectObjectType.modelServer:
+      return modelServerImg;
     case ProjectObjectType.registeredModels:
-      return registerModelImg;
+      return registeredModelsImg;
+    case ProjectObjectType.deployedModels:
+      return deployedModelsImg;
+    case ProjectObjectType.deployingModels:
+      return deployingModelsImg;
+    case ProjectObjectType.dataConnection:
+    case ProjectObjectType.connections:
+      return dataConnectionImg;
+    case ProjectObjectType.user:
+      return userImg;
+    case ProjectObjectType.group:
+      return groupImg;
     default:
       return '';
   }
@@ -39,15 +258,52 @@ export const typedObjectImage = (objectType: ProjectObjectType): string => {
 
 export const typedEmptyImage = (objectType: ProjectObjectType, option?: string): string => {
   switch (objectType) {
+    case ProjectObjectType.project:
+    case ProjectObjectType.projectContext:
+      return projectEmptyStateImg;
+    case ProjectObjectType.notebook:
+      return notebookEmptyStateImg;
+    case ProjectObjectType.pipeline:
+    case ProjectObjectType.pipelineRun:
+    case ProjectObjectType.pipelineSetup:
+      return pipelineEmptyStateImg;
+    case ProjectObjectType.clusterStorage:
+      return clusterStorageEmptyStateImg;
+    case ProjectObjectType.modelServer:
+      return modelServerEmptyStateImg;
     case ProjectObjectType.registeredModels:
       switch (option) {
         case 'MissingModel':
           return modelRegistryMissingModelImg;
         case 'MissingVersion':
           return modelRegistryMissingVersionImg;
+        case 'MissingDeployment':
+          return modelServerEmptyStateImg;
         default:
           return modelRegistryEmptyStateImg;
       }
+    case ProjectObjectType.storageClasses:
+      return storageClassesEmptyStateImg;
+    case ProjectObjectType.dataConnection:
+    case ProjectObjectType.connections:
+      return dataConnectionEmptyStateImg;
+    default:
+      return '';
+  }
+};
+
+export const sectionTypeIconColor = (sectionType: SectionType): string => {
+  switch (sectionType) {
+    case SectionType.setup:
+      return 'var(--ai-set-up--IconColor)';
+    case SectionType.organize:
+      return 'var(--ai-organize--IconColor)';
+    case SectionType.training:
+      return 'var(--ai-training--IconColor)';
+    case SectionType.serving:
+      return 'var(--ai-serving--IconColor)';
+    case SectionType.general:
+      return 'var(--ai-general--IconColor)';
     default:
       return '';
   }
diff --git a/clients/ui/frontend/src/shared/components/notFound/NotFound.tsx b/clients/ui/frontend/src/shared/components/notFound/NotFound.tsx
new file mode 100644
index 000000000..c4f4519b4
--- /dev/null
+++ b/clients/ui/frontend/src/shared/components/notFound/NotFound.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import { HomeIcon, PathMissingIcon } from '@patternfly/react-icons';
+import {
+  Button,
+  EmptyState,
+  EmptyStateBody,
+  EmptyStateFooter,
+  EmptyStateVariant,
+  PageSection,
+} from '@patternfly/react-core';
+
+const NotFound: React.FC = () => (
+  <PageSection hasBodyWrapper={false}>
+    <EmptyState
+      headingLevel="h2"
+      icon={PathMissingIcon}
+      titleText="We can‘t find that page"
+      variant={EmptyStateVariant.full}
+      data-testid="not-found-page"
+    >
+      <EmptyStateBody data-testid="not-found-page-description">
+        Another page might have what you need. Return to the home page.
+      </EmptyStateBody>
+      <EmptyStateFooter>
+        <Button
+          icon={<HomeIcon />}
+          data-testid="home-page-button"
+          component="a"
+          href="/"
+          variant="primary"
+        >
+          Home
+        </Button>
+      </EmptyStateFooter>
+    </EmptyState>
+  </PageSection>
+);
+
+export default NotFound;
diff --git a/clients/ui/frontend/src/shared/components/table/TableBase.tsx b/clients/ui/frontend/src/shared/components/table/TableBase.tsx
index bf2f730a7..c79ead7bd 100644
--- a/clients/ui/frontend/src/shared/components/table/TableBase.tsx
+++ b/clients/ui/frontend/src/shared/components/table/TableBase.tsx
@@ -20,6 +20,7 @@ import {
   Td,
   TbodyProps,
   InnerScrollContainer,
+  TrProps,
 } from '@patternfly/react-table';
 import { EitherNotBoth } from '~/shared/typeHelpers';
 import { GetColumnSort, SortableData } from './types';
@@ -27,6 +28,8 @@ import { CHECKBOX_FIELD_ID, EXPAND_FIELD_ID, KEBAB_FIELD_ID } from './const';
 
 type Props<DataType> = {
   loading?: boolean;
+  skeletonRowCount?: number;
+  skeletonRowProps?: TrProps;
   data: DataType[];
   columns: SortableData<DataType>[];
   subColumns?: SortableData<DataType>[];
@@ -36,6 +39,7 @@ type Props<DataType> = {
   enablePagination?: boolean | 'compact';
   truncateRenderingAt?: number;
   toolbarContent?: React.ReactElement<typeof ToolbarItem | typeof ToolbarGroup>;
+  onClearFilters?: () => void;
   bottomToolbarContent?: React.ReactElement<typeof ToolbarItem | typeof ToolbarGroup>;
   emptyTableView?: React.ReactNode;
   caption?: string;
@@ -92,6 +96,7 @@ const TableBase = <T,>({
   rowRenderer,
   enablePagination,
   toolbarContent,
+  onClearFilters,
   bottomToolbarContent,
   emptyTableView,
   caption,
@@ -109,6 +114,8 @@ const TableBase = <T,>({
   getColumnSort,
   itemCount = 0,
   loading,
+  skeletonRowCount,
+  skeletonRowProps = {},
   toggleTemplate,
   disableItemCount = false,
   hasStickyColumns,
@@ -131,6 +138,7 @@ const TableBase = <T,>({
       variant={variant}
       widgetId="table-pagination"
       perPageOptions={perPageOptions}
+      menuAppendTo="inline"
       titles={{
         paginationAriaLabel: `${variant} pagination`,
       }}
@@ -192,6 +200,7 @@ const TableBase = <T,>({
         stickyLeftOffset={col.stickyLeftOffset}
         hasRightBorder={col.hasRightBorder}
         modifier={col.modifier}
+        visibility={col.visibility}
         className={col.className}
       >
         {col.label}
@@ -207,7 +216,7 @@ const TableBase = <T,>({
       ? // compute the number of items in the upcoming page
         new Array(
           itemCount === 0
-            ? rowHeightsRef.current?.length || MIN_PAGE_SIZE
+            ? skeletonRowCount || rowHeightsRef.current?.length || MIN_PAGE_SIZE
             : Math.max(0, Math.min(perPage, itemCount - perPage * (page - 1))),
         )
           .fill(undefined)
@@ -218,7 +227,11 @@ const TableBase = <T,>({
             const getRow = () => (
               <Tr
                 key={`skeleton-${i}`}
-                style={{ height: rowHeightsRef.current?.[i] || rowHeightsRef.current?.[0] }}
+                {...skeletonRowProps}
+                style={{
+                  ...(skeletonRowProps.style || {}),
+                  height: rowHeightsRef.current?.[i] || rowHeightsRef.current?.[0],
+                }}
               >
                 {columns.map((col) => (
                   <Td
@@ -258,6 +271,7 @@ const TableBase = <T,>({
     <Table {...props} {...(hasStickyColumns && { gridBreakPoint: '' })} ref={tableRef}>
       {caption && <Caption>{caption}</Caption>}
       <Thead noWrap hasNestedHeader={hasNestedHeader}>
+        {/* Note from PF: following custom style can be removed when we can resolve misalignment issue natively */}
         <Tr>{columns.map((col, i) => renderColumnHeader(col, i))}</Tr>
         {subColumns?.length ? (
           <Tr>{subColumns.map((col, i) => renderColumnHeader(col, columns.length + i, true))}</Tr>
@@ -274,7 +288,8 @@ const TableBase = <T,>({
         <Toolbar
           inset={{ default: 'insetNone' }}
           className="pf-v6-u-w-100"
-          customLabelGroupContent={<></>}
+          customLabelGroupContent={onClearFilters ? undefined : <></>}
+          clearAllFilters={onClearFilters}
         >
           <ToolbarContent>
             {toolbarContent}
@@ -299,18 +314,12 @@ const TableBase = <T,>({
         </div>
       )}
 
-      {(bottomToolbarContent || showPagination) && (
+      {bottomToolbarContent && (
         <Toolbar inset={{ default: 'insetNone' }} className="pf-v6-u-w-100">
-          <ToolbarContent alignItems="center">
-            {bottomToolbarContent}
-            {showPagination && (
-              <ToolbarItem variant="pagination" align={{ default: 'alignEnd' }}>
-                {pagination('bottom')}
-              </ToolbarItem>
-            )}
-          </ToolbarContent>
+          <ToolbarContent alignItems="center">{bottomToolbarContent}</ToolbarContent>
         </Toolbar>
       )}
+      {showPagination && <>{pagination('bottom')}</>}
     </>
   );
 };
diff --git a/clients/ui/frontend/src/shared/components/table/types.ts b/clients/ui/frontend/src/shared/components/table/types.ts
index 8e6bc1558..a223b8ee0 100644
--- a/clients/ui/frontend/src/shared/components/table/types.ts
+++ b/clients/ui/frontend/src/shared/components/table/types.ts
@@ -11,6 +11,7 @@ export type SortableData<T> = Pick<
   | 'modifier'
   | 'width'
   | 'info'
+  | 'visibility'
   | 'className'
 > & {
   label: string;
@@ -24,4 +25,6 @@ export type SortableData<T> = Pick<
    * Assume ASC -- the result will be inverted internally if needed.
    */
   sortable: boolean | ((a: T, b: T, keyField: string) => number);
+  // The below can be removed when PatternFly adds a replacement utility class for pf-v6-u-background-color-200 in v6
+  style?: React.CSSProperties;
 };
diff --git a/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Layered_A_Black-RGB.svg b/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Layered_A_Black-RGB.svg
new file mode 100644
index 000000000..6e287adac
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Layered_A_Black-RGB.svg
@@ -0,0 +1,66 @@
+<svg id="f5aa912d-8d1f-4bdf-a271-498170a1de49" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
+  <title>Layered icon - Black</title>
+<desc>stacks, stacked, combine, merge, top, bottom, sandwich, overlap, multiple, diagrams and graphs</desc>
+<metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 8.0-c001 1.000000, 0000/00/00-00:00:00        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:cq="http://www.day.com/jcr/cq/1.0"
+            xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
+         <xmp:rhcc-effective-on>2023-12-08T17:35:00.619Z</xmp:rhcc-effective-on>
+         <xmp:rhcc-metadata-complete-moderator>pending</xmp:rhcc-metadata-complete-moderator>
+         <xmp:rhcc-translation-id>TRA85f90967-e20e-494c-afe3-285b3277006f</xmp:rhcc-translation-id>
+         <xmp:brand-content-type>Icon</xmp:brand-content-type>
+         <xmp:CreateDate>2023-12-08T17:35:00.619Z</xmp:CreateDate>
+         <xmp:rhcc-effective-on-set-on-upload>true</xmp:rhcc-effective-on-set-on-upload>
+         <xmp:rhcc-metadata-complete-uploader>pending</xmp:rhcc-metadata-complete-uploader>
+         <xmp:rhcc-file-last-modified>2023-12-08T17:35:17.197Z</xmp:rhcc-file-last-modified>
+         <xmp:rhcc-audience>rhcc-audience:internal</xmp:rhcc-audience>
+         <xmp:rhcc-rights-restricted>no</xmp:rhcc-rights-restricted>
+         <xmp:brand-content-subtype>Icon</xmp:brand-content-subtype>
+         <xmp:rhcc-derivative-id>DER85f90967-e20e-494c-afe3-285b3277006f</xmp:rhcc-derivative-id>
+         <xmp:brand-logo-color>Black</xmp:brand-logo-color>
+         <xmp:rhcc-notify-portal-subscribers-on-change>yes</xmp:rhcc-notify-portal-subscribers-on-change>
+         <dc:format>image/svg+xml</dc:format>
+         <dc:modified>2024-02-09T20:35:03.611Z</dc:modified>
+         <dc:title>
+            <rdf:Alt>
+               <rdf:li xml:lang="x-default">Layered icon - Black</rdf:li>
+            </rdf:Alt>
+         </dc:title>
+         <dc:description>
+            <rdf:Alt>
+               <rdf:li xml:lang="x-default">stacks, stacked, combine, merge, top, bottom, sandwich, overlap, multiple, diagrams and graphs</rdf:li>
+            </rdf:Alt>
+         </dc:description>
+         <cq:lastReplicationAction_scene7>Activate</cq:lastReplicationAction_scene7>
+         <cq:lastReplicationAction_publish>Activate</cq:lastReplicationAction_publish>
+         <cq:lastReplicated_publish>2024-02-09T22:22:36.870Z</cq:lastReplicated_publish>
+         <cq:lastReplicatedBy>workflow-process-service</cq:lastReplicatedBy>
+         <cq:lastReplicationAction>Activate</cq:lastReplicationAction>
+         <cq:lastReplicatedBy_publish>workflow-process-service</cq:lastReplicatedBy_publish>
+         <cq:isDelivered>true</cq:isDelivered>
+         <cq:lastReplicated>2024-02-09T22:22:36.870Z</cq:lastReplicated>
+         <cq:lastReplicatedBy_scene7>workflow-process-service</cq:lastReplicatedBy_scene7>
+         <cq:lastReplicated_scene7>2024-02-09T22:22:36.870Z</cq:lastReplicated_scene7>
+         <tiff:ImageLength>36</tiff:ImageLength>
+         <tiff:ImageWidth>36</tiff:ImageWidth>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                 
+<?xpacket end="w"?></metadata>
+<path d="M31,11.38H24.62V5A.62.62,0,0,0,24,4.38H5A.62.62,0,0,0,4.38,5V24a.62.62,0,0,0,.62.62h6.38V31a.62.62,0,0,0,.62.62H31a.62.62,0,0,0,.62-.62V12A.62.62,0,0,0,31,11.38ZM11.38,12V23.38H5.62V5.62H23.38v5.76H12A.62.62,0,0,0,11.38,12Zm19,18.38H12.62V12.62H30.38Z"/>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Storage-A-Black-RGB.svg b/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Storage-A-Black-RGB.svg
new file mode 100644
index 000000000..5e1d56401
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Storage-A-Black-RGB.svg
@@ -0,0 +1,3 @@
+<svg id="eaad59ab-3095-4de5-b3a7-9641e4916a61" data-name="Icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
+  <path d="M18,7.35C10.35,7.35,4.35,10.71,4.35,15v6c0,4.29,6,7.65,13.65,7.65S31.65,25.29,31.65,21V15C31.65,10.71,25.65,7.35,18,7.35Zm0,1.3c6.7,0,12.35,2.91,12.35,6.35S24.7,21.35,18,21.35,5.65,18.44,5.65,15,11.3,8.65,18,8.65Zm0,18.7c-6.7,0-12.35-2.91-12.35-6.35V18.29c2.16,2.6,6.81,4.36,12.35,4.36s10.19-1.76,12.35-4.36V21C30.35,24.44,24.7,27.35,18,27.35Z"/>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Sys_admin-A-Black-RGB.svg b/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Sys_admin-A-Black-RGB.svg
new file mode 100644
index 000000000..c41b30255
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/Icon-Red_Hat-Sys_admin-A-Black-RGB.svg
@@ -0,0 +1,8 @@
+<svg id="ec9e3690-9f9c-4bb1-b6d6-8fcbe007a9ad" data-name="Icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
+  <circle cx="27" cy="22.99" r="0.62"/>
+  <g>
+    <path d="M31,17.38H5a.61.61,0,0,0-.62.62V28a.61.61,0,0,0,.62.62H31a.61.61,0,0,0,.62-.62V18A.61.61,0,0,0,31,17.38Zm-.62,10H5.62V18.62H30.38Z"/>
+    <path d="M9,23.62h6a.62.62,0,0,0,0-1.24H9a.62.62,0,0,0,0,1.24Z"/>
+  </g>
+  <path d="M24,10.38H16.54a2.62,2.62,0,1,0,0,1.24h2.84V13a.62.62,0,1,0,1.24,0V11.62h.76V13a.62.62,0,1,0,1.24,0V11.62h.76V12a.62.62,0,1,0,1.24,0V11A.61.61,0,0,0,24,10.38Zm-10,2A1.38,1.38,0,1,1,15.38,11,1.38,1.38,0,0,1,14,12.38Z"/>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Branch-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Branch-RGB.svg
new file mode 100644
index 000000000..dfdb41e94
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Branch-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-bb260d08-8860-45e3-a5bd-3a2aa9dfbce7"><rect width="48" height="48" fill="none"/></g><g id="uuid-080af0c0-6354-4d04-adc7-5829f96de813"><path d="m38,16c0-2.21-1.79-4-4-4s-4,1.79-4,4c0,1.86,1.28,3.41,3,3.86v1.16c0,1.65-1.34,2.99-2.99,3,0,0,0,0-.01,0h-10c-1.13,0-2.16.39-3,1.02v-10.18c1.72-.45,3-2,3-3.86,0-2.21-1.79-4-4-4s-4,1.79-4,4c0,1.86,1.28,3.41,3,3.86v18.28c-1.72.45-3,2-3,3.86,0,2.21,1.79,4,4,4s4-1.79,4-4c0-1.86-1.28-3.41-3-3.86v-4.13c0-1.65,1.34-2.99,2.99-3,0,0,0,0,.01,0h10c2.76,0,5-2.24,5-5v-1.16c1.72-.45,3-2,3-3.86Zm-24-5c0-1.1.9-2,2-2s2,.9,2,2-.9,2-2,2-2-.9-2-2Zm4,26c0,1.1-.9,2-2,2s-2-.9-2-2,.9-2,2-2,2,.9,2,2Zm16-19c-1.1,0-2-.9-2-2s.9-2,2-2,2,.9,2,2-.9,2-2,2Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Connected-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Connected-RGB.svg
new file mode 100644
index 000000000..0ab34b49a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Connected-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-a0e9d7d4-7c5e-4557-92c4-2ac4ea588d4d"><rect width="48" height="48" fill="none"/></g><g id="uuid-1a13ae36-aa4e-4288-b693-b84bf61daa44"><path d="m24,20c-2.21,0-4,1.79-4,4s1.79,4,4,4,4-1.79,4-4-1.79-4-4-4Zm0,6c-1.1,0-2-.9-2-2s.9-2,2-2,2,.9,2,2-.9,2-2,2Z"/><path d="m18.34,16.93c-.39-.39-1.02-.39-1.41,0-3.9,3.9-3.9,10.24,0,14.14.2.2.45.29.71.29s.51-.1.71-.29c.39-.39.39-1.02,0-1.41-3.12-3.12-3.12-8.2,0-11.31.39-.39.39-1.02,0-1.41Z"/><path d="m29.66,16.93c-.39.39-.39,1.02,0,1.41,3.12,3.12,3.12,8.2,0,11.31-.39.39-.39,1.02,0,1.41.2.2.45.29.71.29s.51-.1.71-.29c3.9-3.9,3.9-10.24,0-14.14-.39-.39-1.02-.39-1.41,0Z"/><path d="m13.39,11.98c-.39-.39-1.02-.39-1.41,0-3.21,3.21-4.98,7.48-4.98,12.02s1.77,8.81,4.98,12.02c.2.2.45.29.71.29s.51-.1.71-.29c.39-.39.39-1.02,0-1.41-2.83-2.83-4.39-6.6-4.39-10.61s1.56-7.77,4.39-10.61c.39-.39.39-1.02,0-1.41Z"/><path d="m36.02,11.98c-.39-.39-1.02-.39-1.41,0s-.39,1.02,0,1.41c2.83,2.83,4.39,6.6,4.39,10.61s-1.56,7.77-4.39,10.61c-.39.39-.39,1.02,0,1.41.2.2.45.29.71.29s.51-.1.71-.29c3.21-3.21,4.98-7.48,4.98-12.02s-1.77-8.81-4.98-12.02Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/images/UI_icon-Cubes-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Cubes-RGB.svg
similarity index 100%
rename from clients/ui/frontend/src/images/UI_icon-Cubes-RGB.svg
rename to clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Cubes-RGB.svg
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Double_arrow_right-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Double_arrow_right-RGB.svg
new file mode 100644
index 000000000..673c0a0d9
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Double_arrow_right-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-f1a66e2b-fb8a-4e52-943b-33b719590903"><rect width="48" height="48" fill="none"/></g><g id="uuid-56b599a8-d4a0-4fca-8e82-42f637e6575f"><path d="m24.71,23.29l-15-15c-.39-.39-1.02-.39-1.41,0s-.39,1.02,0,1.41l14.29,14.29-14.29,14.29c-.39.39-.39,1.02,0,1.41.2.2.45.29.71.29s.51-.1.71-.29l15-15c.39-.39.39-1.02,0-1.41Z"/><path d="m40.71,23.29l-15-15c-.39-.39-1.02-.39-1.41,0s-.39,1.02,0,1.41l14.29,14.29-14.29,14.29c-.39.39-.39,1.02,0,1.41.2.2.45.29.71.29s.51-.1.71-.29l15-15c.39-.39.39-1.02,0-1.41Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Folder-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Folder-RGB.svg
new file mode 100644
index 000000000..cbc42e23d
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Folder-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-66d71e49-fd70-4c75-bff7-dfd4b5a2a62b"><rect width="48" height="48" fill="none"/></g><g id="uuid-74edff00-7557-4e8b-844e-f427e2cf25c0"><path d="m39,15h-2.34l-.68-3.21c-.1-.46-.51-.79-.98-.79h-10c-.47,0-.88.33-.98.79l-.68,3.21h-9.34c-.55,0-1,.45-1,1v15c0,.55.45,1,1,1s1-.45,1-1v-14h9.15c.47,0,.88-.33.98-.79l.68-3.21h8.38l.68,3.21c.1.46.51.79.98.79h2.15v18H10v-19c0-.55-.45-1-1-1s-1,.45-1,1v20c0,.55.45,1,1,1h30c.55,0,1-.45,1-1v-20c0-.55-.45-1-1-1Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Notebook-Images-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Notebook-Images-RGB.svg
new file mode 100644
index 000000000..f5b52b415
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Notebook-Images-RGB.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M18.62 8.99891C18.62 9.16334 18.5547 9.32104 18.4384 9.43731C18.3221 9.55358 18.1644 9.61891 18 9.61891C17.8356 9.61891 17.6779 9.55358 17.5616 9.43731C17.4453 9.32104 17.38 9.16334 17.38 8.99891C17.38 8.83447 17.4453 8.67677 17.5616 8.5605C17.6779 8.44423 17.8356 8.37891 18 8.37891C18.1644 8.37891 18.3221 8.44423 18.4384 8.5605C18.5547 8.67677 18.62 8.83447 18.62 8.99891Z" fill="black"/>
+  <path d="M6.00001 24.619H30C30.0818 24.6203 30.163 24.6052 30.2389 24.5745C30.3147 24.5439 30.3836 24.4983 30.4414 24.4404C30.4993 24.3826 30.5449 24.3137 30.5756 24.2378C30.6063 24.162 30.6214 24.0808 30.62 23.999V8.99899C30.6214 8.9172 30.6063 8.83597 30.5756 8.76014C30.5449 8.6843 30.4993 8.61541 30.4414 8.55757C30.3836 8.49973 30.3147 8.45411 30.2389 8.42343C30.163 8.39275 30.0818 8.37764 30 8.37899H21C20.8356 8.37899 20.6779 8.44431 20.5616 8.56058C20.4453 8.67686 20.38 8.83456 20.38 8.99899C20.38 9.16342 20.4453 9.32112 20.5616 9.4374C20.6779 9.55367 20.8356 9.61899 21 9.61899H29.38V23.379H6.62001V9.61899H15C15.1644 9.61899 15.3221 9.55367 15.4384 9.4374C15.5547 9.32112 15.62 9.16342 15.62 8.99899C15.62 8.83456 15.5547 8.67686 15.4384 8.56058C15.3221 8.44431 15.1644 8.37899 15 8.37899H6.00001C5.91822 8.37764 5.83699 8.39275 5.76116 8.42343C5.68532 8.45411 5.61644 8.49973 5.55859 8.55757C5.50075 8.61541 5.45513 8.6843 5.42445 8.76014C5.39377 8.83597 5.37866 8.9172 5.38001 8.99899V23.999C5.37866 24.0808 5.39377 24.162 5.42445 24.2378C5.45513 24.3137 5.50075 24.3826 5.55859 24.4404C5.61644 24.4983 5.68532 24.5439 5.76116 24.5745C5.83699 24.6052 5.91822 24.6203 6.00001 24.619Z" fill="black"/>
+  <path d="M32 26.3789H4C3.83557 26.3789 3.67787 26.4442 3.5616 26.5605C3.44533 26.6768 3.38 26.8345 3.38 26.9989C3.38 27.1633 3.44533 27.321 3.5616 27.4373C3.67787 27.5536 3.83557 27.6189 4 27.6189H32C32.1644 27.6189 32.3221 27.5536 32.4384 27.4373C32.5547 27.321 32.62 27.1633 32.62 26.9989C32.62 26.8345 32.5547 26.6768 32.4384 26.5605C32.3221 26.4442 32.1644 26.3789 32 26.3789Z" fill="black"/>
+  <path d="M17.24 19.9984C17.403 20.0309 17.5723 19.9976 17.7109 19.9058C17.8495 19.814 17.9463 19.6712 17.98 19.5084L19.22 13.6684C19.253 13.5055 19.2214 13.3362 19.1318 13.1962C19.0422 13.0563 18.9017 12.9566 18.74 12.9184C18.577 12.8859 18.4077 12.9192 18.2691 13.011C18.1305 13.1028 18.0337 13.2456 18 13.4084L16.76 19.2484C16.7243 19.4115 16.7548 19.5821 16.8448 19.7227C16.9348 19.8634 17.0769 19.9625 17.24 19.9984Z" fill="black"/>
+  <path d="M21 19.4983C21.1177 19.6131 21.2756 19.6774 21.44 19.6774C21.6044 19.6774 21.7623 19.6131 21.88 19.4983L24.44 16.9383C24.5555 16.8189 24.62 16.6593 24.62 16.4933C24.62 16.3272 24.5555 16.1676 24.44 16.0483L21.88 13.4883C21.31 12.9083 20.41 13.8083 21 14.3683L23.12 16.4883L21 18.6083C20.9404 18.6661 20.8931 18.7352 20.8607 18.8117C20.8284 18.8881 20.8117 18.9703 20.8117 19.0533C20.8117 19.1363 20.8284 19.2184 20.8607 19.2949C20.8931 19.3713 20.9404 19.4405 21 19.4983Z" fill="black"/>
+  <path d="M15 13.4883C14.9431 13.429 14.8748 13.3818 14.7991 13.3496C14.7235 13.3174 14.6422 13.3008 14.56 13.3008C14.4778 13.3008 14.3965 13.3174 14.3209 13.3496C14.2452 13.3818 14.1769 13.429 14.12 13.4883L11.56 16.0483C11.4445 16.1676 11.38 16.3272 11.38 16.4933C11.38 16.6594 11.4445 16.8189 11.56 16.9383L14.12 19.4983C14.2417 19.5935 14.3941 19.6407 14.5483 19.631C14.7025 19.6212 14.8477 19.555 14.9563 19.4452C15.065 19.3353 15.1295 19.1893 15.1375 19.035C15.1456 18.8807 15.0966 18.7289 15 18.6083L12.88 16.4883L15 14.3683C15.0593 14.3114 15.1065 14.243 15.1387 14.1674C15.1709 14.0918 15.1875 14.0105 15.1875 13.9283C15.1875 13.8461 15.1709 13.7648 15.1387 13.6891C15.1065 13.6135 15.0593 13.5452 15 13.4883Z" fill="black"/>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Server-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Server-RGB.svg
new file mode 100644
index 000000000..b2fe41622
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Server-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-94ffe917-633d-4d9d-8ed0-84ea82b1e6ff"><rect width="48" height="48" fill="none"/></g><g id="uuid-cf88f362-79ee-42ff-8275-fe3bc4f5a2bf"><path d="m39,17H9c-.55,0-1,.45-1,1v12c0,.55.45,1,1,1h30c.55,0,1-.45,1-1v-12c0-.55-.45-1-1-1Zm-1,12H10v-10h28v10Z"/><path d="m30.61,24.57c.04.09.09.18.14.26.06.09.12.16.19.23s.15.13.23.19c.08.05.17.1.26.14.09.03.18.06.28.08.09.02.19.03.29.03s.2,0,.29-.03c.1-.02.19-.05.28-.08.09-.04.18-.09.26-.14.09-.06.16-.12.23-.19.07-.07.13-.14.19-.23.05-.08.1-.17.14-.26.03-.09.06-.18.08-.28.02-.09.03-.19.03-.29s0-.2-.03-.29c-.02-.1-.05-.19-.08-.28-.04-.09-.09-.18-.14-.26-.06-.08-.12-.16-.19-.23s-.14-.13-.23-.19c-.08-.05-.17-.1-.26-.14-.09-.03-.18-.06-.28-.08-.19-.04-.39-.04-.58,0-.1.02-.19.05-.28.08-.09.04-.18.09-.26.14-.08.06-.16.12-.23.19-.07.07-.13.15-.19.23-.05.08-.1.17-.14.26-.03.09-.06.18-.08.28-.02.09-.03.19-.03.29s0,.2.03.29c.02.1.05.19.08.28Z"/><path d="m15,25h7c.55,0,1-.45,1-1s-.45-1-1-1h-7c-.55,0-1,.45-1,1s.45,1,1,1Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Server_upload-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Server_upload-RGB.svg
new file mode 100644
index 000000000..a9bb1141b
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Server_upload-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-67292764-f350-4d4f-bde0-1dd550c1a6ad"><rect width="48" height="48" fill="none"/></g><g id="uuid-6e7487ad-757a-40b2-8475-7092405eb995"><path d="m39,26H9c-.55,0-1,.45-1,1v12c0,.55.45,1,1,1h30c.55,0,1-.45,1-1v-12c0-.55-.45-1-1-1Zm-1,12H10v-10h28v10Z"/><path d="m18.71,14.71l4.29-4.29v12.59c0,.55.45,1,1,1s1-.45,1-1v-12.59l4.29,4.29c.2.2.45.29.71.29s.51-.1.71-.29c.39-.39.39-1.02,0-1.41l-6-6c-.09-.09-.2-.17-.33-.22-.24-.1-.52-.1-.76,0-.12.05-.23.12-.33.22l-6,6c-.39.39-.39,1.02,0,1.41s1.02.39,1.41,0Z"/><path d="m31.17,34.25c.08.05.17.1.26.14.09.03.18.06.28.08.09.02.19.03.29.03s.2,0,.29-.03c.1-.02.19-.05.28-.08.09-.04.18-.09.26-.14.09-.06.16-.12.23-.19.28-.28.44-.67.44-1.06,0-.1,0-.2-.03-.29-.02-.1-.05-.19-.08-.28-.04-.09-.09-.18-.14-.26-.06-.08-.12-.16-.19-.23s-.14-.13-.23-.19c-.08-.05-.17-.1-.26-.13-.09-.04-.18-.07-.28-.09-.19-.04-.39-.04-.58,0-.1.02-.19.05-.28.09-.09.03-.18.08-.26.13-.08.06-.16.12-.23.19-.07.07-.13.15-.19.23-.05.08-.1.17-.14.26-.03.09-.06.18-.08.28-.02.09-.03.19-.03.29,0,.39.16.78.44,1.06.07.07.15.13.23.19Z"/><path d="m15,34h7c.55,0,1-.45,1-1s-.45-1-1-1h-7c-.55,0-1,.45-1,1s.45,1,1,1Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Shared_workspace-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Shared_workspace-RGB.svg
new file mode 100644
index 000000000..cd8dd3dfa
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Shared_workspace-RGB.svg
@@ -0,0 +1,8 @@
+<svg id="b1e8d741-53b6-4099-a5d8-87ebc53e68d6" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
+  <g>
+    <path d="M26.29,10.79a3.61,3.61,0,1,0-4.58,0A6.63,6.63,0,0,0,17.38,17a.62.62,0,0,0,.62.62H30a.62.62,0,0,0,.62-.62A6.63,6.63,0,0,0,26.29,10.79ZM21.62,8a2.38,2.38,0,0,1,4.75,0A2.38,2.38,0,0,1,21.62,8Zm-3,8.38a5.38,5.38,0,0,1,10.68,0Z"/>
+    <path d="M13.29,24.79a3.61,3.61,0,1,0-4.58,0A6.63,6.63,0,0,0,4.38,31a.62.62,0,0,0,.62.62H17a.62.62,0,0,0,.62-.62A6.63,6.63,0,0,0,13.29,24.79ZM8.62,22a2.38,2.38,0,0,1,4.75,0A2.38,2.38,0,0,1,8.62,22Zm-3,8.38a5.38,5.38,0,0,1,10.68,0Z"/>
+    <path d="M28.1,19.38a.63.63,0,0,0-.63.62v7.38H20.1a.62.62,0,0,0,0,1.24h8a.62.62,0,0,0,.62-.62V20A.62.62,0,0,0,28.1,19.38Z"/>
+    <path d="M8,16.62A.62.62,0,0,0,8.62,16V8.62H16a.62.62,0,0,0,0-1.24H8A.62.62,0,0,0,7.38,8v8A.62.62,0,0,0,8,16.62Z"/>
+  </g>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Storage-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Storage-RGB.svg
new file mode 100644
index 000000000..7588fdf64
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Storage-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-872aefdd-b274-4c48-8ed6-b12df12233d5"><rect width="48" height="48" fill="none"/></g><g id="uuid-6d7a9d63-d3b6-4431-900f-7c1c9288f14a"><path d="m39.99,15.94c-.12-5.02-7.1-8.94-15.99-8.94s-15.86,3.92-15.99,8.94c0,.02-.01.04-.01.06v15.92c0,5.09,7.03,9.08,16,9.08s16-3.99,16-9.08v-15.92s-.01-.04-.01-.06Zm-29.99,4.59c2.7,2.78,7.9,4.63,14,4.63s11.3-1.85,14-4.63v3.3c0,3.88-6.41,7.17-14,7.17s-14-3.28-14-7.17v-3.3Zm14-11.53c7.59,0,14,3.24,14,7.08s-6.41,7.08-14,7.08-14-3.24-14-7.08,6.41-7.08,14-7.08Zm14,22.92c0,3.84-6.41,7.08-14,7.08s-14-3.24-14-7.08v-3.59c2.7,2.81,7.9,4.67,14,4.67s11.3-1.86,14-4.67v3.59Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-User-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-User-RGB.svg
new file mode 100644
index 000000000..3b37a73f9
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-User-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-f51a4af0-6225-48d0-b7dc-891d648dde61"><rect width="48" height="48" fill="none"/></g><g id="uuid-55ee4c9a-74ef-4398-ad10-fbcc88b85563"><path d="m28.57,23.2c2.5-1.54,4.18-4.3,4.18-7.45,0-4.83-3.92-8.75-8.75-8.75s-8.75,3.92-8.75,8.75c0,3.15,1.68,5.9,4.18,7.45-6.6,2.04-11.43,8.35-11.43,15.8,0,.55.45,1,1,1h30c.55,0,1-.45,1-1,0-7.46-4.83-13.77-11.43-15.8Zm-11.32-7.45c0-3.72,3.03-6.75,6.75-6.75s6.75,3.03,6.75,6.75-3.03,6.75-6.75,6.75-6.75-3.03-6.75-6.75Zm-7.22,22.25c.5-7.53,6.57-13.5,13.97-13.5s13.47,5.97,13.97,13.5H10.03Z"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Wrench-RGB.svg b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Wrench-RGB.svg
new file mode 100644
index 000000000..333a28ce0
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/UI_icon-Red_Hat-Wrench-RGB.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g id="uuid-0357926d-b66d-4573-89f9-9c0b6cdb2b80"><rect width="48" height="48" fill="none"/></g><g id="uuid-60e7604d-2e8f-4696-b102-0d767b1fee35"><path d="m39.74,12.91c-.15-.28-.42-.47-.73-.52-.31-.04-.63.06-.86.28l-6.12,6.12c-.75.75-2.07.75-2.83,0-.38-.38-.58-.88-.58-1.41s.21-1.04.58-1.41l6.12-6.12c.22-.22.33-.54.28-.86-.05-.31-.24-.59-.52-.73-1.55-.82-3.31-1.26-5.09-1.26-6.07,0-11,4.93-11,11,0,1.03.14,2.05.43,3.03l-10.87,10.87c-1.01,1.01-1.56,2.34-1.56,3.77s.55,2.76,1.56,3.77,2.4,1.56,3.77,1.56,2.73-.52,3.77-1.56l10.87-10.87c.98.29,2,.43,3.03.43,6.07,0,11-4.93,11-11,0-1.77-.43-3.53-1.26-5.09Zm-9.74,14.09c-1.02,0-2.02-.17-2.97-.51-.36-.13-.77-.04-1.04.24l-11.3,11.3c-1.3,1.3-3.41,1.3-4.71,0-.63-.63-.97-1.46-.97-2.35s.35-1.72.97-2.35l11.3-11.3c.27-.27.36-.68.24-1.04-.34-.96-.51-1.96-.51-2.97,0-4.96,4.04-9,9-9,1,0,1.96.16,2.88.47l-5.08,5.08c-1.56,1.56-1.56,4.1,0,5.65s4.1,1.56,5.65,0l5.08-5.08c.31.92.47,1.88.47,2.88,0,4.96-4.04,9-9,9Z"/><circle cx="13" cy="35" r="1.5"/></g></svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/empty-state-cluster-storage.svg b/clients/ui/frontend/src/shared/images/empty-state-cluster-storage.svg
new file mode 100644
index 000000000..6a229d8a1
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-cluster-storage.svg
@@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="uuid-1d152f65-b441-46e8-ae96-577dc5539273"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 326 323"
+	 style="enable-background:new 0 0 326 323;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFE8CC;}
+	.st1{clip-path:url(#SVGID_00000112611297674528717110000013311965522108702594_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#EE0000;}
+	.st4{fill:#FFFFFF;stroke:#EE0000;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#EE0000;stroke-width:2;stroke-miterlimit:10;}
+	.st6{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
+	.st7{fill:#A60000;}
+	.st8{fill:#FCCB8F;}
+	.st9{fill:#F8AE54;}
+	.st10{clip-path:url(#SVGID_00000041976194055379547400000005452136194380282804_);}
+	.st11{fill:none;stroke:#FFFFFF;stroke-width:2.07;stroke-linecap:round;stroke-linejoin:round;}
+	.st12{clip-path:url(#SVGID_00000183207263048940397160000008946258925924671130_);}
+	.st13{clip-path:url(#SVGID_00000173842313802575467460000001896399358219734694_);}
+	.st14{clip-path:url(#SVGID_00000088813573692902352420000009021909864742885254_);}
+	.st15{clip-path:url(#SVGID_00000000220589359788645480000016946950349649421706_);}
+</style>
+<g>
+	<path class="st0" d="M32.3,56.1c4.9-8.5,16.6-11.2,25.5-12.8c11.8-2.2,24.1-2.4,35.9,0.2c11.5,2.6,21.5,9,32.5,12.9
+		c16.8,5.9,32.5,1.3,48-6.3c6-2.9,11.8-6.1,17.5-9.5C242.3,11,284.6,30,295.3,44.2s33.2,56.5-22.1,113.2c0,0-19.4,18-3.2,43.3
+		c16.2,25.3,51.4,49.4,33.6,83.8c-17.8,34.4-65.2,30.4-109.4,14.6c0,0-26.1-11.5-56.5,0.4c-27.8,10.8-57.2,20.3-85.9,5.7
+		c-32.2-16.4-38.7-55.6-22-85.9c6.4-24.9,10.9-50.6,13.1-76.3c1.2-13.6,1.7-27.5,0.2-41.1c-0.6-5.8-1.6-11.6-3.4-17.2
+		c-2.4-7.5-8.6-14.3-8.9-22.4C30.8,59.9,31.3,57.9,32.3,56.1L32.3,56.1z"/>
+	<g>
+		<g>
+			<defs>
+				<path id="SVGID_1_" d="M32.3,56.1c4.9-8.5,16.6-11.2,25.5-12.8c11.8-2.2,24.1-2.4,35.9,0.2c11.5,2.6,21.5,9,32.5,12.9
+					c16.8,5.9,32.5,1.3,48-6.3c6-2.9,11.8-6.1,17.5-9.5C242.3,11,284.6,30,295.3,44.2s33.2,56.5-22.1,113.2c0,0-19.4,18-3.2,43.3
+					c16.2,25.3,51.4,49.4,33.6,83.8c-17.8,34.4-65.2,30.4-109.4,14.6c0,0-26.1-11.5-56.5,0.4c-27.8,10.8-57.2,20.3-85.9,5.7
+					c-32.2-16.4-38.7-55.6-22-85.9c6.4-24.9,10.9-50.6,13.1-76.3c1.2-13.6,1.7-27.5,0.2-41.1c-0.6-5.8-1.6-11.6-3.4-17.2
+					c-2.4-7.5-8.6-14.3-8.9-22.4C30.8,59.9,31.3,57.9,32.3,56.1L32.3,56.1z"/>
+			</defs>
+			<clipPath id="SVGID_00000178907443285880116320000015335826878177754559_">
+				<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+			</clipPath>
+			<g style="clip-path:url(#SVGID_00000178907443285880116320000015335826878177754559_);">
+				<path class="st2" d="M195.5,76.4c3.2,0,6.4,0.5,9.3,1.4c7.1-13.3,21.1-22.4,37.2-22.4c18,0,33.3,11.2,39.4,27
+					c11.5,0.4,21.2,7.5,25.5,17.5c1.6-0.4,3.3-0.6,5-0.6c11.1,0,20.2,9,20.2,20.2s-9,20.2-20.2,20.2c-5.5,0-108.1,0-116.4,0
+					c-17.5,0-31.7-14.2-31.7-31.7S178,76.4,195.5,76.4L195.5,76.4z"/>
+			</g>
+		</g>
+		<g>
+			<path class="st3" d="M182.9,31.2c0-7.5-6.1-13.6-13.6-13.6s-13.6,6.1-13.6,13.6s6.1,13.6,13.6,13.6h-0.4v50.6h0.8V44.8h-0.4
+				C176.8,44.8,182.9,38.7,182.9,31.2L182.9,31.2z"/>
+			<path class="st3" d="M196.5,33.3c0.1-0.7,0.1-1.4,0.1-2.1c0-15.1-12.3-27.4-27.4-27.4c-0.9,0-1.7,0-2.5,0.1
+				c-0.4-2.1-2.3-3.7-4.6-3.7c-2.6,0-4.7,2.1-4.7,4.7c0,0.5,0.1,1,0.2,1.5c-9.3,4.4-15.8,13.8-15.8,24.8c0,5.8,1.8,11.2,5,15.7
+				c-0.9,0.9-1.5,2.1-1.5,3.4c0,2.6,2.1,4.7,4.7,4.7c1.4,0,2.6-0.6,3.4-1.5c3.5,2.5,7.6,4.2,12.1,4.8l0.1-0.8
+				c-4.3-0.6-8.3-2.2-11.7-4.7c0.5-0.7,0.8-1.6,0.8-2.5c0-2.6-2.1-4.7-4.7-4.7c-0.9,0-1.8,0.3-2.5,0.7c-3-4.3-4.8-9.6-4.8-15.2
+				c0-10.6,6.3-19.8,15.4-24.1c0.8,1.5,2.3,2.4,4.1,2.4c2.6,0,4.7-2.1,4.7-4.7c0,0,0-0.1,0-0.1c0.8-0.1,1.6-0.1,2.4-0.1
+				c14.6,0,26.6,11.9,26.6,26.6c0,0.7,0,1.3-0.1,2c-0.1,0-0.2,0-0.3,0c-2.6,0-4.7,2.1-4.7,4.7c0,1.9,1.1,3.5,2.8,4.2
+				c-3.7,8.1-11.3,14.2-20.5,15.5l0.1,0.8c9.5-1.3,17.4-7.6,21.2-16c0.4,0.1,0.8,0.2,1.2,0.2c2.6,0,4.7-2.1,4.7-4.7
+				C200,35.6,198.5,33.8,196.5,33.3L196.5,33.3z"/>
+			<g>
+				<path class="st2" d="M176.4,24.8c-0.1,0-0.2,0-0.3-0.1c-1.7-1.8-4-2.8-6.5-2.9c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4
+					c2.7,0.1,5.2,1.2,7,3.1c0.2,0.2,0.1,0.4,0,0.6C176.6,24.8,176.5,24.8,176.4,24.8z"/>
+				<path class="st2" d="M162.4,38c-0.1,0-0.2,0-0.3-0.1c-1.8-1.9-2.8-4.4-2.7-7.1c0.1-5.5,4.8-9.9,10.3-9.8c0.2,0,0.4,0.2,0.4,0.4
+					s-0.2,0.4-0.4,0.4c-5.1-0.1-9.3,3.9-9.5,9c-0.1,2.4,0.8,4.7,2.5,6.5c0.2,0.2,0.1,0.4,0,0.6C162.6,38,162.5,38,162.4,38L162.4,38
+					z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<g>
+					<rect x="33.6" y="76.3" class="st2" width="89.9" height="31"/>
+					<path class="st3" d="M123.9,107.8H33.2V75.9h90.7V107.8L123.9,107.8z M34,107h89.1V76.7H34V107L34,107z"/>
+				</g>
+				<g>
+					<rect x="33.6" y="107.4" class="st2" width="89.9" height="31"/>
+					<path class="st3" d="M123.9,138.8H33.2V107h90.7V138.8z M34,138h89.1v-30.2H34V138z"/>
+				</g>
+				<g>
+					<rect x="33.6" y="138.4" class="st2" width="89.9" height="31"/>
+					<path class="st3" d="M123.9,169.8H33.2V138h90.7V169.8z M34,169h89.1v-30.2H34V169z"/>
+				</g>
+				<rect x="33.6" y="169.4" class="st4" width="89.9" height="31"/>
+				<g>
+					<rect x="43.2" y="89.6" class="st3" width="49.4" height="5.7"/>
+					<circle class="st3" cx="110.6" cy="92.5" r="2.8"/>
+				</g>
+				<circle class="st3" cx="110.6" cy="153.9" r="2.8"/>
+				<circle class="st3" cx="110.6" cy="184.9" r="2.8"/>
+				<circle class="st3" cx="110.6" cy="122.9" r="2.8"/>
+				<g>
+					<rect x="43.2" y="114.5" class="st3" width="5.7" height="16.7"/>
+					<rect x="53.7" y="114.5" class="st3" width="5.7" height="16.7"/>
+				</g>
+			</g>
+			<g>
+				<path class="st3" d="M129.9,207.2h-3.2c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h2.8v-2.8c0-0.2,0.2-0.4,0.4-0.4
+					c0.2,0,0.4,0.2,0.4,0.4v3.2C130.3,207,130.1,207.2,129.9,207.2z"/>
+				<path class="st3" d="M121.8,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C122.2,207,122,207.2,121.8,207.2z M110.4,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C110.8,207,110.6,207.2,110.4,207.2z M98.9,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C99.3,207,99.2,207.2,98.9,207.2z M87.5,207.2H81c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C87.9,207,87.7,207.2,87.5,207.2z M76.1,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C76.5,207,76.3,207.2,76.1,207.2z M64.7,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C65.1,207,64.9,207.2,64.7,207.2z M53.2,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C53.6,207,53.5,207.2,53.2,207.2z M41.8,207.2h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C42.2,207,42,207.2,41.8,207.2z"/>
+				<path class="st3" d="M30.4,207.2h-3.2c-0.2,0-0.4-0.2-0.4-0.4v-3.2c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v2.8h2.8
+					c0.2,0,0.4,0.2,0.4,0.4C30.8,207,30.6,207.2,30.4,207.2z"/>
+				<path class="st3" d="M27.2,199.1c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,199,27.4,199.1,27.2,199.1z M27.2,187.7c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,187.5,27.4,187.7,27.2,187.7z M27.2,176.3c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,176.1,27.4,176.3,27.2,176.3z M27.2,164.9c-0.2,0-0.4-0.2-0.4-0.4V158c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,164.7,27.4,164.9,27.2,164.9z M27.2,153.5c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,153.3,27.4,153.5,27.2,153.5z M27.2,142c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,141.9,27.4,142,27.2,142z M27.2,130.6c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,130.5,27.4,130.6,27.2,130.6z M27.2,119.2c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,119,27.4,119.2,27.2,119.2z M27.2,107.8c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,107.6,27.4,107.8,27.2,107.8z M27.2,96.4c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4V96
+					C27.6,96.2,27.4,96.4,27.2,96.4z M27.2,85c-0.2,0-0.4-0.2-0.4-0.4V78c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C27.6,84.8,27.4,85,27.2,85z"/>
+				<path class="st3" d="M27.2,73.6c-0.2,0-0.4-0.2-0.4-0.4V70c0-0.2,0.2-0.4,0.4-0.4h3.2c0.2,0,0.4,0.2,0.4,0.4
+					c0,0.2-0.2,0.4-0.4,0.4h-2.8v2.8C27.6,73.4,27.4,73.6,27.2,73.6z"/>
+				<path class="st3" d="M121.8,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C122.2,70.2,122,70.4,121.8,70.4z M110.4,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C110.8,70.2,110.6,70.4,110.4,70.4z M98.9,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C99.3,70.2,99.2,70.4,98.9,70.4z M87.5,70.4H81c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C87.9,70.2,87.7,70.4,87.5,70.4z M76.1,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C76.5,70.2,76.3,70.4,76.1,70.4z M64.7,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C65.1,70.2,64.9,70.4,64.7,70.4z M53.2,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C53.6,70.2,53.5,70.4,53.2,70.4z M41.8,70.4h-6.5c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h6.5c0.2,0,0.4,0.2,0.4,0.4
+					C42.2,70.2,42,70.4,41.8,70.4z"/>
+				<path class="st3" d="M129.9,73.6c-0.2,0-0.4-0.2-0.4-0.4v-2.8h-2.8c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h3.2
+					c0.2,0,0.4,0.2,0.4,0.4v3.2C130.3,73.4,130.1,73.6,129.9,73.6z"/>
+				<path class="st3" d="M129.9,199.1c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C130.3,199,130.1,199.1,129.9,199.1z M129.9,187.7c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4
+					v6.5C130.3,187.5,130.1,187.7,129.9,187.7z M129.9,176.3c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4
+					c0.2,0,0.4,0.2,0.4,0.4v6.5C130.3,176.1,130.1,176.3,129.9,176.3z M129.9,164.9c-0.2,0-0.4-0.2-0.4-0.4V158
+					c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5C130.3,164.7,130.1,164.9,129.9,164.9z M129.9,153.5c-0.2,0-0.4-0.2-0.4-0.4
+					v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5C130.3,153.3,130.1,153.5,129.9,153.5z M129.9,142
+					c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5C130.3,141.9,130.1,142,129.9,142z M129.9,130.6
+					c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5C130.3,130.5,130.1,130.6,129.9,130.6z
+					 M129.9,119.2c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5C130.3,119,130.1,119.2,129.9,119.2
+					z M129.9,107.8c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C130.3,107.6,130.1,107.8,129.9,107.8z M129.9,96.4c-0.2,0-0.4-0.2-0.4-0.4v-6.5c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4
+					V96C130.3,96.2,130.1,96.4,129.9,96.4z M129.9,85c-0.2,0-0.4-0.2-0.4-0.4V78c0-0.2,0.2-0.4,0.4-0.4c0.2,0,0.4,0.2,0.4,0.4v6.5
+					C130.3,84.8,130.1,85,129.9,85z"/>
+			</g>
+			<rect x="43.2" y="151.1" class="st3" width="49.4" height="5.7"/>
+			<rect x="43.2" y="182.2" class="st3" width="49.4" height="5.7"/>
+		</g>
+		<g>
+			<path class="st2" d="M10.2,210.9c0,8.3,6.8,15.1,15.1,15.1H136c8.3,0,15.1-6.8,15.1-15.1c0-8.3-6.8-15.1-15.1-15.1
+				c-1.3,0-2.6,0.2-3.8,0.5c-3.2-8.6-11.5-14.4-20.8-14.4c-1.8,0-3.6,0.2-5.4,0.7c-2.2-7.5-7.3-14.4-14.4-19.3
+				c-7.4-5-16.7-7.8-26.2-7.8c-23.1,0-41.8,15.9-41.8,35.4c0,1.7,0.1,3.4,0.4,5C16.2,196.6,10.2,203.1,10.2,210.9L10.2,210.9z"/>
+			<path class="st0" d="M136,226.3H25.3c-8.5,0-15.5-6.9-15.5-15.5c0-7.7,5.9-14.4,13.6-15.3c-0.2-1.5-0.4-3.1-0.4-4.7
+				c0-19.7,18.9-35.8,42.2-35.8c9.6,0,19,2.8,26.5,7.9c7.1,4.9,12.3,11.6,14.5,19.1c1.7-0.4,3.4-0.6,5.1-0.6c9.3,0,17.7,5.8,21,14.4
+				c1.2-0.3,2.4-0.4,3.6-0.4c8.5,0,15.5,6.9,15.5,15.5S144.5,226.3,136,226.3L136,226.3z M65.3,155.9c-22.9,0-41.4,15.7-41.4,35
+				c0,1.6,0.1,3.3,0.4,5c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.2,0.1-0.3,0.2c-7.4,0.7-13.3,7.1-13.3,14.6c0,8.1,6.6,14.7,14.7,14.7H136
+				c8.1,0,14.7-6.6,14.7-14.7s-6.6-14.7-14.7-14.7c-1.2,0-2.5,0.2-3.7,0.5c-0.2,0.1-0.4-0.1-0.5-0.2c-3.2-8.5-11.4-14.2-20.4-14.2
+				c-1.8,0-3.6,0.2-5.3,0.7c-0.2,0.1-0.4-0.1-0.5-0.3c-2.1-7.4-7.2-14.2-14.3-19C84,158.6,74.7,155.9,65.3,155.9L65.3,155.9z"/>
+		</g>
+		<g>
+			<circle class="st2" cx="37.1" cy="51.2" r="35.7"/>
+			<path class="st3" d="M37.1,87.3C17.2,87.3,1,71.1,1,51.2s16.2-36.1,36.1-36.1s36.1,16.2,36.1,36.1S57,87.3,37.1,87.3L37.1,87.3z
+				 M37.1,16C17.6,16,1.8,31.8,1.8,51.2s15.8,35.3,35.3,35.3s35.3-15.8,35.3-35.3S56.5,16,37.1,16L37.1,16z"/>
+		</g>
+		<g>
+			<line class="st5" x1="223.2" y1="249.5" x2="195.2" y2="199.8"/>
+			
+				<rect x="89" y="230.2" transform="matrix(0.4903 -0.8716 0.8716 0.4903 -137.5803 225.8716)" class="st3" width="70.7" height="0.8"/>
+			<circle class="st6" cx="191.7" cy="104" r="12"/>
+			<path class="st2" d="M170.9,196.1c-6.8,0-12.4,5.6-12.4,12.4c0,6.8,5.6,12.4,12.4,12.4s12.4-5.6,12.4-12.4
+				C183.3,201.7,177.7,196.1,170.9,196.1z"/>
+			<circle class="st3" cx="169.2" cy="153.1" r="58"/>
+			<path d="M206.1,108.3l-0.6,0.6c8.4,10.2,13,23.1,13,36.4c0,31.6-25.7,57.3-57.3,57.3c-13.3,0-26.2-4.6-36.4-13l-0.6,0.6
+				c11.1,13.4,27.4,21.2,44.8,21.2c32,0,58-26,58-58C227.3,135.7,219.6,119.4,206.1,108.3L206.1,108.3z"/>
+			<g>
+				<g>
+					<circle class="st3" cx="162.5" cy="139" r="16.6"/>
+					<path class="st7" d="M162.5,156c-9.4,0-17-7.6-17-17c0-9.4,7.6-17,17-17c9.4,0,17,7.6,17,17C179.5,148.4,171.9,156,162.5,156z
+						 M162.5,122.8c-8.9,0-16.2,7.3-16.2,16.2s7.3,16.2,16.2,16.2c8.9,0,16.2-7.3,16.2-16.2S171.4,122.8,162.5,122.8L162.5,122.8z"
+						/>
+				</g>
+				<g>
+					<path d="M172.1,125.4c1.9,2.7,3.1,6,3.1,9.6c0,9.2-7.4,16.6-16.6,16.6c-3.6,0-6.9-1.1-9.6-3.1c3,4.2,8,7,13.6,7
+						c9.2,0,16.6-7.4,16.6-16.6C179.1,133.4,176.4,128.4,172.1,125.4L172.1,125.4z"/>
+					<path d="M162.5,156c-5.5,0-10.7-2.7-13.9-7.2c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c2.8,2,6,3,9.4,3
+						c8.9,0,16.2-7.3,16.2-16.2c0-3.4-1-6.6-3-9.4c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c4.5,3.2,7.2,8.4,7.2,13.9
+						C179.5,148.4,171.9,156,162.5,156L162.5,156z M150.8,150.2c3,3.2,7.3,5,11.7,5c8.9,0,16.2-7.3,16.2-16.2c0-4.5-1.8-8.7-5-11.7
+						c1.2,2.4,1.9,5.1,1.9,7.8c0,9.4-7.6,17-17,17C155.8,152.1,153.2,151.4,150.8,150.2L150.8,150.2z"/>
+				</g>
+			</g>
+			<g>
+				<circle class="st2" cx="210.6" cy="119.4" r="21.7"/>
+				<path class="st8" d="M210.6,141.4c-12.2,0-22.1-9.9-22.1-22.1s9.9-22.1,22.1-22.1s22.1,9.9,22.1,22.1S222.7,141.4,210.6,141.4z
+					 M210.6,98.1c-11.7,0-21.3,9.5-21.3,21.3s9.5,21.3,21.3,21.3s21.3-9.5,21.3-21.3S222.3,98.1,210.6,98.1z"/>
+			</g>
+			<g>
+				<circle class="st2" cx="125.4" cy="176.1" r="21.7"/>
+				<path class="st8" d="M125.4,198.2c-12.2,0-22.1-9.9-22.1-22.1s9.9-22.1,22.1-22.1s22.1,9.9,22.1,22.1S137.6,198.2,125.4,198.2z
+					 M125.4,154.9c-11.7,0-21.3,9.5-21.3,21.3s9.5,21.3,21.3,21.3s21.3-9.5,21.3-21.3S137.1,154.9,125.4,154.9z"/>
+			</g>
+			<g>
+				<circle class="st2" cx="197" cy="192.3" r="28.2"/>
+				<path class="st9" d="M197,220.9c-15.8,0-28.6-12.8-28.6-28.6s12.8-28.6,28.6-28.6s28.6,12.8,28.6,28.6S212.7,220.9,197,220.9z
+					 M197,164.5c-15.3,0-27.8,12.5-27.8,27.8s12.5,27.8,27.8,27.8s27.8-12.5,27.8-27.8S212.3,164.5,197,164.5z"/>
+			</g>
+			<g>
+				<path class="st8" d="M223.3,101.8c2.6,3.6,4.1,8,4.1,12.7c0,12-9.7,21.7-21.7,21.7c-4.7,0-9.1-1.5-12.7-4.1
+					c3.9,5.4,10.3,9,17.5,9c12,0,21.7-9.7,21.7-21.7C232.2,112.1,228.7,105.8,223.3,101.8L223.3,101.8z"/>
+				<path class="st8" d="M210.6,141.4c-7,0-13.7-3.4-17.9-9.1c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c3.6,2.6,8,4,12.5,4
+					c11.7,0,21.3-9.5,21.3-21.3c0-4.5-1.4-8.8-4-12.5c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c5.7,4.1,9.1,10.8,9.1,17.9
+					C232.6,131.5,222.7,141.4,210.6,141.4L210.6,141.4z M194.9,133.7c4,4.3,9.7,6.9,15.7,6.9c11.7,0,21.3-9.5,21.3-21.3
+					c0-6-2.5-11.7-6.9-15.7c1.9,3.3,2.8,7,2.8,10.8c0,12.2-9.9,22.1-22.1,22.1C201.9,136.6,198.2,135.6,194.9,133.7L194.9,133.7z"/>
+			</g>
+			<g>
+				<path class="st8" d="M137.8,158.3c2.4,3.5,3.9,7.8,3.9,12.3c0,12-9.7,21.7-21.7,21.7c-4.6,0-8.8-1.4-12.3-3.9
+					c3.9,5.6,10.4,9.3,17.8,9.3c12,0,21.7-9.7,21.7-21.7C147.1,168.7,143.4,162.2,137.8,158.3L137.8,158.3z"/>
+				<path class="st8" d="M125.4,198.2c-7.2,0-14-3.5-18.1-9.5c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.3-0.2,0.5,0
+					c3.6,2.5,7.8,3.8,12.1,3.8c11.7,0,21.3-9.5,21.3-21.3c0-4.4-1.3-8.5-3.8-12.1c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.3-0.2,0.5,0
+					c5.9,4.1,9.5,10.9,9.5,18.1C147.5,188.3,137.6,198.2,125.4,198.2L125.4,198.2z M109.3,190c4,4.7,9.9,7.4,16.1,7.4
+					c11.7,0,21.3-9.5,21.3-21.3c0-6.2-2.7-12.1-7.4-16.1c1.8,3.3,2.8,6.9,2.8,10.7c0,12.2-9.9,22.1-22.1,22.1
+					C116.2,192.7,112.5,191.8,109.3,190L109.3,190z"/>
+			</g>
+			<g>
+				<path class="st8" d="M214.3,170.1c3.7,4.8,5.9,10.8,5.9,17.3c0,15.6-12.6,28.2-28.2,28.2c-6.5,0-12.5-2.2-17.3-5.9
+					c5.2,6.6,13.2,10.9,22.2,10.9c15.6,0,28.2-12.6,28.2-28.2C225.2,183.3,220.9,175.2,214.3,170.1L214.3,170.1z"/>
+				<path class="st8" d="M197,220.9c-8.9,0-17.1-4-22.5-11l-2-2.5l2.5,2c4.9,3.8,10.8,5.8,17.1,5.8c15.3,0,27.8-12.5,27.8-27.8
+					c0-6.2-2-12.1-5.8-17.1l-2-2.5l2.5,2c7,5.5,11,13.7,11,22.5C225.5,208.1,212.7,220.9,197,220.9L197,220.9z M177.1,211.7
+					c5.2,5.3,12.3,8.3,19.8,8.3c15.3,0,27.8-12.5,27.8-27.8c0-7.6-3-14.6-8.3-19.8c2.7,4.5,4.2,9.6,4.2,14.9
+					c0,15.8-12.8,28.6-28.6,28.6C186.7,215.9,181.6,214.5,177.1,211.7z"/>
+			</g>
+			<g>
+				<path class="st2" d="M151.5,95c-3.4,0-6.2,2.8-6.2,6.2c0,3.4,2.8,6.2,6.2,6.2c3.4,0,6.2-2.8,6.2-6.2C157.8,97.8,155,95,151.5,95
+					z"/>
+				<path class="st2" d="M169.4,148.2c-3.4,0-6.2,2.8-6.2,6.2c0,3.4,2.8,6.2,6.2,6.2c3.4,0,6.2-2.8,6.2-6.2S172.8,148.2,169.4,148.2
+					z"/>
+			</g>
+			<g>
+				<circle class="st2" cx="146.3" cy="181.9" r="5.8"/>
+				<path class="st8" d="M146.3,188.1c-3.4,0-6.2-2.8-6.2-6.2c0-3.4,2.8-6.2,6.2-6.2s6.2,2.8,6.2,6.2
+					C152.5,185.3,149.7,188.1,146.3,188.1z M146.3,176.5c-3,0-5.4,2.4-5.4,5.4c0,3,2.4,5.4,5.4,5.4c3,0,5.4-2.4,5.4-5.4
+					C151.7,178.9,149.3,176.5,146.3,176.5z"/>
+			</g>
+			<g>
+				<circle class="st2" cx="205" cy="166.1" r="8.8"/>
+				<path class="st8" d="M205,175.3c-5.1,0-9.2-4.1-9.2-9.2c0-5.1,4.1-9.2,9.2-9.2c5.1,0,9.2,4.1,9.2,9.2
+					C214.2,171.2,210.1,175.3,205,175.3z M205,157.6c-4.6,0-8.4,3.8-8.4,8.4s3.8,8.4,8.4,8.4s8.4-3.8,8.4-8.4S209.7,157.6,205,157.6
+					z"/>
+			</g>
+			<g>
+				<circle class="st2" cx="215.8" cy="97.7" r="4.1"/>
+				<path class="st8" d="M215.8,102.2c-2.5,0-4.5-2-4.5-4.5c0-2.5,2-4.5,4.5-4.5c2.5,0,4.5,2,4.5,4.5
+					C220.3,100.2,218.3,102.2,215.8,102.2z M215.8,94c-2.1,0-3.7,1.7-3.7,3.7c0,2.1,1.7,3.7,3.7,3.7c2.1,0,3.7-1.7,3.7-3.7
+					C219.5,95.6,217.8,94,215.8,94z"/>
+			</g>
+			<path class="st3" d="M233.1,172.9c-2.5,0-4.5,2-4.5,4.5c0,2.5,2,4.5,4.5,4.5c2.5,0,4.5-2,4.5-4.5
+				C237.6,174.9,235.6,172.9,233.1,172.9z"/>
+			<g>
+				<path class="st3" d="M102,230.2c-1.2-0.4-2.4-0.3-3.6,0.2c-2.3,1.1-3.3,3.9-2.1,6.2c0.8,1.6,2.5,2.6,4.2,2.6
+					c0.7,0,1.4-0.2,2.1-0.5c2.3-1.1,3.3-3.9,2.1-6.2C104.2,231.5,103.2,230.6,102,230.2L102,230.2z"/>
+				<path class="st3" d="M135.7,267.9c-0.6-1.1-1.5-2-2.7-2.4c-1.2-0.4-2.4-0.3-3.6,0.2c-2.3,1.1-3.3,3.9-2.1,6.2
+					c0.8,1.6,2.5,2.6,4.2,2.6c0.7,0,1.4-0.2,2.1-0.5C135.9,273,136.9,270.2,135.7,267.9L135.7,267.9z"/>
+				<path d="M83.3,274.7c-2.3,1.1-3.3,3.9-2.1,6.2c0.6,1.1,1.5,2,2.7,2.4c0.5,0.2,1,0.2,1.5,0.2c0.7,0,1.4-0.2,2.1-0.5
+					c1.1-0.6,2-1.5,2.4-2.7c0.4-1.2,0.3-2.4-0.2-3.6C88.4,274.5,85.6,273.5,83.3,274.7L83.3,274.7z"/>
+			</g>
+			<path class="st3" d="M106.2,288.7c-0.2,0-0.4,0-0.7,0c-15.1-0.4-27.1-12.9-26.7-28c0.4-15.1,12.9-27.1,28-26.7
+				c3.5,0.1,6.8,0.8,10,2.1c0.2,0.1,0.3,0.3,0.2,0.5c-0.1,0.2-0.3,0.3-0.5,0.2c-3.1-1.3-6.3-2-9.7-2.1
+				c-14.6-0.3-26.8,11.3-27.2,25.9s11.3,26.8,25.9,27.2c7.1,0.2,13.8-2.4,19-7.3c5.1-4.9,8.1-11.5,8.2-18.6
+				c0.2-8.4-3.4-16.2-10-21.4c-0.2-0.1-0.2-0.4-0.1-0.6c0.1-0.2,0.4-0.2,0.6-0.1c6.7,5.4,10.5,13.4,10.3,22
+				c-0.2,7.3-3.2,14.1-8.5,19.1C119.9,286,113.3,288.7,106.2,288.7L106.2,288.7z"/>
+			<g>
+				<g>
+					<circle class="st3" cx="128.8" cy="116.7" r="9.1"/>
+					<path class="st7" d="M128.8,126.2c-5.2,0-9.5-4.2-9.5-9.5s4.2-9.5,9.5-9.5c5.2,0,9.5,4.2,9.5,9.5S134,126.2,128.8,126.2z
+						 M128.8,108.1c-4.8,0-8.7,3.9-8.7,8.7s3.9,8.7,8.7,8.7c4.8,0,8.7-3.9,8.7-8.7S133.6,108.1,128.8,108.1z"/>
+				</g>
+				<g>
+					<path d="M134.1,109.3c1.1,1.5,1.7,3.3,1.7,5.3c0,5-4.1,9.1-9.1,9.1c-2,0-3.8-0.6-5.3-1.7c1.6,2.3,4.3,3.8,7.4,3.8
+						c5,0,9.1-4.1,9.1-9.1C137.9,113.7,136.4,111,134.1,109.3L134.1,109.3z"/>
+					<path d="M128.8,126.2c-3.1,0-5.9-1.5-7.7-4c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c1.5,1,3.2,1.6,5,1.6
+						c4.8,0,8.7-3.9,8.7-8.7c0-1.8-0.6-3.5-1.6-5c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c2.5,1.8,4,4.7,4,7.7
+						C138.3,121.9,134,126.2,128.8,126.2L128.8,126.2z M123.3,123.4c1.5,1.2,3.5,2,5.5,2c4.8,0,8.7-3.9,8.7-8.7c0-2-0.7-3.9-2-5.5
+						c0.4,1.1,0.6,2.2,0.6,3.3c0,5.2-4.2,9.5-9.5,9.5C125.5,124.1,124.4,123.8,123.3,123.4z"/>
+				</g>
+			</g>
+			<g>
+				<g>
+					<circle class="st3" cx="197.7" cy="136" r="9.1"/>
+					<path class="st7" d="M197.7,145.5c-5.2,0-9.5-4.2-9.5-9.5s4.2-9.5,9.5-9.5c5.2,0,9.5,4.2,9.5,9.5S203,145.5,197.7,145.5z
+						 M197.7,127.3c-4.8,0-8.7,3.9-8.7,8.7s3.9,8.7,8.7,8.7c4.8,0,8.7-3.9,8.7-8.7S202.5,127.3,197.7,127.3z"/>
+				</g>
+				<g>
+					<path d="M203,128.6c1.1,1.5,1.7,3.3,1.7,5.3c0,5-4.1,9.1-9.1,9.1c-2,0-3.8-0.6-5.3-1.7c1.6,2.3,4.3,3.8,7.4,3.8
+						c5,0,9.1-4.1,9.1-9.1C206.8,132.9,205.3,130.2,203,128.6L203,128.6z"/>
+					<path d="M197.7,145.5c-3.1,0-5.9-1.5-7.7-4c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c1.5,1,3.2,1.6,5,1.6
+						c4.8,0,8.7-3.9,8.7-8.7c0-1.8-0.6-3.5-1.6-5c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c2.5,1.8,4,4.7,4,7.7
+						C207.2,141.2,203,145.5,197.7,145.5L197.7,145.5z M192.3,142.7c1.5,1.2,3.5,2,5.5,2c4.8,0,8.7-3.9,8.7-8.7c0-2-0.7-3.9-2-5.5
+						c0.4,1.1,0.6,2.2,0.6,3.3c0,5.2-4.2,9.5-9.5,9.5C194.4,143.3,193.3,143.1,192.3,142.7L192.3,142.7z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<defs>
+				<path id="SVGID_00000048497558382615773580000004321571140207061640_" d="M32.3,56.1c4.9-8.5,16.6-11.2,25.5-12.8
+					c11.8-2.2,24.1-2.4,35.9,0.2c11.5,2.6,21.5,9,32.5,12.9c16.8,5.9,32.5,1.3,48-6.3c6-2.9,11.8-6.1,17.5-9.5
+					C242.3,11,284.6,30,295.3,44.2s33.2,56.5-22.1,113.2c0,0-19.4,18-3.2,43.3c16.2,25.3,51.4,49.4,33.6,83.8
+					c-17.8,34.4-65.2,30.4-109.4,14.6c0,0-26.1-11.5-56.5,0.4c-27.8,10.8-57.2,20.3-85.9,5.7c-32.2-16.4-38.7-55.6-22-85.9
+					c6.4-24.9,10.9-50.6,13.1-76.3c1.2-13.6,1.7-27.5,0.2-41.1c-0.6-5.8-1.6-11.6-3.4-17.2c-2.4-7.5-8.6-14.3-8.9-22.4
+					C30.8,59.9,31.3,57.9,32.3,56.1L32.3,56.1z"/>
+			</defs>
+			<clipPath id="SVGID_00000144321838296400425610000006398048406390092678_">
+				<use xlink:href="#SVGID_00000048497558382615773580000004321571140207061640_"  style="overflow:visible;"/>
+			</clipPath>
+			<g style="clip-path:url(#SVGID_00000144321838296400425610000006398048406390092678_);">
+				<g>
+					<rect x="42.9" y="250.9" class="st2" width="77.4" height="77.4"/>
+					<path class="st3" d="M43.3,250.9h76.6c0.2,0,0.4,0.2,0.4,0.4v14.3c0,0.2-0.2,0.4-0.4,0.4H43.3c-0.2,0-0.4-0.2-0.4-0.4v-14.3
+						C42.9,251.1,43.1,250.9,43.3,250.9z"/>
+					<g>
+						<circle class="st2" cx="105.7" cy="258.6" r="2"/>
+						<circle class="st2" cx="113.3" cy="258.6" r="2"/>
+					</g>
+					<path class="st2" d="M92.5,259H50.1c-0.2,0-0.4-0.2-0.4-0.4c0-0.2,0.2-0.4,0.4-0.4h42.4c0.2,0,0.4,0.2,0.4,0.4
+						C92.9,258.8,92.7,259,92.5,259z"/>
+					<g>
+						<path class="st9" d="M86,321.5H50c-0.2,0-0.4-0.2-0.4-0.4v-48.8c0-0.2,0.2-0.4,0.4-0.4h36c0.2,0,0.4,0.2,0.4,0.4v48.8
+							C86.4,321.3,86.2,321.5,86,321.5z M50.4,320.7h35.2v-48H50.4V320.7z"/>
+						<path class="st9" d="M113.1,294.4H90.9c-0.2,0-0.4-0.2-0.4-0.4v-21.7c0-0.2,0.2-0.4,0.4-0.4h22.2c0.2,0,0.4,0.2,0.4,0.4V294
+							C113.5,294.3,113.4,294.4,113.1,294.4L113.1,294.4z M91.3,293.6h21.4v-20.9H91.3V293.6z"/>
+						<path class="st9" d="M113.1,321.5H90.9c-0.2,0-0.4-0.2-0.4-0.4v-21.7c0-0.2,0.2-0.4,0.4-0.4h22.2c0.2,0,0.4,0.2,0.4,0.4v21.7
+							C113.5,321.3,113.4,321.5,113.1,321.5L113.1,321.5z M91.3,320.7h21.4v-20.9H91.3V320.7z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g>
+			<circle class="st2" cx="237.1" cy="275.1" r="47.3"/>
+			<path class="st3" d="M237.1,322.8c-26.3,0-47.7-21.4-47.7-47.7s21.4-47.7,47.7-47.7s47.7,21.4,47.7,47.7S263.4,322.8,237.1,322.8
+				z M237.1,228.3c-25.8,0-46.9,21-46.9,46.9s21,46.9,46.9,46.9s46.9-21,46.9-46.9S262.9,228.3,237.1,228.3z"/>
+		</g>
+		<g>
+			<line class="st11" x1="37.1" y1="51.1" x2="37.1" y2="62.9"/>
+			<line class="st11" x1="37.1" y1="51.1" x2="37.1" y2="70"/>
+			<polygon class="st3" points="55.6,40.4 55.6,61.7 37.1,72.4 18.7,61.7 18.7,40.4 37.1,29.7 			"/>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000160869203447171873690000008219489948024841663_" points="55.6,40.4 55.6,61.7 37.1,72.4 18.7,61.7 
+						18.7,40.4 37.1,29.7 					"/>
+				</defs>
+				<clipPath id="SVGID_00000085968426529931034570000011736094703510178235_">
+					<use xlink:href="#SVGID_00000160869203447171873690000008219489948024841663_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000085968426529931034570000011736094703510178235_);">
+					<path d="M22.2,23.7c-1.1,1.2-1.6,3.6-2.1,5.1c-1,3.1-1.8,6.4-1.9,9.7c-0.1,4.6,2.9,8.8,5.8,12.2c2.8,3.2,6.4,5.6,9,9
+						c0.5,0.6,0.9,1.3,1.2,1.9c2.2,4.1,2.9,8.9,2.4,13.5c0,0.2-0.1,1.6-0.4,1.6l-25,0.9L9.3,24.2C9.3,24.2,22.6,23.2,22.2,23.7
+						L22.2,23.7z"/>
+				</g>
+			</g>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000172436767319740619740000001551144003380837282_" points="55.6,40.4 55.6,61.7 37.1,72.4 18.7,61.7 
+						18.7,40.4 37.1,29.7 					"/>
+				</defs>
+				<clipPath id="SVGID_00000123431541774770998140000002547388921764013503_">
+					<use xlink:href="#SVGID_00000172436767319740619740000001551144003380837282_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000123431541774770998140000002547388921764013503_);">
+					<path class="st2" d="M56,40.2c-0.1-0.2-0.4-0.3-0.7-0.2L37.1,50.5L18.9,40c-0.2-0.1-0.5-0.1-0.7,0.2c-0.1,0.2-0.1,0.5,0.2,0.7
+						l18.2,10.5v24.5c0,0.3,0.2,0.5,0.5,0.5c0.3,0,0.5-0.2,0.5-0.5V51.4l18.2-10.5C56.1,40.7,56.2,40.4,56,40.2L56,40.2z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<line class="st11" x1="236.7" y1="275.1" x2="236.7" y2="289.6"/>
+			<line class="st11" x1="236.7" y1="275.1" x2="236.7" y2="298.3"/>
+			<polygon class="st3" points="259.4,262 259.4,288.2 236.7,301.3 214,288.2 214,262 236.7,248.9 			"/>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000068650855539157462690000003586291606053824170_" points="259.4,262 259.4,288.2 236.7,301.3 
+						214,288.2 214,262 236.7,248.9 					"/>
+				</defs>
+				<clipPath id="SVGID_00000059988209085810132010000010228198031736121021_">
+					<use xlink:href="#SVGID_00000068650855539157462690000003586291606053824170_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000059988209085810132010000010228198031736121021_);">
+					<path d="M218.3,241.5c-1.4,1.5-2,4.4-2.6,6.2c-1.2,3.8-2.3,7.9-2.3,12c-0.1,5.6,3.6,10.9,7.1,15c3.4,3.9,7.9,6.8,11,11
+						c0.6,0.8,1.1,1.6,1.5,2.4c2.7,5,3.5,11,3,16.6c0,0.3-0.1,2-0.5,2l-30.8,1.1l-2.4-65.6C202.5,242.1,218.9,240.9,218.3,241.5
+						L218.3,241.5z"/>
+				</g>
+			</g>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000098903084389073046360000003639616609492915330_" points="259.4,262 259.4,288.2 236.7,301.3 
+						214,288.2 214,262 236.7,248.9 					"/>
+				</defs>
+				<clipPath id="SVGID_00000168808955944851158370000010097178493700077245_">
+					<use xlink:href="#SVGID_00000098903084389073046360000003639616609492915330_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000168808955944851158370000010097178493700077245_);">
+					<path class="st2" d="M259.8,261.8c-0.1-0.2-0.4-0.3-0.7-0.2l-22.4,13l-22.5-13c-0.2-0.1-0.5-0.1-0.7,0.2
+						c-0.1,0.2-0.1,0.5,0.2,0.7l22.5,13v30.1c0,0.3,0.2,0.5,0.5,0.5s0.5-0.2,0.5-0.5v-30.1l22.4-13C259.9,262.3,260,262,259.8,261.8
+						z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<g>
+				<circle class="st2" cx="299.1" cy="185" r="16.8"/>
+				<path class="st8" d="M299.1,202.2c-9.5,0-17.2-7.7-17.2-17.2c0-9.5,7.7-17.2,17.2-17.2c9.5,0,17.2,7.7,17.2,17.2
+					C316.3,194.5,308.6,202.2,299.1,202.2z M299.1,168.6c-9,0-16.4,7.4-16.4,16.4c0,9,7.4,16.4,16.4,16.4c9,0,16.4-7.4,16.4-16.4
+					C315.5,175.9,308.1,168.6,299.1,168.6z"/>
+			</g>
+			<g>
+				<path class="st8" d="M307.9,170.7c1.6,2.6,2.5,5.6,2.5,8.8c0,9.3-7.5,16.8-16.8,16.8c-3.2,0-6.2-0.9-8.8-2.5c3,4.8,8.3,8,14.3,8
+					c9.3,0,16.8-7.5,16.8-16.8C315.9,178.9,312.7,173.6,307.9,170.7L307.9,170.7z"/>
+				<path class="st8" d="M299.1,202.2c-6,0-11.5-3.1-14.7-8.2c-0.1-0.2-0.1-0.4,0.1-0.5c0.1-0.1,0.3-0.2,0.5-0.1
+					c2.6,1.6,5.5,2.4,8.6,2.4c9,0,16.4-7.4,16.4-16.4c0-3-0.8-6-2.4-8.6c-0.1-0.2-0.1-0.4,0.1-0.5c0.1-0.1,0.3-0.2,0.5-0.1
+					c5.1,3.2,8.2,8.6,8.2,14.7C316.3,194.5,308.6,202.2,299.1,202.2L299.1,202.2z M286.1,194.9c3.1,4.1,7.9,6.5,13,6.5
+					c9,0,16.4-7.4,16.4-16.4c0-5.2-2.4-10-6.5-13c1.1,2.3,1.7,4.9,1.7,7.5c0,9.5-7.7,17.2-17.2,17.2
+					C291,196.7,288.4,196.1,286.1,194.9L286.1,194.9z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<circle class="st2" cx="107.1" cy="42" r="16.6"/>
+				<path class="st8" d="M107.1,59.1c-9.4,0-17-7.6-17-17s7.6-17,17-17s17,7.6,17,17S116.4,59.1,107.1,59.1z M107.1,25.8
+					c-8.9,0-16.2,7.3-16.2,16.2s7.3,16.2,16.2,16.2s16.2-7.3,16.2-16.2S116,25.8,107.1,25.8z"/>
+			</g>
+			<g>
+				<path class="st8" d="M116.7,28.5c1.9,2.7,3.1,6,3.1,9.6c0,9.2-7.4,16.6-16.6,16.6c-3.6,0-6.9-1.1-9.6-3.1c3,4.2,8,7,13.6,7
+					c9.2,0,16.6-7.4,16.6-16.6C123.7,36.5,120.9,31.5,116.7,28.5L116.7,28.5z"/>
+				<path class="st8" d="M107.1,59.1c-5.5,0-10.7-2.7-13.9-7.2c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c2.8,2,6,3,9.4,3
+					c8.9,0,16.2-7.3,16.2-16.2c0-3.4-1-6.6-3-9.4c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0c4.5,3.2,7.2,8.4,7.2,13.9
+					C124.1,51.4,116.4,59.1,107.1,59.1L107.1,59.1z M95.3,53.2c3,3.2,7.3,5,11.7,5c8.9,0,16.2-7.3,16.2-16.2c0-4.5-1.8-8.7-5-11.7
+					c1.2,2.4,1.9,5.1,1.9,7.8c0,9.4-7.6,17-17,17C100.4,55.1,97.7,54.5,95.3,53.2z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<circle class="st2" cx="8.6" cy="107" r="8.2"/>
+				<path class="st8" d="M8.6,115.6c-4.7,0-8.6-3.9-8.6-8.6c0-4.7,3.9-8.6,8.6-8.6s8.6,3.9,8.6,8.6C17.2,111.7,13.3,115.6,8.6,115.6
+					z M8.6,99.2c-4.3,0-7.8,3.5-7.8,7.8c0,4.3,3.5,7.8,7.8,7.8s7.8-3.5,7.8-7.8C16.4,102.7,12.9,99.2,8.6,99.2z"/>
+			</g>
+			<g>
+				<path class="st8" d="M12.9,100c0.8,1.2,1.2,2.7,1.2,4.3c0,4.5-3.7,8.2-8.2,8.2c-1.6,0-3-0.4-4.3-1.2c1.4,2.3,4,3.9,7,3.9
+					c4.5,0,8.2-3.7,8.2-8.2C16.8,104,15.2,101.4,12.9,100z"/>
+				<path class="st8" d="M8.6,115.6c-3,0-5.7-1.5-7.3-4.1c-0.1-0.2-0.1-0.4,0.1-0.5c0.1-0.1,0.3-0.2,0.5-0.1
+					c1.2,0.8,2.6,1.2,4.1,1.2c4.3,0,7.8-3.5,7.8-7.8c0-1.4-0.4-2.9-1.2-4.1c-0.1-0.2-0.1-0.4,0.1-0.5c0.1-0.1,0.3-0.2,0.5-0.1
+					c2.6,1.6,4.1,4.3,4.1,7.3C17.2,111.7,13.3,115.6,8.6,115.6L8.6,115.6z M2.9,112.4c1.5,1.5,3.5,2.4,5.7,2.4
+					c4.3,0,7.8-3.5,7.8-7.8c0-2.2-0.9-4.2-2.4-5.7c0.3,0.9,0.5,1.9,0.5,3c0,4.7-3.9,8.6-8.6,8.6C4.9,112.9,3.9,112.7,2.9,112.4
+					L2.9,112.4z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<circle class="st2" cx="317.6" cy="157.3" r="8"/>
+				<path class="st8" d="M317.6,165.7c-4.6,0-8.4-3.8-8.4-8.4s3.8-8.4,8.4-8.4s8.4,3.8,8.4,8.4S322.2,165.7,317.6,165.7z
+					 M317.6,149.7c-4.2,0-7.6,3.4-7.6,7.6s3.4,7.6,7.6,7.6c4.2,0,7.6-3.4,7.6-7.6S321.8,149.7,317.6,149.7z"/>
+			</g>
+			<g>
+				<path class="st8" d="M322.2,150.7c0.9,1.3,1.5,2.9,1.5,4.7c0,4.4-3.6,8-8,8c-1.7,0-3.3-0.6-4.7-1.5c1.5,2,3.8,3.4,6.5,3.4
+					c4.4,0,8-3.6,8-8C325.6,154.6,324.3,152.2,322.2,150.7L322.2,150.7z"/>
+				<path class="st8" d="M317.6,165.7c-2.7,0-5.3-1.3-6.9-3.6c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0
+					c1.3,0.9,2.8,1.4,4.4,1.4c4.2,0,7.6-3.4,7.6-7.6c0-1.6-0.5-3.1-1.4-4.4c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.1,0.4-0.2,0.5,0
+					c2.2,1.6,3.6,4.2,3.6,6.9C326,161.9,322.2,165.7,317.6,165.7L317.6,165.7z M313,163.4c1.3,1,2.9,1.6,4.6,1.6
+					c4.2,0,7.6-3.4,7.6-7.6c0-1.7-0.6-3.3-1.6-4.6c0.3,0.9,0.4,1.8,0.4,2.7c0,4.6-3.8,8.4-8.4,8.4
+					C314.7,163.8,313.8,163.7,313,163.4L313,163.4z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/empty-state-data-connections.svg b/clients/ui/frontend/src/shared/images/empty-state-data-connections.svg
new file mode 100644
index 000000000..38786075a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-data-connections.svg
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="uuid-07f88b0d-0a06-4081-8aaa-9b335cce561d"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 378 321"
+	 style="enable-background:new 0 0 378 321;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFE8CC;}
+	.st1{fill:#F8AE54;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#FCCB8F;}
+	.st4{fill:#EE0000;}
+	.st5{fill:none;stroke:#EE0000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
+	.st6{fill:#664934;}
+	.st7{fill:none;stroke:#8F0000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
+	.st8{fill:none;stroke:#664934;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
+	.st9{fill:none;stroke:#FCCB8F;stroke-width:3;stroke-miterlimit:10;}
+	.st10{clip-path:url(#SVGID_00000163768460521451006740000010962981066457926043_);}
+	.st11{fill:#FFE9DC;}
+	.st12{opacity:0.5;fill:#D8A381;enable-background:new    ;}
+	.st13{fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
+	.st14{clip-path:url(#SVGID_00000042701427658932295510000013113789385487904129_);}
+	.st15{fill:#F56D6D;}
+	.st16{clip-path:url(#SVGID_00000183934628865033149680000000761491724817307314_);}
+	.st17{fill:#F9D5C0;}
+	.st18{fill:#F5921B;}
+	.st19{fill:#EDBEA1;}
+	.st20{fill:#CA6C0F;}
+</style>
+<g>
+	<path class="st0" d="M6.2,133.7C-22.1,65.1,46.9-13.8,116.4,2.1c13.4,3.1,26.2,9.6,35.4,20.2c14.9,17.2,15.9,39.9,29.9,57.6
+		c14.7,18.7,37.4,16.4,58.9,18.1c46.6,3.7,86.7,11,111.4,57.3c15.7,29.5,14.4,66.5,2.8,97.2c-7.4,19.5-19.6,37.7-36.5,50
+		c-43.9,31.9-114,21.1-150.1-22.4c-23.4-28.2-31.6-60.3-62.6-81.4c-19.5-13.3-49.1-15.5-68.7-28.6C21.9,160.2,12,147.6,6.2,133.7z"
+		/>
+	<rect x="80.1" y="32.4" class="st1" width="106.6" height="109.2"/>
+	<rect x="219" y="173.4" class="st1" width="108.2" height="111.5"/>
+	<g>
+		<rect x="214.2" y="168.6" class="st2" width="108.2" height="111.5"/>
+		<path class="st3" d="M323,280.8H213.6V168H323L323,280.8L323,280.8z M214.9,279.5h106.9V169.3H214.9V279.5z"/>
+	</g>
+	<g>
+		<path class="st4" d="M121.4,236.4h136.3c0.2,0,0.4,0.2,0.4,0.4v9c0,0.2-0.2,0.4-0.4,0.4H121.4c-0.2,0-0.4-0.2-0.4-0.4v-9
+			C121,236.6,121.2,236.4,121.4,236.4z"/>
+		<path class="st4" d="M185.4,219.9h46.5c0.2,0,0.4,0.2,0.4,0.4v9c0,0.2-0.2,0.4-0.4,0.4h-46.5c-0.2,0-0.4-0.2-0.4-0.4v-9
+			C185,220.1,185.2,219.9,185.4,219.9z"/>
+		<path class="st4" d="M63.4,219.9h108.1c0.2,0,0.4,0.2,0.4,0.4v9c0,0.2-0.2,0.4-0.4,0.4H63.4c-0.2,0-0.4-0.2-0.4-0.4v-9
+			C63,220.1,63.2,219.9,63.4,219.9z"/>
+	</g>
+	<g>
+		<path class="st4" d="M260.5,56.5h109.3c0.2,0,0.4,0.2,0.4,0.4v9c0,0.2-0.2,0.4-0.4,0.4H260.5c-0.2,0-0.4-0.2-0.4-0.4v-9
+			C260.1,56.7,260.3,56.5,260.5,56.5z"/>
+		<path class="st4" d="M206.3,56.5h39.4c0.2,0,0.4,0.2,0.4,0.4v9c0,0.2-0.2,0.4-0.4,0.4h-39.4c-0.2,0-0.4-0.2-0.4-0.4v-9
+			C205.9,56.7,206.1,56.5,206.3,56.5z"/>
+		<path class="st4" d="M199.5,40.4h76.1c0.2,0,0.4,0.2,0.4,0.4v8.3c0,0.2-0.2,0.4-0.4,0.4h-76.1c-0.2,0-0.4-0.2-0.4-0.4v-8.3
+			C199.1,40.6,199.3,40.4,199.5,40.4z"/>
+		<path class="st4" d="M290.2,40.4h39.4c0.2,0,0.4,0.2,0.4,0.4v8.3c0,0.2-0.2,0.4-0.4,0.4h-39.4c-0.2,0-0.4-0.2-0.4-0.4v-8.3
+			C289.8,40.6,290,40.4,290.2,40.4z"/>
+	</g>
+	<g>
+		<path class="st4" d="M58.5,89h-23c-0.3-1.9-1.9-3.3-3.9-3.3s-3.6,1.4-3.9,3.3h-10c-0.3,0-0.6,0.3-0.6,0.6s0.3,0.6,0.6,0.6h10
+			c0.3,1.9,1.9,3.3,3.9,3.3s3.6-1.4,3.9-3.3h23c0.4,0,0.6-0.3,0.6-0.6S58.8,89,58.5,89L58.5,89z M34.1,90.3
+			c-0.3,1.2-1.3,2.1-2.6,2.1s-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1s2.3,0.9,2.6,2.1
+			c0.1,0.2,0.1,0.4,0.1,0.6S34.2,90.1,34.1,90.3z"/>
+		<path class="st4" d="M58.5,101.2h-5.9c-0.3-1.9-1.9-3.3-3.9-3.3c-2,0-3.6,1.4-3.9,3.3H17.6c-0.3,0-0.6,0.3-0.6,0.6
+			s0.3,0.6,0.6,0.6h27.1c0.3,1.9,1.9,3.3,3.9,3.3s3.6-1.4,3.9-3.3h5.9c0.4,0,0.6-0.3,0.6-0.6S58.8,101.2,58.5,101.2z M51.2,102.4
+			c-0.3,1.2-1.3,2.1-2.6,2.1s-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1s2.3,0.9,2.6,2.1
+			c0.1,0.2,0.1,0.4,0.1,0.6S51.3,102.2,51.2,102.4z"/>
+		<path class="st2" d="M34.2,89.7c0,0.2,0,0.4-0.1,0.6c-0.3,1.2-1.3,2.1-2.6,2.1s-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+			s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1s2.3,0.9,2.6,2.1C34.2,89.2,34.2,89.4,34.2,89.7z"/>
+		<path class="st2" d="M51.3,101.8c0,0.2,0,0.4-0.1,0.6c-0.3,1.2-1.3,2.1-2.6,2.1s-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+			s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1s2.3,0.9,2.6,2.1C51.3,101.4,51.3,101.6,51.3,101.8z"/>
+		<g>
+			<path class="st4" d="M58.5,113.3H42.4c-0.3-1.9-1.9-3.3-3.9-3.3c-2,0-3.6,1.4-3.9,3.3h-17c-0.3,0-0.6,0.3-0.6,0.6
+				s0.3,0.6,0.6,0.6h17c0.3,1.9,1.9,3.3,3.9,3.3c2,0,3.6-1.4,3.9-3.3h16.1c0.4,0,0.6-0.3,0.6-0.6S58.8,113.3,58.5,113.3L58.5,113.3z
+				 M41.1,114.6c-0.3,1.2-1.3,2.1-2.6,2.1c-1.3,0-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1
+				c1.3,0,2.3,0.9,2.6,2.1c0.1,0.2,0.1,0.4,0.1,0.6S41.2,114.4,41.1,114.6z"/>
+			<path class="st2" d="M41.2,113.9c0,0.2,0,0.4-0.1,0.6c-0.3,1.2-1.3,2.1-2.6,2.1c-1.3,0-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+				s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1c1.3,0,2.3,0.9,2.6,2.1C41.2,113.5,41.2,113.7,41.2,113.9z"/>
+		</g>
+	</g>
+	<g>
+		<rect x="150.7" y="154.4" class="st2" width="45.1" height="45.1"/>
+		<path class="st4" d="M195.8,200.1h-45.1c-0.4,0-0.6-0.3-0.6-0.6v-45.1c0-0.4,0.3-0.6,0.6-0.6h45.1c0.4,0,0.6,0.3,0.6,0.6v45.1
+			C196.4,199.9,196.2,200.1,195.8,200.1z M151.3,198.9h43.8V155h-43.8V198.9z"/>
+	</g>
+	<rect x="199.5" y="154.4" class="st2" width="45.1" height="45.1"/>
+	<rect x="213.7" y="168" class="st3" width="31.1" height="31.7"/>
+	<rect x="200.2" y="123.1" class="st2" width="43.8" height="27"/>
+	<g>
+		<path class="st4" d="M244.6,104.9h-45.1c-0.3,0-0.6,0.3-0.6,0.6v45.1c0,0.4,0.3,0.6,0.6,0.6h45.1c0.4,0,0.6-0.3,0.6-0.6v-45.1
+			C245.3,105.2,245,104.9,244.6,104.9L244.6,104.9z M244,150h-43.8v-27H244V150z"/>
+		<path class="st4" d="M245.3,104.9v0.6c0-0.4-0.3-0.6-0.6-0.6H245.3z"/>
+	</g>
+	<circle class="st2" cx="227.6" cy="114.1" r="2.3"/>
+	<circle class="st2" cx="236.6" cy="114.1" r="2.3"/>
+	<path class="st2" d="M208.6,114.1c0,0.4-0.3,0.6-0.6,0.6h-9.1v-1.3h9.1C208.3,113.5,208.6,113.8,208.6,114.1z"/>
+	<rect x="151.3" y="123.1" class="st2" width="43.8" height="27"/>
+	<g>
+		<path class="st4" d="M195.8,104.9h-45.1c-0.3,0-0.6,0.3-0.6,0.6v45.1c0,0.4,0.3,0.6,0.6,0.6h45.1c0.4,0,0.6-0.3,0.6-0.6v-45.1
+			C196.4,105.2,196.2,104.9,195.8,104.9L195.8,104.9z M195.2,150h-43.8v-27h43.8V150z"/>
+		<path class="st4" d="M150.7,104.9c-0.3,0-0.6,0.3-0.6,0.6v-0.6H150.7z"/>
+	</g>
+	<path class="st2" d="M196.5,113.5v1.3h-40.7c-0.3,0-0.6-0.3-0.6-0.6s0.3-0.6,0.6-0.6H196.5z"/>
+	<rect x="150" y="102.8" class="st1" width="36.7" height="20.4"/>
+	<rect x="199.5" y="154.4" class="st5" width="45.1" height="45.1"/>
+	<rect x="151.4" y="123.1" class="st1" width="35.3" height="18.5"/>
+	<rect x="150" y="119.6" class="st4" width="1.4" height="22.1"/>
+	<g>
+		<rect x="75.2" y="27.4" class="st2" width="106.6" height="109.2"/>
+		<path class="st3" d="M182.4,137.3H74.5V26.8h107.9V137.3L182.4,137.3z M75.8,136h105.3v-108H75.8V136z"/>
+	</g>
+	<path d="M102.3,136.7c0,0-0.4-25.8,8.3-45.9c0,0,3.8-6.1,6.1-7.7c0,0,0.4,1.1,5.5,0.8c5.1-0.2,15,3.8,17.9,9
+		c3,5.2,5.2,11.1,6.8,20.1s10,23.5,10,23.5L102.3,136.7"/>
+	<path class="st6" d="M196.5,50.4l-4.6-2.5c-0.5-0.3-1.1-0.3-1.6-0.1l-8.9,4.1c0,0,0,0-0.1,0c-1.2,0.7-3.6,7-4.6,9.7
+		c-0.1,0.3,0,0.7,0.4,0.8c0.1,0,0.1,0,0.2,0c0.1,0,0.3,0,0.4-0.1l5.2,5.1c0,0,5.2-3.8,6.7-4.7c1.5-1,5.3-4.9,6.3-6.5
+		c1.1-1.6-0.5-2.5-2-1.7c-1.5,0.8-3.9,3-5.5,3.1c0,0,0.1-2.7,3.1-4.4l3.8-1.9l0.5,0.3c0.3,0.2,0.7,0.1,0.9-0.2
+		C196.9,51,196.8,50.6,196.5,50.4L196.5,50.4z"/>
+	<path d="M183.1,68.1c-0.2,0-0.4-0.1-0.5-0.3c-0.2-0.3-0.1-0.7,0.1-0.9c0.2-0.2,5.2-3.8,6.7-4.8c1.4-0.9,5.1-4.8,6.2-6.3
+		c0.2-0.4,0.3-0.7,0.2-0.8c-0.2-0.2-0.7-0.3-1.4,0c-0.5,0.3-1.2,0.7-1.8,1.2c-1.3,0.9-2.7,1.9-3.9,2c-0.3,0-0.7-0.2-0.7-0.6
+		c0-0.4,0.2-0.7,0.6-0.7c0.9-0.1,2.1-1,3.3-1.8c0.7-0.5,1.4-1,2-1.3c1.1-0.5,2.3-0.4,2.9,0.3c0.5,0.6,0.5,1.5-0.1,2.4
+		c-1.1,1.7-5,5.7-6.5,6.7c-1.5,1-6.6,4.7-6.7,4.7C183.4,68.1,183.3,68.2,183.1,68.1L183.1,68.1z"/>
+	<path d="M204.9,49.2c-0.1-0.3-0.4-0.4-0.7-0.4l-5.6,0.5c-0.1,0-0.1,0-0.1,0l-16.3,5.6c-0.2,0.1-0.3,0.2-0.4,0.3
+		c-0.4,0.9-0.7,2.9,1,4.1c0.1,0.1,0.2,0.1,0.4,0.1c0.1,0,0.1,0,0.2,0l16.9-6.3c0.1,0,0.1-0.1,0.2-0.1l4.2-3.1
+		C204.9,49.7,205,49.4,204.9,49.2L204.9,49.2z"/>
+	<line class="st7" x1="119" y1="80.9" x2="119" y2="84"/>
+	<path class="st6" d="M148.9,63.4c0-0.1-3.2-5.2-2.9-10.9c0-0.4-0.3-0.6-0.6-0.7c-0.2,0-0.3,0.1-0.5,0.2l-2.4-5.4l-10,3.4
+		l-13.2,23.4l-0.5,10.5l3.3,0c7.9,0.3,13,3.9,14.8,5.5l0,0.7c0,0.4,0.2,0.7,0.6,0.7c0,0,0,0,0,0c0.3,0,0.6-0.3,0.6-0.6l0.8-12.6
+		c1.4,1.1,4.1,2.6,6.5,1.1c3-2,2.1-10.4,1.8-12.2l1.6-2.4C149,63.9,149,63.7,148.9,63.4L148.9,63.4z"/>
+	<path d="M138.2,67.7c-1.3,0-2.2-0.9-2.3-1c-0.3-0.2-0.3-0.6,0-0.9c0.2-0.3,0.6-0.3,0.9,0c0,0,0.7,0.7,1.5,0.6
+		c0.5,0,0.9-0.3,1.3-0.9c0.2-0.3,0.6-0.3,0.9-0.1c0.3,0.2,0.3,0.6,0.1,0.9c-0.6,0.8-1.4,1.3-2.2,1.4
+		C138.4,67.7,138.3,67.7,138.2,67.7L138.2,67.7z"/>
+	<path d="M147.2,62c-0.3,0-0.5-0.2-0.6-0.4c-0.1-0.3,0-0.7,0.4-0.8c1.5-0.6,1.6-2.8,1.6-3.9l-5.9,0.3c-0.4,0-0.7-0.2-0.7-0.6
+		c0-0.4,0.2-0.7,0.6-0.7l6.6-0.4c0.3,0,0.6,0.2,0.7,0.5c0,0.2,0.7,4.7-2.3,5.8C147.3,62,147.3,62,147.2,62L147.2,62z"/>
+	<path class="st4" d="M189.5,68.3c-0.1-0.2-0.2-0.4-0.5-0.4c-11.7-2.9-12.6-8.4-12.6-8.5c0-0.3-0.2-0.5-0.4-0.5
+		c-0.2-0.1-0.5,0-0.7,0.2c-1.4,1.5-3.3,3.8-5.4,6.4c-5.5,6.5-13.1,15.5-15.6,16.9c-3.9,2.1-11.7,3.9-16.6,4.3
+		c-0.3,0-0.6,0.3-0.6,0.6l0,1.7c-4.3-3.5-10-5.6-15.9-5.6c-0.4,0-0.8,0-1.2,0c-1.4,0.1-2,0.1-2.5-0.6c-0.2-0.3-0.6-0.3-0.8-0.2
+		c-1.8,1.1-3.6,3-5.5,5.9c-1.4,2.3-2.6,4.7-3.5,7.2c-1.1,3-1.8,6.2-2.5,9.2l-0.2,1c-2.3,10-3.4,20.2-3.4,30.4c0,0.4,0.3,0.6,0.6,0.6
+		l0,0c0.4,0,0.6-0.3,0.6-0.6l52.8,0c0.1,0.1,0.1,0.2,0.2,0.3c0.2,0.3,0.6,0.4,0.9,0.2c0.3-0.2,0.4-0.6,0.2-0.9
+		c-3.9-6.5-6.9-13.6-8.9-20.9c-0.5-1.9-0.9-3.8-1.4-5.7c-0.4-1.8-0.8-3.6-1.3-5.4c6-0.5,13.9-3.2,18.6-6.3
+		c4.8-3.3,8.7-7.7,12.2-12.1c2-2.5,4.6-5.8,6.8-8.8c2.9-3.7,5.6-7.2,6.2-7.9C189.5,68.8,189.6,68.5,189.5,68.3L189.5,68.3z"/>
+	<path d="M136.2,136.4c-3.4-4.3-7.3-29.2-7.3-29.4c0-0.2-0.2-0.4-0.4-0.4l0,0c-0.2,0-0.4,0.2-0.4,0.4c-2.1,15.3,0.9,29.6,0.9,29.8
+		c0,0.2,0.2,0.4,0.4,0.4h6.5c0.2,0,0.3-0.1,0.4-0.3C136.4,136.7,136.3,136.5,136.2,136.4L136.2,136.4z"/>
+	<path d="M146.1,47.6c-0.2-0.4-0.4-0.9-0.6-1.4c-0.2-0.7-0.1-1.5,0-2.4c0.1-1.2,0.3-2.6-0.6-3.9c-0.9-1.2-2.5-1.7-4.7-1.4
+		c-0.8,0.1-1-0.1-1.5-0.9c-0.2-0.3-0.4-0.5-0.6-0.9c-0.7-0.9-1.7-1.3-3-1.4c-1.7-0.1-3.6,0.6-4.7,1.7c-1,1-1.9,1.5-2.8,1.5h0
+		c-0.6,0-1.2-0.3-1.8-0.6c-0.2-0.1-0.5-0.3-0.8-0.4c-1-0.5-2.2-0.5-3.3,0c-1.2,0.5-2.2,1.4-2.8,2.7c-1,2.3-2.8,3.5-5.8,5
+		c-1.9,0.9-3,2.7-2.9,4.6c0.1,1.1,0.6,2,1.1,2.9c0.3,0.6,0.4,1.2,0.3,1.8c-0.2,1.8-1.1,3.5-2,5c-1.5,2.5,0.1,5.1,1.4,6.8
+		c0.5,0.7,1.1,1.3,1.6,2c1.2,1.4,2.3,2.6,3.1,4.2c1.1,2.1,1.4,3.7,1.1,4.8c-0.1,0.4-0.2,0.8-0.2,1.2c0,0.9,0.3,1.7,0.9,2.2
+		c1.1,1.1,2.9,1.2,3.9,1.2c0.2,0,0.4,0,0.5,0c1.9-0.1,3.6-1,5.2-1.7c1.6-0.8,3.2-1.8,4.6-3c2-1.7,3.3-4,4.3-6
+		c0.1-0.1,0.1-0.3,0.2-0.4c0.6-1.2,1.5-2.8,1.2-4.1c-0.1-0.6-0.6-1.1-1-1.5l-0.2-0.2c-1-1.1-1.9-3.3-1.6-4.9
+		c0.1-0.8,0.5-1.3,1.2-1.6c0.5-0.3,0.9-0.3,1.2-0.2c0.6,0.2,1.1,1.1,1.4,1.8c0.4,0.7,0.7,1.3,1.3,1.4c0.1,0,0.2,0,0.3,0.1
+		c0.5,0.1,1.2,0.3,1.8-0.2c0.7-0.5,1-1.5,1.1-3.2c0.2-2,1.2-3.9,2.8-5.1c0.6-0.3,1-0.9,1.1-1.6C147.1,49.9,146.6,48.8,146.1,47.6
+		L146.1,47.6z"/>
+	<path class="st2" d="M147.1,108.5c-0.3,0-0.6-0.2-0.6-0.5c-2.9-14.1-8.1-17.9-11.8-19.5c-0.3-0.1-0.5-0.5-0.3-0.8
+		c0.1-0.3,0.5-0.5,0.8-0.3c8.3,3.6,11.1,13.4,12.6,20.4c0.1,0.3-0.2,0.7-0.5,0.8C147.2,108.5,147.2,108.5,147.1,108.5L147.1,108.5z"
+		/>
+	<path class="st8" d="M147.9,62.9c-0.6-1.2-1.1-2.4-1.6-3.7"/>
+	<line class="st9" x1="181.8" y1="136.7" x2="75.2" y2="136.7"/>
+	<g>
+		<defs>
+			<rect id="SVGID_1_" x="217.7" y="179" width="95.9" height="100.6"/>
+		</defs>
+		<clipPath id="SVGID_00000129925952866183361770000010879544761919015609_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g style="clip-path:url(#SVGID_00000129925952866183361770000010879544761919015609_);">
+			<g>
+				<path class="st11" d="M260,207.3c-0.1,1.8-0.2,4.3-0.2,8.1c0,0.7,0.6,1.3,1.1,1.8c1.2,1.1,3.4,3.7,1.5,7.1
+					c-0.1,0.2-0.1,0.5,0.1,0.7c0.5,0.5,1.6,0.9,3.4,0.3c0,0,0.8,1.7,1.8,2.5c0,0,0,0.5,0.8,1.4c0.4,0.4,0.8,1.9,1.2,2.4
+					c0,0,0.1,0.1,0.1,0.1c0.9,0.8,2.1,0.9,3.1,0.2c0.7-0.5,1.3-1,1.9-1.4c1.1-0.7,2.1-1.5,3.1-2.4c0.5-0.4,1-0.9,1.4-1.4l0,0
+					c0,0,1.1,3.7,1,5.2l0.3,1.3l14.7-8.1v-0.7l-4.7-11.5L269,199.6l-7.5,6.3C261.5,205.9,260.1,206.4,260,207.3"/>
+				<path class="st12" d="M279.3,226.9c0.6-0.7,1.2-1.4,1.7-2.2c0.8-1.1,0.8-2.6,0.8-4.1c0-0.1,0.1-0.1,0.1-0.1c0.1,0,0.1,0,0.1,0.1
+					c0.5,1.3,1.4,3.2-0.8,6.4c0,0,0.8,3.4,0.9,4.5l-1.8,1.4l-0.2-0.7c0,0,0.2-0.8-0.8-4.5L279.3,226.9L279.3,226.9z"/>
+				<path class="st12" d="M283.1,209.6c-0.1-0.1-0.3-0.2-0.5-0.1l-0.8,0.8c-0.3,0.1-0.6,0.4-0.5,0.7c0.2,1.3-0.1,2.7-0.8,3.8
+					c-0.1,0.2-0.2,0.6,0,0.8c0.4,0.2,0.7-0.2,0.9-0.5c0.6-0.6,1.1-1.3,1.4-2.1c0.3-0.8,0.5-1.7,0.5-2.5v-0.4
+					C283.3,210,283.2,209.8,283.1,209.6L283.1,209.6z"/>
+				<path d="M268.1,213.6c-0.6-0.1-1.2-0.1-1.8-0.1c-0.6,0.1-1.2,0.3-1.7,0.5c-0.5,0.2-1,0.5-1.5,0.9c-0.2,0.2-0.4,0.4-0.6,0.6
+					l-0.7,0.7c-0.2,0.3-0.6,0.3-0.9,0c-0.3-0.2-0.3-0.6,0-0.9c0,0,0,0,0,0l0,0l0.7-0.6c0.3-0.2,0.5-0.4,0.8-0.6
+					c0.6-0.4,1.2-0.7,1.8-0.9c0.6-0.2,1.3-0.3,2-0.3c0.7,0,1.3,0.2,1.9,0.4c0.1,0,0.2,0.2,0.1,0.3l0,0
+					C268.3,213.6,268.2,213.6,268.1,213.6L268.1,213.6L268.1,213.6z"/>
+				<ellipse transform="matrix(0.896 -0.444 0.444 0.896 -69.1259 139.8568)" cx="264" cy="217.5" rx="0.9" ry="1.1"/>
+				<path d="M262.8,217.6c-0.1,0-0.2-0.1-0.3-0.2c-0.1-0.2-0.1-0.5,0.1-0.6c1.1-0.9,2.3-1.7,4.6-1.6c0.2,0,0.4,0.2,0.4,0.4
+					c0,0.2-0.2,0.4-0.4,0.4c-2-0.1-3,0.6-4.1,1.4C263,217.6,262.9,217.6,262.8,217.6L262.8,217.6z"/>
+				<path class="st13" d="M281.8,210.7c-0.1-0.8-0.4-1.5-0.8-2.2c-0.4-0.6-1-1.1-1.8-1.2c-0.7-0.1-1.5,0.2-1.9,0.8
+					c-0.5,0.6-0.7,1.3-0.8,2c-0.1,0.3-0.2,0.6-0.3,0.8"/>
+				<path d="M293.5,189c-1.6-1.5-3.6-3.5-6.2-4.2c-1.5-0.4-3.7-0.3-5.2,2.8c-0.2,0.4-0.5,1-0.7,1.5c-0.2-0.1-0.5-0.1-0.7-0.2
+					c-1.4-0.4-2.8-0.5-4.3-0.5c-3.5,0.1-6.3,1.7-9.5,3.5c-2.4,1.4-5.3,3.3-7,6.1c-1.8,2.8-2,6.5-0.5,9.5l0,0
+					c0.1,0.2,0.4,0.3,0.7,0.2c0,0,0.1,0,0.1-0.1c0.1-0.1,0.9-0.5,1.3-0.8c1.8-1,4.9-2.8,7.3-2.2c1.1,0.3,1.5,1.2,1.9,2.3
+					c0.1,0.2,0.1,0.3,0.2,0.5c0.7,1.7,1.8,3.6,4.1,4c0.1,0,0.2,0,0.3,0.1c0.5,0.1,0.9,0.2,1.2-0.1c0.1-0.2,0.2-0.4,0.1-0.6
+					c-0.4-1.3,0.3-2.4,1.2-3.2c0.8,0,1.5,0.1,2,0.5c1.3,0.9,1.5,2.8,1.5,2.8c0,0.2,0.2,0.4,0.4,0.4c2.6,0.4,5.9,4.1,6.2,4.5
+					c0.1,0.2,0.3,0.3,0.5,0.4c0.4,0.2,0.8,0.2,1.1,0.2c1.1,0,1.7-0.7,2-1.2c0.2-0.2,0.4-0.4,0.4-0.7c1.9-6,1.7-10.6,0.7-14.2
+					c0.5,0,0.9-0.2,1.4-0.4c1.5-0.7,2.6-2.1,2.8-3.6C297.5,193.5,295.4,190.8,293.5,189L293.5,189z"/>
+				<path class="st2" d="M290.6,197.7c-0.2,0-0.4-0.1-0.5-0.3c-2.5-3.9-5.5-5.3-5.5-5.3c-0.3-0.1-0.5-0.5-0.3-0.8
+					c0.1-0.3,0.5-0.5,0.8-0.3c0.1,0.1,3.3,1.5,6,5.8c0.2,0.3,0.1,0.7-0.2,0.9C290.8,197.7,290.7,197.7,290.6,197.7L290.6,197.7z"/>
+				<path class="st12" d="M266.5,226.4c0.1-0.1,0.2-0.2,0.2-0.3c0.1-0.1,0.2-0.2,0.2-0.4c0.1-0.2,0.2-0.5,0.3-0.7
+					c0.2-0.4,0.3-0.8,0.3-1.3c-0.2,0.5-0.6,0.9-1,1.2c-0.2,0.1-0.3,0.2-0.5,0.3l-0.1,0.1c0.2,0.3,0.3,0.7,0.5,1L266.5,226.4"/>
+				<g>
+					<defs>
+						<path id="SVGID_00000130615760853976808640000005334475786981563320_" d="M260,207.3c-0.1,1.8-0.2,4.3-0.2,8.1
+							c0,0.7,0.6,1.3,1.1,1.8c1.2,1.1,3.4,3.7,1.5,7.1c-0.1,0.2-0.1,0.5,0.1,0.7c0.5,0.5,1.6,0.9,3.4,0.3c0,0,0.8,1.7,1.8,2.5
+							c0,0,0,0.5,0.8,1.4c0.4,0.4,0.8,1.9,1.2,2.4c0,0,0.1,0.1,0.1,0.1c0.9,0.8,2.1,0.9,3.1,0.2c0.7-0.5,1.3-1,1.9-1.4
+							c1.1-0.7,2.1-1.5,3.1-2.4c0.5-0.4,1-0.9,1.4-1.4l0,0c0,0,1.1,3.7,1,5.2l0.3,1.3l14.7-8.1v-0.7l-4.7-11.5L269,199.6l-7.5,6.3
+							C261.5,205.9,260.1,206.4,260,207.3"/>
+					</defs>
+					<clipPath id="SVGID_00000013172665156632980940000011234858711410820021_">
+						<use xlink:href="#SVGID_00000130615760853976808640000005334475786981563320_"  style="overflow:visible;"/>
+					</clipPath>
+					<g style="clip-path:url(#SVGID_00000013172665156632980940000011234858711410820021_);">
+						<g>
+							<path class="st15" d="M267.5,227.8c0,0-0.2,0.8,0.8,1.1c0,0,2.1-1.2,1.7-3.4L267.5,227.8z"/>
+							<path class="st4" d="M266.9,226.7c0.3-0.1,0.6-0.2,0.8-0.4c0.3-0.1,0.5-0.3,0.8-0.5c0.3-0.2,0.5-0.3,0.7-0.5
+								c0.2-0.2,0.4-0.4,0.6-0.7v0c0.1-0.1,0.2-0.1,0.3-0.1c0.1,0.1,0.1,0.2,0.1,0.2c-0.1,0.3-0.3,0.6-0.5,0.9
+								c-0.2,0.3-0.4,0.5-0.7,0.8c-0.2,0.2-0.5,0.5-0.8,0.7s-0.5,0.4-0.8,0.6c-0.3,0.2-0.7,0.1-0.9-0.2c-0.2-0.3-0.1-0.6,0.1-0.8
+								C266.8,226.8,266.8,226.7,266.9,226.7L266.9,226.7L266.9,226.7z"/>
+						</g>
+					</g>
+				</g>
+				<g>
+					<defs>
+						<rect id="SVGID_00000072986383944656932240000003630328335220958107_" x="216.8" y="172.8" width="95.4" height="106.7"/>
+					</defs>
+					<clipPath id="SVGID_00000065759408325763278360000007094573724007035011_">
+						<use xlink:href="#SVGID_00000072986383944656932240000003630328335220958107_"  style="overflow:visible;"/>
+					</clipPath>
+					<g style="clip-path:url(#SVGID_00000065759408325763278360000007094573724007035011_);">
+						<g>
+							<path class="st17" d="M244.9,246.2c-0.8-0.9-4.7-5.7-5.2-5.9c-0.5-0.2-1.1-0.3-1.6-0.3c-0.5-0.1-1.1-0.1-1.7-0.2
+								c-0.5-0.1-1.1-0.2-1.7-0.3c-0.8-0.2-1.7-0.3-2.3-0.5c-1-0.3-2.8,3.5-3.6,5.2l-2.5,1.4c-0.1,0-0.1,0.1-0.1,0.2
+								c0,0.1,0.1,0.2,0.2,0.2l2.5,0.8c0,0,0,0,0.1,0c0.1,0.3,0.2,0.5,0.3,0.8c0.2,1.2,1.1,1.4,1.9,1.6l0.4,0.1c0.5,0.1,2,1,3.4,1.8
+								c1.2,0.7,2.2,1.3,2.8,1.5c0.6,0.3,1.3,0.6,1.8,1c0,0,0.1,0.1,0.1,0.1h0c0.1,0,0.1,0,0.2-0.1l4.9-6.9
+								C245,246.4,245,246.3,244.9,246.2L244.9,246.2z"/>
+							<path class="st17" d="M245.1,246.6c-0.1,0-0.2-0.1-0.3-0.2c-2.2-2.8-4.8-5.8-5.2-6.1c-0.2-0.1-0.8-0.2-1.5-0.3
+								c-0.6-0.1-1.2-0.1-1.8-0.3c-0.5-0.1-1-0.2-1.6-0.3c-0.9-0.2-1.9-0.4-2.5-0.5c-0.5,0.1-1.6,2.1-2.7,4.5l1.2,0l1.2-1.8
+								c0.1-0.2,0.4-0.3,0.6-0.1c0.2,0.1,0.3,0.4,0.1,0.6l-1.3,2c-0.1,0.1-0.2,0.2-0.4,0.2l-2.1,0c-0.1,0-0.3-0.1-0.3-0.2
+								c-0.1-0.1-0.1-0.3,0-0.4c1.2-2.7,2.8-5.9,3.9-5.6c0.6,0.2,1.6,0.4,2.5,0.5c0.6,0.1,1.1,0.2,1.6,0.3c0.5,0.1,1.2,0.2,1.7,0.3
+								c0.8,0.1,1.4,0.2,1.8,0.4c0.5,0.3,4,4.5,5.4,6.3c0.1,0.2,0.1,0.5-0.1,0.6C245.3,246.6,245.2,246.7,245.1,246.6L245.1,246.6z"
+								/>
+							<polygon class="st18" points="231.2,243.7 234.9,243.9 233.4,242.3 232.1,242.3 							"/>
+							<path class="st19" d="M230.9,244.5c-0.2,0-0.4-0.2-0.5-0.4c0-0.3,0.2-0.5,0.4-0.5l3.3-0.1l-0.8-0.7c-0.8-0.1-1.5-0.6-1.9-1.3
+								c-0.1-0.2-0.1-0.5,0.2-0.6c0.2-0.1,0.5-0.1,0.6,0.2c0.3,0.5,0.8,0.8,1.4,0.9c0.1,0,0.2,0,0.3,0.1l1.8,1.6
+								c0.1,0.1,0.2,0.3,0.1,0.5c-0.1,0.2-0.2,0.3-0.4,0.3L230.9,244.5C230.9,244.5,230.9,244.5,230.9,244.5z"/>
+							<path d="M240,243.9c-0.1-0.2-0.3-0.3-0.5-0.3l-10.6-0.2c-0.1,0-0.2,0-0.3,0.1l-2.6,1.5c-0.2,0.1-0.3,0.4-0.3,0.6
+								c0,0.3,0.2,0.5,0.4,0.5l2.6,0.8c0.1,0,0.1,0,0.2,0l10.3,0.2h0c0.1,0,0.2,0,0.2,0c0.1,0,0.7-0.3,1-1
+								C240.6,245.4,240.5,244.7,240,243.9L240,243.9z"/>
+							<g>
+								<path class="st17" d="M235.8,247.5l-3.3-1.1c0,0-0.2-0.8-2-1.6c-1.8-0.8-2.1,0.7-2.1,0.7c0.6,0.5,0.9,1.1,1,1.8
+									c0.2,1.3,1.3,1.3,2.3,1.6c1,0.3,5.1,2.9,6.4,3.5c0.7,0.3,1.4,0.6,1.9,1.1"/>
+								<path class="st19" d="M240,254c-0.1,0-0.2,0-0.3-0.1c-0.6-0.4-1.2-0.8-1.8-1c-0.6-0.3-1.7-0.9-2.9-1.6
+									c-1.4-0.8-2.9-1.7-3.4-1.8c-0.1,0-0.3-0.1-0.4-0.1c-0.9-0.2-1.9-0.5-2.2-1.8c-0.1-0.6-0.4-1.2-0.9-1.6
+									c-0.1-0.1-0.2-0.3-0.1-0.4c0-0.1,0.2-0.8,0.8-1.1c0.5-0.3,1.1-0.2,1.8,0.1c1.4,0.6,2,1.3,2.2,1.6l3.2,1
+									c0.2,0.1,0.3,0.3,0.3,0.5c-0.1,0.2-0.3,0.3-0.5,0.3l-3.3-1.1c-0.1,0-0.2-0.1-0.3-0.3l0,0c0,0-0.3-0.6-1.8-1.3
+									c-0.3-0.1-0.8-0.3-1.1-0.1c-0.2,0.1-0.3,0.2-0.3,0.3c0.5,0.5,0.8,1.2,0.9,1.9c0.1,0.8,0.6,0.9,1.5,1.1
+									c0.1,0,0.3,0.1,0.5,0.1c0.6,0.2,2.1,1,3.7,1.9c1.1,0.6,2.3,1.3,2.8,1.6c0.7,0.3,1.4,0.7,2,1.2c0.2,0.1,0.2,0.4,0.1,0.6
+									C240.2,253.9,240.1,254,240,254L240,254z"/>
+							</g>
+						</g>
+					</g>
+				</g>
+				<path class="st20" d="M276.8,254.8l-0.5-1l-0.6,1c0,0.1-4,5.3-30.6-11.7l-0.5-0.3l-9.5,14.6l0.5,0.4
+					c1.1,0.8,23.2,15.7,35.8,15.7c2.7,0,4.9-0.7,6.4-2.3l0.1-0.1l4-7.4L276.8,254.8L276.8,254.8z"/>
+				<path class="st2" d="M268.8,275.6C268.8,275.6,268.8,275.6,268.8,275.6c-0.5,0-0.9-0.4-0.9-0.9c0.1-2.3,0-4.3-0.1-6
+					c-0.2-3.3-0.3-6,0.6-8.5c1-2.5,2.1-4.9,3.5-7.1c0.2-0.4,0.8-0.5,1.2-0.3c0.4,0.2,0.5,0.8,0.3,1.2c-1.3,2.2-2.4,4.5-3.3,6.8
+					c-0.8,2.2-0.7,4.7-0.5,7.8c0.1,1.8,0.2,3.8,0.1,6.1C269.6,275.2,269.3,275.6,268.8,275.6L268.8,275.6z"/>
+				<path class="st20" d="M305.8,239.2c4.2,6.5,4.3,15.8,4.3,15.8c0.4,16.9-5.2,39.1-5.2,39.1l-39-1.2c6.2-18.5,1.6-26.2,3.9-32.5
+					c2.3-6.3,10-17.3,10-17.3l9.1-10.8l11.8,2.4L305.8,239.2z"/>
+				<path d="M286.2,261.9c0-0.3-0.3-0.6-0.7-0.6c-0.3,0-0.6,0.3-0.6,0.7c0.6,20.8-4.1,32-4.1,32.1c-0.1,0.2-0.1,0.4,0,0.6
+					c0.1,0.2,0.3,0.3,0.5,0.3l3.2,0.3c0,0,0,0,0.1,0c0.3,0,0.6-0.2,0.6-0.5C288.5,280,286.2,262,286.2,261.9L286.2,261.9z"/>
+				<path class="st1" d="M279.1,232.7c0,0,16.8-10.1,17.6-10.3c0.8-0.2-1,2.2,1.8,6.1s5.8,8.2,7.2,10.7c0,0-11.4-12-26.1,4
+					C280,239.7,279.8,236.2,279.1,232.7L279.1,232.7z"/>
+				<path class="st18" d="M285.5,280.1l-28.9-6.1c-0.2-0.1-0.5,0-0.6,0.2s-0.2,0.5-0.1,0.7l2.9,5.7c0.1,0.2,0.3,0.3,0.6,0.3l26,0.4
+					h0c0.3,0,0.6-0.2,0.6-0.6C286.1,280.4,285.8,280.1,285.5,280.1L285.5,280.1z"/>
+				<path d="M260.3,280.7l-12.7-25c-0.1-0.2-0.3-0.3-0.5-0.3l-28-3.7c-0.2,0-0.5,0.1-0.6,0.3c-0.1,0.2-0.2,0.4-0.1,0.6l13.7,28.6
+					c0.1,0.2,0.3,0.4,0.6,0.4c0.1,0,0.2,0,0.3-0.1c0.2-0.1,0.4-0.3,0.4-0.6H259l0.1,0.3c0.2,0.3,0.5,0.4,0.9,0.3
+					S260.5,281,260.3,280.7L260.3,280.7z"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path class="st4" d="M377.7,221.2h-23c-0.3-1.9-1.9-3.3-3.9-3.3s-3.6,1.4-3.9,3.3h-10c-0.3,0-0.6,0.3-0.6,0.6
+			c0,0.4,0.3,0.6,0.6,0.6h10c0.3,1.9,1.9,3.3,3.9,3.3s3.6-1.4,3.9-3.3h23c0.4,0,0.6-0.3,0.6-0.6C378.3,221.5,378,221.2,377.7,221.2z
+			 M353.3,222.4c-0.3,1.2-1.3,2.1-2.6,2.1c-1.3,0-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1
+			c1.3,0,2.3,0.9,2.6,2.1c0.1,0.2,0.1,0.4,0.1,0.6S353.4,222.2,353.3,222.4z"/>
+		<path class="st4" d="M377.7,233.3h-5.9c-0.3-1.9-1.9-3.3-3.9-3.3s-3.6,1.4-3.9,3.3h-27.1c-0.3,0-0.6,0.3-0.6,0.6s0.3,0.6,0.6,0.6
+			h27.1c0.3,1.9,1.9,3.3,3.9,3.3s3.6-1.4,3.9-3.3h5.9c0.4,0,0.6-0.3,0.6-0.6S378,233.3,377.7,233.3z M370.4,234.6
+			c-0.3,1.2-1.3,2.1-2.6,2.1c-1.3,0-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1
+			c1.3,0,2.3,0.9,2.6,2.1c0.1,0.2,0.1,0.4,0.1,0.6S370.5,234.4,370.4,234.6z"/>
+		<path class="st2" d="M353.4,221.8c0,0.2,0,0.4-0.1,0.6c-0.3,1.2-1.3,2.1-2.6,2.1c-1.3,0-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+			s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1c1.3,0,2.3,0.9,2.6,2.1C353.4,221.4,353.4,221.6,353.4,221.8z"/>
+		<path class="st2" d="M370.5,233.9c0,0.2,0,0.4-0.1,0.6c-0.3,1.2-1.3,2.1-2.6,2.1c-1.3,0-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+			s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1c1.3,0,2.3,0.9,2.6,2.1C370.5,233.5,370.5,233.7,370.5,233.9z"/>
+		<g>
+			<path class="st4" d="M377.7,245.4h-16.1c-0.3-1.9-1.9-3.3-3.9-3.3s-3.6,1.4-3.9,3.3h-17c-0.3,0-0.6,0.3-0.6,0.6
+				c0,0.4,0.3,0.6,0.6,0.6h17c0.3,1.9,1.9,3.3,3.9,3.3s3.6-1.4,3.9-3.3h16.1c0.4,0,0.6-0.3,0.6-0.6
+				C378.3,245.7,378,245.4,377.7,245.4z M360.3,246.7c-0.3,1.2-1.3,2.1-2.6,2.1s-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+				s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1s2.3,0.9,2.6,2.1c0.1,0.2,0.1,0.4,0.1,0.6S360.4,246.5,360.3,246.7z"/>
+			<path class="st2" d="M360.4,246.1c0,0.2,0,0.4-0.1,0.6c-0.3,1.2-1.3,2.1-2.6,2.1s-2.3-0.9-2.6-2.1c-0.1-0.2-0.1-0.4-0.1-0.6
+				s0-0.4,0.1-0.6c0.3-1.2,1.3-2.1,2.6-2.1s2.3,0.9,2.6,2.1C360.4,245.6,360.4,245.9,360.4,246.1z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/clients/ui/frontend/src/images/empty-state-model-registries.svg b/clients/ui/frontend/src/shared/images/empty-state-model-registries.svg
similarity index 100%
rename from clients/ui/frontend/src/images/empty-state-model-registries.svg
rename to clients/ui/frontend/src/shared/images/empty-state-model-registries.svg
diff --git a/clients/ui/frontend/src/shared/images/empty-state-model-serving.svg b/clients/ui/frontend/src/shared/images/empty-state-model-serving.svg
new file mode 100644
index 000000000..4fd433271
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-model-serving.svg
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 495 321" style="enable-background:new 0 0 495 321;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+	.st1{fill:#B9DAFC;}
+	.st2{clip-path:url(#SVGID_00000082334144444578035450000002426849202634827932_);}
+	.st3{fill:#4394E5;}
+	.st4{fill:#FFFFFF;stroke:#FFFFFF;stroke-miterlimit:10;}
+	.st5{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
+	.st6{fill:#B9DAFC;stroke:#FFFFFF;stroke-width:2.23;stroke-miterlimit:10;}
+	.st7{fill:#FFFFFF;}
+	.st8{fill:#EE0000;}
+	.st9{clip-path:url(#SVGID_00000160187852063691342880000009548005903242447025_);}
+	.st10{clip-path:url(#SVGID_00000142151220885517530920000005733161748127152045_);}
+	.st11{fill:#003366;}
+	.st12{clip-path:url(#SVGID_00000139980203941449251260000004260663555558625677_);}
+	.st13{clip-path:url(#SVGID_00000161619106630728917290000017552698256561537933_);}
+	.st14{fill:#EE0000;stroke:#FFFFFF;stroke-width:2.23;stroke-miterlimit:10;}
+	.st15{fill:none;stroke:#FF0000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
+</style>
+<g class="st0">
+	<g id="uuid-2c394f4a-cf84-462a-a79e-245f938fce72">
+		<g>
+			<path class="st1" d="M68.7,110.3c-4.4-15.7-1.2-32.2,5-46.5c21.4-48.6,74-70.1,122-56.5c43,12.3,75.4,45.1,120,49.9
+				c31.3,3.4,67-9.6,95.7,8.4c26,16.2,41.4,45,39.3,75.8c-1.6,24.1-14.1,46-32.3,61.6c-18.4,15.8-40.4,26.3-58.7,42.4
+				c-12.8,11.3-18.7,27.4-29.4,40.2c-12.6,15-31.4,25.3-50.7,28.2c-20.3,3.1-41.4-1.7-58.6-12.8c-15.3-9.8-27.9-25.1-46.1-29.6
+				c-13.2-3.3-26.2,0.2-39.1,3.3c-9,2.2-19,1-27.8-2.1c-17.5-6.1-32.5-20.3-38.9-37.8c-4.2-11.7-4.1-24.5,1-35.8
+				c3.8-8.4,8.8-16.4,10.8-25.5c3.7-16.8-0.5-33.9-7.1-49.5C71.9,119.1,70.1,115.2,68.7,110.3L68.7,110.3z"/>
+			<g>
+				<defs>
+					<path id="SVGID_1_" d="M68.7,110.3c-4.4-15.7-1.2-32.2,5-46.5c21.4-48.6,74-70.1,122-56.5c43,12.3,75.4,45.1,120,49.9
+						c31.3,3.4,67-9.6,95.7,8.4c26,16.2,41.4,45,39.3,75.8c-1.6,24.1-14.1,46-32.3,61.6c-18.4,15.8-40.4,26.3-58.7,42.4
+						c-12.8,11.3-18.7,27.4-29.4,40.2c-12.6,15-31.4,25.3-50.7,28.2c-20.3,3.1-41.4-1.7-58.6-12.8c-15.3-9.8-27.9-25.1-46.1-29.6
+						c-13.2-3.3-26.2,0.2-39.1,3.3c-9,2.2-19,1-27.8-2.1c-17.5-6.1-32.5-20.3-38.9-37.8c-4.2-11.7-4.1-24.5,1-35.8
+						c3.8-8.4,8.8-16.4,10.8-25.5c3.7-16.8-0.5-33.9-7.1-49.5C71.9,119.1,70.1,115.2,68.7,110.3L68.7,110.3z"/>
+				</defs>
+				<clipPath id="SVGID_00000181063981142024680320000006360988311234069182_">
+					<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000181063981142024680320000006360988311234069182_);">
+					<path class="st1" d="M68.7,110.3c-4.4-15.7-1.2-32.2,5-46.5c21.4-48.6,74.3-66.4,122.3-52.7c43,12.3,75.1,41.4,119.7,46.2
+						c31.3,3.4,67-9.6,95.7,8.4c26,16.2,41.4,45,39.3,75.8c-1.6,24.1-14.1,46-32.3,61.6c-18.4,15.8-40.4,26.3-58.7,42.4
+						c-12.8,11.3-18.7,27.4-29.4,40.2c-12.6,15-31.4,25.3-50.7,28.2c-20.3,3.1-41.4-1.7-58.6-12.8c-15.3-9.8-27.9-25.1-46.1-29.6
+						c-13.2-3.3-26.2,0.2-39.1,3.3c-9,2.2-19,1-27.8-2.1c-17.5-6.1-32.5-20.3-38.9-37.8c-4.2-11.7-4.1-24.5,1-35.8
+						c3.8-8.4,8.8-16.4,10.8-25.5c3.7-16.8-0.5-33.9-7.1-49.5C71.9,119.2,70.1,115.2,68.7,110.3L68.7,110.3z"/>
+					<g>
+						<path class="st1" d="M264.3,110.8c-6,0-11.9,0.9-17.4,2.6c-13.2-24.9-39.4-41.8-69.5-41.8c-33.5,0-62.1,20.9-73.4,50.4
+							c-21.4,0.7-39.6,14-47.5,32.7c-3-0.8-6.1-1.2-9.4-1.2c-20.8,0-37.6,16.9-37.6,37.6s16.9,37.6,37.6,37.6h217.1
+							c32.6,0,59.1-26.4,59.1-59.1S296.9,110.8,264.3,110.8L264.3,110.8z"/>
+					</g>
+					<g>
+						<circle class="st1" cx="292.4" cy="178.2" r="4.1"/>
+						<circle class="st1" cx="304.9" cy="178.2" r="4.1"/>
+					</g>
+					<g>
+						<g>
+							<g>
+								<rect x="174.2" y="3.2" class="st3" width="150.2" height="327.2"/>
+								<rect x="189.7" y="116.3" class="st4" width="150.2" height="214"/>
+								<line class="st5" x1="189.6" y1="267.5" x2="340.2" y2="267.5"/>
+							</g>
+							<circle class="st6" cx="312.2" cy="243.8" r="2.6"/>
+							<circle class="st6" cx="320.6" cy="243.8" r="2.6"/>
+							<circle class="st6" cx="303.9" cy="243.8" r="2.6"/>
+						</g>
+						<g>
+							<line class="st5" x1="189.8" y1="217.7" x2="335.1" y2="217.7"/>
+							<line class="st5" x1="189.8" y1="161" x2="339.3" y2="161"/>
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+		<path class="st3" d="M257.5,122.9c-6,0-11.9,0.9-17.4,2.6c-12.5-23.5-36.5-39.9-64.6-41.6c-1.6-0.1-3.3-0.2-4.9-0.2
+			c-33.5,0-62.1,20.9-73.4,50.4c-21.4,0.7-39.6,14-47.5,32.7c-3-0.8-6.1-1.2-9.4-1.2c-20.8,0-37.6,16.9-37.6,37.6S19.6,241,40.3,241
+			h217.1c32.6,0,59.1-26.4,59.1-59.1S290.1,122.9,257.5,122.9L257.5,122.9z"/>
+		<g>
+			<path class="st7" d="M264.3,110.8c-6,0-11.9,0.9-17.4,2.6c-12.5-23.5-36.5-39.9-64.6-41.6c-1.6-0.1-3.3-0.2-4.9-0.2
+				c-33.5,0-62.1,20.9-73.4,50.4c-21.4,0.7-39.6,14-47.5,32.7c-3-0.8-6.1-1.2-9.4-1.2c-20.8,0-37.6,16.9-37.6,37.6
+				s16.9,37.6,37.6,37.6h217.1c32.6,0,59.1-26.4,59.1-59.1S296.9,110.8,264.3,110.8L264.3,110.8z"/>
+			<path class="st1" d="M264.3,229.6H47.2c-21.1,0-38.3-17.2-38.3-38.3s17.2-38.3,38.3-38.3c3,0,6,0.4,9,1.1
+				c8.2-19,26.7-31.7,47.4-32.6c5.7-14.6,15.6-27.1,28.5-36.2c13.4-9.3,29.1-14.3,45.4-14.3c1.6,0,3.2,0.1,5,0.2
+				c13.7,0.8,27,5.3,38.4,12.8c11,7.2,20.2,17.1,26.4,28.7c5.5-1.6,11.2-2.5,17-2.5c32.9,0,59.7,26.8,59.7,59.7
+				S297.2,229.6,264.3,229.6L264.3,229.6z M47.2,154.3c-20.4,0-37,16.6-37,37s16.6,37,37,37h217.1c32.2,0,58.4-26.2,58.4-58.4
+				s-26.2-58.4-58.4-58.4c-5.8,0-11.6,0.9-17.2,2.6c-0.3,0.1-0.7,0-0.8-0.3c-6.2-11.6-15.2-21.5-26.2-28.7
+				c-11.3-7.4-24.3-11.7-37.8-12.5c-1.7-0.1-3.3-0.2-4.9-0.2c-16.1,0-31.5,4.9-44.6,14c-12.8,9-22.6,21.4-28.2,36
+				c-0.1,0.3-0.3,0.4-0.6,0.4c-20.5,0.7-38.9,13.4-46.9,32.3c-0.1,0.3-0.5,0.5-0.8,0.4C53.4,154.7,50.3,154.3,47.2,154.3L47.2,154.3
+				z"/>
+		</g>
+		<g>
+			<path class="st8" d="M121,228.2c-0.4,0-0.7-0.3-0.7-0.7v-30.6c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7v30.6
+				C121.7,227.9,121.4,228.2,121,228.2z"/>
+			<path class="st8" d="M101.1,263.6c-0.4,0-0.7-0.3-0.7-0.7v-52.1c0-0.4,0.3-0.7,0.7-0.7s0.7,0.3,0.7,0.7v52.1
+				C101.7,263.3,101.4,263.6,101.1,263.6z"/>
+			<path class="st8" d="M141,262.8c-0.4,0-0.7-0.3-0.7-0.7v-44.5c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7v44.5
+				C141.7,262.5,141.4,262.8,141,262.8z"/>
+			<path class="st8" d="M121,292.5c-0.4,0-0.7-0.3-0.7-0.7v-47.6c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7v47.6
+				C121.7,292.2,121.4,292.5,121,292.5z"/>
+		</g>
+		<g>
+			<polygon class="st8" points="167.5,103.1 167.5,155.1 122.4,181.1 77.4,155.1 77.4,103.1 122.4,77.1 			"/>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000036956329780120723660000008381785446522592140_" points="167.5,103.1 167.5,155.1 122.4,181.1 
+						77.4,155.1 77.4,103.1 122.4,77.1 					"/>
+				</defs>
+				<clipPath id="SVGID_00000046310137800730563280000000690597499582807461_">
+					<use xlink:href="#SVGID_00000036956329780120723660000008381785446522592140_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000046310137800730563280000000690597499582807461_);">
+					<path class="st7" d="M168.2,102.7c-0.2-0.4-0.8-0.6-1.2-0.3l-44.5,25.7l-44.6-25.7c-0.4-0.2-1-0.1-1.2,0.3
+						c-0.2,0.4-0.1,1,0.3,1.2l44.6,25.7v59.8c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9v-59.8l44.5-25.7
+						C168.3,103.6,168.5,103.1,168.2,102.7L168.2,102.7z"/>
+				</g>
+			</g>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000076589908644435705500000018411111499963603902_" points="167.5,103.1 167.5,155.1 122.4,181.1 
+						77.4,155.1 77.4,103.1 122.4,77.1 					"/>
+				</defs>
+				<clipPath id="SVGID_00000150802504368725477730000014064374870789939073_">
+					<use xlink:href="#SVGID_00000076589908644435705500000018411111499963603902_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000150802504368725477730000014064374870789939073_);">
+					<path class="st11" d="M86,62.4c-2.7,2.9-3.9,8.7-5.1,12.3c-2.5,7.6-4.5,15.7-4.6,23.7c-0.1,11.1,7.1,21.6,14.1,29.7
+						c6.8,7.8,15.6,13.6,21.9,21.9c1.1,1.5,2.2,3.1,3,4.7c5.4,10,7,21.7,6,33c-0.1,0.5-0.1,3.9-1,3.9l-61,2.1L54.6,63.6
+						C54.6,63.6,87.1,61.2,86,62.4L86,62.4z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<polygon class="st8" points="437.9,40.7 437.9,92.7 392.9,118.7 347.9,92.7 347.9,40.7 392.9,14.7 			"/>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000020359557577141049000000017088080227883089568_" points="437.9,40.7 437.9,92.7 392.9,118.7 
+						347.9,92.7 347.9,40.7 392.9,14.7 					"/>
+				</defs>
+				<clipPath id="SVGID_00000083770390579201446000000011852125556161196680_">
+					<use xlink:href="#SVGID_00000020359557577141049000000017088080227883089568_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000083770390579201446000000011852125556161196680_);">
+					<path class="st7" d="M438.7,40.3c-0.2-0.4-0.8-0.6-1.2-0.3l-44.5,25.7L348.3,40c-0.4-0.2-1-0.1-1.2,0.3s-0.1,1,0.3,1.2
+						L392,67.3V127c0,0.5,0.4,0.9,0.9,0.9s0.9-0.4,0.9-0.9V67.3l44.5-25.7C438.8,41.3,438.9,40.7,438.7,40.3z"/>
+				</g>
+			</g>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000016758610357942877470000001035453737970813327_" points="437.9,40.7 437.9,92.7 392.9,118.7 
+						347.9,92.7 347.9,40.7 392.9,14.7 					"/>
+				</defs>
+				<clipPath id="SVGID_00000017490873635001709530000002114454152218726028_">
+					<use xlink:href="#SVGID_00000016758610357942877470000001035453737970813327_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000017490873635001709530000002114454152218726028_);">
+					<path class="st11" d="M356.5,0c-2.7,2.9-3.9,8.7-5.1,12.3c-2.5,7.6-4.5,15.7-4.6,23.7c-0.1,11.1,7.1,21.6,14.1,29.7
+						c6.8,7.8,15.6,13.6,21.9,21.9c1.1,1.5,2.2,3.1,3,4.7c5.4,10,7,21.7,6,33c-0.1,0.5-0.1,3.9-1,3.9l-61,2.1L325.1,1.3
+						C325.1,1.3,357.6-1.2,356.5,0L356.5,0z"/>
+				</g>
+			</g>
+		</g>
+		<path class="st11" d="M264.3,228.9c32.6,0,59.1-26.4,59.1-59.1s-26.4-59.1-59.1-59.1c-6,0-11.9,0.9-17.4,2.6
+			c-12.5-23.5-36.5-39.9-64.6-41.6c-1.6-0.1-3.3-0.2-4.9-0.2c-1.1,0-2.2,0-3.2,0.1v157.2L264.3,228.9L264.3,228.9z"/>
+		<polygon class="st7" points="189.4,246.2 189.7,0 339.9,0 339.9,246.5 		"/>
+		<rect x="228.8" y="75.7" class="st14" width="77.4" height="5.1"/>
+		<rect x="200.8" y="122.9" class="st14" width="48.2" height="5.1"/>
+		<rect x="200.8" y="139.6" class="st14" width="48.2" height="5.1"/>
+		<path class="st8" d="M329.6,78.2c0,1.8-1.5,3.3-3.3,3.3s-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3C328.1,74.9,329.6,76.4,329.6,78.2z"/>
+		<path class="st8" d="M274.8,133.9c0,1.8-1.5,3.3-3.3,3.3c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3S274.8,132.1,274.8,133.9z"/>
+		<path class="st8" d="M297.9,133.9c0,1.8-1.5,3.3-3.3,3.3s-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3S297.9,132.1,297.9,133.9z"/>
+		<path class="st8" d="M320.8,133.9c0,1.8-1.5,3.3-3.3,3.3c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3S320.8,132.1,320.8,133.9z"/>
+		<path class="st8" d="M210.7,78.2c0,1.8-1.5,3.3-3.3,3.3c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3C209.2,74.9,210.7,76.4,210.7,78.2
+			z"/>
+		<g>
+			<g>
+				<rect x="199" y="18.3" class="st7" width="130.9" height="26.3"/>
+				<path class="st8" d="M329.4,18.8v25.3H199.5V18.8H329.4 M330.4,17.8H198.5v27.3h131.9V17.8L330.4,17.8L330.4,17.8z"/>
+			</g>
+			<path class="st8" d="M314.3,31.5c0,1.2-0.9,2.1-2.1,2.1c-1.2,0-2.1-0.9-2.1-2.1s0.9-2.1,2.1-2.1S314.3,30.3,314.3,31.5
+				L314.3,31.5z"/>
+			<path class="st8" d="M306,31.5c0,1.2-0.9,2.1-2.1,2.1c-1.2,0-2.1-0.9-2.1-2.1s0.9-2.1,2.1-2.1C305.1,29.4,306,30.3,306,31.5
+				L306,31.5z"/>
+			<path class="st8" d="M323.1,31.5c0,1.2-0.9,2.1-2.1,2.1s-2.1-0.9-2.1-2.1s0.9-2.1,2.1-2.1C322.2,29.4,323.1,30.3,323.1,31.5
+				L323.1,31.5z"/>
+			<rect x="208.8" y="30.9" class="st8" width="83.6" height="1"/>
+		</g>
+		<path class="st8" d="M217.9,187.9c0,1.8-1.5,3.3-3.3,3.3s-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3S217.9,186.1,217.9,187.9z"/>
+		<path class="st8" d="M241,187.9c0,1.8-1.5,3.3-3.3,3.3s-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3S241,186.1,241,187.9z"/>
+		<g>
+			<g>
+				<rect x="255.8" y="172" class="st7" width="70.4" height="31.4"/>
+				<path class="st8" d="M325.5,172.7v30h-69v-30H325.5 M326.8,171.3h-71.8V204h71.8V171.3L326.8,171.3z"/>
+			</g>
+			<rect x="269.7" y="187" class="st8" width="43" height="1.4"/>
+		</g>
+		<path class="st8" d="M208.5,282.8c0,1.8-1.5,3.3-3.3,3.3s-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3S208.5,281,208.5,282.8z"/>
+		<path class="st8" d="M231.7,282.8c0,1.8-1.5,3.3-3.3,3.3c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3
+			C230.2,279.5,231.7,281,231.7,282.8z"/>
+		<g>
+			<g>
+				<rect x="199.2" y="230.8" class="st7" width="130.5" height="26"/>
+				<path class="st8" d="M329,231.5v24.6H199.9v-24.6H329 M330.4,230.1H198.5v27.3h131.9V230.1L330.4,230.1z"/>
+			</g>
+			<rect x="208.8" y="243.1" class="st8" width="83.6" height="1.4"/>
+		</g>
+		<path class="st3" d="M456.5,260.6c-2.6,0-5.1,0.3-7.5,0.9c-6.3-15-20.9-25.7-38.1-26.3c-9.1-23.7-32.1-40.5-58.9-40.5
+			c-7.4,0-14.4,1.3-21,3.6c-8,2.8-15.2,7.2-21.3,12.7c-0.4,0.3-0.7,0.7-1.1,1c-1.8,1.7-3.4,3.4-5,5.3c-0.4,0.5-0.8,0.9-1.1,1.4
+			c-0.5,0.7-1.1,1.4-1.6,2.1c-0.6,0.8-1.1,1.6-1.7,2.4c-1.1,1.6-2.1,3.3-3,5.1c-4.4-1.4-9.1-2.1-13.9-2.1c-9.8,0-18.9,3-26.5,8.1
+			c-0.3,0.2-0.6,0.4-0.9,0.7c-5,3.5-9.2,8-12.5,13.1c-4.7,7.4-7.5,16.1-7.5,25.6c0,0.6,0,1.2,0,1.8c0,0.2,0,0.4,0,0.6
+			c0,0.4,0,0.8,0.1,1.2c0,0.2,0,0.5,0.1,0.7c0,0.3,0.1,0.7,0.1,1c0,0.2,0.1,0.5,0.1,0.7c0,0.3,0.1,0.7,0.1,1c0,0.2,0.1,0.5,0.1,0.7
+			c0.1,0.3,0.1,0.6,0.2,0.9c0,0.2,0.1,0.5,0.1,0.7c0.1,0.3,0.1,0.6,0.2,0.9c0.1,0.2,0.1,0.5,0.2,0.7c0.1,0.3,0.1,0.6,0.2,0.9
+			c0.1,0.2,0.1,0.5,0.2,0.7c0.1,0.3,0.2,0.6,0.2,0.9c0.1,0.2,0.2,0.5,0.2,0.7c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.2,0.2,0.5,0.3,0.7
+			c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.2,0.2,0.5,0.3,0.7c0.1,0.3,0.2,0.6,0.3,0.8c0.1,0.2,0.2,0.5,0.3,0.7c0.1,0.3,0.2,0.6,0.4,0.8
+			c0.1,0.2,0.2,0.4,0.3,0.7c0.1,0.3,0.3,0.5,0.4,0.8c0.1,0.2,0.2,0.4,0.3,0.7c0.1,0.3,0.3,0.5,0.4,0.8c0.1,0.2,0.2,0.4,0.4,0.6
+			c0.2,0.3,0.3,0.5,0.5,0.8c0.1,0.2,0.3,0.4,0.4,0.6c0.2,0.3,0.3,0.5,0.5,0.8c0.1,0.2,0.3,0.4,0.4,0.6c0.2,0.3,0.3,0.5,0.5,0.8
+			c0.1,0.2,0.3,0.4,0.4,0.6c0.2,0.3,0.4,0.5,0.5,0.7c0.1,0.2,0.3,0.4,0.4,0.6c0.2,0.2,0.4,0.5,0.6,0.7c0.1,0.2,0.3,0.4,0.5,0.6
+			c0.2,0.2,0.4,0.5,0.6,0.7c0.2,0.2,0.3,0.4,0.5,0.5c0.2,0.2,0.4,0.5,0.6,0.7c0.2,0.2,0.3,0.3,0.5,0.5c0.2,0.2,0.4,0.5,0.6,0.7
+			c0.2,0.2,0.3,0.3,0.5,0.5c0.2,0.2,0.4,0.4,0.7,0.7c0.2,0.2,0.3,0.3,0.5,0.5c0.2,0.2,0.5,0.4,0.7,0.6c0.2,0.2,0.4,0.3,0.5,0.5
+			c0.2,0.2,0.5,0.4,0.7,0.6c0.2,0.2,0.4,0.3,0.5,0.4c0.2,0.2,0.5,0.4,0.7,0.6c0.2,0.1,0.4,0.3,0.6,0.4c0.3,0.2,0.5,0.4,0.8,0.6
+			c0.2,0.1,0.4,0.3,0.6,0.4c0.3,0.2,0.5,0.4,0.8,0.5c0.2,0.1,0.4,0.3,0.6,0.4c0.3,0.2,0.5,0.3,0.8,0.5c0.2,0.1,0.4,0.2,0.6,0.4
+			c0.3,0.2,0.5,0.3,0.8,0.5c0.2,0.1,0.4,0.2,0.6,0.3c0.3,0.2,0.5,0.3,0.8,0.4c0.2,0.1,0.4,0.2,0.6,0.3c0.2,0.1,0.4,0.2,0.6,0.3
+			c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0,0.1,0.1,0.2,0.1c0,0,0,0,0,0c6.2,3,13.2,4.6,20.5,4.6h174.3c16.7,0,30.2-13.5,30.2-30.2
+			S473.2,260.6,456.5,260.6L456.5,260.6z"/>
+		<g>
+			<path class="st7" d="M287.1,218.5c4.9,0,9.5,0.7,13.9,2.1c10.6-20,31.6-33.5,55.8-33.5c26.9,0,49.8,16.8,58.9,40.5
+				c17.2,0.6,31.8,11.2,38.1,26.3c2.4-0.6,4.9-0.9,7.5-0.9c16.7,0,30.2,13.5,30.2,30.2c0,16.7-13.5,30.2-30.2,30.2
+				c-8.3,0-161.9,0-174.3,0c-26.2,0-47.4-21.2-47.4-47.4C239.7,239.7,260.9,218.5,287.1,218.5L287.1,218.5z"/>
+			<path class="st1" d="M461.4,314H287.1c-26.5,0-48.1-21.6-48.1-48.1s21.6-48.1,48.1-48.1c4.6,0,9.2,0.7,13.6,2
+				c11.2-20.6,32.6-33.4,56.1-33.4c13.2,0,25.8,4,36.5,11.5c10.4,7.3,18.3,17.3,22.9,29c16.6,0.7,31.4,10.9,38.1,26.1
+				c2.3-0.5,4.7-0.8,7.1-0.8c17,0,30.9,13.9,30.9,30.9S478.4,314,461.4,314L461.4,314z M287.1,219.2c-25.8,0-46.7,21-46.7,46.7
+				s21,46.7,46.7,46.7h174.3c16.3,0,29.5-13.3,29.5-29.5s-13.3-29.5-29.5-29.5c-2.5,0-5,0.3-7.3,0.9c-0.3,0.1-0.7-0.1-0.8-0.4
+				c-6.4-15.2-21.1-25.3-37.5-25.9c-0.3,0-0.5-0.2-0.6-0.4c-4.5-11.7-12.3-21.6-22.6-28.8c-10.5-7.4-22.9-11.2-35.7-11.2
+				c-23.1,0-44.3,12.7-55.2,33.2c-0.2,0.3-0.5,0.4-0.8,0.3C296.4,219.9,291.8,219.2,287.1,219.2L287.1,219.2z"/>
+		</g>
+		<path class="st1" d="M366.3,255c0-5.7-4.7-10.4-10.4-10.4s-10.4,4.7-10.4,10.4c0,4,2.3,7.5,5.7,9.3v10.3c0,2.6,2.1,4.7,4.7,4.7
+			s4.7-2.1,4.7-4.7v-10.3C363.9,262.6,366.3,259.1,366.3,255z"/>
+		<g>
+			<path class="st8" d="M416.5,211.4c-0.4,0-0.7-0.3-0.7-0.7v-62.3c0-0.4,0.3-0.7,0.7-0.7s0.7,0.3,0.7,0.7v62.3
+				C417.2,211.1,416.9,211.4,416.5,211.4z"/>
+			<path class="st8" d="M369.5,187.4c-0.4,0-0.7-0.3-0.7-0.7v-37.4c0-0.4,0.3-0.7,0.7-0.7s0.7,0.3,0.7,0.7v37.4
+				C370.2,187.1,369.9,187.4,369.5,187.4L369.5,187.4z"/>
+			<path class="st8" d="M393,174.2c-0.4,0-0.7-0.3-0.7-0.7V130c0-0.4,0.3-0.7,0.7-0.7s0.7,0.3,0.7,0.7v43.6
+				C393.7,173.9,393.4,174.2,393,174.2z"/>
+		</g>
+		<line class="st15" x1="393" y1="186.6" x2="393" y2="215.8"/>
+	</g>
+</g>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/empty-state-notebooks.svg b/clients/ui/frontend/src/shared/images/empty-state-notebooks.svg
new file mode 100644
index 000000000..4be11cd9a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-notebooks.svg
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 566 321" style="enable-background:new 0 0 566 321;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+	.st1{clip-path:url(#SVGID_00000076575341824455101530000011962599753811949203_);}
+	.st2{fill:#DAF2F2;}
+	.st3{fill:#9AD8D8;}
+	.st4{fill:#EE0000;}
+	.st5{fill:#147878;}
+	.st6{fill:#FFFFFF;}
+	.st7{fill:#B9E5E5;}
+	.st8{fill:#FFFFFF;stroke:#DAF2F2;stroke-width:2.93;stroke-miterlimit:10;}
+	.st9{fill:#FFFFFF;stroke:#DAF2F2;stroke-width:3.44;stroke-miterlimit:10;}
+	.st10{fill:#37A3A3;}
+	.st11{fill:#724335;}
+	.st12{fill:#40251D;}
+	.st13{fill:#5F0000;}
+	.st14{fill:#A60000;}
+	.st15{fill:#C9C9C9;}
+	.st16{clip-path:url(#SVGID_00000034802795593979821620000003977317974350838945_);}
+	.st17{fill:#A60000;enable-background:new    ;}
+	.st18{clip-path:url(#SVGID_00000106131864675202226450000017841016652386732678_);}
+	.st19{stroke:#000000;stroke-width:2.04;stroke-linecap:round;stroke-linejoin:round;}
+	.st20{fill:#F56E6E;}
+	.st21{fill:#F56D6D;}
+	.st22{fill:#004D4D;}
+	.st23{fill:#EDBEA1;}
+	.st24{fill:#D8A381;}
+	.st25{clip-path:url(#SVGID_00000075874844464235363220000013336761435876727170_);}
+	.st26{fill:#63BDBD;}
+</style>
+<g class="st0">
+	<g id="uuid-bc573d35-6b89-4597-81ff-c816a5191329">
+		<g>
+			<defs>
+				<path id="SVGID_1_" d="M471.2,81.9c-10.6,0-37.6,10.1-47.2,13.1c-23.2-43.7-69.2-73.4-122.1-73.4c-58.8,0-114.5,25.7-134.4,77.5
+					c-37.6,1.3-64.2,35.7-78,68.6c-5.3-1.3-10.8-2.1-16.5-2.1c-36.5,0-66.1,29.6-66.1,66.1S36.5,298,73,298h381.5
+					c57.3,0,103.8-46.5,103.8-103.8S528.5,81.9,471.2,81.9L471.2,81.9z"/>
+			</defs>
+			<clipPath id="SVGID_00000029727164305978556820000014448928449610491539_">
+				<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+			</clipPath>
+			<g style="clip-path:url(#SVGID_00000029727164305978556820000014448928449610491539_);">
+				<path class="st2" d="M454.5,90.4c-10.6,0-20.9,1.6-30.5,4.6c-23.2-43.7-69.2-73.4-122.1-73.4c-58.8,0-109.1,36.8-129,88.6
+					c-37.6,1.3-69.6,24.6-83.4,57.5c-5.3-1.3-10.8-2.1-16.5-2.1c-36.5,0-66.1,29.6-66.1,66.1S36.5,298,73,298h381.5
+					c57.3,0,103.8-46.5,103.8-103.8S511.8,90.4,454.5,90.4L454.5,90.4z"/>
+				<polygon class="st3" points="365.8,144.6 302,144.6 302,100.1 302,93.1 365.8,93.1 				"/>
+				<polygon class="st3" points="414.9,160.1 391.5,160.1 391.5,141.3 391.5,138.3 414.9,138.3 				"/>
+				<polygon class="st3" points="357.9,251.8 334.5,251.8 334.5,233 334.5,230 357.9,230 				"/>
+				<polygon class="st3" points="294.4,192.3 210.7,192.3 210.7,125.2 210.7,115 294.4,115 				"/>
+				<g>
+					<path class="st4" d="M250.6,232.1c-7.2,0-13.1-5.9-13.1-13.1v-41.4c0-0.3,0.2-0.5,0.5-0.5c0.3,0,0.5,0.2,0.5,0.5V219
+						c0,6.7,5.4,12.1,12.1,12.1c0.3,0,0.5,0.2,0.5,0.5S250.9,232.1,250.6,232.1L250.6,232.1z"/>
+					<path class="st4" d="M385.1,238.8h-91.3c-0.3,0-0.5-0.2-0.5-0.5s0.2-0.5,0.5-0.5h91.3c7.2,0,13.1-5.9,13.1-13.1v-97.2
+						c0-6-4.9-10.9-10.9-10.9h-39.4c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h39.4c6.6,0,11.9,5.4,11.9,11.9v97.2
+						C399.2,232.4,392.9,238.8,385.1,238.8z"/>
+					<path class="st4" d="M237.8,113.9c-0.3,0-0.5-0.2-0.5-0.5V78.6c0-7.9,6.4-14.3,14.3-14.3h31.9c0.3,0,0.5,0.2,0.5,0.5
+						c0,0.3-0.2,0.5-0.5,0.5h-31.9c-7.3,0-13.2,5.9-13.2,13.2v34.8C238.3,113.7,238.1,113.9,237.8,113.9z"/>
+					<path class="st4" d="M328.1,86.2c-0.3,0-0.5-0.2-0.5-0.5V76c0-0.3,0.2-0.5,0.5-0.5c0.3,0,0.5,0.2,0.5,0.5v9.7
+						C328.6,86,328.4,86.2,328.1,86.2z"/>
+				</g>
+				<polygon class="st5" points="434.9,303.2 91.8,301.3 135.4,250.1 446.7,250.1 				"/>
+				<g>
+					<rect x="206.5" y="121" class="st6" width="78.1" height="62"/>
+					<path class="st4" d="M204,108v77.5h83.1V108L204,108L204,108z M284.6,183h-78.1v-62h78.1V183z"/>
+					<g>
+						<circle class="st6" cx="273.8" cy="114.9" r="1.8"/>
+						<circle class="st6" cx="280.3" cy="114.9" r="1.8"/>
+					</g>
+					<path class="st6" d="M250.6,115.5h-42.9c-0.3,0-0.5-0.2-0.5-0.5s0.2-0.5,0.5-0.5h42.9c0.3,0,0.5,0.2,0.5,0.5
+						S250.9,115.5,250.6,115.5L250.6,115.5z"/>
+					<g>
+						<path class="st7" d="M239.9,149.7h-24.6c-0.3,0-0.6-0.3-0.6-0.6v-19.2c0-0.3,0.3-0.6,0.6-0.6h24.6c0.3,0,0.6,0.3,0.6,0.6v19.2
+							C240.4,149.4,240.2,149.7,239.9,149.7L239.9,149.7z M215.8,148.5h23.5v-18.1h-23.5V148.5z"/>
+						<path class="st7" d="M275.4,149.7h-24.6c-0.3,0-0.6-0.3-0.6-0.6v-19.2c0-0.3,0.3-0.6,0.6-0.6h24.6c0.3,0,0.6,0.3,0.6,0.6v19.2
+							C276,149.4,275.7,149.7,275.4,149.7z M251.4,148.5h23.5v-18.1h-23.5L251.4,148.5L251.4,148.5z"/>
+						<path class="st7" d="M239.9,174.9h-24.6c-0.3,0-0.6-0.3-0.6-0.6v-19.2c0-0.3,0.3-0.6,0.6-0.6h24.6c0.3,0,0.6,0.3,0.6,0.6v19.2
+							C240.4,174.7,240.2,174.9,239.9,174.9L239.9,174.9z M215.8,173.8h23.5v-18.1h-23.5V173.8z"/>
+						<path class="st7" d="M275.4,174.9h-24.6c-0.3,0-0.6-0.3-0.6-0.6v-19.2c0-0.3,0.3-0.6,0.6-0.6h24.6c0.3,0,0.6,0.3,0.6,0.6v19.2
+							C276,174.7,275.7,174.9,275.4,174.9z M251.4,173.8h23.5v-18.1h-23.5L251.4,173.8L251.4,173.8z"/>
+					</g>
+				</g>
+				<g>
+					<rect x="387.2" y="134.2" class="st6" width="23" height="21.2"/>
+					<path class="st2" d="M411,156.2h-24.6v-22.8H411V156.2z M388,154.6h21.5v-19.7H388V154.6z"/>
+				</g>
+				<rect x="330.3" y="225.4" class="st8" width="23" height="21.2"/>
+				<path class="st9" d="M324.6,41.7c-1.8,0-3.5,0.3-5,0.8c-3.8-7.2-11.4-12.1-20.2-12.1c-9.7,0-18,6.1-21.3,14.7
+					c-6.2,0.2-11.5,4.1-13.8,9.5c-0.9-0.2-1.8-0.3-2.7-0.3c-6,0-10.9,4.9-10.9,10.9c0,6,4.9,10.9,10.9,10.9h63.1
+					c9.5,0,17.2-7.7,17.2-17.2S334.1,41.7,324.6,41.7L324.6,41.7z"/>
+				<g>
+					<polygon points="219,253.4 219,255.7 205.1,274 295.2,274.3 302.8,255.7 302.8,253.4 					"/>
+					<polygon points="295.2,272 205.1,271.7 219.3,253 302.8,253.4 					"/>
+					<path class="st10" d="M294.4,258.5h-33.1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h33.1c0.3,0,0.5,0.2,0.5,0.5
+						C295,258.2,294.7,258.5,294.4,258.5z"/>
+					<path class="st10" d="M291.9,262h-33.1c-0.3,0-0.5-0.2-0.5-0.5s0.2-0.5,0.5-0.5h33.1c0.3,0,0.5,0.2,0.5,0.5
+						S292.2,262,291.9,262z"/>
+					<rect x="219" y="201.6" width="83.8" height="51.8"/>
+					<rect x="220.9" y="203.3" class="st6" width="80.1" height="47.4"/>
+					<path d="M227,245.1c-0.1,0-0.2,0-0.3-0.1c-0.3-0.2-0.3-0.5-0.2-0.7l5.9-9.4c0.1-0.2,0.3-0.3,0.5-0.3l8.1,0l5.8-6.4
+						c0.1-0.1,0.3-0.2,0.5-0.2l11.2,2.3l12.4-15c0.2-0.2,0.5-0.3,0.8-0.1c0.2,0.2,0.3,0.5,0.1,0.8L259,231.4
+						c-0.1,0.2-0.3,0.2-0.5,0.2l-11.2-2.3l-5.8,6.3c-0.1,0.1-0.2,0.2-0.4,0.2l-8,0l-5.7,9.1C227.3,245,227.1,245.1,227,245.1
+						L227,245.1z"/>
+					<rect x="277.1" y="235.3" class="st7" width="14.6" height="1.4"/>
+					<rect x="277.1" y="231.7" class="st7" width="18.2" height="1.4"/>
+					<rect x="277.1" y="228.1" class="st7" width="18.2" height="1.4"/>
+					<rect x="277.1" y="224.5" class="st7" width="18.3" height="1.4"/>
+					<path class="st7" d="M271,245.2h-44.6c-0.3,0-0.5-0.2-0.5-0.5v-31.9c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v31.4h44
+						c0.3,0,0.5,0.2,0.5,0.5S271.3,245.2,271,245.2z"/>
+				</g>
+				<g>
+					<path class="st11" d="M332.4,154.4c0,0-3.3-2.9-10.8-5.3c-7.5-2.3-9.9-2.7-11.4-3.8c-1.5-1.1-5-7.9-5-7.9h23.2l14.5,10
+						c0,0,0.7,7-3.2,7L332.4,154.4L332.4,154.4z"/>
+					<path class="st12" d="M320.2,140.9c-0.1,0-0.1,0-0.2,0c-1.9-0.8-5.9-0.6-6-0.6c-0.2,0-0.4-0.1-0.5-0.3c-0.5-1.3-4.5-6.5-6-8.4
+						c-0.2-0.2-0.1-0.6,0.1-0.8c0.2-0.2,0.6-0.1,0.8,0.1c0.2,0.3,4.9,6.2,6,8.4c1.1,0,4.3,0,6.1,0.7c0.3,0.1,0.4,0.4,0.3,0.7
+						C320.6,140.7,320.4,140.9,320.2,140.9L320.2,140.9z"/>
+					<g>
+						<path class="st13" d="M462.7,150.7c-1.4,1.2-3,2.3-4.9,2.3c-1.8,0-3.9-0.3-5.5-1.2c-0.9-0.5-2.8-1.4-2.9-2.6
+							c0.3,2.9,2.1,4.7,5,5.8c1.3,0.5,2.7,0.9,4,1.2c0.5,0.1,5.2,0.8,5.2,0.7C463.8,155.1,463.1,152.6,462.7,150.7L462.7,150.7z"/>
+						<path class="st11" d="M498.9,179.9c0,0-3.2-10.7-2.5-21.3l1.5-23.5c0.3-7.9-2.1-14.4-7.1-19.2c-11.2-10.9-20.9-15.1-29.5-13.5
+							c-0.1,0-2.7,3.8-2.7,3.8c-0.1,0.2-3.2,4.1-3.2,6.7c0,2.9-0.3,5.2-0.9,6.4l-0.1,0.2c-0.8,1.5-3.1,6.1-4.6,7.2
+							c-1.4,1.2-4.1,2.5-2.5,4.7l2.7,1.9c0,0,0.1,0.1,0.1,0.1c-0.1,2.2-0.3,10.6-0.3,12.4c0,0.2,0,0.5,0,0.8c0,2.1,0.1,5.3,3,7.1
+							c3.3,2.1,8.5,2.6,10.7,2.8c0,0,0,0,0.1,0c0,2.6-0.3,5.1-0.6,7.7c-0.1,1.1-0.3,2.3-0.4,3.5c0,0,0,0,0,0
+							c0,0.1,1.7,10.9,14.9,12.2C490.8,181.3,498.9,179.9,498.9,179.9L498.9,179.9z"/>
+						<path class="st12" d="M498,175.1l-15.5-2.8c-5.9-1.5-19.9-2.8-19.9-2.8c0.3-1.9,0.6-4.2,0.6-4.2s3.4-0.2,5.2-0.5
+							c11.7-1.6,17.5,4.2,26.5,3.8c0.3,0,1.5-0.3,1.8-0.3L498,175.1L498,175.1z"/>
+						<path class="st12" d="M468.8,136.7c-0.2,0-0.3,0-0.5,0c-1.4-0.3-2.2-1.7-2.8-2.8c-0.1-0.3,0-0.6,0.3-0.7
+							c0.3-0.1,0.6,0,0.7,0.3c0.7,1.4,1.3,2.1,2,2.2c0.8,0.2,2-0.5,3.4-1.8c0.2-0.2,0.5-0.5,0.7-0.8c0.2-0.2,0.5-0.3,0.8-0.1
+							c0.2,0.2,0.3,0.5,0.1,0.8c-0.3,0.4-0.6,0.7-0.9,1C471.1,136,469.9,136.7,468.8,136.7L468.8,136.7z"/>
+						<path class="st12" d="M449.9,133.9C449.9,133.9,449.9,133.9,449.9,133.9c-0.1,0-1.8-0.2-2.9-1.8c-1.9-2.7,1.3-5.3,2.4-6.2
+							c1.3-1.1,3.4-4.6,4.5-6.7c0.6-1.1,0.9-3.4,0.9-6.2c0-2.7,4.7-8.9,5.2-9.6c0.2-0.2,0.5-0.3,0.8-0.1c0.2,0.2,0.3,0.5,0.1,0.8
+							c-1.4,1.8-5,7-5,9c0,1.8-0.1,5-1,6.7c0,0.1-2.8,5.4-4.7,7c-2.5,2-3.1,3.5-2.2,4.8c0.8,1.1,2.1,1.3,2.1,1.3
+							c0.3,0,0.5,0.3,0.5,0.6C450.4,133.7,450.2,133.9,449.9,133.9L449.9,133.9z"/>
+						<path class="st12" d="M463.4,156.9C463.4,156.9,463.4,156.9,463.4,156.9c-2.3-0.2-7.5-0.7-10.9-2.8c-3.1-2-3.2-5.2-3.2-7.4
+							c0-0.3,0-0.5,0-0.8c0-0.9,0-4.1,0.2-9.4c0-0.3,0.3-0.5,0.6-0.5c0.3,0,0.5,0.3,0.5,0.6c-0.2,5.3-0.2,8.5-0.2,9.4
+							c0,0.2,0,0.5,0,0.8c0,2.1,0.1,4.9,2.7,6.5c3.1,2,8.2,2.5,10.4,2.7c0.3,0,0.5,0.3,0.5,0.6C463.9,156.7,463.7,156.9,463.4,156.9
+							L463.4,156.9z"/>
+						<path class="st12" d="M450,137C450,137,450,137,450,137c-0.3,0-0.5-0.3-0.5-0.6c0.1-3.2,0.2-6,0.2-6c0-0.3,0.3-0.5,0.6-0.5
+							c0.3,0,0.5,0.3,0.5,0.6c0,0-0.1,2.8-0.2,6C450.6,136.8,450.3,137,450,137L450,137z"/>
+						<path class="st12" d="M462.6,168.3C462.6,168.3,462.5,168.3,462.6,168.3c-0.3,0-0.6-0.3-0.5-0.6c0.1-1.2,0.3-2.4,0.4-3.5
+							c0.6-4.4,1.1-8.6,0.1-12.8c-0.1-0.3,0.1-0.6,0.4-0.6c0.3-0.1,0.6,0.1,0.6,0.4c1,4.5,0.5,8.9-0.1,13.2
+							c-0.1,1.1-0.3,2.3-0.4,3.5C463.1,168.1,462.8,168.3,462.6,168.3L462.6,168.3z"/>
+						<path class="st12" d="M498.9,180.5c-0.2,0-0.4-0.2-0.5-0.4c0-0.1-3.2-10.9-2.5-21.5l1.5-23.5c0-0.3,0.3-0.5,0.6-0.5
+							c0.3,0,0.5,0.3,0.5,0.6l-1.5,23.5c-0.7,10.4,2.4,21,2.5,21.1c0.1,0.3-0.1,0.6-0.4,0.7C499,180.5,498.9,180.5,498.9,180.5
+							L498.9,180.5z"/>
+					</g>
+					<path class="st11" d="M357.1,148.3c3.6-0.3,10.1,3.8,12.7,6.7c2.6,2.9,9.1-12.4,9.1-12.4s-8-4.2-9.2-7.9
+						C368.5,130.9,357.1,148.3,357.1,148.3L357.1,148.3z"/>
+					<path class="st14" d="M365.4,155.1c0,0,0.4-13.5,13.4-16.6c0,0,33,32.7,62.1,38.2c8.4,1.6-25,22.3-36.4,16.6
+						C393.1,187.6,365.4,155.1,365.4,155.1L365.4,155.1z"/>
+					<ellipse class="st15" cx="490.2" cy="199.4" rx="18.9" ry="19.3"/>
+					<ellipse class="st15" cx="373.4" cy="207.6" rx="13.5" ry="13.7"/>
+					<path class="st6" d="M421.8,290.3c-6.5,15.4-6.8,16.6-13.6,45.7h91c0,0,6.3-15.2-3.6-38.8C485.7,273.8,421.8,290.3,421.8,290.3
+						L421.8,290.3z"/>
+					<path class="st4" d="M509.1,199.4c-0.5,15.8-6.3,32.9-15.9,57.2c-1.2,20.3,7.1,40.7,7.1,40.7s-7.9,14-29.9,16.1
+						c-22,2.1-48.3-6.8-60.8-8.2c10.8-48.4,28.4-76.4,16.1-108.4c-5-13,2.7-25.9,19.6-27.9c10.4-1.2,24-0.6,36.7,2.8
+						C507.1,178.5,509.4,190.2,509.1,199.4L509.1,199.4z"/>
+					<path class="st4" d="M370.3,221.3c-25.1-13.7-26.2-47.5-38.3-66c0,0,7.8-11.6,18.6-2.1c0,0,17,32.6,31.8,46.1
+						C404.3,219.4,378.6,217.1,370.3,221.3L370.3,221.3z"/>
+					<g>
+						<defs>
+							<path id="SVGID_00000035505240729008152560000004689176182289466782_" d="M370.3,221.3c-25.1-13.7-26.2-47.5-38.3-66
+								c0,0,7.8-11.6,18.6-2.1c0,0,17,32.6,31.8,46.1C404.3,219.4,378.6,217.1,370.3,221.3L370.3,221.3z"/>
+						</defs>
+						<clipPath id="SVGID_00000154387411125961704750000002957669115917827240_">
+							<use xlink:href="#SVGID_00000035505240729008152560000004689176182289466782_"  style="overflow:visible;"/>
+						</clipPath>
+						<g style="clip-path:url(#SVGID_00000154387411125961704750000002957669115917827240_);">
+							<path class="st17" d="M360.1,236.1c-23-17.1-28.6-54.8-38.1-74.8c0,0-0.9-38,16.6-10.9c17.4,27.1,9.6,45.7,26.9,64.2
+								C385.8,236.3,377.3,244.5,360.1,236.1L360.1,236.1z"/>
+						</g>
+					</g>
+					<path class="st11" d="M358.8,125c0,0-1-9.1,2.7-9.3c3.7-0.2,1.4,10.6,5.2,13.2s4.2,10.7,1.1,13.7c-3.1,3-8.8,7.7-14.5,4.8
+						c-5.7-3-10.5-6.2-10.5-6.2l-5.6-13.1L358.8,125L358.8,125z"/>
+					<path class="st4" d="M454.2,168.7c0,0,16.9-5.2,31.4,0.3c9.4,3.5,12.7,1.8,12.7,1.8s0.9,8.2,4.9,11.6c-2.5,2-13.3,0.6-19.9-1.2
+						s-8.3-10.7-34.9-12.2L454.2,168.7L454.2,168.7z"/>
+					<g>
+						<defs>
+							<path id="SVGID_00000168089430304964011500000006527564680725154969_" d="M509.1,199.4c-0.5,15.8-6.3,32.9-15.9,57.2
+								c-1.2,20.3,7.1,40.7,7.1,40.7s-7.9,14-29.9,16.1c-22,2.1-48.3-6.8-60.8-8.2c10.6-47.8,28.4-76.4,16.1-108.4
+								c-5-13-4.3-25.1,12.7-27.1c10.4-1.2,30.9-1.4,43.7,2C507.1,178.5,509.4,190.2,509.1,199.4L509.1,199.4z"/>
+						</defs>
+						<clipPath id="SVGID_00000137839958111446405970000005628401259831978941_">
+							<use xlink:href="#SVGID_00000168089430304964011500000006527564680725154969_"  style="overflow:visible;"/>
+						</clipPath>
+						<g style="clip-path:url(#SVGID_00000137839958111446405970000005628401259831978941_);">
+							<path class="st17" d="M428.8,338.7c-11.4-11.1-4.3-54,8.1-86.2c8.3-21.5,26.4-57.4,5.4-67.6c-27.9-13.7-23.1,12.5-23.1,12.5
+								s-44.4,83.5-38.2,100C387.2,313.9,428.8,338.7,428.8,338.7z"/>
+						</g>
+					</g>
+					<path class="st4" d="M370.3,221.3c11.6,0.6,61.2-8,72.6-10.8c11.5-2.9,11,12.5,14.1,8.1c5.3-7.5,4.9-35.4-3.8-45.9
+						c-10.8-13.1-37.3,12.2-77.5,21.2C355.5,198.4,370.3,221.3,370.3,221.3L370.3,221.3z"/>
+					<path class="st19" d="M473,133.3c3-4,6.7-14.9,0.3-16c-3.8-0.7-6.2,5-7.9,7.7c0,0-3-2.7-1.7-7.5s-3.2-5.9-1.5-8.6
+						c3.8-6.4-3.7-4.2-0.6-8c0,0,1.9-3.4,6.3-5.7c6.3-3.3,15.6-4.8,27-1.1c12.3,4,18.8,15.4,19.7,18.5c4.9,16.1-6.9,28.8-8.5,30.7
+						c-7.5,8.4-9.3,12.9-9.8,15.4c0,0-8.8-0.5-15-4c-7.3-4.2-8.1-14.7-8.4-21"/>
+					<path d="M455.7,111.1c1.2,0.4,2.1,1.4,2.6,2.5c0.1,0.2,0,0.4-0.2,0.5c-0.2,0.1-0.4,0-0.5-0.1c-0.6-0.6-1.4-1.3-2.3-1.4
+						C454.5,112.5,454.7,111,455.7,111.1L455.7,111.1L455.7,111.1z"/>
+					<path class="st12" d="M367.8,143.1c-0.1,0-0.3-0.1-0.4-0.2c-0.2-0.2-0.2-0.6,0-0.8c1.4-1.3,2.1-4,1.8-6.8c-0.2-2.7-1.3-5-2.9-6
+						c-2.1-1.4-2.5-4.9-2.9-7.9c-0.4-3.2-0.7-5.3-2-5.2c-0.4,0-0.8,0.2-1.1,0.6c-1.4,1.7-1.2,6.4-1.1,8.1c0,0.3-0.2,0.6-0.5,0.6
+						c-0.3,0-0.6-0.2-0.6-0.5c0-0.3-0.7-6.6,1.3-9c0.5-0.6,1.1-0.9,1.9-1c2.4-0.1,2.7,2.9,3.1,6.1c0.3,2.8,0.7,6,2.4,7.2
+						c1.8,1.2,3.1,3.8,3.3,6.8c0.3,3.2-0.5,6.1-2.2,7.7C368,143.1,367.9,143.1,367.8,143.1L367.8,143.1z"/>
+					<g>
+						<g>
+							<rect x="301.1" y="84.9" class="st6" width="58.8" height="52.7"/>
+							<path class="st2" d="M359.1,85.7v51.2h-57.3V85.7H359.1 M360.6,84.1h-60.3v54.3h60.3V84.1L360.6,84.1z"/>
+						</g>
+						<rect x="295.7" y="85.7" class="st2" width="12.4" height="51.2"/>
+						<g>
+							<g>
+								<path class="st3" d="M304,96.2h-4.2c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									C304.5,95.9,304.3,96.2,304,96.2z"/>
+								<path class="st3" d="M304,101.4h-4.2c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									C304.5,101.1,304.3,101.4,304,101.4z"/>
+								<path class="st3" d="M304,106.6h-4.2c-0.3,0-0.6-0.3-0.6-0.6s0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									S304.3,106.6,304,106.6z"/>
+								<path class="st3" d="M304,111.9h-4.2c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									C304.5,111.6,304.3,111.9,304,111.9z"/>
+								<path class="st3" d="M304,117.1h-4.2c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									C304.5,116.8,304.3,117.1,304,117.1z"/>
+								<path class="st3" d="M304,122.3h-4.2c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									C304.5,122.1,304.3,122.3,304,122.3z"/>
+								<path class="st3" d="M304,127.5h-4.2c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h4.2c0.3,0,0.6,0.3,0.6,0.6
+									C304.5,127.3,304.3,127.5,304,127.5z"/>
+							</g>
+							<g>
+								<path class="st4" d="M330,96.1h-17.7c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5H330c0.3,0,0.5,0.2,0.5,0.5
+									C330.5,95.9,330.3,96.1,330,96.1z"/>
+								<path class="st2" d="M352.2,101.4H337c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h15.3c0.3,0,0.6,0.3,0.6,0.6
+									C352.8,101.1,352.6,101.4,352.2,101.4z"/>
+								<path class="st2" d="M332,101.4h-15.9c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6H332c0.3,0,0.6,0.3,0.6,0.6
+									C332.6,101.1,332.3,101.4,332,101.4z"/>
+								<path class="st2" d="M343.4,106.6h-27.2c-0.3,0-0.6-0.3-0.6-0.6s0.3-0.6,0.6-0.6h27.2c0.3,0,0.6,0.3,0.6,0.6
+									S343.7,106.6,343.4,106.6z"/>
+								<path class="st4" d="M337,111.8h-24.7c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5H337c0.3,0,0.5,0.2,0.5,0.5
+									C337.5,111.6,337.3,111.8,337,111.8z"/>
+								<path class="st2" d="M342.1,117.1H332c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h10.1c0.3,0,0.6,0.3,0.6,0.6
+									C342.7,116.8,342.4,117.1,342.1,117.1z"/>
+								<path class="st2" d="M325.7,117.1h-9.6c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h9.6c0.3,0,0.6,0.3,0.6,0.6
+									C326.2,116.8,326,117.1,325.7,117.1z"/>
+								<path class="st2" d="M352.2,122.3h-6.8c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h6.8c0.3,0,0.6,0.3,0.6,0.6
+									C352.8,122.1,352.6,122.3,352.2,122.3z"/>
+								<path class="st2" d="M341.1,122.3h-25c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h25c0.3,0,0.6,0.3,0.6,0.6
+									C341.7,122.1,341.4,122.3,341.1,122.3z"/>
+								<path class="st2" d="M344.1,127.5H336c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6h8.1c0.3,0,0.6,0.3,0.6,0.6
+									C344.7,127.3,344.5,127.5,344.1,127.5z"/>
+								<path class="st2" d="M330,127.5h-13.9c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6H330c0.3,0,0.6,0.3,0.6,0.6
+									C330.6,127.3,330.3,127.5,330,127.5z"/>
+							</g>
+						</g>
+					</g>
+					<path class="st11" d="M342.8,149.5c0.3-3.9-1.3-7.9-4.1-10.5c-3.9-3.6-9.6-4.4-14.1-7.3c-0.6-0.4-3.5-1.8-4.4-1.8
+						c-0.8-0.1-1.7,0.1-2.1,0.8c-0.4,0.7-0.1,1.7,0.4,2.4c1,1.7,2.5,3.2,4.2,4.2c1,0.6,2.2,1.1,3.1,1.9c0.9,0.8,1.7,2,1.6,3.2
+						c0,0.4-0.2,0.8-0.2,1.3c0,0.7,0.4,1.3,0.8,1.9c1.2,1.8,2.6,3.4,4.3,4.8"/>
+					<path class="st12" d="M342.8,150C342.8,150,342.8,150,342.8,150c-0.3,0-0.6-0.3-0.5-0.6c0.1-0.9,0-1.8-0.1-2.6
+						c-0.4-2.8-1.8-5.6-3.9-7.5c-2.2-2.1-5-3.2-7.9-4.3c-2.1-0.8-4.2-1.7-6.1-2.9c-0.6-0.4-3.4-1.7-4.1-1.8c-0.4,0-1.2,0-1.6,0.5
+						c-0.2,0.3-0.5,0.3-0.7,0.2c-0.3-0.1-0.3-0.5-0.2-0.7c0.4-0.7,1.4-1.1,2.6-1c1.1,0.1,4.1,1.5,4.6,1.9c1.8,1.2,3.9,2,6,2.8
+						c2.9,1.2,5.9,2.4,8.2,4.5c2.3,2.1,3.7,5,4.2,8.1c0.1,1,0.2,1.9,0.1,2.9C343.3,149.8,343.1,150.1,342.8,150L342.8,150z"/>
+					<path class="st12" d="M327.4,142.8C327.4,142.8,327.3,142.8,327.4,142.8c-0.3,0-0.6-0.3-0.5-0.6c0.1-0.9-0.4-1.9-1.4-2.7
+						c-0.2-0.2-0.3-0.5-0.1-0.8s0.5-0.3,0.8-0.1c1.2,1,1.9,2.4,1.8,3.6C327.9,142.6,327.6,142.8,327.4,142.8z"/>
+					<path class="st12" d="M325.8,139.6c-0.1,0-0.2,0-0.3-0.1c-0.6-0.5-1.3-0.9-2-1.2c-0.4-0.2-0.7-0.4-1.1-0.6
+						c-1.8-1.1-3.3-2.6-4.4-4.4c-0.9-1.5-0.7-2.4-0.4-2.9c0.2-0.3,0.5-0.3,0.7-0.2c0.3,0.2,0.3,0.5,0.2,0.7c-0.3,0.5,0,1.3,0.4,1.8
+						c1,1.6,2.4,3,4,4c0.3,0.2,0.7,0.4,1.1,0.6c0.7,0.4,1.5,0.8,2.1,1.3c0.2,0.2,0.3,0.5,0.1,0.8C326.1,139.5,326,139.6,325.8,139.6
+						L325.8,139.6z"/>
+					<path class="st20" d="M365.5,202.8c0,0-0.1,0-0.1,0c-0.3-0.1-0.5-0.4-0.4-0.7c1.2-4.5,4.8-7.4,10.6-8.8
+						c16.9-3.8,31.5-10.5,43.2-15.9c16.4-7.6,28.3-13,34.8-5.1c0.2,0.2,0.2,0.6-0.1,0.8c-0.2,0.2-0.6,0.2-0.8-0.1
+						c-6-7.3-17.6-1.9-33.6,5.4c-11.8,5.4-26.4,12.2-43.4,16c-5.4,1.2-8.7,3.9-9.8,8C365.9,202.6,365.7,202.8,365.5,202.8
+						L365.5,202.8z"/>
+					<path class="st21" d="M376.8,194c-0.2,0-0.3-0.1-0.4-0.2c-13.1-15.2-26.1-40.1-26.3-40.4c-0.1-0.3,0-0.6,0.2-0.7s0.6,0,0.7,0.2
+						c0.1,0.2,13.2,25.1,26.1,40.2c0.2,0.2,0.2,0.6-0.1,0.8C377.1,194,376.9,194,376.8,194L376.8,194z"/>
+					<path class="st20" d="M498.1,183.9c-4.8,0-11.2-1.2-14.9-2.2c-0.3-0.1-0.5-0.4-0.4-0.7c0.1-0.3,0.4-0.5,0.7-0.4
+						c6.7,1.8,15.9,2.8,18.8,1.6c-3.1-3.1-4.1-8.8-4.4-10.8c-1.4,0.4-5.2,0.7-12.4-2c-14.2-5.3-30.9-0.3-31.1-0.3
+						c-0.3,0.1-0.6-0.1-0.7-0.4c-0.1-0.3,0.1-0.6,0.4-0.7c0.2-0.1,17.3-5.2,31.8,0.3c9,3.4,12.2,1.8,12.2,1.8c0.2-0.1,0.3-0.1,0.5,0
+						c0.2,0.1,0.3,0.2,0.3,0.4c0,0.1,0.9,8.1,4.7,11.2c0.1,0.1,0.2,0.3,0.2,0.4s-0.1,0.3-0.2,0.4
+						C502.5,183.6,500.5,183.9,498.1,183.9L498.1,183.9z"/>
+				</g>
+				<g>
+					<path class="st22" d="M185.5,158.5c-1.1,0-2.2-0.2-3.4-0.7c-0.4-0.2-0.6-0.6-0.4-1s0.6-0.6,1-0.4c2,0.8,3.8,0.8,5.2,0
+						c2.9-1.7,3.7-6.3,3.7-6.3c0.1-0.4,0.5-0.7,0.9-0.7c0.4,0.1,0.7,0.5,0.7,0.9c0,0.2-0.9,5.4-4.5,7.4
+						C187.7,158.2,186.7,158.5,185.5,158.5L185.5,158.5z"/>
+					<circle class="st21" cx="162.1" cy="136.7" r="27"/>
+					<path class="st23" d="M189.1,136.7c-0.5,9.4-4.6,15.4-4.8,18c-0.2,2.6-0.1,6.4-1.4,8.4c-4.2,6.2-5.9,14.7-10.9,15.6
+						c-5,0.9-23-9.4-23.4-21c-0.4-11.5,30.1-23.9,30.1-23.9L189.1,136.7L189.1,136.7z"/>
+					<path class="st24" d="M172,179.2c-0.3,0-0.5-0.2-0.5-0.4c-0.1-0.3,0.1-0.6,0.4-0.6c3-0.5,4.8-4.2,6.8-8.5
+						c1.1-2.3,2.2-4.7,3.7-6.9c1-1.4,1.1-4,1.2-6.4c0-0.6,0.1-1.2,0.1-1.8c0.1-1,0.6-2.2,1.3-3.9c1.3-3.1,3.2-7.9,3.5-14.1
+						c0-0.3,0.3-0.5,0.6-0.5c0.3,0,0.5,0.3,0.5,0.6c-0.3,6.4-2.3,11.2-3.6,14.4c-0.6,1.6-1.1,2.8-1.2,3.6c0,0.5-0.1,1.1-0.1,1.7
+						c-0.1,2.5-0.3,5.2-1.4,6.9c-1.4,2.1-2.5,4.4-3.6,6.7C177.6,174.6,175.7,178.6,172,179.2C172.1,179.2,172.1,179.2,172,179.2
+						L172,179.2z"/>
+					<path class="st14" d="M180.6,200c2.2-18.2-20.2-27.5-15.3-47.4c0.7-2.9,1.3-4.8,5.5-5c15.1-0.6,23.5-14.6,19.3-23.7
+						s-22.6-17.1-32.6-15.9c-10,1.2-18.2,11.1-22,16.8c0,0-9,11.6-4.4,31.4c4.6,19.8-2.5,30.8-2.5,30.8L180.6,200L180.6,200z"/>
+					<path class="st13" d="M171.6,194c-4.2-8.7-21.8-6.2-23.8-34.2c0,0-3.9,23.2-11.8,27.3S171.6,194,171.6,194L171.6,194z"/>
+					<path class="st4" d="M180.6,200.6C180.6,200.6,180.6,200.6,180.6,200.6c-0.4,0-0.6-0.3-0.5-0.6c1-8.3-3.2-14.7-7.7-21.4
+						c-5-7.5-10.2-15.3-7.5-26.1c0.7-2.8,1.3-5.2,6-5.4c7.4-0.3,13.9-4,17.4-9.9c2.7-4.4,3.2-9.2,1.4-13c-0.1-0.3,0-0.6,0.3-0.7
+						c0.3-0.1,0.6,0,0.7,0.3c1.9,4.1,1.4,9.4-1.5,14c-3.8,6.2-10.6,10-18.3,10.4c-3.9,0.2-4.3,1.8-5,4.6
+						c-2.6,10.4,2.5,17.9,7.4,25.2c4.4,6.6,8.9,13.4,7.9,22.1C181.1,200.4,180.9,200.6,180.6,200.6L180.6,200.6z"/>
+					<path class="st22" d="M192.4,150.9c-0.1,0-0.2,0-0.2,0l-21.7-7.2c-0.4-0.1-0.6-0.6-0.5-1s0.6-0.6,1-0.5l21.7,7.2
+						c0.4,0.1,0.6,0.6,0.5,1C193,150.7,192.7,150.9,192.4,150.9L192.4,150.9z"/>
+					<path class="st23" d="M172,144.5c-0.3-2.9-5.2-5.5-7.5,1.1c-2.3,6.6-0.9,13.2,1,13c1.9-0.1,4.5-2.5,4.5-2.5L172,144.5z"/>
+					<path class="st23" d="M232.1,257.6c5.9-0.8,17.5-7.3,19.7-7.4c2.2-0.1,7.8,2.8,7.8,2.8l2.5,5.4c0,0-4.5,2.2-6,4
+						c-1.6,1.8-7.9,5.3-10.2,4.9c-2.3-0.4-10.3,0.1-12.3,0.9C231.5,269,232.1,257.6,232.1,257.6L232.1,257.6z"/>
+					<path class="st24" d="M259,253.2c-0.1,0-0.2,0-0.2-0.1c-1.6-0.8-5.3-2-6.8-1.9c-0.3,0-0.6-0.2-0.6-0.5s0.2-0.6,0.5-0.6
+						c1.9-0.1,5.9,1.2,7.4,2c0.3,0.1,0.4,0.5,0.2,0.7C259.4,253.1,259.2,253.2,259,253.2L259,253.2z"/>
+					<path class="st23" d="M203.9,253c3.8-0.6,13.9-5.1,15.8-5.4c1.9-0.3,8,2.9,9.4,3.4c1.5,0.5,3.5,4.1,4.5,4.6
+						c1,0.4-0.1,2.5-2.5,2.1c-2.4-0.5-24.3,4.7-24.3,4.7L203.9,253L203.9,253z"/>
+					<path class="st24" d="M230.7,258.1c-0.1,0-0.2,0-0.2-0.1c-0.1-0.1-3.1-1.5-4.1-2.1c-0.5-0.3-3.2-1.8-6.5-1.3
+						c-0.3,0-0.6-0.2-0.6-0.5c0-0.3,0.2-0.6,0.5-0.6c3.6-0.5,6.4,1,7.2,1.4c1,0.6,4,2.1,4,2.1c0.3,0.1,0.4,0.5,0.2,0.7
+						C231.1,258,230.9,258.1,230.7,258.1L230.7,258.1z"/>
+					<path class="st24" d="M221,258.7c-1.7,0-3.2-1.2-4.4-3.5c-0.1-0.3,0-0.6,0.2-0.7c0.3-0.1,0.6,0,0.7,0.2c1.1,2,2.3,3,3.6,2.9
+						c0.3,0,0.5,0.2,0.6,0.5c0,0.3-0.2,0.5-0.5,0.6C221.1,258.7,221.1,258.7,221,258.7L221,258.7z"/>
+					<path class="st6" d="M188.3,249.6c4.4,0.3,15.5-1,15.5-1s4.8,3.2,5.5,10.6c0.7,7.4-19.6,7.4-19.6,7.4L188.3,249.6L188.3,249.6z
+						"/>
+					<path class="st13" d="M126.7,202.4c9.9-0.7,20.9-9.3,21.9-28.7c1-19.4-6.1-26.6-6.4-33.9c-0.3-7.2,4.1-13.4,4.1-16.5
+						c0-3-2.1-3.3-2.1-3.3c-5.9-3.1-15.6,11.6-18.7,23s-0.8,19.6-4.1,27.1c-3.1,7.1-14.9,14-8.3,31.1c0.4,1.1,2,1.2,2.5,0.2
+						c0.7-1.4,2-3.2,4-5.1c0,0,0.1,10.2-4,16.4C121.6,213.9,126.7,202.4,126.7,202.4L126.7,202.4z"/>
+					<path class="st6" d="M172.6,245.5l15.8,12.7c-13.1-11.6,6.5-55.6-10.4-63c-40.7-17.7-74.3-5.3-74.3-5.3
+						c-6.5,1.9-8.4,9.5-9,13.2c-6.1,25-4.5,73-19.7,103.3h98.1c0,0-7.7-9.4,1.6-38.7L172.6,245.5L172.6,245.5z"/>
+					<path class="st6" d="M157.4,207.6c-1.1,44.3,21.6,79.1,30.5,80.9c8.9,1.7,40.4-10.6,52.5-19.1c0,0,1.1-9.6-6.5-14.5
+						c0,0-13.6,1.4-34.1,6.4c-11.9-22.3-9-51.2-16.6-61.1C175.4,190,157.8,189.8,157.4,207.6L157.4,207.6z"/>
+					<g>
+						<defs>
+							<path id="SVGID_00000060732102258812795670000010819516512309120665_" d="M233.9,257.1c0,0-13.6-0.9-34.1,4.1
+								c-11.9-22.3-9.4-61.4-17.5-66.6c-0.5-0.3-1-0.6-1.5-0.9c-0.8-0.9-1.7-1.7-2.8-2.3c-40-22.1-66-4.8-74.4-1.6
+								c-8.4,3.2-8.6,10.9-8.8,13.3c-6.1,25-4.5,73-19.7,103.3h98.1c0,0-6.8-8.4,0.2-33.9c5.5,9.4,11.1,15.2,14.6,15.9
+								c8.9,1.7,40.4-10.6,52.5-19.1C240.3,269.4,241.4,262.1,233.9,257.1L233.9,257.1z"/>
+						</defs>
+						<clipPath id="SVGID_00000027577926765714139970000018153809786374194060_">
+							<use xlink:href="#SVGID_00000060732102258812795670000010819516512309120665_"  style="overflow:visible;"/>
+						</clipPath>
+						<g style="clip-path:url(#SVGID_00000027577926765714139970000018153809786374194060_);">
+							<path class="st2" d="M88,191.4l-17.3,2.3l29.4,126.1l78.3-2.3c0,0-5.3-24.5,0.8-19.2c6,5.3,63.6-18.4,65.2-23.3
+								c1.6-4.8-3.5-9.6-3.5-9.6c-22.7,12.3-44.4,15.8-47.7,11c-13-18.7-18.2-66-30.2-74.1C132.2,181.4,88,191.4,88,191.4L88,191.4z
+								"/>
+						</g>
+					</g>
+					<path class="st3" d="M75,307c-0.1,0-0.2,0-0.2-0.1c-0.3-0.1-0.4-0.5-0.2-0.7c9.8-19.5,12.5-46.3,15-69.9
+						c1.3-12.6,2.5-24.5,4.7-33.3c0.6-4.3,2.7-11.7,9.3-13.6c0.1,0,11.1-4,27.7-4.2c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5
+						c-16.5,0.2-27.3,4.1-27.4,4.2c-6.1,1.7-8,8.8-8.6,12.8c-2.2,8.8-3.4,20.7-4.7,33.2c-2.4,23.7-5.2,50.6-15.1,70.3
+						C75.4,306.9,75.2,307,75,307L75,307z"/>
+					<path class="st13" d="M141.8,158.3c-4.6-19.8,4.4-31.4,4.4-31.4c3.8-5.6,12-15.5,22-16.8c0.8-0.1,1.6-0.1,2.5-0.1
+						c-4.8-1.6-9.5-2.4-13.1-2c-10,1.2-18.2,11.1-22,16.8c0,0-9,11.6-4.4,31.4c4.6,19.8-2.5,30.8-2.5,30.8l11,1.4
+						C141.1,185.8,145.8,175.3,141.8,158.3L141.8,158.3z"/>
+					<ellipse class="st4" cx="139.3" cy="121.5" rx="4.5" ry="5"/>
+					<path class="st14" d="M121.4,197c9.9-0.7,25.2-6.4,26.2-25.8s-10.4-29.6-10.7-36.8c-0.3-7.2,4.1-8.8,4.1-11.9
+						c0-3-2.1-3.3-2.1-3.3c-5.9-3.1-15.6,7-18.7,18.4s-0.8,19.6-4.1,27.1c-3.1,7.1-14.9,14-8.3,31.1c0.4,1.1,2,1.2,2.5,0.2
+						c0.7-1.4,2-3.2,4-5.1c0,0,0.1,10.2-4,16.4C116.2,208.6,121.4,197,121.4,197L121.4,197z"/>
+					<path class="st13" d="M119,166.8c3.5-8,1.1-16.7,4.3-28.8c2.4-8.7,8.4-16.8,13.9-19.3c-5.9-0.9-14.3,8.5-17.1,18.9
+						c-3.1,11.4-0.8,19.6-4.1,27.1c-3.1,7.1-14.9,14-8.3,31.1c0.2,0.6,0.8,0.9,1.4,0.9C104.6,180.8,115.8,173.9,119,166.8L119,166.8
+						z"/>
+					<path class="st13" d="M119.2,199.6c-0.2,0-0.5-0.2-0.5-0.4c-1.6-7.1,1.5-12.4,4.4-17.6c2.3-4,4.7-8.2,5-13.3
+						c0.3-5.2-0.6-10.5-1.4-15.6c-1-6.2-2-12-0.4-16.2c2.3-6.4,5.7-11,10.5-14.6c0.2-0.2,0.6-0.1,0.8,0.1c0.2,0.2,0.1,0.6-0.1,0.8
+						c-4.7,3.5-7.9,7.9-10.1,14.1c-1.4,3.9-0.5,9.6,0.5,15.6c0.8,5.2,1.7,10.5,1.4,15.8c-0.3,5.3-2.7,9.6-5.1,13.8
+						c-3,5.2-5.8,10.1-4.3,16.8c0.1,0.3-0.1,0.6-0.4,0.6C119.3,199.6,119.2,199.6,119.2,199.6L119.2,199.6z"/>
+					<path class="st13" d="M123.3,191.5c-0.1,0-0.2,0-0.3-0.1c-0.2-0.2-0.3-0.5-0.1-0.8c5.2-6.3,10.6-17.1,10.9-26.9
+						c0.1-5.1-0.7-9.1-1.6-12.9c-0.8-3.8-1.6-7.3-1.2-11.2c0.9-7.8,2.8-9.8,2.9-9.9c0.2-0.2,0.6-0.2,0.8,0c0.2,0.2,0.2,0.6,0,0.8
+						c0,0-1.8,1.9-2.6,9.2c-0.4,3.7,0.3,7,1.1,10.9c0.8,3.7,1.8,8,1.6,13.2c-0.3,10-5.8,21-11.1,27.5
+						C123.6,191.4,123.4,191.5,123.3,191.5L123.3,191.5z"/>
+					<path class="st23" d="M250.2,254.7c0,0,10.1-2.4,10.9-2.5c0.8-0.1,6.5,2.7,6.9,3.1c0.4,0.4,1.3,2.8,2,3.1s0.3,2.8-3,1.5
+						c-3.2-1.3-6.5-2.3-6.5-2.3l-7.1,1.5L250.2,254.7L250.2,254.7z"/>
+					<path class="st23" d="M256.1,262.3c2.3-0.9,3.2-1.2,5-1.3c1.8-0.2,3.5,0.5,5.2,1.3c1.7,0.9,3.4,0.7,4,0c0.6-0.7-1.6-2.7-3-3.6
+						c-1.4-0.9-3.8-3-5.2-3.2c-1.4-0.2-4.9,1-6.4,1.4L256.1,262.3"/>
+					<path class="st24" d="M270.1,259c-0.1,0-0.1,0-0.2,0c-0.6-0.2-1-1-1.7-2.3c-0.2-0.4-0.5-0.9-0.6-1c-0.5-0.4-5.4-2.5-6.2-2.5
+						c0,0,0,0,0,0c-0.3,0-0.5-0.2-0.6-0.5c0-0.3,0.2-0.5,0.5-0.6c1-0.1,6.5,2.3,7,2.8c0.2,0.2,0.4,0.6,0.7,1.2
+						c0.3,0.5,0.9,1.6,1.1,1.8c0.3,0.1,0.4,0.4,0.3,0.7C270.5,258.8,270.3,259,270.1,259L270.1,259z"/>
+					<path class="st24" d="M270.4,262.9c-0.1,0-0.3,0-0.4-0.1c-0.2-0.2-0.2-0.5-0.1-0.7c-0.1-0.5-1.4-1.8-2.9-2.8
+						c-0.4-0.3-0.8-0.6-1.3-0.9c-1.2-0.9-2.8-2.1-3.7-2.2c-0.3,0-0.5-0.3-0.5-0.6c0-0.3,0.3-0.5,0.6-0.5c1.2,0.1,2.8,1.3,4.2,2.4
+						c0.5,0.3,0.9,0.7,1.3,0.9c0.9,0.6,3.2,2.4,3.4,3.6c0,0.3-0.1,0.6-0.2,0.8C270.7,262.8,270.5,262.9,270.4,262.9L270.4,262.9z"/>
+					<path class="st24" d="M165.5,159.2c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.6,0.5-0.6c1.4-0.1,3.5-1.7,4.2-2.3
+						c0.2-0.2,0.6-0.2,0.8,0c0.2,0.2,0.2,0.6,0,0.8C170.3,156.7,167.6,159.1,165.5,159.2C165.5,159.2,165.5,159.2,165.5,159.2
+						L165.5,159.2z"/>
+					<path class="st4" d="M170.7,190.2c-0.2,0-0.5-0.2-0.5-0.4c-0.9-4.4-3.8-7.9-6.6-11.3c-3-3.8-6.2-7.7-6.9-12.7
+						c0-0.3,0.2-0.6,0.5-0.6c0.3,0,0.6,0.2,0.6,0.5c0.6,4.7,3.6,8.4,6.6,12.2c2.8,3.5,5.8,7.2,6.8,11.8c0.1,0.3-0.1,0.6-0.4,0.6
+						C170.8,190.2,170.8,190.2,170.7,190.2L170.7,190.2z"/>
+					<path class="st26" d="M187.9,288.2c0,0-0.1,0-0.1,0c-4.7-0.9-11.9-9.4-17.9-21.2c-7.4-14.7-12-32.3-12.9-49.6
+						c0-0.3,0.2-0.5,0.5-0.6c0.3,0,0.5,0.2,0.6,0.5c2.1,39.5,22.1,68.3,29.9,69.8c0.3,0.1,0.5,0.3,0.4,0.6
+						C188.3,288,188.1,288.2,187.9,288.2L187.9,288.2z"/>
+					<path class="st3" d="M202,268.1c-0.3,0-0.5-0.2-0.5-0.4c-0.4-2.3-2.2-6.2-2.2-6.2c-6.5-12.1-8.5-25.9-10.4-38.1
+						c-1.5-9.9-2.8-18.5-6.2-23c-3.8-5-10.3-7.6-15.7-6.4c-5.6,1.2-8.9,6.2-9.1,13.6c0,0.3-0.2,0.5-0.5,0.5c0,0,0,0,0,0
+						c-0.3,0-0.5-0.3-0.5-0.6c0.2-7.9,3.8-13.2,9.9-14.6c5.8-1.3,12.8,1.5,16.8,6.7c3.6,4.7,4.9,13.4,6.4,23.4
+						c1.8,12.1,3.9,25.8,10.3,37.8c0.1,0.2,1.9,4.1,2.3,6.5C202.6,267.7,202.4,268,202,268.1C202.1,268.1,202.1,268.1,202,268.1
+						L202,268.1z"/>
+					<path class="st3" d="M240.3,269.9C240.3,269.9,240.3,269.9,240.3,269.9c-0.4,0-0.6-0.3-0.5-0.6c0-0.1,0.9-9.2-6.1-13.9
+						c-1.7,0.2-14.9,1.8-33.8,6.3c-0.3,0.1-0.6-0.1-0.6-0.4c-0.1-0.3,0.1-0.6,0.4-0.6c20.3-4.9,34-6.4,34.2-6.4c0.1,0,0.2,0,0.4,0.1
+						c7.7,5,6.7,15,6.7,15.1C240.8,269.7,240.6,269.9,240.3,269.9L240.3,269.9z"/>
+					<path d="M154.7,308c0-41.3-16.6-88-21.9-102.1c-1-2.5-3.4-4.2-6.1-4.2h-68c-4.6,0-7.7,4.5-6.1,8.8c6.7,18,19.2,54.7,21.1,97.4
+						H154.7L154.7,308z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/empty-state-pipelines.svg b/clients/ui/frontend/src/shared/images/empty-state-pipelines.svg
new file mode 100644
index 000000000..5d49e8a4a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-pipelines.svg
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="uuid-8f959568-17a3-4541-bf2b-510305e1a8a9"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 334 321"
+	 style="enable-background:new 0 0 334 321;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#DAF2F2;}
+	.st1{fill:#E8A997;}
+	.st2{fill:#9AD8D8;}
+	.st3{fill:#EE0000;}
+	.st4{fill:#FFFFFF;}
+	.st5{clip-path:url(#SVGID_00000155144837773721602480000001274941825705248399_);}
+	.st6{fill:none;stroke:#EE0000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st7{fill:#F7C8BB;}
+	.st8{fill:#B9E5E5;}
+	.st9{fill:#9AD8D8;stroke:#9AD8D8;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
+	.st10{fill:#CE8873;}
+	.st11{fill:#63BDBD;}
+	.st12{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
+	.st13{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<g>
+	<path class="st0" d="M301.9,37.4c11.8,5.7,21,15.6,26.5,30.1c11,29.1,5.1,63.4-12.5,88.3c-8.6,12.2-19.4,22.2-29.5,33
+		c-10.5,11.2-19.2,23.9-28.1,36.4c-14.9,20.9-32,41.6-56.2,50.8c-26.5,10.1-55.7,5.2-79.8-9.1c-24.2-14.5-45.1-34.2-69.3-48.7
+		c-22.3-13.4-43.7-28.7-50.7-56.2c-7.1-28.1,2.4-55.9,19.4-77.8c9.1-11.7,20-20.2,29.3-31.7C60,41.4,68,27.7,79.1,19
+		C99.9,2.6,125.3-3.6,150.8,2.5c23.5,5.7,44.1,19.8,67.3,26.6c19.5,5.7,40.5,1.3,60.5,2.5C287.1,32.1,295,34,301.9,37.4L301.9,37.4z
+		"/>
+	<path class="st1" d="M191.4,293.7c0-4.8,1.2-9.6,2.1-12.4l11.1,2.2c0,4.4,1,7.8,2.6,8.7c0,0-1.9,4.2-7,4.5
+		C195.1,297.1,191.4,293.7,191.4,293.7L191.4,293.7z"/>
+	<g>
+		<rect x="17.3" y="92.1" class="st2" width="91.5" height="51.5"/>
+		<rect x="119.1" y="92.1" class="st2" width="91.5" height="51.5"/>
+		<rect x="221" y="92.1" class="st2" width="91.5" height="51.5"/>
+		<rect x="17.3" y="30.7" class="st2" width="91.5" height="51.5"/>
+		<rect x="119.1" y="30.7" class="st2" width="91.5" height="51.5"/>
+		<rect x="221" y="30.7" class="st2" width="91.5" height="51.5"/>
+		<rect x="17.3" y="153.5" class="st2" width="91.5" height="51.5"/>
+		<rect x="119.1" y="153.5" class="st2" width="91.5" height="51.5"/>
+		<rect x="221" y="153.5" class="st2" width="91.5" height="51.5"/>
+	</g>
+	<path class="st3" d="M323.7,224.9H7.1c-0.3,0-0.5-0.2-0.5-0.5s0.2-0.5,0.5-0.5h316.7c0.3,0,0.5,0.2,0.5,0.5S324,224.9,323.7,224.9
+		L323.7,224.9z"/>
+	<g>
+		<g>
+			<rect x="22.3" y="87.1" class="st4" width="91.5" height="51.5"/>
+			<path d="M114.3,139.1H21.7V86.6h92.5V139.1z M22.8,138.1h90.5V87.6H22.8L22.8,138.1L22.8,138.1z"/>
+		</g>
+		<g>
+			<rect x="124.1" y="87.1" class="st4" width="91.5" height="51.5"/>
+			<path d="M216.1,139.1h-92.5V86.6h92.5V139.1z M124.6,138.1h90.5V87.6h-90.5V138.1z"/>
+		</g>
+		<g>
+			<rect x="226" y="87.1" class="st4" width="91.5" height="51.5"/>
+			<path d="M318,139.1h-92.5V86.6H318V139.1z M226.5,138.1H317V87.6h-90.5V138.1z"/>
+		</g>
+		<g>
+			<rect x="22.3" y="25.7" class="st4" width="91.5" height="51.5"/>
+			<path d="M114.3,77.7H21.7V25.2h92.5V77.7z M22.8,76.7h90.5V26.2H22.8L22.8,76.7L22.8,76.7z"/>
+		</g>
+		<g>
+			<rect x="124.1" y="25.7" class="st4" width="91.5" height="51.5"/>
+			<path d="M216.1,77.7h-92.5V25.2h92.5V77.7z M124.6,76.7h90.5V26.2h-90.5V76.7z"/>
+		</g>
+		<g>
+			<rect x="226" y="25.7" class="st4" width="91.5" height="51.5"/>
+			<path d="M318,77.7h-92.5V25.2H318V77.7z M226.5,76.7H317V26.2h-90.5V76.7z"/>
+		</g>
+		<g>
+			<rect x="22.3" y="148.5" class="st4" width="91.5" height="51.5"/>
+			<path d="M114.3,200.5H21.7V148h92.5V200.5z M22.8,199.5h90.5V149H22.8L22.8,199.5L22.8,199.5z"/>
+		</g>
+		<g>
+			<rect x="124.1" y="148.5" class="st4" width="91.5" height="51.5"/>
+			<path d="M216.1,200.5h-92.5V148h92.5V200.5z M124.6,199.5h90.5V149h-90.5V199.5z"/>
+		</g>
+		<g>
+			<rect x="226" y="148.5" class="st4" width="91.5" height="51.5"/>
+			<path d="M318,200.5h-92.5V148H318V200.5z M226.5,199.5H317V149h-90.5V199.5z"/>
+		</g>
+	</g>
+	<g>
+		<rect x="26" y="90.9" class="st4" width="84" height="44"/>
+		<rect x="26" y="90.9" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="127.8" y="90.9" class="st4" width="84" height="44"/>
+		<rect x="127.8" y="90.9" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="229.7" y="90.9" class="st4" width="84" height="44"/>
+		<rect x="229.7" y="90.9" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="26" y="29.5" class="st4" width="84" height="44"/>
+		<rect x="26" y="29.5" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="127.8" y="29.5" class="st4" width="84" height="44"/>
+		<rect x="127.8" y="29.5" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="26" y="152.3" class="st4" width="84" height="44"/>
+		<rect x="26" y="152.3" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="127.8" y="152.3" class="st4" width="84" height="44"/>
+		<rect x="127.8" y="152.3" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<rect x="229.7" y="152.3" class="st4" width="84" height="44"/>
+		<rect x="229.7" y="152.3" class="st4" width="84" height="44"/>
+	</g>
+	<g>
+		<defs>
+			<path id="SVGID_1_" d="M26,134.9v-44h84v44H26z M211.9,134.9v-44h-84v44H211.9z M313.8,134.9v-44h-84v44H313.8z M110,73.5v-44H26
+				v44H110z M211.9,73.5v-44h-84v44H211.9z M313.8,73.5v-44h-84v44H313.8z M110,196.3v-44H26v44H110z M211.9,196.3v-44h-84v44H211.9
+				z M313.8,196.3v-44h-84v44H313.8z"/>
+		</defs>
+		<clipPath id="SVGID_00000016782343718668753850000015624202287320811412_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g style="clip-path:url(#SVGID_00000016782343718668753850000015624202287320811412_);">
+			<g>
+				<path class="st3" d="M272.7,200H272v-23.4c0-2.7-2.2-5-5-5h-87.5c-3.1,0-5.6-2.5-5.6-5.6v-48c0-3.1,2.5-5.6,5.6-5.6h106.2
+					c2.7,0,5-2.2,5-5V64.2c0-2.7-2.2-5-5-5h-8.1c-3.1,0-5.6-2.5-5.6-5.6v-7.2c0-2.7-2.2-5-5-5h-91.9c-2.7,0-5,2.2-5,5
+					c0,3.1-2.5,5.6-5.6,5.6H69c-2.7,0-5,2.2-5,5v50.6c0,3.1-2.5,5.6-5.6,5.6h-6.7c-2.7,0-5,2.2-5,5V169c0,2.7,2.2,5,5,5h62v0.7h-62
+					c-3.1,0-5.6-2.5-5.6-5.6v-50.8c0-3.1,2.5-5.6,5.6-5.6h6.7c2.7,0,5-2.2,5-5V57c0-3.1,2.5-5.6,5.6-5.6h95.6c2.7,0,5-2.2,5-5
+					c0-3.1,2.5-5.6,5.6-5.6H267c3.1,0,5.6,2.5,5.6,5.6v7.2c0,2.7,2.2,5,5,5h8.1c3.1,0,5.6,2.5,5.6,5.6v43.3c0,3.1-2.5,5.6-5.6,5.6
+					H179.5c-2.7,0-5,2.2-5,5v48c0,2.7,2.2,5,5,5H267c3.1,0,5.6,2.5,5.6,5.6L272.7,200L272.7,200z"/>
+				<path class="st3" d="M52.5,122.3c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3s3.3,1.5,3.3,3.3S54.3,122.3,52.5,122.3z M52.5,116.4
+					c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6s2.6-1.2,2.6-2.6C55.1,117.6,53.9,116.4,52.5,116.4z"/>
+				<path class="st3" d="M52.5,171.5c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3s3.3,1.5,3.3,3.3C55.8,170,54.3,171.5,52.5,171.5
+					z M52.5,165.6c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6s2.6-1.2,2.6-2.6C55.1,166.8,53.9,165.6,52.5,165.6z"/>
+				<path class="st3" d="M180.5,168.4c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3s3.3,1.5,3.3,3.3
+					C183.8,166.9,182.3,168.4,180.5,168.4z M180.5,162.5c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6s2.6-1.2,2.6-2.6
+					S181.9,162.5,180.5,162.5z"/>
+				<path class="st3" d="M180.5,122c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3s3.3,1.5,3.3,3.3S182.3,122,180.5,122z M180.5,116.1
+					c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6s2.6-1.2,2.6-2.6C183.1,117.3,181.9,116.1,180.5,116.1z"/>
+				<path class="st3" d="M284.8,109.8c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3S286.6,109.8,284.8,109.8z
+					 M284.8,103.9c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6C287.4,105.1,286.2,103.9,284.8,103.9z"/>
+				<path class="st3" d="M284.8,68.4c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3
+					C288.1,66.9,286.6,68.4,284.8,68.4z M284.8,62.5c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6
+					S286.2,62.5,284.8,62.5z"/>
+				<path class="st3" d="M278.6,56c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3s3.3,1.5,3.3,3.3C281.9,54.5,280.4,56,278.6,56z
+					 M278.6,50c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6C281.2,51.2,280,50,278.6,50z"/>
+				<path class="st3" d="M266.1,50.7c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3S267.9,50.7,266.1,50.7z
+					 M266.1,44.8c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6C268.7,45.9,267.6,44.8,266.1,44.8z"/>
+				<path class="st3" d="M176.1,50.7c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3S177.9,50.7,176.1,50.7z
+					 M176.1,44.8c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6s2.6-1.2,2.6-2.6C178.7,45.9,177.5,44.8,176.1,44.8z"/>
+				<path class="st3" d="M163.6,48.8c-1.8,0-3.3-1.5-3.3-3.3c0-1.8,1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3
+					C166.9,47.3,165.5,48.8,163.6,48.8z M163.6,42.9c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6s2.6-1.2,2.6-2.6
+					C166.3,44.1,165.1,42.9,163.6,42.9z"/>
+				<path class="st3" d="M69.9,61.3c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3S71.7,61.3,69.9,61.3z M69.9,55.3
+					c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6S71.3,55.3,69.9,55.3z"/>
+				<path class="st3" d="M266.1,180.9c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3S267.9,180.9,266.1,180.9z
+					 M266.1,174.9c-1.4,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6S267.6,174.9,266.1,174.9z"/>
+				<path class="st3" d="M57.4,110.2c-1.8,0-3.3-1.5-3.3-3.3s1.5-3.3,3.3-3.3c1.8,0,3.3,1.5,3.3,3.3S59.3,110.2,57.4,110.2z
+					 M57.4,104.2c-1.4,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6c1.4,0,2.6-1.2,2.6-2.6C60.1,105.4,58.9,104.2,57.4,104.2z"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path d="M49,223.8c-0.1,0-0.3-0.1-0.4-0.1c-0.2-0.2-0.2-0.5,0-0.7c0.1-0.1,9.7-9.5,26.7-9.5c8.9,0,15.6,2.6,19.8,4.7
+			c4.5,2.3,6.8,4.7,6.9,4.8c0.2,0.2,0.2,0.5,0,0.7c-0.2,0.2-0.5,0.2-0.7,0c-0.1-0.1-9.4-9.2-26-9.2s-25.9,9.1-26,9.2
+			C49.3,223.8,49.2,223.8,49,223.8L49,223.8z"/>
+		<path d="M83.4,214.2v-14.3H67.9v14.3c0,0,3.4-0.3,7.5-0.3C79.4,213.9,83.4,214.2,83.4,214.2z"/>
+	</g>
+	<g>
+		<path class="st6" d="M143.6,223.5c0,0,9.4-9.3,26.3-9.3s26.3,9.3,26.3,9.3"/>
+		<path d="M178,214.3V200h-15.6v14.3c0,0,3.4-0.3,7.5-0.3C173.9,214,178,214.3,178,214.3z"/>
+	</g>
+	<g>
+		<path d="M245.4,224c-0.1,0-0.3-0.1-0.4-0.1c-0.2-0.2-0.2-0.5,0-0.7c0.1-0.1,9.7-9.5,26.7-9.5c8.9,0,15.6,2.6,19.8,4.7
+			c4.5,2.3,6.8,4.7,6.9,4.8c0.2,0.2,0.2,0.5,0,0.7c-0.2,0.2-0.5,0.2-0.7,0c-0.1-0.1-9.4-9.2-26-9.2s-25.9,9.1-26,9.2
+			C245.7,223.9,245.5,224,245.4,224z"/>
+		<path d="M279.8,214.3V200h-15.6v14.3c0,0,3.4-0.3,7.5-0.3C275.8,214,279.8,214.3,279.8,214.3z"/>
+	</g>
+	<g>
+		<path class="st4" d="M148.1,260.6c-1.4,0-9.1-0.7-23.5-14.7c-13.6-13.3-20.5-27.1-23.9-36.4c-3.8-10.4-4.6-18.9-3.9-21.6
+			c0.4-1.7,2.2-3.4,4.2-5.4c3.8-3.7,8.5-8.3,8-15.3c-4.3-1.8-6.6-6.1-6.9-8.8c-0.1,0-0.3,0-0.5,0c-0.9,0-1.6-0.5-2-1.3l0-0.1l0-0.1
+			c0,0,1.1-3.3,0.7-5.7c-0.2,0.1-0.5,0.1-0.8,0.1c-0.9,0-1.5-0.5-1.8-1.4l-0.1-0.2l0.2-0.1c0,0,1.7-1.2,2-3.5c0-0.1,0-0.3,0-0.5
+			c0.6-8.1,3-12.2,7.2-12.2c0,0,0.1,0,0.1,0c1.6-2.3,3.5-3.4,5.9-3.4c1.8,0,3.5,0.6,5,1.1c1.2,0.4,2.2,0.7,2.9,0.7
+			c1.4,0,2.6-0.1,3.6-0.2c0.9-0.1,1.6-0.1,2.3-0.1c1,0,2,0.9,3.2,1.9c2,1.8,4.7,4.3,9.6,4.3h0.3l0.1,0.2c0,0,0.3,1.2-0.3,1.9
+			c-0.2,0.3-0.6,0.5-1,0.6c0.3,0.3,0.8,0.6,1.6,0.6h0.4l0,0.4c-0.1,1.1-0.9,3.1-2.8,3.1c-1.2,0-2.2,0-3,0.2c0.5,2,1.1,4.3,1.1,5.1
+			c0,0.3,0,0.5-0.1,0.7l3.2,0.6l0,0.7c0,0.4-0.2,3.6-1.7,5.7c0.5,0.6,0.8,1,0.9,1.3c0.2,0.5,0.1,1-0.2,1.4c-0.3,0.4-0.7,0.6-1.2,0.6
+			l-0.2,0.4c0.3,0.6,1,1.7,1.9,2.3l0.1,0.1v0.2c0,0.7-0.4,1.9-1.7,2.2c0.2,0.4,0.4,1,0.4,1.6c0,0.7-0.5,1.4-0.9,1.8
+			c-0.1,0.1-0.3,0.3-0.3,0.4c0,0,0,0,0,0.1c0.2,1.7-0.2,3.1-1.1,4c-0.9,1-2.4,1.5-4.3,1.5c-2.1,0-3.6-0.8-4.7-2.4
+			c-0.4,2.4-0.6,6.7-0.2,9.9c5.9,1.8,10.2,3.8,13.1,6.1c2.1,1.6,3.4,3.4,5.2,6.1c2,3.1,4.3,6.7,7.2,9.1l0.4,0.3l-0.1,0.5
+			c0,0-0.1,0.3-0.3,0.8c2.5,2.6,8.6,8.5,14,10.8c1.5,0.6,3,1.2,4.5,1.8l16.8-10.7l7.7-25.9c0.1-0.3,0.4-0.6,0.8-0.6c0,0,0.1,0,0.1,0
+			l32.4,2.5c0.2,0,0.5,0.1,0.6,0.3c0.1,0.2,0.2,0.4,0.1,0.7l-9,30.9l0,0c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1
+			c0,0,0,0,0,0l0,0l-25.3,16.8c-0.1,0.1-0.3,0.1-0.4,0.1c-0.1,0-0.2,0-0.3,0l-7.8-2.7c-4.2,1.3-9.6,2.1-14.7,2.1
+			c-3.4,0-6.5-0.3-9.2-1c-0.1,0-0.2-0.1-0.3-0.1c1.6,5.8,0,12.6-4.8,19.7c-3.7,5.5-8.1,9.4-8.1,9.4l-0.1,0.1l-0.1,0
+			C148.3,260.6,148.2,260.6,148.1,260.6L148.1,260.6z"/>
+		<path class="st4" d="M113.3,130.3c3.1,0,6.1,1.8,7.9,1.8c2.5,0,4.4-0.3,5.9-0.3c2.5,0,5,6.2,12.8,6.2c0,0,0.6,2.2-1.6,2.2
+			c0,0,0.6,1.2,2.2,1.2c0,0-0.3,2.8-2.5,2.8c-1.4,0-2.5,0-3.4,0.2c0.5,1.6,1.2,4.5,1.2,5.4c0,0.3,0,0.6-0.1,1l3.2,0.6l0,0.4
+			c0,0.2-0.2,3.7-1.8,5.7c0.4,0.4,0.9,1,1,1.4c0.3,0.9-0.3,1.6-1.2,1.6l-0.3,0.7c0.3,0.5,1.1,1.8,2,2.5c0,0,0,1.9-1.9,1.9
+			c0,0,0.6,0.9,0.6,1.9s-1.2,1.9-1.2,2.2c0,0.3,0.9,5.3-5,5.3c-2.6,0-4.1-1.4-4.9-3c-0.5,2.2-0.8,7.5-0.3,11.1
+			c4.8,1.5,9.8,3.5,13.2,6.1c2,1.5,3.3,3.2,5.1,6.1c2,3.1,4.3,6.7,7.2,9.1l0.2,0.2l-0.1,0.3c0,0-0.1,0.4-0.3,1
+			c2.7,2.8,8.7,8.6,14.2,11.1c1.6,0.7,3.2,1.3,4.7,1.8l17-10.9l7.7-26c0.1-0.2,0.2-0.3,0.4-0.3c0,0,0,0,0,0l32.4,2.5
+			c0.1,0,0.3,0.1,0.3,0.2c0.1,0.1,0.1,0.3,0.1,0.4l-9,30.8c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0-0.1,0.1c0,0,0,0,0,0
+			c0,0,0,0,0,0l-25.2,16.8c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.1,0-0.2,0l-7.9-2.7c-4.2,1.3-9.5,2.1-14.7,2.1c-3.2,0-6.4-0.3-9.1-0.9
+			c-0.3-0.1-0.6-0.1-0.9-0.2c4.6,14.2-12.7,29.4-12.7,29.4s0,0-0.1,0c-1.1,0-8.8-0.5-23.2-14.6c-25.3-24.8-28.9-52.7-27.7-57.7
+			c1.1-4.6,13.1-9.8,12.3-21c-4.3-1.7-6.9-6.2-6.9-8.9c0,0-0.4,0.1-0.8,0.1c-0.6,0-1.3-0.2-1.7-1.1c0,0,1.2-3.7,0.6-6.2
+			c0,0-0.5,0.2-1,0.2s-1.2-0.2-1.5-1.2c0,0,1.9-1.2,2.2-3.7c0.2-1.2,0.3-12.5,6.9-12.5c0.1,0,0.2,0,0.3,0
+			C109.3,131,111.3,130.3,113.3,130.3 M113.3,129.6c-2.5,0-4.5,1.1-6.1,3.4c-3.5,0-5.3,3-6.2,5.4c-1,2.7-1.2,5.8-1.3,7.1
+			c0,0.2,0,0.4,0,0.5c-0.3,2.2-1.9,3.3-1.9,3.3l-0.4,0.3l0.2,0.5c0.4,1,1.1,1.6,2.1,1.6c0.2,0,0.3,0,0.5,0c0.2,2.2-0.7,5.1-0.7,5.2
+			l-0.1,0.2l0.1,0.2c0.4,1,1.2,1.5,2.3,1.5c0.1,0,0.2,0,0.2,0c0.2,1.4,0.9,3,1.9,4.4c1.3,1.8,3,3.3,5,4.2c0.3,6.7-4.3,11.2-8,14.8
+			c-2.1,2-3.9,3.8-4.3,5.6c-0.6,2.6-0.1,10.7,3.9,21.8c3.4,9.3,10.3,23.1,23.9,36.5c14.4,14.1,22.3,14.8,23.7,14.8
+			c0.1,0,0.2,0,0.2,0l0.2,0l0.2-0.1c0.2-0.2,4.4-3.9,8.2-9.5c4.7-7,6.4-13.7,5-19.5c2.7,0.6,5.8,0.9,9.1,0.9
+			c5.1,0,10.4-0.8,14.7-2.1l7.7,2.6c0.1,0,0.2,0.1,0.4,0.1c0.2,0,0.4-0.1,0.6-0.2l25.2-16.8l0.1,0l0,0c0,0,0,0,0,0
+			c0,0,0.1-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0-0.1l9-30.8c0.1-0.3,0-0.7-0.2-1
+			c-0.2-0.3-0.5-0.5-0.8-0.5l-32.4-2.5c0,0-0.1,0-0.1,0c-0.5,0-0.9,0.3-1.1,0.8l-7.7,25.8l-16.5,10.6c-1.5-0.5-2.9-1.1-4.3-1.7
+			c-5.3-2.3-11.2-8-13.7-10.6c0.1-0.4,0.2-0.6,0.2-0.7l0.1-0.3l0.1-0.4l-0.3-0.3l-0.2-0.2c-2.8-2.4-5.1-5.9-7.1-9
+			c-1.8-2.8-3.2-4.6-5.3-6.2c-2.9-2.3-7.2-4.3-13-6.1c-0.3-2.8-0.2-6.4,0.1-8.8c1.1,1.3,2.6,1.9,4.5,1.9c2,0,3.5-0.5,4.5-1.6
+			c0.9-1,1.3-2.4,1.1-4.2c0.1-0.1,0.1-0.2,0.2-0.3c0.4-0.5,1-1.2,1-2.1c0-0.5-0.1-1-0.3-1.4c1.1-0.4,1.5-1.6,1.5-2.4v-0.3l-0.3-0.2
+			c-0.7-0.5-1.3-1.5-1.7-2l0-0.1c0.5-0.1,1-0.3,1.2-0.7c0.3-0.5,0.4-1.1,0.2-1.7c0-0.1-0.2-0.5-0.8-1.2c1.4-2.2,1.6-5.3,1.6-5.7
+			l0-0.4l0-0.6l-0.6-0.1l-2.6-0.5c0-0.2,0-0.3,0-0.5c0-0.7-0.4-2.3-1.1-4.8c0.7-0.1,1.6-0.1,2.6-0.1c2.2,0,3-2.2,3.2-3.4l0.1-0.7
+			h-0.7c-0.4,0-0.6-0.1-0.9-0.2c0.3-0.2,0.5-0.3,0.6-0.5c0.7-0.9,0.4-2.1,0.3-2.2l-0.1-0.5H140c-4.7,0-7.4-2.4-9.4-4.2
+			c-1.3-1.1-2.2-2-3.4-2c-0.7,0-1.5,0.1-2.3,0.1c-1,0.1-2.2,0.2-3.6,0.2c-0.7,0-1.7-0.3-2.8-0.7
+			C116.9,130.2,115.2,129.6,113.3,129.6L113.3,129.6L113.3,129.6z"/>
+	</g>
+	<path class="st1" d="M97.2,187.9c4.8-10.2,14.9-10.8,11.8-24.2c0,0-12.9-21.6,1.1-26.9c18.7-7.1,24.3,6.5,24.3,6.5s1.6,5.3,1.6,6.5
+		s-0.6,2.5-0.6,5.9l1.6,1.5c0,0,1.1,1.1,1.3,1.7c0.3,0.9-0.3,1.6-1.2,1.6l-1.7,3.9c-0.6,1.9-7.8,5.3-8.4,5.9
+		c-0.5,0.5-1.7,6.9-0.8,12.1c0,0,2,7.1,1.7,11.9C127.4,199.1,97.2,187.9,97.2,187.9L97.2,187.9z"/>
+	<g>
+		<path class="st7" d="M137,160.9c-0.2,0-0.3-0.2-0.3-0.3c0-0.2,0.2-0.3,0.3-0.3c0.4,0,0.7-0.1,0.9-0.4c0.1-0.2,0.2-0.5,0.1-0.8
+			c-0.1-0.4-0.8-1.2-1.3-1.6c-0.1-0.1-0.1-0.3,0-0.5c0.1-0.1,0.3-0.1,0.5,0c0.1,0.1,1.2,1.2,1.4,1.9c0.2,0.5,0.1,1-0.2,1.4
+			C138.1,160.7,137.6,160.9,137,160.9L137,160.9z"/>
+		<path class="st7" d="M135.3,156.1c-0.2,0-0.3-0.2-0.3-0.3c0-2.2,0.3-3.5,0.4-4.5c0.1-0.6,0.2-1,0.2-1.5c0-1-1.1-5-1.5-6.4
+			c-0.1-0.2,0.1-0.4,0.2-0.4c0.2-0.1,0.4,0.1,0.4,0.2c0.1,0.2,1.6,5.4,1.6,6.6c0,0.5-0.1,1-0.2,1.6c-0.2,0.9-0.4,2.2-0.4,4.3
+			C135.6,155.9,135.5,156.1,135.3,156.1L135.3,156.1z"/>
+	</g>
+	<path class="st4" d="M103.6,179.4c-2.4,3.2-5.9,6.2-6.4,8.5c-1.2,5,2.4,32.9,27.7,57.7c15.6,15.3,23.4,14.6,23.4,14.6
+		s19.6-17.1,11.5-32.1l-9.2-15.4l-1.9-2.2c0,0,2.5-3.7,2.6-5.8c-5.6-4.7-8.5-13.4-12.8-16.2c-3.3-2.2-11.6-5.6-12.9-5.9
+		C106.7,178,103.6,179.4,103.6,179.4z"/>
+	<path class="st8" d="M144,216.1c-10.9-11.5-14.9-19.7-20-21.7c-8.1-3.2-20.4-4.8-27.7-3.2c0,0,1,20.5,15.7,40.2
+		c14.7,19.7,31.7,27.2,31.7,27.2s20.4-5.8,18-24.8l-23.1-14.9C138.6,218.8,141.7,218.5,144,216.1L144,216.1z"/>
+	<path class="st3" d="M188.2,303.1c-12.5,2.5-14.9,7.8,0.9,6.5c15.9-1.2,32.1-10,30.5-11.2L188.2,303.1z"/>
+	<g>
+		<path d="M159.8,219.8l0.1-0.3c0.3-1.5,2-9.3,3.9-10.5c1.1-0.7,6.5-1.7,12.2-1.7c4.4,0,8.1,0.6,11.1,1.6l0.3,0.1l-3.6,18.7
+			L159.8,219.8L159.8,219.8z"/>
+		<path class="st4" d="M176,207.7c3.7,0,7.7,0.4,11,1.6l-3.4,18.1l-23.4-7.8c0.6-3.1,2.2-9.3,3.7-10.3
+			C164.9,208.8,170.1,207.7,176,207.7 M176,207L176,207c-5.8,0-11.2,1-12.4,1.7c-2,1.2-3.6,8.5-4,10.7l-0.1,0.6l0.6,0.2l23.4,7.8
+			l0.7,0.2l0.1-0.8l3.4-18.1l0.1-0.6l-0.5-0.2C184.1,207.6,180.4,207,176,207L176,207L176,207z"/>
+	</g>
+	<ellipse class="st0" cx="171.1" cy="308.9" rx="74.7" ry="12"/>
+	<g>
+		<path d="M176.7,308.3c-0.2,0-0.4,0-0.6-0.1l-21.5-8.4l-20,8.4c-0.2,0.1-0.4,0.1-0.6,0.1h-0.7c-0.7,0-1.3-0.5-1.5-1.2
+			c-0.2-0.7,0.2-1.4,0.8-1.7l22-10.6l22.7,10.6c0.7,0.3,1,1,0.8,1.7C178,307.9,177.4,308.4,176.7,308.3L176.7,308.3z"/>
+		<path class="st4" d="M154.7,295.2l22.5,10.5c1.1,0.5,0.8,2.3-0.5,2.3c-0.1,0-0.3,0-0.4-0.1l-21.6-8.5l-20.2,8.5
+			c-0.1,0.1-0.3,0.1-0.5,0.1h-0.7c-1.3,0-1.6-1.7-0.5-2.2L154.7,295.2 M154.6,294.5l-0.3,0.1l-21.8,10.5c-0.8,0.4-1.2,1.2-1,2.1
+			c0.2,0.9,0.9,1.4,1.8,1.4h0.7c0.2,0,0.5-0.1,0.7-0.1l19.9-8.4l21.3,8.4c0.2,0.1,0.4,0.1,0.7,0.1c0.9,0,1.6-0.6,1.8-1.4
+			c0.2-0.9-0.2-1.7-1-2.1l-22.5-10.5L154.6,294.5L154.6,294.5L154.6,294.5z"/>
+	</g>
+	<rect x="153.4" y="264.3" width="3" height="34"/>
+	<path d="M159.4,230c6.2,2.5,0.6,37.7-23.4,27.7c0,0,3,6.4,27.5,6.4s53.5-27.3,57.8-32.5c4.4-5.3,1.6-13.1-5.3-15.3
+		C209.3,214.2,159.4,230,159.4,230L159.4,230z"/>
+	<path class="st3" d="M245.6,214.2c0,0-1-3.7-4.7-3.7c-2.3,0-6.6,1.7-10.5,3.3c-2.1,0.8-4.1,1.6-5.5,2c-3.6,1-6.3,0.8-7.3,0.6
+		c-0.1,0-0.3,0-0.4,0.1l0,0c-1.9,2.4-3.8,3.5-6.1,4.7c-0.6,0.3-1.3,0.7-1.9,1.1c-1.1,0.7-1.8,1.6-2,2.7c-0.3,1.8,0.7,4.2,2.8,6.6
+		c0.2,0.3,0.6,0.5,1.4,0.5c2,0,6.5-1.5,17.6-7.8c8.3-4.7,16.3-9.8,16.4-9.9l0.2-0.1L245.6,214.2L245.6,214.2z"/>
+	<path class="st4" d="M210.8,232.6c-0.1,0-0.2,0-0.3-0.1c-2.9-3.4-4.2-5.9-3.9-7.7c0.1-0.9,0.6-1.6,1.5-2.1c0.8-0.5,1.7-1,2.6-1.4
+		c2.5-1.3,5-2.6,6.8-4.9c0.1-0.1,0.3-0.2,0.5-0.1c0.1,0.1,0.2,0.3,0.1,0.5c-1.9,2.4-4.5,3.7-7,5.1c-0.9,0.5-1.8,0.9-2.6,1.4
+		c-0.7,0.4-1.1,1-1.2,1.6c-0.3,1.6,1,4,3.8,7.2c0.1,0.1,0.1,0.4,0,0.5C211,232.5,210.9,232.6,210.8,232.6L210.8,232.6z"/>
+	<path d="M209,283.9c0-16.5,9.3-42,14.5-57L199,238.4c0,0-8.7,17.8-8.7,43.9c0,0,3.4,3.7,10.6,3.7C208,286.1,209,283.9,209,283.9
+		L209,283.9z"/>
+	<path class="st4" d="M209.8,245c-1.2,0.2-2.3,0-2.8-0.2c1-1.2,2-2.4,3-3.7c0.1-0.1,0.1-0.4-0.1-0.5c-0.1-0.1-0.4-0.1-0.5,0.1
+		c-6.4,8.7-14.2,14.4-25.4,18.6c-0.2,0.1-0.3,0.3-0.2,0.4c0.1,0.1,0.2,0.2,0.3,0.2c0,0,0.1,0,0.1,0c9.4-3.5,16.4-8.1,22.2-14.6
+		c0.3,0.1,1.1,0.4,2.2,0.4c0.4,0,0.8,0,1.2-0.1c0.2,0,0.3-0.2,0.3-0.4C210.2,245.1,210,245,209.8,245L209.8,245z"/>
+	<polygon class="st9" points="187.8,209.5 165.4,223.8 193.7,233.5 219.7,216.2 228.7,185.3 227.8,184.7 219.1,215.6 193.9,232.1 	
+		"/>
+	<g>
+		<polygon points="193.7,232.2 218.9,215.4 187.8,208.2 165.4,222.6 		"/>
+		<path class="st2" d="M193.7,232.6c0,0-0.1,0-0.1,0l-28.3-9.7c-0.1,0-0.2-0.2-0.2-0.3c0-0.1,0-0.3,0.2-0.3l22.4-14.3
+			c0.1,0,0.2-0.1,0.3,0l31.1,7.2c0.1,0,0.2,0.1,0.3,0.3c0,0.1,0,0.3-0.1,0.3l-25.2,16.8C193.8,232.5,193.8,232.6,193.7,232.6
+			L193.7,232.6z M166.1,222.5l27.5,9.4l24.4-16.3l-30.3-7L166.1,222.5L166.1,222.5z"/>
+	</g>
+	<path class="st1" d="M165.8,216.2c3.7,0,11.5-5.9,13.1-5.9c1.6,0,5.9,1.9,7.5,1.9l2.5,3.4l-6.8,2.6c0,0-6.4,5.5-12.6,7.1
+		c-3.4,0.9-7.4-0.5-8.7-1.9c-3.7-4-0.9-7.4-0.9-7.4L165.8,216.2L165.8,216.2z"/>
+	<g>
+		<polygon points="228,184.6 218.9,215.4 187.8,208.2 195.6,182.1 		"/>
+		<path class="st2" d="M218.9,215.7C218.9,215.7,218.9,215.7,218.9,215.7l-31.2-7.2c-0.1,0-0.2-0.1-0.2-0.2s-0.1-0.2,0-0.3l7.8-26.2
+			c0-0.2,0.2-0.2,0.3-0.2l32.4,2.5c0.1,0,0.2,0.1,0.3,0.1c0.1,0.1,0.1,0.2,0,0.3l-9,30.8C219.2,215.6,219.1,215.7,218.9,215.7
+			L218.9,215.7z M188.2,208l30.5,7l8.8-30.1l-31.7-2.4L188.2,208L188.2,208z"/>
+	</g>
+	<polygon class="st4" points="190.7,206.4 197.2,184.6 224.9,186.7 217.3,212.6 	"/>
+	<path class="st3" d="M216,206.5C216,206.5,216,206.5,216,206.5l-21.7-4l4.2-13.9c0.1-0.2,0.2-0.3,0.4-0.2c0.2,0.1,0.3,0.2,0.2,0.4
+		l-4,13.2l20.9,3.9c0.2,0,0.3,0.2,0.3,0.4C216.3,206.4,216.2,206.5,216,206.5L216,206.5z"/>
+	<path class="st1" d="M185.4,222c1.2-1.3,0.2-4.1,0.9-4.7c0.6-0.6,3.4-4,4.4-4c0.9,0,1.6,0.9,1.9,0.9s2.5-0.9,2.8-0.9
+		c0.3,0,2.5,1.6,2.5,1.6s2.1,3.2,2.1,3.8c0,0.6-0.9,3.7-2.4,4.9c-1.6,1.2-4.4,2.2-5.9,3.1C190,227.5,183.4,224.1,185.4,222
+		L185.4,222z"/>
+	<path class="st8" d="M148.1,260.6c-1.3,0-9.1-0.7-23.4-14.7c-25.9-25.4-29.7-51.4-28.4-56.1c1.1-4.2,3.9-7.1,6.5-9.9
+		c4-4.2,7.8-8.2,5.9-16.1l0.7-0.2c1.9,8.2-2.2,12.5-6.1,16.7c-2.6,2.8-5.3,5.6-6.4,9.6c-0.6,2.3,0,9.7,4.2,20.2
+		c3.5,8.7,10.5,21.9,24.1,35.2c14.3,14,22,14.5,23,14.5c1.4-1.3,19-17.6,11.4-31.6l0.6-0.3c3.4,6.2,2.4,13.8-2.7,22
+		c-3.9,6.1-8.8,10.5-8.9,10.5l-0.1,0.1l-0.1,0C148.2,260.6,148.2,260.6,148.1,260.6L148.1,260.6z"/>
+	<path class="st10" d="M175.8,222.1c-0.2,0-0.3-0.1-0.3-0.3c0-0.2,0.1-0.3,0.3-0.4c1.8-0.2,3.5-1.5,4.7-2.5c0.6-0.5,1.1-0.8,1.4-1
+		c2.6-0.9,3.1-1.3,3.2-1.4c-0.3-0.5-1.7-0.9-4.6-0.1c-0.7,0.2-1.6,0.4-1.9-0.2c-0.4-0.7,0.8-2,1.3-2.6c0.1-0.1,0.3-0.1,0.5,0
+		c0.1,0.1,0.1,0.3,0,0.5c-0.7,0.7-1.3,1.5-1.2,1.8c0,0,0,0,0.2,0c0.2,0,0.5,0,0.9-0.2c4.1-1.1,5.1,0,5.4,0.5c0.1,0.2,0.1,0.3,0,0.5
+		c-0.2,0.5-1.3,1.1-3.6,1.9c-0.2,0.1-0.7,0.5-1.2,0.8C179.7,220.5,177.8,221.9,175.8,222.1C175.8,222.1,175.8,222.1,175.8,222.1
+		L175.8,222.1z"/>
+	<path class="st1" d="M186.4,222.1l-21.5-1.5l-14-14.7c0,0-2.6,10.4-12.2,12.9l22.7,15c0,0,24.6-2.9,30.2-7.2"/>
+	<g>
+		<path class="st7" d="M186.4,222.4C186.4,222.4,186.4,222.4,186.4,222.4l-21.5-1.5c-0.1,0-0.2,0-0.2-0.1l-13.7-14
+			c-0.1-0.1-0.1-0.3,0-0.5c0.1-0.1,0.3-0.1,0.5,0l13.6,13.9l21.4,1.5c0.2,0,0.3,0.2,0.3,0.4C186.7,222.3,186.5,222.4,186.4,222.4
+			L186.4,222.4z"/>
+		<path class="st7" d="M185.4,222.3c-0.1,0-0.2,0-0.2-0.1c-0.1-0.1-0.1-0.3,0-0.5c0.6-0.7,0.6-1.9,0.5-2.8c0-0.9,0-1.6,0.3-1.9
+			c0.1-0.1,0.4-0.4,0.6-0.7c1.9-2.2,3.2-3.4,4-3.4s1.3,0.4,1.6,0.7c0.1,0.1,0.2,0.2,0.3,0.2c0.2,0,0.8-0.3,1.3-0.4
+			c0.9-0.3,1.3-0.5,1.5-0.5c0.1,0,0.4,0,2.7,1.6c0.2,0.1,0.2,0.3,0.1,0.5c-0.1,0.2-0.3,0.2-0.5,0.1c-0.9-0.7-2-1.4-2.3-1.5
+			c-0.2,0-0.8,0.3-1.3,0.4c-0.9,0.3-1.3,0.5-1.5,0.5c-0.2,0-0.4-0.2-0.7-0.4c-0.3-0.3-0.7-0.6-1.2-0.6c-0.6,0-2.7,2.4-3.5,3.2
+			c-0.3,0.3-0.5,0.6-0.7,0.7c-0.2,0.2-0.1,0.9-0.1,1.4c0,1.1,0.1,2.4-0.7,3.3C185.5,222.3,185.4,222.3,185.4,222.3L185.4,222.3z
+			 M195.2,213.6L195.2,213.6z"/>
+	</g>
+	<g>
+		<path class="st10" d="M161.3,234.2c-0.1,0-0.1,0-0.2-0.1l-22.3-14.7c-0.2-0.1-0.2-0.3-0.1-0.5c0.1-0.2,0.3-0.2,0.5-0.1l22.2,14.6
+			c1.9-0.2,24.7-3.1,29.9-7.2c0.1-0.1,0.4-0.1,0.5,0.1c0.1,0.1,0.1,0.4-0.1,0.5c-2.4,1.8-8.2,3.6-17.4,5.3
+			C167.6,233.4,161.4,234.2,161.3,234.2C161.3,234.2,161.3,234.2,161.3,234.2L161.3,234.2z"/>
+		<path class="st10" d="M191.5,226.9c-0.1,0-0.2-0.1-0.3-0.2c-0.1-0.2,0-0.4,0.1-0.5c0.6-0.4,1.4-0.7,2.3-1.1c1.3-0.6,2.7-1.2,3.6-2
+			c1.5-1.2,2.4-4.2,2.3-4.7c0-0.2,0.1-0.3,0.3-0.4c0.2,0,0.3,0.1,0.4,0.3c0.1,0.7-0.9,3.9-2.6,5.2c-1,0.8-2.4,1.4-3.7,2
+			c-0.8,0.4-1.6,0.7-2.2,1.1C191.6,226.9,191.6,226.9,191.5,226.9L191.5,226.9z"/>
+	</g>
+	<path class="st7" d="M165.8,216.5c-0.2,0-0.3-0.2-0.3-0.3c0-0.2,0.2-0.3,0.3-0.3c2.2,0,6-2.2,8.8-3.9c2.3-1.3,3.6-2.1,4.3-2.1
+		c0.8,0,2.3,0.5,3.8,0.9c1.4,0.5,2.9,0.9,3.6,0.9c0.2,0,0.3,0.2,0.3,0.3c0,0.2-0.2,0.3-0.3,0.3c-0.8,0-2.3-0.5-3.8-0.9
+		c-1.4-0.5-2.9-0.9-3.6-0.9c-0.5,0-2.2,1-3.9,2C172,214.3,168.2,216.5,165.8,216.5L165.8,216.5z"/>
+	<path class="st8" d="M137,219.8l-0.1-0.1c-3.4-1.9-5.8-3.9-7.8-5.6c-2.5-2.1-3.7-3.1-4.8-2.4c-0.2,0.1-0.4,0.1-0.5-0.1
+		c-0.1-0.2-0.1-0.4,0.1-0.5c1.5-1.1,3.1,0.3,5.6,2.4c1.9,1.6,4.3,3.7,7.6,5.5c9.6-1.6,13.4-12.5,13.9-14.2c-3-2.5-5.3-6.1-7.3-9.2
+		c-1.8-2.8-3.5-5.4-5.3-6.8c-3.1-2.5-19.2-8.3-27.1-8.8c-0.2,0-0.3-0.2-0.3-0.4c0-0.2,0.2-0.3,0.4-0.3c8.2,0.6,24.2,6.4,27.5,9
+		c1.9,1.5,3.6,4.2,5.4,7c2.1,3.2,4.4,6.8,7.3,9.2l0.2,0.1l-0.1,0.2c0,0.1-3.8,13.2-14.6,14.9L137,219.8L137,219.8z"/>
+	<path d="M107.6,133.6c4.4-6.5,10.6-1.6,13.7-1.6c2.5,0,4.4-0.3,5.9-0.3c2.5,0,5,6.2,12.8,6.2c0,0,0.6,2.2-1.6,2.2
+		c0,0,0.6,1.2,2.2,1.2c0,0-0.3,2.8-2.5,2.8c-2.2,0-3.7,0-4.7,0.9c-0.9,0.9,0.9,2.8-2.8,5c-3.7,2.2-1.6,5.9,0.3,7.8
+		c1.9,1.9,2.2,5,3.7,5c0,0,0.6-1.9,1.9-1.9c0,0,0.9,1.9,2.2,2.8c0,0,0,1.9-1.9,1.9c0,0,0.6,0.9,0.6,1.9c0,0.9-1.2,1.9-1.2,2.2
+		c0,0.3,0.9,5.3-5,5.3c-5.9,0-5.9-7.2-5.9-8.4s1-5.9,1.2-9c0.5-5.7-2.8-7.8-5-6.5s-1.7,6.3,0.9,7.5c0,0-2.8,9-9.3,9
+		s-10.6-6.2-10.6-9.7c0,0-1.9,0.6-2.5-0.9c0,0,1.2-3.7,0.6-6.2c0,0-1.9,0.9-2.5-0.9c0,0,1.9-1.2,2.2-3.7
+		C100.6,144.9,100.7,133.3,107.6,133.6L107.6,133.6z"/>
+	<g>
+		<path class="st11" d="M105,210.3c18.9,0,40.5,23,57,28.9c18.4,6.5,30.5,1.6,40.8,8.7c0,0-12.8,16.2-47.3,16.2
+			c-24.3,0-49.8-32.4-56.7-52.9C100.9,210.6,102.9,210.3,105,210.3 M105,209.3c-2.3,0-4.4,0.3-6.5,0.9l-1,0.3l0.3,1
+			c3.7,11,12.1,24.3,22,34.6c5.5,5.8,11.3,10.3,17,13.6c6.4,3.7,12.7,5.5,18.6,5.5c8,0,15.4-0.9,22.2-2.6c5.4-1.4,10.4-3.3,14.9-5.7
+			c7.6-4.1,10.9-8.2,11-8.4l0.7-0.8l-0.9-0.6c-5.6-3.9-11.8-4.3-18.9-4.8c-6.4-0.4-13.6-0.9-22.2-4c-6.4-2.3-13.5-7.2-21.1-12.3
+			C129.3,217.8,116.8,209.3,105,209.3L105,209.3L105,209.3z"/>
+		<path class="st3" d="M155.5,264.1c34.6,0,47.3-16.2,47.3-16.2c-10.3-7.2-22.4-2.2-40.8-8.7s-43-34.3-63.2-28
+			C105.7,231.7,131.3,264.1,155.5,264.1L155.5,264.1z"/>
+		<path class="st3" d="M155.5,264.1c34.6,0,47.3-16.2,47.3-16.2c-10.3-7.2-22.4-2.2-40.8-8.7s-43-34.3-63.2-28
+			C105.7,231.7,131.3,264.1,155.5,264.1L155.5,264.1z"/>
+	</g>
+	<path class="st10" d="M178.6,214c-0.2,0-0.3-0.1-0.3-0.3c0-0.2,0.1-0.4,0.3-0.4c2.2-0.3,4.9,0,5.1,0c0.2,0,0.3,0.2,0.3,0.4
+		c0,0.2-0.2,0.3-0.4,0.3C183.5,214,180.7,213.7,178.6,214C178.6,214,178.6,214,178.6,214L178.6,214z"/>
+	<path class="st3" d="M206.5,199.5C206.4,199.5,206.4,199.5,206.5,199.5c-0.2,0-0.2-0.1-0.3-0.2l-1.6-2.7l-1.3,1.5
+		c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.2-0.1-0.2-0.3l-0.5-2.5l-3.6,3.9c-0.1,0.1-0.3,0.1-0.5,0c-0.1-0.1-0.1-0.3,0-0.5l4-4.4
+		c0.1-0.1,0.2-0.1,0.3-0.1c0.1,0,0.2,0.1,0.2,0.3l0.5,2.4l1.1-1.3c0.1-0.1,0.2-0.1,0.3-0.1c0.1,0,0.2,0.1,0.3,0.2l1.7,2.8l4.1-2.9
+		c0.1-0.1,0.3-0.1,0.5,0.1l1,1.3l5.3-4.7c0.1-0.1,0.3-0.1,0.5,0c0.1,0.1,0.1,0.3,0,0.5l-5.6,5c-0.1,0.1-0.2,0.1-0.3,0.1
+		c-0.1,0-0.2-0.1-0.2-0.1l-1-1.3l-4.1,2.9C206.6,199.5,206.5,199.5,206.5,199.5L206.5,199.5z"/>
+	<path class="st4" d="M210,230.8c0,4,7.2,6.5,19.6-0.6c12.5-7.2,16.6-14.1,14.3-17.8c-3.2-5.3-13.4,7.1-18.7,10
+		C220.6,224.9,210,224.9,210,230.8L210,230.8z"/>
+	<g>
+		<path class="st4" d="M211.3,232.1c0,4,7.2,4.7,19.6-0.6c13.2-5.6,16.6-14.1,14.3-17.8c-3.4-5.6-14,7.5-18.7,10
+			C221.9,226.1,211.3,226.1,211.3,232.1L211.3,232.1z"/>
+		<path class="st3" d="M216.4,235.6c-1.7,0-3.1-0.3-4.1-0.9c-0.9-0.6-1.4-1.5-1.4-2.6c0-4.3,5.2-5.7,9.8-6.8
+			c2.2-0.6,4.2-1.1,5.6-1.9c1.4-0.7,3.4-2.5,5.4-4.3c4-3.5,8.5-7.5,11.5-7c0.9,0.1,1.6,0.6,2.1,1.5c0.8,1.3,0.9,3.2,0.3,5.2
+			c-0.8,2.3-3.7,8.3-14.8,13C225.1,234.3,220,235.6,216.4,235.6L216.4,235.6z M242.9,212.6c-2.8,0-7.1,3.8-10.6,6.9
+			c-2.1,1.9-4.1,3.6-5.6,4.4c-1.5,0.8-3.6,1.3-5.8,1.9c-4.6,1.2-9.3,2.4-9.3,6.2c0,0.9,0.4,1.6,1.1,2c3.2,2.1,11.4-0.1,18.1-3
+			c10.8-4.6,13.7-10.3,14.4-12.6c0.6-1.8,0.5-3.5-0.2-4.7c-0.4-0.7-1-1.1-1.7-1.2C243.1,212.6,243,212.6,242.9,212.6L242.9,212.6z"
+			/>
+	</g>
+	<g>
+		<path class="st4" d="M219.4,301.2c-2,1.8-19.2,6.6-24.9,7c-5.1,0.3-6.6-1.4-6.8-1.7c-0.1-0.5-0.1-1.3-0.2-2.4
+			c0.7,0.6,2.3,1.6,5.9,1.6c0.4,0,0.7,0,1.1,0c5.6-0.3,21.3-4.9,24.9-7.1C219.3,300.2,219.3,300.9,219.4,301.2z"/>
+		<path class="st3" d="M219.7,297.8L219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8z"/>
+	</g>
+	<g>
+		<path class="st3" d="M219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8L219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8z"/>
+		<path class="st3" d="M219.7,297.8L219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8z"/>
+		<path class="st3" d="M219.9,297.2c0,0,0,0-0.1-0.1l0,0c-1.3-2.5-3.3-3.2-5.6-4.1c-0.5-0.2-1-0.4-1.5-0.6c-3.2-1.3-5.1-3.6-5.2-3.6
+			c-0.1-0.1-0.2-0.1-0.3-0.1c-0.1,0-0.2,0.1-0.3,0.2c0,0.1-1.6,5.1-6.6,6c-3.3,0.6-3.7-0.3-4.1-1.3c-0.2-0.5-0.4-1.1-1-1.4
+			c-1.6-1-6.8-1.3-7-1.3c-0.1,0-0.3,0.1-0.3,0.2c-1.1,2.2-1.3,6.2-1.2,9.1c-0.1,2.8,0.1,5.5,0.2,6.5c0,0,0,0.1,0,0.1
+			c0.1,0.1,1.2,2.1,6.3,2.1c0.4,0,0.7,0,1.1,0c5.7-0.3,23.7-5.2,25.5-7.3c0.1-0.1,0.1-0.2,0.1-0.3c0-0.2,0-1.8,0-3.4
+			c0,0,0-0.1,0-0.1c0-0.1,0-0.2,0-0.3C220,297.3,220,297.2,219.9,297.2L219.9,297.2z M194.5,308.1c-5.1,0.3-6.6-1.4-6.8-1.7
+			c-0.1-0.5-0.1-1.3-0.2-2.4c0.7,0.6,2.3,1.6,5.9,1.6c0.4,0,0.7,0,1.1,0c5.6-0.3,21.3-4.9,24.9-7.1c0,1.7,0,2.4,0,2.7
+			C217.4,303,200.2,307.8,194.5,308.1z M219.7,297.8L219.7,297.8C219.7,297.8,219.7,297.8,219.7,297.8
+			C219.7,297.8,219.7,297.8,219.7,297.8z"/>
+	</g>
+	<line class="st12" x1="220.2" y1="216.5" x2="193.8" y2="233.9"/>
+	<path class="st4" d="M121,141.5C121,141.5,121,141.5,121,141.5c-0.1,0-2.1-0.4-4.4-2.6c-0.1-0.1-0.1-0.3,0-0.5s0.3-0.1,0.5,0
+		c1.5,1.5,2.9,2.1,3.5,2.3c0-0.7,0.1-1.9,1.2-2.4c0.2-0.1,0.3,0,0.4,0.1c0,0.1,0.9,1.4,2.2,1.1c0.2,0,0.4,0.1,0.4,0.3
+		s-0.1,0.4-0.3,0.4c-1.4,0.3-2.3-0.7-2.7-1.2c-0.8,0.6-0.5,2-0.5,2c0,0.1,0,0.2-0.1,0.3C121.2,141.4,121.1,141.5,121,141.5
+		L121,141.5z"/>
+	<polygon class="st3" points="124.4,149.2 138.3,151.6 138.3,152.4 127.1,151.9 	"/>
+	<path class="st3" d="M138.6,151.5l-14.1-2.5c-0.1,0-0.3,0-0.4,0.2c-0.1,0.1,0,0.3,0.1,0.4l2.5,2.5c0.1,0.1,0.1,0.1,0.2,0.1
+		c1.5,0,9,0.3,11.2,0.6c-0.2,1.6-0.9,4.7-2.8,5.3c-0.2,0.1-0.3,0.2-0.2,0.4c0,0.1,0.2,0.2,0.3,0.2c0,0,0.1,0,0.1,0
+		c3-1,3.3-6.6,3.3-6.8C138.9,151.7,138.8,151.6,138.6,151.5L138.6,151.5z"/>
+	<path class="st13" d="M144.1,216.2c-1.9,1.6-4.3,2.8-7.1,3.3c-7.6-4.2-10.6-9.7-12.9-7.9"/>
+	<path class="st4" d="M139.7,151.7C139.7,151.7,139.6,151.7,139.7,151.7l-15.3-2.2c-0.2,0-0.3-0.2-0.3-0.4c0-0.2,0.2-0.3,0.4-0.3
+		l15.3,2.2c0.2,0,0.3,0.2,0.3,0.4C140,151.6,139.8,151.7,139.7,151.7L139.7,151.7z"/>
+</g>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/empty-state-project-overview.svg b/clients/ui/frontend/src/shared/images/empty-state-project-overview.svg
new file mode 100644
index 000000000..3ef12e28a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-project-overview.svg
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="uuid-a7ab53c3-7cad-44b3-b51c-bbc6bac212a4"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 394 480"
+	 style="enable-background:new 0 0 394 480;" xml:space="preserve">
+<style type="text/css">
+	.st0{clip-path:url(#SVGID_00000109723552571010259340000007470040599259438258_);}
+	.st1{fill:#DAF2F2;}
+	.st2{fill:#37A3A3;}
+	.st3{fill:#FFFFFF;}
+	.st4{fill:#B9E5E5;}
+	.st5{fill:#EE0000;}
+	.st6{clip-path:url(#SVGID_00000002358001176583397610000010072262552289970869_);}
+	.st7{fill:none;}
+	.st8{fill:#DEDEDE;}
+	.st9{fill:#707070;}
+	.st10{fill:#EE0000;stroke:#EE0000;stroke-width:1.5;stroke-miterlimit:10;}
+	.st11{fill:#A60000;}
+	.st12{stroke:#EE0000;stroke-width:1.5;stroke-miterlimit:10;}
+	.st13{clip-path:url(#SVGID_00000043425643620266845590000017910303348047347863_);}
+	.st14{fill:#E0E0E0;}
+	.st15{fill:#FFFFFF;stroke:#E0E0E0;stroke-width:1.5;stroke-miterlimit:10;}
+	.st16{fill:#C7C7C7;}
+	.st17{fill:#147878;}
+	.st18{fill:#147878;stroke:#37A3A3;stroke-width:1.5;stroke-miterlimit:10;}
+	.st19{stroke:#000000;stroke-width:1.5;stroke-miterlimit:10;}
+	.st20{fill:#A3A3A3;}
+	.st21{stroke:#DEDEDE;stroke-width:1.5;stroke-miterlimit:10;}
+	.st22{fill:#E8A997;}
+	.st23{fill:#A66552;}
+	.st24{fill:#40251D;}
+	.st25{stroke:#000000;stroke-width:0.97;stroke-miterlimit:10;}
+</style>
+<g>
+	<g>
+		<defs>
+			<path id="SVGID_1_" d="M366.7,407c63.6-60.9-7.6-113.8-4.1-165.2s53.6-143.8-27.4-178.3c-84.2-35.8-117.2,47.7-176.7,82.2
+				c-36.8,21.4-133,21.8-149,91.3c-19.4,84.2,57.8,126.1,100.1,124.2c39.2-1.8,98.4,7.8,129.5,35C270.7,423.8,331.5,440.7,366.7,407
+				L366.7,407z"/>
+		</defs>
+		<clipPath id="SVGID_00000124875786729139922110000017333564383753247108_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g style="clip-path:url(#SVGID_00000124875786729139922110000017333564383753247108_);">
+			<path class="st1" d="M366.7,407c63.6-60.9-7.6-113.8-4.1-165.2s53.6-143.8-27.4-178.3c-84.2-35.8-117.2,47.7-176.7,82.2
+				c-36.8,21.4-133,21.8-149,91.3c-19.4,84.2,57.8,126.1,100.1,124.2c39.2-1.8,98.4,7.8,129.5,35C270.7,423.8,331.5,440.7,366.7,407
+				L366.7,407z"/>
+			<rect x="4.7" y="184.4" class="st2" width="54.3" height="54.3"/>
+			<path class="st2" d="M367.3,69.6c0-7.5-6-13.5-13.5-13.5c-0.2,0-0.3,0-0.5,0c-1.6-10-10.1-17.7-20.4-18.2
+				c-4.2-14.8-17.9-25.7-34.1-25.7c-18.4,0-33.6,14.1-35.3,32c-0.1,0-0.1,0-0.2,0c-10.7,0-19.4,8.7-19.4,19.4s8.6,19.4,19.3,19.4
+				l0,0h0.1l0,0l0,0h35.5l0,0l0,0h55l0,0l0,0h0.2l0,0C361.4,83,367.3,77,367.3,69.6L367.3,69.6z"/>
+			<path class="st2" d="M284.3,75.4c-4.3,0-8.4,0.6-12.3,1.8c-9.3-17.6-27.8-29.5-49.1-29.5c-23.7,0-43.8,14.8-51.9,35.6
+				c-15.1,0.5-28,9.9-33.5,23.1c-2.1-0.5-4.3-0.8-6.6-0.8c-14.7,0-26.6,11.9-26.6,26.6s11.9,26.6,26.6,26.6h153.4
+				c23,0,41.7-18.7,41.7-41.7C326,94,307.3,75.4,284.3,75.4L284.3,75.4z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st3" d="M363.3,66.3c0-7.5-6-13.5-13.5-13.5c-0.2,0-0.3,0-0.5,0c-1.6-10-10.1-17.7-20.4-18.2
+			C324.6,19.7,311,8.9,294.8,8.9c-18.4,0-33.6,14.1-35.3,32c-0.1,0-0.1,0-0.2,0c-10.7,0-19.4,8.7-19.4,19.4s8.6,19.4,19.3,19.4l0,0
+			h0.1l0,0l0,0h35.5l0,0l0,0h55l0,0l0,0h0.2l0,0C357.3,79.7,363.3,73.7,363.3,66.3L363.3,66.3z"/>
+		<path class="st4" d="M350,80.4l-91.5,0c-10.7-0.4-19.3-9.3-19.3-20.1s8.8-19.9,19.7-20.1c2.1-18.3,17.4-32,35.9-32
+			c15.9,0,30,10.6,34.6,25.7c10.1,0.7,18.6,8.2,20.5,18.1c7.8,0,14.1,6.4,14.1,14.2s-5.9,13.7-13.3,14.2v0L350,80.4L350,80.4z
+			 M259.7,79.1H350c7-0.1,12.6-5.9,12.6-12.8c0-7-5.8-12.8-12.8-12.8c-0.1,0-0.3,0-0.4,0l-0.6,0l-0.1-0.6
+			c-1.6-9.8-9.9-17.2-19.8-17.6l-0.5,0l-0.1-0.5c-4.2-14.8-18-25.2-33.4-25.2c-18,0-32.9,13.5-34.6,31.4l-0.1,0.6l-0.8,0
+			c-10.4,0-18.8,8.4-18.8,18.8s8.4,18.7,18.7,18.8L259.7,79.1L259.7,79.1z"/>
+	</g>
+	<g>
+		<g>
+			<path class="st5" d="M81.8,241.2c-0.1,0-0.2,0-0.3-0.1c-6.2-3.1-12.2-6.9-17.7-11.1c-0.3-0.2-0.3-0.6-0.1-0.9
+				c0.2-0.3,0.6-0.3,0.9-0.1c5.5,4.2,11.4,7.9,17.5,11c0.3,0.2,0.5,0.6,0.3,0.9C82.3,241.1,82.1,241.2,81.8,241.2L81.8,241.2z"/>
+			<path class="st5" d="M107.8,260.8c0,0-0.1,0-0.1,0c-16.6-3.3-32.1-9.9-46.1-19.7c-0.3-0.2-0.4-0.6-0.2-0.9
+				c0.2-0.3,0.6-0.4,0.9-0.2c13.8,9.7,29.1,16.2,45.6,19.4c0.4,0.1,0.6,0.4,0.5,0.8C108.4,260.5,108.2,260.8,107.8,260.8
+				L107.8,260.8z"/>
+			<path class="st5" d="M130.7,272.3c-1.9,0-3.8,0-5.7-0.1c-28-1.2-54.3-11.1-76.1-28.6c-0.3-0.2-0.3-0.7-0.1-0.9s0.7-0.3,0.9-0.1
+				c21.6,17.3,47.6,27.1,75.3,28.3c10.3,0.4,20.7-0.3,30.7-2.3c0.4-0.1,0.7,0.2,0.8,0.5c0.1,0.4-0.2,0.7-0.5,0.8
+				C147.8,271.5,139.3,272.3,130.7,272.3L130.7,272.3z"/>
+		</g>
+		<g>
+			<path class="st5" d="M65.3,67.8c-0.2,0-0.4-0.1-0.5-0.3c-0.2-0.3-0.2-0.7,0.1-0.9c5.5-4.3,11.4-8.1,17.6-11.3
+				c0.3-0.2,0.7,0,0.9,0.3c0.2,0.3,0,0.7-0.3,0.9c-6.1,3.2-12,6.9-17.4,11.2C65.6,67.8,65.5,67.8,65.3,67.8L65.3,67.8z"/>
+			<path class="st5" d="M36.6,83.1c-0.1,0-0.3,0-0.4-0.1c-0.3-0.2-0.4-0.6-0.1-0.9c9.3-12.7,20.9-23.3,34.4-31.5
+				c0.3-0.2,0.7-0.1,0.9,0.2c0.2,0.3,0.1,0.7-0.2,0.9c-13.3,8.1-24.8,18.6-34,31.2C37,83,36.8,83.1,36.6,83.1L36.6,83.1z"/>
+			<path class="st5" d="M7.9,122.7c-0.1,0-0.1,0-0.2,0c-0.4-0.1-0.6-0.5-0.5-0.8c2.5-10,6.2-19.8,11.1-29.1
+				c13-24.8,33.2-44.4,58.2-56.7c0.3-0.2,0.7,0,0.9,0.3c0.2,0.3,0,0.7-0.3,0.9C52.3,49.4,32.4,68.8,19.5,93.4
+				c-4.8,9.2-8.5,18.9-11,28.8C8.5,122.5,8.2,122.7,7.9,122.7L7.9,122.7z"/>
+		</g>
+	</g>
+	<g>
+		<rect x="1.8" y="191.5" class="st3" width="53.5" height="43.3"/>
+		<path class="st5" d="M55.7,180.3H1.3c-0.3,0-0.5,0.2-0.5,0.5v54.5c0,0.3,0.2,0.5,0.5,0.5h54.5c0.3,0,0.5-0.2,0.5-0.5v-54.5
+			C56.2,180.5,56,180.3,55.7,180.3z M55.2,234.8H1.8v-43.3h53.5V234.8z"/>
+		<g>
+			<circle class="st3" cx="45.7" cy="185.9" r="1.4"/>
+			<circle class="st3" cx="51" cy="185.9" r="1.4"/>
+		</g>
+		<path class="st3" d="M33.8,186.4H4.5c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h29.3c0.3,0,0.5,0.2,0.5,0.5
+			C34.3,186.2,34,186.4,33.8,186.4z"/>
+		<g>
+			<path class="st5" d="M24.1,227.7c0,0-0.1,0-0.1,0c-0.3-0.1-0.4-0.4-0.3-0.6l8.8-28.6c0.1-0.3,0.4-0.4,0.6-0.3
+				c0.3,0.1,0.4,0.4,0.3,0.6l-8.8,28.6C24.5,227.6,24.3,227.7,24.1,227.7z"/>
+			<path class="st5" d="M37.6,220.6c-0.1,0-0.3,0-0.4-0.1c-0.2-0.2-0.2-0.5,0-0.7l6.8-6.8l-6.8-6.8c-0.2-0.2-0.2-0.5,0-0.7
+				c0.2-0.2,0.5-0.2,0.7,0l7.5,7.5l-7.5,7.5C37.9,220.5,37.8,220.6,37.6,220.6z"/>
+			<path class="st5" d="M19.3,220.6c-0.1,0-0.3,0-0.4-0.1l-7.5-7.5l7.5-7.5c0.2-0.2,0.5-0.2,0.7,0s0.2,0.5,0,0.7l-6.8,6.8l6.8,6.8
+				c0.2,0.2,0.2,0.5,0,0.7C19.6,220.5,19.5,220.6,19.3,220.6z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st5" d="M112.2,62.2C95,62.2,81,48.3,81,31.1S95,0,112.2,0s31.1,14,31.1,31.1S129.3,62.2,112.2,62.2z M112.2,1
+			C95.5,1,82,14.5,82,31.1s13.5,30.1,30.1,30.1s30.1-13.5,30.1-30.1S128.8,1,112.2,1z"/>
+		<g>
+			<path class="st3" d="M111.9,40.8c-0.3,0-0.5-0.2-0.5-0.5v-9.2c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v9.2
+				C112.4,40.6,112.2,40.8,111.9,40.8z"/>
+			<path class="st3" d="M111.9,46.3c-0.3,0-0.5-0.2-0.5-0.5V31.1c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v14.7
+				C112.4,46.1,112.2,46.3,111.9,46.3z"/>
+			<g>
+				<polygon class="st3" points="126.3,22.8 126.3,39.4 111.9,47.7 97.5,39.4 97.5,22.8 111.9,14.5 				"/>
+				<path class="st5" d="M111.9,48.3L97,39.7V22.5l14.9-8.6l14.9,8.6v17.2L111.9,48.3z M98,39.1l13.9,8l13.9-8V23.1l-13.9-8l-13.9,8
+					V39.1z"/>
+			</g>
+			<g>
+				<defs>
+					<polygon id="SVGID_00000141425380276407201280000013604326761576616885_" points="126.3,22.8 126.3,39.4 111.9,47.7 97.5,39.4 
+						97.5,22.8 111.9,14.5 					"/>
+				</defs>
+				<clipPath id="SVGID_00000034076394557954382820000010320230075188281491_">
+					<use xlink:href="#SVGID_00000141425380276407201280000013604326761576616885_"  style="overflow:visible;"/>
+				</clipPath>
+				<g style="clip-path:url(#SVGID_00000034076394557954382820000010320230075188281491_);">
+					<g>
+						<g>
+							<line class="st7" x1="97.5" y1="22.8" x2="111.9" y2="31.1"/>
+							<path class="st5" d="M111.9,31.6c-0.1,0-0.2,0-0.2-0.1l-14.4-8.3c-0.2-0.1-0.3-0.4-0.2-0.7c0.1-0.2,0.4-0.3,0.7-0.2l14.4,8.3
+								c0.2,0.1,0.3,0.4,0.2,0.7C112.2,31.5,112.1,31.6,111.9,31.6L111.9,31.6z"/>
+						</g>
+						<path class="st5" d="M111.9,50.9c-0.3,0-0.5-0.2-0.5-0.5V31.1c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v19.3
+							C112.4,50.7,112.2,50.9,111.9,50.9z"/>
+						<g>
+							<line class="st7" x1="126.3" y1="22.8" x2="111.9" y2="31.1"/>
+							<path class="st5" d="M111.9,31.6c-0.2,0-0.3-0.1-0.4-0.3c-0.1-0.2-0.1-0.5,0.2-0.7l14.4-8.3c0.2-0.1,0.5-0.1,0.7,0.2
+								c0.1,0.2,0.1,0.5-0.2,0.7l-14.4,8.3C112.1,31.6,112,31.6,111.9,31.6L111.9,31.6z"/>
+						</g>
+					</g>
+				</g>
+			</g>
+			<path class="st5" d="M111.9,48.1l-14.7-8.5v-17l0.2-0.1l14.6-8.4l14.7,8.5v17l-0.2,0.1L111.9,48.1z M97.8,39.2l14.1,8.1l14.1-8.1
+				V23l-14.1-8.1L97.8,23V39.2z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st3" d="M280.3,72c-4.3,0-8.4,0.6-12.3,1.8c-9.3-17.6-27.8-29.5-49.1-29.5c-23.7,0-43.8,14.8-51.9,35.6
+				c-15.1,0.5-28,9.9-33.5,23.1c-2.1-0.5-4.3-0.8-6.6-0.8c-14.7,0-26.6,11.9-26.6,26.6s11.9,26.6,26.6,26.6h153.4
+				c23,0,41.7-18.7,41.7-41.7C322,90.7,303.3,72,280.3,72L280.3,72z"/>
+			<path class="st4" d="M280.3,156.1H126.9c-15,0-27.3-12.2-27.3-27.3s12.2-27.3,27.3-27.3c2.1,0,4.2,0.2,6.2,0.7
+				c5.8-13.4,18.9-22.3,33.5-23c4.1-10.3,11-19.1,20.1-25.5c9.5-6.6,20.6-10.1,32.2-10.1c20.7,0,39.5,11.2,49.4,29.4
+				c3.9-1.1,7.9-1.7,11.9-1.7c23.4,0,42.4,19,42.4,42.4S303.6,156.1,280.3,156.1L280.3,156.1z M126.9,102.9
+				c-14.3,0-25.9,11.6-25.9,25.9s11.6,25.9,25.9,25.9h153.4c22.6,0,41-18.4,41-41s-18.4-41-41-41c-4.1,0-8.2,0.6-12.1,1.8l-0.5,0.2
+				l-0.3-0.5c-9.6-18-28.1-29.2-48.5-29.2c-11.3,0-22.2,3.4-31.4,9.9c-9,6.3-15.9,15.1-19.8,25.3l-0.2,0.4l-0.4,0
+				c-14.4,0.5-27.4,9.4-33,22.7l-0.2,0.5l-0.6-0.1C131.2,103.2,129.1,102.9,126.9,102.9L126.9,102.9z"/>
+		</g>
+		<path class="st8" d="M217.9,126.3c-3.2,0-5.8-2.6-5.8-5.8v-10.8c-3.8-2.1-6.2-6.1-6.2-10.5c0-6.6,5.4-12,12-12s12,5.4,12,12
+			c0,4.4-2.4,8.4-6.2,10.5v10.8C223.7,123.7,221.1,126.3,217.9,126.3z M217.9,88.5c-5.9,0-10.7,4.8-10.7,10.7c0,4,2.2,7.7,5.8,9.5
+			l0.4,0.2v11.6c0,2.5,2,4.5,4.5,4.5c2.5,0,4.5-2,4.5-4.5v-11.6l0.4-0.2c3.6-1.8,5.8-5.5,5.8-9.5C228.6,93.2,223.8,88.5,217.9,88.5
+			L217.9,88.5z"/>
+	</g>
+	<polygon class="st5" points="111.5,31.1 111.9,47.7 126.3,39.2 126.3,23.1 	"/>
+	<ellipse cx="220.2" cy="463" rx="72.2" ry="17"/>
+	<path d="M207.1,452.1c9.3-7.6,4.9-52,4.9-63s14.2-10.9,15.3,0c1.1,11-1.5,58.3,5.3,62.4C244.3,458.7,197.8,459.8,207.1,452.1z"/>
+	<path class="st9" d="M221.5,458.7c-6.3,0-12.6-0.9-13.7-3.2c-0.3-0.7-0.4-1.9,1.3-3.3c3.6-2.9,5.6-18.3,5.4-41.1
+		c0-0.4,0.3-0.7,0.7-0.7c0.3,0,0.7,0.3,0.7,0.7c0.1,13.8-0.5,37.7-5.9,42.2c-0.6,0.5-1.2,1.1-0.9,1.6c1.2,2.5,15.2,3.3,23.4,1.5
+		c0.4-0.1,0.7,0.1,0.8,0.5c0.1,0.4-0.1,0.7-0.5,0.8C229.9,458.3,225.7,458.7,221.5,458.7L221.5,458.7z"/>
+	<path class="st10" d="M235.5,202.7c16.9-10.8,70-10.4,83.1,6.6c13.9,17.9-3.2,131.4-46.5,168.5c-41.6,35.6-94.9,34.8-134.2,17.1
+		c-15.2-6.9-16.3-23.5-11.1-33.9c11.7-23.7,59-50.4,72-76.6C216.7,248.4,214.2,216.4,235.5,202.7L235.5,202.7z"/>
+	<path class="st11" d="M318.7,209.3c-2-2.6-4.9-4.8-8.5-6.6c7.8,4.1,11.2,12.4,10.4,35.7c-1.2,37.5-19.4,93.7-47.3,121.4
+		c-51.7,51.4-92.9,45.7-117.4,41.7c36.6,10.6,80.7,6.7,116.3-23.7C315.5,340.7,332.5,227.2,318.7,209.3L318.7,209.3z"/>
+	<path class="st12" d="M236.1,204.3c16.9-10.8,48.7-10.4,71.5,2.5c22.2,12.5-1.5,82.6-34.9,128.8c-31,43-92.6,69.5-130.9,49.4
+		c-48.1-25.2,33.7-57.3,56.5-93.8C219.6,257.3,214.8,218,236.1,204.3L236.1,204.3z"/>
+	<path class="st9" d="M220.1,477c-38.6,0-68.9-7.1-68.9-16.1c0-2,1.4-3.8,4.3-5.4c0.3-0.2,0.7-0.1,0.8,0.2c0.2,0.3,0.1,0.7-0.2,0.8
+		c-2.5,1.4-3.7,2.8-3.7,4.4c0,8.1,31,14.9,67.6,14.9c26.6,0,51-3.5,61.9-9c0.3-0.2,0.7,0,0.8,0.3c0.2,0.3,0,0.7-0.3,0.8
+		C271.5,473.4,247,477,220.1,477L220.1,477z"/>
+	<g>
+		<defs>
+			<path id="SVGID_00000031203376333382190370000004782890709439614857_" d="M217.1,124.4c9-5.7,51.1-12.6,69.9,9.2
+				c16.6,19.2,9.9,66.6,20.6,72.7c22.2,12.5-1.5,82.6-34.9,128.8c-31,43-92.6,69.5-130.9,49.4c-48.1-25.2-56.8-71.1-34-107.6
+				C129.1,243.1,195.8,138.1,217.1,124.4L217.1,124.4z"/>
+		</defs>
+		<clipPath id="SVGID_00000099630141084161515050000007109444054852416661_">
+			<use xlink:href="#SVGID_00000031203376333382190370000004782890709439614857_"  style="overflow:visible;"/>
+		</clipPath>
+		<g style="clip-path:url(#SVGID_00000099630141084161515050000007109444054852416661_);">
+			<g>
+				<g>
+					<path class="st3" d="M234.7,227.8c-1.1,8.1-7,14.4-15.4,30.1c-0.7,1.3-6-1.1-12.4-3.6l3.6,22.3c8.4,5.3,13.2,10.3,16,9.1
+						c11.1-5.1,31.2-31.6,24.1-61.4C246.6,207.5,236.7,213.7,234.7,227.8L234.7,227.8z"/>
+					<path class="st14" d="M225.6,286.3c-2,0-4.6-1.9-8.2-4.5c-2-1.5-4.4-3.1-7.1-4.9l-0.2-0.1l-3.7-23.4l2.7,1.1
+						c3.5,1.4,9.5,3.8,9.9,3.1c3-5.6,5.6-9.9,7.9-13.7c4-6.7,6.7-11.1,7.4-16.2c1.1-8,4.9-13.9,9-14.1c2-0.1,5.7,1.1,7.9,10.4
+						c4,16.8-0.6,31.2-5.2,40.3c-5.8,11.6-13.8,19.2-19.1,21.7C226.4,286.2,226,286.3,225.6,286.3L225.6,286.3z M211,276.3
+						c2.7,1.7,4.9,3.3,7,4.8c3.9,2.8,6.8,4.9,8.4,4.1c5.2-2.4,12.9-9.9,18.6-21.2c4.5-9,9.1-23.2,5.2-39.6c-1.5-6.3-4-9.8-6.9-9.7
+						c-3.6,0.2-7,5.7-8,13.2l0,0c-0.7,5.3-3.4,9.8-7.5,16.6c-2.3,3.8-4.9,8.1-7.9,13.7c-0.8,1.5-4.2,0.2-11.1-2.6l-1.1-0.4
+						L211,276.3L211,276.3z"/>
+				</g>
+				<path class="st14" d="M234.7,227.8c0.3,12.5-6.6,20.2-11,34c-0.4,1.4-9,4.5-15.4,1c0,0,54.3,31.7,42.3-38.6
+					C247.7,207.3,234.3,213.5,234.7,227.8L234.7,227.8z"/>
+				<path class="st15" d="M309.9,229.3c-4.6-19.5-14.5-23.4-26.8-26.6c-0.5-0.1-0.8,0.6-0.4,0.9l1.3,0.8c0.3,0.2,0.3,0.9,0.1,1.3
+					c-2.8,4.7-8.8,11.1-13.5,13.3c-10.7,5-19.3,5.2-15.8-1.5c1-2,5.5-7.1,5.1-11.5c0-0.4-5.1-0.6-5.5-0.5
+					c-10.3,4.1-19.5,11-17.8,20.6c3.1,17.3-13.2,23.9-6.7,42.1c5.4,14.9-5.4,27.5-11.3,35.3c10,3.6,24.1,12.1,41.8,12
+					c10.8-0.1,19.3,7.3,22.5,12.4c1.5-2.3,6.5-14.1,8.5-21.4C297.7,284.5,317,259.6,309.9,229.3L309.9,229.3z"/>
+				<path class="st16" d="M310.4,229.3c-4.6-19.5-12.3,7-23.6,5.6c3.1,17.3,3.5,38.3-12.5,40.1c-17,1.9,6.4,13-11.7,36.7
+					c9.7,5.2,17.6,11.1,20.8,16.2c1.5-2.3,6.5-14.1,8.5-21.4C298.2,284.5,317.5,259.5,310.4,229.3L310.4,229.3z"/>
+				<path class="st16" d="M208.3,267.9l2.2,9.2c8.4,5.3,13.2,10.3,16,9.1c4.3-2,6-7.3,4-16C221.6,269.4,215.5,269,208.3,267.9
+					L208.3,267.9z"/>
+				<path d="M286.6,291.4c-5,16-11.3,28.2-9.4,29.7c2.8,2.3,5,4.6,6.4,6.8c1.5-2.3,11.2-29.4,12.9-33.6L286.6,291.4L286.6,291.4z"/>
+			</g>
+			<g>
+				<path class="st9" d="M178,340.2c5.2,3.5,23,13.8,26.1,18.2s3.3,12-1.6,13.9c-4.9,1.8-9.9,4.5-14.5,2.8c-4.7-1.8-6.8-8-10.5-11.2
+					c-3.6-3.2-9.4-11.5-14.5-12.5s-5.5-2.7-4.6-6.9S171.1,335.5,178,340.2L178,340.2z"/>
+				<g>
+					<path class="st17" d="M110.2,310.8c-7.7,28.3,28.8,28.8,56.1,54c-2.2-10.9,11.8-14.4,11.8-14.4c-13.1-18.6-15.4-32.4-52.2-40.1
+						c29.4,5.3,38.8,19.5,41,24.1c3.6,7.3,12.2,18.1,27,23.6c5-3.8,0.7-12.4,6.9-10.8c8,2,32.4,16.8,37.3,16.9
+						c2.4,0.1,8.1,6,13.9-0.3c13-10.5,19.4-16.6,30.8-35.5c-12.4-16.4-57.4-32.7-63.7-26.2c-4.1,4.2-8.5,9-14.5,8.5
+						C171.1,307.5,118.2,281.2,110.2,310.8L110.2,310.8z"/>
+					<path class="st2" d="M246.2,367.1c-2.2,0-4.2-1-5.8-1.7c-0.9-0.5-1.8-0.9-2.3-0.9c-2.6-0.1-10.3-4-18.4-8.2
+						c-7.5-3.8-15.2-7.8-19-8.8c-1-0.3-1.7-0.2-2.2,0.1c-0.8,0.5-0.9,1.9-1.1,3.5c-0.3,2.3-0.6,5.3-3.1,7.1
+						c-0.1,0.1-0.3,0.1-0.5,0.1c-6.7-2.5-12-6-16.1-9.5c0.3,0.4,0.6,0.8,0.8,1.2c0.1,0.1,0.1,0.3,0.1,0.5c-0.1,0.2-0.2,0.3-0.3,0.3
+						c0,0-3.5,0.9-6.6,3c-4.1,2.8-5.7,6.5-4.8,10.8c0,0.2-0.1,0.4-0.2,0.5c-0.2,0.1-0.4,0.1-0.6-0.1c-10-9.2-21.1-15-31-20.2
+						c-16.9-8.9-30.3-15.9-25.3-34.2l0.5,0.1l-0.5-0.1c5.8-21.3,34.4-14.2,62.1-7.3c11.3,2.8,23,5.7,32.9,6.6
+						c5.6,0.5,9.8-3.9,13.9-8.1l0.2-0.2c1.2-1.3,3.7-1.8,7.3-1.6c14.6,0.9,46.6,14,57.1,27.8c0.1,0.2,0.1,0.4,0,0.6
+						c-11.4,18.9-17.8,25.1-30.9,35.6C250.3,366.3,248.2,367.1,246.2,367.1L246.2,367.1z M199.5,346.3c0.4,0,0.9,0.1,1.5,0.2
+						c4,1,11.7,5,19.2,8.8c7.7,3.9,15.6,8,18,8.1c0.7,0,1.6,0.4,2.7,1c2.9,1.4,6.8,3.3,10.8-1.1c0,0,0,0,0.1,0
+						c12.9-10.4,19.3-16.5,30.5-35.1c-10.4-13.3-42.2-26.3-56.2-27.1c-3.3-0.2-5.6,0.2-6.6,1.3l-0.2,0.2c-4,4.2-8.6,8.9-14.7,8.4
+						c-9.9-0.9-21.6-3.8-33-6.6c-27.2-6.8-55.4-13.8-60.9,6.6c-4.8,17.5,7.6,24.1,24.8,33.1c9.6,5,20.4,10.7,30.2,19.4
+						c-0.7-8.8,8.9-12.5,11.7-13.4c-1.1-1.5-2.1-3-3-4.5c-4.4-4.7-6.9-9.1-7.9-11.1c-1.5-3.1-6.8-11.6-21.1-17.9
+						c-5.2-2.2-11.6-4.2-19.6-5.8c-0.3-0.1-0.4-0.3-0.4-0.6c0.1-0.3,0.3-0.4,0.6-0.4c9.5,1.7,16.9,4.3,22.7,7.3
+						c12.7,6.3,17.9,14.5,24,24c0.8,1.3,1.6,2.6,2.5,3.9c4.2,4.5,10.3,9.2,18.8,12.4c1.9-1.6,2.2-4.1,2.5-6.3
+						c0.2-1.9,0.4-3.5,1.6-4.2C198.4,346.5,198.9,346.4,199.5,346.3L199.5,346.3z"/>
+				</g>
+				<path d="M126.2,309.9c29.4,5.3,38.5,19.8,40.7,24.3c3.6,7.3,7.1-8.5,13.3-12.3C155.9,312.3,134.8,311,126.2,309.9L126.2,309.9z"
+					/>
+				<path d="M111,310.8c-7.7,28.3,28,28.8,55.3,54c-1.1-5.2,1.6-8.8,4.7-11C137.5,334,110,334,111,310.8L111,310.8z"/>
+				<g>
+					<path class="st3" d="M169.7,371.3c-6.7-0.8-28.7-2.1-33.8-4.4c-5-2.4-8.9-8.4-5-11.8c3.8-3.4,7.4-7.6,12.7-8
+						c5.3-0.4,10.4,3.8,15.4,5c5,1.2,14.5,5.6,19.8,4.4c5.3-1.2,6.5,0,7.7,3.8C187.8,363.9,178.5,372.3,169.7,371.3L169.7,371.3z"/>
+					<path class="st14" d="M171.2,371.9c-0.5,0-1,0-1.5-0.1l0,0c-1.6-0.2-4.2-0.4-7.1-0.7c-9.7-0.8-22.9-2-26.8-3.8
+						c-3.6-1.7-6.4-5-6.8-8.1c-0.3-1.8,0.3-3.4,1.7-4.6c0.6-0.5,1.2-1.1,1.8-1.6c3.2-3,6.6-6.1,11.2-6.5c3.4-0.3,6.6,1.3,9.8,2.7
+						c2,0.9,3.9,1.8,5.8,2.3c1.5,0.3,3.3,1,5.3,1.6c4.7,1.6,10.7,3.6,14.3,2.7c5.6-1.3,7.1,0.2,8.3,4.1c0.4,1.3-0.2,3.1-1.8,5.1
+						C182.3,368.6,176.7,371.9,171.2,371.9L171.2,371.9z M169.8,370.8c5.6,0.7,11.7-2.7,14.7-6.4c1.3-1.6,1.9-3.2,1.6-4.1
+						c-1.1-3.5-1.9-4.6-7.1-3.4c-3.9,0.9-10-1.1-14.8-2.8c-1.9-0.6-3.8-1.3-5.2-1.6c-2-0.5-4-1.4-6-2.3c-3-1.4-6.1-2.9-9.3-2.6
+						c-4.3,0.3-7.4,3.2-10.6,6.2c-0.6,0.6-1.2,1.1-1.8,1.7c-1.1,1-1.6,2.2-1.3,3.7c0.4,2.7,3,5.8,6.3,7.3c3.7,1.8,17.4,2.9,26.4,3.7
+						C165.6,370.4,168.1,370.6,169.8,370.8L169.8,370.8L169.8,370.8z"/>
+				</g>
+				<g>
+					<path class="st16" d="M169.7,371.3c-6.7-0.8-28.7-2.1-33.8-4.4c-2.4-1.1-4.5-3.1-5.7-5.2c-1.3-2.3-1.4-4.8,0.7-6.6
+						c2.5,0.8,5.7,4.6,11,4.2c5.3-0.4,10,1.3,16.3-1c4.9-1.7,15.3-0.7,20.6-1.8c5.3-1.2,6.5,0,7.7,3.8
+						C187.8,363.9,178.5,372.3,169.7,371.3L169.7,371.3z"/>
+					<path class="st14" d="M171.2,371.9c-0.5,0-1,0-1.5-0.1l0,0c-1.6-0.2-4.2-0.4-7.1-0.7c-9.7-0.8-22.9-2-26.8-3.8
+						c-2.5-1.2-4.7-3.2-5.9-5.4c-1.5-2.8-1.3-5.4,0.8-7.2l0.2-0.2l0.3,0.1c0.8,0.3,1.7,0.8,2.6,1.4c2.1,1.3,4.7,3,8.2,2.7
+						c1.9-0.1,3.7,0,5.4,0.1c3.3,0.2,6.7,0.4,10.8-1.1c2.8-1,7.2-1.1,11.5-1.2c3.5-0.1,6.8-0.2,9.2-0.7c5.6-1.3,7.1,0.2,8.3,4.1
+						c0.4,1.3-0.2,3.1-1.8,5.1C182.3,368.6,176.7,371.9,171.2,371.9L171.2,371.9z M169.8,370.8c5.6,0.7,11.7-2.7,14.7-6.4
+						c1.3-1.6,1.9-3.2,1.6-4.1c-1.1-3.5-1.9-4.6-7.1-3.4c-2.4,0.5-5.8,0.6-9.4,0.7c-4.2,0.1-8.6,0.2-11.2,1.1
+						c-4.3,1.5-7.8,1.3-11.2,1.1c-1.8-0.1-3.5-0.2-5.3-0.1c-3.9,0.3-6.6-1.5-8.8-2.9c-0.8-0.5-1.5-1-2.1-1.2c-2,2-1.1,4.5-0.3,5.8
+						c1.1,2,3.2,3.9,5.5,5c3.7,1.8,17.4,2.9,26.4,3.7C165.6,370.4,168.1,370.6,169.8,370.8L169.8,370.8L169.8,370.8z"/>
+				</g>
+				<path class="st18" d="M158.3,358.2c4.1-18.1,6.8-48.7,17.8-56c23.1-15.3,57.8,13.9,79.7,13.9c15.4,0,23.7,6.5,27.2,12.1
+					c-5.8,9.2-14.8,23-29.2,34.5c-3.2,2.1-4.2,4.7-12.1,3.2c-16.8-3.1-47.5-18.8-54.4-32.3c5.6,9.1,10.7,10.4,14.7,14.8
+					c3.1,7.6-17.8,15.6-21.4,21.4C164.1,378.1,157.2,363,158.3,358.2L158.3,358.2z"/>
+				<path class="st19" d="M158.3,358.2c0.8-6.2,8.3,9.6,18.3,1c5.6-4.8,10.1-15.1,10.6-25.6c17.4,13.4,36.5,16.1,49.6,15.2
+					c19.9-1.4,59.1-32.5,21.3-33.7c0.7-1.3,1.1-2.5,2.1-3.8c7.5,3.2,17.5,8.4,23.7,15.8c-5.8,9.2-15.9,24.2-30.2,35.6
+					c-3.2,2.1-4.2,4.7-12.1,3.2c-16.8-3.1-47.5-18.8-54.4-32.3c5.6,9.1,10.7,10.4,14.7,14.8c3.1,7.6-17.8,15.6-21.4,21.4
+					C164.1,378.1,157.6,363.1,158.3,358.2L158.3,358.2z"/>
+				<path class="st20" d="M204.3,362.4c-1.8-4.3-8.4-0.8-11.2,1.1c-4.2,2.9-9.1,6.3-5.6,10c4.3,1.7,9-0.8,13.5-2.5
+					C204.3,369.7,205.1,366,204.3,362.4L204.3,362.4z"/>
+			</g>
+			<g>
+				<path class="st21" d="M246,280.1c0,5.1,0.3,8.2,2.7,9.2c2.2,0.9,3.7-4.1,3.7-9.2c0-5.1,0.4-9.2-2-9.2
+					C248,270.9,246,275,246,280.1L246,280.1z"/>
+				<g>
+					<g>
+						<path class="st22" d="M255.2,274.1c-5.6-3.3-7.9-3.2-13.9-5.2c-1.4-0.5-2.9-1.6-4.3-2c-2.7-0.7-1.9-1-4.5-2.3
+							c-0.8-0.4-2.7-0.3-4.3,0.2c-3.3-0.8-8.8-2-10.6-2.2c-3.9-0.3-8.5-0.2-9.6-0.1c-0.6,0.1-1.3,0.1-1.8,0.4
+							c-0.3,0.1-0.7,0.3-0.9,0.7c-0.1,0.2-0.1,0.4,0,0.6c0.4,0.8,1.2,1.2,1.9,1.4c4.8,1.4,7,0.9,9.3,1.5c1.6,0.4,5.1,1.4,7.3,2
+							c-1.7,2.8-3.2,6.1-2.5,6.8c1,0.9,1.8,1.9,2.7,2.9l-2.8,0.7c-0.3,0.2-1.9,1.2-2.2,1.4c-0.4,0.4-0.9,0.8-1,1.4
+							c-0.2,0.6,0.7,2.1,1.2,2.6c0.3,0.3,0.7,0.3,1.1,0.4c0.6,0,2.3-0.6,3.9-1.1c5.7-1.4,7.9-0.4,12.6-1.7c1.3-0.4,2.3-0.9,3.1-1.6
+							c0.9-0.7,2-0.9,3-0.6c2.8,0.8,5.7,1.9,8.8,3.1C253.7,284.2,256.3,274.7,255.2,274.1L255.2,274.1z"/>
+						<path class="st23" d="M220.1,285.6C220.1,285.6,220.1,285.6,220.1,285.6c-0.6,0-1-0.2-1.3-0.4c-0.6-0.5-1.6-2.1-1.3-2.9
+							c0.2-0.7,0.7-1.1,1.1-1.6c0.2-0.1,0.7-0.5,1.4-0.9c0.3-0.2,0.6-0.4,0.8-0.5l0.1-0.1l2.2-0.6c-0.2-0.2-0.4-0.5-0.7-0.7
+							c-0.5-0.6-1.1-1.2-1.7-1.7c-1-1,1.4-5.4,2.2-6.8c-1-0.3-2.3-0.6-3.5-1c-1.3-0.4-2.6-0.7-3.3-0.9c-0.8-0.2-1.7-0.3-2.7-0.4
+							c-1.6-0.1-3.6-0.3-6.5-1.1c-0.7-0.2-1.6-0.6-2.1-1.5c-0.2-0.3-0.2-0.7,0-1c0.2-0.4,0.5-0.6,1-0.9c0.6-0.2,1.2-0.3,1.9-0.4
+							c1.2-0.1,5.8-0.3,9.7,0.1c1.8,0.2,7.4,1.4,10.6,2.2c1.7-0.5,3.6-0.5,4.5-0.1c1.1,0.5,1.6,0.9,2,1.2c0.5,0.4,0.9,0.6,2.4,1.1
+							c0.8,0.2,1.6,0.7,2.4,1.1c0.7,0.4,1.3,0.7,1.9,0.9c1.8,0.6,3.4,1.1,4.7,1.4c3,0.9,5.4,1.5,9.3,3.8l0,0
+							c1.1,0.6-0.1,5.4-1.2,7.7c-1.1,2.3-2.1,2.5-2.7,2.2c-2.5-1-5.7-2.2-8.7-3.1c-0.9-0.3-1.9-0.1-2.7,0.5c-0.9,0.7-2,1.3-3.2,1.6
+							c-2.3,0.7-4.1,0.7-5.9,0.8c-1.9,0.1-3.8,0.2-6.7,0.9c-0.7,0.2-1.4,0.4-1.9,0.6C221.3,285.4,220.6,285.6,220.1,285.6
+							L220.1,285.6z M221.1,279.8c-0.1,0.1-0.4,0.3-0.7,0.5c-0.5,0.3-1.2,0.7-1.3,0.9c-0.5,0.4-0.8,0.8-0.9,1.2
+							c-0.1,0.4,0.6,1.8,1.1,2.2c0.2,0.2,0.5,0.3,0.9,0.3c0.3,0,1.1-0.2,1.9-0.5c0.6-0.2,1.3-0.4,2-0.6c2.9-0.7,4.9-0.8,6.8-0.9
+							c1.8-0.1,3.5-0.2,5.8-0.8c1.1-0.3,2.1-0.8,3-1.5c1-0.7,2.2-1,3.3-0.7c3,0.9,6.3,2.1,8.8,3.1c0.5,0.2,1-0.5,1.3-1
+							c1.6-2.4,2.5-7.3,2-7.7c-3.8-2.2-6.1-2.9-9.1-3.7c-1.3-0.4-2.9-0.8-4.7-1.4c-0.7-0.2-1.4-0.6-2-1c-0.7-0.4-1.5-0.8-2.3-1
+							c-1.7-0.4-2.1-0.7-2.7-1.2c-0.4-0.3-0.9-0.6-1.9-1.1c-0.6-0.3-2.3-0.3-4.1,0.2l-0.1,0l-0.1,0c-3.2-0.7-8.8-2-10.6-2.2
+							c-3.8-0.3-8.4-0.2-9.6-0.1c-0.6,0.1-1.2,0.1-1.7,0.3c-0.3,0.1-0.6,0.3-0.7,0.5c-0.1,0.1-0.1,0.2,0,0.3c0.3,0.6,0.8,1,1.7,1.2
+							c2.9,0.8,4.8,1,6.4,1.1c1,0.1,2,0.2,2.9,0.4c0.8,0.2,2,0.6,3.3,0.9c1.4,0.4,2.8,0.8,3.9,1.1l0.4,0.1l-0.2,0.4
+							c-2.1,3.5-2.9,6-2.6,6.4c0.6,0.6,1.1,1.2,1.7,1.7c0.4,0.4,0.7,0.8,1.1,1.1l0.4,0.4L221.1,279.8L221.1,279.8z"/>
+					</g>
+					<path class="st23" d="M225.5,266.8c-3.9,0.2-7-0.8-8.8-1c-3.9-0.3-10.6-1.4-11.8-2.4c-0.1,0.2-0.1,0.4,0,0.6
+						c0.4,0.8,1.2,1.2,1.9,1.4c4.8,1.4,7.3,1,9.9,1.7c1.7,0.4,3.2,1,5.4,1.6L225.5,266.8L225.5,266.8z"/>
+					<path class="st23" d="M255.2,274.1c-1.4-1.1-3.9-2.3-5.3-2.5c1.4,3.2,4.9,10.8-14.6,6.9c-8.3,2.3-16.2,7.2-17.5,3.9
+						c-0.2,0.6,0.7,2.1,1.2,2.6c0.3,0.3,0.7,0.3,1.1,0.4c0.6,0,2.3-0.6,3.9-1.1c5.7-1.4,7.9-0.4,12.6-1.7c1.3-0.4,2.3-0.9,3.1-1.6
+						c0.9-0.7,2-0.9,3-0.6c2.8,0.8,5.7,1.9,8.8,3.1C253.7,284.3,256.3,274.7,255.2,274.1L255.2,274.1z"/>
+					<path class="st23" d="M226.6,275.5c1.2,1.7,0.9,1.9,2.8,3c1.1-0.6,2.1-0.7,3.3-1.6c-1.3-1.3-0.2-1.8-2.4-3
+						C228.7,274.6,227.4,274.7,226.6,275.5L226.6,275.5z"/>
+					<g>
+						<path class="st22" d="M226,267c-4.2,1.6-6,4.6-7.9,7.5c-0.4,0.6-0.4,1.3-0.1,1.9c0.9,1.4,1.6,2.4,3,3.2c2.1,1.3,3.1,3,7.5,1.5
+							l-2-10.1"/>
+						<path class="st23" d="M225.5,282c-1.7,0-2.7-0.7-3.7-1.5c-0.3-0.2-0.7-0.5-1.1-0.7c-1.4-0.9-2.2-1.9-3.1-3.4
+							c-0.4-0.7-0.4-1.6,0.1-2.3l0.4-0.5c1.8-2.7,3.7-5.5,7.7-7.1c0.2-0.1,0.4,0,0.5,0.2c0.1,0.2,0,0.4-0.2,0.5
+							c-3.9,1.5-5.6,4.1-7.4,6.8l-0.4,0.5c-0.3,0.4-0.3,1-0.1,1.4c0.9,1.4,1.6,2.3,2.9,3.1c0.4,0.2,0.8,0.5,1.1,0.7
+							c1.4,1,2.6,1.9,5.7,0.8l-1.9-9.8c0-0.2,0.1-0.4,0.3-0.4c0.2,0,0.4,0.1,0.4,0.3l2,10.1c0,0.2-0.1,0.4-0.3,0.4
+							C227.3,281.9,226.3,282,225.5,282L225.5,282z"/>
+					</g>
+					<g>
+						<path class="st22" d="M226.5,269.1c-2,1.5-3.9,3.1-5.3,5.6c-0.4,0.6-0.3,1.4,0.1,2.1c1.3,2,2.4,3.2,3.6,3.9
+							c3.7,2.2,3.7,2.6,9.8-1c0.6-0.6,0.5-1.2-0.8-2c-1.5-1-3.6-0.7-4.9,0.4c0.2-1.4-1.3-1.4-1.9-2.4c1.7,0.1,2.5-0.8,4-1.4
+							c0.5,1.9,0.4,2.2,2,2.8c0.8,0.7,1.9,1.3,1.9,1.8"/>
+						<path class="st23" d="M228.7,282.6c-1.1,0-2-0.5-3.4-1.4l-0.6-0.4c-1.2-0.7-2.4-2-3.7-4c-0.5-0.7-0.5-1.7-0.1-2.4
+							c1.5-2.6,3.5-4.3,5.4-5.7c0.1-0.1,0.4-0.1,0.5,0.1c0.1,0.1,0.1,0.4-0.1,0.5c-1.9,1.4-3.8,3-5.2,5.5c-0.3,0.5-0.3,1.2,0.1,1.7
+							c1.2,1.9,2.3,3.1,3.4,3.8l0.6,0.4c3.1,1.9,3.3,2,8.8-1.3c0.2-0.2,0.2-0.4,0.2-0.4c0,0,0,0,0-0.1c0,0,0,0,0-0.1
+							c0-0.1-0.1-0.2-0.2-0.3c-0.2-0.2-0.5-0.4-0.7-0.6c-0.1-0.1-0.2-0.1-0.3-0.2c-1.4-0.7-3.2-0.3-4.2,0.5c-0.1,0.1-0.3,0.1-0.4,0
+							c-0.1-0.1-0.2-0.2-0.2-0.3c0.1-0.6-0.2-0.8-0.8-1.2c-0.4-0.2-0.8-0.5-1.1-1c-0.1-0.1-0.1-0.2,0-0.3c0.1-0.1,0.2-0.2,0.3-0.2
+							c1.1,0,1.8-0.3,2.7-0.8c0.4-0.2,0.7-0.4,1.2-0.6c0.1,0,0.2,0,0.3,0c0.1,0,0.2,0.1,0.2,0.2c0.1,0.3,0.1,0.5,0.2,0.8
+							c0.3,1.2,0.4,1.4,1.6,1.8c0,0,0.1,0,0.1,0.1c0.2,0.1,0.3,0.3,0.5,0.4c0.1,0.1,0.2,0.1,0.3,0.2c0.4,0.3,0.7,0.5,0.9,0.7
+							c0.2,0.2,0.4,0.4,0.4,0.7c0,0.1,0,0.1,0,0.2c0,0.3-0.1,0.7-0.4,1c0,0,0,0-0.1,0C231.6,281.8,230,282.6,228.7,282.6
+							L228.7,282.6z M227.8,275.9c0.1,0.1,0.3,0.2,0.4,0.3c0.4,0.3,0.9,0.6,1.1,1.2c0.7-0.4,1.6-0.7,2.4-0.7
+							c-0.4-0.4-0.5-0.8-0.7-1.6c0-0.1-0.1-0.2-0.1-0.4c-0.3,0.1-0.5,0.3-0.8,0.4C229.4,275.4,228.7,275.8,227.8,275.9L227.8,275.9z
+							"/>
+					</g>
+				</g>
+				<g>
+					<path class="st3" d="M286.3,234.9c3.8,10.5,2.6,19.6-3.8,43.6c-0.8,2.8-30.1-7.5-32.1-7.5c4.7,2.7,1.1,17.2-1.2,18.5
+						c21.4,5.5,31.5,18.8,40.6,16.8c9.4-2,33.2-64,14.6-90.8"/>
+					<path class="st14" d="M287.9,306.9c-4.2,0-8.7-2.7-14.2-5.9c-6.3-3.7-14.1-8.3-24.6-11.1c-0.2-0.1-0.3-0.2-0.4-0.4
+						c0-0.2,0.1-0.4,0.3-0.5c1.2-0.7,3.2-6.6,3.2-11.7c0-3.1-0.7-5.2-2-5.9c-0.2-0.1-0.3-0.3-0.2-0.6c0.1-0.2,0.3-0.4,0.5-0.4
+						c0.7,0,3.3,0.8,8.2,2.3c6.7,2,22.2,6.8,23.5,5.6c6.3-23.7,7.7-32.8,3.8-43.2c-0.1-0.3,0-0.5,0.3-0.6c0.3-0.1,0.5,0,0.6,0.3
+						c3.9,10.7,2.6,19.9-3.8,43.9c0,0.2-0.2,0.4-0.5,0.6c-2,1.1-12.2-1.8-24.2-5.5c-2.4-0.7-4.8-1.5-6.3-1.9
+						c0.8,1.2,1.2,3.1,1.2,5.5c0,4.3-1.5,9.8-3,11.8c10.3,2.8,17.9,7.3,24.1,11c6.4,3.8,11.1,6.6,15.5,5.6c3-0.7,7.9-8.3,12.1-19.1
+						c9.2-23.5,13.5-54.5,2.2-70.9c-0.2-0.2-0.1-0.5,0.1-0.7c0.2-0.2,0.5-0.1,0.7,0.1c11.6,16.7,7.3,48.1-2.1,71.8
+						c-4.5,11.4-9.4,19-12.8,19.7C289.3,306.8,288.6,306.9,287.9,306.9L287.9,306.9z"/>
+				</g>
+				<path class="st8" d="M252.4,280.1c0,2.8-2.2,8.7-3,9c-0.7,0.3-0.6,0.4,0.1,0.6c21.4,5.5,32.1,18.8,41.1,16.4
+					c9.5-2.5,35.9-66.3,11.7-94c8.7,13.5,6.2,15.7,6.8,24c1,14.8-2.2,36-16.3,53.1C284.4,299.4,266.9,285.9,252.4,280.1L252.4,280.1
+					z"/>
+			</g>
+			<g>
+				<g>
+					<path d="M171.1,219.4l11.1,60.9c0.1,0.3,0.3,0.6,0.6,0.8l28.6,10.6c0.9,0.5,2-0.3,1.8-1.3l-9.9-68.4c-0.2-1.1-1.1-1.8-2.1-1.9
+						l-29.4-1.5C171.3,218.5,171,218.9,171.1,219.4L171.1,219.4z"/>
+					<path class="st3" d="M171.1,219.4l11.1,60.9c0.1,0.3,0.3,0.6,0.6,0.8l26.3,9.1c0.9,0.5,2.5,2.3,1.8-0.8L201,222
+						c-0.2-1.1-1.1-1.8-2.1-1.9l-27.1-1.5C171.3,218.5,171,218.9,171.1,219.4L171.1,219.4z"/>
+					<path class="st14" d="M176.7,250.3l5.4,29.9c0.1,0.3,0.3,0.6,0.6,0.8l26.3,9.1c0.9,0.5,2.5,2.3,1.8-0.8l-1.5-10.1L176.7,250.3
+						L176.7,250.3z"/>
+					<path class="st20" d="M210.7,291.5c-0.4,0-0.8-0.3-1.3-0.7c-0.2-0.1-0.4-0.3-0.5-0.4l-26.2-9c-0.4-0.2-0.7-0.6-0.8-1.1
+						l-11.1-60.9c-0.1-0.3,0-0.6,0.2-0.9c0.2-0.2,0.5-0.4,0.8-0.3l27.1,1.5c1.2,0.1,2.2,1,2.4,2.2l9.9,67.4c0.3,1.2,0.2,1.8-0.2,2
+						C210.9,291.4,210.8,291.5,210.7,291.5L210.7,291.5z M171.8,218.9c-0.1,0-0.2,0-0.3,0.1c-0.1,0.1-0.1,0.2-0.1,0.3l11.1,60.9
+						c0,0.2,0.2,0.5,0.4,0.6l26.2,9c0.2,0.1,0.5,0.3,0.7,0.4c0.3,0.2,0.7,0.5,0.9,0.5l0,0c0,0,0.1-0.3-0.1-1.3l-9.9-67.4
+						c-0.2-0.9-0.9-1.6-1.8-1.6L171.8,218.9C171.8,218.9,171.8,218.9,171.8,218.9L171.8,218.9z"/>
+				</g>
+				<g>
+					<g>
+						<path class="st22" d="M178.7,262.4c1.9-0.4,3.9-1.2,4.9-0.1c1.4,1.6-0.7,2.1-2,2.9c-1.8,0.4-2.8,1.3-3.7,1
+							c-1-0.3-1.6-0.5-2-1.6c-0.4-1.1,0.7-2.9,1.1-3.5C177.9,261.8,178.7,262.4,178.7,262.4L178.7,262.4z"/>
+						<path class="st23" d="M178.2,266.4c-0.1,0-0.3,0-0.4-0.1c-1-0.3-1.7-0.5-2.1-1.7c-0.4-1,0.4-2.6,1.1-3.7l0.1-0.2l0.2,0.2
+							c0.7,0.7,1.4,1.2,1.6,1.3c0.3-0.1,0.6-0.1,0.8-0.2c1.7-0.4,3.3-0.8,4.2,0.2c0.4,0.5,0.6,0.9,0.5,1.3c-0.1,0.7-0.9,1.1-1.8,1.5
+							c-0.3,0.1-0.5,0.3-0.8,0.4l-0.1,0c-0.7,0.2-1.3,0.4-1.8,0.6C179.2,266.2,178.7,266.4,178.2,266.4L178.2,266.4z M177,261.3
+							c-0.8,1.4-1.2,2.5-1,3.1c0.3,1,0.9,1.2,1.8,1.5c0.5,0.1,1-0.1,1.7-0.4c0.5-0.2,1.1-0.5,1.9-0.6c0.2-0.1,0.5-0.3,0.8-0.4
+							c0.7-0.3,1.5-0.7,1.6-1.2c0-0.3-0.1-0.6-0.4-0.9c-0.7-0.8-2.2-0.4-3.7,0c-0.3,0.1-0.6,0.2-0.9,0.2l-0.1,0l-0.1-0.1
+							C178.6,262.6,177.9,262.1,177,261.3L177,261.3z"/>
+					</g>
+					<g>
+						<path class="st22" d="M179.5,258.3c3,0.1,4.5,0.1,4.9,1.6c0.7,2.3-2.6,2.2-5.1,2.6c-2.7-0.2-3,0.4-4-0.2
+							c-1.1-0.7-1.8-1.1-1.4-2.5c0.4-1.4,3.3-3.1,4.4-3.7C178.8,257.4,179.5,258.3,179.5,258.3L179.5,258.3z"/>
+						<path class="st23" d="M176.4,262.9c-0.4,0-0.7-0.1-1.2-0.4c-1.1-0.6-2-1.2-1.6-2.8c0.3-1.1,1.8-2.3,4.5-3.9l0.3-0.2l0.1,0.3
+							c0.4,1,0.9,1.7,1.1,2l0.3,0c2.7,0.1,4.2,0.2,4.7,1.8c0.2,0.6,0.1,1.1-0.1,1.5c-0.6,0.9-2.1,1.1-3.8,1.3
+							c-0.5,0.1-1,0.1-1.4,0.2h0h0c-1.1-0.1-1.8,0-2.3,0C176.8,262.9,176.6,262.9,176.4,262.9L176.4,262.9z M178.1,256.5
+							c-2.3,1.3-3.7,2.5-4,3.3c-0.3,1.1,0.2,1.5,1.3,2.2c0.5,0.3,0.8,0.3,1.5,0.2c0.5,0,1.2-0.1,2.4,0c0.5-0.1,0.9-0.1,1.4-0.2
+							c1.4-0.2,2.9-0.4,3.3-1c0.2-0.2,0.2-0.6,0-1c-0.4-1.2-1.4-1.3-4.2-1.4l-0.6,0l-0.1-0.1C179.2,258.5,178.6,257.7,178.1,256.5
+							L178.1,256.5z"/>
+					</g>
+					<g>
+						<path class="st22" d="M177.1,254.5c2.9,0.4,6.2,0.4,6.7,2.1c0.7,2.5-2.5,2.1-5,2.4c-2.7-0.4-4.8,0.3-5.8-0.5
+							c-1.1-0.8-1.8-1.3-1.4-2.8c0.3-1.5,3.2-3,4.3-3.6C176.4,253.5,177.1,254.5,177.1,254.5L177.1,254.5z"/>
+						<path class="st23" d="M178.8,259.3L178.8,259.3c-1.1-0.2-2.1-0.1-3-0.1c-1.3,0-2.3,0-3-0.5c-1-0.8-1.9-1.4-1.5-3.1
+							c0.3-1.4,2.6-2.8,4.5-3.8l0.3-0.2l0.1,0.3c0.4,1.1,0.9,2,1.1,2.2c0.4,0.1,0.8,0.1,1.3,0.2c2.6,0.3,5.1,0.6,5.5,2.2
+							c0.2,0.7,0.1,1.2-0.2,1.6c-0.6,0.9-2.1,1-3.7,1.1C179.7,259.2,179.2,259.2,178.8,259.3L178.8,259.3L178.8,259.3z M176.7,258.6
+							c0.6,0,1.3,0,2.1,0.1c0.4-0.1,0.9-0.1,1.4-0.1c1.4-0.1,2.7-0.2,3.2-0.8c0.2-0.3,0.2-0.6,0.1-1.1c-0.3-1.2-2.7-1.4-5-1.7
+							c-0.5-0.1-1-0.1-1.4-0.2l-0.1,0l-0.1-0.1c0,0-0.6-0.9-1.1-2.2c-2.3,1.2-3.6,2.4-3.8,3.3c-0.3,1.3,0.3,1.7,1.3,2.5
+							c0.5,0.4,1.4,0.4,2.6,0.3C176,258.6,176.3,258.6,176.7,258.6L176.7,258.6z"/>
+					</g>
+					<g>
+						<path class="st22" d="M176.4,250.9c2.6,0.2,4.9,1.3,5.3,2.3c1.2,2.7-2.2,1.9-4.3,1.7c-2.2-0.9-4-0.6-4.8-1.7
+							c-0.8-1.1-1-0.8-0.6-2.3c0.4-1.5,2.6-1.9,3.5-2.3C176,250.3,176.4,250.9,176.4,250.9z"/>
+						<path class="st23" d="M180.3,255.4c-0.6,0-1.2-0.1-1.9-0.1c-0.3,0-0.6-0.1-0.9-0.1l-0.1,0c-0.9-0.4-1.7-0.5-2.5-0.7
+							c-1-0.2-1.9-0.4-2.5-1.1c-0.2-0.2-0.3-0.4-0.4-0.5c-0.6-0.6-0.6-0.8-0.3-2.1c0.3-1.4,1.9-1.9,3-2.2c0.3-0.1,0.5-0.2,0.7-0.3
+							l0.3-0.1l0.1,0.3c0.3,1.2,0.6,1.8,0.7,2.1c2.5,0.3,4.9,1.3,5.4,2.5c0.3,0.8,0.4,1.4,0.1,1.8
+							C181.7,255.3,181.1,255.5,180.3,255.4L180.3,255.4z M177.5,254.6c0.3,0,0.6,0.1,0.9,0.1c1.2,0.1,2.8,0.3,3.1-0.2
+							c0.2-0.3,0-0.8-0.1-1.2c-0.4-0.8-2.5-1.9-5.1-2.1l-0.1,0l-0.1-0.1c0,0-0.4-0.6-0.7-2.1c-0.1,0.1-0.3,0.1-0.5,0.2
+							c-1,0.3-2.3,0.8-2.6,1.8c-0.2,0.7-0.1,1.2,0.1,1.6c0.1,0.1,0.3,0.3,0.4,0.5c0.4,0.5,1.1,0.7,2.1,0.9
+							C175.8,254,176.6,254.2,177.5,254.6L177.5,254.6z"/>
+					</g>
+				</g>
+			</g>
+			<g>
+				<path class="st24" d="M227.6,160.9c4.8,5.5,28.6-18.2,14.4-16.8c-14.3,1.5-20.1,9.3-21.4,17.8c-1.3,8.5-2.5,16.5,3.2,29.7
+					c4.7,10.8,4,24.3,1.4,28.2c22.3,1.9,25.9-11.8,25.9-11.8L227.6,160.9z"/>
+				<path d="M228.3,159.8c-6.9,13-2.5,23.5,0,30.6c3.9,11.1,5.2,20.6,2.1,28.1c18,0.7,20.7-10.6,20.7-10.6S226.8,171.3,228.3,159.8z
+					"/>
+				<g>
+					<path class="st22" d="M229.4,156.7c0.9-1.4,2-2.5,3.2-3.6c1.9-1.7,4-3.3,6.6-3.4c5.8-0.2,11.3-0.2,16.5,2.5
+						c5.5,2.9,10.8,6.3,15.1,10.8c2.3,2.5,4.4,5.3,5.2,8.6c0.7,2.9-0.6,6.4-0.6,9.5c0,13.5,1.6,19.5,8.9,23.5
+						c-2.5,4.6-8.8,11.3-13.5,13.5c-10.3,4.8-18.6,4.9-15.2-1.5c1.9-3.7,0.1-8.1,0.2-10.5c-1.9,2-5.4,3.7-7.4,3.5
+						c-2.1-0.1-4.8-0.8-5.3-2.8c-0.8-3.8-3.3-4.4-5.5-9.3c-0.3-0.7-1.4-2.3-2.6-2.3c-0.3-0.1-0.9-0.4-1.2-0.6
+						c-1.9-1.4-0.6-3.4-0.6-3.5c-1.9-5.4-1.1-4.4-1.9-6.5c-0.3-0.9-0.5-1-0.9-1.6C227.1,178.6,228.5,158,229.4,156.7L229.4,156.7z"
+						/>
+					<path class="st23" d="M258.7,222c-1.6,0-2.8-0.3-3.5-1.1c-0.6-0.7-1.1-2,0.1-4.4c1.3-2.5,0.8-5.4,0.4-7.7
+						c-0.1-0.7-0.2-1.3-0.3-1.9c-2,1.8-5.2,3.2-7.2,3.1c-1.2-0.1-5-0.5-5.6-3.1c-0.4-1.9-1.3-3-2.3-4.3c-1-1.2-2.1-2.6-3.1-5
+						c-0.3-0.6-1.3-2.1-2.3-2.1h-0.1c-0.4-0.1-1-0.4-1.3-0.6c-1.7-1.3-1-3.1-0.8-3.7c0,0,0-0.1,0-0.1c-1.1-3.1-1.3-4.1-1.4-4.8
+						c-0.1-0.5-0.2-0.8-0.5-1.6c-0.2-0.6-0.4-0.8-0.6-1.1c-0.1-0.1-0.2-0.2-0.3-0.4c-3.4-4.8-1.8-25.5-1-26.8
+						c0.9-1.4,2.2-2.7,3.3-3.6c1.8-1.6,4.1-3.3,6.8-3.5c5.7-0.2,11.3-0.2,16.6,2.6c6.6,3.5,11.4,6.9,15.2,10.9
+						c2.8,3,4.6,5.8,5.3,8.8c0.5,1.9,0.1,3.9-0.2,5.9c-0.2,1.3-0.4,2.5-0.4,3.6c0,12.8,1.3,19.2,8.8,23.2l0.3,0.2l-0.2,0.3
+						c-2.5,4.6-8.8,11.4-13.6,13.7C266.1,220.8,261.7,222,258.7,222L258.7,222z M256.1,205.3l0,0.9c0,0.7,0.1,1.5,0.3,2.5
+						c0.4,2.4,0.9,5.4-0.5,8.1c-0.9,1.7-1,2.9-0.3,3.6c1.7,1.8,7.9,0.7,15.1-2.6c4.6-2.1,10.6-8.6,13.1-13.1
+						c-7.5-4.2-8.8-10.7-8.8-23.6c0-1.2,0.2-2.5,0.4-3.7c0.3-1.9,0.6-3.9,0.2-5.6c-0.7-2.8-2.4-5.6-5.1-8.5
+						c-3.7-3.9-8.5-7.3-15-10.7c-5.2-2.7-10.7-2.7-16.3-2.5c-2.4,0.1-4.6,1.7-6.3,3.3c-1.1,1-2.3,2.1-3.2,3.5l0,0
+						c-0.8,1.2-2.2,21.6,0.9,26.1c0.1,0.1,0.2,0.2,0.3,0.3c0.3,0.3,0.4,0.6,0.7,1.3c0.4,0.9,0.4,1.3,0.5,1.8
+						c0.1,0.7,0.3,1.6,1.4,4.8c0.1,0.1,0,0.3-0.1,0.5c-0.2,0.6-0.8,1.9,0.6,2.9c0.2,0.2,0.8,0.4,1.1,0.5c1.4,0.1,2.6,1.9,2.8,2.5
+						c1,2.3,2.1,3.6,3,4.8c1.1,1.4,2,2.5,2.5,4.6c0.5,2.1,3.9,2.5,5,2.6c1.9,0.1,5.4-1.5,7.2-3.4L256.1,205.3L256.1,205.3z"/>
+				</g>
+				<path class="st23" d="M265.5,189c0.2-1.5,0.8-2.1-1-6.7c-3.6-9.1,3.2-22.3,6.2-19.1c2.3,2.5,4.4,5.3,5.2,8.6
+					c0.7,2.9-0.6,6.4-0.6,9.5c0,13.5,2.4,18.5,9.1,23.3c-2.5,4.6-11.9,15.9-22.8,16.8c15.3-8.9,7.7-17.5,7.4-24.7
+					C268.9,192.6,267.1,190.3,265.5,189L265.5,189z"/>
+				<path d="M241.5,182.2c-0.9,0-1.5-0.2-1.8-0.5c-0.2-0.2-0.2-0.5,0-0.7c0.2-0.2,0.5-0.2,0.7,0c0.3,0.3,2.9,0.7,6.8-1.7
+					c0.2-0.1,0.5-0.1,0.7,0.2c0.1,0.2,0.1,0.5-0.2,0.7C245.2,181.6,243,182.2,241.5,182.2L241.5,182.2z"/>
+				<g>
+					<path class="st3" d="M233.8,182.7c-0.9,0.4-1.9,0.5-2.9,0.2"/>
+					<path d="M232,183.6c-0.4,0-0.8-0.1-1.2-0.2c-0.3-0.1-0.4-0.3-0.4-0.6c0.1-0.3,0.3-0.4,0.6-0.4c0.9,0.2,1.8,0.1,2.6-0.2
+						c0.2-0.1,0.5,0,0.6,0.3s0,0.5-0.3,0.6C233.3,183.4,232.6,183.5,232,183.6L232,183.6z"/>
+				</g>
+				<path class="st23" d="M235.7,196.2c-0.7,0-1.4-0.2-1.9-0.6l-0.1-0.1c-0.6-0.5-1.5-1.2-1.4-2.2c0-0.3,0.2-1,0.6-2.4
+					c0.6-2.2,1.7-5.9,1.5-7.2c-0.2-1.7-1.3-4-3.7-4.6c-0.3-0.1-0.4-0.3-0.3-0.6c0.1-0.3,0.3-0.4,0.6-0.3c2.8,0.7,4.1,3.4,4.4,5.4
+					c0.2,1.5-0.8,5-1.6,7.6c-0.3,0.9-0.6,2-0.6,2.2c0,0.5,0.6,1,1.1,1.4l0.1,0.1c0.8,0.6,2.7,0.3,4.2-0.3c0.2-0.1,0.5,0,0.6,0.3
+					c0.1,0.2,0,0.5-0.3,0.6C238.1,195.8,236.8,196.2,235.7,196.2L235.7,196.2z"/>
+				<path class="st23" d="M249.8,209.9c-0.2,0-0.3-0.1-0.3-0.3c0-0.2,0.1-0.4,0.3-0.4c5-1,12.7-10.1,14.2-14.6
+					c0.6-1.7,1.7-6.4,1.4-9.2c0-0.2,0.1-0.3,0.3-0.4c0.2,0,0.3,0.1,0.4,0.3c0.3,3-0.8,7.8-1.4,9.5
+					C263,199.7,255.1,208.9,249.8,209.9C249.9,209.9,249.8,209.9,249.8,209.9L249.8,209.9z"/>
+				<path class="st25" d="M243.2,173.6c-2.1,0.6-4.2,1.3-6.2,2.2c-0.6,0.3-1.4,0.9-1.2,1.5c0.2,0.6,1.1,0.6,1.7,0.4
+					c2.4-0.8,4.6-2.4,7.2-2.8c2.1-0.4,4.3,0.1,6.3,0.7C251.1,175.6,246.5,172.7,243.2,173.6L243.2,173.6z"/>
+				<path class="st25" d="M227.8,177.9c0.3-0.4,0.8-0.4,1.3-0.4h0.5c0.1,0,0.4,0.2,0.5,0.2l0,0c0.4,0.1,1.7,1,1.5,1.4
+					c-0.2,0.3-1.7,0.1-2.1,0.2c-0.4,0.1-0.9,0.1-1.3-0.2C227.7,178.8,227.5,178.3,227.8,177.9L227.8,177.9z"/>
+				<path d="M244.8,181.4c0,0,0.4,1.9-1.2,1.9c-1.6,0-1.4-1.7-1.4-1.7"/>
+				<path d="M233.4,183.1c0,0,0.3,1.7-1,1.9c0-0.1,0-0.1-0.1-0.2c-0.2-0.5-0.5-1.1-0.8-1.6L233.4,183.1L233.4,183.1z"/>
+				<g>
+					<path class="st5" d="M238.3,198.8c-0.2,0-0.4,0.3-0.2,0.5c0.2,0.2,0.5,0.5,0.6,0.9c0.5,1.2,2.2,2.6,4,2.2
+						c1.9-0.4,3.2-1.3,4.4-3c1.2-1.8,2.5-3.7,2.5-3.7S243.1,198.9,238.3,198.8L238.3,198.8z"/>
+					<path class="st11" d="M249.8,195.5c0,0-0.6,0.5-1.1,0.9c-0.2,0.2-2,1.4-2.3,1.6c-1.1,0.7-3.3,1.4-5.7,1.6
+						c-2.9,0.3-2.7-0.8-2.7-0.8s0.3-1.1,0.8-1.4c0.5-0.3,0.5,0.4,1.2,0.4c0.7,0,0.9-1.3,1.9-1.3
+						C242.7,196.5,246.6,196.8,249.8,195.5L249.8,195.5z"/>
+				</g>
+				<path class="st24" d="M286.4,172.4c-0.9-24.1-31.3-41-43.6-33.9c-2.6,1.5-4.7,3-6.5,4.4c-0.9,0.4-1.6,0.9-2.1,1.3
+					c-1.3,1.1-2.2,2.7-3.2,4.1c-0.1,0.2-0.7,0.9-0.8,1.1c-4,4.5-4.3,11.5-1.7,14.4c5.6,5.1,19.6,12,30.2,11.1
+					c0.2,0.4,0.5,0.9,0.8,1.2c0.6,0.6,1.5,0.9,2.2,0.5c0-0.8,0.1-1.6,0.2-2.3c0.8-0.2,1.6-0.5,2.4-0.9c3.2,7.9,9.7,29.2,4.2,39
+					C280.5,201.2,287,187.7,286.4,172.4L286.4,172.4z"/>
+				<path d="M286.4,172.4c-0.6-16-14.1-28.8-26.8-33.6c21.4,17.1,2,28.5,6.1,46.6c6.2,3.4,12.4,13.5,7,23.2
+					C283,197.5,287,187.7,286.4,172.4L286.4,172.4z"/>
+				<g>
+					<path class="st22" d="M261.9,179.9c-0.2-1.4-0.2-4.5,0.1-5.9c0.3-1.4,1-2.8,2.2-3.3c0.6-0.3,1.4-0.3,2.1-0.2
+						c0.8,0.1,1.7,0.3,2.4,1c1.2,1.1,1.4,3,1.3,4.7c0,1.9-0.2,3.8-0.5,5.6c-0.3,1.9-1.1,2.6-2.7,3.2c-0.9,0.3-2,0.1-2.8-0.5"/>
+					<path class="st23" d="M265.9,185.6c-0.7,0-1.4-0.2-2.1-0.7l0.4-0.5c0.8,0.6,1.8,0.7,2.5,0.5c1.5-0.5,2.2-1.1,2.5-2.9
+						c0.3-1.8,0.5-3.7,0.5-5.6c0-1.4-0.1-3.4-1.2-4.5c-0.5-0.5-1.2-0.8-2.2-0.9c-0.8-0.1-1.4,0-1.9,0.2c-1,0.4-1.8,1.6-2,3.1
+						c-0.3,1.4-0.3,4.4-0.1,5.8l-0.6,0.1c-0.2-1.5-0.2-4.5,0.1-6c0.3-1.7,1.2-3,2.4-3.5c0.8-0.3,1.7-0.3,2.2-0.2
+						c1.1,0.1,1.9,0.5,2.5,1.1c1.3,1.2,1.5,3.4,1.4,5c0,1.9-0.2,3.8-0.5,5.7c-0.4,2.2-1.3,2.9-2.9,3.4
+						C266.6,185.5,266.2,185.6,265.9,185.6L265.9,185.6z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/clients/ui/frontend/src/shared/images/empty-state-projects-color.svg b/clients/ui/frontend/src/shared/images/empty-state-projects-color.svg
new file mode 100644
index 000000000..04f424469
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-projects-color.svg
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="uuid-d9739ff7-c23f-4626-aa36-2aee60a8a260" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1080 1080">
+  <defs>
+    <style>
+      .uuid-dc2a4e5e-ada0-4ea9-9375-c58d28983f1f {
+        clip-path: url(#uuid-4413ce6d-9e92-4c2a-b4da-8b4ab06efd01);
+      }
+
+      .uuid-16da1986-f55d-4a03-affb-bae81badf18b {
+        clip-path: url(#uuid-ec273687-bfa6-4652-b83c-f86b42ebb90f);
+      }
+
+      .uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221 {
+        fill: none;
+      }
+
+      .uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221, .uuid-61390fc4-79be-43a3-8814-cf2449c9f989, .uuid-18fa4fe2-d7a9-44e1-8aff-0ce2bc50b66d, .uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2, .uuid-8d511b34-cb1c-4bc4-88d6-991463184736, .uuid-316d1419-7950-4df8-bef8-c900f5a0b66a, .uuid-36fbeed9-c18d-4258-a91a-5aaeb4a6ad59, .uuid-4a9b977d-1216-4ca7-a2bc-498eb355fcfa, .uuid-558c6bb1-e044-4f93-8391-4d6d34535af4, .uuid-43d45d96-41be-4b6d-9df3-573463ba6685, .uuid-2801e42a-7060-4486-88aa-d94681ee2ed0, .uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d, .uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39, .uuid-a70371d8-a3f4-4dbe-ad0d-0c4bdf15f082, .uuid-db2e6ea7-8c0c-4c2f-ba7b-a69a0dbb6e4d, .uuid-253635c7-d671-49a3-943d-dcae1e3ea900, .uuid-9002faa4-2900-438b-8492-e5c1fd008780, .uuid-c83e48d4-6996-457b-9cb4-115cb8c93406 {
+        stroke-width: 0px;
+      }
+
+      .uuid-67b9f1ca-8a34-43aa-b2b0-7b41952c6713 {
+        clip-path: url(#uuid-7fa89c88-6495-46e7-a9b2-d82f11a698fa);
+      }
+
+      .uuid-39cf7afe-70b0-4066-801e-6b6e873eb4e1 {
+        clip-path: url(#uuid-f61af702-7373-457e-a6c7-119d4fdbac1f);
+      }
+
+      .uuid-db01da53-9c0b-47b1-a92a-578658f7497f {
+        mask: url(#uuid-51c97860-03fc-4705-8fea-bb758a104e4c);
+      }
+
+      .uuid-64f3b32f-84fa-4dfe-86c0-894bf5bbbe7d {
+        clip-path: url(#uuid-f2cbe323-fc57-4ac1-a21e-97da56c0cfa5);
+      }
+
+      .uuid-18fa4fe2-d7a9-44e1-8aff-0ce2bc50b66d {
+        fill: #f5921b;
+      }
+
+      .uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2 {
+        fill: #f7c8bb;
+      }
+
+      .uuid-8d511b34-cb1c-4bc4-88d6-991463184736 {
+        fill: #292929;
+      }
+
+      .uuid-316d1419-7950-4df8-bef8-c900f5a0b66a {
+        fill: #707070;
+      }
+
+      .uuid-36fbeed9-c18d-4258-a91a-5aaeb4a6ad59 {
+        fill: #e0f0ff;
+      }
+
+      .uuid-4a9b977d-1216-4ca7-a2bc-498eb355fcfa {
+        fill: #be00f3;
+      }
+
+      .uuid-558c6bb1-e044-4f93-8391-4d6d34535af4 {
+        fill: #a60000;
+      }
+
+      .uuid-43d45d96-41be-4b6d-9df3-573463ba6685 {
+        fill: #92c5f9;
+      }
+
+      .uuid-2801e42a-7060-4486-88aa-d94681ee2ed0 {
+        fill: #009c6d;
+      }
+
+      .uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d {
+        fill: #fff;
+      }
+
+      .uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39 {
+        fill: #e00;
+      }
+
+      .uuid-a70371d8-a3f4-4dbe-ad0d-0c4bdf15f082 {
+        fill: #ffe8cc;
+      }
+
+      .uuid-db2e6ea7-8c0c-4c2f-ba7b-a69a0dbb6e4d {
+        fill: #fccb8f;
+      }
+
+      .uuid-253635c7-d671-49a3-943d-dcae1e3ea900 {
+        fill: #e8a997;
+      }
+
+      .uuid-9002faa4-2900-438b-8492-e5c1fd008780 {
+        fill: #036;
+      }
+
+      .uuid-c83e48d4-6996-457b-9cb4-115cb8c93406 {
+        fill: #06c;
+      }
+
+      .uuid-57009325-15fc-45f9-945c-a0892a27bce5 {
+        mask: url(#uuid-b51a5625-00cb-42a2-abed-2302d2fe12dd);
+      }
+    </style>
+    <mask id="uuid-b51a5625-00cb-42a2-abed-2302d2fe12dd" data-name="mask" x="106.02" y="142.02" width="428.23" height="326.41" maskUnits="userSpaceOnUse">
+      <g>
+        <g>
+          <rect class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" x="106.6" y="142.6" width="427.07" height="325.25"/>
+          <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m533.1,143.17v324.1H107.18V143.17h425.92m1.15-1.15H106.02v326.41h428.23V142.02h0Z"/>
+        </g>
+        <rect class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" x="145.87" y="150.58" width="386.1" height="276.41"/>
+      </g>
+    </mask>
+    <clipPath id="uuid-f61af702-7373-457e-a6c7-119d4fdbac1f">
+      <path id="uuid-0b851b4d-254e-4fcb-9677-f2b51d8e0b31" data-name="SVGID" class="uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221" d="m590.51,764.45s-31.55,26.63-81.51,10.1-50.33-62.35-50.33-62.35c0,0-51.09-1.88-74.47-44.2-20.48-37.06-.28-81.63-.28-81.63,0,0-27.8-6.46-42.45-36.83-14.65-30.37-1.13-58.58-1.13-58.58,0,0-32.46-30.19-19.6-68.76,12.86-38.57,44.01-45.43,44.01-45.43,0,0,1.82-41.76,35.69-74.18,31.18-29.85,81.89-23.11,81.89-23.11,0,0,6.01-43.57,47.33-50.4,41.32-6.83,60.85,21.85,60.85,21.85v513.52Z"/>
+    </clipPath>
+    <mask id="uuid-51c97860-03fc-4705-8fea-bb758a104e4c" data-name="mask-1" x="106.02" y="142.02" width="428.23" height="326.41" maskUnits="userSpaceOnUse">
+      <g>
+        <g>
+          <rect class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" x="106.6" y="142.6" width="427.07" height="325.25"/>
+          <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m533.1,143.17v324.1H107.18V143.17h425.92m1.15-1.15H106.02v326.41h428.23V142.02h0Z"/>
+        </g>
+        <rect class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" x="116.17" y="150.58" width="386.1" height="276.41"/>
+      </g>
+    </mask>
+    <clipPath id="uuid-ec273687-bfa6-4652-b83c-f86b42ebb90f">
+      <path id="uuid-44ce7b48-945e-461f-9dde-8c4a77ac9086" data-name="SVGID" class="uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221" d="m161.28,822.94s-12.77,12.89-20.37,9.75c0,0-2.92,10.13,4.75,20.34,7.67,10.21,14.29,9.69,14.29,9.69,0,0-2.38-6.68,2.52-13.7,4.9-7.02,10.91-11.35,10.91-11.35l-12.09-14.72Z"/>
+    </clipPath>
+    <clipPath id="uuid-7fa89c88-6495-46e7-a9b2-d82f11a698fa">
+      <path id="uuid-5bc346d4-1506-4122-8ac6-b30f0d2ffa8b" data-name="SVGID" class="uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221" d="m234.28,851.06s-1.71,18.45-10.59,20.91c0,0,4.82,9.88,18.87,12.93,14.06,3.05,19.42-1.66,19.42-1.66,0,0-6.91-3.71-7.75-12.42-.84-8.71,1.22-16.03,1.22-16.03l-21.17-3.73Z"/>
+    </clipPath>
+    <clipPath id="uuid-4413ce6d-9e92-4c2a-b4da-8b4ab06efd01">
+      <path id="uuid-e2bd56eb-ce72-4539-93bf-f9dcf3777d0f" data-name="SVGID" class="uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221" d="m313.99,311.11s-1.56-15.86-6.19-22.01c-4.63-6.15-19.06-19.37-42.21-13.9-23.15,5.47-24.24,28.56-22.63,39.84,1.6,11.28-1.25,22.56-2.67,26.83-1.42,4.27-5.39,40.67-5.39,40.67l15.35,6.07-.04.1s14.37,38.98,17,14.29c2.45-22.95,15.93-44.28,23.32-45.25,3.27,1.52,6.74,2.87,9.56,1.18,4.14-2.48,3.88-6.44,8.62-14.31,2.6-4.31,3.71-6.18,4.59-11.15,1.25-7.01-1.58-12.58-1.58-12.58-.98-2.7,2.69-6.2,2.27-9.79Z"/>
+    </clipPath>
+    <clipPath id="uuid-f2cbe323-fc57-4ac1-a21e-97da56c0cfa5">
+      <path id="uuid-44158513-a3a7-46fc-8eb6-93eac2d2aa62" data-name="SVGID" class="uuid-3b36539a-9d2a-4850-a6ee-bd61c1466221" d="m226.68,465.33c2.39,8.97,5.68,20.07,7.13,29.29,1.96,12.49-1.63,27.26-1.63,27.26,0,0,6.83,2,32.82,2s34.15-2.17,34.15-2.17c0,0,.33-17.66-.67-29.15-1-11.49-2.83-25.99-2-31.82.83-5.83,6.83-13.83,5-24.49-1.83-10.66-11.66-16.99-14.66-23.49-3-6.5-12.99-28.49-26.32-28.82-13.33-.33-31.19,1.46-40.86,23.62-6.74,15.46-2.26,23.96,2.45,41.6,1.2,4.51,2.57,8.94,3.84,13.43.26.91.51,1.83.75,2.74Z"/>
+    </clipPath>
+  </defs>
+  <rect class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" x="140.87" y="157.5" width="386.1" height="274.62"/>
+  <path class="uuid-36fbeed9-c18d-4258-a91a-5aaeb4a6ad59" d="m343.38,296.69c-53.75,34.62-108.47,55.48-167.04,75.49-51.62,17.64-117.02,56.78-132.88,112.02-15.98,55.64,20.59,162.3,169.22,164.27,168.67,2.24,254.86,59.94,345.37,88.52,90.93,28.71,172.67,39.83,250.93,4.34,105.89-48.03,169.73-169.34,167.63-280.35-1.83-97.08-70.53-181.1-153.12-228.04-69.56-39.53-152.39-54.8-232-44.25-138.57,18.36-209.05,82.85-248.1,108Z"/>
+  <g class="uuid-57009325-15fc-45f9-945c-a0892a27bce5">
+    <rect class="uuid-c83e48d4-6996-457b-9cb4-115cb8c93406" x="131.18" y="167.39" width="386.1" height="274.62"/>
+  </g>
+  <path class="uuid-36fbeed9-c18d-4258-a91a-5aaeb4a6ad59" d="m590.51,764.45s-31.55,26.63-81.51,10.1-50.33-62.35-50.33-62.35c0,0-51.09-1.88-74.47-44.2-20.48-37.06-.28-81.63-.28-81.63,0,0-27.8-6.46-42.45-36.83-14.65-30.37-1.13-58.58-1.13-58.58,0,0-32.46-30.19-19.6-68.76,12.86-38.57,44.01-45.43,44.01-45.43,0,0,1.82-41.76,35.69-74.18,31.18-29.85,81.89-23.11,81.89-23.11,0,0,6.01-43.57,47.33-50.4,41.32-6.83,60.85,21.85,60.85,21.85v513.52Z"/>
+  <g class="uuid-39cf7afe-70b0-4066-801e-6b6e873eb4e1">
+    <g class="uuid-db01da53-9c0b-47b1-a92a-578658f7497f">
+      <rect class="uuid-c83e48d4-6996-457b-9cb4-115cb8c93406" x="131.18" y="174.26" width="386.1" height="267.74"/>
+    </g>
+  </g>
+  <g>
+    <rect class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" x="140.87" y="157.5" width="386.1" height="274.62"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m527.97,433.12H139.87V156.5h388.1v276.62Zm-386.1-2h384.1V158.5H141.87v272.62Z"/>
+  </g>
+  <path class="uuid-a70371d8-a3f4-4dbe-ad0d-0c4bdf15f082" d="m320.74,422.2c12.86-38.57,44.01-45.43,44.01-45.43,0,0,1.82-41.76,35.69-74.18,31.18-29.85,81.89-23.11,81.89-23.11,0,0,5.73-41.5,44.42-49.84v-28.06c-96.8,26.19-150.92,74.22-183.36,95.11-53.75,34.62-108.47,55.48-167.04,75.49-11.45,3.91-23.58,8.89-35.7,14.86v45.01h177.73c.48-3.21,1.25-6.5,2.37-9.85Z"/>
+  <path class="uuid-db2e6ea7-8c0c-4c2f-ba7b-a69a0dbb6e4d" d="m482.32,279.48s-50.71-6.74-81.89,23.11c-33.87,32.42-35.69,74.18-35.69,74.18,0,0-31.15,6.86-44.01,45.43-1.12,3.35-1.89,6.64-2.37,9.85h208.37v-202.41c-38.69,8.34-44.42,49.84-44.42,49.84Z"/>
+  <path class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" d="m590.51,764.45s31.55,26.63,81.51,10.1c49.96-16.53,50.33-62.35,50.33-62.35,0,0,51.09-1.88,74.47-44.2,20.48-37.06.28-81.63.28-81.63,0,0,27.8-6.46,42.45-36.83,14.65-30.37,1.13-58.58,1.13-58.58,0,0,32.46-30.19,19.6-68.76-12.86-38.57-44.01-45.43-44.01-45.43,0,0-1.82-41.76-35.69-74.18-31.18-29.85-81.89-23.11-81.89-23.11,0,0-6.01-43.57-47.33-50.4-41.32-6.83-60.85,21.85-60.85,21.85v513.52Z"/>
+  <circle class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" cx="422.97" cy="555.64" r="5.88"/>
+  <rect class="uuid-18fa4fe2-d7a9-44e1-8aff-0ce2bc50b66d" x="166.77" y="268.41" width="22.35" height="55.36"/>
+  <rect class="uuid-43d45d96-41be-4b6d-9df3-573463ba6685" x="206.33" y="224.04" width="22.35" height="99.73"/>
+  <rect class="uuid-db2e6ea7-8c0c-4c2f-ba7b-a69a0dbb6e4d" x="245.88" y="238.14" width="22.35" height="85.63"/>
+  <g>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m861.22,421.88c-11.79-35.36-39.18-44.54-44.01-45.9-.46-5.79-4.64-44.16-35.94-74.12-28.8-27.57-74.57-24.2-81.75-23.48-1.22-6.51-9.87-43.99-47.99-50.29-36.85-6.1-56.87,15.98-61.02,21.19-4.15-5.2-24.17-27.28-61.02-21.19-38.12,6.3-46.77,43.78-47.99,50.29-7.18-.72-52.96-4.09-81.75,23.48-31.3,29.96-35.48,68.33-35.94,74.12-4.83,1.36-32.23,10.54-44.01,45.9-12.01,36.03,15.22,65.16,19.35,69.3-1.91,4.47-12.03,30.91,1.42,58.79,13,26.95,36.55,35.42,41.98,37.05-2.88,7.06-17.96,47.57.77,81.46,21.65,39.18,67.29,44.13,74.38,44.66.16,3.03,1.1,12.95,6.49,24.46,5.87,12.52,18.35,29.25,44.49,37.9,11.83,3.91,22.67,5.41,32.32,5.41,27.94,0,45.97-12.52,49.5-15.19,3.53,2.68,21.56,15.19,49.5,15.19,9.65,0,20.5-1.5,32.32-5.41,46.1-15.25,50.56-55.7,50.98-62.36,7.06-.53,52.73-5.47,74.39-44.66,18.72-33.89,3.65-74.4.77-81.46,5.43-1.63,28.98-10.1,41.98-37.05,13.45-27.88,3.33-54.31,1.42-58.79,4.13-4.14,31.36-33.28,19.35-69.3Zm-271.72,325.29c-.8-1.5-1.82-2.89-3.05-4.12l-23.53-23.53c-3.61-3.61-5.6-8.42-5.6-13.52v-29.69c3.04-.48,5.38-3.12,5.38-6.3,0-3.52-2.86-6.38-6.38-6.38s-6.38,2.86-6.38,6.38c0,3.18,2.34,5.81,5.38,6.3v29.69c0,5.64,2.2,10.95,6.19,14.94l23.53,23.53c2.88,2.88,4.47,6.71,4.47,10.78v8.72c-3.6,2.79-34.18,24.86-80.2,9.64-48.67-16.1-49.64-60.96-49.65-61.41v-14.7c0-4.33,3.52-7.86,7.85-7.86h7.45c.48,3.04,3.12,5.38,6.3,5.38,3.52,0,6.38-2.86,6.38-6.38s-2.86-6.38-6.38-6.38c-3.18,0-5.81,2.34-6.3,5.38h-7.45c-3.21,0-6.05,1.55-7.85,3.93v-62.62c0-4.07,1.58-7.89,4.46-10.76l32.63-32.63c1.05.77,2.34,1.22,3.74,1.22,3.52,0,6.38-2.86,6.38-6.38s-2.86-6.38-6.38-6.38-6.38,2.86-6.38,6.38c0,1.4.46,2.69,1.22,3.74l-32.63,32.63c-1.23,1.23-2.25,2.62-3.04,4.11v-21.21c0-5.64-2.2-10.95-6.19-14.94l-29.8-29.8-1.41,1.41,29.8,29.8c3.61,3.61,5.6,8.42,5.6,13.52v50.53c-.79-1.49-1.81-2.88-3.04-4.11l-15.21-15.21c.77-1.05,1.22-2.34,1.22-3.74,0-3.52-2.86-6.38-6.38-6.38s-6.38,2.86-6.38,6.38,2.86,6.38,6.38,6.38c1.4,0,2.69-.46,3.74-1.22l15.21,15.21c2.88,2.88,4.46,6.7,4.46,10.76v52.87c-7.33-.57-51.59-5.6-72.6-43.62-19.99-36.18-.44-80.29-.24-80.74.12-.27.12-.59-.01-.86s-.38-.46-.67-.53c-.27-.06-27.51-6.73-41.77-36.29-14.26-29.56-1.26-57.44-1.13-57.72.19-.39.1-.87-.22-1.16s-31.83-30.21-19.33-67.71c12.19-36.56,41.37-44.3,43.18-44.75h36.21c6.88,0,13.34-2.68,18.21-7.54l37.05-37.05c1.05.77,2.34,1.22,3.74,1.22,3.52,0,6.38-2.86,6.38-6.38s-2.86-6.38-6.38-6.38-6.38,2.86-6.38,6.38c0,1.4.46,2.69,1.22,3.74l-37.05,37.05c-4.49,4.49-10.45,6.96-16.8,6.96h-35.25c.57-6.62,5.07-43.52,35.3-72.46,21.24-20.33,52.02-23.45,68.88-23.45,7.33,0,12.03.59,12.18.61.55.07,1.05-.31,1.12-.85.06-.43,6.37-42.92,46.5-49.55,38.16-6.3,57.67,18.46,59.69,21.19v495.92Zm249.14-198.07c-14.26,29.55-41.5,36.22-41.77,36.29-.29.07-.54.26-.67.53-.13.27-.14.58-.01.86.2.44,19.76,44.53-.24,80.74-21.01,38.02-65.27,43.05-72.6,43.62v-29.56c0-4,1.56-7.76,4.38-10.58l15.83-15.83c.96.68,2.13,1.08,3.39,1.08,3.25,0,5.88-2.63,5.88-5.88s-2.63-5.88-5.88-5.88-5.88,2.63-5.88,5.88c0,1.26.4,2.43,1.08,3.39l-15.83,15.83c-1.2,1.2-2.19,2.54-2.97,3.99v-39.6c0-5.77,2.25-11.2,6.33-15.28l16.14-16.14c.96.68,2.13,1.08,3.39,1.08,3.25,0,5.88-2.63,5.88-5.88s-2.63-5.88-5.88-5.88-5.88,2.63-5.88,5.88c0,1.26.4,2.43,1.08,3.39l-16.14,16.14c-4.46,4.46-6.92,10.39-6.92,16.7v15.2c-.78-1.45-1.77-2.79-2.97-3.99l-18.83-18.83c.68-.96,1.08-2.13,1.08-3.39,0-3.25-2.63-5.88-5.88-5.88s-5.88,2.63-5.88,5.88,2.63,5.88,5.88,5.88c1.26,0,2.43-.4,3.39-1.08l18.83,18.83c2.83,2.83,4.38,6.58,4.38,10.58v55.02c0,.11-.18,11.46-6.38,24.64-5.71,12.13-17.84,28.36-43.27,36.77-46.02,15.23-76.59-6.85-80.2-9.64v-18.22h0v-8.72c0-4.07,1.59-7.9,4.46-10.78l19.87-19.87c3.61-3.61,8.42-5.6,13.52-5.6h6.83c.48,2.77,2.89,4.88,5.79,4.88,3.25,0,5.88-2.63,5.88-5.88s-2.63-5.88-5.88-5.88c-2.91,0-5.32,2.11-5.79,4.89h-6.83c-5.64,0-10.95,2.2-14.94,6.19l-19.87,19.87c-1.23,1.23-2.26,2.62-3.05,4.12v-17.71h.03v-13.39c0-4.07,1.59-7.9,4.47-10.78l28.18-28.18c3.3-3.3,7.69-5.12,12.36-5.12h22.91c.48,2.77,2.89,4.88,5.79,4.88,3.25,0,5.88-2.63,5.88-5.88s-2.63-5.88-5.88-5.88c-2.91,0-5.32,2.11-5.79,4.89h-22.91c-2.18,0-4.3.38-6.3,1.06l19.31-19.31c3.19-3.19,4.94-7.42,4.94-11.93v-40.98c2.77-.48,4.89-2.89,4.89-5.79,0-3.25-2.63-5.88-5.88-5.88s-5.88,2.63-5.88,5.88c0,2.91,2.11,5.32,4.88,5.79v40.98c0,3.97-1.55,7.71-4.36,10.52l-25.36,25.36s0,0,0,0l-4.73,4.73h0s-23.45,23.45-23.45,23.45c-1.25,1.25-2.28,2.66-3.08,4.17v-264.72h0v-18.05c0-4.07,1.59-7.9,4.47-10.78l23.6-23.6h0s3.27-3.27,3.27-3.27c0,0,0,0,0,0l1.49-1.49c2.81-2.81,6.54-4.36,10.52-4.36h9.37c.04,3.21,2.66,5.8,5.88,5.8s5.88-2.63,5.88-5.88-2.63-5.88-5.88-5.88c-2.58,0-4.76,1.66-5.56,3.97h-9.69c-2.76,0-5.42.67-7.8,1.91,1.44-2.96,2.22-6.22,2.22-9.6v-15.56c2.91-.35,5.17-2.83,5.17-5.84,0-3.25-2.63-5.88-5.88-5.88s-5.88,2.63-5.88,5.88c0,2.81,1.97,5.15,4.6,5.74v15.65c0,5.34-2.08,10.35-5.85,14.13l-26.87,26.87c-1.23,1.23-2.26,2.62-3.05,4.12v-147.74c2.02-2.73,21.53-27.5,59.69-21.19,36.65,6.06,45.1,42.08,46.33,48.55-7.97,1.13-14.08,8.19-14.08,16.49v3.28h-25.91c-.48-2.77-2.89-4.89-5.79-4.89-3.25,0-5.88,2.63-5.88,5.88s2.63,5.88,5.88,5.88c2.91,0,5.32-2.11,5.79-4.88h25.91v15.71c0,4.51,1.75,8.74,4.94,11.93l27.84,27.84c-.68.96-1.08,2.13-1.08,3.39,0,3.25,2.63,5.88,5.88,5.88s5.88-2.63,5.88-5.88-2.63-5.88-5.88-5.88c-1.26,0-2.43.4-3.39,1.08l-27.84-27.84c-2.81-2.81-4.36-6.54-4.36-10.52v-20.99c0-7.59,5.79-14.01,13.17-14.62h.17s0-.02,0-.02c.01,0,.03,0,.04,0,.5-.07,50.59-6.34,81.06,22.84,29.9,28.62,34.62,65.02,35.28,72.23-3.52-.69-6.92-1.16-10.12-1.36-.43-.03-.86-.04-1.28-.04h0s-3.59,0-3.59,0c-4.13,0-8.15-1.69-11.03-4.65l-22.81-23.35c.7-.97,1.12-2.16,1.12-3.45,0-3.25-2.63-5.88-5.88-5.88s-5.88,2.63-5.88,5.88,2.63,5.88,5.88,5.88c1.24,0,2.39-.39,3.34-1.04l22.81,23.35c2.24,2.29,5.08,3.89,8.15,4.68-2.89,1.09-5.55,2.8-7.79,5.03l-31.77,31.77c-.96-.68-2.13-1.08-3.39-1.08-3.25,0-5.88,2.63-5.88,5.88s2.63,5.88,5.88,5.88,5.88-2.63,5.88-5.88c0-1.26-.4-2.43-1.08-3.39l31.77-31.77c4.08-4.08,9.72-6.21,15.43-5.84,3.5.23,7.24.76,11.13,1.58.09.02,7.78,1.78,16.91,8.15,8.42,5.88,19.83,17,26.37,36.62,12.5,37.5-19.01,67.41-19.33,67.71-.32.3-.41.77-.22,1.17.13.28,13.15,28.12-1.13,57.72Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m568.22,303.45c-3.52,0-6.38,2.86-6.38,6.38s2.86,6.38,6.38,6.38,6.38-2.86,6.38-6.38-2.86-6.38-6.38-6.38Z"/>
+  </g>
+  <g>
+    <g>
+      <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m589.51,340.36v14.77h2v-14.77c0-5.58-2.17-10.83-6.12-14.77l-16.46-16.46-1.41,1.41,16.46,16.46c3.57,3.57,5.53,8.31,5.53,13.36Z"/>
+      <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m517.4,502.68v-1.5c0-40.31,32.8-73.11,73.11-73.11,31.67,0,59.91,20.69,69.58,50.62l-18.59-4.07-.64,2.93,22.77,4.98,5.77-26.37-2.93-.64-4.34,19.85c-10.77-29.86-39.49-50.3-71.61-50.3-41.46,0-75.29,33.33-76.09,74.61l-335.59-.08v3s337.07.08,337.07.08h1.5Z"/>
+      <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m1025.15,485.9h-102.77c-7.87,0-14.36,6.02-15.11,13.69l-242.15.08h-1.5v1.5c0,40.31-32.8,73.11-73.11,73.11-31.67,0-59.91-20.69-69.58-50.62l18.59,4.07.64-2.93-22.77-4.98-5.77,26.37,2.93.64,4.34-19.85c10.77,29.86,39.49,50.3,71.61,50.3,41.46,0,75.29-33.33,76.09-74.61l240.67-.08c.76,7.67,7.25,13.69,15.11,13.69h102.77c8.38,0,15.19-6.81,15.19-15.19s-6.81-15.19-15.19-15.19Z"/>
+    </g>
+    <path class="uuid-18fa4fe2-d7a9-44e1-8aff-0ce2bc50b66d" d="m1003.65,440.48h-81.27c-8.38,0-15.19,6.81-15.19,15.19s6.81,15.19,15.19,15.19h81.27c8.38,0,15.19-6.81,15.19-15.19s-6.81-15.19-15.19-15.19Z"/>
+    <g>
+      <rect class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" x="908.69" y="532.83" width="108.65" height="27.38" rx="13.69" ry="13.69"/>
+      <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m1003.65,561.71h-81.27c-8.38,0-15.19-6.81-15.19-15.19s6.81-15.19,15.19-15.19h81.27c8.38,0,15.19,6.81,15.19,15.19s-6.81,15.19-15.19,15.19Zm-81.27-27.38c-6.72,0-12.19,5.47-12.19,12.19s5.47,12.19,12.19,12.19h81.27c6.72,0,12.19-5.47,12.19-12.19s-5.47-12.19-12.19-12.19h-81.27Z"/>
+    </g>
+    <path class="uuid-c83e48d4-6996-457b-9cb4-115cb8c93406" d="m1003.65,576.76h-81.27c-8.38,0-15.19,6.81-15.19,15.19s6.81,15.19,15.19,15.19h81.27c8.38,0,15.19-6.81,15.19-15.19s-6.81-15.19-15.19-15.19Z"/>
+  </g>
+  <g>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m139.88,156.5v276.61h388.09V156.5H139.88Zm1.99,274.62v-243.25h384.11v243.25H141.87Z"/>
+    <circle class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" cx="507.45" cy="172.68" r="5.93"/>
+  </g>
+  <g>
+    <rect class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" x="60.33" y="487.4" width="130.15" height="27.38" rx="13.69" ry="13.69"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m176.8,516.28h-102.77c-8.38,0-15.19-6.81-15.19-15.19s6.81-15.19,15.19-15.19h102.77c8.38,0,15.19,6.81,15.19,15.19s-6.81,15.19-15.19,15.19Zm-102.77-27.38c-6.72,0-12.19,5.47-12.19,12.19s5.47,12.19,12.19,12.19h102.77c6.72,0,12.19-5.47,12.19-12.19s-5.47-12.19-12.19-12.19h-102.77Z"/>
+  </g>
+  <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m504.84,630.23v-2.92h5.43v-12.44c-.18.37-.45.72-.83,1.05-.38.33-.81.62-1.31.86s-1.04.44-1.63.58-1.19.22-1.81.22v-2.99c.69,0,1.33-.08,1.93-.24s1.14-.38,1.63-.66.93-.62,1.31-1.01c.38-.39.69-.82.93-1.28h3.71v15.92h4.51v2.92h-13.87Z"/>
+  <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m498.65,649.54c0,1.78-.17,3.28-.52,4.52-.34,1.23-.82,2.23-1.43,3-.61.77-1.33,1.32-2.16,1.67s-1.74.52-2.73.52-1.89-.17-2.72-.51-1.54-.89-2.14-1.66-1.06-1.77-1.4-3-.5-2.74-.5-4.53.17-3.43.5-4.68c.33-1.25.8-2.24,1.4-2.99s1.33-1.27,2.17-1.58,1.78-.46,2.8-.46c.96,0,1.85.15,2.67.46.82.31,1.54.83,2.14,1.58s1.07,1.74,1.41,2.99.51,2.81.51,4.68Zm-3.94,0c0-1.28-.05-2.35-.15-3.2s-.27-1.53-.49-2.04-.51-.87-.87-1.08-.79-.31-1.31-.31c-.55,0-1.01.11-1.38.32s-.67.58-.9,1.09-.39,1.19-.49,2.05-.15,1.91-.15,3.18.05,2.29.15,3.14.27,1.53.49,2.05.52.88.88,1.1.81.33,1.34.33.95-.11,1.31-.33.66-.59.89-1.1.4-1.2.51-2.05c.11-.85.16-1.89.16-3.14Z"/>
+  <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m553.3,604.67c0,1.78-.17,3.28-.52,4.52-.34,1.23-.82,2.23-1.43,3s-1.33,1.32-2.16,1.67-1.74.52-2.73.52-1.89-.17-2.72-.51c-.83-.34-1.54-.89-2.14-1.66s-1.06-1.77-1.4-3-.5-2.74-.5-4.53.17-3.43.5-4.68c.33-1.25.8-2.24,1.4-2.99s1.33-1.27,2.17-1.58c.84-.31,1.78-.46,2.8-.46.96,0,1.85.15,2.67.46.82.31,1.54.83,2.14,1.58s1.07,1.74,1.41,2.99c.34,1.25.51,2.81.51,4.68Zm-3.94,0c0-1.28-.05-2.35-.15-3.2-.1-.85-.27-1.53-.49-2.04s-.51-.87-.87-1.08c-.36-.21-.79-.31-1.31-.31-.55,0-1.01.11-1.38.32s-.67.58-.9,1.09-.39,1.19-.49,2.05-.15,1.91-.15,3.18.05,2.29.15,3.14.27,1.53.49,2.05.52.88.88,1.1.81.33,1.34.33.95-.11,1.31-.33.66-.59.89-1.1.4-1.2.51-2.05.16-1.89.16-3.14Z"/>
+  <g>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m716.88,412.78v-2.92h5.43v-12.44c-.18.37-.45.72-.83,1.05-.38.33-.81.62-1.31.86s-1.04.44-1.63.58-1.19.22-1.81.22v-2.99c.69,0,1.33-.08,1.93-.24s1.14-.38,1.63-.66.93-.62,1.31-1.01.69-.82.93-1.28h3.71v15.92h4.51v2.92h-13.87Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m748.24,480.26v-2.92h5.43v-12.44c-.18.37-.45.72-.83,1.05s-.81.62-1.31.86-1.04.44-1.63.58c-.59.14-1.19.22-1.81.22v-2.99c.69,0,1.33-.08,1.93-.24s1.14-.38,1.63-.66.93-.62,1.31-1.01.69-.82.93-1.28h3.71v15.92h4.51v2.92h-13.87Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m699.91,434.68c0,1.78-.17,3.28-.52,4.52-.34,1.23-.82,2.23-1.43,3s-1.33,1.32-2.16,1.67-1.74.52-2.73.52-1.89-.17-2.72-.51-1.54-.89-2.14-1.66-1.06-1.77-1.4-3c-.34-1.23-.5-2.74-.5-4.53s.17-3.43.5-4.68c.33-1.25.8-2.24,1.4-2.99.61-.74,1.33-1.27,2.17-1.58s1.78-.46,2.8-.46c.96,0,1.85.15,2.67.46s1.54.83,2.14,1.58,1.07,1.74,1.41,2.99.51,2.81.51,4.68Zm-3.94,0c0-1.28-.05-2.35-.15-3.2s-.27-1.53-.49-2.04c-.22-.51-.51-.87-.87-1.08s-.79-.31-1.31-.31c-.55,0-1.01.11-1.38.32s-.67.58-.9,1.09-.39,1.19-.49,2.05-.15,1.91-.15,3.18.05,2.29.15,3.14c.1.85.27,1.53.49,2.05s.52.88.88,1.1c.36.22.81.33,1.34.33s.95-.11,1.31-.33.66-.59.89-1.1.4-1.2.51-2.05c.11-.85.16-1.89.16-3.14Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m818.54,529.9c0,2.03-.2,3.76-.59,5.17-.39,1.41-.94,2.56-1.64,3.44-.7.88-1.52,1.52-2.48,1.91s-1.99.59-3.12.59-2.17-.19-3.12-.58-1.76-1.02-2.44-1.9-1.21-2.02-1.6-3.44-.58-3.14-.58-5.18.19-3.93.57-5.35c.38-1.43.91-2.57,1.61-3.42.69-.85,1.52-1.45,2.48-1.81s2.03-.53,3.2-.53c1.1,0,2.12.18,3.06.53.94.35,1.76.95,2.44,1.81.69.85,1.23,1.99,1.61,3.42.39,1.43.58,3.21.58,5.35Zm-4.51,0c0-1.47-.06-2.69-.18-3.66-.12-.97-.3-1.75-.56-2.33-.26-.59-.59-1-1-1.24s-.91-.36-1.49-.36c-.63,0-1.16.12-1.58.37s-.77.66-1.03,1.25-.45,1.37-.56,2.34-.17,2.19-.17,3.64.06,2.63.18,3.6.3,1.75.56,2.34.59,1.01,1.01,1.26c.42.25.93.38,1.53.38s1.09-.13,1.5-.38c.42-.25.76-.67,1.02-1.26s.46-1.37.58-2.34c.12-.97.18-2.17.18-3.6Z"/>
+  </g>
+  <g>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m158.53,501.09c0,1.37-.13,2.52-.4,3.47-.26.95-.63,1.72-1.1,2.31s-1.02,1.02-1.66,1.28-1.34.4-2.1.4-1.46-.13-2.09-.39-1.18-.69-1.64-1.28-.82-1.36-1.07-2.31-.39-2.11-.39-3.48.13-2.64.38-3.6c.25-.96.61-1.72,1.08-2.3.47-.57,1.02-.98,1.67-1.21.65-.24,1.36-.35,2.15-.35.74,0,1.42.12,2.06.35.63.24,1.18.64,1.64,1.21.46.57.82,1.34,1.08,2.3.26.96.39,2.16.39,3.6Zm-3.03,0c0-.99-.04-1.81-.12-2.46-.08-.65-.2-1.17-.38-1.57s-.4-.67-.67-.83-.61-.24-1-.24c-.42,0-.78.08-1.06.25s-.52.44-.69.84-.3.92-.38,1.57c-.08.65-.11,1.47-.11,2.44s.04,1.76.12,2.41.2,1.18.38,1.57.4.68.68.85.62.25,1.03.25.73-.08,1.01-.25.51-.45.69-.85.31-.92.39-1.57.12-1.46.12-2.41Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m130.76,508.33v-2.24h4.17v-9.56c-.14.29-.35.56-.64.81s-.63.47-1.01.66-.8.33-1.26.45-.92.17-1.39.17v-2.3c.53,0,1.02-.06,1.48-.18s.88-.29,1.26-.51.71-.48,1-.78.53-.63.71-.99h2.85v12.23h3.47v2.24h-10.66Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m166.55,508.33v-2.24h4.17v-9.56c-.14.29-.35.56-.64.81s-.63.47-1.01.66-.8.33-1.26.45-.92.17-1.39.17v-2.3c.53,0,1.02-.06,1.48-.18s.88-.29,1.26-.51.71-.48,1-.78c.29-.3.53-.63.71-.99h2.85v12.23h3.47v2.24h-10.66Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m122.73,501.09c0,1.37-.13,2.52-.4,3.47-.26.95-.63,1.72-1.1,2.31s-1.02,1.02-1.66,1.28c-.64.26-1.34.4-2.1.4s-1.46-.13-2.09-.39-1.18-.69-1.64-1.28-.82-1.36-1.07-2.31-.39-2.11-.39-3.48.13-2.64.38-3.6.61-1.72,1.08-2.3c.47-.57,1.02-.98,1.67-1.21.65-.24,1.36-.35,2.15-.35.74,0,1.42.12,2.06.35.63.24,1.18.64,1.64,1.21.46.57.82,1.34,1.08,2.3.26.96.39,2.16.39,3.6Zm-3.03,0c0-.99-.04-1.81-.12-2.46s-.2-1.17-.38-1.57-.4-.67-.67-.83-.61-.24-1-.24c-.42,0-.78.08-1.06.25s-.52.44-.69.84-.3.92-.38,1.57c-.08.65-.11,1.47-.11,2.44s.04,1.76.12,2.41.2,1.18.38,1.57.4.68.68.85.62.25,1.03.25.73-.08,1.01-.25.51-.45.69-.85.31-.92.39-1.57.12-1.46.12-2.41Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m94.96,508.33v-2.24h4.17v-9.56c-.14.29-.35.56-.64.81s-.63.47-1.01.66-.8.33-1.26.45-.92.17-1.39.17v-2.3c.53,0,1.02-.06,1.48-.18s.88-.29,1.26-.51.71-.48,1-.78c.29-.3.53-.63.71-.99h2.85v12.23h3.47v2.24h-10.66Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m86.93,501.09c0,1.37-.13,2.52-.4,3.47-.26.95-.63,1.72-1.1,2.31-.47.59-1.02,1.02-1.66,1.28s-1.34.4-2.1.4-1.46-.13-2.09-.39-1.18-.69-1.64-1.28-.82-1.36-1.07-2.31-.39-2.11-.39-3.48.13-2.64.38-3.6.61-1.72,1.08-2.3c.47-.57,1.02-.98,1.67-1.21.65-.24,1.36-.35,2.15-.35.74,0,1.42.12,2.06.35.63.24,1.18.64,1.64,1.21s.82,1.34,1.08,2.3c.26.96.39,2.16.39,3.6Zm-3.03,0c0-.99-.04-1.81-.12-2.46s-.2-1.17-.38-1.57-.4-.67-.67-.83-.61-.24-1-.24c-.42,0-.78.08-1.06.25s-.52.44-.69.84-.3.92-.38,1.57-.11,1.47-.11,2.44.04,1.76.12,2.41.2,1.18.38,1.57.4.68.68.85.62.25,1.03.25.73-.08,1.01-.25.51-.45.69-.85.31-.92.39-1.57.12-1.46.12-2.41Z"/>
+  </g>
+  <g>
+    <g>
+      <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m161.28,822.94s-12.77,12.89-20.37,9.75c0,0-2.92,10.13,4.75,20.34,7.67,10.21,14.29,9.69,14.29,9.69,0,0-2.38-6.68,2.52-13.7,4.9-7.02,10.91-11.35,10.91-11.35l-12.09-14.72Z"/>
+      <g class="uuid-16da1986-f55d-4a03-affb-bae81badf18b">
+        <path class="uuid-253635c7-d671-49a3-943d-dcae1e3ea900" d="m142.86,839.93c6.13-3.28,14.01-7.42,14.01-7.42,0,0,10.08,5.22,16.5,6.37,6.43,1.15.81.14.81.14l-15.47-17.85-17.4,8.37-5.37,9.5"/>
+      </g>
+      <path class="uuid-8d511b34-cb1c-4bc4-88d6-991463184736" d="m121.65,846.93c-1.58,6.96-12.82,17.79-12.82,17.79,0,0-1.43,2.6,2.49,5.93,3.38,2.88,4.75,2.66,6.33,2.02,0,0,8.13-8.59,10.14-10.82,2.47-2.72,4.73.53,4.73.53,0,0,.89-4.18-3.53-9.88-4.42-5.7-7.34-5.57-7.34-5.57Z"/>
+      <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m143.52,830.61s2.28-.82,2.88.62c1.7,4.05-2.36,10.92,1.45,17.99,3.81,7.07,11.91,6.61,14.75,6.41,0,0-1.4,12.6-2.47,20.74-1.07,8.14-2.91,9.87,2.86,13.44,5.76,3.57,7.33,6.09,6.05,11.13-.49,1.94-2.29,4.97-3.06,6,0,0-6.99.07-14.38-3.9-4.92-2.64-11.02-6.04-13.02-11.28-1.53-4-1.06-7.98-.64-12.21.56-5.72-.16-10.96-3.92-15.43-7.66-9.09-12.07-11.78-12.37-17.19,0,0-1.33-3.83,5.51-8.3,5.2-3.4,6.5-1.74,16.36-8.02Z"/>
+    </g>
+    <path class="uuid-316d1419-7950-4df8-bef8-c900f5a0b66a" d="m165.68,902.86c-.13,0-.25-.02-.38-.07-.51-.21-.76-.79-.55-1.3.82-2.02.82-3.87-.02-5.07-1.1-1.59-5.06-4.01-6.5-4.81-.48-.27-.65-.88-.39-1.36.27-.48.88-.66,1.36-.39.57.32,5.6,3.16,7.16,5.42,1.23,1.77,1.31,4.31.23,6.97-.16.39-.53.62-.93.62Z"/>
+    <g>
+      <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m234.28,851.06s-1.71,18.45-10.59,20.91c0,0,4.82,9.88,18.87,12.93,14.06,3.05,19.42-1.66,19.42-1.66,0,0-6.91-3.71-7.75-12.42-.84-8.71,1.22-16.03,1.22-16.03l-21.17-3.73Z"/>
+      <g class="uuid-67b9f1ca-8a34-43aa-b2b0-7b41952c6713">
+        <path class="uuid-253635c7-d671-49a3-943d-dcae1e3ea900" d="m232.46,876.88s5.79-8.47,7.18-14.49c0,0,9.97.09,14.71-1.46l-21.89-6.18-8.16,20.84"/>
+      </g>
+      <path class="uuid-8d511b34-cb1c-4bc4-88d6-991463184736" d="m216.87,895.56c3.56,6.57,1.38,22.39,1.38,22.39,0,0,.59,2.98,6.4,3.16,5.01.15,6.06-.89,6.99-2.41,0,0,1.03-12.04,1.22-15.11.23-3.75,4.53-2.58,4.53-2.58,0,0-2.19-3.91-10.12-5.66-7.93-1.74-10.4.22-10.4.22Z"/>
+      <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m224.48,868.6s1.41-2.11,2.97-1.34c4.37,2.15,5.69,10.24,14.06,13.47,8.36,3.23,15.15-2.3,17.5-4.26,0,0,7.72,10.97,12.56,18.16,4.84,7.19,6.6,10.96,14.16,11.39s10.45,1.96,11.97,7.19c.58,2.01.49,5.65.3,6.97,0,0-6.76,3.48-16.11,3.48-6.23,0-12.83-.09-18.31-3.01-4.18-2.23-6.6-5.71-9.24-9.36-3.57-4.93-7.92-8.67-14.4-9.85-13.18-2.4-18.96-1.74-23.07-5.88,0,0-3.88-2.22-1.06-10.15,2.15-6.03,4.47-5.53,8.67-16.82Z"/>
+    </g>
+    <path class="uuid-316d1419-7950-4df8-bef8-c900f5a0b66a" d="m294.92,916.69c-.49,0-.92-.36-.99-.87-.31-2.26-1.34-3.96-2.85-4.66-1.97-.92-7.18-1.2-9.02-1.22-.55,0-.99-.46-.98-1.01,0-.55.5-1.01,1.01-.99.29,0,7.08.12,9.84,1.41,2.13,1,3.58,3.26,3.98,6.2.07.55-.31,1.05-.86,1.13-.05,0-.09,0-.14,0Z"/>
+    <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m238.8,693.97c.11,11.92-3,25.8-8.45,34.82s-24.42,31.79-36.19,46.79c-11.77,15-23.31,28.21-25.82,40.06,0,0-1.39,2.18-4.2,4.61-2.81,2.43-7.39,5.41-7.39,5.41,0,0-1.21,1.66,7.63,7.82,8.84,6.16,9.81,5.54,9.81,5.54,0,0,8.05-7.34,13.79-8.86,0,0,20.15-9.1,33.81-18.74,13.66-9.64,31.81-29.63,50.4-51.14,18.59-21.51,14.47-21.79,21.07-36.85,6.6-15.07-5.4-30.74-19.05-35.16-13.65-4.42-34.53-2-34.53-2,0,0-.95.29-.88,7.71Z"/>
+    <path class="uuid-8d511b34-cb1c-4bc4-88d6-991463184736" d="m185.11,830.53c-.09,0-.17-.01-.26-.04-10.65-2.89-15.61-10.38-15.82-10.7-.3-.46-.17-1.08.29-1.38.46-.3,1.08-.17,1.38.29.05.07,4.78,7.18,14.67,9.86.53.14.85.69.7,1.23-.12.45-.52.74-.96.74Z"/>
+    <path class="uuid-253635c7-d671-49a3-943d-dcae1e3ea900" d="m354.42,447.8c6.31-4.18,12.45-10.18,15.17-12.64,2.72-2.46,9.65-16.56,12.42-18.8,2.77-2.24,3.61,21.81,2.26,26.29-1.35,4.49-8.14,6.44-8.14,6.44,0,0-7.35,5.8-12.77,11.88-5.42,6.08-8.94-13.18-8.94-13.18Z"/>
+    <path class="uuid-4a9b977d-1216-4ca7-a2bc-498eb355fcfa" d="m421.99,427.45c2.18.22,3.48.87,3.26,2.39-.22,1.52-2.39,2.61-4.57,2.39-2.18-.22-6.53-2.83-6.53-2.83"/>
+    <path class="uuid-2801e42a-7060-4486-88aa-d94681ee2ed0" d="m292.09,357.87c-6.85-2.39-22.26,20.43-24.89,45.13-2.63,24.69-17-14.29-17-14.29l12.69-31.67,19.21-16.2"/>
+    <ellipse class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" cx="311.35" cy="320.9" rx="5.97" ry="10.93"/>
+    <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m310.99,318.82c1.62,4.14,2.51,5.53,3.63,6.9s2.12,2.2,2.11,4.02c0,1.09-1.19,2.37-2.94,3.75-1.74,1.38-5.79,1.87-5.79,1.87"/>
+    <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m406.21,453.61l-48.65-15.73c-1.96-.63-4.04-5.35-2.7-7.36l48.71-68.92c1.34-2.01,4.02-3.13,5.98-2.5l50.01,14.1c.98,1.29,1.59,4.54.25,6.55l-47.62,71.36c-1.34,2.01-4.02,3.13-5.98,2.5Z"/>
+    <g>
+      <g>
+        <path class="uuid-81072a91-e8e9-441e-a11f-37c3fd868a0d" d="m406.61,450.07c-.36,0-.69-.05-1-.15l-49.14-15.86c-.68-.22-1.14-.65-1.35-1.25-.27-.78-.08-1.75.54-2.67l47.62-71.36c.95-1.42,2.73-2.42,4.33-2.42.36,0,.69.05,1,.15l49.14,15.86c.68.22,1.14.65,1.35,1.25.27.78.08,1.75-.54,2.67l-47.62,71.36c-.95,1.42-2.73,2.42-4.33,2.42Z"/>
+        <path class="uuid-8d511b34-cb1c-4bc4-88d6-991463184736" d="m407.59,356.94h0c.3,0,.57.04.82.12l49.14,15.86c.51.16.84.46.99.89.21.61.04,1.39-.47,2.16l-47.62,71.36c-.85,1.27-2.43,2.16-3.85,2.16-.3,0-.57-.04-.82-.12l-49.14-15.86c-.51-.16-.84-.46-.99-.89-.21-.61-.04-1.39.47-2.16l47.62-71.36c.85-1.27,2.43-2.16,3.85-2.16m0-1.15c-1.75,0-3.72,1.04-4.81,2.68l-47.62,71.36c-1.34,2.01-.84,4.16,1.12,4.79l49.14,15.86c.37.12.77.18,1.18.18,1.75,0,3.72-1.04,4.81-2.68l47.62-71.36c1.34-2.01.84-4.16-1.12-4.79l-49.14-15.86c-.37-.12-.77-.18-1.18-.18h0Z"/>
+      </g>
+      <path class="uuid-8d511b34-cb1c-4bc4-88d6-991463184736" d="m456.04,381.1l-56.24-18.15,3.05-4.57c1.28-1.92,3.83-2.98,5.7-2.38l49.48,15.97c1.87.6,2.35,2.65,1.07,4.56l-3.05,4.57Z"/>
+      <g>
+        <ellipse class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" cx="420.56" cy="407.56" rx="7.32" ry="5.3" transform="translate(-155.78 303.57) rotate(-33.87)"/>
+        <ellipse class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" cx="404.81" cy="402.48" rx="5.26" ry="3.81" transform="translate(-155.62 293.93) rotate(-33.87)"/>
+        <ellipse class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" cx="391.36" cy="398.14" rx="3.2" ry="2.31" transform="translate(-155.48 285.7) rotate(-33.87)"/>
+      </g>
+    </g>
+    <path class="uuid-558c6bb1-e044-4f93-8391-4d6d34535af4" d="m304.26,471.16c4.8-.28,40.28-17.01,54.54-27.81,0,0,4.12.12,6.23,2.73s4.13,6,4.08,11.64c-.04,5.64-15.74,23.91-15.74,23.91,0,0-25.32,17.57-35.13,19.46-9.82,1.89-13.98-29.94-13.98-29.94Z"/>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m311.35,332.83c-3.91,0-6.97-5.24-6.97-11.93s3.06-11.93,6.97-11.93,6.97,5.24,6.97,11.93-3.06,11.93-6.97,11.93Zm0-21.86c-2.7,0-4.97,4.55-4.97,9.93s2.28,9.93,4.97,9.93,4.97-4.55,4.97-9.93-2.28-9.93-4.97-9.93Z"/>
+    <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m313.99,311.11c.41,3.59-3.25,7.09-2.27,9.79,0,0,2.82,5.57,1.58,12.58-.88,4.97-1.99,6.83-4.59,11.15-4.74,7.87-4.49,11.83-8.62,14.31-5.88,3.52-14.61-6.12-18.34-3.14,0,0-9.77,6.76-18.85,14.79-9.08,8.03-11.58,18.46-11.58,18.46l-16.43-6.49s3.96-36.4,5.39-40.67c1.42-4.27,4.27-15.55,2.67-26.83-1.6-11.28-.52-34.38,22.63-39.84,23.15-5.47,37.58,7.75,42.21,13.9,4.63,6.15,6.19,22.01,6.19,22.01Z"/>
+    <g class="uuid-dc2a4e5e-ada0-4ea9-9375-c58d28983f1f">
+      <path class="uuid-253635c7-d671-49a3-943d-dcae1e3ea900" d="m292.09,336.38c1.38,1.12.91,9.26.91,13.02s1.93,8.96,3.85,9.52,2.78.24,2.78.24c0,0-.37,2.32-5.43,2.75-5.06.43-10.61,4.71-12.46,8.05s-7.29,11.01-7.29,11.01l-4,6.6-7.34-11.56-1.46-10,5.65-10.88,7.15-10.36,9.12-15.16,7.02-1.2,2.14,2.14,1.46,2.06"/>
+    </g>
+    <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m226.68,465.33c2.39,8.97,5.68,20.07,7.13,29.29,1.96,12.49-1.63,27.26-1.63,27.26,0,0,6.83,2,32.82,2s34.15-2.17,34.15-2.17c0,0,.33-17.66-.67-29.15-1-11.49-2.83-25.99-2-31.82.83-5.83,6.83-13.83,5-24.49-1.83-10.66-11.66-16.99-14.66-23.49-3-6.5-12.99-28.49-26.32-28.82-13.33-.33-31.19,1.46-40.86,23.62-6.74,15.46-2.26,23.96,2.45,41.6,1.2,4.51,2.57,8.94,3.84,13.43.26.91.51,1.83.75,2.74Z"/>
+    <g class="uuid-64f3b32f-84fa-4dfe-86c0-894bf5bbbe7d">
+      <path class="uuid-558c6bb1-e044-4f93-8391-4d6d34535af4" d="m248.18,416.22s10.27,14.88,10.76,49.89c.5,35.01,1.65,54.54,17.85,70.71,16.2,16.17,12.4-30.37,12.4-30.37l-14.18-76.56-9.79-17.25"/>
+      <path class="uuid-558c6bb1-e044-4f93-8391-4d6d34535af4" d="m274.39,375.64s-.84,6.86-22.4,22.39c-21.56,15.54-27.74,44.4-17.09,74.23,10.64,29.83,10.42,35.14,9.92,62.49-.5,27.35-25.98-4.35-25.98-4.35l-11.96-48.48-3.89-41.02,4.87-17.4,14.13-19.89,11.69-12.43,12.31-12.43,7.37-10.57,6.16-5.59"/>
+    </g>
+    <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m352.34,461.23c9.75-7.46,14.62-14.99,16.78-17.48,2.16-2.49,3.66-5.94,4.68-9.16,1.02-3.22,9.56-1.12,12.74,1.53s.34,11.46.34,11.46c0,0-5.41,2.96-8.58,7.47-11.7,16.67-18.15,31.24-22.82,33.87"/>
+    <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m367.27,446.17c1.86-3.22,7.86-18.25,8.49-21.8.63-3.55.06-4.59,2.76-6.8,2.7-2.21,6.88-5.45,9.01-6.61,2.13-1.16,4.48-2.38,7.91-4.23s5.94-3.7,6.89-3.99c.95-.29,1.35-.48,1.93-.11.58.36,1.09,1.33-1.07,3.88-2.17,2.54-8.31,5.87-11.38,8.95,0,0,.96-.5,2.55-.21,1.59.29,2.61,1.28,2.77,1.9.16.62-.2,1.58-.2,1.58,0,0,1.71-.27,2.67.08s2.14,1.15,2.27,2.42-.17,2.68-.17,2.68c0,0,1.08-.21,1.88.44.8.65,1.44,2.32,1.26,4.08-.18,1.76-.79,4.67-1.5,5.75-.71,1.08-3.2,2.63-4.57,3.6s-2.78-.25-2.83-.71.13-2.21.13-2.21c0,0-2.88,3.17-4.22,6.72-1.34,3.54-4.69,6.72-6.39,8.38-1.7,1.65-7.34,4.81-8.9,7.36"/>
+    <path class="uuid-9002faa4-2900-438b-8492-e5c1fd008780" d="m233.37,513.82c-.48,7.74-13.19,29.31-17.95,48.83-4.31,17.68,1.31,41.33,8.45,63.04,3.25,9.88,13.84,40.27,14.96,60.96.88,16.18-3.18,39.98,15.71,41.77,18.89,1.8,46.13-13.97,47.88-42.46,1.75-28.49,1.44-59.51-.65-83.38-2.09-23.88-7.41-56.15-6.96-63.48.45-7.33-.19-24.75-.19-24.75,0,0-50.75-6.61-61.24-.53Z"/>
+    <g>
+      <path class="uuid-9002faa4-2900-438b-8492-e5c1fd008780" d="m239.17,713.62c-.08,10.62-10.4,47.64-13.62,66.24-3.22,18.6-.14,53.43,7.62,62.5l-1.72,14.54s-1.31,2.04,10.82,3.41c12.13,1.36,14.49.27,14.49.27.04-9.05,4.45-18.45,4.45-18.45,6.66-9.85,15.87-29.76,19.85-40.96,14.51-40.79,19.47-92.41,20.82-110.57,1.28-17.22-22.31-18.1-37.83-18.1s-27.68-4.96-27.68-4.96c0,0,3.03,17.05,2.8,46.09Z"/>
+      <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m249.64,847.3c-8.07,0-14.5-2.48-14.85-2.62-.51-.2-.77-.78-.56-1.3.2-.51.78-.77,1.3-.57.11.04,11.08,4.26,21.94,1.57.53-.13,1.08.19,1.21.73.13.54-.19,1.08-.73,1.21-2.84.7-5.66.97-8.3.97Z"/>
+    </g>
+    <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m294.81,539.11c.45-7.33-.19-24.75-.19-24.75,0,0-13.93-1.82-28.71-2.67-13.42-.78-27.54-.76-32.53,2.14-.14,2.36-1.43,6.01-3.28,10.5-4.21,10.22-11.36,24.77-14.67,38.34-4.31,17.68,1.31,41.33,8.45,63.04,1.88,5.71,6.21,18.29,9.75,31.87-2.39-23.01-6.39-43.42-8.84-55.93-5.97-30.4,2.35-42.26,6.46-51.43,2.73-6.09,7.69-17.83,10.69-27.1,7.56-.47,17.91-.61,29.76.6,6.4,8.99,15.12,18.13,23.55,23.39-.36-3.62-.53-6.4-.43-7.99Z"/>
+    <g>
+      <rect class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" x="294.21" y="314.76" width="25.77" height="2"/>
+      <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m287.23,333.48s-1.99,11.41-3.3,27.47c-1.47,17.93,14.5,46.62.02,69.33l-16.59-6.67s1.68-6.71-1.31-16.79c-2.98-10.07-4.85-19.4-4.29-24.06,0,0,.93-19.02-5.6-30.22-1.44-2.47-3.21-5.4-5.1-8.47"/>
+      <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m265.11,369.84c.29-7.72,4.15,7.74,5.9,11.26,2.88,5.78,14.8,10.47,19.91,14.42,5.99,4.63,9.05,12.43,9.82,28.9.77,16.47,7.87,55.79,12.36,65.79s18.14,31.38,8.65,38.71c-9.5,7.33-20.84,7-29.16.49-7.05-5.52-15.18-21.29-21.58-43.18-4.41-15.07-7.41-33.69-12.06-48.53-1.44-4.6-3.22-7.65-6.52-11.36-3.03-3.41-15.2-3.44-13.88-8.99.36-1.51,1.52-2.68,2.63-3.77,7.8-7.62,7.74-13.92,14.89-21.69,7.73-8.39,10.57-9.13,9.19-19.42-.14-1.05-.19-1.91-.16-2.62Z"/>
+      <path class="uuid-cb3be09b-e4ed-4d2f-aeb3-eb49a25b2a39" d="m309.8,491.2c24.21-11.45,42.91-32.49,50.11-38.77,0,0,5.81-1.63,12.78,1.86,6.97,3.49,5.49,17.06,5.49,17.06,0,0-6.14,1.79-11.64,8.89-3.44,4.44-21.47,27.21-32.16,38.36-4.35,4.54-9.69,9.23-13.51,11.34-6.64,3.67-12.98,4.14-20.36,2.36-4.44-1.07-9.63-3.95-12.35-8.43-6.54-10.75,21.65-32.68,21.65-32.68Z"/>
+      <path class="uuid-558c6bb1-e044-4f93-8391-4d6d34535af4" d="m316.1,502.92c-.48,0-.9-.35-.99-.83-.94-5.6-2.03-9.15-2.04-9.19-.16-.53.13-1.09.66-1.25s1.09.13,1.25.66c.05.15,1.13,3.7,2.1,9.45.09.54-.28,1.06-.82,1.15-.06,0-.11.01-.17.01Z"/>
+    </g>
+    <path class="uuid-558c6bb1-e044-4f93-8391-4d6d34535af4" d="m267.95,372.49v-1.15c-7.4,1.87-21.67,12.57-21.67,12.57l-10.07,11.61,12.39,4.82c7.35-4.83,17.67-12.21,21.86-20.54-.73-1.89-1.64-4.8-2.51-7.3Z"/>
+    <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m282.09,358.04c.81-2.94,1.73-6.02,1.86-9.72,0,0,3.26-11.89,4.89-25.26.41-3.38,6.68-4.07,7.66-1.14.98,2.93,3.58,4.07,4.24,1.47.65-2.61,2.28-7.17,4.64-8.8,2.36-1.63,5.08-7.82,5.08-7.82,2.05-3.62,1.98-8.57,1.98-8.57-.42-8.27-19.71-27.18-41.61-26.34-7.23.28-14.54,2.19-20.2,6.88-10.18,8.44-12.06,23.22-11.88,35.65.11,7.34-.89,30.07-1.75,37.41-3.07,26.13-10.01,29.02-23.08,46.3-13.07,17.29-23.36,41.66-21.17,62.33,2.19,20.67,17.53,29.21,24.54,29.65,7.01.44,12.13-4.34,12.89-11.85.76-7.51-9.82-27.36-6.97-42.92,2.85-15.55,14.9-32.11,33.3-46.29,18.4-14.18,22.21-18.73,25.6-31Z"/>
+    <path class="uuid-cdf792eb-539d-4ef9-bded-f523fc7887a2" d="m296.85,323s-.31-4.53-3.66-5.54c-3.35-1.01-6.46,4.19-5.77,11.05.69,6.85,6.57,9.25,6.57,9.25"/>
+    <path class="uuid-8d511b34-cb1c-4bc4-88d6-991463184736" d="m307.72,311.86c1.52-2.32,2.74-5.1,2.74-5.1,2.05-3.62,1.98-8.57,1.98-8.57-.42-8.27-19.71-27.18-41.61-26.34-.78.03-1.57.08-2.35.15,6.05-.1,34.5,7.1,39.24,39.85Z"/>
+    <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m311.04,320.64c-.06,0-.13,0-.19,0-.51,0-.91-.43-.9-.94,0-.51.43-.9.94-.91.86,0,1.57-.1,2.01-.31.45-.23,1.01-.05,1.24.41.23.45.05,1.01-.41,1.24-.83.42-1.88.51-2.69.51Z"/>
+    <path class="uuid-61390fc4-79be-43a3-8814-cf2449c9f989" d="m314.02,312.01c-.73-.62-1.85-1.06-3.15.31,0,0,.5-1.84,1.87-2.35s1.7.92,1.29,2.04Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/empty-state-storage-classes.svg b/clients/ui/frontend/src/shared/images/empty-state-storage-classes.svg
new file mode 100644
index 000000000..8ef9353c2
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/empty-state-storage-classes.svg
@@ -0,0 +1,56 @@
+<svg id="f375cd2b-e6f3-4bc7-98f2-a51b347295b2" data-name="Icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
+  <title>Gear icon - Black</title>
+  <desc>cog, machine, operation, automation, factory, industry, automate, function, teeth, spin, objects</desc>
+  <metadata>
+    <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+    <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 8.0-c001 1.000000, 0000/00/00-00:00:00        ">
+      <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+        <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
+          <xmp:rhcc-effective-on>2023-12-08T17:35:40.666Z</xmp:rhcc-effective-on>
+          <xmp:rhcc-metadata-complete-moderator>pending</xmp:rhcc-metadata-complete-moderator>
+          <xmp:rhcc-translation-id>TRAf30b2948-fc0a-41cd-9d48-da7866412b00</xmp:rhcc-translation-id>
+          <xmp:brand-content-type>Icon</xmp:brand-content-type>
+          <xmp:CreateDate>2023-12-08T17:35:40.666Z</xmp:CreateDate>
+          <xmp:rhcc-effective-on-set-on-upload>true</xmp:rhcc-effective-on-set-on-upload>
+          <xmp:rhcc-metadata-complete-uploader>pending</xmp:rhcc-metadata-complete-uploader>
+          <xmp:rhcc-file-last-modified>2023-12-08T17:36:26.508Z</xmp:rhcc-file-last-modified>
+          <xmp:rhcc-audience>rhcc-audience:internal</xmp:rhcc-audience>
+          <xmp:rhcc-rights-restricted>no</xmp:rhcc-rights-restricted>
+          <xmp:brand-content-subtype>Icon</xmp:brand-content-subtype>
+          <xmp:rhcc-derivative-id>DERf30b2948-fc0a-41cd-9d48-da7866412b00</xmp:rhcc-derivative-id>
+          <xmp:brand-logo-color>Black</xmp:brand-logo-color>
+          <xmp:rhcc-notify-portal-subscribers-on-change>yes</xmp:rhcc-notify-portal-subscribers-on-change>
+          <dc:format>image/svg+xml</dc:format>
+          <dc:modified>2024-02-09T20:30:42.645Z</dc:modified>
+          <dc:title>
+            <rdf:Alt>
+              <rdf:li xml:lang="x-default">Gear icon - Black</rdf:li>
+            </rdf:Alt>
+          </dc:title>
+          <dc:description>
+            <rdf:Alt>
+              <rdf:li xml:lang="x-default">cog, machine, operation, automation, factory, industry, automate, function, teeth, spin, objects</rdf:li>
+            </rdf:Alt>
+          </dc:description>
+          <cq:lastReplicationAction_scene7>Activate</cq:lastReplicationAction_scene7>
+          <cq:lastReplicationAction_publish>Activate</cq:lastReplicationAction_publish>
+          <cq:lastReplicated_publish>2024-02-09T22:17:38.468Z</cq:lastReplicated_publish>
+          <cq:lastReplicatedBy>workflow-process-service</cq:lastReplicatedBy>
+          <cq:lastReplicationAction>Activate</cq:lastReplicationAction>
+          <cq:lastReplicatedBy_publish>workflow-process-service</cq:lastReplicatedBy_publish>
+          <cq:isDelivered>true</cq:isDelivered>
+          <cq:lastReplicated>2024-02-09T22:17:38.468Z</cq:lastReplicated>
+          <cq:lastReplicatedBy_scene7>workflow-process-service</cq:lastReplicatedBy_scene7>
+          <cq:lastReplicated_scene7>2024-02-09T22:17:38.468Z</cq:lastReplicated_scene7>
+          <tiff:ImageLength>36</tiff:ImageLength>
+          <tiff:ImageWidth>36</tiff:ImageWidth>
+        </rdf:Description>
+      </rdf:RDF>
+    </x:xmpmeta>
+    <?xpacket end="w"?>
+  </metadata>
+  <g>
+    <path d="M32.36,15.29a.62.62,0,0,0-.61-.51H28.41A10.58,10.58,0,0,0,27.67,13L30,10.6a.62.62,0,0,0,.08-.79A14.72,14.72,0,0,0,26.3,6a.62.62,0,0,0-.8.08L23.15,8.39a11,11,0,0,0-1.84-.77V4.26a.62.62,0,0,0-.51-.61,14.25,14.25,0,0,0-5.41,0,.62.62,0,0,0-.52.62V7.56a10.8,10.8,0,0,0-1.9.77L10.6,6a.63.63,0,0,0-.79-.08A14.72,14.72,0,0,0,6,9.7a.62.62,0,0,0,.08.8l2.35,2.35a10.48,10.48,0,0,0-.8,1.93H4.25a.62.62,0,0,0-.61.51,14.25,14.25,0,0,0,0,5.42.62.62,0,0,0,.61.51H7.59a10.48,10.48,0,0,0,.8,1.93L6,25.5a.62.62,0,0,0-.08.8,14.72,14.72,0,0,0,3.85,3.82A.62.62,0,0,0,10.6,30L13,27.67a10.8,10.8,0,0,0,1.9.77v3.32a.62.62,0,0,0,.52.62,14.49,14.49,0,0,0,5.41,0,.62.62,0,0,0,.51-.61V28.38a11,11,0,0,0,1.84-.77L25.5,30a.62.62,0,0,0,.8.08,14.72,14.72,0,0,0,3.82-3.85A.62.62,0,0,0,30,25.4L27.67,23a10.58,10.58,0,0,0,.74-1.81h3.34a.62.62,0,0,0,.61-.51,14.25,14.25,0,0,0,0-5.42ZM31.22,20H27.94a.62.62,0,0,0-.6.47,9.78,9.78,0,0,1-1,2.39.62.62,0,0,0,.1.75l2.33,2.33A13.13,13.13,0,0,1,26,28.7L23.7,26.39a.64.64,0,0,0-.77-.1,9.49,9.49,0,0,1-2.41,1,.63.63,0,0,0-.46.61v3.29a12.69,12.69,0,0,1-3.94,0V28a.62.62,0,0,0-.47-.6,9.92,9.92,0,0,1-2.48-1,.62.62,0,0,0-.75.1l-2.33,2.33A13.13,13.13,0,0,1,7.3,26l2.31-2.32a.62.62,0,0,0,.1-.76,9.27,9.27,0,0,1-1.05-2.49.62.62,0,0,0-.6-.47H4.78a12.21,12.21,0,0,1,0-3.94H8.06a.62.62,0,0,0,.6-.47,9.27,9.27,0,0,1,1.05-2.49.64.64,0,0,0-.1-.77L7.3,10a13.13,13.13,0,0,1,2.79-2.78l2.33,2.33a.62.62,0,0,0,.75.1,9.92,9.92,0,0,1,2.48-1,.62.62,0,0,0,.47-.6V4.77a12.69,12.69,0,0,1,3.94,0V8.08a.63.63,0,0,0,.46.61,9.49,9.49,0,0,1,2.41,1,.64.64,0,0,0,.77-.1L26,7.3a13.13,13.13,0,0,1,2.78,2.79l-2.33,2.33a.62.62,0,0,0-.1.75,9.78,9.78,0,0,1,1,2.39.62.62,0,0,0,.6.47h3.28a12.21,12.21,0,0,1,0,3.94Z" />
+    <path d="M18,13.38A4.62,4.62,0,1,0,22.62,18,4.62,4.62,0,0,0,18,13.38Zm0,8A3.38,3.38,0,1,1,21.38,18,3.39,3.39,0,0,1,18,21.38Z" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/clients/ui/frontend/src/shared/images/icons/AcceleratorProfileIcon.ts b/clients/ui/frontend/src/shared/images/icons/AcceleratorProfileIcon.ts
new file mode 100644
index 000000000..5b863ff6e
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/AcceleratorProfileIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const AcceleratorProfileIcon = createIcon({
+  name: 'AcceleratorProfileIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 6,17.62 A 0.62,0.62 0 0 0 6.62,17 V 5.62 H 20 A 0.62,0.62 0 1 0 20,4.38 H 6 A 0.62,0.62 0 0 0 5.38,5 V 17 A 0.62,0.62 0 0 0 6,17.62 Z M 31,15.38 A 0.62,0.62 0 0 0 30.38,16 V 29.38 H 19 a 0.62,0.62 0 0 0 0,1.24 H 31 A 0.62,0.62 0 0 0 31.62,30 V 16 A 0.62,0.62 0 0 0 31,15.38 Z M 31.58,4.78 A 0.62,0.62 0 0 0 31,4.38 h -7 a 0.62,0.62 0 0 0 0,1.24 h 5.49 L 15.74,19.38 H 5 A 0.62,0.62 0 0 0 4.38,20 V 31 A 0.62,0.62 0 0 0 5,31.62 H 16 A 0.62,0.62 0 0 0 16.62,31 V 20.26 L 30.38,6.51 V 12 a 0.62,0.62 0 0 0 1.24,0 V 5 A 0.54,0.54 0 0 0 31.58,4.78 Z m -16.2,25.6 H 5.62 v -9.76 h 9.76 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default AcceleratorProfileIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ArtifactIcon.ts b/clients/ui/frontend/src/shared/images/icons/ArtifactIcon.ts
new file mode 100644
index 000000000..b572e3901
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ArtifactIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ArtifactIcon = createIcon({
+  name: 'ArtifactIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 30.7,20.23 18,27.29 5.3,20.23 a 0.62211333,0.62211333 0 1 0 -0.6,1.09 l 13,7.23 a 0.68,0.68 0 0 0 0.6,0 l 13,-7.23 a 0.62211333,0.62211333 0 1 0 -0.6,-1.09 z m -26,-4.68 13,7.22 a 0.6,0.6 0 0 0 0.6,0 l 13,-7.22 a 0.63,0.63 0 0 0 0,-1.1 l -13,-7.22 a 0.64,0.64 0 0 0 -0.6,0 l -13,7.22 a 0.63,0.63 0 0 0 0,1.1 z M 18,8.49 29.71,15 18,21.51 6.29,15 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ArtifactIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/BuildIcon.ts b/clients/ui/frontend/src/shared/images/icons/BuildIcon.ts
new file mode 100644
index 000000000..77b25f03e
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/BuildIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const BuildIcon = createIcon({
+  name: 'BuildIcon',
+  width: 48,
+  height: 48,
+  svgPath:
+    'M 14.5,35 A 1.5,1.5 0 0 1 13,36.5 1.5,1.5 0 0 1 11.5,35 1.5,1.5 0 0 1 13,33.5 1.5,1.5 0 0 1 14.5,35 Z M 39.74,12.91 c -0.15,-0.28 -0.42,-0.47 -0.73,-0.52 -0.31,-0.04 -0.63,0.06 -0.86,0.28 l -6.12,6.12 c -0.75,0.75 -2.07,0.75 -2.83,0 -0.38,-0.38 -0.58,-0.88 -0.58,-1.41 0,-0.53 0.21,-1.04 0.58,-1.41 L 35.32,9.85 C 35.54,9.63 35.65,9.31 35.6,8.99 35.55,8.68 35.36,8.4 35.08,8.26 33.53,7.44 31.77,7 29.99,7 c -6.07,0 -11,4.93 -11,11 0,1.03 0.14,2.05 0.43,3.03 L 8.55,31.9 c -1.01,1.01 -1.56,2.34 -1.56,3.77 0,1.43 0.55,2.76 1.56,3.77 1.01,1.01 2.4,1.56 3.77,1.56 1.37,0 2.73,-0.52 3.77,-1.56 L 26.96,28.57 c 0.98,0.29 2,0.43 3.03,0.43 6.07,0 11,-4.93 11,-11 0,-1.77 -0.43,-3.53 -1.26,-5.09 z M 30,27 c -1.02,0 -2.02,-0.17 -2.97,-0.51 -0.36,-0.13 -0.77,-0.04 -1.04,0.24 l -11.3,11.3 c -1.3,1.3 -3.41,1.3 -4.71,0 -0.63,-0.63 -0.97,-1.46 -0.97,-2.35 0,-0.89 0.35,-1.72 0.97,-2.35 l 11.3,-11.3 c 0.27,-0.27 0.36,-0.68 0.24,-1.04 -0.34,-0.96 -0.51,-1.96 -0.51,-2.97 0,-4.96 4.04,-9 9,-9 1,0 1.96,0.16 2.88,0.47 l -5.08,5.08 c -1.56,1.56 -1.56,4.1 0,5.65 1.56,1.55 4.1,1.56 5.65,0 l 5.08,-5.08 c 0.31,0.92 0.47,1.88 0.47,2.88 0,4.96 -4.04,9 -9,9 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default BuildIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ClusterSettingsIcon.ts b/clients/ui/frontend/src/shared/images/icons/ClusterSettingsIcon.ts
new file mode 100644
index 000000000..be9d8672f
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ClusterSettingsIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ClusterSettingsIcon = createIcon({
+  name: 'ClusterSettingsIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M26.46,18.62a2.62,2.62,0,1,0,0-1.24h-4.9a3.56,3.56,0,0,0-.6-1.46l6.69-6.68A2.56,2.56,0,0,0,29,9.62,2.62,2.62,0,1,0,26.38,7a2.56,2.56,0,0,0,.38,1.35L20.08,15a3.56,3.56,0,0,0-1.46-.6V9.54a2.62,2.62,0,1,0-1.24,0v4.9a3.56,3.56,0,0,0-1.46.6L9.24,8.35A2.56,2.56,0,0,0,9.62,7,2.62,2.62,0,1,0,7,9.62a2.56,2.56,0,0,0,1.35-.38L15,15.92a3.56,3.56,0,0,0-.6,1.46H9.54a2.62,2.62,0,1,0,0,1.24h4.9a3.56,3.56,0,0,0,.6,1.46L8.35,26.76A2.56,2.56,0,0,0,7,26.38,2.62,2.62,0,1,0,9.62,29a2.56,2.56,0,0,0-.38-1.35L15.92,21a3.56,3.56,0,0,0,1.46.6v4.9a2.62,2.62,0,1,0,1.24,0v-4.9a3.56,3.56,0,0,0,1.46-.6l6.68,6.69A2.56,2.56,0,0,0,26.38,29,2.62,2.62,0,1,0,29,26.38a2.56,2.56,0,0,0-1.35.38L21,20.08a3.56,3.56,0,0,0,.6-1.46Zm2.54-2A1.38,1.38,0,1,1,27.62,18,1.38,1.38,0,0,1,29,16.62Zm0-11A1.38,1.38,0,1,1,27.62,7,1.38,1.38,0,0,1,29,5.62ZM5.62,7A1.38,1.38,0,1,1,7,8.38,1.38,1.38,0,0,1,5.62,7ZM7,19.38A1.38,1.38,0,1,1,8.38,18,1.38,1.38,0,0,1,7,19.38Zm0,11A1.38,1.38,0,1,1,8.38,29,1.38,1.38,0,0,1,7,30.38ZM30.38,29A1.38,1.38,0,1,1,29,27.62,1.38,1.38,0,0,1,30.38,29ZM16.62,7A1.38,1.38,0,1,1,18,8.38,1.38,1.38,0,0,1,16.62,7Zm2.76,22A1.38,1.38,0,1,1,18,27.62,1.38,1.38,0,0,1,19.38,29ZM18,20.38A2.38,2.38,0,1,1,20.38,18,2.39,2.39,0,0,1,18,20.38Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ClusterSettingsIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ConfigurationIcon.ts b/clients/ui/frontend/src/shared/images/icons/ConfigurationIcon.ts
new file mode 100644
index 000000000..2bf41931d
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ConfigurationIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ConfigurationIcon = createIcon({
+  name: 'ConfigurationIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 18,13.38 A 4.62,4.62 0 1 0 22.62,18 4.62,4.62 0 0 0 18,13.38 Z m 0,8 A 3.38,3.38 0 1 1 21.38,18 3.39,3.39 0 0 1 18,21.38 Z M 32.36,15.29 A 0.62,0.62 0 0 0 31.75,14.78 H 28.41 A 10.58,10.58 0 0 0 27.67,13 L 30,10.6 A 0.62,0.62 0 0 0 30.08,9.81 14.72,14.72 0 0 0 26.3,6 0.62,0.62 0 0 0 25.5,6.08 L 23.15,8.39 A 11,11 0 0 0 21.31,7.62 V 4.26 a 0.62,0.62 0 0 0 -0.51,-0.61 14.25,14.25 0 0 0 -5.41,0 0.62,0.62 0 0 0 -0.52,0.62 v 3.29 a 10.8,10.8 0 0 0 -1.9,0.77 L 10.6,6 A 0.63,0.63 0 0 0 9.81,5.92 14.72,14.72 0 0 0 6,9.7 0.62,0.62 0 0 0 6.08,10.5 l 2.35,2.35 a 10.48,10.48 0 0 0 -0.8,1.93 H 4.25 a 0.62,0.62 0 0 0 -0.61,0.51 14.25,14.25 0 0 0 0,5.42 0.62,0.62 0 0 0 0.61,0.51 h 3.34 a 10.48,10.48 0 0 0 0.8,1.93 L 6,25.5 A 0.62,0.62 0 0 0 5.92,26.3 14.72,14.72 0 0 0 9.77,30.12 0.62,0.62 0 0 0 10.6,30 L 13,27.67 a 10.8,10.8 0 0 0 1.9,0.77 v 3.32 a 0.62,0.62 0 0 0 0.52,0.62 14.49,14.49 0 0 0 5.41,0 0.62,0.62 0 0 0 0.51,-0.61 v -3.39 a 11,11 0 0 0 1.84,-0.77 L 25.5,30 a 0.62,0.62 0 0 0 0.8,0.08 14.72,14.72 0 0 0 3.82,-3.85 A 0.62,0.62 0 0 0 30,25.4 L 27.67,23 a 10.58,10.58 0 0 0 0.74,-1.81 h 3.34 a 0.62,0.62 0 0 0 0.61,-0.51 14.25,14.25 0 0 0 0,-5.42 z M 31.22,20 h -3.28 a 0.62,0.62 0 0 0 -0.6,0.47 9.78,9.78 0 0 1 -1,2.39 0.62,0.62 0 0 0 0.1,0.75 l 2.33,2.33 A 13.13,13.13 0 0 1 26,28.7 l -2.3,-2.31 a 0.64,0.64 0 0 0 -0.77,-0.1 9.49,9.49 0 0 1 -2.41,1 0.63,0.63 0 0 0 -0.46,0.61 v 3.29 a 12.69,12.69 0 0 1 -3.94,0 V 28 a 0.62,0.62 0 0 0 -0.47,-0.6 9.92,9.92 0 0 1 -2.48,-1 0.62,0.62 0 0 0 -0.75,0.1 l -2.33,2.33 A 13.13,13.13 0 0 1 7.3,26 L 9.61,23.68 A 0.62,0.62 0 0 0 9.71,22.92 9.27,9.27 0 0 1 8.66,20.43 0.62,0.62 0 0 0 8.06,19.96 H 4.78 a 12.21,12.21 0 0 1 0,-3.94 h 3.28 a 0.62,0.62 0 0 0 0.6,-0.47 9.27,9.27 0 0 1 1.05,-2.49 0.64,0.64 0 0 0 -0.1,-0.77 L 7.3,10 a 13.13,13.13 0 0 1 2.79,-2.78 l 2.33,2.33 a 0.62,0.62 0 0 0 0.75,0.1 9.92,9.92 0 0 1 2.48,-1 0.62,0.62 0 0 0 0.47,-0.6 V 4.77 a 12.69,12.69 0 0 1 3.94,0 v 3.31 a 0.63,0.63 0 0 0 0.46,0.61 9.49,9.49 0 0 1 2.41,1 0.64,0.64 0 0 0 0.77,-0.1 L 26,7.3 a 13.13,13.13 0 0 1 2.78,2.79 l -2.33,2.33 a 0.62,0.62 0 0 0 -0.1,0.75 9.78,9.78 0 0 1 1,2.39 0.62,0.62 0 0 0 0.6,0.47 h 3.28 a 12.21,12.21 0 0 1 0,3.94 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ConfigurationIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/CreateAndTrainIcon.ts b/clients/ui/frontend/src/shared/images/icons/CreateAndTrainIcon.ts
new file mode 100644
index 000000000..2fef56f26
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/CreateAndTrainIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const CreateAndTrainIcon = createIcon({
+  name: 'CreateAndTrainIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 25.55,25.12 a 10.43,10.43 0 0 1 -15.1,0 c -0.54,-0.6 -1.47,0.28 -0.9,0.86 a 11.67,11.67 0 0 0 16.9,0 C 27,25.4 26.1,24.52 25.55,25.12 Z M 10.45,10.88 a 10.43,10.43 0 0 1 15.1,0 c 0.54,0.6 1.47,-0.28 0.9,-0.86 a 11.67,11.67 0 0 0 -16.9,0 C 9,10.6 9.9,11.48 10.45,10.88 Z M 5.56,21.56 c -0.6,0.56 0.32,1.46 0.88,0.88 C 7,21.86 6.13,21 5.56,21.56 Z m 2.2,-7.98 a 0.63,0.63 0 0 0 0.48,-1.16 0.63,0.63 0 0 0 -0.48,1.16 z m 7.48,3.84 A 0.63,0.63 0 1 0 15,18.63 0.63,0.63 0 0 0 15.24,17.42 Z M 13.62,21 a 2.62,2.62 0 0 0 -5.24,0 2.62,2.62 0 0 0 5.24,0 z m -4,0 a 1.38,1.38 0 0 1 2.75,0 1.38,1.38 0 0 1 -2.75,0 z M 12,17.62 a 2.62,2.62 0 0 0 0,-5.24 2.62,2.62 0 0 0 0,5.24 z m 0,-4 a 1.38,1.38 0 0 1 0,2.75 1.38,1.38 0 0 1 0,-2.75 z m -6,0.76 a 2.62,2.62 0 0 0 0,5.24 2.62,2.62 0 0 0 0,-5.24 z m 0,4 a 1.38,1.38 0 0 1 0,-2.75 1.38,1.38 0 0 1 0,2.75 z m 21,-6 c -7.43,0.23 -7.43,11 0,11.25 7.43,-0.24 7.43,-11.02 0,-11.25 z m 0,10 a 4.38,4.38 0 0 1 0,-8.76 4.38,4.38 0 0 1 0,8.76 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default CreateAndTrainIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/DataConnectionIcon.ts b/clients/ui/frontend/src/shared/images/icons/DataConnectionIcon.ts
new file mode 100644
index 000000000..d47b342ab
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/DataConnectionIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const DataConnectionIcon = createIcon({
+  name: 'DataConnectionIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M27,24.375c-.4968,0-.9568.1466-1.3533.3874l-4.6847-4.6847c.4148-.5894.663-1.3037.663-2.0777,0-.0441-.0114-.0851-.013-.1288l2.061-.4381c.5568,1.2875,1.8372,2.1919,3.327,2.1919,1.999,0,3.625-1.626,3.625-3.625s-1.626-3.625-3.625-3.625-3.625,1.626-3.625,3.625c0,.0733.0173.1418.0217.214l-2.0392.4334c-.3837-.9488-1.1584-1.6893-2.1227-2.0415l.848-3.9893c1.4082-.0449,2.5422-1.1977,2.5422-2.6166,0-1.4473-1.1777-2.625-2.625-2.625s-2.625,1.1777-2.625,2.625c0,1.0374.61,1.9279,1.4857,2.3539l-.8549,4.0217c-.002,0-.0038-.0006-.0059-.0006-.774,0-1.4883.2482-2.0777.663l-3.9603-3.9603c.4148-.5894.663-1.3037.663-2.0777,0-1.999-1.626-3.625-3.625-3.625s-3.625,1.626-3.625,3.625,1.626,3.625,3.625,3.625c.774,0,1.4883-.2482,2.0777-.663l3.9603,3.9603c-.4148.5894-.663,1.3037-.663,2.0777,0,.0441.0115.0851.0131.1289l-3.0765.6539c-.4406-.8327-1.3058-1.4078-2.3116-1.4078-1.4473,0-2.625,1.1777-2.625,2.625s1.1777,2.625,2.625,2.625,2.625-1.1777,2.625-2.625c0-.002-.0006-.0038-.0006-.0058l3.0181-.6415c.3526.8719,1.0331,1.5739,1.8898,1.9556l-.4413,2.076c-.0309-.0008-.0598-.0092-.091-.0092-1.999,0-3.625,1.626-3.625,3.625s1.626,3.625,3.625,3.625,3.625-1.626,3.625-3.625c0-1.5336-.9604-2.84-2.3086-3.3688l.4318-2.0317c.0847.0059.1656.0255.2518.0255.774,0,1.4883-.2482,2.0777-.663l4.6847,4.6847c-.2408.3965-.3874.8566-.3874,1.3533,0,1.4473,1.1777,2.625,2.625,2.625s2.625-1.1777,2.625-2.625-1.1777-2.625-2.625-2.625ZM27,13.625c1.3096,0,2.375,1.0654,2.375,2.375s-1.0654,2.375-2.375,2.375-2.375-1.0654-2.375-2.375,1.0654-2.375,2.375-2.375ZM18.625,8c0-.7583.6167-1.375,1.375-1.375s1.375.6167,1.375,1.375c0,.7578-.6167,1.375-1.375,1.375s-1.375-.6172-1.375-1.375ZM9,11.375c-1.3096,0-2.375-1.0654-2.375-2.375s1.0654-2.375,2.375-2.375,2.375,1.0654,2.375,2.375-1.0654,2.375-2.375,2.375ZM9,21.375c-.7583,0-1.375-.6172-1.375-1.375s.6167-1.375,1.375-1.375,1.375.6172,1.375,1.375-.6167,1.375-1.375,1.375ZM18.375,27c0,1.3096-1.0654,2.375-2.375,2.375s-2.375-1.0654-2.375-2.375,1.0654-2.375,2.375-2.375,2.375,1.0654,2.375,2.375ZM15.625,18c0-1.3096,1.0654-2.375,2.375-2.375s2.375,1.0654,2.375,2.375-1.0654,2.375-2.375,2.375-2.375-1.0654-2.375-2.375ZM27,28.375c-.7583,0-1.375-.6172-1.375-1.375s.6167-1.375,1.375-1.375,1.375.6172,1.375,1.375-.6167,1.375-1.375,1.375Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default DataConnectionIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/DeployedModelIcon.ts b/clients/ui/frontend/src/shared/images/icons/DeployedModelIcon.ts
new file mode 100644
index 000000000..d739b9b8a
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/DeployedModelIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const DeployedModelIcon = createIcon({
+  name: 'DeployedModelIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 19.5,31.375 c -0.6616,0 -1.3007,-0.1774 -1.875,-0.4969 V 16.625 H 22 c 0.8228,0 1.6152,0.2998 2.2319,0.8438 0.1191,0.1045 0.2666,0.1562 0.4136,0.1562 0.1729,0 0.3452,-0.0713 0.4688,-0.2119 0.2285,-0.2588 0.2036,-0.6533 -0.0552,-0.8818 -0.6765,-0.5964 -1.5097,-0.9667 -2.3925,-1.0956 0.5895,-0.6449 0.9584,-1.495 0.9584,-2.4356 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,1.3096 -1.0654,2.375 -2.375,2.375 H 17.625 V 5.3434 C 18.149,4.8861 18.8014,4.625 19.5,4.625 c 1.0716,0 2.0559,0.6158 2.5467,1.572 C 21.626,6.914 20.8513,7.375 20,7.375 c -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 1.3695,0 2.6091,-0.7805 3.2228,-1.9775 1.7554,0.1171 3.1522,1.5674 3.1522,3.3525 0,0.4141 -0.0815,0.8301 -0.2427,1.2363 -0.1235,0.3125 0.0215,0.667 0.3291,0.8027 1.77,0.7793 2.9136,2.5312 2.9136,4.4609 0,0.7812 -0.1792,1.5264 -0.5332,2.2148 -0.1577,0.3066 -0.0366,0.6836 0.2705,0.8408 0.3071,0.1582 0.6841,0.0361 0.8418,-0.2705 0.439,-0.8545 0.6709,-1.8174 0.6709,-2.7852 0,-2.2344 -1.2192,-4.2783 -3.1499,-5.3516 0.0996,-0.3789 0.1499,-0.7637 0.1499,-1.1484 0,-2.542 -2.061,-4.6113 -4.5996,-4.625 -0.7412,-1.2275 -2.0811,-2 -3.5254,-2 -0.9155,0 -1.7842,0.2969 -2.5,0.8467 -0.7158,-0.5498 -1.5845,-0.8467 -2.5,-0.8467 -1.4443,0 -2.7837,0.7725 -3.5254,2 -2.5386,0.0137 -4.5996,2.083 -4.5996,4.625 0,0.3848 0.0503,0.7695 0.1499,1.1484 -1.7631,0.9801 -2.9211,2.7722 -3.1109,4.777 -0.0032,0.0256 -0.0151,0.0481 -0.0151,0.0745 0,0.0131 0.0067,0.0241 0.0075,0.037 -0.0118,0.1541 -0.0314,0.3067 -0.0314,0.463 0,1.917 0.8857,3.6943 2.3936,4.8516 -0.2612,0.6904 -0.3936,1.4102 -0.3936,2.1484 0,2.7324 1.7812,5.0967 4.3735,5.8643 0.7656,1.9648 2.6338,3.2607 4.7515,3.2607 0.8804,0 1.7368,-0.2246 2.5,-0.6523 0.7632,0.4277 1.6196,0.6523 2.5,0.6523 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 z M 10.8525,28.7283 V 26 c 0,-0.7578 0.6167,-1.375 1.375,-1.375 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -1.4473,0 -2.625,1.1777 -2.625,2.625 v 1.9849 C 7.8165,27.2365 6.625,25.4922 6.625,23.5 6.625,22.7734 6.7866,22.0674 7.1055,21.4014 7.2422,21.1172 7.1446,20.7754 6.8789,20.6055 5.5035,19.725 4.6742,18.243 4.6329,16.625 H 7 c 1.3096,0 2.375,1.0654 2.375,2.375 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.9425 -0.3702,-1.7943 -0.9618,-2.4396 1.694,-0.3038 2.9857,-1.7803 2.9857,-3.5604 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,1.3096 -1.0654,2.375 -2.375,2.375 H 4.7695 C 5.1186,13.913 6.122,12.6627 7.5385,12.0391 7.8461,11.9034 7.9911,11.5489 7.8676,11.2364 7.7065,10.8302 7.6249,10.4141 7.6249,10.0001 c 0,-1.8613 1.5142,-3.375 3.375,-3.375 0.0405,0 0.0791,0.0068 0.1182,0.0127 l 0.1641,0.0186 C 11.5468,6.672 11.7885,6.5334 11.8984,6.297 12.3701,5.2814 13.3911,4.6251 14.5,4.6251 c 0.6986,0 1.351,0.2612 1.875,0.7184 v 4.9375 c -1.0052,-0.2764 -1.75,-1.1891 -1.75,-2.2809 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,1.785 1.2992,3.2637 3,3.5618 v 19.3163 c -0.5743,0.3195 -1.2134,0.4969 -1.875,0.4969 -1.6612,0 -3.1146,-1.0621 -3.6475,-2.6467 z M 27,21.375 c -3.1016,0 -5.625,2.5234 -5.625,5.625 0,3.1016 2.5234,5.625 5.625,5.625 3.1016,0 5.625,-2.5234 5.625,-5.625 0,-3.1016 -2.5234,-5.625 -5.625,-5.625 z m 0,10 c -2.4126,0 -4.375,-1.9629 -4.375,-4.375 0,-2.4121 1.9624,-4.375 4.375,-4.375 2.4126,0 4.375,1.9629 4.375,4.375 0,2.4121 -1.9624,4.375 -4.375,4.375 z m 1.2246,-5.9277 -1.7803,1.7803 -0.6689,-0.6689 c -0.2437,-0.2432 -0.6392,-0.2461 -0.8838,-0.001 -0.2441,0.2441 -0.2441,0.6396 0,0.8838 l 1.1108,1.1113 c 0.1172,0.1182 0.2759,0.1836 0.4419,0.1836 0.166,0 0.3247,-0.0654 0.4419,-0.1836 l 2.2222,-2.2217 c 0.2441,-0.2441 0.2441,-0.6406 0,-0.8848 -0.2441,-0.2442 -0.6396,-0.2432 -0.8838,10e-4 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default DeployedModelIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/DistributedWorkloadIcon.ts b/clients/ui/frontend/src/shared/images/icons/DistributedWorkloadIcon.ts
new file mode 100644
index 000000000..ced5ce589
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/DistributedWorkloadIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const DistributedWorkloadIcon = createIcon({
+  name: 'DistributedWorkloadIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M28.62,24.44V18a.62.62,0,0,0-.62-.62H18.62V11.56a3.62,3.62,0,1,0-1.24,0v5.82H8a.62.62,0,0,0-.62.62v6.44a3.62,3.62,0,1,0,1.24,0V18.62h8.76v5.82a3.62,3.62,0,1,0,1.24,0V18.62h8.76v5.82a3.62,3.62,0,1,0,1.24,0ZM15.62,8a2.38,2.38,0,0,1,4.75,0A2.38,2.38,0,0,1,15.62,8ZM10.38,28a2.38,2.38,0,0,1-4.75,0A2.38,2.38,0,0,1,10.38,28Zm10,0a2.38,2.38,0,0,1-4.75,0A2.38,2.38,0,0,1,20.38,28ZM28,30.38a2.38,2.38,0,0,1,0-4.75A2.38,2.38,0,0,1,28,30.38Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default DistributedWorkloadIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/EnabledApplicationsIcon.ts b/clients/ui/frontend/src/shared/images/icons/EnabledApplicationsIcon.ts
new file mode 100644
index 000000000..ffde8d515
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/EnabledApplicationsIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const EnabledApplicationsIcon = createIcon({
+  name: 'EnabledApplicationsIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 14.558,23.442 a 0.625,0.625 0 0 0 0.884,0 l 10.5,-10.5 A 0.62508239,0.62508239 0 0 0 25.058,12.058 L 15,22.116 11.442,18.558 a 0.62508239,0.62508239 0 0 0 -0.884,0.884 z M 31,4.375 H 5 A 0.625,0.625 0 0 0 4.375,5 V 31 A 0.625,0.625 0 0 0 5,31.625 H 31 A 0.625,0.625 0 0 0 31.625,31 V 5 A 0.625,0.625 0 0 0 31,4.375 Z m -0.625,26 H 5.625 V 5.625 h 24.75 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default EnabledApplicationsIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ExperimentIcon.ts b/clients/ui/frontend/src/shared/images/icons/ExperimentIcon.ts
new file mode 100644
index 000000000..976ca1422
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ExperimentIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ExperimentIcon = createIcon({
+  name: 'ExperimentIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 16.56,5.44 c 0.55,0.59 1.48,-0.32 0.88,-0.88 a 0.62225397,0.62225397 0 0 0 -0.88,0.88 z m 2,7 c 0.57,0.58 1.47,-0.31 0.88,-0.88 -0.59,-0.57 -1.44,0.31 -0.88,0.88 z m -2,6 a 0.62225397,0.62225397 0 0 0 0.88,-0.88 C 16.86,17 16,17.87 16.56,18.44 Z M 27.39,27.3 21.62,13 V 7.62 c 0.72,-0.07 2,0.3 2,-0.62 A 0.62,0.62 0 0 0 23,6.38 h -2 a 0.62,0.62 0 0 0 -0.62,0.7 v 6 a 0.5,0.5 0 0 0 0,0.12 c 0,0 0,0.08 0,0.12 l 2.83,7 H 12.75 l 2.83,-7 c 0,0 0,-0.08 0,-0.12 a 0.5,0.5 0 0 0 0,-0.12 v -6 A 0.62,0.62 0 0 0 14.96,6.38 H 13 a 0.62,0.62 0 0 0 0,1.24 h 1.38 V 13 L 8.61,27.3 a 3.14,3.14 0 0 0 2.89,4.32 h 13 a 3.14,3.14 0 0 0 2.89,-4.32 z m -2.89,3.08 h -13 A 1.89,1.89 0 0 1 9.62,28.5 c -0.23,-0.16 2.54,-6.53 2.62,-6.88 h 11.52 l 2.47,6.15 a 1.89,1.89 0 0 1 -1.73,2.61 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ExperimentIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ExploreApplicationsIcon.ts b/clients/ui/frontend/src/shared/images/icons/ExploreApplicationsIcon.ts
new file mode 100644
index 000000000..b219ef57c
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ExploreApplicationsIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ExploreApplicationsIcon = createIcon({
+  name: 'ExploreApplicationsIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 23,22.38 A 0.63,0.63 0 1 0 23.62,23 0.62,0.62 0 0 0 23,22.38 Z m -8.5,-15 a 7.12,7.12 0 0 0 -7.12,7.12 0.62,0.62 0 1 0 1.24,0 5.89,5.89 0 0 1 5.88,-5.88 0.62,0.62 0 0 0 0,-1.24 z m 16.94,23.18 -6,-6 c -0.56,-0.58 -1.46,0.32 -0.88,0.88 l 6,6 a 0.62225397,0.62225397 0 0 0 0.88,-0.88 z M 14.5,4.38 A 10.12,10.12 0 1 0 24.62,14.5 10.13,10.13 0 0 0 14.5,4.38 Z m 0,19 a 8.88,8.88 0 1 1 8.88,-8.88 8.9,8.9 0 0 1 -8.88,8.88 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ExploreApplicationsIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/GroupIcon.ts b/clients/ui/frontend/src/shared/images/icons/GroupIcon.ts
new file mode 100644
index 000000000..f13683fef
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/GroupIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const GroupIcon = createIcon({
+  name: 'GroupIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 27.87,23.29 a 3.86,3.86 0 1 0 -4.74,0 A 7.11,7.11 0 0 0 18.38,30 0.61,0.61 0 0 0 19,30.62 H 32 A 0.63,0.63 0 0 0 32.63,30 7.13,7.13 0 0 0 27.87,23.29 Z m -5,-3 a 2.62,2.62 0 0 1 5.24,0 2.62,2.62 0 0 1 -5.23,-0.04 z m -3.22,9.13 c 0.84,-6.94 10.84,-6.93 11.68,0 z M 16,19.38 a 0.62,0.62 0 0 0 0,1.24 h 4 a 0.62,0.62 0 0 0 0,-1.24 z m -2.63,-4 a 6,6 0 0 1 9.48,0.18 0.61,0.61 0 0 0 0.66,-0.07 c 1.07,-1 -2.27,-3 -3.13,-3.21 a 3.86,3.86 0 1 0 -4.76,0 c -0.86,0.25 -4.2,2.18 -3.13,3.21 a 0.62,0.62 0 0 0 0.88,-0.11 z m 2,-6.13 a 2.62,2.62 0 0 1 5.24,0 2.62,2.62 0 0 1 -5.23,0 z m -2.5,14.04 a 3.86,3.86 0 1 0 -4.74,0 A 7.11,7.11 0 0 0 3.38,30 0.61,0.61 0 0 0 4,30.62 H 17 A 0.63,0.63 0 0 0 17.63,30 7.13,7.13 0 0 0 12.87,23.29 Z m -5,-3 a 2.62,2.62 0 0 1 5.24,0 2.62,2.62 0 0 1 -5.23,-0.04 z m -3.21,9.09 c 0.84,-6.94 10.84,-6.93 11.68,0 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default GroupIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ModelIcon.ts b/clients/ui/frontend/src/shared/images/icons/ModelIcon.ts
new file mode 100644
index 000000000..e839ec652
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ModelIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ModelIcon = createIcon({
+  name: 'ModelIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 19.8432,19.1348 c 0.4556,-1.0236 1.5624,-3.5098 1.5624,-3.5098 h 4.0529 c 0.2823,1.145 1.3107,2 2.5415,2 1.4473,0 2.625,-1.1777 2.625,-2.625 0,-1.4473 -1.1777,-2.625 -2.625,-2.625 -1.2308,0 -2.2592,0.855 -2.5415,2 H 21 c -0.2089,0.0208 -0.4269,0.1096 -0.5259,0.3079 -0.0163,0.0255 -0.0398,0.0452 -0.0501,0.0751 0,0 -1.2868,2.8907 -1.6658,3.742 C 18.5166,18.4264 18.2654,18.3751 18,18.3751 c -1.4473,0 -2.625,1.1777 -2.625,2.625 0,1.4473 1.1777,2.625 2.625,2.625 1.4473,0 2.625,-1.1777 2.625,-2.625 0,-0.7292 -0.2999,-1.389 -0.7818,-1.8652 z M 28,13.625 c 0.7583,0 1.375,0.6172 1.375,1.375 0,0.7578 -0.6167,1.375 -1.375,1.375 -0.7583,0 -1.375,-0.6172 -1.375,-1.375 0,-0.7578 0.6167,-1.375 1.375,-1.375 z m -10,8.75 c -0.7583,0 -1.375,-0.6172 -1.375,-1.375 0,-0.7578 0.6167,-1.375 1.375,-1.375 0.7583,0 1.375,0.6172 1.375,1.375 0,0.7578 -0.6167,1.375 -1.375,1.375 z m 11,-3 c -1.2308,0 -2.2592,0.855 -2.5415,2 H 24 c -0.3452,0 -0.625,0.2803 -0.625,0.625 v 4.4585 c -1.145,0.2823 -2,1.3107 -2,2.5415 0,1.4473 1.1777,2.625 2.625,2.625 1.4473,0 2.625,-1.1777 2.625,-2.625 0,-1.2308 -0.855,-2.2592 -2,-2.5415 V 22.625 h 1.8335 c 0.2823,1.145 1.3107,2 2.5415,2 1.4473,0 2.625,-1.1777 2.625,-2.625 0,-1.4473 -1.1777,-2.625 -2.625,-2.625 z M 25.375,29 c 0,0.7578 -0.6167,1.375 -1.375,1.375 -0.7583,0 -1.375,-0.6172 -1.375,-1.375 0,-0.7578 0.6167,-1.375 1.375,-1.375 0.7583,0 1.375,0.6172 1.375,1.375 z M 29,23.375 c -0.7583,0 -1.375,-0.6172 -1.375,-1.375 0,-0.7578 0.6167,-1.375 1.375,-1.375 0.7583,0 1.375,0.6172 1.375,1.375 0,0.7578 -0.6167,1.375 -1.375,1.375 z m -11,3 c -0.3452,0 -0.625,0.2803 -0.625,0.625 v 3.8781 c -0.5743,0.3195 -1.2134,0.4969 -1.875,0.4969 -1.6603,0 -3.1138,-1.0615 -3.6475,-2.6465 V 26 c 0,-0.7578 0.6167,-1.375 1.375,-1.375 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -1.4473,0 -2.625,1.1777 -2.625,2.625 v 1.985 C 8.8162,27.2367 7.625,25.4923 7.625,23.5 7.625,22.7734 7.7866,22.0674 8.1055,21.4014 8.2422,21.1172 8.1446,20.7754 7.8789,20.6055 6.5035,19.725 5.6742,18.243 5.6329,16.625 H 8 c 1.3096,0 2.375,1.0654 2.375,2.375 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.9425 -0.3702,-1.7943 -0.9618,-2.4396 1.694,-0.3038 2.9857,-1.7803 2.9857,-3.5604 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,1.3096 -1.0654,2.375 -2.375,2.375 H 5.7695 C 6.1186,13.913 7.122,12.6627 8.5385,12.0391 8.8461,11.9034 8.9911,11.5489 8.8676,11.2364 8.7065,10.8302 8.6249,10.4141 8.6249,10.0001 c 0,-1.8613 1.5142,-3.375 3.375,-3.375 0.042,0 0.0815,0.0073 0.1221,0.0127 l 0.1577,0.0186 c 0.2607,0.0288 0.5088,-0.1216 0.6187,-0.3599 0.4712,-1.0151 1.4927,-1.6714 2.6016,-1.6714 0.699,0 1.3514,0.2608 1.875,0.7179 v 4.938 c -1.0052,-0.2764 -1.75,-1.1891 -1.75,-2.2809 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,1.785 1.2992,3.2637 3,3.5618 v 1.4382 c 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 V 5.343 c 0.5236,-0.4571 1.176,-0.7179 1.875,-0.7179 1.0711,0 2.0558,0.6158 2.5466,1.5724 C 22.6258,6.9141 21.8513,7.3751 21,7.3751 c -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 1.3694,0 2.6089,-0.7803 3.2226,-1.9775 1.7556,0.117 3.1524,1.5674 3.1524,3.3525 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-2.542 -2.061,-4.6113 -4.5996,-4.625 -0.7412,-1.2275 -2.0811,-2 -3.5254,-2 -0.916,0 -1.7847,0.2974 -2.5,0.8467 -0.7153,-0.5493 -1.584,-0.8467 -2.5,-0.8467 -1.4443,0 -2.7842,0.7725 -3.5254,2 -2.5386,0.0137 -4.5996,2.083 -4.5996,4.625 0,0.3848 0.0503,0.7695 0.1499,1.1484 C 5.7618,12.1286 4.6038,13.9207 4.414,15.9255 4.4108,15.9511 4.3989,15.9736 4.3989,16 c 0,0.0131 0.0067,0.0241 0.0075,0.037 -0.0118,0.1541 -0.0314,0.3067 -0.0314,0.463 0,1.917 0.8857,3.6943 2.3936,4.8516 C 6.5074,22.042 6.375,22.7618 6.375,23.5 c 0,2.7324 1.7812,5.0967 4.373,5.8643 0.7661,1.9639 2.6343,3.2607 4.752,3.2607 1.0166,0 2.0015,-0.2988 2.8477,-0.8652 0.0173,-0.0117 0.0265,-0.0297 0.0423,-0.0427 0.0331,-0.0271 0.0616,-0.0561 0.0886,-0.0894 0.0253,-0.0312 0.047,-0.0623 0.0655,-0.0972 0.0186,-0.0346 0.0323,-0.0698 0.0441,-0.108 0.0128,-0.0413 0.0211,-0.0814 0.0251,-0.1244 0.002,-0.0201 0.0117,-0.0374 0.0117,-0.058 v -4.2402 c 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ModelIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ModelRegistryIcon.ts b/clients/ui/frontend/src/shared/images/icons/ModelRegistryIcon.ts
new file mode 100644
index 000000000..8237db7f4
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ModelRegistryIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ModelRegistryIcon = createIcon({
+  name: 'ModelRegistryIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 9,18.62 h 6 a 0.62,0.62 0 0 0 0,-1.24 H 9 a 0.62,0.62 0 0 0 0,1.24 z m 0,8 h 6 a 0.62,0.62 0 0 0 0,-1.24 H 9 a 0.62,0.62 0 1 0 0,1.24 z m 0,-16 h 6 A 0.62,0.62 0 0 0 15,9.38 H 9 a 0.62,0.62 0 0 0 0,1.24 z M 31,4.38 H 5 A 0.61,0.61 0 0 0 4.38,5 V 31 A 0.61,0.61 0 0 0 5,31.62 H 31 A 0.61,0.61 0 0 0 31.62,31 V 5 A 0.61,0.61 0 0 0 31,4.38 Z m -0.62,26 H 5.62 V 5.62 H 30.38 Z M 27,10.62 A 0.62,0.62 0 1 0 26.38,10 0.61,0.61 0 0 0 27,10.62 Z m 0,8 A 0.62,0.62 0 1 0 26.38,18 0.61,0.61 0 0 0 27,18.62 Z m 0,8 A 0.62,0.62 0 1 0 26.38,26 0.61,0.61 0 0 0 27,26.62 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ModelRegistryIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ModelServerIcon.ts b/clients/ui/frontend/src/shared/images/icons/ModelServerIcon.ts
new file mode 100644
index 000000000..77d95493c
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ModelServerIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ModelServerIcon = createIcon({
+  name: 'ModelServerIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 9,18.62 h 6 a 0.62,0.62 0 0 0 0,-1.24 H 9 a 0.62,0.62 0 0 0 0,1.24 z m 0,8 h 6 a 0.62,0.62 0 0 0 0,-1.24 H 9 a 0.62,0.62 0 1 0 0,1.24 z m 0,-16 h 6 A 0.62,0.62 0 0 0 15,9.38 H 9 a 0.62,0.62 0 0 0 0,1.24 z M 31,4.38 H 5 A 0.61,0.61 0 0 0 4.38,5 V 31 A 0.61,0.61 0 0 0 5,31.62 H 31 A 0.61,0.61 0 0 0 31.62,31 V 5 A 0.61,0.61 0 0 0 31,4.38 Z m -0.62,26 H 5.62 V 5.62 H 30.38 Z M 27,10.62 A 0.62,0.62 0 1 0 26.38,10 0.61,0.61 0 0 0 27,10.62 Z m 0,8 A 0.62,0.62 0 1 0 26.38,18 0.61,0.61 0 0 0 27,18.62 Z m 0,8 A 0.62,0.62 0 1 0 26.38,26 0.61,0.61 0 0 0 27,26.62 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ModelServerIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/MultiModelIcon.ts b/clients/ui/frontend/src/shared/images/icons/MultiModelIcon.ts
new file mode 100644
index 000000000..ed2b96887
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/MultiModelIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const MultiModelIcon = createIcon({
+  name: 'MultiModelIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 25,30.38 H 5.62 V 11 A 0.62,0.62 0 0 0 4.38,11 V 31 A 0.61,0.61 0 0 0 5,31.62 h 20 a 0.62,0.62 0 0 0 0,-1.24 z m 3,-3 H 8.62 V 8 A 0.62,0.62 0 0 0 7.38,8 V 28 A 0.61,0.61 0 0 0 8,28.62 h 20 a 0.62,0.62 0 0 0 0,-1.24 z m 3,-23 H 11 A 0.61,0.61 0 0 0 10.38,5 V 25 A 0.61,0.61 0 0 0 11,25.62 H 31 A 0.61,0.61 0 0 0 31.62,25 V 5 A 0.61,0.61 0 0 0 31,4.38 Z m -0.62,20 H 11.62 V 5.62 H 30.38 Z M 28,7.38 a 0.63,0.63 0 0 0 -0.62,0.63 0.63,0.63 0 0 0 1.25,0 A 0.63,0.63 0 0 0 28,7.38 Z m -2,0 a 0.63,0.63 0 0 0 -0.62,0.63 0.63,0.63 0 0 0 1.25,0 A 0.63,0.63 0 0 0 26,7.38 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default MultiModelIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/NotebookIcon.ts b/clients/ui/frontend/src/shared/images/icons/NotebookIcon.ts
new file mode 100644
index 000000000..7f9df531d
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/NotebookIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const NotebookIcon = createIcon({
+  name: 'NotebookIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 7,28.38 A 0.63,0.63 0 1 0 7.62,29.01 0.63,0.63 0 0 0 7,28.38 Z M 31.61,10.05 A 0.69,0.69 0 0 0 31.44,9.56 l -2,-2 a 0.61,0.61 0 0 0 -0.88,0 L 23,13.12 18.14,8.25 21.92,5.8 l 1.7,1.7 -2.06,2.06 a 0.62225397,0.62225397 0 0 0 0.88,0.88 l 2.5,-2.5 a 0.61,0.61 0 0 0 0,-0.88 l -2.5,-2.5 A 0.66,0.66 0 0 0 21.71,4.45 c -0.05,0 -4.85,3.16 -4.9,3.17 a 0.66,0.66 0 0 0 -0.18,0.87 c 0,0 0.69,0.72 0.75,0.77 A 6.61,6.61 0 0 0 15.8,16.32 L 5.06,27.06 a 2.7435743,2.7435743 0 0 0 3.88,3.88 L 19.68,20.2 a 6.29,6.29 0 0 0 5.89,-0.69 l 5.95,-9.17 a 0.75,0.75 0 0 0 0.09,-0.29 z M 19.79,18.9 a 0.67,0.67 0 0 0 -0.7,0.13 l -11,11 A 1.5,1.5 0 0 1 5.97,27.91 l 11,-11 a 0.65,0.65 0 0 0 0.17,-0.34 0.74,0.74 0 0 0 0,-0.36 5.39,5.39 0 0 1 1.16,-6.07 l 4.3,4.3 a 0.61,0.61 0 0 0 0.88,0 L 29,8.88 l 1.2,1.2 -5.59,8.61 a 5.42,5.42 0 0 1 -4.82,0.21 z m -0.35,-5.34 c -0.56,-0.58 -1.46,0.32 -0.88,0.88 l 3,3 a 0.62225397,0.62225397 0 0 0 0.88,-0.88 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default NotebookIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/NotebookImageIcon.ts b/clients/ui/frontend/src/shared/images/icons/NotebookImageIcon.ts
new file mode 100644
index 000000000..becdf60ac
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/NotebookImageIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const NotebookImageIcon = createIcon({
+  name: 'NotebookImageIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 15,13.49 a 0.61,0.61 0 0 0 -0.88,0 l -2.56,2.56 a 0.64,0.64 0 0 0 0,0.89 l 2.56,2.56 A 0.63,0.63 0 0 0 15,18.61 L 12.88,16.49 15,14.37 a 0.61,0.61 0 0 0 0,-0.88 z m 6,6.01 a 0.63,0.63 0 0 0 0.88,0 l 2.56,-2.56 a 0.64,0.64 0 0 0 0,-0.89 L 21.88,13.49 C 21.31,12.91 20.41,13.81 21,14.37 l 2.12,2.12 -2.12,2.12 a 0.62,0.62 0 0 0 0,0.89 z M 17.24,20 a 0.63,0.63 0 0 0 0.74,-0.49 l 1.24,-5.84 A 0.64,0.64 0 0 0 18.74,12.92 0.63,0.63 0 0 0 18,13.41 l -1.24,5.84 A 0.63,0.63 0 0 0 17.24,20 Z M 32,26.38 H 4 a 0.62,0.62 0 0 0 0,1.24 h 28 a 0.62,0.62 0 0 0 0,-1.24 z M 6,24.62 H 30 A 0.61,0.61 0 0 0 30.62,24 V 9 A 0.61,0.61 0 0 0 30,8.38 h -9 a 0.62,0.62 0 0 0 0,1.24 h 8.38 V 23.38 H 6.62 V 9.62 H 15 A 0.62,0.62 0 0 0 15,8.38 H 6 A 0.61,0.61 0 0 0 5.38,9 V 24 A 0.61,0.61 0 0 0 6,24.62 Z M 18.62,9 a 0.62,0.62 0 0 1 -1.24,0 0.62,0.62 0 0 1 1.24,0 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default NotebookImageIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/PermissionsIcon.ts b/clients/ui/frontend/src/shared/images/icons/PermissionsIcon.ts
new file mode 100644
index 000000000..0998ac594
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/PermissionsIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const PermissionsIcon = createIcon({
+  name: 'PermissionsIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 18,18.62 a 12.35,12.35 0 0 1 11.78,8.57 0.62,0.62 0 0 0 0.79,0.4 0.62,0.62 0 0 0 0.4,-0.78 13.58,13.58 0 0 0 -9.63,-9 7.12,7.12 0 1 0 -6.66,0 A 13.63,13.63 0 0 0 4.38,31 0.62,0.62 0 0 0 5,31.62 h 11 a 0.62,0.62 0 0 0 0,-1.24 H 5.64 A 12.4,12.4 0 0 1 18,18.62 Z M 12.12,11.5 A 5.88,5.88 0 1 1 18,17.38 5.89,5.89 0 0 1 12.12,11.5 Z M 31,29.38 h -7.46 a 2.62,2.62 0 1 0 0,1.24 h 2.84 V 32 a 0.62,0.62 0 0 0 1.24,0 v -1.38 h 0.76 V 32 a 0.62,0.62 0 0 0 1.24,0 v -1.38 h 0.76 V 31 a 0.62,0.62 0 0 0 1.24,0 V 30 A 0.62,0.62 0 0 0 31,29.38 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default PermissionsIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/PipelineExecutionIcon.ts b/clients/ui/frontend/src/shared/images/icons/PipelineExecutionIcon.ts
new file mode 100644
index 000000000..8cc4c0d85
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/PipelineExecutionIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const PipelineExecutionIcon = createIcon({
+  name: 'PipelineExecutionIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 23.56,13.56 16,21.12 12.44,17.56 c -0.56,-0.58 -1.46,0.32 -0.88,0.88 l 4,4 a 0.63,0.63 0 0 0 0.88,0 l 8,-8 C 25,13.88 24.13,13 23.56,13.56 Z M 18,3.38 A 14.64,14.64 0 0 0 3.38,18 c 0.8,19.4 28.44,19.4 29.25,0 A 14.65,14.65 0 0 0 18,3.38 Z m 0,28 A 13.39,13.39 0 0 1 4.62,18 C 5.36,0.26 30.64,0.26 31.38,18 A 13.39,13.39 0 0 1 18,31.38 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default PipelineExecutionIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/PipelineIcon.ts b/clients/ui/frontend/src/shared/images/icons/PipelineIcon.ts
new file mode 100644
index 000000000..c97207e1d
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/PipelineIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const PipelineIcon = createIcon({
+  name: 'PipelineIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M28,24.375c-1.785,0-3.2637,1.2992-3.5618,3h-14.4382c-2.4126,0-4.375-1.9629-4.375-4.375s1.9624-4.375,4.375-4.375h16c3.1016,0,5.625-2.5234,5.625-5.625s-2.5234-5.625-5.625-5.625h-14.4382c-.298-1.7008-1.7768-3-3.5618-3-1.999,0-3.625,1.626-3.625,3.625s1.626,3.625,3.625,3.625c1.785,0,3.2637-1.2992,3.5618-3h14.4382c2.4126,0,4.375,1.9629,4.375,4.375s-1.9624,4.375-4.375,4.375H10c-3.1016,0-5.625,2.5234-5.625,5.625s2.5234,5.625,5.625,5.625h14.4382c.298,1.7008,1.7768,3,3.5618,3,1.999,0,3.625-1.626,3.625-3.625s-1.626-3.625-3.625-3.625ZM8,10.375c-1.3096,0-2.375-1.0654-2.375-2.375s1.0654-2.375,2.375-2.375,2.375,1.0654,2.375,2.375-1.0654,2.375-2.375,2.375ZM28,30.375c-1.3096,0-2.375-1.0654-2.375-2.375s1.0654-2.375,2.375-2.375,2.375,1.0654,2.375,2.375-1.0654,2.375-2.375,2.375Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default PipelineIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/PipelineRunIcon.ts b/clients/ui/frontend/src/shared/images/icons/PipelineRunIcon.ts
new file mode 100644
index 000000000..5ec182f52
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/PipelineRunIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const PipelineRunIcon = createIcon({
+  name: 'PipelineRunIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 10,18.625 h 4.4382 c 0.298,1.7008 1.7768,3 3.5618,3 1.785,0 3.2637,-1.2992 3.5618,-3 H 26 c 3.1016,0 5.625,-2.5234 5.625,-5.625 0,-3.1016 -2.5234,-5.625 -5.625,-5.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 2.4126,0 4.375,1.9629 4.375,4.375 0,2.4121 -1.9624,4.375 -4.375,4.375 h -4.4382 c -0.298,-1.7008 -1.7768,-3 -3.5618,-3 -1.785,0 -3.2637,1.2992 -3.5618,3 H 10 c -3.1016,0 -5.625,2.5234 -5.625,5.625 0,3.1016 2.5234,5.625 5.625,5.625 h 2.491 l -0.9329,0.9326 c -0.2441,0.2441 -0.2441,0.6406 0,0.8848 0.1221,0.1221 0.2817,0.1826 0.4419,0.1826 0.1602,0 0.3198,-0.0605 0.4419,-0.1826 l 2,-2 c 0.01,-0.01 0.0133,-0.0234 0.0225,-0.0339 0.0447,-0.0509 0.0858,-0.1056 0.1122,-0.1691 0.0634,-0.1531 0.0634,-0.3257 0,-0.4788 -0.0264,-0.0635 -0.0674,-0.1182 -0.1122,-0.1691 -0.0092,-0.0105 -0.0125,-0.0239 -0.0225,-0.0339 l -2,-2 c -0.2441,-0.2441 -0.6396,-0.2441 -0.8838,0 -0.2442,0.2441 -0.2441,0.6406 0,0.8848 L 12.491,27.375 H 10 C 7.5874,27.375 5.625,25.4121 5.625,23 5.625,20.5879 7.5874,18.625 10,18.625 Z m 8,-3 c 1.3096,0 2.375,1.0654 2.375,2.375 0,1.3096 -1.0654,2.375 -2.375,2.375 -1.3096,0 -2.375,-1.0654 -2.375,-2.375 0,-1.3096 1.0654,-2.375 2.375,-2.375 z m -10,-4 c 1.785,0 3.2637,-1.2992 3.5618,-3 h 9.9293 l -0.9329,0.9326 c -0.2441,0.2441 -0.2441,0.6406 0,0.8848 0.1221,0.1221 0.2817,0.1826 0.4419,0.1826 0.1602,0 0.3198,-0.0605 0.4419,-0.1826 l 2,-2 c 0.01,-0.01 0.0133,-0.0234 0.0225,-0.0339 0.0447,-0.0509 0.0858,-0.1056 0.1122,-0.1691 0.0634,-0.1531 0.0634,-0.3257 0,-0.4788 C 23.5503,7.6971 23.5093,7.6424 23.4645,7.5915 23.4553,7.581 23.452,7.5676 23.442,7.5576 l -2,-1.9995 c -0.2441,-0.2441 -0.6396,-0.2441 -0.8838,0 -0.2442,0.2441 -0.2441,0.6396 0,0.8838 l 0.9331,0.9331 h -9.9294 c -0.298,-1.7008 -1.7768,-3 -3.5618,-3 -1.999,0 -3.625,1.626 -3.625,3.625 0,1.999 1.626,3.625 3.625,3.625 z m 0,-6 c 1.3096,0 2.375,1.0654 2.375,2.375 0,1.3096 -1.0654,2.375 -2.375,2.375 C 6.6904,10.375 5.625,9.3096 5.625,8 5.625,6.6904 6.6904,5.625 8,5.625 Z m 20,18.75 c -1.785,0 -3.2637,1.2992 -3.5618,3 H 17 c -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 h 7.4382 c 0.298,1.7008 1.7768,3 3.5618,3 1.999,0 3.625,-1.626 3.625,-3.625 0,-1.999 -1.626,-3.625 -3.625,-3.625 z m 0,6 c -1.3096,0 -2.375,-1.0654 -2.375,-2.375 0,-1.3096 1.0654,-2.375 2.375,-2.375 1.3096,0 2.375,1.0654 2.375,2.375 0,1.3096 -1.0654,2.375 -2.375,2.375 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default PipelineRunIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ProjectIcon.ts b/clients/ui/frontend/src/shared/images/icons/ProjectIcon.ts
new file mode 100644
index 000000000..16f467640
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ProjectIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ProjectIcon = createIcon({
+  name: 'ProjectIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M31,9.38H27.29l-.52-2.47a.62.62,0,0,0-.61-.49H18.84a.62.62,0,0,0-.61.49l-.52,2.47H8.21a.62.62,0,0,0-.62.62V25a.63.63,0,0,0,1.25,0V10.62h9.37a.61.61,0,0,0,.61-.49l.53-2.46h6.3l.53,2.46a.61.61,0,0,0,.61.49h3.59V28.38H5.62V10a.62.62,0,0,0-1.24,0V29a.62.62,0,0,0,.62.62H31a.62.62,0,0,0,.62-.62V10A.62.62,0,0,0,31,9.38Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ProjectIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/RegisteredModelIcon.ts b/clients/ui/frontend/src/shared/images/icons/RegisteredModelIcon.ts
new file mode 100644
index 000000000..58d664aa8
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/RegisteredModelIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const RegisteredModelIcon = createIcon({
+  name: 'RegisteredModelIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 27.4764,23.1071 C 27.5651,22.7496 27.625,22.3818 27.625,22 c 0,-0.8232 -0.2217,-1.6191 -0.6455,-2.332 1.0518,-1.1299 1.6455,-2.6201 1.6455,-4.168 0,-2.6426 -1.7041,-4.9785 -4.187,-5.8047 C 23.8662,7.75 22.0571,6.375 20,6.375 19.3081,6.375 18.6367,6.5332 18,6.8457 17.3633,6.5332 16.6919,6.375 16,6.375 c -2.0571,0 -3.8662,1.375 -4.438,3.3203 -2.4829,0.8262 -4.187,3.1621 -4.187,5.8047 0,0.5093 0.0864,1.0057 0.2101,1.4919 0,0.0028 -0.0016,0.0052 -0.0016,0.0081 0,0.1152 0.0398,0.2173 0.0943,0.3101 0.2723,0.8694 0.7134,1.6824 1.3427,2.3578 -0.4238,0.7129 -0.6455,1.5098 -0.6455,2.332 0,1.9805 1.2583,3.7168 3.1069,4.3564 0.3979,1.8906 2.0566,3.2686 4.0181,3.2686 0.9155,0 1.7842,-0.2969 2.5,-0.8467 0.7158,0.5498 1.5845,0.8467 2.5,0.8467 1.9614,0 3.6201,-1.3779 4.0181,-3.2686 1.4432,-0.4994 2.5169,-1.6707 2.9227,-3.1012 0.0207,-0.0458 0.0264,-0.0974 0.0356,-0.1482 z m -14.8055,2.7573 v -0.9103 c 0,-0.7324 0.5962,-1.3291 1.3291,-1.3291 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -1.4224,0 -2.5791,1.1572 -2.5791,2.5791 v 0.0046 C 10.3373,24.3849 9.625,23.266 9.625,22 c 0,-0.7285 0.2422,-1.4326 0.7007,-2.0342 C 10.523,19.706 10.4883,19.3398 10.2466,19.122 9.7738,18.6973 9.4065,18.1829 9.1333,17.6249 H 11 c 0.7583,0 1.375,0.6172 1.375,1.375 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-0.6068 -0.2155,-1.1591 -0.5626,-1.6042 0.9185,-0.4092 1.5626,-1.3272 1.5626,-2.3958 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.7578 -0.6167,1.375 -1.375,1.375 H 8.7183 C 8.6651,16.0872 8.625,15.7961 8.625,15.4999 c 0,-2.2021 1.4878,-4.1367 3.6182,-4.7051 0.2285,-0.0605 0.4033,-0.2461 0.4512,-0.4775 0.3203,-1.5605 1.7104,-2.6924 3.3057,-2.6924 0.4759,0 0.9402,0.111 1.3863,0.3192 -0.0018,0.0193 -0.0113,0.0361 -0.0113,0.0558 v 3.375 h -1.3525 c -0.2065,0 -0.375,-0.168 -0.375,-0.375 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.8965 0.729,1.625 1.625,1.625 h 1.3525 v 15.0316 c -0.524,0.4573 -1.1764,0.7184 -1.875,0.7184 -1.4425,0 -2.6453,-1.076 -2.8291,-2.5106 z M 23.812,25.2637 c -0.2549,0.0635 -0.4429,0.2793 -0.4707,0.54 -0.1562,1.4658 -1.3779,2.5713 -2.8413,2.5713 -0.6986,0 -1.351,-0.2612 -1.875,-0.7184 V 23.625 H 19 c 0.7583,0 1.375,0.6172 1.375,1.375 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 0,-1.4473 -1.1777,-2.625 -2.625,-2.625 h -0.375 v -4.75 H 21 c 0.4893,0 0.9458,0.2637 1.1914,0.6885 0.1162,0.2002 0.3257,0.3115 0.5415,0.3115 0.1064,0 0.2144,-0.0273 0.313,-0.084 0.2983,-0.1729 0.4004,-0.5557 0.2275,-0.8545 -0.2831,-0.4883 -0.7216,-0.8456 -1.2232,-1.0676 0.3542,-0.4475 0.5748,-1.0053 0.5748,-1.619 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.7578 -0.6167,1.375 -1.375,1.375 H 18.625 V 7.9999 C 18.625,7.9801 18.6155,7.9634 18.6137,7.9441 19.0597,7.736 19.5241,7.6249 20,7.6249 c 1.3525,0 2.5504,0.8181 3.0809,2.0168 -0.5936,0.4675 -1.3212,0.7332 -2.0809,0.7332 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 0.9685,0 1.8968,-0.3192 2.6779,-0.8771 0.0286,0.0125 0.0482,0.0389 0.079,0.0471 2.1304,0.5684 3.6182,2.5029 3.6182,4.7051 0,1.376 -0.5908,2.6963 -1.6216,3.6221 -0.2422,0.2178 -0.2764,0.585 -0.0791,0.8438 0.4585,0.6016 0.7007,1.3047 0.7007,2.0342 0,0.1274 -0.0178,0.2508 -0.0318,0.375 h -1.3432 c -0.2065,0 -0.375,-0.168 -0.375,-0.375 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.8965 0.729,1.625 1.625,1.625 h 0.9545 c -0.4424,0.7978 -1.2039,1.4055 -2.1425,1.6387 z M 31,4.375 h -4 c -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 h 3.375 v 24.75 H 27 c -0.3452,0 -0.625,0.2803 -0.625,0.625 0,0.3447 0.2798,0.625 0.625,0.625 h 4 c 0.3452,0 0.625,-0.2803 0.625,-0.625 V 5 C 31.625,4.6553 31.3452,4.375 31,4.375 Z m -22,26 H 5.625 V 5.625 H 9 C 9.3452,5.625 9.625,5.3447 9.625,5 9.625,4.6553 9.3452,4.375 9,4.375 H 5 C 4.6548,4.375 4.375,4.6553 4.375,5 v 26 c 0,0.3447 0.2798,0.625 0.625,0.625 H 9 C 9.3452,31.625 9.625,31.3447 9.625,31 9.625,30.6553 9.3452,30.375 9,30.375 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default RegisteredModelIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ResourcesIcon.ts b/clients/ui/frontend/src/shared/images/icons/ResourcesIcon.ts
new file mode 100644
index 000000000..304c6acc0
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ResourcesIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ResourcesIcon = createIcon({
+  name: 'ResourcesIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M31,11.38H18.26L11.44,4.56A.62.62,0,0,0,10.38,5v6.38H5a.62.62,0,0,0-.62.62V31a.62.62,0,0,0,.62.62H31a.62.62,0,0,0,.62-.62V12A.62.62,0,0,0,31,11.38Zm-.62,13H25a.62.62,0,0,0-.62.62v5.38H18.62V12.62H30.38Zm-.89,1.24-3.87,3.87V25.62ZM11.62,6.51l5.76,5.75V29.49l-5.76-5.75Zm-6,6.11h4.76V24a.59.59,0,0,0,.18.44l5.93,5.94H5.62ZM26.51,30.38l3.87-3.87v3.87Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ResourcesIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/ServingRuntimeIcon.ts b/clients/ui/frontend/src/shared/images/icons/ServingRuntimeIcon.ts
new file mode 100644
index 000000000..5c0b79efd
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/ServingRuntimeIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const ServingRuntimeIcon = createIcon({
+  name: 'ServingRuntimeIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 24,10.38 h -7.46 a 2.62,2.62 0 1 0 0,1.24 h 2.84 V 13 a 0.62,0.62 0 1 0 1.24,0 v -1.38 h 0.76 V 13 a 0.62,0.62 0 1 0 1.24,0 v -1.38 h 0.76 V 12 a 0.62,0.62 0 1 0 1.24,0 V 11 A 0.61,0.61 0 0 0 24,10.38 Z m -10,2 A 1.38,1.38 0 1 1 15.38,11 1.38,1.38 0 0 1 14,12.38 Z M 9,23.62 h 6 a 0.62,0.62 0 0 0 0,-1.24 H 9 a 0.62,0.62 0 0 0 0,1.24 z M 31,17.38 H 5 A 0.61,0.61 0 0 0 4.38,18 V 28 A 0.61,0.61 0 0 0 5,28.62 H 31 A 0.61,0.61 0 0 0 31.62,28 V 18 A 0.61,0.61 0 0 0 31,17.38 Z m -0.62,10 H 5.62 V 18.62 H 30.38 Z M 27.62,22.99 A 0.62,0.62 0 0 1 27,23.61 0.62,0.62 0 0 1 26.38,22.99 0.62,0.62 0 0 1 27,22.37 a 0.62,0.62 0 0 1 0.62,0.62 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default ServingRuntimeIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/SingleModelIcon.ts b/clients/ui/frontend/src/shared/images/icons/SingleModelIcon.ts
new file mode 100644
index 000000000..9fccb5c95
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/SingleModelIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const SingleModelIcon = createIcon({
+  name: 'SingleModelIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M 31,4.38 H 5 A 0.61,0.61 0 0 0 4.38,5 V 31 A 0.61,0.61 0 0 0 5,31.62 H 31 A 0.61,0.61 0 0 0 31.62,31 V 5 A 0.61,0.61 0 0 0 31,4.38 Z m -0.62,26 H 5.62 V 5.62 H 30.38 Z M 27,8.37 A 0.63,0.63 0 0 0 26.38,9 0.63,0.63 0 0 0 27.63,9 0.63,0.63 0 0 0 27,8.37 Z m -2,0 A 0.63,0.63 0 0 0 24.38,9 0.63,0.63 0 0 0 25.63,9 0.63,0.63 0 0 0 25,8.37 Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default SingleModelIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/StorageClassIcon.ts b/clients/ui/frontend/src/shared/images/icons/StorageClassIcon.ts
new file mode 100644
index 000000000..793b05bc2
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/StorageClassIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const StorageClassIcon = createIcon({
+  name: 'StorageClassIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'm 7.6597,15.9971 c 0.4199,0.2725 0.8818,0.5312 1.3726,0.7686 0.0874,0.043 0.1802,0.0625 0.2715,0.0625 0.2324,0 0.4551,-0.1299 0.563,-0.3525 0.1504,-0.3105 0.0205,-0.6846 -0.2905,-0.835 C 9.1329,15.4259 8.7169,15.1934 8.3405,14.9483 8.0509,14.7608 7.6647,14.8438 7.4762,15.1319 c -0.188,0.29 -0.106,0.6768 0.1836,0.8652 z m 8.4511,1.9384 c -0.0181,0.3447 0.2471,0.6387 0.5918,0.6562 0.4272,0.0225 0.8599,0.0332 1.2988,0.0332 0.4458,-0.001 0.8857,-0.0127 1.3203,-0.0361 0.3447,-0.0186 0.6094,-0.3125 0.5908,-0.6572 -0.0181,-0.3447 -0.3154,-0.6182 -0.6572,-0.5908 -0.8203,0.042 -1.6709,0.0439 -2.4883,0.0029 -0.3545,-0.0293 -0.6387,0.2471 -0.6562,0.5918 z M 21.21,17.7939 c 0.0508,0.3057 0.3159,0.5225 0.6157,0.5225 0.0342,0 0.0684,-0.0029 0.103,-0.0088 0.8877,-0.1465 1.7505,-0.3447 2.5654,-0.5889 0.3306,-0.0986 0.5186,-0.4473 0.4194,-0.7773 -0.0991,-0.3311 -0.4487,-0.5166 -0.7778,-0.4199 -0.7646,0.2285 -1.5757,0.415 -2.4111,0.5537 -0.3408,0.0557 -0.5708,0.3779 -0.5146,0.7188 z M 11.1089,16.9473 c -0.0991,0.3301 0.0889,0.6787 0.4194,0.7773 0.8135,0.2432 1.6768,0.4414 2.5664,0.5879 0.0347,0.0049 0.0684,0.0078 0.1025,0.0078 0.3003,0 0.5654,-0.2168 0.6157,-0.5234 0.0562,-0.3408 -0.1748,-0.6621 -0.5151,-0.7178 -0.8374,-0.1387 -1.6489,-0.3242 -2.4111,-0.5518 -0.3335,-0.0977 -0.6787,0.0889 -0.7778,0.4199 z m 16.5508,-1.9991 c -0.3765,0.2451 -0.7925,0.4775 -1.2358,0.6924 -0.311,0.1504 -0.4409,0.5244 -0.2905,0.835 0.1079,0.2227 0.3306,0.3525 0.563,0.3525 0.0913,0 0.1841,-0.0195 0.2715,-0.0625 0.4907,-0.2373 0.9526,-0.4961 1.3726,-0.7686 0.2896,-0.1885 0.3716,-0.5752 0.1836,-0.8652 -0.188,-0.2881 -0.5747,-0.3711 -0.8643,-0.1836 z M 5,15.625 c 0.3452,0 0.625,-0.2803 0.625,-0.625 v -1.4951 c 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 -0.3452,0 -0.625,0.2803 -0.625,0.625 V 15 c 0,0.3447 0.2798,0.625 0.625,0.625 z M 4.9556,11.2324 c 0.0215,0.002 0.043,0.0029 0.0645,0.0029 0.3164,0 0.5879,-0.2393 0.6206,-0.5615 C 5.7183,9.916 6.0645,9.1748 6.67,8.4697 6.8951,8.208 6.8648,7.8135 6.6031,7.5888 6.3404,7.3622 5.9464,7.3935 5.7218,7.6552 4.9469,8.5575 4.5016,9.5302 4.3976,10.5468 4.3624,10.8896 4.612,11.1972 4.9557,11.2323 Z M 8.4058,6.9019 c 0.1079,0 0.2173,-0.0278 0.3169,-0.0864 C 9.4532,6.3848 10.2886,6.0069 11.2051,5.691 11.5313,5.5787 11.7046,5.2232 11.5923,4.8966 11.48,4.5709 11.125,4.3961 10.7979,4.5094 9.8028,4.8522 8.8907,5.2657 8.0879,5.7384 7.7905,5.9137 7.6914,6.297 7.8667,6.5944 7.9834,6.7922 8.1919,6.902 8.4058,6.902 Z M 24.834,5.7041 c 0.9155,0.3184 1.7495,0.6992 2.4785,1.1318 0.1001,0.0591 0.21,0.0874 0.3184,0.0874 0.2134,0 0.4214,-0.1094 0.5381,-0.3062 C 28.3453,6.3202 28.2471,5.9369 27.9502,5.7607 27.1494,5.2856 26.2388,4.8691 25.2441,4.5234 24.9165,4.4096 24.562,4.5825 24.4487,4.9087 24.3354,5.2344 24.5078,5.5908 24.834,5.7041 Z m 5.5278,5.0059 c 0.0298,0.3242 0.3022,0.5684 0.6221,0.5684 0.0186,0 0.0376,-10e-4 0.0571,-0.0029 0.3438,-0.0312 0.5972,-0.335 0.5659,-0.6787 C 31.5141,9.5753 31.0771,8.5978 30.3081,7.6915 30.0854,7.4288 29.6914,7.3956 29.4272,7.6192 29.164,7.8428 29.1318,8.2364 29.3549,8.5001 c 0.5991,0.7061 0.938,1.4502 1.0068,2.21 z M 19.4102,4.667 c 0.9399,0.0562 1.8667,0.1689 2.7544,0.3354 0.0391,0.0073 0.0776,0.0107 0.1157,0.0107 0.2949,0 0.5576,-0.2095 0.6138,-0.5098 0.0635,-0.3394 -0.1597,-0.666 -0.499,-0.7295 -0.939,-0.1763 -1.918,-0.2954 -2.9106,-0.355 -0.3589,-0.0137 -0.6406,0.2427 -0.6611,0.5869 -0.0205,0.3442 0.2422,0.6406 0.5869,0.6611 z m -5.6485,0.3384 c 0.0376,0 0.0757,-0.0034 0.1143,-0.0103 0.8911,-0.1655 1.8184,-0.2764 2.7554,-0.3306 0.3447,-0.02 0.6079,-0.3154 0.5879,-0.6602 -0.02,-0.3442 -0.3262,-0.605 -0.6602,-0.5879 -0.9888,0.0571 -1.9683,0.1748 -2.9106,0.3491 -0.3394,0.063 -0.5635,0.3892 -0.501,0.7285 0.0562,0.3013 0.3188,0.5112 0.6143,0.5112 z M 31,12.8799 c -0.3452,0 -0.625,0.2803 -0.625,0.625 V 15 c 0,0.3447 0.2798,0.625 0.625,0.625 0.3452,0 0.625,-0.2803 0.625,-0.625 v -1.4951 c 0,-0.3447 -0.2798,-0.625 -0.625,-0.625 z m 0,4.4717 c -0.3584,0 -0.6484,0.29 -0.6484,0.6484 0,3.4424 -5.6562,6.3516 -12.3516,6.3516 -6.6954,0 -12.3516,-2.9092 -12.3516,-6.3516 0,-0.3584 -0.29,-0.6484 -0.6484,-0.6484 -0.3584,0 -0.6484,0.29 -0.6484,0.6484 v 6 c 0,4.2891 5.9951,7.6484 13.6484,7.6484 7.6533,0 13.6484,-3.3594 13.6484,-7.6484 v -6 c 0,-0.3584 -0.29,-0.6484 -0.6484,-0.6484 z m -13,13 C 11.3047,30.3516 5.6484,27.4424 5.6484,24 v -2.7116 c 2.1587,2.5969 6.8143,4.36 12.3516,4.36 5.5373,0 10.1929,-1.7632 12.3516,-4.36 V 24 c 0,3.4424 -5.6562,6.3516 -12.3516,6.3516 z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default StorageClassIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/StorageIcon.ts b/clients/ui/frontend/src/shared/images/icons/StorageIcon.ts
new file mode 100644
index 000000000..94230af35
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/StorageIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const StorageIcon = createIcon({
+  name: 'StorageIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M31.56,11.15c-2-8.88-23.85-8.84-26.88-.84-.55,1.11-.26,4.46-.33,5.69v8c0,4.29,6,7.65,13.65,7.65S31.65,28.29,31.65,24V20C31.59,17.69,31.77,13.4,31.56,11.15ZM30.35,24v0h0c0,3.43-5.67,6.33-12.35,6.33S5.67,27.45,5.65,24h0v-.73c4.5,5.76,20.2,5.75,24.7,0Zm0-4.21c.14,3.66-5.56,6.52-12.35,6.56-7.07-.12-12.77-2.89-12.35-7.06,4.5,5.76,20.2,5.75,24.7,0Zm0-3.95c.11,3.61-5.58,6.48-12.35,6.51-7.07-.12-12.77-2.89-12.35-7.06,4.5,5.76,20.2,5.75,24.7,0ZM18,18.35c-6.7,0-12.35-2.91-12.35-6.35S11.3,5.65,18,5.65,30.35,8.56,30.35,12,24.7,18.35,18,18.35Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default StorageIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/UserIcon.ts b/clients/ui/frontend/src/shared/images/icons/UserIcon.ts
new file mode 100644
index 000000000..585d22cdb
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/UserIcon.ts
@@ -0,0 +1,13 @@
+import { createIcon } from '@patternfly/react-icons/dist/esm/createIcon';
+
+const UserIcon = createIcon({
+  name: 'UserIcon',
+  width: 36,
+  height: 36,
+  svgPath:
+    'M21.32,17.8C27.8,14.41,25.42,4.39,18,4.38s-9.8,10-3.32,13.42A13.63,13.63,0,0,0,4.38,31a.61.61,0,0,0,.62.62H31a.61.61,0,0,0,.62-.62A13.63,13.63,0,0,0,21.32,17.8Zm-9.2-6.3c.25-7.76,11.51-7.76,11.76,0C23.63,19.26,12.37,19.26,12.12,11.5ZM5.64,30.38C7,14.79,29.05,14.8,30.36,30.38Z',
+  xOffset: 0,
+  yOffset: 0,
+});
+
+export default UserIcon;
diff --git a/clients/ui/frontend/src/shared/images/icons/index.ts b/clients/ui/frontend/src/shared/images/icons/index.ts
new file mode 100644
index 000000000..785edd450
--- /dev/null
+++ b/clients/ui/frontend/src/shared/images/icons/index.ts
@@ -0,0 +1,31 @@
+export { default as AcceleratorProfileIcon } from './AcceleratorProfileIcon';
+export { default as ArtifactIcon } from './ArtifactIcon';
+export { default as BuildIcon } from './BuildIcon';
+export { default as ClusterSettingsIcon } from './ClusterSettingsIcon';
+export { default as ConfigurationIcon } from './ConfigurationIcon';
+export { default as CreateAndTrainIcon } from './CreateAndTrainIcon';
+export { default as DataConnectionIcon } from './DataConnectionIcon';
+export { default as DeployedModelIcon } from './DeployedModelIcon';
+export { default as DistributedWorkloadIcon } from './DistributedWorkloadIcon';
+export { default as EnabledApplicationsIcon } from './EnabledApplicationsIcon';
+export { default as ExperimentIcon } from './ExperimentIcon';
+export { default as ExploreApplicationsIcon } from './ExploreApplicationsIcon';
+export { default as GroupIcon } from './GroupIcon';
+export { default as ModelIcon } from './ModelIcon';
+export { default as ModelRegistryIcon } from './ModelRegistryIcon';
+export { default as ModelServerIcon } from './ModelServerIcon';
+export { default as MultiModelIcon } from './MultiModelIcon';
+export { default as NotebookIcon } from './NotebookIcon';
+export { default as NotebookImageIcon } from './NotebookImageIcon';
+export { default as PermissionsIcon } from './PermissionsIcon';
+export { default as PipelineExecutionIcon } from './PipelineExecutionIcon';
+export { default as PipelineIcon } from './PipelineIcon';
+export { default as PipelineRunIcon } from './PipelineRunIcon';
+export { default as ProjectIcon } from './ProjectIcon';
+export { default as RegisteredModelIcon } from './RegisteredModelIcon';
+export { default as ResourcesIcon } from './ResourcesIcon';
+export { default as ServingRuntimeIcon } from './ServingRuntimeIcon';
+export { default as SingleModelIcon } from './SingleModelIcon';
+export { default as StorageClassIcon } from './StorageClassIcon';
+export { default as StorageIcon } from './StorageIcon';
+export { default as UserIcon } from './UserIcon';
diff --git a/clients/ui/frontend/src/images/no-models-model-registry.svg b/clients/ui/frontend/src/shared/images/no-models-model-registry.svg
similarity index 100%
rename from clients/ui/frontend/src/images/no-models-model-registry.svg
rename to clients/ui/frontend/src/shared/images/no-models-model-registry.svg
diff --git a/clients/ui/frontend/src/images/no-versions-model-registry.svg b/clients/ui/frontend/src/shared/images/no-versions-model-registry.svg
similarity index 100%
rename from clients/ui/frontend/src/images/no-versions-model-registry.svg
rename to clients/ui/frontend/src/shared/images/no-versions-model-registry.svg
diff --git a/clients/ui/frontend/src/shared/k8sTypes.ts b/clients/ui/frontend/src/shared/k8sTypes.ts
new file mode 100644
index 000000000..d4d73dc18
--- /dev/null
+++ b/clients/ui/frontend/src/shared/k8sTypes.ts
@@ -0,0 +1,9 @@
+export type K8sCondition = {
+  type: string;
+  status: string;
+  reason?: string;
+  message?: string;
+  lastProbeTime?: string | null;
+  lastTransitionTime?: string;
+  lastHeartbeatTime?: string;
+};
diff --git a/clients/ui/frontend/src/shared/style/MUI-theme.scss b/clients/ui/frontend/src/shared/style/MUI-theme.scss
index ac651aeea..360be684d 100644
--- a/clients/ui/frontend/src/shared/style/MUI-theme.scss
+++ b/clients/ui/frontend/src/shared/style/MUI-theme.scss
@@ -113,9 +113,7 @@
 }
 
 .mui-theme .pf-v6-c-action-list__item .pf-v6-c-button {
-  --pf-v6-c-button--BorderRadius: 50%;
-  --pf-v6-c-button--PaddingInlineStart: none;
-  --pf-v6-c-button--PaddingInlineEnd: none;
+  border-radius: var(--mui-shape-borderRadius);
 }
 
 .mui-theme .pf-v6-c-alert {
@@ -747,7 +745,6 @@
   --pf-v6-c-masthead--BackgroundColor: var(--mui-palette-common-white);
   box-shadow: var(--mui-shadows-1);
   min-height: var(--kf-central-app-bar-height);
-  margin-left: var(--kf-central-app-drawer-width);
 }
 
 .mui-theme .pf-v6-c-modal-box {
@@ -798,3 +795,17 @@
 .mui-theme .pf-v6-c-page__main-container {
   margin-top: var(--kf-central-app-bar-height); /* Move content area below the app bar */
 }
+
+/* Hide Masthead Toggle by default */
+.mui-theme .pf-v6-c-masthead__toggle {
+  display: none;
+}
+
+/* Show Masthead Toggle on viewports below 1270px */
+@media (max-width: 1270px) {
+  .mui-theme .pf-v6-c-masthead__toggle {
+    display: block;
+    padding-block-start: var(--mui-spacing-4px);
+  }
+}
+
diff --git a/clients/ui/frontend/src/shared/types.ts b/clients/ui/frontend/src/shared/types.ts
index 56164eae4..e0d58cd6e 100644
--- a/clients/ui/frontend/src/shared/types.ts
+++ b/clients/ui/frontend/src/shared/types.ts
@@ -1,5 +1,3 @@
-import { ValueOf } from '~/shared/typeHelpers';
-
 export type UserSettings = {
   userId: string;
   clusterAdmin?: boolean;
@@ -26,4 +24,89 @@ export type Namespace = {
   name: string;
 };
 
-export type UpdateObjectAtPropAndValue<T> = (propKey: keyof T, propValue: ValueOf<T>) => void;
+export declare type K8sResourceIdentifier = {
+  apiGroup?: string;
+  apiVersion: string;
+  kind: string;
+};
+
+export declare type K8sResourceCommon = K8sResourceIdentifier &
+  Partial<{
+    metadata: Partial<{
+      annotations: Record<string, string>;
+      clusterName: string;
+      creationTimestamp: string;
+      deletionGracePeriodSeconds: number;
+      deletionTimestamp: string;
+      finalizers: string[];
+      generateName: string;
+      generation: number;
+      labels: Record<string, string>;
+      managedFields: unknown[];
+      name: string;
+      namespace: string;
+      ownerReferences: OwnerReference[];
+      resourceVersion: string;
+      uid: string;
+    }>;
+    spec: {
+      selector?: Selector | MatchLabels;
+      [key: string]: unknown;
+    };
+    status: {
+      [key: string]: unknown;
+    };
+    data: {
+      [key: string]: unknown;
+    };
+  }>;
+
+export declare type OwnerReference = {
+  apiVersion: string;
+  kind: string;
+  name: string;
+  uid: string;
+  controller?: boolean;
+  blockOwnerDeletion?: boolean;
+};
+
+export declare type Selector = Partial<{
+  matchLabels: MatchLabels;
+  matchExpressions: MatchExpression[];
+  [key: string]: unknown;
+}>;
+
+export declare type MatchExpression = {
+  key: string;
+  operator: Operator | string;
+  values?: string[];
+  value?: string;
+};
+
+export declare type MatchLabels = {
+  [key: string]: string;
+};
+
+export declare enum Operator {
+  Exists = 'Exists',
+  DoesNotExist = 'DoesNotExist',
+  In = 'In',
+  NotIn = 'NotIn',
+  Equals = 'Equals',
+  NotEqual = 'NotEqual',
+  GreaterThan = 'GreaterThan',
+  LessThan = 'LessThan',
+  NotEquals = 'NotEquals',
+}
+
+export type UpdateObjectAtPropAndValue<T> = <K extends keyof T>(
+  propKey: K,
+  propValue: T[K],
+) => void;
+
+export type FetchStateObject<T, E = Error> = {
+  data: T;
+  loaded: boolean;
+  error?: E;
+  refresh: () => void;
+};
diff --git a/clients/ui/frontend/src/shared/utilities/const.ts b/clients/ui/frontend/src/shared/utilities/const.ts
index 747affa19..673e4a968 100644
--- a/clients/ui/frontend/src/shared/utilities/const.ts
+++ b/clients/ui/frontend/src/shared/utilities/const.ts
@@ -9,11 +9,20 @@ export enum DeploymentMode {
   Integrated = 'integrated',
 }
 
+export enum PlatformMode {
+  Default = 'default',
+  Kubeflow = 'kubeflow',
+}
+
 export const isMUITheme = (): boolean => STYLE_THEME === Theme.MUI;
 export const isStandalone = (): boolean => DEPLOYMENT_MODE === DeploymentMode.Standalone;
 export const isIntegrated = (): boolean => DEPLOYMENT_MODE === DeploymentMode.Integrated;
 
+export const isPlatformKubeflow = (): boolean => PLATFORM_MODE === PlatformMode.Kubeflow;
+export const isPlatformDefault = (): boolean => PLATFORM_MODE === PlatformMode.Default;
+
 const STYLE_THEME = process.env.STYLE_THEME || Theme.Default;
+const PLATFORM_MODE = process.env.PLATFORM_MODE || PlatformMode.Default;
 const DEV_MODE = process.env.APP_ENV === 'development';
 const MOCK_AUTH = process.env.MOCK_AUTH === 'true';
 const DEPLOYMENT_MODE = process.env.DEPLOYMENT_MODE || DeploymentMode.Integrated;
@@ -33,4 +42,11 @@ export {
   LOGO_LIGHT,
   MOCK_AUTH,
   URL_PREFIX,
+  PLATFORM_MODE,
 };
+
+export const FindAdministratorOptions = [
+  'The person who gave you your username, or who helped you to log in for the first time',
+  'Someone in your IT department or help desk',
+  'A project manager or developer',
+];
diff --git a/clients/ui/frontend/src/shared/utilities/useMakeFetchObject.ts b/clients/ui/frontend/src/shared/utilities/useMakeFetchObject.ts
new file mode 100644
index 000000000..1c94ac0b3
--- /dev/null
+++ b/clients/ui/frontend/src/shared/utilities/useMakeFetchObject.ts
@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { FetchStateObject } from '~/shared/types';
+import { FetchState } from '~/shared/utilities/useFetchState';
+
+export const useMakeFetchObject = <T>(fetchState: FetchState<T>): FetchStateObject<T> => {
+  const [data, loaded, error, refresh] = fetchState;
+  return React.useMemo(() => ({ data, loaded, error, refresh }), [data, loaded, error, refresh]);
+};
diff --git a/clients/ui/frontend/src/shared/utilities/utils.ts b/clients/ui/frontend/src/shared/utilities/utils.ts
new file mode 100644
index 000000000..2652d996d
--- /dev/null
+++ b/clients/ui/frontend/src/shared/utilities/utils.ts
@@ -0,0 +1,17 @@
+export const asEnumMember = <T extends object>(
+  member: T[keyof T] | string | number | undefined | null,
+  e: T,
+): T[keyof T] | null => (isEnumMember(member, e) ? member : null);
+
+export const isEnumMember = <T extends object>(
+  member: T[keyof T] | string | number | undefined | unknown | null,
+  e: T,
+): member is T[keyof T] => {
+  if (member != null) {
+    return Object.entries(e)
+      .filter(([key]) => Number.isNaN(Number(key)))
+      .map(([, value]) => value)
+      .includes(member);
+  }
+  return false;
+};
diff --git a/clients/ui/scripts/deploy_kind_cluster.sh b/clients/ui/scripts/deploy_kind_cluster.sh
index 66d547e51..0ade7546b 100755
--- a/clients/ui/scripts/deploy_kind_cluster.sh
+++ b/clients/ui/scripts/deploy_kind_cluster.sh
@@ -5,11 +5,7 @@ command -v docker >/dev/null 2>&1 || { echo >&2 "Docker is required but it's not
 command -v kubectl >/dev/null 2>&1 || { echo >&2 "kubectl is required but it's not installed. Aborting."; exit 1; }
 command -v kind >/dev/null 2>&1 || { echo >&2 "kind is required but it's not installed. Aborting."; exit 1; }
 
-# Check if the script has rights to push an image into the registry
-if ! docker push "${IMG_UI_STANDALONE}" --dry-run >/dev/null 2>&1; then
-  echo -e "\033[31mError: No rights to push the image to the registry ${IMG_UI_STANDALONE}, you can change the image in the env variable IMG_UI_STANDALONE\033[0m"
-  exit 1
-fi
+echo "WARNING: You must have proper push / pull access to ${IMG_UI_STANDALONE}". If this is a new image, make sure you set it to public to avoid issues.
 
 if kubectl get deployment model-registry-deployment -n kubeflow >/dev/null 2>&1; then
   echo "Model Registry deployment already exists. Skipping to step 4."
@@ -45,7 +41,7 @@ make docker-build-standalone
 make docker-push-standalone
 
 echo "Editing kustomize image..."
-pushd  ./manifests/base
+pushd  ../../manifests/kustomize/options/ui/base
 kustomize edit set image model-registry-ui-image=${IMG_UI_STANDALONE}
 
 pushd  ../overlays/standalone
diff --git a/docs/mr_go_library.md b/docs/mr_go_library.md
index e5c99d9ef..5c0f99194 100644
--- a/docs/mr_go_library.md
+++ b/docs/mr_go_library.md
@@ -15,7 +15,7 @@ This includes models, model versions, artifacts, serving environments, inference
 ### Prerequisites
 
 * [MLMD server](https://github.com/google/ml-metadata/blob/f0fef74eae2bdf6650a79ba976b36bea0b777c2e/g3doc/get_started.md#use-mlmd-with-a-remote-grpc-server)
-* Go >= 1.21
+* Go >= 1.22
 
 Install it using:
 
diff --git a/go.mod b/go.mod
index 1d56c5b3c..bac05f3ce 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubeflow/model-registry
 
-go 1.21
+go 1.22
 
 require (
 	github.com/go-chi/chi/v5 v5.1.0
diff --git a/internal/converter/openapi_reconciler_util.go b/internal/converter/openapi_reconciler_util.go
index e2b8544c8..071912a7f 100644
--- a/internal/converter/openapi_reconciler_util.go
+++ b/internal/converter/openapi_reconciler_util.go
@@ -6,18 +6,28 @@ import (
 
 func UpdateExistingArtifact(genc OpenAPIReconciler, source OpenapiUpdateWrapper[openapi.Artifact]) (openapi.Artifact, error) {
 	art := InitWithExisting(source)
+
 	if source.Update == nil {
 		return art, nil
 	}
-	ma, err := genc.UpdateExistingModelArtifact(OpenapiUpdateWrapper[openapi.ModelArtifact]{Existing: art.ModelArtifact, Update: source.Update.ModelArtifact})
-	if err != nil {
-		return art, err
+
+	if source.Update.ModelArtifact != nil {
+		ma, err := genc.UpdateExistingModelArtifact(OpenapiUpdateWrapper[openapi.ModelArtifact]{Existing: art.ModelArtifact, Update: source.Update.ModelArtifact})
+		if err != nil {
+			return art, err
+		}
+
+		art.ModelArtifact = &ma
 	}
-	da, err := genc.UpdateExistingDocArtifact(OpenapiUpdateWrapper[openapi.DocArtifact]{Existing: art.DocArtifact, Update: source.Update.DocArtifact})
-	if err != nil {
-		return art, err
+
+	if source.Update.DocArtifact != nil {
+		da, err := genc.UpdateExistingDocArtifact(OpenapiUpdateWrapper[openapi.DocArtifact]{Existing: art.DocArtifact, Update: source.Update.DocArtifact})
+		if err != nil {
+			return art, err
+		}
+
+		art.DocArtifact = &da
 	}
-	art.DocArtifact = &da
-	art.ModelArtifact = &ma
+
 	return art, nil
 }
diff --git a/internal/server/openapi/api_model_registry_service_service.go b/internal/server/openapi/api_model_registry_service_service.go
index d22b38c25..3d5211b4a 100644
--- a/internal/server/openapi/api_model_registry_service_service.go
+++ b/internal/server/openapi/api_model_registry_service_service.go
@@ -492,7 +492,8 @@ func (s *ModelRegistryServiceAPIService) UpdateArtifact(ctx context.Context, art
 	}
 	if artifactUpdate.DocArtifactUpdate != nil {
 		entity.DocArtifact.Id = &artifactId
-	} else {
+	}
+	if artifactUpdate.ModelArtifactUpdate != nil {
 		entity.ModelArtifact.Id = &artifactId
 	}
 	existing, err := s.coreApi.GetArtifactById(artifactId)
diff --git a/manifests/kustomize/README.md b/manifests/kustomize/README.md
index 54314cbdd..a931e5686 100644
--- a/manifests/kustomize/README.md
+++ b/manifests/kustomize/README.md
@@ -40,6 +40,26 @@ curl -sX 'GET' \
   -H 'accept: application/json' | jq
 ```
 
+### UI Installation
+
+There are two main ways to deploy the Model Registry UI:
+
+1. Standalone mode - Use this if you are using Model Registry without the Kubeflow Platform
+
+2. Integrated mode - Use this if you are deploying Model Registry in Kubeflow 
+
+For a standalone install run the following command:
+
+```bash
+kubectl apply -k options/ui/overlays/standalone -n kubeflow
+```
+
+For an integrated install use the istio UI overlay:
+
+```bash
+kubectl apply -k options/ui/overlays/istio -n kubeflow
+```
+
 ## Usage
 
 For a basic usage of the Kubeflow Model Registry, follow the [Kubeflow Model Registry getting started documentation](https://www.kubeflow.org/docs/components/model-registry/getting-started/)
diff --git a/clients/ui/manifests/base/kustomization.yaml b/manifests/kustomize/options/ui/base/kustomization.yaml
similarity index 100%
rename from clients/ui/manifests/base/kustomization.yaml
rename to manifests/kustomize/options/ui/base/kustomization.yaml
diff --git a/clients/ui/manifests/base/model-registry-ui-deployment.yaml b/manifests/kustomize/options/ui/base/model-registry-ui-deployment.yaml
similarity index 100%
rename from clients/ui/manifests/base/model-registry-ui-deployment.yaml
rename to manifests/kustomize/options/ui/base/model-registry-ui-deployment.yaml
diff --git a/clients/ui/manifests/base/model-registry-ui-role.yaml b/manifests/kustomize/options/ui/base/model-registry-ui-role.yaml
similarity index 100%
rename from clients/ui/manifests/base/model-registry-ui-role.yaml
rename to manifests/kustomize/options/ui/base/model-registry-ui-role.yaml
diff --git a/clients/ui/manifests/base/model-registry-ui-service-account.yaml b/manifests/kustomize/options/ui/base/model-registry-ui-service-account.yaml
similarity index 100%
rename from clients/ui/manifests/base/model-registry-ui-service-account.yaml
rename to manifests/kustomize/options/ui/base/model-registry-ui-service-account.yaml
diff --git a/clients/ui/manifests/base/model-registry-ui-service.yaml b/manifests/kustomize/options/ui/base/model-registry-ui-service.yaml
similarity index 100%
rename from clients/ui/manifests/base/model-registry-ui-service.yaml
rename to manifests/kustomize/options/ui/base/model-registry-ui-service.yaml
diff --git a/clients/ui/manifests/overlays/integrated/kustomization.yaml b/manifests/kustomize/options/ui/overlays/integrated/kustomization.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/integrated/kustomization.yaml
rename to manifests/kustomize/options/ui/overlays/integrated/kustomization.yaml
diff --git a/clients/ui/manifests/overlays/integrated/model-registry-ui-deployment.yaml b/manifests/kustomize/options/ui/overlays/integrated/model-registry-ui-deployment.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/integrated/model-registry-ui-deployment.yaml
rename to manifests/kustomize/options/ui/overlays/integrated/model-registry-ui-deployment.yaml
diff --git a/clients/ui/manifests/overlays/istio/authorization-policy-ui.yaml b/manifests/kustomize/options/ui/overlays/istio/authorization-policy-ui.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/istio/authorization-policy-ui.yaml
rename to manifests/kustomize/options/ui/overlays/istio/authorization-policy-ui.yaml
diff --git a/clients/ui/manifests/overlays/istio/destination-rule-ui.yaml b/manifests/kustomize/options/ui/overlays/istio/destination-rule-ui.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/istio/destination-rule-ui.yaml
rename to manifests/kustomize/options/ui/overlays/istio/destination-rule-ui.yaml
diff --git a/clients/ui/manifests/overlays/istio/kustomization.yaml b/manifests/kustomize/options/ui/overlays/istio/kustomization.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/istio/kustomization.yaml
rename to manifests/kustomize/options/ui/overlays/istio/kustomization.yaml
diff --git a/clients/ui/manifests/overlays/istio/model-registry-ui-service.yaml b/manifests/kustomize/options/ui/overlays/istio/model-registry-ui-service.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/istio/model-registry-ui-service.yaml
rename to manifests/kustomize/options/ui/overlays/istio/model-registry-ui-service.yaml
diff --git a/clients/ui/manifests/overlays/istio/virtual-service.yaml b/manifests/kustomize/options/ui/overlays/istio/virtual-service.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/istio/virtual-service.yaml
rename to manifests/kustomize/options/ui/overlays/istio/virtual-service.yaml
diff --git a/clients/ui/manifests/overlays/standalone/kubeflow-dashboard-rbac.yaml b/manifests/kustomize/options/ui/overlays/standalone/kubeflow-dashboard-rbac.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/standalone/kubeflow-dashboard-rbac.yaml
rename to manifests/kustomize/options/ui/overlays/standalone/kubeflow-dashboard-rbac.yaml
diff --git a/clients/ui/manifests/overlays/standalone/kustomization.yaml b/manifests/kustomize/options/ui/overlays/standalone/kustomization.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/standalone/kustomization.yaml
rename to manifests/kustomize/options/ui/overlays/standalone/kustomization.yaml
diff --git a/clients/ui/manifests/overlays/standalone/model-registry-ui-deployment.yaml b/manifests/kustomize/options/ui/overlays/standalone/model-registry-ui-deployment.yaml
similarity index 100%
rename from clients/ui/manifests/overlays/standalone/model-registry-ui-deployment.yaml
rename to manifests/kustomize/options/ui/overlays/standalone/model-registry-ui-deployment.yaml
diff --git a/scripts/install_protoc.sh b/scripts/install_protoc.sh
index fd66de66e..c152ebde4 100755
--- a/scripts/install_protoc.sh
+++ b/scripts/install_protoc.sh
@@ -8,7 +8,7 @@ if [[ ${OSTYPE,,} =~ darwin ]]; then
 fi
 
 ARCH=$(uname -m)
-if [[ "$ARCH" == "arm"* ]]; then
+if [[ "$ARCH" == "arm"* || "$ARCH" == "aarch64" ]]; then
   ARCH="aarch_64"
 elif [[ "$ARCH" == "s390x" ]]; then
   ARCH="s390_64"