diff --git a/package-lock.json b/package-lock.json
index 54715de6..29a46aeb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "react-dom": "^18.2.0",
         "react-rnd": "^10.4.1",
         "react-router-dom": "^6.23.0",
-        "utopia-ui": "^3.0.86"
+        "utopia-ui": "^3.0.91"
       },
       "devDependencies": {
         "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
@@ -3042,9 +3042,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.76.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.76.0.tgz",
-      "integrity": "sha512-FN375hb8ctzfNAlex5gHI6+WDXTNpe0nbxp/d2YJtnP+IBM6OUm7zcaoCW6T63BawGOYZBbKC0iPvr41TteNVg==",
+      "version": "5.76.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.76.2.tgz",
+      "integrity": "sha512-PFGwWh5ss9cJQ67l6bZ7hqXbisX2gy13G2jP+VGY1bgdbCfOMWh6UBVnN62QbFXro6CCoX9hYzTnZHr6Rz00YQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3052,12 +3052,12 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.76.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.76.1.tgz",
-      "integrity": "sha512-YxdLZVGN4QkT5YT1HKZQWiIlcgauIXEIsMOTSjvyD5wLYK8YVvKZUPAysMqossFJJfDpJW3pFn7WNZuPOqq+fw==",
+      "version": "5.76.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.76.2.tgz",
+      "integrity": "sha512-rGkWberCrFdIxMdvSAJM/UOKeu0O/JVTbMmfhQoJpiU9Uq0EDx2EMCadnNuJWbXR4smDA2t7DY3NKkYFmDVS5A==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.76.0"
+        "@tanstack/query-core": "5.76.2"
       },
       "funding": {
         "type": "github",
@@ -3197,9 +3197,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.3.21",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.21.tgz",
-      "integrity": "sha512-gXLBtmlcRJeT09/sI4PxVwyrku6SaNUj/6cMubjE6T6XdY1fDmBL7r0nX0jbSZPU/Xr0KuwLLZh6aOYY5d91Xw==",
+      "version": "18.3.22",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.22.tgz",
+      "integrity": "sha512-vUhG0YmQZ7kL/tmKLrD3g5zXbXXreZXB3pmROW8bg3CnLnpjkRVwUlLne7Ufa2r9yJ8+/6B73RzhAek5TBKh2Q==",
       "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
@@ -4447,9 +4447,9 @@
       "license": "MIT"
     },
     "node_modules/daisyui": {
-      "version": "5.0.35",
-      "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.0.35.tgz",
-      "integrity": "sha512-AWi11n/x5++mps55jcwrBf0Lmip1euWY0FYcH/05SFGmoqrU7S7/aIUWaiaeqlJ5EcmEZ/7zEY73aOxMv6hcIg==",
+      "version": "5.0.37",
+      "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.0.37.tgz",
+      "integrity": "sha512-PLc+MhWAqTwolygEGPDi+ac+OsFqIt9nZylTIiyVlEx8loYL7Pt7hNWb8cp5pQQ9dhjYnda1ERiuM6OsJmvPGw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -4720,9 +4720,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "version": "1.23.10",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
+      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4730,18 +4730,18 @@
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -4757,13 +4757,13 @@
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
@@ -4776,7 +4776,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10513,9 +10513,9 @@
       }
     },
     "node_modules/utopia-ui": {
-      "version": "3.0.86",
-      "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.86.tgz",
-      "integrity": "sha512-Y5qGztPnQk8QAUBqtWQKI3uchGr74Pb1KTcfEEvkIcwFqkvrNVjXLQNp/+V9SKtyhf+AvlfIGkCtjD65NwsHHw==",
+      "version": "3.0.91",
+      "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.91.tgz",
+      "integrity": "sha512-AIq+H/Kt5WlrQt8M/xeNNu9KdWrkFJYaCWCK+T1M78QIe1jDfdtI1a94i+XTCX9MxcpPs6HE3BlGmeIwd884uA==",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@heroicons/react": "^2.0.17",
diff --git a/package.json b/package.json
index 77fc790b..ee0ff5d1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "react-dom": "^18.2.0",
     "react-rnd": "^10.4.1",
     "react-router-dom": "^6.23.0",
-    "utopia-ui": "^3.0.86"
+    "utopia-ui": "^3.0.91"
   },
   "devDependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
diff --git a/src/pages/MapContainer.tsx b/src/pages/MapContainer.tsx
index c011c63d..482d18db 100644
--- a/src/pages/MapContainer.tsx
+++ b/src/pages/MapContainer.tsx
@@ -12,11 +12,11 @@ import { useEffect, useState } from 'react'
 import {
   UtopiaMap,
   Layer,
-  ItemView,
+  PopupView,
   PopupButton,
   StartEndView,
   TextView,
-  ItemForm,
+  PopupForm,
   PopupStartEndInput,
   PopupTextAreaInput,
   PopupTextInput,
@@ -107,14 +107,14 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
               listed={layer.listed}
               api={apis.find((api) => api.id === layer.id)?.api}
             >
-              <ItemView>
+              <PopupView>
                 {layer.itemType.show_start_end && <StartEndView></StartEndView>}
                 {layer.itemType.show_profile_button && (
                   <PopupButton url={'/item'} parameterField={'id'} text={'Profile'} />
                 )}
                 {layer.itemType.show_text && <TextView truncate></TextView>}
-              </ItemView>
-              <ItemForm>
+              </PopupView>
+              <PopupForm>
                 {layer.itemType.show_name_input && (
                   <PopupTextInput dataField='name' placeholder='Name'></PopupTextInput>
                 )}
@@ -140,7 +140,7 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
                   Object.entries(layer.item_presets).map((ip: any) => (
                     <input key={ip[0]} type='hidden' id={ip[0]} name={ip[0]} value={ip[1]} />
                   ))}
-              </ItemForm>
+              </PopupForm>
             </Layer>
           ))}
       </UtopiaMap>