diff --git a/README.md b/README.md
index 8994aa9..7860d64 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,7 @@ as well as see all models made in any window.
 - fix click (for placement and selection on floor + cubes) to only work when mouse stays still (down-up)
 - first cube cant be removed in model editor
 - updates to models not showing without refreshing (in world)
+- showing world models in model picker only after one model is added to world
 
 ## Credits
 
diff --git a/package-lock.json b/package-lock.json
index 00a2649..ad016a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
 				"@threlte/rapier": "^3.1.1",
 				"@threlte/studio": "^0.1.4",
 				"@types/three": "^0.175.0",
-				"fuchs": "^0.0.30",
+				"fuchs": "^0.0.31",
 				"three": "^0.175.0",
 				"uber-noise": "^0.2.2",
 				"vite-plugin-top-level-await": "^1.5.0",
@@ -2782,9 +2782,9 @@
 			}
 		},
 		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
-			"integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz",
+			"integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==",
 			"cpu": [
 				"arm"
 			],
@@ -2795,9 +2795,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
-			"integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz",
+			"integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==",
 			"cpu": [
 				"arm64"
 			],
@@ -2808,9 +2808,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
-			"integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz",
+			"integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==",
 			"cpu": [
 				"arm64"
 			],
@@ -2821,9 +2821,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
-			"integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz",
+			"integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==",
 			"cpu": [
 				"x64"
 			],
@@ -2834,9 +2834,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-arm64": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
-			"integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz",
+			"integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==",
 			"cpu": [
 				"arm64"
 			],
@@ -2847,9 +2847,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-freebsd-x64": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
-			"integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz",
+			"integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==",
 			"cpu": [
 				"x64"
 			],
@@ -2860,9 +2860,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
-			"integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz",
+			"integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==",
 			"cpu": [
 				"arm"
 			],
@@ -2873,9 +2873,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
-			"integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz",
+			"integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==",
 			"cpu": [
 				"arm"
 			],
@@ -2886,9 +2886,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
-			"integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz",
+			"integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==",
 			"cpu": [
 				"arm64"
 			],
@@ -2899,9 +2899,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
-			"integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz",
+			"integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -2912,9 +2912,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
-			"integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz",
+			"integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==",
 			"cpu": [
 				"loong64"
 			],
@@ -2925,9 +2925,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
-			"integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz",
+			"integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==",
 			"cpu": [
 				"ppc64"
 			],
@@ -2938,9 +2938,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
-			"integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz",
+			"integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==",
 			"cpu": [
 				"riscv64"
 			],
@@ -2951,9 +2951,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-riscv64-musl": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
-			"integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz",
+			"integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==",
 			"cpu": [
 				"riscv64"
 			],
@@ -2964,9 +2964,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-s390x-gnu": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
-			"integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz",
+			"integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==",
 			"cpu": [
 				"s390x"
 			],
@@ -2977,9 +2977,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
-			"integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz",
+			"integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==",
 			"cpu": [
 				"x64"
 			],
@@ -2990,9 +2990,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-linux-x64-musl": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
-			"integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz",
+			"integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==",
 			"cpu": [
 				"x64"
 			],
@@ -3003,9 +3003,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
-			"integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz",
+			"integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==",
 			"cpu": [
 				"arm64"
 			],
@@ -3016,9 +3016,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
-			"integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz",
+			"integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==",
 			"cpu": [
 				"ia32"
 			],
@@ -3029,9 +3029,9 @@
 			]
 		},
 		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
-			"integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz",
+			"integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==",
 			"cpu": [
 				"x64"
 			],
@@ -4205,9 +4205,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.15.2",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.2.tgz",
-			"integrity": "sha512-uKXqKN9beGoMdBfcaTY1ecwz6ctxuJAcUlwE55938g0ZJ8lRxwAZqRz2AJ4pzpt5dHdTPMB863UZ0ESiFUcP7A==",
+			"version": "22.15.3",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
+			"integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
 			"license": "MIT",
 			"peer": true,
 			"dependencies": {
@@ -4241,17 +4241,17 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.0.tgz",
-			"integrity": "sha512-evaQJZ/J/S4wisevDvC1KFZkPzRetH8kYZbkgcTRyql3mcKsf+ZFDV1BVWUGTCAW5pQHoqn5gK5b8kn7ou9aFQ==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.1.tgz",
+			"integrity": "sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.31.0",
-				"@typescript-eslint/type-utils": "8.31.0",
-				"@typescript-eslint/utils": "8.31.0",
-				"@typescript-eslint/visitor-keys": "8.31.0",
+				"@typescript-eslint/scope-manager": "8.31.1",
+				"@typescript-eslint/type-utils": "8.31.1",
+				"@typescript-eslint/utils": "8.31.1",
+				"@typescript-eslint/visitor-keys": "8.31.1",
 				"graphemer": "^1.4.0",
 				"ignore": "^5.3.1",
 				"natural-compare": "^1.4.0",
@@ -4271,16 +4271,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz",
-			"integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.1.tgz",
+			"integrity": "sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.31.0",
-				"@typescript-eslint/types": "8.31.0",
-				"@typescript-eslint/typescript-estree": "8.31.0",
-				"@typescript-eslint/visitor-keys": "8.31.0",
+				"@typescript-eslint/scope-manager": "8.31.1",
+				"@typescript-eslint/types": "8.31.1",
+				"@typescript-eslint/typescript-estree": "8.31.1",
+				"@typescript-eslint/visitor-keys": "8.31.1",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -4296,14 +4296,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz",
-			"integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.1.tgz",
+			"integrity": "sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.31.0",
-				"@typescript-eslint/visitor-keys": "8.31.0"
+				"@typescript-eslint/types": "8.31.1",
+				"@typescript-eslint/visitor-keys": "8.31.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4314,14 +4314,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.0.tgz",
-			"integrity": "sha512-DJ1N1GdjI7IS7uRlzJuEDCgDQix3ZVYVtgeWEyhyn4iaoitpMBX6Ndd488mXSx0xah/cONAkEaYyylDyAeHMHg==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.1.tgz",
+			"integrity": "sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.31.0",
-				"@typescript-eslint/utils": "8.31.0",
+				"@typescript-eslint/typescript-estree": "8.31.1",
+				"@typescript-eslint/utils": "8.31.1",
 				"debug": "^4.3.4",
 				"ts-api-utils": "^2.0.1"
 			},
@@ -4338,9 +4338,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz",
-			"integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.1.tgz",
+			"integrity": "sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4352,14 +4352,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz",
-			"integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.1.tgz",
+			"integrity": "sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.31.0",
-				"@typescript-eslint/visitor-keys": "8.31.0",
+				"@typescript-eslint/types": "8.31.1",
+				"@typescript-eslint/visitor-keys": "8.31.1",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
@@ -4405,16 +4405,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.0.tgz",
-			"integrity": "sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.1.tgz",
+			"integrity": "sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.31.0",
-				"@typescript-eslint/types": "8.31.0",
-				"@typescript-eslint/typescript-estree": "8.31.0"
+				"@typescript-eslint/scope-manager": "8.31.1",
+				"@typescript-eslint/types": "8.31.1",
+				"@typescript-eslint/typescript-estree": "8.31.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4429,13 +4429,13 @@
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz",
-			"integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.1.tgz",
+			"integrity": "sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.31.0",
+				"@typescript-eslint/types": "8.31.1",
 				"eslint-visitor-keys": "^4.2.0"
 			},
 			"engines": {
@@ -6235,9 +6235,9 @@
 			}
 		},
 		"node_modules/fuchs": {
-			"version": "0.0.30",
-			"resolved": "https://registry.npmjs.org/fuchs/-/fuchs-0.0.30.tgz",
-			"integrity": "sha512-r7tF0joYpuUnMKd/DTav++CVniVY6PifCermst4cdBWtInM7FODfYgBB84ra5AeAYkpDnr6TchpTlqzURqYMUQ==",
+			"version": "0.0.31",
+			"resolved": "https://registry.npmjs.org/fuchs/-/fuchs-0.0.31.tgz",
+			"integrity": "sha512-p//NbNtq6WAFBcdknzLnRcd3YsBCAcBYG78ezaogSVS8AUGWHA4QuXVtS008luTXllrhpxppXCH8yd2LHgoh4g==",
 			"license": "MIT",
 			"dependencies": {
 				"@atproto/api": "^0.14.7",
@@ -8657,9 +8657,9 @@
 			"license": "Unlicense"
 		},
 		"node_modules/rollup": {
-			"version": "4.40.0",
-			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
-			"integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
+			"version": "4.40.1",
+			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz",
+			"integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==",
 			"license": "MIT",
 			"dependencies": {
 				"@types/estree": "1.0.7"
@@ -8672,26 +8672,26 @@
 				"npm": ">=8.0.0"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-android-arm-eabi": "4.40.0",
-				"@rollup/rollup-android-arm64": "4.40.0",
-				"@rollup/rollup-darwin-arm64": "4.40.0",
-				"@rollup/rollup-darwin-x64": "4.40.0",
-				"@rollup/rollup-freebsd-arm64": "4.40.0",
-				"@rollup/rollup-freebsd-x64": "4.40.0",
-				"@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
-				"@rollup/rollup-linux-arm-musleabihf": "4.40.0",
-				"@rollup/rollup-linux-arm64-gnu": "4.40.0",
-				"@rollup/rollup-linux-arm64-musl": "4.40.0",
-				"@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
-				"@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
-				"@rollup/rollup-linux-riscv64-gnu": "4.40.0",
-				"@rollup/rollup-linux-riscv64-musl": "4.40.0",
-				"@rollup/rollup-linux-s390x-gnu": "4.40.0",
-				"@rollup/rollup-linux-x64-gnu": "4.40.0",
-				"@rollup/rollup-linux-x64-musl": "4.40.0",
-				"@rollup/rollup-win32-arm64-msvc": "4.40.0",
-				"@rollup/rollup-win32-ia32-msvc": "4.40.0",
-				"@rollup/rollup-win32-x64-msvc": "4.40.0",
+				"@rollup/rollup-android-arm-eabi": "4.40.1",
+				"@rollup/rollup-android-arm64": "4.40.1",
+				"@rollup/rollup-darwin-arm64": "4.40.1",
+				"@rollup/rollup-darwin-x64": "4.40.1",
+				"@rollup/rollup-freebsd-arm64": "4.40.1",
+				"@rollup/rollup-freebsd-x64": "4.40.1",
+				"@rollup/rollup-linux-arm-gnueabihf": "4.40.1",
+				"@rollup/rollup-linux-arm-musleabihf": "4.40.1",
+				"@rollup/rollup-linux-arm64-gnu": "4.40.1",
+				"@rollup/rollup-linux-arm64-musl": "4.40.1",
+				"@rollup/rollup-linux-loongarch64-gnu": "4.40.1",
+				"@rollup/rollup-linux-powerpc64le-gnu": "4.40.1",
+				"@rollup/rollup-linux-riscv64-gnu": "4.40.1",
+				"@rollup/rollup-linux-riscv64-musl": "4.40.1",
+				"@rollup/rollup-linux-s390x-gnu": "4.40.1",
+				"@rollup/rollup-linux-x64-gnu": "4.40.1",
+				"@rollup/rollup-linux-x64-musl": "4.40.1",
+				"@rollup/rollup-win32-arm64-msvc": "4.40.1",
+				"@rollup/rollup-win32-ia32-msvc": "4.40.1",
+				"@rollup/rollup-win32-x64-msvc": "4.40.1",
 				"fsevents": "~2.3.2"
 			}
 		},
@@ -9744,15 +9744,15 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.31.0",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.31.0.tgz",
-			"integrity": "sha512-u+93F0sB0An8WEAPtwxVhFby573E8ckdjwUUQUj9QA4v8JAvgtoDdIyYR3XFwFHq2W1KJ1AurwJCO+w+Y1ixyQ==",
+			"version": "8.31.1",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.31.1.tgz",
+			"integrity": "sha512-j6DsEotD/fH39qKzXTQRwYYWlt7D+0HmfpOK+DVhwJOFLcdmn92hq3mBb7HlKJHbjjI/gTOqEcc9d6JfpFf/VA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.31.0",
-				"@typescript-eslint/parser": "8.31.0",
-				"@typescript-eslint/utils": "8.31.0"
+				"@typescript-eslint/eslint-plugin": "8.31.1",
+				"@typescript-eslint/parser": "8.31.1",
+				"@typescript-eslint/utils": "8.31.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/package.json b/package.json
index 770c82b..0759f45 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"@threlte/rapier": "^3.1.1",
 		"@threlte/studio": "^0.1.4",
 		"@types/three": "^0.175.0",
-		"fuchs": "^0.0.30",
+		"fuchs": "^0.0.31",
 		"three": "^0.175.0",
 		"uber-noise": "^0.2.2",
 		"vite-plugin-top-level-await": "^1.5.0",
diff --git a/src/lib/model-editor/ModelEditorUI.svelte b/src/lib/model-editor/ModelEditorUI.svelte
index 7ad00c1..923a34f 100644
--- a/src/lib/model-editor/ModelEditorUI.svelte
+++ b/src/lib/model-editor/ModelEditorUI.svelte
@@ -1,9 +1,10 @@
-<script>
+<script lang="ts">
 	import { Button, PopoverColorPicker, Toggle, ToggleGroup, ToggleGroupItem } from 'fuchs';
 	import { addVoxel, applyModelEditorTransform, deleteVoxel, modelEditor } from './state.svelte';
 	import { editingState } from '$lib/world-editor/state.svelte';
 	import { g } from '$lib/roomy.svelte';
 	import { onMount } from 'svelte';
+	import { Models } from '$lib/roomy';
 
 	$effect(() => {
 		applyModelEditorTransform();
@@ -173,16 +174,39 @@
 	</div>
 </div>
 
-<div class="absolute bottom-2 right-2">
-	<Button size="iconLg" onclick={() => {
-		editingState.showModelEditor = false;
-		if(g.voxelObject?.id && g.voxelObject.voxels.length > 0) editingState.selectedModelId = g.voxelObject.id;;
-	}}>
+<div class="absolute right-2 bottom-2">
+	<Button
+		size="iconLg"
+		onclick={() => {
+			editingState.showModelEditor = false;
+			if (g.voxelObject?.id && g.voxelObject.voxels.length > 0)
+				editingState.selectedModelId = g.voxelObject.id;
+		}}
+	>
 		Back to world
 	</Button>
 </div>
 
-
 <div class="absolute top-3 right-3 z-10">
 	<PopoverColorPicker bind:rgb={modelEditor.color} />
-</div>
\ No newline at end of file
+</div>
+
+
+<!-- delete from public model list -->
+<!-- <Button
+	size="lg"
+	class="absolute bottom-2 left-2"
+	onclick={async () => {
+		if (!g.voxelObject || !g.roomy) return;
+
+		const id = 'leaf:6hv4pxwp66xa5g9jqqz2q4jr39ryahrceafe71e2vwys1fstjmw0';
+
+		const models = await g.roomy.open(Models, id);
+		const index = (await models.models.items()).findIndex((m) => m.id === g.voxelObject?.id);
+		if (index === -1) return;
+		models.models.remove(index);
+		models.commit();
+	}}
+>
+	Delete
+</Button> -->
diff --git a/src/lib/model-picker/base/ModelPicker.svelte b/src/lib/model-picker/base/ModelPicker.svelte
index 165fa48..fddce28 100644
--- a/src/lib/model-picker/base/ModelPicker.svelte
+++ b/src/lib/model-picker/base/ModelPicker.svelte
@@ -78,7 +78,7 @@
 							}
 						}
 					></div>
-					<div class="text-base-700 dark:text-base-300 text-sm">{item.label}</div>
+					<!-- <div class="text-base-700 dark:text-base-300 text-sm">{item.label}</div> -->
 
 					{#if showEditButton}
 						<div class="absolute -top-1 -right-1 z-10">
diff --git a/src/lib/player/ThirdPersonControls.svelte b/src/lib/player/ThirdPersonControls.svelte
index 1b88dcb..ff7a0b1 100644
--- a/src/lib/player/ThirdPersonControls.svelte
+++ b/src/lib/player/ThirdPersonControls.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
 	import { Camera, Vector2, Vector3, Quaternion, Mesh } from 'three';
-	import { useThrelte, useParent, useTask } from '@threlte/core';
+	import { useThrelte, useParent } from '@threlte/core';
+	import { usePhysicsTask } from '@threlte/rapier';
 
 	let {
 		object,
-		rotateSpeed = 1.0,
+		rotateSpeed = 0.8,
 		idealOffset = { x: -0.5, y: 1.5, z: -4 },
 		idealLookAt = { x: 0, y: 1, z: 5 },
 	}: {
@@ -54,7 +55,7 @@
 	});
 
 	// This is basically your update function
-	useTask((delta) => {
+	usePhysicsTask((delta) => {
 		// the object's position is bound to the prop
 		if (!object) return;
 
diff --git a/src/lib/roomy.svelte.ts b/src/lib/roomy.svelte.ts
index e9321b5..c8b5aea 100644
--- a/src/lib/roomy.svelte.ts
+++ b/src/lib/roomy.svelte.ts
@@ -19,7 +19,7 @@ export const g = $state({
 	did: undefined as string | undefined
 });
 
-export async function initRoomy(type: 'local' | 'remote' | 'dev' = 'local') {
+export async function initRoomy(type: 'local' | 'remote' | 'dev' = 'dev') {
 	const savedCatalogId = localStorage.getItem('catalogId');
 	const catalogId = new EntityId((savedCatalogId as EntityIdStr) ?? undefined);
 	if (!savedCatalogId) localStorage.setItem('catalogId', catalogId.toString());
diff --git a/src/lib/roomy/components.ts b/src/lib/roomy/components.ts
index fce7fdb..c475b36 100644
--- a/src/lib/roomy/components.ts
+++ b/src/lib/roomy/components.ts
@@ -289,3 +289,37 @@ export const PlayerLocationComponent = defComponent(
 	}>
 );
 
+// export const WorldSettingsComponent = defComponent(
+// 	'worldSettings:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+// 	LoroMap<{
+// 		/** The JSON encoded content from the rich text editor. */
+// 		settings: string;
+// 	}>,
+// 	(map) => map.set('settings', '{}')
+// );
+
+export const GradientStopComponent = defComponent(
+	'gradientStop:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMap<{
+		r: number;
+		g: number;
+		b: number;
+		position: number;
+	}>
+);
+
+export const GradientComponent = defComponent(
+	'gradient:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMovableList<EntityIdStr>
+);
+
+export const WorldSettingsComponent = defComponent(
+	'worldSettings:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMap<{
+		seed: string;
+		size: number;
+		terrainGradient: EntityIdStr;
+		waterGradient: EntityIdStr;
+		waterPercentage: number;
+	}>
+);
\ No newline at end of file
diff --git a/src/lib/roomy/index.ts b/src/lib/roomy/index.ts
index 9790136..760a840 100644
--- a/src/lib/roomy/index.ts
+++ b/src/lib/roomy/index.ts
@@ -44,8 +44,7 @@ export * from '@muni-town/leaf';
 export * as components from './components';
 import * as c from './components';
 import { Color, Quaternion, Vector3 } from 'three';
-
-import { g, initRoomy } from '$lib/roomy.svelte.js';
+import UberNoise, { type NoiseOptions } from 'uber-noise';
 
 /** A constructor for an {@linkcode EntityWrapper}. */
 export type EntityConstructor<T extends EntityWrapper> = new (peer: Peer, entity: Entity) => T;
@@ -928,10 +927,8 @@ export class TransformedGroup extends Transform {
 		return this.entity.getOrInit(c.TransformedGroupComponent, (entity) => entity.get('group'));
 	}
 
-	async loadGroup() {
-		if (!g.roomy) await initRoomy();
-
-		return await g.roomy!.open(VoxelGroup, this.group);
+	async loadGroup(): Promise<VoxelGroup> {
+		return this.open(VoxelGroup, this.group);
 	}
 
 	set group(value: EntityIdStr) {
@@ -979,6 +976,20 @@ export class PlayerLocation extends EntityWrapper {
 	}
 }
 
+// export type WorldSettings = {
+// 	seed: string;
+// 	size: number;
+// 	terrainGradient: {
+// 		rgb: { r: number; g: number; b: number };
+// 		position: number;
+// 	}[];
+// 	waterGradient: {
+// 		rgb: { r: number; g: number; b: number };
+// 		position: number;
+// 	}[];
+// 	version?: number;
+// };
+
 export class World extends NamedEntity {
 	get instances(): EntityList<TransformedGroup> {
 		return new EntityList(this.peer, this.entity, c.WorldComponent, TransformedGroup);
@@ -987,4 +998,89 @@ export class World extends NamedEntity {
 	get locations(): EntityList<PlayerLocation> {
 		return new EntityList(this.peer, this.entity, c.PlayerLocationsComponent, PlayerLocation);
 	}
-}
\ No newline at end of file
+
+	get settings(): WorldSettings {
+		return JSON.parse(
+			this.entity.getOrInit(c.WorldSettingsComponent, (entity) => entity.get('settings'))
+		);
+	}
+
+	set settings(value: WorldSettings) {
+		this.entity.getOrInit(c.WorldSettingsComponent, (entity) =>
+			entity.set('settings', JSON.stringify(value))
+		);
+	}
+
+	get terrainGradient(): EntityIdStr {
+		return this.entity.getOrInit(c.WorldSettingsComponent, (entity) =>
+			entity.get('terrainGradient')
+		);
+	}
+
+	async loadTerrainGradient(): Promise<Gradient> {
+		return await this.open(Gradient, this.terrainGradient);
+	}
+
+	get seed(): string {
+		return this.entity.getOrInit(c.WorldSettingsComponent, (entity) => entity.get('seed'));
+	}
+
+	set seed(value: string) {
+		this.entity.getOrInit(c.WorldSettingsComponent, (entity) => entity.set('seed', value));
+	}
+}
+
+export class GradientStop extends EntityWrapper {
+	get r() {
+		return this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.get('r'));
+	}
+
+	set r(value: number) {
+		this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.set('r', value));
+	}
+
+	get g() {
+		return this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.get('g'));
+	}
+	set g(value: number) {
+		this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.set('g', value));
+	}
+
+	get b() {
+		return this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.get('b'));
+	}
+	set b(value: number) {
+		this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.set('b', value));
+	}
+
+	get position() {
+		return this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.get('position'));
+	}
+
+	set position(value: number) {
+		this.entity.getOrInit(c.GradientStopComponent, (entity) => entity.set('position', value));
+	}
+}
+
+export class Gradient extends EntityWrapper {
+	get stops(): EntityList<GradientStop> {
+		return new EntityList(this.peer, this.entity, c.GradientComponent, GradientStop);
+	}
+}
+
+export type WorldSettings = {
+	seed: string;
+	size: number;
+	terrainGradient: {
+		rgb: { r: number; g: number; b: number };
+		position: number;
+	}[];
+	waterGradient: {
+		rgb: { r: number; g: number; b: number };
+		position: number;
+	}[];
+	version: number;
+	waterPercentage: number;
+	terrainNoise?: NoiseOptions;
+	waterNoise?: NoiseOptions;
+};
diff --git a/src/lib/roomy/world-components.ts b/src/lib/roomy/world-components.ts
new file mode 100644
index 0000000..459c311
--- /dev/null
+++ b/src/lib/roomy/world-components.ts
@@ -0,0 +1,79 @@
+import { defComponent, LoroMap, LoroMovableList, type EntityIdStr } from '@muni-town/leaf';
+
+export const TransformComponent = defComponent(
+	'name:01JPEBV8TJ8YCXYYD256NJSR5X',
+	LoroMap<{
+		x: number;
+		y: number;
+		z: number;
+
+		sx: number;
+		sy: number;
+		sz: number;
+
+		qx: number;
+		qy: number;
+		qz: number;
+		qw: number;
+	}>
+);
+
+export const VoxelComponent = defComponent(
+	'name:01JPEBV8TJ8YCXYYD256NJSR5X',
+	LoroMap<{
+		x: number;
+		y: number;
+		z: number;
+		r: number;
+		g: number;
+		b: number;
+		sx: number;
+		sy: number;
+		sz: number;
+		qx: number;
+		qy: number;
+		qz: number;
+		qw: number;
+
+		visible: boolean;
+		collider: boolean;
+	}>
+);
+
+export const VoxelGroupComponent = defComponent(
+	'voxels:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMovableList<EntityIdStr>
+);
+
+export const TransformedGroupComponent = defComponent(
+	'transformed:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMap<{
+		group: EntityIdStr;
+	}>
+);
+
+export const ModelsComponent = defComponent(
+	'models:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMovableList<EntityIdStr>
+);
+
+export const WorldComponent = defComponent(
+	'world:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMovableList<EntityIdStr>
+);
+
+export const PlayerLocationsComponent = defComponent(
+	'player:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMovableList<EntityIdStr>
+);
+
+export const PlayerLocationComponent = defComponent(
+	'player:02JPFMTA2QAFY2D3CV1C0YBZQ1',
+	LoroMap<{
+		x: number;
+		y: number;
+		z: number;
+
+		time: number;
+	}>
+);
diff --git a/src/lib/roomy/world.ts b/src/lib/roomy/world.ts
new file mode 100644
index 0000000..6d197eb
--- /dev/null
+++ b/src/lib/roomy/world.ts
@@ -0,0 +1,237 @@
+import { g, initRoomy } from '$lib/roomy.svelte';
+import type { EntityIdStr } from '@muni-town/leaf';
+import { Quaternion, Vector3, Color } from 'three';
+import { EntityList, EntityWrapper, NamedEntity } from '.';
+
+import * as c from './world-components';
+
+export class Transform extends EntityWrapper {
+	get position() {
+		return new Vector3(this.x, this.y, this.z);
+	}
+
+	set position(value: Vector3) {
+		this.x = value.x;
+		this.y = value.y;
+		this.z = value.z;
+	}
+
+	get quaternion() {
+		return new Quaternion(this.qx, this.qy, this.qz, this.qw);
+	}
+
+	set quaternion(value: Quaternion) {
+		this.qx = value.x;
+		this.qy = value.y;
+		this.qz = value.z;
+		this.qw = value.w;
+	}
+
+	get scale() {
+		return new Vector3(this.sx, this.sy, this.sz);
+	}
+
+	set scale(value: Vector3) {
+		this.sx = value.x;
+		this.sy = value.y;
+		this.sz = value.z;
+	}
+
+	get x() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('x'));
+	}
+	set x(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('x', value));
+	}
+
+	get y() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('y'));
+	}
+	set y(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('y', value));
+	}
+
+	get z() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('z'));
+	}
+	set z(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('z', value));
+	}
+
+	get sx() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('sx'));
+	}
+
+	set sx(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('sx', value));
+	}
+
+	get sy() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('sy'));
+	}
+
+	set sy(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('sy', value));
+	}
+
+	get sz() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('sz'));
+	}
+
+	set sz(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('sz', value));
+	}
+
+	get qx() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('qx'));
+	}
+
+	set qx(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('qx', value));
+	}
+
+	get qy() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('qy'));
+	}
+
+	set qy(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('qy', value));
+	}
+
+	get qz() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('qz'));
+	}
+
+	set qz(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('qz', value));
+	}
+
+	get qw() {
+		return this.entity.getOrInit(c.TransformComponent, (entity) => entity.get('qw'));
+	}
+
+	set qw(value: number) {
+		this.entity.getOrInit(c.TransformComponent, (entity) => entity.set('qw', value));
+	}
+}
+
+export class Voxel extends Transform {
+	get color() {
+		return new Color(this.r, this.g, this.b);
+	}
+
+	set color(value: Color) {
+		this.r = value.r;
+		this.g = value.g;
+		this.b = value.b;
+	}
+
+	get r() {
+		return this.entity.getOrInit(c.VoxelComponent, (entity) => entity.get('r'));
+	}
+	set r(value: number) {
+		this.entity.getOrInit(c.VoxelComponent, (entity) => entity.set('r', value));
+	}
+
+	get g() {
+		return this.entity.getOrInit(c.VoxelComponent, (entity) => entity.get('g'));
+	}
+	set g(value: number) {
+		this.entity.getOrInit(c.VoxelComponent, (entity) => entity.set('g', value));
+	}
+
+	get b() {
+		return this.entity.getOrInit(c.VoxelComponent, (entity) => entity.get('b'));
+	}
+	set b(value: number) {
+		this.entity.getOrInit(c.VoxelComponent, (entity) => entity.set('b', value));
+	}
+
+	get visible() {
+		return this.entity.getOrInit(c.VoxelComponent, (entity) => entity.get('visible'));
+	}
+
+	set visible(value: boolean) {
+		this.entity.getOrInit(c.VoxelComponent, (entity) => entity.set('visible', value));
+	}
+
+	get collider() {
+		return this.entity.getOrInit(c.VoxelComponent, (entity) => entity.get('collider'));
+	}
+
+	set collider(value: boolean) {
+		this.entity.getOrInit(c.VoxelComponent, (entity) => entity.set('collider', value));
+	}
+}
+
+export class VoxelGroup extends NamedEntity {
+	get voxels(): EntityList<Voxel> {
+		return new EntityList(this.peer, this.entity, c.VoxelGroupComponent, Voxel);
+	}
+}
+
+export class TransformedGroup extends Transform {
+	get group() {
+		return this.entity.getOrInit(c.TransformedGroupComponent, (entity) => entity.get('group'));
+	}
+
+	async loadGroup() {
+		if (!g.roomy) await initRoomy();
+
+		return await g.roomy!.open(VoxelGroup, this.group);
+	}
+
+	set group(value: EntityIdStr) {
+		this.entity.getOrInit(c.TransformedGroupComponent, (entity) => entity.set('group', value));
+	}
+}
+
+export class Models extends NamedEntity {
+	get models(): EntityList<VoxelGroup> {
+		return new EntityList(this.peer, this.entity, c.ModelsComponent, VoxelGroup);
+	}
+}
+
+export class PlayerLocation extends EntityWrapper {
+	get time() {
+		return this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.get('time'));
+	}
+
+	set time(value: number) {
+		this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.set('time', value));
+	}
+
+	get x() {
+		return this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.get('x'));
+	}
+
+	set x(value: number) {
+		this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.set('x', value));
+	}
+
+	get y() {
+		return this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.get('y'));
+	}
+
+	set y(value: number) {
+		this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.set('y', value));
+	}
+
+	get z() {
+		return this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.get('z'));
+	}
+
+	set z(value: number) {
+		this.entity.getOrInit(c.PlayerLocationComponent, (entity) => entity.set('z', value));
+	}
+}
+
+export class World extends NamedEntity {
+	get instances(): EntityList<TransformedGroup> {
+		return new EntityList(this.peer, this.entity, c.WorldComponent, TransformedGroup);
+	}
+
+	get locations(): EntityList<PlayerLocation> {
+		return new EntityList(this.peer, this.entity, c.PlayerLocationsComponent, PlayerLocation);
+	}
+}
diff --git a/src/lib/utils.svelte.ts b/src/lib/utils.svelte.ts
index 246b058..6874c92 100644
--- a/src/lib/utils.svelte.ts
+++ b/src/lib/utils.svelte.ts
@@ -26,6 +26,7 @@ export function derivePromise<T>(
 import { g, initRoomy } from './roomy.svelte';
 import { goto } from '$app/navigation';
 import { World } from './roomy';
+import { editingState } from './world-editor/state.svelte';
 
 export async function createWorld(base: string) {
 	if (!g.roomy) {
@@ -34,8 +35,26 @@ export async function createWorld(base: string) {
 		if (!g.roomy) return;
 	}
 	const world = await g.roomy.create(World);
+
+	world.settings = {
+		seed: Math.random().toString(),
+		size: 100,
+		terrainGradient: [
+			{ rgb: { r: 0, g: 0.05, b: 0 }, position: 0 },
+			{ rgb: { r: 0, g: 0.35, b: 0 }, position: 1 }
+		],
+		waterGradient: [
+			{ rgb: { r: 0.0, g: 0.0, b: 0.05 }, position: 0 },
+			{ rgb: { r: 0.1, g: 0.1, b: 0.55 }, position: 1 }
+		],
+		waterPercentage: 35,
+		version: 1
+	};
+
 	world.commit();
 
+	editingState.showWorldSettings = true;
+
 	goto(base + `/world?id=${world.id}`);
 }
 
diff --git a/src/lib/viewer/WorldViewerScene.svelte b/src/lib/viewer/WorldViewerScene.svelte
index 301011e..8f37c1e 100644
--- a/src/lib/viewer/WorldViewerScene.svelte
+++ b/src/lib/viewer/WorldViewerScene.svelte
@@ -4,6 +4,7 @@
 	import type { WorldData } from './types';
 	import WorldItemsViewer from './WorldItemsViewer.svelte';
 	import { T } from '@threlte/core';
+	import Water from '$lib/world/Water.svelte';
 
 	const { world }: { world: WorldData } = $props();
 </script>
@@ -19,7 +20,31 @@
 </T.PerspectiveCamera>
 
 <Float floatingRange={[-10, -5]} floatIntensity={5}>
-	<Terrain collider={false} animate />
+	<Terrain collider={false} animate settings={{
+		seed: 1,
+		size: 100,
+		terrainGradient: [
+			{ rgb: { r: 0.0, g: 0.05, b: 0.0 }, position: 0 },
+			{ rgb: { r: 0.0, g: 0.35, b: 0.0 }, position: 1 }
+		],
+		waterGradient: [
+			{ rgb: { r: 0.0, g: 0.05, b: 0.0 }, position: 0 },
+			{ rgb: { r: 0.0, g: 0.35, b: 0.0 }, position: 1 }
+		],
+	}} />
+
+	<Water animateIn animate settings={{
+		seed: 1,
+		size: 100,
+		terrainGradient: [
+			{ rgb: { r: 0.0, g: 0.05, b: 0.0 }, position: 0 },
+			{ rgb: { r: 0.0, g: 0.35, b: 0.0 }, position: 1 }
+		],
+		waterGradient: [
+			{ rgb: { r: 0.0, g: 0.00, b: 0.05 }, position: 0 },
+			{ rgb: { r: 0.1, g: 0.1, b: 0.55 }, position: 1 }
+		]
+	}} />
 
 	<WorldItemsViewer {world} />
 </Float>
diff --git a/src/lib/world-editor/HudScene.svelte b/src/lib/world-editor/HudScene.svelte
index 42889cd..85ebefe 100644
--- a/src/lib/world-editor/HudScene.svelte
+++ b/src/lib/world-editor/HudScene.svelte
@@ -25,7 +25,7 @@
 	{#key editingState.selectedInstance?.group ?? editingState.selectedModelId ?? ''}
 		{#await models.getModel(editingState.selectedInstance?.group ?? editingState.selectedModelId ?? '') then voxels}
 			<T.Group
-				position={[-$viewport.width / 2 + 0.8, -$viewport.height / 2 + 1, 0]}
+				position={[$viewport.width / 2 - 0.8, -$viewport.height / 2 + 1, 0]}
 				oncreate={() => {
 					console.log('oncreate');
 				}}
diff --git a/src/lib/world-editor/HudUI.svelte b/src/lib/world-editor/HudUI.svelte
index ee29838..8ebe6b9 100644
--- a/src/lib/world-editor/HudUI.svelte
+++ b/src/lib/world-editor/HudUI.svelte
@@ -3,7 +3,7 @@
 </script>
 
 {#if editingState.selectedInstance || editingState.selectedModelId}
-	<div class="absolute bottom-2 left-4 z-10 flex flex-col gap-2">
+	<div class="absolute bottom-2 right-4 z-10 flex flex-col gap-2">
 		{#if editingState.selectedInstance}
 			<div class="flex items-center gap-2">
 				<span class="text-base-800 text-sm"> moving </span>
diff --git a/src/lib/world-editor/Instance.svelte b/src/lib/world-editor/Instance.svelte
index 3701811..beb41a1 100644
--- a/src/lib/world-editor/Instance.svelte
+++ b/src/lib/world-editor/Instance.svelte
@@ -8,8 +8,8 @@
 <script lang="ts">
 	import { T } from '@threlte/core';
 	import { derivePromise } from '$lib/utils.svelte';
-	import { Instance, InstancedMesh, TransformControls } from '@threlte/extras';
-	import { applyTransform, editingState } from './state.svelte';
+	import { TransformControls } from '@threlte/extras';
+	import { addInstance, applyTransform, editingState } from './state.svelte';
 	import { Collider } from '@threlte/rapier';
 	import { models } from './models.svelte';
 	import { onMount } from 'svelte';
@@ -34,6 +34,7 @@
 		quaternion={instance.quaternion.toArray()}
 		scale={instance.scale.toArray()}
 		bind:controls={editingState.transformControls}
+		mode={editingState.tool === 'move' ? 'translate' : editingState.tool}
 	>
 		{#each voxels.value as voxel}
 			<T.Mesh
@@ -54,10 +55,17 @@
 		onclick={async (e) => {
 			e.stopPropagation();
 
-			await applyTransform();
+			if(editingState.selectedModelId) {
+				// place on top of instance
+				addInstance(editingState.selectedModelId, e.point);
+				return;
+			}
+				await applyTransform();
+				editingState.selectedModelId = null;
+				editingState.selectedInstance = instance;
+				
+				return;
 
-			editingState.selectedModelId = null;
-			editingState.selectedInstance = instance;
 		}}
 	>
 		<!-- <InstancedMesh>
diff --git a/src/lib/world-editor/InstanceEditorUI.svelte b/src/lib/world-editor/InstanceEditorUI.svelte
new file mode 100644
index 0000000..f1004ec
--- /dev/null
+++ b/src/lib/world-editor/InstanceEditorUI.svelte
@@ -0,0 +1,167 @@
+<script lang="ts">
+	import { Button, PopoverColorPicker, Toggle, ToggleGroup, ToggleGroupItem } from 'fuchs';
+	import { applyTransform, deleteInstance, editingState } from '$lib/world-editor/state.svelte';
+	import { g } from '$lib/roomy.svelte';
+	import { onMount } from 'svelte';
+	import { Models } from '$lib/roomy';
+
+	$effect(() => {
+		applyTransform();
+
+		editingState.tool = selectedTool;
+	});
+
+	onMount(() => {
+		window.addEventListener('keydown', async (e) => {
+			// if target is input, don't handle
+			if (e.target instanceof HTMLInputElement) return;
+
+			console.log(e.key);
+
+			if (e.key === 'r') {
+				selectedTool = 'rotate';
+			} else if (e.key === 's') {
+				selectedTool = 'scale';
+			} else if (e.key === 'g') {
+				selectedTool = 'move';
+			} else if (e.key === 'd') {
+				if (!editingState.selectedInstance) return;
+				editingState.selectedModelId = editingState.selectedInstance.group;
+				editingState.selectedInstance = null;
+			} else if (e.key === 'p') {
+				if (!editingState.selectedInstance) return;
+
+				applyTransform();
+				editingState.selectedModelId = editingState.selectedInstance.group;
+				editingState.selectedInstance = null;
+			} else if (e.key === 'x') {
+				// delete
+				if (!editingState.selectedInstance) return;
+				deleteInstance(editingState.selectedInstance.id);
+				editingState.selectedInstance = null;
+			} else if (e.key === 'Escape') {
+				applyTransform();
+
+				editingState.selectedInstance = null;
+				editingState.selectedModelId = null;
+			}
+		});
+	});
+
+	let selectedTool = $state(editingState.tool);
+</script>
+
+{#if editingState.selectedInstance}
+<div class="absolute top-2 right-2">
+	<div class="bg-base-100 flex gap-4 rounded-2xl p-2">
+		<ToggleGroup
+			type="single"
+			bind:value={
+				() => {
+					return selectedTool;
+				},
+				(value) => {
+					selectedTool = value;
+				}
+			}
+		>
+			<!-- move -->
+			<ToggleGroupItem value="move">
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					class="size-6"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="M7.5 21 3 16.5m0 0L7.5 12M3 16.5h13.5m0-13.5L21 7.5m0 0L16.5 12M21 7.5H7.5"
+					/>
+				</svg>
+			</ToggleGroupItem>
+
+			<!-- rotate -->
+			<ToggleGroupItem value="rotate">
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					class="size-6"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
+					/>
+				</svg>
+			</ToggleGroupItem>
+			<!-- scale -->
+			<ToggleGroupItem value="scale">
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					class="size-6"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="M3.75 3.75v4.5m0-4.5h4.5m-4.5 0L9 9M3.75 20.25v-4.5m0 4.5h4.5m-4.5 0L9 15M20.25 3.75h-4.5m4.5 0v4.5m0-4.5L15 9m5.25 11.25h-4.5m4.5 0v-4.5m0 4.5L15 15"
+					/>
+				</svg>
+			</ToggleGroupItem>
+		</ToggleGroup>
+		<Button
+			size="iconLg"
+			variant="ghost"
+			onclick={() => {
+				if (!editingState.selectedInstance) return;
+				deleteInstance(editingState.selectedInstance.id);
+				editingState.selectedInstance = null;
+			}}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				fill="none"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				class="size-6"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0"
+				/>
+			</svg>
+
+			<span class="sr-only">Delete instance</span>
+		</Button>
+		<Button
+			size="iconLg"
+			variant="ghost"
+			onclick={() => {
+				if (!editingState.selectedInstance) return;
+				console.log(editingState.selectedInstance);
+				editingState.selectedModelId = editingState.selectedInstance.group;
+				console.log(editingState.selectedModelId);
+				editingState.selectedInstance = null;
+			}}
+		>
+		
+		<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+			<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 0 1-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 0 1 1.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 0 0-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 0 1-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H9.75" />
+		  </svg>
+
+			<span class="sr-only">Clone instance</span>
+		</Button>  
+	</div>
+</div>
+{/if}
diff --git a/src/lib/world-editor/ModelSelection.svelte b/src/lib/world-editor/ModelSelection.svelte
index 0bc8ffa..41833cc 100644
--- a/src/lib/world-editor/ModelSelection.svelte
+++ b/src/lib/world-editor/ModelSelection.svelte
@@ -2,7 +2,6 @@
 	import ModalModelPicker from '$lib/model-picker/modal/ModalModelPicker.svelte';
 	import { derivePromise } from '$lib/utils.svelte';
 	import type { EntityIdStr } from '@muni-town/leaf';
-	import { Button } from 'fuchs';
 	import { onMount } from 'svelte';
 	import { applyTransform, editingState } from './state.svelte';
 	import { g, initRoomy } from '$lib/roomy.svelte';
@@ -16,14 +15,19 @@
 	);
 
 	let worldModelList = derivePromise([], async () => {
-		if (!g.roomy) return [];
-		const models = await g.world?.instances.items();
+		if (!g.world || !g.roomy) {
+			return [];
+		}
+
+		const models = await g.world.instances.items();
 		const groups = new Set<EntityIdStr>();
 		for (const model of models ?? []) {
 			groups.add(model.group);
 		}
 		return Promise.all(
-			Array.from(groups).map(async (group) => await g.roomy?.open(VoxelGroup, group))
+			Array.from(groups)
+				.filter((group) => group)
+				.map(async (group) => await g.roomy?.open(VoxelGroup, group))
 		);
 	});
 
@@ -47,7 +51,7 @@
 	function getItems() {
 		let items: { voxels: VoxelGroup; label: string }[] = [];
 		if (editingState.modelPickerType === 'public') {
-			items=  globalModelList.value.map((model) => ({ voxels: model, label: model.name }));
+			items = globalModelList.value.map((model) => ({ voxels: model, label: model.name }));
 		}
 
 		if (editingState.modelPickerType === 'private') {
@@ -55,7 +59,10 @@
 		}
 
 		if (editingState.modelPickerType === 'world') {
-			items = worldModelList.value.map((model) => ({ voxels: model, label: model?.name })) as { voxels: VoxelGroup; label: string }[];
+			items = worldModelList.value.map((model) => ({ voxels: model, label: model?.name })) as {
+				voxels: VoxelGroup;
+				label: string;
+			}[];
 		}
 
 		// filter all items that have no voxels
diff --git a/src/lib/world-editor/WorldEditorScene.svelte b/src/lib/world-editor/WorldEditorScene.svelte
index 28fdddd..79523ab 100644
--- a/src/lib/world-editor/WorldEditorScene.svelte
+++ b/src/lib/world-editor/WorldEditorScene.svelte
@@ -21,7 +21,11 @@
 
 	let instances = derivePromise([], async () => (g.world ? await g.world.instances.items() : []));
 
-	let camera = $state('first');
+	let terrainGradient = derivePromise([], async () =>
+		g.world ? (await g.world.loadTerrainGradient()).stops.items() : []
+	);
+
+	$inspect(terrainGradient.value);
 
 	const { renderer } = useThrelte();
 
@@ -29,18 +33,25 @@
 		window.addEventListener('keydown', (e) => {
 			// on c switch camera
 			if (e.key === 'c') {
-				camera = camera === 'first' ? 'third' : 'first';
+				editingState.camera = editingState.camera === 'first' ? 'third' : 'first';
 			}
 		});
 
 		renderer.toneMapping = ACESFilmicToneMapping;
 	});
+
+	$effect(() => {
+		if (g.world && g.world.settings.version > editingState.worldSettings.version) {
+			editingState.worldSettings = g.world.settings;
+			console.log('settings', editingState.worldSettings);
+		}
+	});
 </script>
 
-{#if camera === 'first'}
+{#if editingState.camera === 'third'}
 	<T.PerspectiveCamera
 		makeDefault
-		position={[100, 10, 100]}
+		position={[100, 50, 100]}
 		oncreate={(ref) => {
 			ref.lookAt(0, 1, 0);
 		}}
@@ -53,19 +64,22 @@
 
 <T.DirectionalLight position={[0, 10, -10]} />
 
-{#key editingState.worldSettings.version}
+{#key editingState.worldSettings.version + editingState.worldSettings.waterPercentage + editingState.worldSettings.size}
 	<Terrain
 		clickedTerrain={(e) => {
 			if (editingState.selectedModelId) {
 				addInstance(editingState.selectedModelId, e.point);
 			}
 		}}
+		settings={editingState.worldSettings}
 	/>
 
-	<Water />
+	{#if editingState.worldSettings.waterPercentage > 0}
+		<Water settings={editingState.worldSettings} />
+	{/if}
 {/key}
 
-<Debug />
+<!-- <Debug /> -->
 
 <Sky />
 
diff --git a/src/lib/world-editor/WorldEditorUI.svelte b/src/lib/world-editor/WorldEditorUI.svelte
index 5d0819c..e060b70 100644
--- a/src/lib/world-editor/WorldEditorUI.svelte
+++ b/src/lib/world-editor/WorldEditorUI.svelte
@@ -1,12 +1,19 @@
 <script>
-	import { Button } from 'fuchs';
+	import { Button, cn } from 'fuchs';
 	import { editingState } from './state.svelte';
+	import InstanceEditorUi from './InstanceEditorUI.svelte';
 </script>
 
 <Button
 	size="iconLg"
-	class="bg-accent-100 hover:bg-accent-200 absolute top-4 left-4"
-	onclick={() => (editingState.showModelPicker = true)}
+	class={cn(
+		'bg-accent-100 hover:bg-accent-200 absolute top-4',
+		editingState.showWorldSettings ? 'left-84' : 'left-4'
+	)}
+	onclick={() => {
+		editingState.showWorldSettings = false;
+		editingState.showModelPicker = true;
+	}}
 >
 	<svg
 		xmlns="http://www.w3.org/2000/svg"
@@ -20,3 +27,39 @@
 
 	<span class="sr-only">Add Model</span>
 </Button>
+
+<Button
+	class={cn(
+		'bg-accent-100 hover:bg-accent-200 absolute bottom-4',
+		editingState.showWorldSettings ? 'left-84' : 'left-4'
+	)}
+	size="iconLg"
+	onclick={() => {
+		editingState.showWorldSettings = !editingState.showWorldSettings;
+	}}
+>
+	<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+		<path
+			fill-rule="evenodd"
+			d="M11.828 2.25c-.916 0-1.699.663-1.85 1.567l-.091.549a.798.798 0 0 1-.517.608 7.45 7.45 0 0 0-.478.198.798.798 0 0 1-.796-.064l-.453-.324a1.875 1.875 0 0 0-2.416.2l-.243.243a1.875 1.875 0 0 0-.2 2.416l.324.453a.798.798 0 0 1 .064.796 7.448 7.448 0 0 0-.198.478.798.798 0 0 1-.608.517l-.55.092a1.875 1.875 0 0 0-1.566 1.849v.344c0 .916.663 1.699 1.567 1.85l.549.091c.281.047.508.25.608.517.06.162.127.321.198.478a.798.798 0 0 1-.064.796l-.324.453a1.875 1.875 0 0 0 .2 2.416l.243.243c.648.648 1.67.733 2.416.2l.453-.324a.798.798 0 0 1 .796-.064c.157.071.316.137.478.198.267.1.47.327.517.608l.092.55c.15.903.932 1.566 1.849 1.566h.344c.916 0 1.699-.663 1.85-1.567l.091-.549a.798.798 0 0 1 .517-.608 7.52 7.52 0 0 0 .478-.198.798.798 0 0 1 .796.064l.453.324a1.875 1.875 0 0 0 2.416-.2l.243-.243c.648-.648.733-1.67.2-2.416l-.324-.453a.798.798 0 0 1-.064-.796c.071-.157.137-.316.198-.478.1-.267.327-.47.608-.517l.55-.091a1.875 1.875 0 0 0 1.566-1.85v-.344c0-.916-.663-1.699-1.567-1.85l-.549-.091a.798.798 0 0 1-.608-.517 7.507 7.507 0 0 0-.198-.478.798.798 0 0 1 .064-.796l.324-.453a1.875 1.875 0 0 0-.2-2.416l-.243-.243a1.875 1.875 0 0 0-2.416-.2l-.453.324a.798.798 0 0 1-.796.064 7.462 7.462 0 0 0-.478-.198.798.798 0 0 1-.517-.608l-.091-.55a1.875 1.875 0 0 0-1.85-1.566h-.344ZM12 15.75a3.75 3.75 0 1 0 0-7.5 3.75 3.75 0 0 0 0 7.5Z"
+			clip-rule="evenodd"
+		/>
+	</svg>
+
+	<span class="sr-only">World Settings</span>
+</Button>
+
+<InstanceEditorUi />
+
+<Button
+	size="lg"
+	class={cn(
+		'bg-accent-100 hover:bg-accent-200 absolute bottom-4',
+		editingState.showWorldSettings ? 'left-98' : 'left-18'
+	)}
+	onclick={() => {
+		editingState.camera = editingState.camera === 'first' ? 'third' : 'first';
+	}}
+>
+	{editingState.camera === 'first' ? 'Back to World View' : 'Walk around'}
+</Button>
diff --git a/src/lib/world-editor/WorldSettingsUI.svelte b/src/lib/world-editor/WorldSettingsUI.svelte
index 1322646..2ae12cc 100644
--- a/src/lib/world-editor/WorldSettingsUI.svelte
+++ b/src/lib/world-editor/WorldSettingsUI.svelte
@@ -1,50 +1,89 @@
-<script>
-	import { Label, SliderNumber, ColorGradientPicker, Button } from "fuchs";
-	import { editingState } from "./state.svelte";
+<script lang="ts">
+	import { Label, SliderNumber, ColorGradientPicker, Button, Textarea, Subheading } from 'fuchs';
+	import { editingState } from './state.svelte';
+	import { g } from '$lib/roomy.svelte';
+	import { untrack } from 'svelte';
 
+	// let { settings }: { settings: WorldSettings } = $props();
+
+	// // let mySettings = $state(settings);
+
+	// worldSettings.seed = settings.seed;
+	// worldSettings.size = settings.size;
+	// worldSettings.terrainGradient = settings.terrainGradient;
+	// worldSettings.waterGradient = settings.waterGradient;
+	// worldSettings.version = settings.version;
+	// worldSettings.waterPercentage = settings.waterPercentage;
+
+	$effect(() => {
+		if (
+			g.world &&
+			g.world.settings &&
+			g.world.settings.version < editingState.worldSettings.version
+		) {
+			g.world.settings = JSON.parse(JSON.stringify(editingState.worldSettings));
+			g.world.commit();
+			console.log('committed');
+		}
+	});
+
+	let terrainNoise = $derived(JSON.stringify(editingState.worldSettings.terrainNoise, null, 2));
+	let waterNoise = $derived(JSON.stringify(editingState.worldSettings.waterNoise, null, 2));
 </script>
-<div class="absolute top-0 bottom-0 left-0 w-80 px-8 py-16">
-	<Label>Size</Label>
-	<SliderNumber
-		class="mt-2"
-		min={20}
-		max={100}
-		type="single"
-		bind:value={editingState.worldSettings.size}
-	/>
-
-	<Label>Terrain</Label>
-	<ColorGradientPicker
-		class="mt-6 mb-8"
-		bind:colors={editingState.worldSettings.terrainGradient}
-		onchange={() => {
-			editingState.worldSettings.version += 1;
-		}}
-	/>
 
-	<Label>Water</Label>
+{#if g.world}
+	<div class="absolute top-0 bottom-0 left-0 w-80 px-8 py-16 -z-10">
+		<Subheading>Size</Subheading>
+		<SliderNumber
+			class="mt-2"
+			min={20}
+			max={100}
+			type="single"
+			bind:value={editingState.worldSettings.size}
+		/>
 
-	<ColorGradientPicker
-		class="mt-6 mb-4"
-		bind:colors={editingState.worldSettings.waterGradient}
-		onchange={() => {
-			editingState.worldSettings.version += 1;
-		}}
-	/>
-
-	<Label>Percentage</Label>
-	<SliderNumber
-		class="mt-2"
-		type="single"
-		bind:value={editingState.worldSettings.waterPercentage}
-	/>
-
-	<Button
-		class="mt-6"
-		onclick={() => {
+		<Subheading class="mt-8">Terrain</Subheading>
+		<ColorGradientPicker
+			size="sm"
+			class="mt-2 mb-8"
+			bind:colors={editingState.worldSettings.terrainGradient}
+			onchange={() => {
+				editingState.worldSettings.version += 1;
+			}}
+		/>
+
+		<Subheading class="mt-8">Water</Subheading>
+
+		<ColorGradientPicker
+			size="sm"
+			class="mt-2 mb-4"
+			bind:colors={editingState.worldSettings.waterGradient}
+			onchange={() => {
+				editingState.worldSettings.version += 1;
+			}}
+		/>
+
+		<Label>Water Level</Label>
+		<SliderNumber
+			class="mt-2"
+			type="single"
+			bind:value={editingState.worldSettings.waterPercentage}
+		/>
+
+		<Button class="mt-8" onclick={() => {
 			editingState.worldSettings.version += 1;
-		}}
-	>
-		Update
-	</Button>
-</div>
\ No newline at end of file
+		}}>
+			Update
+		</Button>
+
+		<Textarea
+			bind:value={terrainNoise}
+			class="mt-8 hidden w-full"
+			oninput={() => {
+				console.log('changed');
+				editingState.worldSettings.terrainNoise = JSON.parse(terrainNoise);
+				editingState.worldSettings.version += 1;
+			}}
+		/>
+	</div>
+{/if}
diff --git a/src/lib/world-editor/state.svelte.ts b/src/lib/world-editor/state.svelte.ts
index fce36a0..8746ac6 100644
--- a/src/lib/world-editor/state.svelte.ts
+++ b/src/lib/world-editor/state.svelte.ts
@@ -1,4 +1,4 @@
-import { TransformedGroup } from '$lib/roomy';
+import { TransformedGroup, type WorldSettings } from '$lib/roomy';
 import { g, initRoomy } from '$lib/roomy.svelte';
 import type { EntityIdStr } from '@muni-town/leaf';
 import { Quaternion, Vector3 } from 'three';
@@ -11,13 +11,17 @@ export const editingState = $state({
 	showModelEditor: false,
 	showWorldSettings: false,
 	showModelPicker: false,
+	camera: 'third' as 'first' | 'third',
 	modelPickerType: 'public' as 'private' | 'world' | 'public',
+
+	tool: 'move' as 'move' | 'rotate' | 'scale',
+
 	worldSettings: {
-		seed: Math.floor(Math.random() * 1000000),
-		size: 100,
+		seed: Math.floor(Math.random() * 1000000).toString(),
+		size: 0,
 		terrainGradient: [
-			{ rgb: { r: 0, g: 0.05, b: 0 }, position: 0 },
-			{ rgb: { r: 0, g: 0.35, b: 0 }, position: 1 }
+			{ rgb: { r: 0, g: 0, b: 0 }, position: 0 },
+			{ rgb: { r: 0, g: 0, b: 0 }, position: 1 }
 		] as {
 			rgb: {
 				r: number;
@@ -28,7 +32,7 @@ export const editingState = $state({
 		}[],
 		waterGradient: [
 			{ rgb: { r: 0, g: 0, b: 0 }, position: 0 },
-			{ rgb: { r: 0, g: 0, b: 1 }, position: 1 }
+			{ rgb: { r: 0, g: 0, b: 0 }, position: 1 }
 		] as {
 			rgb: {
 				r: number;
@@ -38,8 +42,8 @@ export const editingState = $state({
 			position: number;
 		}[],
 		waterPercentage: 35,
-		version: 0
-	}
+		version: -1
+	} as WorldSettings
 });
 
 export type AddInstanceFunction = (id: EntityIdStr, position: Vector3) => void;
@@ -87,3 +91,14 @@ export async function addInstance(id: EntityIdStr, position: Vector3) {
 	g.world?.instances.push(instance);
 	g.world?.commit();
 }
+
+export async function deleteInstance(id: string) {
+	const instances = await g.world?.instances.items();
+	// find voxel by id
+	const instance = instances?.findIndex((v) => v.id === id);
+	console.log(instance);
+	if (instance === undefined || instance < 0) return;
+
+	g.world?.instances.remove(instance);
+	g.world?.commit();
+}
diff --git a/src/lib/world/Terrain.svelte b/src/lib/world/Terrain.svelte
index b6c26d5..eedb074 100644
--- a/src/lib/world/Terrain.svelte
+++ b/src/lib/world/Terrain.svelte
@@ -7,9 +7,24 @@
 	import type { IntersectionEvent } from '@threlte/extras';
 	import { shuffle } from '$lib/utils.svelte';
 	import { ColorGradient } from './colorgradient';
-	import { editingState } from '$lib/world-editor/state.svelte';
+	import type { WorldSettings } from '$lib/roomy';
+	import { applyTransform, editingState } from '$lib/world-editor/state.svelte';
 
-	const size = editingState.worldSettings.size;
+	let {
+		clickedTerrain,
+		collider = true,
+		animate = false,
+		animationTime = 3,
+		settings
+	}: {
+		clickedTerrain?: (e: IntersectionEvent<MouseEvent>) => void;
+		collider?: boolean;
+		animate?: boolean;
+		animationTime?: number;
+		settings: WorldSettings;
+	} = $props();
+
+	const size = settings.size;
 
 	const voxelSize = 1;
 
@@ -28,18 +43,22 @@
 	const dummy = new THREE.Object3D();
 	const color = new THREE.Color(0x00ff00);
 
+	console.log('seed', settings.seed);
 	const heightfield: number[] = [];
 
-	const upperNoise = new UberNoise({
-		seed: editingState.worldSettings.seed,
+	const options = settings.terrainNoise ?? {
 		octaves: 6,
 		scale: 0.03,
 		min: 0,
 		max: 3,
 		warp: 1
-	});
+	};
+
+	options.seed = settings.seed;
+
+	const upperNoise = new UberNoise(options);
 	const lowerNoise = new UberNoise({
-		seed: editingState.worldSettings.seed + 10,
+		seed: settings.seed + 10,
 		octaves: 6,
 		scale: 0.05,
 		min: 0,
@@ -51,7 +70,7 @@
 
 
 	const gradient = new ColorGradient({
-		stops: editingState.worldSettings.terrainGradient.map(({ rgb, position }) => ({
+		stops: settings.terrainGradient.map(({ rgb, position }) => ({
 			position: (position - 0.5) * 2,
 			value: new THREE.Color(rgb.r, rgb.g, rgb.b)
 		}))
@@ -69,7 +88,7 @@
 				continue;
 			}
 
-			const height = noiseHeight + Math.pow(distance / (size / 2), 2) * -5;
+			const height = noiseHeight// + Math.pow(distance / (size / 2), 2) * -5;
 			const noise = upperNoise.normalized(x, z);
 			dummy.position.set(x, height, z);
 			dummy.scale.set(1, 3, 1);
@@ -110,17 +129,6 @@
 
 	let heightfieldData = new Float32Array(heightfield);
 
-	let {
-		clickedTerrain,
-		collider = true,
-		animate = false,
-		animationTime = 3
-	}: {
-		clickedTerrain?: (e: IntersectionEvent<MouseEvent>) => void;
-		collider?: boolean;
-		animate?: boolean;
-		animationTime?: number;
-	} = $props();
 
 	let i = 0;
 	const addPerSecond = totalVoxels / animationTime;
@@ -148,6 +156,11 @@
 				clickedTerrain(e);
 			}
 		: undefined}
+
+	ondblclick={() => {
+		applyTransform();
+		editingState.selectedInstance = null;
+	}}
 />
 
 {#if collider}
diff --git a/src/lib/world/Water.svelte b/src/lib/world/Water.svelte
index 153a173..83f6659 100644
--- a/src/lib/world/Water.svelte
+++ b/src/lib/world/Water.svelte
@@ -5,8 +5,21 @@
 	import { shuffle } from '$lib/utils.svelte';
 	import { ColorGradient } from './colorgradient';
 	import { editingState } from '$lib/world-editor/state.svelte';
+	import type { WorldSettings } from '$lib/roomy';
 
-	const size = editingState.worldSettings.size;
+	let {
+		animate = true,
+		animateIn = false,
+		animationTime = 3,
+		settings
+	}: {
+		animate?: boolean;
+		animateIn?: boolean;
+		animationTime?: number;
+		settings: WorldSettings;
+	} = $props();
+
+	const size = settings.size;
 
 	const voxelSize = 1;
 
@@ -25,7 +38,7 @@
 	const dummy = new THREE.Object3D();
 
 	const waterNoise = new UberNoise({
-		seed: editingState.worldSettings.seed + 10,
+		seed: settings.seed + 10,
 		octaves: 3,
 		scale: 0.01,
 		min: 0,
@@ -34,17 +47,20 @@
 	});
 
 
-	const terrainNoise = new UberNoise({
-		seed: editingState.worldSettings.seed,
+	const options = settings.terrainNoise ?? {
 		octaves: 6,
 		scale: 0.03,
 		min: 0,
 		max: 3,
 		warp: 1
-	});
+	};
+
+	options.seed = settings.seed;
+
+	const terrainNoise = new UberNoise(options);
 
 	const waterGradient = new ColorGradient({
-		stops: editingState.worldSettings.waterGradient.map(({ rgb, position }) => ({
+		stops: settings.waterGradient.map(({ rgb, position }) => ({
 			position: (position - 1),
 			value: new THREE.Color(rgb.r, rgb.g, rgb.b)
 		}))
@@ -76,8 +92,7 @@
 
 			const isEdge = surrounding.some(s => s > size / 2);
 
-
-			const height = noiseHeight + Math.pow(distance / (size / 2), 2) * -5;
+			const height = noiseHeight// + Math.pow(distance / (size / 2), 2) * -5;
 
 			if(water > (editingState.worldSettings.waterPercentage / 100 * 2 - 1)) continue;
 
@@ -103,17 +118,6 @@
 		instancedMesh.instanceColor.needsUpdate = true;
 	}
 
-
-	let {
-		animate = true,
-		animateIn = false,
-		animationTime = 3
-	}: {
-		animate?: boolean;
-		animateIn?: boolean;
-		animationTime?: number;
-	} = $props();
-
 	let totalTime = 0;
 	const addPerSecond = totalVoxels / animationTime;
 
diff --git a/src/routes/world/+layout.svelte b/src/routes/world/+layout.svelte
index 61621ed..00110fa 100644
--- a/src/routes/world/+layout.svelte
+++ b/src/routes/world/+layout.svelte
@@ -12,9 +12,6 @@
 	let showWorld = $state(false);
 
 	$effect(() => {
-		console.log('hello');
-		//const worldId = page.params.id;
-		// TODO: we should use search params here
 		const worldId = page.url.searchParams.get('id');
 		if (!worldId) return;
 
@@ -28,7 +25,6 @@
 				return;
 			}
 		}
-		console.log('loading', worldId);
 
 		g.roomy
 			.open(World, worldId as EntityIdStr)
diff --git a/src/routes/world/+page.svelte b/src/routes/world/+page.svelte
index c09f0f2..58d5943 100644
--- a/src/routes/world/+page.svelte
+++ b/src/routes/world/+page.svelte
@@ -12,13 +12,14 @@
 	import WorldSettingsUi from '$lib/world-editor/WorldSettingsUI.svelte';
 	import HudUi from '$lib/world-editor/HudUI.svelte';
 	import WorldEditorUi from '$lib/world-editor/WorldEditorUI.svelte';
+	import { g } from '$lib/roomy.svelte';
 
 	let showPerfMonitor = $state(false);
 </script>
 
 <div
 	class={cn(
-		'absolute h-[100dvh]',
+		'absolute h-[100dvh] transition-all duration-200',
 		!editingState.showModelEditor && editingState.showWorldSettings
 			? 'left-80 w-[calc(100vw-320px)]'
 			: 'left-0 w-screen'
@@ -42,12 +43,14 @@
 
 {#if !editingState.showModelEditor}
 	{#if editingState.showWorldSettings}
-		<WorldSettingsUi />
-	{:else}
-	<WorldEditorUi />
+		{#if g.world?.settings}
+			<WorldSettingsUi />
+		{/if}
+		
 	{/if}
+	<WorldEditorUi />
+
+	<HudUi />
 {:else}
 	<ModelEditorUi />
 {/if}
-
-<HudUi />
\ No newline at end of file