diff --git a/README.md b/README.md
index adc3d119a..6f38bd63f 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
 [![Jest Coverage](https://github.com/BarthPaleologue/CosmosJourneyer/actions/workflows/tests.yml/badge.svg)](https://github.com/BarthPaleologue/CosmosJourneyer/actions/workflows/tests.yml)
 [![License](https://img.shields.io/github/license/BarthPaleologue/planetEngine)](./LICENSE.md)
 
+[![Teaser Video](./coverImages/video.png)](https://youtu.be/5pXZqHRShTE)
+
 Cosmos Journeyer is the procedural universe running inside a web page that makes space exploration accessible for everyone.
 
 The main website of the project is online at https://cosmosjourneyer.com/
@@ -52,7 +54,7 @@ First, clone the repository and install the dependencies with `pnpm install`.
 
 ### Web
 
-To build the web version of Cosmos Journeyer, run `pnpm build`. Everything will be built in the `dist` folder.
+To build the web version of Cosmos Journeyer, run `pnpm run build`. Everything will be built in the `dist` folder.
 
 ### Tauri
 
diff --git a/coverImages/video.png b/coverImages/video.png
new file mode 100644
index 000000000..5f4f8fb77
Binary files /dev/null and b/coverImages/video.png differ
diff --git a/package.json b/package.json
index 31bd7706a..d19a9f36a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
     "eslint-plugin-import": "^2.29.1",
     "extended-random": "^1.2.2",
     "fast-simplex-noise": "^4.0.0",
-    "glslify-loader": "^2.0.0",
     "handle-sliderjs": "^1.3.1",
     "html-loader": "^4.2.0",
     "html-webpack-plugin": "^5.6.0",
@@ -50,7 +49,7 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   },
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "CosmosJourneyer",
   "name": "cosmos-journeyer",
   "scripts": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 043f43e2b..04f150ea1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -68,9 +68,6 @@ devDependencies:
   fast-simplex-noise:
     specifier: ^4.0.0
     version: 4.0.0
-  glslify-loader:
-    specifier: ^2.0.0
-    version: 2.0.0
   handle-sliderjs:
     specifier: ^1.3.1
     version: 1.3.1
@@ -1431,13 +1428,6 @@ packages:
       mitt: 3.0.1
     dev: true
 
-  /@choojs/findup@0.2.1:
-    resolution: {integrity: sha512-YstAqNb0MCN8PjdLCDfRsBcGVRN41f3vgLvaI0IrIcBp4AqILRSS0DeWNGkicC+f/zRIPJLc+9RURVSepwvfBw==}
-    hasBin: true
-    dependencies:
-      commander: 2.20.3
-    dev: true
-
   /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -5148,108 +5138,6 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /glsl-inject-defines@1.0.3:
-    resolution: {integrity: sha512-W49jIhuDtF6w+7wCMcClk27a2hq8znvHtlGnrYkSWEr8tHe9eA2dcnohlcAmxLYBSpSSdzOkRdyPTrx9fw49+A==}
-    dependencies:
-      glsl-token-inject-block: 1.1.0
-      glsl-token-string: 1.0.1
-      glsl-tokenizer: 2.1.5
-    dev: true
-
-  /glsl-resolve@0.0.1:
-    resolution: {integrity: sha512-xxFNsfnhZTK9NBhzJjSBGX6IOqYpvBHxxmo+4vapiljyGNCY0Bekzn0firQkQrazK59c1hYxMDxYS8MDlhw4gA==}
-    dependencies:
-      resolve: 0.6.3
-      xtend: 2.2.0
-    dev: true
-
-  /glsl-token-assignments@2.0.2:
-    resolution: {integrity: sha512-OwXrxixCyHzzA0U2g4btSNAyB2Dx8XrztY5aVUCjRSh4/D0WoJn8Qdps7Xub3sz6zE73W3szLrmWtQ7QMpeHEQ==}
-    dev: true
-
-  /glsl-token-defines@1.0.0:
-    resolution: {integrity: sha512-Vb5QMVeLjmOwvvOJuPNg3vnRlffscq2/qvIuTpMzuO/7s5kT+63iL6Dfo2FYLWbzuiycWpbC0/KV0biqFwHxaQ==}
-    dependencies:
-      glsl-tokenizer: 2.1.5
-    dev: true
-
-  /glsl-token-depth@1.1.2:
-    resolution: {integrity: sha512-eQnIBLc7vFf8axF9aoi/xW37LSWd2hCQr/3sZui8aBJnksq9C7zMeUYHVJWMhFzXrBU7fgIqni4EhXVW4/krpg==}
-    dev: true
-
-  /glsl-token-descope@1.0.2:
-    resolution: {integrity: sha512-kS2PTWkvi/YOeicVjXGgX5j7+8N7e56srNDEHDTVZ1dcESmbmpmgrnpjPcjxJjMxh56mSXYoFdZqb90gXkGjQw==}
-    dependencies:
-      glsl-token-assignments: 2.0.2
-      glsl-token-depth: 1.1.2
-      glsl-token-properties: 1.0.1
-      glsl-token-scope: 1.1.2
-    dev: true
-
-  /glsl-token-inject-block@1.1.0:
-    resolution: {integrity: sha512-q/m+ukdUBuHCOtLhSr0uFb/qYQr4/oKrPSdIK2C4TD+qLaJvqM9wfXIF/OOBjuSA3pUoYHurVRNao6LTVVUPWA==}
-    dev: true
-
-  /glsl-token-properties@1.0.1:
-    resolution: {integrity: sha512-dSeW1cOIzbuUoYH0y+nxzwK9S9O3wsjttkq5ij9ZGw0OS41BirKJzzH48VLm8qLg+au6b0sINxGC0IrGwtQUcA==}
-    dev: true
-
-  /glsl-token-scope@1.1.2:
-    resolution: {integrity: sha512-YKyOMk1B/tz9BwYUdfDoHvMIYTGtVv2vbDSLh94PT4+f87z21FVdou1KNKgF+nECBTo0fJ20dpm0B1vZB1Q03A==}
-    dev: true
-
-  /glsl-token-string@1.0.1:
-    resolution: {integrity: sha512-1mtQ47Uxd47wrovl+T6RshKGkRRCYWhnELmkEcUAPALWGTFe2XZpH3r45XAwL2B6v+l0KNsCnoaZCSnhzKEksg==}
-    dev: true
-
-  /glsl-token-whitespace-trim@1.0.0:
-    resolution: {integrity: sha512-ZJtsPut/aDaUdLUNtmBYhaCmhIjpKNg7IgZSfX5wFReMc2vnj8zok+gB/3Quqs0TsBSX/fGnqUUYZDqyuc2xLQ==}
-    dev: true
-
-  /glsl-tokenizer@2.1.5:
-    resolution: {integrity: sha512-XSZEJ/i4dmz3Pmbnpsy3cKh7cotvFlBiZnDOwnj/05EwNp2XrhQ4XKJxT7/pDt4kp4YcpRSKz8eTV7S+mwV6MA==}
-    dependencies:
-      through2: 0.6.5
-    dev: true
-
-  /glslify-bundle@5.1.1:
-    resolution: {integrity: sha512-plaAOQPv62M1r3OsWf2UbjN0hUYAB7Aph5bfH58VxJZJhloRNbxOL9tl/7H71K7OLJoSJ2ZqWOKk3ttQ6wy24A==}
-    dependencies:
-      glsl-inject-defines: 1.0.3
-      glsl-token-defines: 1.0.0
-      glsl-token-depth: 1.1.2
-      glsl-token-descope: 1.0.2
-      glsl-token-scope: 1.1.2
-      glsl-token-string: 1.0.1
-      glsl-token-whitespace-trim: 1.0.0
-      glsl-tokenizer: 2.1.5
-      murmurhash-js: 1.0.0
-      shallow-copy: 0.0.1
-    dev: true
-
-  /glslify-deps@1.3.2:
-    resolution: {integrity: sha512-7S7IkHWygJRjcawveXQjRXLO2FTjijPDYC7QfZyAQanY+yGLCFHYnPtsGT9bdyHiwPTw/5a1m1M9hamT2aBpag==}
-    dependencies:
-      '@choojs/findup': 0.2.1
-      events: 3.3.0
-      glsl-resolve: 0.0.1
-      glsl-tokenizer: 2.1.5
-      graceful-fs: 4.2.11
-      inherits: 2.0.4
-      map-limit: 0.0.1
-      resolve: 1.22.8
-    dev: true
-
-  /glslify-loader@2.0.0:
-    resolution: {integrity: sha512-oOdmTX1BSPG75o3gNZToemfbbuN5dgi4Pco/aRfjbwGxPIfflYLuok6JCf2kDBPHjP+tV+imNsj6YRJg9gKJ1A==}
-    engines: {node: '>=6'}
-    dependencies:
-      glslify-bundle: 5.1.1
-      glslify-deps: 1.3.2
-      loader-utils: 1.4.2
-      resolve: 1.22.8
-    dev: true
-
   /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
@@ -5940,10 +5828,6 @@ packages:
       is-docker: 2.2.1
     dev: true
 
-  /isarray@0.0.1:
-    resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
-    dev: true
-
   /isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
     dev: true
@@ -6645,15 +6529,6 @@ packages:
     engines: {node: '>=6.11.5'}
     dev: true
 
-  /loader-utils@1.4.2:
-    resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
-    engines: {node: '>=4.0.0'}
-    dependencies:
-      big.js: 5.2.2
-      emojis-list: 3.0.0
-      json5: 1.0.2
-    dev: true
-
   /loader-utils@2.0.4:
     resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
     engines: {node: '>=8.9.0'}
@@ -6843,12 +6718,6 @@ packages:
       tmpl: 1.0.5
     dev: true
 
-  /map-limit@0.0.1:
-    resolution: {integrity: sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==}
-    dependencies:
-      once: 1.3.3
-    dev: true
-
   /marked@4.3.0:
     resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
     engines: {node: '>= 12'}
@@ -7171,10 +7040,6 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /murmurhash-js@1.0.0:
-    resolution: {integrity: sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==}
-    dev: true
-
   /mute-stream@0.0.8:
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
@@ -7553,12 +7418,6 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  /once@1.3.3:
-    resolution: {integrity: sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==}
-    dependencies:
-      wrappy: 1.0.2
-    dev: true
-
   /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -8186,15 +8045,6 @@ packages:
       type-fest: 0.6.0
     dev: true
 
-  /readable-stream@1.0.34:
-    resolution: {integrity: sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==}
-    dependencies:
-      core-util-is: 1.0.3
-      inherits: 2.0.4
-      isarray: 0.0.1
-      string_decoder: 0.10.31
-    dev: true
-
   /readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
     dependencies:
@@ -8372,10 +8222,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /resolve@0.6.3:
-    resolution: {integrity: sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==}
-    dev: true
-
   /resolve@1.22.8:
     resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
     hasBin: true
@@ -8653,10 +8499,6 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /shallow-copy@0.0.1:
-    resolution: {integrity: sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==}
-    dev: true
-
   /shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -8962,10 +8804,6 @@ packages:
       es-abstract: 1.22.4
     dev: true
 
-  /string_decoder@0.10.31:
-    resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
-    dev: true
-
   /string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
@@ -9156,13 +8994,6 @@ packages:
     engines: {node: '>=0.8'}
     dev: true
 
-  /through2@0.6.5:
-    resolution: {integrity: sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==}
-    dependencies:
-      readable-stream: 1.0.34
-      xtend: 4.0.2
-    dev: true
-
   /through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
@@ -10017,16 +9848,6 @@ packages:
         optional: true
     dev: true
 
-  /xtend@2.2.0:
-    resolution: {integrity: sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==}
-    engines: {node: '>=0.4'}
-    dev: true
-
-  /xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
-    dev: true
-
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
diff --git a/src/asset/lensflare.png b/src/asset/lensflare.png
deleted file mode 100644
index db3a9fd60..000000000
Binary files a/src/asset/lensflare.png and /dev/null differ
diff --git a/src/asset/lensflare.webp b/src/asset/lensflare.webp
deleted file mode 100644
index 4c6d33d3e..000000000
Binary files a/src/asset/lensflare.webp and /dev/null differ
diff --git a/src/asset/sound/539503__timbre_endless-deceleration-hyperspace.mp3 b/src/asset/sound/539503__timbre_endless-deceleration-hyperspace.mp3
new file mode 100644
index 000000000..4a4d814c5
Binary files /dev/null and b/src/asset/sound/539503__timbre_endless-deceleration-hyperspace.mp3 differ
diff --git a/src/asset/textures/lensflare.jpeg b/src/asset/textures/lensflare.jpeg
deleted file mode 100644
index 8446d019d..000000000
Binary files a/src/asset/textures/lensflare.jpeg and /dev/null differ
diff --git a/src/asset/textures/lensflare2.png b/src/asset/textures/lensflare2.png
deleted file mode 100644
index e63833ac4..000000000
Binary files a/src/asset/textures/lensflare2.png and /dev/null differ
diff --git a/src/asset/textures/lensflare3.png b/src/asset/textures/lensflare3.png
deleted file mode 100644
index 69021e067..000000000
Binary files a/src/asset/textures/lensflare3.png and /dev/null differ
diff --git a/src/asset/textures/lensflare4.png b/src/asset/textures/lensflare4.png
deleted file mode 100644
index f810358b8..000000000
Binary files a/src/asset/textures/lensflare4.png and /dev/null differ
diff --git a/src/asset/textures/starfield.png b/src/asset/textures/starfield.png
deleted file mode 100644
index d4799d3e6..000000000
Binary files a/src/asset/textures/starfield.png and /dev/null differ
diff --git a/src/asset/warpNoise.png b/src/asset/warpNoise.png
deleted file mode 100644
index b993a4611..000000000
Binary files a/src/asset/warpNoise.png and /dev/null differ
diff --git a/src/html/helmetOverlay.html b/src/html/helmetOverlay.html
index c8c999f48..5d6115a74 100644
--- a/src/html/helmetOverlay.html
+++ b/src/html/helmetOverlay.html
@@ -2,8 +2,13 @@
     <div id="bodyData">
         <p id="bodyName"></p>
     </div>
-    <div id="speedometer"></div>
+    <div id="throttle">
+        <div id="throttleStripes"></div>
+    </div>
+    <div id="speed"></div>
     <div id="targetHelper">
         <div id="targetDot"></div>
     </div>
-</section>
\ No newline at end of file
+</section>
+
+<div id="notificationContainer"></div>
\ No newline at end of file
diff --git a/src/html/index.html b/src/html/index.html
index aa052a2ce..dc5e2e0c0 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -5,16 +5,128 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" lang="en" content="Cosmos Journeyer is an infinite universe explorable right in your web browser.">
-    <meta name="description" lang="fr" content="Cosmos Journeyer est un univers infini explorable directement dans votre navigateur web.">
-    <meta name="keywords" content="planet, engine, procedural, universe, procedural universe, procedural planet, procedural planets, procedural universe engine, procedural planet engine, procedural universe generator">
+    <meta name="description" lang="en"
+          content="Cosmos Journeyer is an infinite universe explorable right in your web browser.">
+    <meta name="description" lang="fr"
+          content="Cosmos Journeyer est un univers infini explorable directement dans votre navigateur web.">
+    <meta name="keywords"
+          content="planet, engine, procedural, universe, procedural universe, procedural planet, procedural planets, procedural universe engine, procedural planet engine, procedural universe generator">
     <meta name="author" content="Barthélemy Paléologue">
     <meta name="robots" content="index, follow">
     <title>Cosmos Journeyer</title>
 </head>
 
 <body>
-    <canvas id="renderer"></canvas>
+<canvas id="renderer"></canvas>
+
+<div id="loadSavePanel" class="rightPanel">
+    <div id="dropFileZone">
+        <p>Drop a save file here</p>
+    </div>
+</div>
+
+<div id="settingsPanel" class="rightPanel">
+    <h2>Settings</h2>
+</div>
+
+<div id="contribute" class="rightPanel">
+    <h2>Contribute</h2>
+
+    <h3>Bug reports</h3>
+
+    <p>If you experience any bug during your exploration, please add it to the <a
+        href="https://github.com/BarthPaleologue/CosmosJourneyer/issues">issue tracker</a>. You can also send an email
+        at
+        <a href="mailto:barth.paleologue@cosmosjourneyer.com">barth.paleologue@cosmosjourneyer.com</a>. Sending
+        screenshots and save files can help enormously with the debugging process.</p>
+
+    <h3>Know how to code?</h3>
+
+    <p>CosmosJourneyer is an open-source project which means anyone can help build it! Why not you?<br /> You can
+        check out
+        <a target="_blank"
+           href="https://github.com/BarthPaleologue/CosmosJourneyer">the repository of the project</a> for more details.
+        Please take a look at the contributing guidelines before starting to code for CosmosJourneyer.
+    </p>
+
+    <h3>Support financially</h3>
+
+    <p>Building CosmosJourneyer takes a lot of time and effort and yet is free for everyone. If you want to support the
+        project financially, you can do so on <a target="_blank" href="https://ko-fi.com/cosmosjourneyer">Ko-fi</a>. Any
+        amount is greatly appreciated and will help me keep working on CosmosJourneyer.</p>
+</div>
+
+<div id="credits" class="rightPanel">
+    <h2>Credits</h2>
+    <!--<p>Contributors:</p>
+    <img src="https://contrib.rocks/image?repo=BarthPaleologue/CosmosJourneyer"  alt="contributors" />-->
+
+    <h3>Programming</h3>
+
+    <p>Created by <a target="_blank" href="https://barth.paleologue.fr">Barthélemy Paléologue</a></p>
+    <p>Webpack configuration & Refactorings by <a target="_blank" href="https://github.com/happy44300">Martin Molli</a>
+    </p>
+    <p>Built with <a target="_blank" href="https://www.babylonjs.com/">BabylonJS</a> and its awesome forum</p>
+    <p>Star colors made using <a target="_blank" href="https://www.fourmilab.ch/documents/specrend/">John Walker's
+        "Colour Rendering of Spectra"</a></p>
+    <p>Black hole shader based on <a target="_blank" href="https://www.shadertoy.com/view/tsBXW3">set111 implementation
+        on shadertoy</a></p>
+    <p>Lens flare shader based on <a target="_blank" href="https://www.shadertoy.com/view/wlcyzj">TheNosiriN
+        implementation on shadertoy</a></p>
+    <p>Fractal raymarching based on <a target="_blank" href="https://www.shadertoy.com/view/tsc3Rj">Nazlbit's
+        implementation</a> and <a target="_blank" href="https://www.shadertoy.com/view/wdjGWR">Myro's implementation</a>
+        on shadertoy</p>
+
+    <h3>Font</h3>
+
+    <p><a href="https://typodermicfonts.com/nasalization/">Nasalization font</a> by Typodermic Fonts</p>
+
+    <h3>Music</h3>
+
+    <p><a href="https://freesound.org/people/Andrewkn/sounds/455855/">Wandering</a> by Andrewkn</p>
+
+    <h3>Sound effects</h3>
+
+    <p><a href="https://freesound.org/people/DrMinky/sounds/166186/">Menu screen mouse over</a> by DrMinky</p>
+
+    <p><a href="https://freesound.org/people/lollosound/sounds/386992/">DISTORZIONE</a> by lollosound</p>
+
+    <p><a href="https://freesound.org/people/NHumphrey/sounds/204418/">Large Engine</a> by NHumphrey</p>
+
+    <p><a href="https://freesound.org/people/MATRIXXX_/sounds/702805/">Futuristic Inspect Sound, UI, or In-Game
+        Notification</a> by MATRIXXX_</p>
+
+    <p><a href="https://freesound.org/people/Timbre/sounds/539503/">endless acceleration</a> by Timbre</p>
+
+    <p><a href="https://freesound.org/people/LimitSnap_Creations/sounds/318688/">Rocket Thrust effect</a> by
+        LimitSnap_Creations</p>
+</div>
+
+<div id="about" class="rightPanel">
+    <h2>About</h2>
+
+    <p class="aboutText">
+        Hello fellow explorer!<br />
+        I am the creator of CosmosJourneyer, and I am glad you're interested in this project.
+        It was years in the making you see: back in 2016 already, when I was working on my 3D planetarium, I dreamed
+        about
+        making the planets fully explorable. But then I was limited by how little I knew about computer graphics.<br />
+        <br />
+        I only started CosmosJourneyer years later as a way to escape from the stress of my studies in French "classes
+        préparatoires". At first, it was only a small procedural planet generator, which was called PlanetEngine.
+        But as ideas kept on coming, I continued working on it for years and the project grew way beyond what I had
+        imagined at first.<br />
+        <br />
+        As I understand now that such projects cannot be achieved alone, I decided to open-source CosmosJourneyer so
+        that
+        anyone could freely use and modify it to their liking and even contribute to the project.<br />
+        <br />
+        I hope you will enjoy CosmosJourneyer as much as I enjoy making it!
+    </p>
+    <p class="signature">Barthélemy Paléologue</p>
+    <p class="aboutText">If you have any question about CosmosJourneyer, feel free to contact me at <a
+        href="mailto:barth.paleologue@cosmosjourneyer.com">barth.paleologue@cosmosjourneyer.com</a></p>
+</div>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/html/mainMenu.html b/src/html/mainMenu.html
index 5add20121..82af90db9 100644
--- a/src/html/mainMenu.html
+++ b/src/html/mainMenu.html
@@ -1,4 +1,4 @@
-<div id="mainMenu" xmlns:>
+<div id="mainMenu">
   <h1>Cosmos Journeyer</h1>
 
   <p id="version"><a target="_blank" href="https://github.com/BarthPaleologue/CosmosJourneyer/releases"></a></p>
@@ -11,108 +11,4 @@ <h1>Cosmos Journeyer</h1>
     <li id="creditsButton">Credits</li>
     <li id="aboutButton">About</li>
   </ul>
-
-  <div id="loadSavePanel" class="rightPanel">
-    <div id="dropFileZone">
-      <p>Drop a save file here</p>
-    </div>
-  </div>
-
-  <div id="settingsPanel" class="rightPanel">
-    <h2>Settings</h2>
-  </div>
-
-  <div id="contribute" class="rightPanel">
-    <h2>Contribute</h2>
-
-    <h3>Bug reports</h3>
-
-    <p>If you experience any bug during your exploration, please add it to the <a
-      href="https://github.com/BarthPaleologue/CosmosJourneyer/issues">issue tracker</a>. You can also send an email at
-      <a href="mailto:barth.paleologue@cosmosjourneyer.com">barth.paleologue@cosmosjourneyer.com</a>. Sending
-      screenshots and save files can help enormously with the debugging process.</p>
-
-    <h3>Know how to code?</h3>
-
-    <p>CosmosJourneyer is an open-source project which means anyone can help build it! Why not you?<br /> You can
-      check out
-      <a target="_blank"
-         href="https://github.com/BarthPaleologue/CosmosJourneyer">the repository of the project</a> for more details.
-      Please take a look at the contributing guidelines before starting to code for CosmosJourneyer.
-    </p>
-
-    <h3>Support financially</h3>
-
-    <p>Building CosmosJourneyer takes a lot of time and effort and yet is free for everyone. If you want to support the
-      project financially, you can do so on <a target="_blank" href="https://ko-fi.com/cosmosjourneyer">Ko-fi</a>. Any
-      amount is greatly appreciated and will help me keep working on CosmosJourneyer.</p>
-  </div>
-
-  <div id="credits" class="rightPanel">
-    <h2>Credits</h2>
-    <!--<p>Contributors:</p>
-    <img src="https://contrib.rocks/image?repo=BarthPaleologue/CosmosJourneyer"  alt="contributors" />-->
-
-    <h3>Programming</h3>
-
-    <p>Created by <a target="_blank" href="https://barth.paleologue.fr">Barthélemy Paléologue</a></p>
-    <p>Webpack configuration & Refactorings by <a target="_blank" href="https://github.com/happy44300">Martin Molli</a>
-    </p>
-    <p>Built with <a target="_blank" href="https://www.babylonjs.com/">BabylonJS</a> and its awesome forum</p>
-    <p>Star colors made using <a target="_blank" href="https://www.fourmilab.ch/documents/specrend/">John Walker's
-      "Colour Rendering of Spectra"</a></p>
-    <p>Black hole shader based on <a target="_blank" href="https://www.shadertoy.com/view/tsBXW3">set111 implementation
-      on shadertoy</a></p>
-    <p>Lens flare shader based on <a target="_blank" href="https://www.shadertoy.com/view/wlcyzj">TheNosiriN
-      implementation on shadertoy</a></p>
-    <p>Fractal raymarching based on <a target="_blank" href="https://www.shadertoy.com/view/tsc3Rj">Nazlbit's
-      implementation</a> and <a target="_blank" href="https://www.shadertoy.com/view/wdjGWR">Myro's implementation</a>
-      on shadertoy</p>
-
-    <h3>Font</h3>
-
-    <p><a href="https://typodermicfonts.com/nasalization/">Nasalization font</a> by Typodermic Fonts</p>
-
-    <h3>Music</h3>
-
-    <p><a href="https://freesound.org/people/Andrewkn/sounds/455855/">Wandering</a> by Andrewkn</p>
-
-    <h3>Sound effects</h3>
-
-    <p><a href="https://freesound.org/people/DrMinky/sounds/166186/">Menu screen mouse over</a> by DrMinky</p>
-
-    <p><a href="https://freesound.org/people/lollosound/sounds/386992/">DISTORZIONE</a> by lollosound</p>
-
-    <p><a href="https://freesound.org/people/NHumphrey/sounds/204418/">Large Engine</a> by NHumphrey</p>
-
-    <p><a href="https://freesound.org/people/MATRIXXX_/sounds/702805/">Futuristic Inspect Sound, UI, or In-Game Notification</a> by MATRIXXX_</p>
-
-    <p><a href="https://freesound.org/people/Timbre/sounds/539503/">endless acceleration</a> by Timbre</p>
-
-    <p><a href="https://freesound.org/people/LimitSnap_Creations/sounds/318688/">Rocket Thrust effect</a>  by LimitSnap_Creations</p>
-  </div>
-
-  <div id="about" class="rightPanel">
-    <h2>About</h2>
-
-    <p class="aboutText">
-      Hello fellow explorer!<br />
-      I am the creator of CosmosJourneyer, and I am glad you're interested in this project.
-      It was years in the making you see: back in 2016 already, when I was working on my 3D planetarium, I dreamed about
-      making the planets fully explorable. But then I was limited by how little I knew about computer graphics.<br />
-      <br />
-      I only started CosmosJourneyer years later as a way to escape from the stress of my studies in French "classes
-      préparatoires". At first, it was only a small procedural planet generator, which was called PlanetEngine.
-      But as ideas kept on coming, I continued working on it for years and the project grew way beyond what I had
-      imagined at first.<br />
-      <br />
-      As I understand now that such projects cannot be achieved alone, I decided to open-source CosmosJourneyer so that
-      anyone could freely use and modify it to their liking and even contribute to the project.<br />
-      <br />
-      I hope you will enjoy CosmosJourneyer as much as I enjoy making it!
-    </p>
-    <p class="signature">Barthélemy Paléologue</p>
-    <p class="aboutText">If you have any question about CosmosJourneyer, feel free to contact me at <a
-      href="mailto:barth.paleologue@cosmosjourneyer.com">barth.paleologue@cosmosjourneyer.com</a></p>
-  </div>
 </div>
\ No newline at end of file
diff --git a/src/html/pauseMenu.html b/src/html/pauseMenu.html
index bafc2dc2c..9f8bd7a25 100644
--- a/src/html/pauseMenu.html
+++ b/src/html/pauseMenu.html
@@ -4,6 +4,10 @@
 
     <li id="saveButton" class="button">Save Game</li>
 
+    <li id="pauseSettingsButton" class="button">Settings</li>
+
+    <li id="pauseContributeButton" class="button">Contribute</li>
+
     <li id="screenshotButton" class="button">Take Screenshot</li>
 
     <li id="shareButton" class="button">Share Position</li>
diff --git a/src/shaders/atmosphericScatteringFragment.glsl b/src/shaders/atmosphericScatteringFragment.glsl
index 2f9e84990..0364b1dc3 100644
--- a/src/shaders/atmosphericScatteringFragment.glsl
+++ b/src/shaders/atmosphericScatteringFragment.glsl
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-precision highp float;
+precision lowp float;
 
 /* disable_uniformity_analysis */
 
diff --git a/src/shaders/blackhole.glsl b/src/shaders/blackhole.glsl
index 79cdcf2be..29f96cfe5 100644
--- a/src/shaders/blackhole.glsl
+++ b/src/shaders/blackhole.glsl
@@ -233,23 +233,24 @@ void main() {
     }
 
     // getting the screen coordinate of the end of the bended ray
-    vec2 uv = uvFromWorld(rayPositionBlackHoleSpace, camera_projection, camera_view);
+    vec2 uv = uvFromWorld(rayPositionBlackHoleSpace + object_position, camera_projection, camera_view);
     // check if there is an object occlusion
     vec3 pixelWorldPositionEndRay = worldFromUV(uv, camera_inverseProjection, camera_inverseView);// the pixel position in world space (near plane)
     vec3 rayDirToEndRay = normalize(pixelWorldPositionEndRay - camera_position);// normalized direction of the ray
 
-    float epsilon = 0.01;
-    float depthEndRay1 = texture2D(depthSampler, uv + vec2(epsilon, 0.0)).r;// the depth corresponding to the pixel in the depth map
-    float depthEndRay2 = texture2D(depthSampler, uv + vec2(-epsilon, 0.0)).r;// the depth corresponding to the pixel in the depth map
-    float depthEndRay3 = texture2D(depthSampler, uv + vec2(0.0, epsilon)).r;// the depth corresponding to the pixel in the depth map
-    float depthEndRay4 = texture2D(depthSampler, uv + vec2(0.0 -epsilon)).r;// the depth corresponding to the pixel in the depth map
-    float depthEndRay = min(min(depthEndRay1, depthEndRay2), min(depthEndRay3, depthEndRay4));
+    float depthEndRay = texture2D(depthSampler, uv).r;// the depth corresponding to the pixel in the depth map
+    for(int i = 0; i < 10; i++) {
+        vec2 offset = (vec2(hash(float(i)), hash(float(i + 1))) - 0.5) * 0.01;
+        depthEndRay = min(depthEndRay, texture2D(depthSampler, uv + offset).r);
+    }
     // closest physical point from the camera in the direction of the pixel (occlusion)
     vec3 closestPointEndRay = (pixelWorldPositionEndRay - camera_position) * remap(depthEndRay, 0.0, 1.0, camera_near, camera_far);
     float maximumDistanceEndRay = length(closestPointEndRay);// the maxium ray length due to occlusion
     float BHDistance = length(camera_position - object_position);
 
     bool behindBH = dot(closestPointEndRay - camera_position, closestPointEndRay - object_position) >= 0.0;
+    // checking for alignment: camera, object, blackhole in this order
+    behindBH = behindBH && dot(closestPointEndRay - camera_position, object_position - camera_position) >= 0.0;
 
     vec4 bg = vec4(0.0);
     if(uv.x >= 0.0 && uv.x <= 1.0 && uv.y >= 0.0 && uv.y <= 1.0 && behindBH) {
diff --git a/src/shaders/colorCorrection.glsl b/src/shaders/colorCorrection.glsl
index 2982e0e9d..bd641e79f 100644
--- a/src/shaders/colorCorrection.glsl
+++ b/src/shaders/colorCorrection.glsl
@@ -27,10 +27,30 @@ uniform sampler2D textureSampler;
 
 varying vec2 vUV;
 
+vec3 aces_tonemap(vec3 color){
+    mat3 m1 = mat3(
+    0.59719, 0.07600, 0.02840,
+    0.35458, 0.90834, 0.13383,
+    0.04823, 0.01566, 0.83777
+    );
+    mat3 m2 = mat3(
+    1.60475, -0.10208, -0.00327,
+    -0.53108,  1.10813, -0.07276,
+    -0.07367, -0.00605,  1.07602
+    );
+    vec3 v = m1 * color;
+    vec3 a = v * (v + 0.0245786) - 0.000090537;
+    vec3 b = v * (0.983729 * v + 0.4329510) + 0.238081;
+    return clamp(m2 * (a / b), 0.0, 1.0);
+}
+
 void main() {
     vec3 color = texture2D(textureSampler, vUV).rgb;
+
     float alpha = texture2D(textureSampler, vUV).a;
 
+    color = aces_tonemap(color);
+
     color *= exposure;
     color = clamp(color, 0.0, 1.0);
 
diff --git a/src/shaders/lensflare.glsl b/src/shaders/lensflare.glsl
index 3e319fa69..e442e1352 100644
--- a/src/shaders/lensflare.glsl
+++ b/src/shaders/lensflare.glsl
@@ -1,4 +1,4 @@
-precision highp float;
+precision lowp float;
 
 // based on https://www.shadertoy.com/view/wlcyzj
 
@@ -102,28 +102,10 @@ vec3 anflares(vec2 uv, float intensity, float stretch, float brightness)
     return vec3(smoothstep(0.009, 0.0, length(uv)))*brightness;
 }
 
-vec3 aces_tonemap(vec3 color){
-    mat3 m1 = mat3(
-    0.59719, 0.07600, 0.02840,
-    0.35458, 0.90834, 0.13383,
-    0.04823, 0.01566, 0.83777
-    );
-    mat3 m2 = mat3(
-    1.60475, -0.10208, -0.00327,
-    -0.53108,  1.10813, -0.07276,
-    -0.07367, -0.00605,  1.07602
-    );
-    vec3 v = m1 * color;
-    vec3 a = v * (v + 0.0245786) - 0.000090537;
-    vec3 b = v * (0.983729 * v + 0.4329510) + 0.238081;
-    return clamp(m2 * (a / b), 0.0, 1.0);
-}
-
 void main() {
     vec4 screenColor = texture(textureSampler, vUV);
 
     if (visibility == 0.0) {
-        screenColor.rgb = aces_tonemap(screenColor.rgb);
         gl_FragColor = screenColor;
         return;
     }
@@ -169,8 +151,6 @@ void main() {
 
     col += sun * visibility;
 
-    col = aces_tonemap(col);
-
     // Output to screen
     gl_FragColor = vec4(col, screenColor.a);
 }
\ No newline at end of file
diff --git a/src/shaders/oceanFragment.glsl b/src/shaders/oceanFragment.glsl
index 97c23a25b..b89429624 100644
--- a/src/shaders/oceanFragment.glsl
+++ b/src/shaders/oceanFragment.glsl
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-precision highp float;
+precision lowp float;
 
 /* disable_uniformity_analysis */
 
diff --git a/src/shaders/starfieldFragment.glsl b/src/shaders/starfieldFragment.glsl
index 67912b316..e023fa442 100644
--- a/src/shaders/starfieldFragment.glsl
+++ b/src/shaders/starfieldFragment.glsl
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-precision highp float;
+precision lowp float;
 
 varying vec2 vUV;// screen coordinates
 
diff --git a/src/shaders/warpConeMaterial/fragment.glsl b/src/shaders/warpConeMaterial/fragment.glsl
index 685461ea2..00ea5d2f6 100644
--- a/src/shaders/warpConeMaterial/fragment.glsl
+++ b/src/shaders/warpConeMaterial/fragment.glsl
@@ -1,4 +1,4 @@
-precision highp float;
+precision lowp float;
 
 varying vec3 vPosition;
 varying vec2 vUV;
@@ -7,16 +7,63 @@ uniform float time;
 
 uniform sampler2D warpNoise;
 
+#include "../utils/smoothSharpener.glsl";
+
+float perlin(vec2 uv, int nbOctaves) {
+    float value = 0.0;
+    float frequency = 1.0;
+    float decay = 1.0;
+    float totalAmplitude = 0.0;
+
+    for (int i = 0; i < nbOctaves; i++) {
+        totalAmplitude += decay;
+        value += texture2D(warpNoise, uv * frequency).r * decay;
+        frequency *= 2.0;
+        decay *= 0.5;
+    }
+
+    return value / totalAmplitude;
+}
+
 void main() {
-    vec2 samplePoint = vec2(3.0 * vUV.x, 3.0 * vUV.y + time * 1.2);
+    vec2 samplePoint = 3.0 * vUV + vec2(0.0, time * 1.2);
+    vec2 densitySamplePoint = samplePoint / 3.0;
+    densitySamplePoint.y /= 2.0;
 
-    float noise = texture2D(warpNoise, samplePoint).r;
-    noise = pow(noise, 8.0);
+    vec2 samplePoint2 = 4.0 * vUV.yx + vec2(time * 1.5, 0.0);
+    vec2 densitySamplePoint2 = samplePoint2 / 4.0;
+    densitySamplePoint2.x /= 2.0;
+
+    float noise = perlin(samplePoint, 4);
+    noise = pow(noise, 2.0);
     noise = smoothstep(0.1, 1.0, noise);
 
-    if(noise == 0.0) discard;
+    float density1 = perlin(densitySamplePoint, 1);
+    density1 = smoothSharpener(density1, 8.0);
+
+    noise *= density1;
+
+    float noise2 = perlin(samplePoint2, 4);
+    noise2 = pow(noise2, 2.0);
+    noise2 = smoothstep(0.1, 1.0, noise2);
+
+    float density2 = perlin(densitySamplePoint2, 1);
+    density2 = smoothSharpener(density2, 8.0);
+
+    noise2 *= density2;
+
+    float brightEnd = pow(sin(vUV.y), 2.0);
+
+    float rays = pow(sin(vUV.x * 3.1415 * 4.0 + time), 4.0);
+    rays *= 0.2 + sin(time * 2.0) * 0.1;
+
+    vec3 finalColor = noise * vec3(0.7, 0.7, 1.0);
+
+    finalColor = mix(finalColor, vec3(1.0, 0.7, 0.7), noise2);
+
+    finalColor = mix(finalColor, vec3(0.9, 0.9, 1.0), brightEnd);
 
-    vec3 finalColor = noise * vec3(0.7, 0.7, 1.0) * 3.0;
+    finalColor += vec3(1.0, 0.9, 0.9) * rays;
 
     gl_FragColor = vec4(finalColor, 1.0); // apply color and lighting
 } 
\ No newline at end of file
diff --git a/src/shaders/warpConeMaterial/vertex.glsl b/src/shaders/warpConeMaterial/vertex.glsl
index af289fce7..0f13cf723 100644
--- a/src/shaders/warpConeMaterial/vertex.glsl
+++ b/src/shaders/warpConeMaterial/vertex.glsl
@@ -1,4 +1,4 @@
-precision highp float;
+precision lowp float;
 
 attribute vec3 position;
 attribute vec2 uv;
diff --git a/src/styles/helmetOverlay/helmetOverlay.scss b/src/styles/helmetOverlay/helmetOverlay.scss
index 46fd9d079..a0772cc18 100644
--- a/src/styles/helmetOverlay/helmetOverlay.scss
+++ b/src/styles/helmetOverlay/helmetOverlay.scss
@@ -15,6 +15,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+@import "notifications.scss";
+
 #helmetOverlay {
   position: absolute;
   top: 0;
@@ -50,12 +52,48 @@
     }
   }
 
-  #speedometer {
+  #throttle {
+    margin-bottom: 5px;
+    width: 50px;
+    height: 400px;
+
     position: absolute;
-    bottom: 0;
-    right: 0;
+    bottom: 50px;
+    right: 5px;
+
+    border-top: 1px solid white;
+
+    display: flex;
+    align-items: flex-end;
+
+    #throttleStripes {
+      background: repeating-linear-gradient(to top,
+              rgba(128, 255, 128, 1.0),
+              rgba(128, 255, 128, 1.0) 4px,
+              transparent 4px,
+              transparent 8px
+      );
+      backdrop-filter: blur(5px) brightness(0.8);
+      height: 100%;
+      width: 100%;
+
+      &.reversed {
+        background: repeating-linear-gradient(to bottom,
+                rgba(255, 128, 128, 1.0),
+                rgba(255, 128, 128, 1.0) 4px,
+                transparent 4px,
+                transparent 8px
+        );
+      }
+    }
+  }
+
+  #speed {
+    position: absolute;
+    bottom: 5px;
+    right: 5px;
     color: white;
-    font-size: 200%;
-    text-shadow: white 0 0 3px;
+    font-family: Nasalization, sans-serif;
+    font-size: 2em;
   }
 }
\ No newline at end of file
diff --git a/src/styles/helmetOverlay/notifications.scss b/src/styles/helmetOverlay/notifications.scss
new file mode 100644
index 000000000..74ad8b2fa
--- /dev/null
+++ b/src/styles/helmetOverlay/notifications.scss
@@ -0,0 +1,93 @@
+#notificationContainer {
+  // positioned at top-center of the screen
+  // children are notifications that have a text and a progress bar
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  z-index: 1000;
+  pointer-events: none;
+  font-family: Nasalization, sans-serif;
+  row-gap: 10px;
+  padding: 10px 0;
+
+  .notification {
+    // notification container
+    position: relative;
+    width: 50%;
+    min-width: 500px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-start;
+    pointer-events: all;
+
+    background: rgba(0, 0, 0, 0.5);
+    backdrop-filter: blur(5px);
+    border: 1px solid rgba(255, 255, 255, 0.5);
+
+    animation: popIn 0.5s ease-in-out;
+    animation-fill-mode: forwards;
+
+    transition: .2s;
+
+    p {
+      // notification text
+      position: relative;
+      padding: 5px 10px;
+      text-align: center;
+      color: white;
+      font-size: 1.1em;
+    }
+
+    .notification-progress {
+      // progress bar
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 5px;
+      background-color: rgba(255, 255, 255, 0.5);
+
+      .notification-progress-bar {
+        // progress bar fill
+        height: 100%;
+        width: 30%;
+        background-color: white;
+        animation-fill-mode: forwards;
+      }
+    }
+  }
+}
+
+@keyframes progress {
+  0% {
+    width: 0;
+  }
+  100% {
+    width: 100%;
+  }
+}
+
+@keyframes popIn {
+  0% {
+    transform: scale(0);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+@keyframes popOut {
+  0% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0);
+  }
+}
\ No newline at end of file
diff --git a/src/styles/helmetOverlay/targetHelper.scss b/src/styles/helmetOverlay/targetHelper.scss
index 1779de2d9..a6a843b18 100644
--- a/src/styles/helmetOverlay/targetHelper.scss
+++ b/src/styles/helmetOverlay/targetHelper.scss
@@ -1,7 +1,7 @@
 #targetHelper {
   position: absolute;
-  bottom: 50px;
-  right: 10px;
+  bottom: 65px;
+  right: 70px;
   border: 1px solid white;
   width: 70px;
   height: 70px;
diff --git a/src/styles/mainMenu.scss b/src/styles/mainMenu.scss
index 4d9fe2913..549807582 100644
--- a/src/styles/mainMenu.scss
+++ b/src/styles/mainMenu.scss
@@ -41,108 +41,110 @@
     transition: 0.2s ease-in-out;
 
     a {
-        color: white;
-        transition: 0.1s;
-        text-decoration: underline solid rgba(255, 255, 255, 0.5);
+      color: white;
+      transition: 0.1s;
+      text-decoration: underline solid rgba(255, 255, 255, 0.5);
 
-        &:hover {
-            text-decoration: underline solid white;
-        }
+      &:hover {
+        text-decoration: underline solid white;
+      }
     }
   }
+}
 
-  .rightPanel {
-    position: absolute;
-    max-width: 1400px;
-    width: 72%;
-    right: 2.5vw;
-    height: 60vh;
-    bottom: 7.5vh;
-    transition: 0.2s ease-in-out;
 
-    backdrop-filter: blur(3px);
-    overflow-y: auto;
+.rightPanel {
+  position: absolute;
+  max-width: 1400px;
+  width: 72%;
+  right: 2.5vw;
+  height: 60vh;
+  bottom: 7.5vh;
+  transition: 0.2s ease-in-out;
+  z-index: 50;
+
+  backdrop-filter: blur(3px);
+  overflow-y: auto;
+
+  transform: scale(0);
+  opacity: 0;
+
+  &.visible {
+    transform: scale(1);
+    opacity: 1;
+  }
 
-    transform: scale(0);
-    opacity: 0;
+  box-shadow: 0 0 20px black;
+  background: rgba(0, 0, 0, 0.8);
 
-    &.visible {
-      transform: scale(1);
-      opacity: 1;
-    }
+  h2 {
+    color: white;
+    text-align: center;
+    font-family: Nasalization, sans-serif;
+    font-size: 3em;
+    margin-block: 0.6em;
+  }
 
-    box-shadow: 0 0 20px black;
-    background: rgba(0, 0, 0, 0.8);
+  h3 {
+    color: white;
+    padding: 0 20px;
+    font-family: Nasalization, sans-serif;
+    font-size: 2em;
+  }
 
-    h2 {
-      color: white;
-      text-align: center;
-      font-family: Nasalization, sans-serif;
-      font-size: 3em;
-      margin-block: 0.6em;
-    }
+  #dropFileZone {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    transition: 0.1s;
 
-    h3 {
-      color: white;
-      padding: 0 20px;
-      font-family: Nasalization, sans-serif;
-      font-size: 2em;
+    &.dragover {
+      background: rgba(255, 255, 255, 0.1);
     }
 
-    #dropFileZone {
-      height: 100%;
-      width: 100%;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-      transition: 0.1s;
-
-      &.dragover {
-        background: rgba(255, 255, 255, 0.1);
-      }
-
-      &:hover {
-        background: rgba(255, 255, 255, 0.05);
-      }
-
-      &.invalid {
-        background: rgba(255, 0, 0, 0.1);
-      }
+    &:hover {
+      background: rgba(255, 255, 255, 0.05);
+    }
 
-      p {
-        color: white;
-        font-family: Nasalization, sans-serif;
-        font-size: 1.5em;
-        text-align: center;
-        line-height: 1.5em;
-        padding: 0 20px;
-      }
+    &.invalid {
+      background: rgba(255, 0, 0, 0.1);
     }
 
     p {
       color: white;
       font-family: Nasalization, sans-serif;
+      font-size: 1.5em;
+      text-align: center;
       line-height: 1.5em;
-      font-size: 1.25em;
       padding: 0 20px;
+    }
+  }
 
-      &.signature {
-        text-align: right;
-        font-style: italic;
-        padding-right: 60px;
-      }
+  p {
+    color: white;
+    font-family: Nasalization, sans-serif;
+    line-height: 1.5em;
+    font-size: 1.25em;
+    padding: 0 20px;
+
+    &.signature {
+      text-align: right;
+      font-style: italic;
+      padding-right: 60px;
     }
+  }
 
-    a {
-      color: white;
-      transition: 0.1s;
-      text-decoration: underline solid rgba(255, 255, 255, 0.5);
+  a {
+    color: white;
+    transition: 0.1s;
+    text-decoration: underline solid rgba(255, 255, 255, 0.5);
 
-      &:hover {
-        text-decoration: underline solid white;
-      }
+    &:hover {
+      text-decoration: underline solid white;
     }
   }
 }
\ No newline at end of file
diff --git a/src/ts/alphaTestis.ts b/src/ts/alphaTestis.ts
index 2cf7cfa85..84ffe5f59 100644
--- a/src/ts/alphaTestis.ts
+++ b/src/ts/alphaTestis.ts
@@ -53,7 +53,7 @@ const starSystemSeed = new SystemSeed(0, 0, 0, 0);
 const starSystem = new StarSystemController(starSystemSeed, starSystemView.scene);
 starSystem.model.setName("Alpha Testis");
 
-starSystemView.setStarSystem(starSystem, false);
+await starSystemView.loadStarSystem(starSystem, false);
 
 const sunModel = new StarModel(0.51);
 const sun = StarSystemHelper.MakeStar(starSystem, sunModel);
@@ -152,9 +152,9 @@ const blackHole = starSystem.makeBlackHole(blackHoleModel);*/
 
 engine.init(true);
 
-positionNearObjectBrightSide(starSystemView.scene.getActiveController(), planet, starSystem, 2);
+positionNearObjectBrightSide(starSystemView.scene.getActiveControls(), planet, starSystem, 2);
 
-const aresAtmosphere = starSystem.postProcessManager.getAtmosphere(ares);
+const aresAtmosphere = starSystemView.postProcessManager.getAtmosphere(ares);
 if (aresAtmosphere) {
     aresAtmosphere.atmosphereUniforms.redWaveLength = 500;
     aresAtmosphere.atmosphereUniforms.greenWaveLength = 680;
@@ -168,7 +168,7 @@ document.addEventListener("keydown", (e) => {
 
     if (e.key === "o") {
         const landingPad = spacestation.handleDockingRequest();
-        if (landingPad !== null && starSystemView.scene.getActiveController() === spaceshipController) {
+        if (landingPad !== null && starSystemView.scene.getActiveControls() === spaceshipController) {
             spaceshipController.spaceship.engageLandingOnPad(landingPad);
         }
     }
@@ -186,29 +186,8 @@ document.addEventListener("keydown", (e) => {
         });
         console.log("Vertices", nbVertices, "Instances", nbInstances);
     }
-
-    if (e.key === "y") {
-        if (starSystemView.scene.getActiveController() === spaceshipController) {
-            console.log("disembark");
-
-            characterController.getTransform().setEnabled(true);
-            characterController.getTransform().setAbsolutePosition(spaceshipController.getTransform().absolutePosition);
-            translate(characterController.getTransform(), getForwardDirection(spaceshipController.getTransform()).scale(10));
-
-            setRotationQuaternion(characterController.getTransform(), getRotationQuaternion(spaceshipController.getTransform()).clone());
-
-            starSystemView.scene.setActiveController(characterController);
-            starSystemView.getStarSystem().postProcessManager.rebuild();
-        } else if (starSystemView.scene.getActiveController() === characterController) {
-            console.log("embark");
-
-            characterController.getTransform().setEnabled(false);
-            starSystemView.scene.setActiveController(spaceshipController);
-            starSystemView.getStarSystem().postProcessManager.rebuild();
-        }
-    }
 });
 
 starSystemView.ui.setEnabled(true);
-starSystemView.showUI();
+starSystemView.showHtmlUI();
 starSystemView.getSpaceshipControls().spaceship.enableWarpDrive();
diff --git a/src/ts/architecture/orbitalObject.ts b/src/ts/architecture/orbitalObject.ts
index c301dbb31..64f57d2e0 100644
--- a/src/ts/architecture/orbitalObject.ts
+++ b/src/ts/architecture/orbitalObject.ts
@@ -21,21 +21,17 @@ import { OrbitProperties } from "../orbit/orbitProperties";
 import { Quaternion, Vector3 } from "@babylonjs/core/Maths/math";
 import { getRotationQuaternion, setRotationQuaternion, translate } from "../uberCore/transforms/basicTransform";
 import { OrbitalObjectPhysicalProperties } from "./physicalProperties";
+import { TypedObject } from "./typedObject";
 
 /**
  * Describes all objects that can have an orbital trajectory and rotate on themselves
  */
-export interface OrbitalObject extends Transformable, BoundingSphere {
+export interface OrbitalObject extends Transformable, BoundingSphere, TypedObject {
     /**
      * The name of the object
      */
     readonly name: string;
 
-    /**
-     * The underlying model describing the data of the orbital object
-     */
-    readonly model: OrbitalObjectModel;
-
     /**
      * The rotation axis around which the object rotates on itself
      */
@@ -51,11 +47,6 @@ export interface OrbitalObject extends Transformable, BoundingSphere {
      */
     getPhysicalProperties(): OrbitalObjectPhysicalProperties;
 
-    /**
-     * Returns the type name of the object. This is used as a short identifier in the UI Overlay of the object
-     */
-    getTypeName(): string;
-
     /**
      * Returns the parent of the object
      */
diff --git a/src/ts/architecture/typedObject.ts b/src/ts/architecture/typedObject.ts
new file mode 100644
index 000000000..fe3e9d077
--- /dev/null
+++ b/src/ts/architecture/typedObject.ts
@@ -0,0 +1,6 @@
+export interface TypedObject {
+    /**
+     * Returns the type name of the object. This is used as a short identifier in the UI Overlay of the object
+     */
+    getTypeName(): string;
+}
diff --git a/src/ts/assets.ts b/src/ts/assets.ts
index ff6ffb375..2748b213d 100644
--- a/src/ts/assets.ts
+++ b/src/ts/assets.ts
@@ -38,7 +38,6 @@ import flareParticle from "../asset/flare.png";
 import atmosphereLUT from "../shaders/textures/atmosphereLUT.glsl";
 
 import seamlessPerlin from "../asset/perlin.png";
-import warpNoise from "../asset/warpNoise.png";
 
 import empty from "../asset/oneBlackPixel.png";
 
@@ -66,6 +65,8 @@ import disableWarpDriveSound from "../asset/sound/204418__nhumphrey__large-engin
 import acceleratingWarpDriveSound from "../asset/sound/539503__timbre__endless-acceleration.mp3";
 import deceleratingWarpDriveSound from "../asset/sound/539503__timbre_endless-deceleration.mp3";
 
+import hyperSpaceSound from "../asset/sound/539503__timbre_endless-deceleration-hyperspace.mp3";
+
 import thrusterSound from "../asset/sound/318688__limitsnap_creations__rocket-thrust-effect.mp3";
 
 import starMapBackgroundMusic from "../asset/sound/455855__andrewkn__wandering.mp3";
@@ -112,7 +113,6 @@ export class Assets {
 
     static ATMOSPHERE_LUT: ProceduralTexture;
 
-    static WARP_NOISE: Texture;
     static SEAMLESS_PERLIN: Texture;
 
     private static SPACESHIP: Mesh;
@@ -152,6 +152,8 @@ export class Assets {
     public static ACCELERATING_WARP_DRIVE_SOUND: Sound;
     public static DECELERATING_WARP_DRIVE_SOUND: Sound;
 
+    public static HYPER_SPACE_SOUND: Sound;
+
     public static THRUSTER_SOUND: Sound;
 
     public static STAR_MAP_BACKGROUND_MUSIC: Sound;
@@ -181,7 +183,6 @@ export class Assets {
         Assets.MANAGER.addTextureTask("FlareTexture", flareParticle).onSuccess = (task) => (Assets.FLARE_TEXTURE = task.texture);
 
         Assets.MANAGER.addTextureTask("SeamlessPerlin", seamlessPerlin).onSuccess = (task) => (Assets.SEAMLESS_PERLIN = task.texture);
-        Assets.MANAGER.addTextureTask("WarpNoise", warpNoise).onSuccess = (task) => (Assets.WARP_NOISE = task.texture);
 
         Assets.ATMOSPHERE_LUT = new ProceduralTexture("atmosphereLUT", 100, { fragmentSource: atmosphereLUT }, scene, undefined, false, false);
         Assets.ATMOSPHERE_LUT.refreshRate = 0;
@@ -342,14 +343,14 @@ export class Assets {
             });
 
             const clonedSound = Assets.MENU_HOVER_SOUND.clone();
-            if(clonedSound === null) throw new Error("clonedSound is null");
+            if (clonedSound === null) throw new Error("clonedSound is null");
             Assets.MENU_SELECT_SOUND = clonedSound;
             Assets.MENU_SELECT_SOUND.updateOptions({
                 playbackRate: 1.0
             });
 
             const clonedSound2 = Assets.MENU_HOVER_SOUND.clone();
-            if(clonedSound2 === null) throw new Error("clonedSound2 is null");
+            if (clonedSound2 === null) throw new Error("clonedSound2 is null");
             Assets.OPEN_PAUSE_MENU_SOUND = clonedSound2;
             Assets.OPEN_PAUSE_MENU_SOUND.updateOptions({
                 playbackRate: 0.75
@@ -363,14 +364,14 @@ export class Assets {
             Assets.TARGET_LOCK_SOUND = new Sound("StarMapClickSound", task.data, scene);
 
             const clonedSound = Assets.TARGET_LOCK_SOUND.clone();
-            if(clonedSound === null) throw new Error("clonedSound is null");
+            if (clonedSound === null) throw new Error("clonedSound is null");
             Assets.TARGET_UNLOCK_SOUND = clonedSound;
             Assets.TARGET_UNLOCK_SOUND.updateOptions({
                 playbackRate: 0.5
             });
 
             const clonedSound2 = Assets.TARGET_LOCK_SOUND.clone();
-            if(clonedSound2 === null) throw new Error("clonedSound2 is null");
+            if (clonedSound2 === null) throw new Error("clonedSound2 is null");
             Assets.STAR_MAP_CLICK_SOUND = clonedSound2;
 
             console.log("Target sound loaded");
@@ -417,6 +418,18 @@ export class Assets {
             console.log("Decelerating warp drive sound loaded");
         };
 
+        const hyperSpaceSoundTask = Assets.MANAGER.addBinaryFileTask("hyperSpaceSoundTask", hyperSpaceSound);
+        hyperSpaceSoundTask.onSuccess = function (task) {
+            Assets.HYPER_SPACE_SOUND = new Sound("HyperSpaceSound", task.data, scene);
+            Assets.HYPER_SPACE_SOUND.updateOptions({
+                playbackRate: 1.5,
+                volume: 0.25,
+                loop: true
+            });
+
+            console.log("Hyper space sound loaded");
+        };
+
         const thrusterSoundTask = Assets.MANAGER.addBinaryFileTask("thrusterSoundTask", thrusterSound);
         thrusterSoundTask.onSuccess = function (task) {
             Assets.THRUSTER_SOUND = new Sound("ThrusterSound", task.data, scene);
@@ -440,12 +453,18 @@ export class Assets {
 
         const mainMenuBackgroundMusicTask = Assets.MANAGER.addBinaryFileTask("mainMenuBackgroundMusicTask", starMapBackgroundMusic);
         const mainMenuBackgroundMusicLoaded = new Promise<void>((resolve) => {
-            mainMenuBackgroundMusicTask.onSuccess = function(task) {
-                Assets.MAIN_MENU_BACKGROUND_MUSIC = new Sound("MainMenuBackgroundMusic", task.data, scene, () => {
-                    resolve();
-                }, {
-                    loop: true
-                });
+            mainMenuBackgroundMusicTask.onSuccess = function (task) {
+                Assets.MAIN_MENU_BACKGROUND_MUSIC = new Sound(
+                    "MainMenuBackgroundMusic",
+                    task.data,
+                    scene,
+                    () => {
+                        resolve();
+                    },
+                    {
+                        loop: true
+                    }
+                );
 
                 console.log("Main menu background music loaded");
             };
diff --git a/src/ts/audio/audioManager.ts b/src/ts/audio/audioManager.ts
index 5fa6438f7..0bd1a68fd 100644
--- a/src/ts/audio/audioManager.ts
+++ b/src/ts/audio/audioManager.ts
@@ -1,6 +1,5 @@
 import { AudioInstance } from "../utils/audioInstance";
 
-
 export class AudioManager {
     private static ENABLED_MASK = 0b1111;
 
@@ -15,10 +14,19 @@ export class AudioManager {
     }
 
     public static Update(deltaSeconds: number) {
-        this.SOUNDS.forEach(sound => {
+        this.SOUNDS.forEach((sound) => {
             const isSoundEnabled = (sound.mask & this.ENABLED_MASK) !== 0;
             sound.setMaskFactor(isSoundEnabled ? 1 : 0);
             sound.update(deltaSeconds);
         });
     }
-}
\ No newline at end of file
+
+    static DisposeSound(audioInstance: AudioInstance) {
+        const index = this.SOUNDS.indexOf(audioInstance);
+        if (index === -1) {
+            throw new Error("Sound not found");
+        }
+        this.SOUNDS.splice(index, 1);
+        audioInstance.dispose();
+    }
+}
diff --git a/src/ts/audio/audioMasks.ts b/src/ts/audio/audioMasks.ts
index 31a651199..52829ab5d 100644
--- a/src/ts/audio/audioMasks.ts
+++ b/src/ts/audio/audioMasks.ts
@@ -1,4 +1,5 @@
 export const AudioMasks = {
     STAR_SYSTEM_VIEW: 0b0001,
     STAR_MAP_VIEW: 0b0010,
-}
\ No newline at end of file
+    HYPER_SPACE: 0b0100
+};
diff --git a/src/ts/blackHoleDemo.ts b/src/ts/blackHoleDemo.ts
index 0949138e9..357741cc8 100644
--- a/src/ts/blackHoleDemo.ts
+++ b/src/ts/blackHoleDemo.ts
@@ -32,7 +32,6 @@ const scene = starSystemView.scene;
 
 const starSystemSeed = new SystemSeed(0, 0, 0, 0);
 const starSystem = new StarSystemController(starSystemSeed, scene);
-starSystemView.setStarSystem(starSystem, false);
 
 const BH = StarSystemHelper.MakeBlackHole(starSystem, 0);
 BH.model.orbit.radius = 0;
@@ -40,10 +39,12 @@ BH.model.orbit.radius = 0;
 const planet = StarSystemHelper.MakeTelluricPlanet(starSystem);
 planet.model.orbit.radius = 45 * planet.getRadius();
 
+await starSystemView.loadStarSystem(starSystem, false);
+
 engine.init(true);
 
-positionNearObjectBrightSide(scene.getActiveController(), BH, starSystem, 20);
+positionNearObjectBrightSide(scene.getActiveControls(), BH, starSystem, 20);
 
 starSystemView.ui.setEnabled(true);
-starSystemView.showUI();
+starSystemView.showHtmlUI();
 starSystemView.getSpaceshipControls().spaceship.enableWarpDrive();
diff --git a/src/ts/characterDemo.ts b/src/ts/characterDemo.ts
index 14f50325b..186b46c2a 100644
--- a/src/ts/characterDemo.ts
+++ b/src/ts/characterDemo.ts
@@ -71,7 +71,7 @@ scene.enablePhysics(Vector3.Zero(), havokPlugin);
 const characterController = new CharacterControls(scene);
 characterController.getTransform().setAbsolutePosition(new Vector3(0, 2, 0));
 
-scene.setActiveController(characterController);
+scene.setActiveControls(characterController);
 
 const centerOfPlanet = new TransformNodeWrapper(new TransformNode("centerOfPlanet", scene), 1000e3);
 centerOfPlanet.getTransform().position.y = -1000e3;
diff --git a/src/ts/cosmosJourneyer.ts b/src/ts/cosmosJourneyer.ts
index 6b6f45fe3..2eccc2404 100644
--- a/src/ts/cosmosJourneyer.ts
+++ b/src/ts/cosmosJourneyer.ts
@@ -45,6 +45,11 @@ import { updateInputDevices } from "./inputs/devices";
 import { Assets } from "./assets";
 import { AudioManager } from "./audio/audioManager";
 import { AudioMasks } from "./audio/audioMasks";
+import { GeneralInputs } from "./inputs/generalInputs";
+import { createNotification } from "./utils/notification";
+import { StarSystemInputs } from "./inputs/starSystemInputs";
+import { pressInteractionToStrings } from "./utils/inputControlsString";
+import { DefaultControlsInputs } from "./defaultController/defaultControlsInputs";
 
 enum EngineState {
     UNINITIALIZED,
@@ -77,16 +82,21 @@ export class CosmosJourneyer {
 
         this.starSystemView = starSystemView;
         this.starMap = starMap;
-        this.starMap.onWarpObservable.add((seed: SystemSeed) => {
-            this.starSystemView.setStarSystem(new StarSystemController(seed, this.starSystemView.scene), true);
-            this.starSystemView.initStarSystem();
+        this.starMap.onTargetSetObservable.add((seed: SystemSeed) => {
             this.toggleStarMap();
 
-            const activeControls = this.starSystemView.scene.getActiveController();
+            const activeControls = this.starSystemView.scene.getActiveControls();
             if (activeControls instanceof ShipControls) {
-                activeControls.spaceship.enableWarpDrive();
                 activeControls.thirdPersonCamera.radius = ShipControls.BASE_CAMERA_RADIUS;
             }
+
+            this.starSystemView.setSystemAsTarget(seed);
+
+            const bindingsString = pressInteractionToStrings(StarSystemInputs.map.jumpToSystem).join(" or ");
+            createNotification(
+                `Align your ship with the system target using the target helper on the bottom right of your screen then press ${bindingsString} to make a hyperspace jump.`,
+                20000
+            );
         });
 
         // Init the active scene
@@ -97,16 +107,21 @@ export class CosmosJourneyer {
 
         this.mainMenu = new MainMenu(starSystemView);
         this.mainMenu.onStartObservable.add(() => {
+            createNotification("Your pointer controls the pitch and roll of your spaceship. The neutral position is at the center of the screen.", 20000);
             this.starMap.setCurrentStarSystem(this.starSystemView.getStarSystem().model.seed);
             this.starSystemView.switchToSpaceshipControls();
             this.starSystemView.getSpaceshipControls().spaceship.enableWarpDrive();
-            this.starSystemView.showUI();
+            this.starSystemView.showHtmlUI();
             this.starSystemView.ui.setEnabled(true);
-            this.starSystemView.ui.setTarget(this.starSystemView.getStarSystem().getClosestToScreenCenterOrbitalObject());
+            const target = this.starSystemView.getStarSystem().getClosestToScreenCenterOrbitalObject();
+            if (target !== null) {
+                this.starSystemView.ui.setTarget(target);
+                this.starSystemView.helmetOverlay.setTarget(target.getTransform());
+            }
         });
 
-        this.mainMenu.onLoadSaveObservable.add((saveData: SaveFileData) => {
-            this.loadSaveData(saveData);
+        this.mainMenu.onLoadSaveObservable.add(async (saveData: SaveFileData) => {
+            await this.loadSaveData(saveData);
         });
 
         this.pauseMenu = new PauseMenu();
@@ -119,7 +134,9 @@ export class CosmosJourneyer {
 
             const payload = `universeCoordinates=${urlData}`;
             const url = new URL(`https://barthpaleologue.github.io/CosmosJourneyer/?${payload}`);
-            navigator.clipboard.writeText(url.toString()).then(() => console.log("Copied to clipboard"));
+            navigator.clipboard.writeText(url.toString()).then(() => {
+                createNotification("Copied to clipboard", 2000);
+            });
         });
         this.pauseMenu.onSave.add(() => this.downloadSaveFile());
 
@@ -131,17 +148,29 @@ export class CosmosJourneyer {
             if (!this.mainMenu?.isVisible()) this.pause();
         });
 
-        //TODO: use the keyboard class
-        document.addEventListener("keydown", (e) => {
+        window.addEventListener("resize", () => {
+            this.engine.resize(true);
+        });
+
+        GeneralInputs.map.toggleStarMap.on("complete", () => {
             if (this.mainMenu?.isVisible()) return;
-            if (e.key === "p") this.takeScreenshot();
-            if (e.key === "v") this.takeVideoCapture();
-            if (e.key === "m") this.toggleStarMap();
+            this.toggleStarMap();
+        });
 
-            if (e.key === "Escape") {
-                if (!this.isPaused()) this.pause();
-                else this.resume();
-            }
+        GeneralInputs.map.screenshot.on("complete", () => {
+            if (this.mainMenu?.isVisible()) return;
+            this.takeScreenshot();
+        });
+
+        GeneralInputs.map.videoCapture.on("complete", () => {
+            if (this.mainMenu?.isVisible()) return;
+            this.takeVideoCapture();
+        });
+
+        GeneralInputs.map.togglePause.on("complete", () => {
+            if (this.mainMenu?.isVisible()) return;
+            if (!this.isPaused()) this.pause();
+            else this.resume();
         });
     }
 
@@ -215,9 +244,9 @@ export class CosmosJourneyer {
     /**
      * Inits the current star system
      */
-    public init(skipMainMenu = false): void {
-        if (!skipMainMenu) this.mainMenu.init();
-        this.starSystemView.initStarSystem();
+    public async init(skipMainMenu = false): Promise<void> {
+        if (!skipMainMenu) await this.mainMenu.init();
+        await this.starSystemView.initStarSystem();
 
         this.engine.runRenderLoop(() => {
             updateInputDevices();
@@ -237,7 +266,9 @@ export class CosmosJourneyer {
             this.starSystemView.unZoom(() => {
                 AudioManager.SetMask(AudioMasks.STAR_MAP_VIEW);
 
-                this.activeView.detachControl();
+                this.starSystemView.ui.setEnabled(false);
+
+                this.starSystemView.detachControl();
                 this.starMap.attachControl();
 
                 const starMap = this.starMap;
@@ -245,12 +276,14 @@ export class CosmosJourneyer {
                 starMap.focusOnCurrentSystem();
             });
         } else {
-            this.activeView.detachControl();
+            this.starMap.detachControl();
             this.starSystemView.attachControl();
 
+            this.starSystemView.ui.setEnabled(true);
+
             AudioManager.SetMask(AudioMasks.STAR_SYSTEM_VIEW);
             this.activeView = this.starSystemView;
-            this.starSystemView.showUI();
+            this.starSystemView.showHtmlUI();
         }
     }
 
@@ -298,12 +331,12 @@ export class CosmosJourneyer {
         if (nearestOrbitalObjectIndex === -1) throw new Error("Nearest orbital object not found");
 
         // Finding the position of the player in the nearest orbital object's frame of reference
-        const currentWorldPosition = this.starSystemView.scene.getActiveController().getTransform().getAbsolutePosition();
+        const currentWorldPosition = this.starSystemView.scene.getActiveControls().getTransform().getAbsolutePosition();
         const nearestOrbitalObjectInverseWorld = nearestOrbitalObject.getTransform().getWorldMatrix().clone().invert();
         const currentLocalPosition = Vector3.TransformCoordinates(currentWorldPosition, nearestOrbitalObjectInverseWorld);
 
         // Finding the rotation of the player in the nearest orbital object's frame of reference
-        const currentWorldRotation = this.starSystemView.scene.getActiveController().getTransform().absoluteRotationQuaternion;
+        const currentWorldRotation = this.starSystemView.scene.getActiveControls().getTransform().absoluteRotationQuaternion;
         const nearestOrbitalObjectInverseRotation = nearestOrbitalObject.getTransform().absoluteRotationQuaternion.clone().invert();
         const currentLocalRotation = currentWorldRotation.multiply(nearestOrbitalObjectInverseRotation);
 
@@ -341,8 +374,8 @@ export class CosmosJourneyer {
      * This will perform engine initialization if the engine is not initialized.
      * @param saveData The save file data to load
      */
-    public loadSaveData(saveData: SaveFileData): void {
-        this.loadUniverseCoordinates(saveData.universeCoordinates);
+    public async loadSaveData(saveData: SaveFileData): Promise<void> {
+        await this.loadUniverseCoordinates(saveData.universeCoordinates);
     }
 
     /**
@@ -350,19 +383,20 @@ export class CosmosJourneyer {
      * This will perform engine initialization if the engine is not initialized.
      * @param universeCoordinates The universe coordinates to load
      */
-    public loadUniverseCoordinates(universeCoordinates: UniverseCoordinates): void {
+    public async loadUniverseCoordinates(universeCoordinates: UniverseCoordinates): Promise<void> {
+        this.engine.loadingScreen.displayLoadingUI();
+
         const seed = SystemSeed.Deserialize(universeCoordinates.starSystem);
 
         this.starMap.setCurrentStarSystem(seed);
-        this.starSystemView.setStarSystem(new StarSystemController(seed, this.starSystemView.scene), true);
 
         this.starSystemView.onInitStarSystem.addOnce(() => {
             this.starSystemView.switchToSpaceshipControls();
 
             this.starSystemView.ui.setEnabled(true);
-            this.starSystemView.showUI();
+            this.starSystemView.showHtmlUI();
 
-            const playerTransform = this.starSystemView.scene.getActiveController().getTransform();
+            const playerTransform = this.starSystemView.scene.getActiveControls().getTransform();
 
             const nearestOrbitalObject = this.starSystemView.getStarSystem().getOrbitalObjects()[universeCoordinates.nearestOrbitalObjectIndex];
             const nearestOrbitalObjectWorld = nearestOrbitalObject.getTransform().getWorldMatrix();
@@ -387,7 +421,11 @@ export class CosmosJourneyer {
             this.starSystemView.getStarSystem().applyFloatingOrigin();
         });
 
-        if (this.state === EngineState.UNINITIALIZED) this.init(true);
-        else this.starSystemView.initStarSystem();
+        await this.starSystemView.loadStarSystem(new StarSystemController(seed, this.starSystemView.scene), true);
+
+        if (this.state === EngineState.UNINITIALIZED) await this.init(true);
+        else await this.starSystemView.initStarSystem();
+
+        this.engine.loadingScreen.hideLoadingUI();
     }
 }
diff --git a/src/ts/defaultController/defaultControls.ts b/src/ts/defaultController/defaultControls.ts
index 762127352..f07c00b4e 100644
--- a/src/ts/defaultController/defaultControls.ts
+++ b/src/ts/defaultController/defaultControls.ts
@@ -71,14 +71,14 @@ export class DefaultControls implements Controls {
         const displacement = Vector3.Zero();
 
         const forwardDisplacement = getForwardDirection(this.transform)
-          .scale(this.speed * deltaTime)
-          .scaleInPlace(DefaultControlsInputs.map.move.value[1]);
+            .scale(this.speed * deltaTime)
+            .scaleInPlace(DefaultControlsInputs.map.move.value[1]);
         const upwardDisplacement = getUpwardDirection(this.transform)
-          .scale(this.speed * deltaTime)
-          .scaleInPlace(DefaultControlsInputs.map.upDown.value);
+            .scale(this.speed * deltaTime)
+            .scaleInPlace(DefaultControlsInputs.map.upDown.value);
         const rightDisplacement = getRightDirection(this.transform)
-          .scale(this.speed * deltaTime)
-          .scaleInPlace(DefaultControlsInputs.map.move.value[0]);
+            .scale(this.speed * deltaTime)
+            .scaleInPlace(DefaultControlsInputs.map.move.value[0]);
 
         displacement.addInPlace(forwardDisplacement);
         displacement.addInPlace(upwardDisplacement);
diff --git a/src/ts/defaultController/defaultControlsInputs.ts b/src/ts/defaultController/defaultControlsInputs.ts
index 90ff2f157..f36036f74 100644
--- a/src/ts/defaultController/defaultControlsInputs.ts
+++ b/src/ts/defaultController/defaultControlsInputs.ts
@@ -3,7 +3,6 @@ import Action from "@brianchirls/game-input/Action";
 import { InputDevices } from "../inputs/devices";
 import { AxisComposite } from "@brianchirls/game-input/browser";
 import { InputMap } from "../inputs/inputMap";
-import { InputMaps } from "../inputs/inputMaps";
 
 const gamepad = InputDevices.GAMEPAD;
 const keyboard = InputDevices.KEYBOARD;
@@ -86,5 +85,3 @@ export const DefaultControlsInputs = new InputMap<{
     pitch: pitchAction,
     yaw: yawAction
 });
-
-InputMaps.push(DefaultControlsInputs);
\ No newline at end of file
diff --git a/src/ts/index.ts b/src/ts/index.ts
index d221ad776..8d6e86173 100644
--- a/src/ts/index.ts
+++ b/src/ts/index.ts
@@ -18,14 +18,11 @@
 import "../styles/index.scss";
 
 import { CosmosJourneyer } from "./cosmosJourneyer";
-import { getForwardDirection, getRotationQuaternion, setRotationQuaternion, translate } from "./uberCore/transforms/basicTransform";
 import { decodeBase64 } from "./utils/base64";
 import { isJsonStringValidUniverseCoordinates } from "./saveFile/universeCoordinates";
 
 const engine = await CosmosJourneyer.CreateAsync();
 
-const starSystemView = engine.starSystemView;
-
 const urlParams = new URLSearchParams(window.location.search);
 const universeCoordinatesString = urlParams.get("universeCoordinates");
 
@@ -38,34 +35,3 @@ if (universeCoordinatesString !== null) {
 } else {
     engine.init(false);
 }
-
-const shipControls = starSystemView.getSpaceshipControls();
-const characterController = starSystemView.getCharacterControls();
-
-document.addEventListener("keydown", (e) => {
-    if (engine.isPaused()) return;
-
-    if (e.key === "e") {
-        if (starSystemView.scene.getActiveController() === shipControls) {
-            console.log("disembark");
-
-            characterController.getTransform().setEnabled(true);
-            characterController.getTransform().setAbsolutePosition(shipControls.getTransform().absolutePosition);
-            translate(characterController.getTransform(), getForwardDirection(shipControls.getTransform()).scale(10));
-
-            setRotationQuaternion(characterController.getTransform(), getRotationQuaternion(shipControls.getTransform()).clone());
-
-            starSystemView.scene.setActiveController(characterController);
-            starSystemView.getStarSystem().postProcessManager.rebuild();
-
-            shipControls.spaceship.acceleratingWarpDriveSound.setTargetVolume(0);
-            shipControls.spaceship.deceleratingWarpDriveSound.setTargetVolume(0);
-        } else if (starSystemView.scene.getActiveController() === characterController) {
-            console.log("embark");
-
-            characterController.getTransform().setEnabled(false);
-            starSystemView.scene.setActiveController(shipControls);
-            starSystemView.getStarSystem().postProcessManager.rebuild();
-        }
-    }
-});
diff --git a/src/ts/inputs/devices.ts b/src/ts/inputs/devices.ts
index 93e92e0df..5d89e0ca7 100644
--- a/src/ts/inputs/devices.ts
+++ b/src/ts/inputs/devices.ts
@@ -4,7 +4,7 @@ import Pointer from "@brianchirls/game-input/devices/Pointer";
 
 const gamepad = new Gamepad();
 const keyboard = new Keyboard({
-    keyCode: true,
+    keyCode: true
 });
 const pointer = new Pointer();
 
@@ -16,4 +16,4 @@ export const InputDevices = {
 
 export function updateInputDevices() {
     gamepad.update();
-}
\ No newline at end of file
+}
diff --git a/src/ts/inputs/generalInputs.ts b/src/ts/inputs/generalInputs.ts
new file mode 100644
index 000000000..5ee5c9e67
--- /dev/null
+++ b/src/ts/inputs/generalInputs.ts
@@ -0,0 +1,53 @@
+import { InputMap } from "./inputMap";
+import { InputDevices } from "./devices";
+import Action from "@brianchirls/game-input/Action";
+import PressInteraction from "@brianchirls/game-input/interactions/PressInteraction";
+
+const gamepad = InputDevices.GAMEPAD;
+const keyboard = InputDevices.KEYBOARD;
+
+const togglePauseKey = keyboard.getControl("Escape");
+const togglePauseButton = gamepad.getControl("start");
+
+const togglePauseAction = new Action({
+    bindings: [togglePauseKey, togglePauseButton]
+});
+
+const togglePauseInteraction = new PressInteraction(togglePauseAction);
+
+const toggleStarMapKey = keyboard.getControl("KeyM");
+
+const toggleStarMapAction = new Action({
+    bindings: [toggleStarMapKey]
+});
+
+const toggleStarMapInteraction = new PressInteraction(toggleStarMapAction);
+
+const screenshotKey = keyboard.getControl("KeyP");
+const screenshotButton = gamepad.getControl("select");
+
+const screenshotAction = new Action({
+    bindings: [screenshotKey, screenshotButton]
+});
+
+const screenshotInteraction = new PressInteraction(screenshotAction);
+
+const videoCaptureKey = keyboard.getControl("KeyV");
+
+const videoCaptureAction = new Action({
+    bindings: [videoCaptureKey]
+});
+
+const videoCaptureInteraction = new PressInteraction(videoCaptureAction);
+
+export const GeneralInputs = new InputMap<{
+    togglePause: PressInteraction;
+    toggleStarMap: PressInteraction;
+    screenshot: PressInteraction;
+    videoCapture: PressInteraction;
+}>("GeneralInputs", {
+    togglePause: togglePauseInteraction,
+    toggleStarMap: toggleStarMapInteraction,
+    screenshot: screenshotInteraction,
+    videoCapture: videoCaptureInteraction
+});
diff --git a/src/ts/inputs/inputMaps.ts b/src/ts/inputs/inputMaps.ts
index 7fc28d596..2f6e07a01 100644
--- a/src/ts/inputs/inputMaps.ts
+++ b/src/ts/inputs/inputMaps.ts
@@ -1,3 +1,9 @@
 import { InputMap } from "./inputMap";
+import { SpaceShipControlsInputs } from "../spaceship/spaceShipControlsInputs";
+import { CharacterInputs } from "../spacelegs/characterControlsInputs";
+import { DefaultControlsInputs } from "../defaultController/defaultControlsInputs";
+import { GeneralInputs } from "./generalInputs";
+import { StarSystemInputs } from "./starSystemInputs";
+import { StarMapInputs } from "./starMapInputs";
 
-export const InputMaps: InputMap<any>[] = [];
\ No newline at end of file
+export const InputMaps: InputMap<any>[] = [GeneralInputs, StarSystemInputs, StarMapInputs, SpaceShipControlsInputs, CharacterInputs, DefaultControlsInputs];
diff --git a/src/ts/inputs/starMapInputs.ts b/src/ts/inputs/starMapInputs.ts
new file mode 100644
index 000000000..2d8aa25b6
--- /dev/null
+++ b/src/ts/inputs/starMapInputs.ts
@@ -0,0 +1,19 @@
+import Action from "@brianchirls/game-input/Action";
+import PressInteraction from "@brianchirls/game-input/interactions/PressInteraction";
+import { InputMap } from "./inputMap";
+import { InputDevices } from "./devices";
+
+const gamepad = InputDevices.GAMEPAD;
+const keyboard = InputDevices.KEYBOARD;
+
+const focusOnCurrentSystemAction = new Action({
+    bindings: [keyboard.getControl("KeyF")]
+});
+
+const focusOnCurrentSystemInteraction = new PressInteraction(focusOnCurrentSystemAction);
+
+export const StarMapInputs = new InputMap<{
+    focusOnCurrentSystem: PressInteraction;
+}>("StarMapInputs", {
+    focusOnCurrentSystem: focusOnCurrentSystemInteraction
+});
diff --git a/src/ts/inputs/starSystemInputs.ts b/src/ts/inputs/starSystemInputs.ts
new file mode 100644
index 000000000..59563a1c0
--- /dev/null
+++ b/src/ts/inputs/starSystemInputs.ts
@@ -0,0 +1,67 @@
+import PressInteraction from "@brianchirls/game-input/interactions/PressInteraction";
+import Action from "@brianchirls/game-input/Action";
+import { InputMap } from "./inputMap";
+import { InputDevices } from "./devices";
+
+const gamepad = InputDevices.GAMEPAD;
+const keyboard = InputDevices.KEYBOARD;
+
+const setTargetAction = new Action({
+    bindings: [keyboard.getControl("KeyT")]
+});
+
+const setTargetInteraction = new PressInteraction(setTargetAction);
+
+const toggleSpaceShipCharacterAction = new Action({
+    bindings: [keyboard.getControl("KeyE")]
+});
+
+const toggleSpaceShipCharacterInteraction = new PressInteraction(toggleSpaceShipCharacterAction);
+
+const jumpToSystemAction = new Action({
+    bindings: [keyboard.getControl("KeyJ")]
+});
+
+const jumpToSystemInteraction = new PressInteraction(jumpToSystemAction);
+
+const toggleOverlayAction = new Action({
+    bindings: [keyboard.getControl("KeyO")]
+});
+
+const toggleOverlayInteraction = new PressInteraction(toggleOverlayAction);
+
+const toggleOrbitsAndAxisAction = new Action({
+    bindings: [keyboard.getControl("KeyN")]
+});
+
+const toggleOrbitsAndAxisInteraction = new PressInteraction(toggleOrbitsAndAxisAction);
+
+const toggleDebugUiAction = new Action({
+    bindings: [keyboard.getControl("KeyU")]
+});
+
+const toggleDebugUiInteraction = new PressInteraction(toggleDebugUiAction);
+
+const cycleViewsAction = new Action({
+    bindings: [keyboard.getControl("KeyC")]
+});
+
+const cycleViewsInteraction = new PressInteraction(cycleViewsAction);
+
+export const StarSystemInputs = new InputMap<{
+    setTarget: PressInteraction;
+    toggleSpaceShipCharacter: PressInteraction;
+    jumpToSystem: PressInteraction;
+    toggleOverlay: PressInteraction;
+    toggleOrbitsAndAxis: PressInteraction;
+    cycleViews: PressInteraction;
+    toggleDebugUi: PressInteraction;
+}>("StarSystemInputs", {
+    setTarget: setTargetInteraction,
+    toggleSpaceShipCharacter: toggleSpaceShipCharacterInteraction,
+    jumpToSystem: jumpToSystemInteraction,
+    toggleOverlay: toggleOverlayInteraction,
+    toggleOrbitsAndAxis: toggleOrbitsAndAxisInteraction,
+    cycleViews: cycleViewsInteraction,
+    toggleDebugUi: toggleDebugUiInteraction
+});
diff --git a/src/ts/landingPad/landingPad.ts b/src/ts/landingPad/landingPad.ts
index b3587626b..19df874cf 100644
--- a/src/ts/landingPad/landingPad.ts
+++ b/src/ts/landingPad/landingPad.ts
@@ -1,15 +1,8 @@
 import { TransformNode } from "@babylonjs/core/Meshes";
 import { Assets } from "../assets";
-import { PhysicsAggregate } from "@babylonjs/core/Physics/v2/physicsAggregate";
-import { PhysicsShapeType } from "@babylonjs/core/Physics/v2/IPhysicsEnginePlugin";
-import { PhysicsShapeConvexHull } from "@babylonjs/core/Physics/v2/physicsShape";
-import { Mesh } from "@babylonjs/core/Meshes/mesh";
-import { CollisionMask } from "../settings";
 import { Scene } from "@babylonjs/core/scene";
-import { Quaternion, Vector3 } from "@babylonjs/core/Maths/math";
 import { Transformable } from "../architecture/transformable";
 import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";
-import { PhysicsMotionType } from "@babylonjs/core";
 import { Axis } from "@babylonjs/core/Maths/math.axis";
 
 export class LandingPad implements Transformable {
diff --git a/src/ts/landingSimulator.ts b/src/ts/landingSimulator.ts
index 134df95ec..105f1a2bb 100644
--- a/src/ts/landingSimulator.ts
+++ b/src/ts/landingSimulator.ts
@@ -84,7 +84,7 @@ ground.receiveShadows = true;*/
 
 const defaultControls = new DefaultControls(scene);
 defaultControls.speed *= 15;
-scene.setActiveController(defaultControls);
+scene.setActiveControls(defaultControls);
 
 translate(defaultControls.getTransform(), new Vector3(50, 0, 0));
 
@@ -92,7 +92,7 @@ translate(defaultControls.getTransform(), new Vector3(50, 0, 0));
 
 scene.onBeforeRenderObservable.add(() => {
     const deltaTime = scene.deltaTime / 1000;
-    scene.getActiveController().update(deltaTime);
+    scene.getActiveControls().update(deltaTime);
     spaceship.update(deltaTime);
 
     //OrbitalObject.UpdateRotation(spacestation, deltaTime);
diff --git a/src/ts/mainMenu/mainMenu.ts b/src/ts/mainMenu/mainMenu.ts
index 17ebc4417..06bdc96c1 100644
--- a/src/ts/mainMenu/mainMenu.ts
+++ b/src/ts/mainMenu/mainMenu.ts
@@ -14,26 +14,10 @@ import { Observable } from "@babylonjs/core/Misc/observable";
 import { SystemSeed } from "../utils/systemSeed";
 import { parseSaveFileData, SaveFileData } from "../saveFile/saveFileData";
 import packageInfo from "../../../package.json";
-import { InputMaps } from "../inputs/inputMaps";
-import Action from "@brianchirls/game-input/Action";
-import Interaction from "@brianchirls/game-input/interactions/Interaction";
 import { Assets } from "../assets";
-import DPadComposite from "@brianchirls/game-input/controls/DPadComposite";
-import {
-    AxisComposite,
-    ButtonInputControl,
-    StickInputControl,
-    Vector2InputControl
-} from "@brianchirls/game-input/browser";
 import { Settings } from "../settings";
 import { GasPlanet } from "../planets/gasPlanet/gasPlanet";
-import {
-    axisCompositeToString,
-    buttonInputToString,
-    dPadCompositeToString,
-    stickInputToString,
-    vector2ToString
-} from "../utils/inputControlsString";
+import { initSettingsPanel } from "./settingsPanel";
 
 export class MainMenu {
     readonly scene: UberScene;
@@ -48,16 +32,16 @@ export class MainMenu {
     readonly onCreditsObservable = new Observable<void>();
     readonly onAboutObservable = new Observable<void>();
 
-    private htmlRoot: HTMLElement | null = null;
-    private title: HTMLElement | null = null;
-    private version: HTMLElement | null = null;
+    private readonly htmlRoot: HTMLElement;
+    private readonly title: HTMLElement;
+    private readonly version: HTMLElement;
 
     private activeRightPanel: HTMLElement | null = null;
-    private loadSavePanel: HTMLElement | null = null;
-    private settingsPanel: HTMLElement | null = null;
-    private contributePanel: HTMLElement | null = null;
-    private creditsPanel: HTMLElement | null = null;
-    private aboutPanel: HTMLElement | null = null;
+    private readonly loadSavePanel: HTMLElement;
+    private readonly settingsPanel: HTMLElement;
+    private readonly contributePanel: HTMLElement;
+    private readonly creditsPanel: HTMLElement;
+    private readonly aboutPanel: HTMLElement;
 
     constructor(starSystemView: StarSystemView) {
         this.starSystemView = starSystemView;
@@ -98,32 +82,13 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
         const seed = allowedSeeds[Math.floor(Math.random() * allowedSeeds.length)];
         console.log(seed.starSectorX + ", " + seed.starSectorY + ", " + seed.starSectorZ + ", " + seed.index);
         this.starSystemController = new StarSystemController(seed, this.scene);
-    }
-
-    init() {
-        this.starSystemView.setStarSystem(this.starSystemController, true);
-
-        this.starSystemView.onInitStarSystem.addOnce(() => {
-            this.starSystemView.switchToDefaultControls();
-            const nbRadius = this.starSystemController.model.getBodyTypeOfStar(0) === BodyType.BLACK_HOLE ? 8 : 2;
-            const targetObject = this.starSystemController.planets.length > 0 ? this.starSystemController.planets[0] : this.starSystemController.stellarObjects[0];
-            positionNearObjectWithStarVisible(this.controls, targetObject, this.starSystemController, nbRadius);
-
-            if (targetObject instanceof GasPlanet) Settings.TIME_MULTIPLIER = 30;
-            else Settings.TIME_MULTIPLIER = 3;
-
-            Assets.MAIN_MENU_BACKGROUND_MUSIC.play();
-        });
-
-        this.starSystemView.ui.setEnabled(false);
-
-        this.starSystemView.bodyEditor.setVisibility(EditorVisibility.HIDDEN);
 
         document.body.insertAdjacentHTML("beforeend", mainMenuHTML);
 
         const htmlRoot = document.getElementById("mainMenu");
         if (htmlRoot === null) throw new Error("#mainMenu does not exist!");
         this.htmlRoot = htmlRoot;
+        this.htmlRoot.style.display = "none";
 
         const title = document.querySelector("#mainMenu h1");
         if (title === null) throw new Error("#mainMenu h1 does not exist!");
@@ -149,6 +114,24 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
             });
         });
 
+        const loadSavePanel = document.getElementById("loadSavePanel");
+        if (loadSavePanel === null) throw new Error("#loadSavePanel does not exist!");
+        this.loadSavePanel = loadSavePanel;
+
+        this.settingsPanel = initSettingsPanel();
+
+        const contributePanel = document.getElementById("contribute");
+        if (contributePanel === null) throw new Error("#contribute does not exist!");
+        this.contributePanel = contributePanel;
+
+        const creditsPanel = document.getElementById("credits");
+        if (creditsPanel === null) throw new Error("#credits does not exist!");
+        this.creditsPanel = creditsPanel;
+
+        const aboutPanel = document.getElementById("about");
+        if (aboutPanel === null) throw new Error("#about does not exist!");
+        this.aboutPanel = aboutPanel;
+
         document.getElementById("startButton")?.addEventListener("click", () => {
             this.startAnimation(() => this.onStartObservable.notifyObservers());
         });
@@ -156,10 +139,71 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
         const loadSaveButton = document.getElementById("loadSaveButton");
         if (loadSaveButton === null) throw new Error("#loadSaveButton does not exist!");
 
-        const loadSavePanel = document.getElementById("loadSavePanel");
-        if (loadSavePanel === null) throw new Error("#loadSavePanel does not exist!");
-        this.loadSavePanel = loadSavePanel;
+        this.initLoadSavePanel();
+
+        loadSaveButton.addEventListener("click", () => {
+            this.toggleActivePanel(this.loadSavePanel);
+        });
+
+        const settingsButton = document.getElementById("settingsButton");
+        if (settingsButton === null) throw new Error("#settingsButton does not exist!");
+
+        settingsButton.addEventListener("click", () => {
+            this.toggleActivePanel(this.settingsPanel);
+        });
+
+        const contributeButton = document.getElementById("contributeButton");
+        if (contributeButton === null) throw new Error("#contributeButton does not exist!");
+
+        contributeButton.addEventListener("click", () => {
+            this.toggleActivePanel(this.contributePanel);
+            this.onContributeObservable.notifyObservers();
+        });
+
+        const creditsButton = document.getElementById("creditsButton");
+        if (creditsButton === null) throw new Error("#creditsButton does not exist!");
+
+        creditsButton.addEventListener("click", () => {
+            this.toggleActivePanel(this.creditsPanel);
+            this.onCreditsObservable.notifyObservers();
+        });
+
+        const aboutButton = document.getElementById("aboutButton");
+        if (aboutButton === null) throw new Error("#aboutButton does not exist!");
+
+        aboutButton.addEventListener("click", () => {
+            this.toggleActivePanel(this.aboutPanel);
+            this.onAboutObservable.notifyObservers();
+        });
+    }
+
+    async init() {
+        await this.starSystemView.loadStarSystem(this.starSystemController, true, 0);
 
+        this.starSystemView.onInitStarSystem.addOnce(() => {
+            this.starSystemView.switchToDefaultControls();
+            const nbRadius = this.starSystemController.model.getBodyTypeOfStellarObject(0) === BodyType.BLACK_HOLE ? 8 : 2;
+            const targetObject = this.starSystemController.planets.length > 0 ? this.starSystemController.planets[0] : this.starSystemController.stellarObjects[0];
+            positionNearObjectWithStarVisible(this.controls, targetObject, this.starSystemController, nbRadius);
+
+            if (targetObject instanceof GasPlanet) Settings.TIME_MULTIPLIER = 30;
+            else Settings.TIME_MULTIPLIER = 3;
+
+            Assets.MAIN_MENU_BACKGROUND_MUSIC.play();
+        });
+
+        this.starSystemView.ui.setEnabled(false);
+
+        this.starSystemView.bodyEditor.setVisibility(EditorVisibility.HIDDEN);
+
+        this.htmlRoot.style.display = "block";
+    }
+
+    /**
+     * Initializes the load save panel to be able to drop a file or click on the drop zone to load a save file
+     * @private
+     */
+    private initLoadSavePanel() {
         const dropFileZone = document.getElementById("dropFileZone");
         if (dropFileZone === null) throw new Error("#dropFileZone does not exist!");
 
@@ -229,173 +273,6 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
             };
             fileInput.click();
         });
-
-        loadSaveButton.addEventListener("click", () => {
-            this.toggleActivePanel(loadSavePanel);
-        });
-
-        const settingsButton = document.getElementById("settingsButton");
-        if (settingsButton === null) throw new Error("#settingsButton does not exist!");
-
-        const settingsPanel = document.getElementById("settingsPanel");
-        if (settingsPanel === null) throw new Error("#settings does not exist!");
-        this.settingsPanel = settingsPanel;
-
-        InputMaps.forEach((inputMap) => {
-            // create a div
-            // the name of the map will be an h3
-            // each action will be a div with the name of the action and the bindings
-            const mapDiv = document.createElement("div");
-            mapDiv.classList.add("map");
-            const mapName = document.createElement("h3");
-            // break camelCase with a space
-            mapName.textContent = inputMap.name.replace(/([A-Z])/g, " $1").trim();
-
-            mapDiv.appendChild(mapName);
-
-            for (const [actionName, action] of Object.entries(inputMap.map)) {
-
-                const subActionMap: Map<string, string[]> = new Map();
-
-                const actionOrInteraction = action as Action | Interaction;
-                const bindings = actionOrInteraction instanceof Action ? actionOrInteraction.bindings : actionOrInteraction.action.bindings;
-                bindings.forEach((binding) => {
-                    if (binding.control instanceof DPadComposite) {
-                        const strings = dPadCompositeToString(binding.control);
-                        strings.forEach((string) => {
-                            const [key, name] = string;
-                            if (!subActionMap.has(key)) {
-                                subActionMap.set(key, []);
-                            }
-                            subActionMap.get(key)?.push(name);
-                        });
-                    } else if (binding.control instanceof ButtonInputControl) {
-                        const text = buttonInputToString(binding.control);
-                        subActionMap.set("BUTTON", [text]);
-                    } else if (binding.control instanceof AxisComposite) {
-                        const strings = axisCompositeToString(binding.control);
-                        strings.forEach((string) => {
-                            const [key, name] = string;
-                            if (!subActionMap.has(key)) {
-                                subActionMap.set(key, []);
-                            }
-                            subActionMap.get(key)?.push(name);
-                        });
-                    } else if (binding.control instanceof StickInputControl) {
-                        const strings = stickInputToString(binding.control);
-                        strings.forEach((string) => {
-                            const [key, name] = string;
-                            if (!subActionMap.has(key)) {
-                                subActionMap.set(key, []);
-                            }
-                            subActionMap.get(key)?.push(name);
-                        });
-                    } else if(binding.control instanceof Vector2InputControl) {
-                        const strings = vector2ToString(binding.control);
-                        strings.forEach((string) => {
-                            const [key, name] = string;
-                            if (!subActionMap.has(key)) {
-                                subActionMap.set(key, []);
-                            }
-                            subActionMap.get(key)?.push(name);
-                        });
-                    } else {
-                        throw new Error("Unknown control type");
-                    }
-                });
-
-                const actionDiv = document.createElement("div");
-
-                const label = document.createElement("p");
-                // break camelCase with a space
-                label.textContent = actionName.replace(/([A-Z])/g, " $1").trim();
-
-                actionDiv.appendChild(label);
-
-                if (subActionMap.size === 1) {
-                    actionDiv.classList.add("actionSingle");
-
-                    const valuesContainer = document.createElement("div");
-                    valuesContainer.classList.add("valuesContainer");
-
-                    subActionMap.forEach((value, key) => {
-                        value.forEach((v) => {
-                            const valueContainer = document.createElement("p");
-                            valueContainer.innerText = v;
-                            valuesContainer.appendChild(valueContainer);
-                        });
-                    });
-
-                    actionDiv.appendChild(valuesContainer);
-                } else {
-                    actionDiv.classList.add("actionMultiple");
-
-                    subActionMap.forEach((value, key) => {
-                        const subActionDiv = document.createElement("div");
-                        subActionDiv.classList.add("subAction");
-
-                        const subActionLabel = document.createElement("p");
-                        subActionLabel.textContent = key;
-
-                        const valuesContainer = document.createElement("div");
-                        valuesContainer.classList.add("valuesContainer");
-
-                        value.forEach((v) => {
-                            const valueContainer = document.createElement("p");
-                            valueContainer.innerText = v;
-                            valuesContainer.appendChild(valueContainer);
-                        });
-
-                        subActionDiv.appendChild(subActionLabel);
-                        subActionDiv.appendChild(valuesContainer);
-
-                        actionDiv.appendChild(subActionDiv);
-                    });
-                }
-
-                mapDiv.appendChild(actionDiv);
-            }
-
-            settingsPanel.appendChild(mapDiv);
-        });
-
-        settingsButton.addEventListener("click", () => {
-            this.toggleActivePanel(settingsPanel);
-        });
-
-        const contributeButton = document.getElementById("contributeButton");
-        if (contributeButton === null) throw new Error("#contributeButton does not exist!");
-
-        const contributePanel = document.getElementById("contribute");
-        if (contributePanel === null) throw new Error("#contribute does not exist!");
-        this.contributePanel = contributePanel;
-
-        contributeButton.addEventListener("click", () => {
-            this.toggleActivePanel(contributePanel);
-            this.onContributeObservable.notifyObservers();
-        });
-
-        const creditsButton = document.getElementById("creditsButton");
-        if (creditsButton === null) throw new Error("#creditsButton does not exist!");
-        const creditsPanel = document.getElementById("credits");
-        if (creditsPanel === null) throw new Error("#credits does not exist!");
-        this.creditsPanel = creditsPanel;
-
-        creditsButton.addEventListener("click", () => {
-            this.toggleActivePanel(creditsPanel);
-            this.onCreditsObservable.notifyObservers();
-        });
-
-        const aboutButton = document.getElementById("aboutButton");
-        if (aboutButton === null) throw new Error("#aboutButton does not exist!");
-        const aboutPanel = document.getElementById("about");
-        if (aboutPanel === null) throw new Error("#about does not exist!");
-        this.aboutPanel = aboutPanel;
-
-        aboutButton.addEventListener("click", () => {
-            this.toggleActivePanel(aboutPanel);
-            this.onAboutObservable.notifyObservers();
-        });
     }
 
     private startAnimation(onAnimationFinished: () => void) {
@@ -459,7 +336,6 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
             this.controls.getActiveCamera().getViewMatrix();
 
             this.starSystemController.applyFloatingOrigin();
-            this.starSystemController.updateShaders(0.0);
         };
 
         this.scene.onBeforePhysicsObservable.add(animationCallback);
diff --git a/src/ts/mainMenu/settingsPanel.ts b/src/ts/mainMenu/settingsPanel.ts
new file mode 100644
index 000000000..3cef10122
--- /dev/null
+++ b/src/ts/mainMenu/settingsPanel.ts
@@ -0,0 +1,133 @@
+import { InputMaps } from "../inputs/inputMaps";
+import Action from "@brianchirls/game-input/Action";
+import Interaction from "@brianchirls/game-input/interactions/Interaction";
+import DPadComposite from "@brianchirls/game-input/controls/DPadComposite";
+import { axisCompositeToString, buttonInputToString, dPadCompositeToString, stickInputToString, vector2ToString } from "../utils/inputControlsString";
+import { AxisComposite, ButtonInputControl, StickInputControl, Vector2InputControl } from "@brianchirls/game-input/browser";
+
+export function initSettingsPanel(): HTMLElement {
+    const settingsPanel = document.getElementById("settingsPanel");
+    if (settingsPanel === null) throw new Error("#settings does not exist!");
+
+    InputMaps.forEach((inputMap) => {
+        // create a div
+        // the name of the map will be an h3
+        // each action will be a div with the name of the action and the bindings
+        const mapDiv = document.createElement("div");
+        mapDiv.classList.add("map");
+        const mapName = document.createElement("h3");
+        // break camelCase with a space
+        mapName.textContent = inputMap.name.replace(/([A-Z])/g, " $1").trim();
+
+        mapDiv.appendChild(mapName);
+
+        for (const [actionName, action] of Object.entries(inputMap.map)) {
+            const subActionMap: Map<string, string[]> = new Map();
+
+            const actionOrInteraction = action as Action | Interaction;
+            const bindings = actionOrInteraction instanceof Action ? actionOrInteraction.bindings : actionOrInteraction.action.bindings;
+            bindings.forEach((binding) => {
+                if (binding.control instanceof DPadComposite) {
+                    const strings = dPadCompositeToString(binding.control);
+                    strings.forEach((string) => {
+                        const [key, name] = string;
+                        if (!subActionMap.has(key)) {
+                            subActionMap.set(key, []);
+                        }
+                        subActionMap.get(key)?.push(name);
+                    });
+                } else if (binding.control instanceof ButtonInputControl) {
+                    const text = buttonInputToString(binding.control);
+                    if (!subActionMap.has("BUTTON")) {
+                        subActionMap.set("BUTTON", []);
+                    }
+                    subActionMap.get("BUTTON")?.push(text);
+                } else if (binding.control instanceof AxisComposite) {
+                    const strings = axisCompositeToString(binding.control);
+                    strings.forEach((string) => {
+                        const [key, name] = string;
+                        if (!subActionMap.has(key)) {
+                            subActionMap.set(key, []);
+                        }
+                        subActionMap.get(key)?.push(name);
+                    });
+                } else if (binding.control instanceof StickInputControl) {
+                    const strings = stickInputToString(binding.control);
+                    strings.forEach((string) => {
+                        const [key, name] = string;
+                        if (!subActionMap.has(key)) {
+                            subActionMap.set(key, []);
+                        }
+                        subActionMap.get(key)?.push(name);
+                    });
+                } else if (binding.control instanceof Vector2InputControl) {
+                    const strings = vector2ToString(binding.control);
+                    strings.forEach((string) => {
+                        const [key, name] = string;
+                        if (!subActionMap.has(key)) {
+                            subActionMap.set(key, []);
+                        }
+                        subActionMap.get(key)?.push(name);
+                    });
+                } else {
+                    throw new Error("Unknown control type");
+                }
+            });
+
+            const actionDiv = document.createElement("div");
+
+            const label = document.createElement("p");
+            // break camelCase with a space
+            label.textContent = actionName.replace(/([A-Z])/g, " $1").trim();
+
+            actionDiv.appendChild(label);
+
+            if (subActionMap.size === 1) {
+                actionDiv.classList.add("actionSingle");
+
+                const valuesContainer = document.createElement("div");
+                valuesContainer.classList.add("valuesContainer");
+
+                subActionMap.forEach((value, key) => {
+                    value.forEach((v) => {
+                        const valueContainer = document.createElement("p");
+                        valueContainer.innerText = v;
+                        valuesContainer.appendChild(valueContainer);
+                    });
+                });
+
+                actionDiv.appendChild(valuesContainer);
+            } else {
+                actionDiv.classList.add("actionMultiple");
+
+                subActionMap.forEach((value, key) => {
+                    const subActionDiv = document.createElement("div");
+                    subActionDiv.classList.add("subAction");
+
+                    const subActionLabel = document.createElement("p");
+                    subActionLabel.textContent = key;
+
+                    const valuesContainer = document.createElement("div");
+                    valuesContainer.classList.add("valuesContainer");
+
+                    value.forEach((v) => {
+                        const valueContainer = document.createElement("p");
+                        valueContainer.innerText = v;
+                        valuesContainer.appendChild(valueContainer);
+                    });
+
+                    subActionDiv.appendChild(subActionLabel);
+                    subActionDiv.appendChild(valuesContainer);
+
+                    actionDiv.appendChild(subActionDiv);
+                });
+            }
+
+            mapDiv.appendChild(actionDiv);
+        }
+
+        settingsPanel.appendChild(mapDiv);
+    });
+
+    return settingsPanel;
+}
diff --git a/src/ts/mandelbulb/mandelbulb.ts b/src/ts/mandelbulb/mandelbulb.ts
index b99203f2d..04c89282e 100644
--- a/src/ts/mandelbulb/mandelbulb.ts
+++ b/src/ts/mandelbulb/mandelbulb.ts
@@ -53,7 +53,7 @@ export class Mandelbulb implements CelestialBody, Cullable {
 
         this.parent = parentBody;
 
-        this.transform = new TransformNode(`${name}Transform`, scene);
+        this.transform = new TransformNode(name, scene);
 
         this.postProcesses.push(PostProcessType.MANDELBULB);
 
diff --git a/src/ts/orbit/orbitRenderer.ts b/src/ts/orbit/orbitRenderer.ts
index f06372202..b4c39b3c5 100644
--- a/src/ts/orbit/orbitRenderer.ts
+++ b/src/ts/orbit/orbitRenderer.ts
@@ -72,7 +72,7 @@ export class OrbitRenderer {
     }
 
     update() {
-        if(!this._isVisible) return;
+        if (!this._isVisible) return;
         for (let i = 0; i < this.orbitalObjects.length; i++) {
             const orbitalObject = this.orbitalObjects[i];
             const orbitMesh = this.orbitMeshes[i];
@@ -90,7 +90,7 @@ export class OrbitRenderer {
         this.orbitMeshes = [];
         this.orbitalObjects = [];
 
-        if(this.orbitMaterial === null) {
+        if (this.orbitMaterial === null) {
             this.orbitMaterial = new StandardMaterial("orbitMaterial");
             this.orbitMaterial.emissiveColor = Color3.White();
             this.orbitMaterial.disableLighting = true;
diff --git a/src/ts/planets/gasPlanet/gasPlanet.ts b/src/ts/planets/gasPlanet/gasPlanet.ts
index 03fcb4fed..e7e3a5d51 100644
--- a/src/ts/planets/gasPlanet/gasPlanet.ts
+++ b/src/ts/planets/gasPlanet/gasPlanet.ts
@@ -64,7 +64,7 @@ export class GasPlanet implements Planet, Cullable {
         this.model = model instanceof GasPlanetModel ? model : new GasPlanetModel(model, parentBody?.model);
 
         this.mesh = MeshBuilder.CreateSphere(
-            `${name}Mesh`,
+            name,
             {
                 diameter: this.model.radius * 2,
                 segments: 32
diff --git a/src/ts/planets/telluricPlanet/telluricPlanet.ts b/src/ts/planets/telluricPlanet/telluricPlanet.ts
index 25a1095d4..18b1e28e3 100644
--- a/src/ts/planets/telluricPlanet/telluricPlanet.ts
+++ b/src/ts/planets/telluricPlanet/telluricPlanet.ts
@@ -76,7 +76,7 @@ export class TelluricPlanet implements Planet, Cullable {
 
         this.model = model instanceof TelluricPlanetModel ? model : new TelluricPlanetModel(model, parentBody?.model);
 
-        this.transform = new TransformNode(`${name}Transform`, scene);
+        this.transform = new TransformNode(name, scene);
 
         rotate(this.transform, Axis.X, this.model.physicalProperties.axialTilt);
         this.transform.computeWorldMatrix(true);
diff --git a/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts b/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts
index eed0750f6..f395e829b 100644
--- a/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts
+++ b/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts
@@ -127,9 +127,9 @@ export class TelluricPlanetMaterial extends ShaderMaterial {
             steepColor: new Color3(60, 60, 60).scaleInPlace(1.5 / 255),
             plainColor: new Color3(
                 //TODO: make this better
-                1.5*Math.max(0.22 + centeredRand(model.rng, 82) / 20, 0),
-                1.5*Math.max(0.37 + centeredRand(model.rng, 83) / 20, 0),
-                1.5*Math.max(0.024 + centeredRand(model.rng, 84) / 20, 0)
+                1.5 * Math.max(0.22 + centeredRand(model.rng, 82) / 20, 0),
+                1.5 * Math.max(0.37 + centeredRand(model.rng, 83) / 20, 0),
+                1.5 * Math.max(0.024 + centeredRand(model.rng, 84) / 20, 0)
             ),
             beachColor: new Color3(132, 114, 46).scaleInPlace(1 / 255),
             desertColor: new Color3(232, 142, 59).scaleInPlace(1 / 255),
diff --git a/src/ts/planets/telluricPlanet/telluricPlanetModel.ts b/src/ts/planets/telluricPlanet/telluricPlanetModel.ts
index 2952d8515..b72819447 100644
--- a/src/ts/planets/telluricPlanet/telluricPlanetModel.ts
+++ b/src/ts/planets/telluricPlanet/telluricPlanetModel.ts
@@ -111,7 +111,7 @@ export class TelluricPlanetModel implements PlanetModel {
             isPlaneAlignedWithParent: isOrbitalPlaneAlignedWithParent
         };
 
-        if(this.isSatelliteOfTelluric || this.isSatelliteOfGas) {
+        if (this.isSatelliteOfTelluric || this.isSatelliteOfGas) {
             // Tidal locking for moons
             this.physicalProperties.rotationPeriod = this.orbit.period;
         }
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/chunkForge.ts b/src/ts/planets/telluricPlanet/terrain/chunks/chunkForge.ts
index af545ccd5..e4da7d997 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/chunkForge.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/chunkForge.ts
@@ -20,4 +20,5 @@ import { BuildTask } from "./taskTypes";
 export interface ChunkForge {
     addTask(task: BuildTask): void;
     update(): void;
+    reset(): void;
 }
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/chunkForgeWorkers.ts b/src/ts/planets/telluricPlanet/terrain/chunks/chunkForgeWorkers.ts
index ee0d83623..755625eb9 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/chunkForgeWorkers.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/chunkForgeWorkers.ts
@@ -127,4 +127,9 @@ export class ChunkForgeWorkers implements ChunkForge {
 
         this.executeNextApplyTask();
     }
+
+    public reset() {
+        this.applyTaskQueue.length = 0;
+        this.workerPool.reset();
+    }
 }
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/workerPool.ts b/src/ts/planets/telluricPlanet/terrain/chunks/workerPool.ts
index fe226300e..ea0788937 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/workerPool.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/workerPool.ts
@@ -55,4 +55,12 @@ export class WorkerPool {
         if (this.hasTask()) return this.taskQueue.shift() as BuildTask;
         throw new Error("The workerpool has no task to dispatch");
     }
+
+    public reset() {
+        this.availableWorkers = this.availableWorkers.concat(this.finishedWorkers);
+        this.finishedWorkers = [];
+        this.availableWorkers.forEach((worker) => (worker.onmessage = null));
+
+        this.taskQueue.length = 0;
+    }
 }
diff --git a/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts b/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts
index b5f7a7def..a60acace2 100644
--- a/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts
+++ b/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts
@@ -79,7 +79,7 @@ export class InstancePatch implements IPatch {
     }
 
     public setEnabled(enabled: boolean) {
-        for(const instance of this.instances) {
+        for (const instance of this.instances) {
             instance.setEnabled(enabled);
         }
     }
diff --git a/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts b/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts
index b26a4dbea..2f7ab758d 100644
--- a/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts
+++ b/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts
@@ -20,7 +20,7 @@ import "@babylonjs/core/Meshes/thinInstanceMesh";
 import { TransformNode } from "@babylonjs/core/Meshes/transformNode";
 import { IPatch } from "./iPatch";
 import { applyTransformationToBuffer } from "./matrixBuffer";
-import { Observer } from "@babylonjs/core";
+import { Observer } from "@babylonjs/core/Misc/observable";
 
 export class ThinInstancePatch implements IPatch {
     private baseMesh: Mesh | null = null;
diff --git a/src/ts/playground.ts b/src/ts/playground.ts
index 5514d3571..6fc791aef 100644
--- a/src/ts/playground.ts
+++ b/src/ts/playground.ts
@@ -36,8 +36,8 @@ import { AtmosphericScatteringPostProcess } from "./postProcesses/atmosphericSca
 import { Star } from "./stellarObjects/star/star";
 import { LensFlarePostProcess } from "./postProcesses/lensFlarePostProcess";
 import { Settings } from "./settings";
-import { ScenePerformancePriority } from "@babylonjs/core";
 import { HemisphericLight } from "@babylonjs/core/Lights/hemisphericLight";
+import { ScenePerformancePriority } from "@babylonjs/core/scene";
 
 const canvas = document.getElementById("renderer") as HTMLCanvasElement;
 canvas.width = window.innerWidth;
diff --git a/src/ts/postProcesses/lensFlarePostProcess.ts b/src/ts/postProcesses/lensFlarePostProcess.ts
index 02287cd12..e47c5c06f 100644
--- a/src/ts/postProcesses/lensFlarePostProcess.ts
+++ b/src/ts/postProcesses/lensFlarePostProcess.ts
@@ -113,7 +113,7 @@ export class LensFlarePostProcess extends UberPostProcess implements ObjectPostP
 
         const samplers: ShaderSamplers = [...getSamplers(scene)];
 
-        super(object.name, shaderName, uniforms, samplers, scene);
+        super(object.name + "LensFlare", shaderName, uniforms, samplers, scene);
 
         this.object = object;
         this.settings = settings;
diff --git a/src/ts/postProcesses/objectPostProcess.ts b/src/ts/postProcesses/objectPostProcess.ts
index d1d6b8a7d..0eea28510 100644
--- a/src/ts/postProcesses/objectPostProcess.ts
+++ b/src/ts/postProcesses/objectPostProcess.ts
@@ -17,6 +17,7 @@
 
 import { PostProcess } from "@babylonjs/core/PostProcesses/postProcess";
 import { Transformable } from "../architecture/transformable";
+import { Camera } from "@babylonjs/core/Cameras/camera";
 
 export interface UpdatablePostProcess extends PostProcess {
     /**
@@ -32,5 +33,5 @@ export interface ObjectPostProcess extends PostProcess {
      * This makes sense for raymarching and raytracing shaders that need to know the position of the object.
      */
     readonly object: Transformable;
-    dispose(): void;
+    dispose(camera: Camera): void;
 }
diff --git a/src/ts/postProcesses/postProcessManager.ts b/src/ts/postProcesses/postProcessManager.ts
index fac7bbb77..fbdce40c9 100644
--- a/src/ts/postProcesses/postProcessManager.ts
+++ b/src/ts/postProcesses/postProcessManager.ts
@@ -32,6 +32,7 @@ import { CloudsPostProcess } from "./volumetricCloudsPostProcess";
 import { Engine } from "@babylonjs/core/Engines/engine";
 import { FxaaPostProcess } from "@babylonjs/core/PostProcesses/fxaaPostProcess";
 import { PostProcessRenderEffect } from "@babylonjs/core/PostProcesses/RenderPipeline/postProcessRenderEffect";
+//import { BloomEffect } from "@babylonjs/core/PostProcesses/bloomEffect";
 import { Texture } from "@babylonjs/core/Materials/Textures/texture";
 import "@babylonjs/core/PostProcesses/RenderPipeline/postProcessRenderPipelineManagerSceneComponent";
 import { PostProcessType } from "./postProcessTypes";
@@ -40,7 +41,7 @@ import { ShadowPostProcess } from "./shadowPostProcess";
 import { LensFlarePostProcess } from "./lensFlarePostProcess";
 import { Quaternion } from "@babylonjs/core/Maths/math";
 import { isOrbiting } from "../utils/nearestBody";
-import { ObjectPostProcess, UpdatablePostProcess } from "./objectPostProcess";
+import { UpdatablePostProcess } from "./objectPostProcess";
 import { MatterJetPostProcess } from "./matterJetPostProcess";
 import { Mandelbulb } from "../mandelbulb/mandelbulb";
 import { Star } from "../stellarObjects/star/star";
@@ -48,8 +49,8 @@ import { BlackHole } from "../stellarObjects/blackHole/blackHole";
 import { NeutronStar } from "../stellarObjects/neutronStar/neutronStar";
 import { CelestialBody } from "../architecture/celestialBody";
 import { StellarObject } from "../architecture/stellarObject";
-import { PostProcessRenderPipelineManager } from "@babylonjs/core";
 import { PostProcessRenderPipeline } from "@babylonjs/core/PostProcesses/RenderPipeline/postProcessRenderPipeline";
+import { PostProcessRenderPipelineManager } from "@babylonjs/core/PostProcesses/RenderPipeline/postProcessRenderPipelineManager";
 
 /**
  * The order in which the post processes are rendered when away from a planet
@@ -81,21 +82,43 @@ const surfaceRenderingOrder: PostProcessType[] = [
 
 /**
  * Manages all post processes in the scene.
- * The manager can dynamically create rendering pipelines depending on the current body.
+ * The manager dynamically creates the rendering pipeline depending on the current body.
  * This is necessary so the effects are rendered in the correct order. (other objects -> body -> overlays)
  */
 export class PostProcessManager {
-    private readonly engine: Engine;
-    private readonly scene: UberScene;
+    /**
+     * The BabylonJS engine
+     */
+    readonly engine: Engine;
 
-    private readonly renderingPipelineManager: PostProcessRenderPipelineManager;
+    /**
+     * The scene where the solar system is rendered.
+     * It needs to use the wrapper as the post-processes need the depth renderer of the scene.
+     */
+    readonly scene: UberScene;
 
-    private readonly spaceRenderingPipeline: PostProcessRenderPipeline;
-    private readonly surfaceRenderingPipeline: PostProcessRenderPipeline;
-    private currentRenderingPipeline: PostProcessRenderPipeline;
+    /**
+     * The BabylonJS rendering pipeline manager of the scene
+     */
+    readonly renderingPipelineManager: PostProcessRenderPipelineManager;
+
+    /**
+     * The current rendering pipeline. It is destroyed and recreated every time the closest orbital object changes or when the camera changes.
+     * @private
+     */
+    private renderingPipeline: PostProcessRenderPipeline;
 
+    /**
+     * The order in which to add the post-processes to the rendering pipeline. This is important as this order determines the rendering order.
+     * For now, there are 2 different orders: one when in space, and one when close to a planet.
+     * @private
+     */
     private currentRenderingOrder: PostProcessType[] = spaceRenderingOrder;
 
+    /**
+     * The closest celestial body to the active camera. This is useful to split post-processes that are specific to a body from the others.
+     * @private
+     */
     private currentBody: CelestialBody | null = null;
 
     private readonly starFields: StarfieldPostProcess[] = [];
@@ -110,34 +133,37 @@ export class PostProcessManager {
     private readonly shadows: ShadowPostProcess[] = [];
     private readonly lensFlares: LensFlarePostProcess[] = [];
 
-    /**
-     * All post processes that are attached to an object.
-     */
-    private readonly objectPostProcesses: ObjectPostProcess[][] = [
-        this.oceans,
-        this.clouds,
-        this.atmospheres,
-        this.rings,
-        this.mandelbulbs,
-        this.blackHoles,
-        this.volumetricLights,
-        this.matterJets,
-        this.shadows,
-        this.lensFlares
-    ];
-
     /**
      * All post processes that are updated every frame.
      */
     private readonly updatablePostProcesses: UpdatablePostProcess[][] = [this.oceans, this.clouds, this.blackHoles, this.matterJets];
 
+    /**
+     * The color correction post process responsible for tone mapping, saturation, contrast, brightness and gamma.
+     */
     readonly colorCorrection: ColorCorrection;
+
+    /**
+     * The FXAA post process responsible for antialiasing.
+     */
     readonly fxaa: FxaaPostProcess;
 
+    /**
+     * The effect storing the star field post process.
+     * @private
+     */
     private readonly starFieldRenderEffect: PostProcessRenderEffect;
 
+    /**
+     * The effect storing the color correction post process.
+     */
     readonly colorCorrectionRenderEffect: PostProcessRenderEffect;
+
+    /**
+     * The effect storing the FXAA post process.
+     */
     readonly fxaaRenderEffect: PostProcessRenderEffect;
+
     //readonly bloomRenderEffect: BloomEffect;
 
     constructor(scene: UberScene) {
@@ -160,20 +186,15 @@ export class PostProcessManager {
             return [this.fxaa];
         });
 
-        this.spaceRenderingPipeline = new PostProcessRenderPipeline(scene.getEngine(), "spaceRenderingPipeline");
-        this.renderingPipelineManager.addPipeline(this.spaceRenderingPipeline);
-
-        this.surfaceRenderingPipeline = new PostProcessRenderPipeline(scene.getEngine(), "surfaceRenderingPipeline");
-        this.renderingPipelineManager.addPipeline(this.surfaceRenderingPipeline);
-
-        this.currentRenderingPipeline = this.spaceRenderingPipeline;
+        this.renderingPipeline = new PostProcessRenderPipeline(scene.getEngine(), "renderingPipeline");
+        this.renderingPipelineManager.addPipeline(this.renderingPipeline);
 
         this.starFieldRenderEffect = new PostProcessRenderEffect(this.engine, "starFieldRenderEffect", () => {
             return this.starFields;
         });
 
         //this.bloomRenderEffect = new BloomEffect(scene, 1.0, 2.0, 32);
-        //this.bloomRenderEffect.threshold = 0.5;
+        //this.bloomRenderEffect.threshold = 0.7;
     }
 
     /**
@@ -307,64 +328,102 @@ export class PostProcessManager {
         this.blackHoles.push(blackhole);
     }
 
+    /**
+     * Returns the black hole post process for the given black hole. Throws an error if no black hole is found.
+     * @param blackHole A black hole
+     */
     public getBlackHole(blackHole: BlackHole): BlackHolePostProcess | null {
         return this.blackHoles.find((bh) => bh.object === blackHole) ?? null;
     }
 
+    /**
+     * Creates a new MatterJet postprocess for the given neutron star and adds it to the manager.
+     * @param neutronStar A neutron star
+     */
     public addMatterJet(neutronStar: NeutronStar) {
         console.log("add matter jet");
         this.matterJets.push(new MatterJetPostProcess(neutronStar.name, neutronStar, this.scene));
     }
 
+    /**
+     * Returns the matter jet post process for the given neutron star. Throws an error if no matter jet is found.
+     * @param neutronStar A neutron star
+     */
     public getMatterJet(neutronStar: NeutronStar): MatterJetPostProcess | null {
         return this.matterJets.find((mj) => mj.object === neutronStar) ?? null;
     }
 
+    /**
+     * Creates a new Shadow postprocess for the given body and adds it to the manager.
+     * @param body A celestial body
+     * @param stellarObjects An array of stellar objects
+     */
     public async addShadowCaster(body: CelestialBody, stellarObjects: StellarObject[]) {
         return ShadowPostProcess.CreateAsync(body, this.scene, stellarObjects).then((shadow) => {
             this.shadows.push(shadow);
         });
     }
 
+    /**
+     * Creates a new LensFlare postprocess for the given stellar object and adds it to the manager.
+     * @param stellarObject A stellar object (usually a star or a neutron star)
+     */
     public addLensFlare(stellarObject: StellarObject) {
         this.lensFlares.push(new LensFlarePostProcess(stellarObject, this.scene));
     }
 
+    /**
+     * Sets the current celestial body of the post process manager.
+     * It should be the closest body to the active camera, in order to split the post processes that are specific to this body from the others.
+     * This method will also choose the appropriate rendering order and rebuild the pipeline.
+     * @param body The closest celestial body to the active camera
+     */
     public setBody(body: CelestialBody) {
         this.currentBody = body;
 
         const rings = this.getRings(body);
         const switchLimit = rings !== null ? rings.ringsUniforms.ringStart : 2;
-        if (isOrbiting(this.scene.getActiveController(), body, switchLimit)) this.setSurfaceOrder();
+        if (isOrbiting(this.scene.getActiveControls(), body, switchLimit)) this.setSurfaceOrder();
         else this.setSpaceOrder();
     }
 
+    /**
+     * Sets the rendering order to the space rendering order and rebuilds the pipeline.
+     */
     public setSpaceOrder() {
-        if (this.currentRenderingPipeline === this.spaceRenderingPipeline) return;
-        this.renderingPipelineManager.detachCamerasFromRenderPipeline(this.surfaceRenderingPipeline.name, [this.scene.getActiveCamera()]);
-        this.currentRenderingPipeline = this.spaceRenderingPipeline;
+        if (this.currentRenderingOrder === spaceRenderingOrder) return;
         this.currentRenderingOrder = spaceRenderingOrder;
-        this.init();
+        this.rebuild();
     }
 
+    /**
+     * Sets the rendering order to the surface rendering order and rebuilds the pipeline.
+     */
     public setSurfaceOrder() {
-        if (this.currentRenderingPipeline === this.surfaceRenderingPipeline) return;
-        this.renderingPipelineManager.detachCamerasFromRenderPipeline(this.spaceRenderingPipeline.name, [this.scene.getActiveCamera()]);
-        this.currentRenderingPipeline = this.surfaceRenderingPipeline;
+        if (this.currentRenderingOrder === surfaceRenderingOrder) return;
         this.currentRenderingOrder = surfaceRenderingOrder;
-        this.init();
-    }
-
-    public rebuild() {
-        this.init();
+        this.rebuild();
     }
 
+    /**
+     * Returns the current celestial body, or throws an error if it is null.
+     * @private
+     */
     private getCurrentBody() {
         if (this.currentBody === null) throw new Error("No body set to the postProcessManager");
         return this.currentBody;
     }
 
-    init() {
+    /**
+     * Rebuilds the rendering pipeline with the current rendering order.
+     */
+    public rebuild() {
+        this.renderingPipelineManager.detachCamerasFromRenderPipeline(this.renderingPipeline.name, this.scene.cameras);
+        this.renderingPipelineManager.removePipeline(this.renderingPipeline.name);
+        this.renderingPipeline.dispose();
+
+        this.renderingPipeline = new PostProcessRenderPipeline(this.scene.getEngine(), "renderingPipeline");
+
         const [otherVolumetricLightsRenderEffect, bodyVolumetricLightsRenderEffect] = makeSplitRenderEffects(
             "VolumetricLights",
             this.getCurrentBody(),
@@ -381,41 +440,41 @@ export class PostProcessManager {
         const shadowRenderEffect = new PostProcessRenderEffect(this.engine, "ShadowRenderEffect", () => this.shadows);
         const lensFlareRenderEffect = new PostProcessRenderEffect(this.engine, "LensFlareRenderEffect", () => this.lensFlares);
 
-        this.currentRenderingPipeline.addEffect(this.starFieldRenderEffect);
+        this.renderingPipeline.addEffect(this.starFieldRenderEffect);
 
-        this.currentRenderingPipeline.addEffect(shadowRenderEffect);
+        this.renderingPipeline.addEffect(shadowRenderEffect);
 
         for (const postProcessType of this.currentRenderingOrder) {
             switch (postProcessType) {
                 case PostProcessType.VOLUMETRIC_LIGHT:
-                    this.currentRenderingPipeline.addEffect(otherVolumetricLightsRenderEffect);
+                    this.renderingPipeline.addEffect(otherVolumetricLightsRenderEffect);
                     break;
                 case PostProcessType.BLACK_HOLE:
-                    this.currentRenderingPipeline.addEffect(otherBlackHolesRenderEffect);
+                    this.renderingPipeline.addEffect(otherBlackHolesRenderEffect);
                     break;
                 case PostProcessType.OCEAN:
-                    this.currentRenderingPipeline.addEffect(otherOceansRenderEffect);
+                    this.renderingPipeline.addEffect(otherOceansRenderEffect);
                     break;
                 case PostProcessType.CLOUDS:
-                    this.currentRenderingPipeline.addEffect(otherCloudsRenderEffect);
+                    this.renderingPipeline.addEffect(otherCloudsRenderEffect);
                     break;
                 case PostProcessType.ATMOSPHERE:
-                    this.currentRenderingPipeline.addEffect(otherAtmospheresRenderEffect);
+                    this.renderingPipeline.addEffect(otherAtmospheresRenderEffect);
                     break;
                 case PostProcessType.RING:
-                    this.currentRenderingPipeline.addEffect(otherRingsRenderEffect);
+                    this.renderingPipeline.addEffect(otherRingsRenderEffect);
                     break;
                 case PostProcessType.MATTER_JETS:
-                    this.currentRenderingPipeline.addEffect(otherMatterJetsRenderEffect);
+                    this.renderingPipeline.addEffect(otherMatterJetsRenderEffect);
                     break;
                 case PostProcessType.MANDELBULB:
-                    this.currentRenderingPipeline.addEffect(otherMandelbulbsRenderEffect);
+                    this.renderingPipeline.addEffect(otherMandelbulbsRenderEffect);
                     break;
                 case PostProcessType.SHADOW:
-                    //this.currentRenderingPipeline.addEffect(otherShadowRenderEffect);
+                    //this.renderingPipeline.addEffect(otherShadowRenderEffect);
                     break;
                 case PostProcessType.LENS_FLARE:
-                    //this.currentRenderingPipeline.addEffect(otherLensFlaresRenderEffect);
+                    //this.renderingPipeline.addEffect(otherLensFlaresRenderEffect);
                     break;
             }
         }
@@ -423,44 +482,45 @@ export class PostProcessManager {
         for (const postProcessType of this.currentRenderingOrder) {
             switch (postProcessType) {
                 case PostProcessType.VOLUMETRIC_LIGHT:
-                    this.currentRenderingPipeline.addEffect(bodyVolumetricLightsRenderEffect);
+                    this.renderingPipeline.addEffect(bodyVolumetricLightsRenderEffect);
                     break;
                 case PostProcessType.BLACK_HOLE:
-                    this.currentRenderingPipeline.addEffect(bodyBlackHolesRenderEffect);
+                    this.renderingPipeline.addEffect(bodyBlackHolesRenderEffect);
                     break;
                 case PostProcessType.OCEAN:
-                    this.currentRenderingPipeline.addEffect(bodyOceansRenderEffect);
+                    this.renderingPipeline.addEffect(bodyOceansRenderEffect);
                     break;
                 case PostProcessType.CLOUDS:
-                    this.currentRenderingPipeline.addEffect(bodyCloudsRenderEffect);
+                    this.renderingPipeline.addEffect(bodyCloudsRenderEffect);
                     break;
                 case PostProcessType.ATMOSPHERE:
-                    this.currentRenderingPipeline.addEffect(bodyAtmospheresRenderEffect);
+                    this.renderingPipeline.addEffect(bodyAtmospheresRenderEffect);
                     break;
                 case PostProcessType.RING:
-                    this.currentRenderingPipeline.addEffect(bodyRingsRenderEffect);
+                    this.renderingPipeline.addEffect(bodyRingsRenderEffect);
                     break;
                 case PostProcessType.MATTER_JETS:
-                    this.currentRenderingPipeline.addEffect(bodyMatterJetsRenderEffect);
+                    this.renderingPipeline.addEffect(bodyMatterJetsRenderEffect);
                     break;
                 case PostProcessType.MANDELBULB:
-                    this.currentRenderingPipeline.addEffect(bodyMandelbulbsRenderEffect);
+                    this.renderingPipeline.addEffect(bodyMandelbulbsRenderEffect);
                     break;
                 case PostProcessType.LENS_FLARE:
-                    //this.currentRenderingPipeline.addEffect(bodyLensFlaresRenderEffect);
+                    //this.renderingPipeline.addEffect(bodyLensFlaresRenderEffect);
                     break;
                 case PostProcessType.SHADOW:
-                    //this.currentRenderingPipeline.addEffect(bodyShadowRenderEffect);
+                    //this.renderingPipeline.addEffect(bodyShadowRenderEffect);
                     break;
             }
         }
 
-        this.currentRenderingPipeline.addEffect(lensFlareRenderEffect);
-        this.currentRenderingPipeline.addEffect(this.fxaaRenderEffect);
-        //this.currentRenderingPipeline.addEffect(this.bloomRenderEffect);
-        this.currentRenderingPipeline.addEffect(this.colorCorrectionRenderEffect);
+        this.renderingPipeline.addEffect(lensFlareRenderEffect);
+        this.renderingPipeline.addEffect(this.fxaaRenderEffect);
+        //this.renderingPipeline.addEffect(this.bloomRenderEffect);
+        this.renderingPipeline.addEffect(this.colorCorrectionRenderEffect);
 
-        this.renderingPipelineManager.attachCamerasToRenderPipeline(this.currentRenderingPipeline.name, [this.scene.getActiveCamera()]);
+        this.renderingPipelineManager.addPipeline(this.renderingPipeline);
+        this.renderingPipelineManager.attachCamerasToRenderPipeline(this.renderingPipeline.name, [this.scene.getActiveCamera()]);
     }
 
     /**
@@ -472,18 +532,43 @@ export class PostProcessManager {
     }
 
     /**
-     * Disposes all post processes and rendering pipelines.
+     * Disposes of all post-processes tied to a star system (everything except color correction and FXAA).
+     * The pipeline is not destroyed as it is always destroyed and recreated when the closest orbital object changes.
      */
-    public dispose() {
-        for (const objectPostProcess of this.objectPostProcesses.flat()) objectPostProcess.dispose();
+    public reset() {
+        const camera = this.scene.getActiveCamera();
+
+        this.starFields.forEach((starField) => starField.dispose(camera));
+        this.starFields.length = 0;
+
+        this.volumetricLights.forEach((volumetricLight) => volumetricLight.dispose(camera));
+        this.volumetricLights.length = 0;
+
+        this.oceans.forEach((ocean) => ocean.dispose(camera));
+        this.oceans.length = 0;
+
+        this.clouds.forEach((clouds) => clouds.dispose(camera));
+        this.clouds.length = 0;
+
+        this.atmospheres.forEach((atmosphere) => atmosphere.dispose(camera));
+        this.atmospheres.length = 0;
+
+        this.rings.forEach((rings) => rings.dispose(camera));
+        this.rings.length = 0;
+
+        this.mandelbulbs.forEach((mandelbulb) => mandelbulb.dispose(camera));
+        this.mandelbulbs.length = 0;
+
+        this.blackHoles.forEach((blackHole) => blackHole.dispose(camera));
+        this.blackHoles.length = 0;
 
-        this.colorCorrection.dispose();
-        this.fxaa.dispose();
+        this.matterJets.forEach((matterJet) => matterJet.dispose(camera));
+        this.matterJets.length = 0;
 
-        this.surfaceRenderingPipeline._detachCameras(this.surfaceRenderingPipeline.cameras);
-        this.spaceRenderingPipeline._detachCameras(this.spaceRenderingPipeline.cameras);
+        this.shadows.forEach((shadow) => shadow.dispose(camera));
+        this.shadows.length = 0;
 
-        this.surfaceRenderingPipeline.dispose();
-        this.spaceRenderingPipeline.dispose();
+        this.lensFlares.forEach((lensFlare) => lensFlare.dispose(camera));
+        this.lensFlares.length = 0;
     }
 }
diff --git a/src/ts/postProcesses/volumetricLight.ts b/src/ts/postProcesses/volumetricLight.ts
index 0abcda353..1246c7a3b 100644
--- a/src/ts/postProcesses/volumetricLight.ts
+++ b/src/ts/postProcesses/volumetricLight.ts
@@ -21,6 +21,7 @@ import { ObjectPostProcess } from "./objectPostProcess";
 import { Star } from "../stellarObjects/star/star";
 import { NeutronStar } from "../stellarObjects/neutronStar/neutronStar";
 import { Scene } from "@babylonjs/core/scene";
+import { Camera } from "@babylonjs/core/Cameras/camera";
 
 export class VolumetricLight extends VolumetricLightScatteringPostProcess implements ObjectPostProcess {
     readonly object: Star | NeutronStar;
@@ -38,9 +39,7 @@ export class VolumetricLight extends VolumetricLightScatteringPostProcess implem
         this.scene = scene;
     }
 
-    public override dispose(): void {
-        const activeCamera = this.scene.activeCamera;
-        if (activeCamera === null) throw new Error("no camera available to dispose volumetric light post process of star " + this.object.name);
-        super.dispose(activeCamera);
+    public override dispose(camera: Camera): void {
+        super.dispose(camera);
     }
 }
diff --git a/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts b/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts
index 352b0b220..e25af3fd9 100644
--- a/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts
+++ b/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts
@@ -50,9 +50,11 @@ export class ButterflyMaterial extends ShaderMaterial {
     update(stars: Transformable[], playerPosition: Vector3, deltaSeconds: number) {
         this.elapsedSeconds += deltaSeconds;
 
-        const star = stars[0];
-        const lightDirection = star.getTransform().getAbsolutePosition().subtract(playerPosition).normalize();
-        this.setVector3("lightDirection", lightDirection);
+        if (stars.length > 0) {
+            const star = stars[0];
+            const lightDirection = star.getTransform().getAbsolutePosition().subtract(playerPosition).normalize();
+            this.setVector3("lightDirection", lightDirection);
+        }
 
         this.setVector3("playerPosition", playerPosition);
         this.setFloat("time", this.elapsedSeconds);
diff --git a/src/ts/proceduralAssets/grass/grassMaterial.ts b/src/ts/proceduralAssets/grass/grassMaterial.ts
index 617b330fe..2be220bb3 100644
--- a/src/ts/proceduralAssets/grass/grassMaterial.ts
+++ b/src/ts/proceduralAssets/grass/grassMaterial.ts
@@ -49,9 +49,11 @@ export class GrassMaterial extends ShaderMaterial {
     update(stars: Transformable[], playerPosition: Vector3, deltaSeconds: number) {
         this.elapsedSeconds += deltaSeconds;
 
-        const star = stars[0];
-        const lightDirection = star.getTransform().getAbsolutePosition().subtract(playerPosition).normalize();
-        this.setVector3("lightDirection", lightDirection);
+        if (stars.length > 0) {
+            const star = stars[0];
+            const lightDirection = star.getTransform().getAbsolutePosition().subtract(playerPosition).normalize();
+            this.setVector3("lightDirection", lightDirection);
+        }
 
         this.setVector3("playerPosition", playerPosition);
         this.setFloat("time", this.elapsedSeconds);
diff --git a/src/ts/randomizer.ts b/src/ts/randomizer.ts
index 4e48afbd7..885dd1584 100644
--- a/src/ts/randomizer.ts
+++ b/src/ts/randomizer.ts
@@ -38,15 +38,15 @@ const index = 0;
 const seed = new SystemSeed(starMapX, starMapY, starMapZ, index);
 
 const starSystem = new StarSystemController(seed, scene);
-starSystemView.setStarSystem(starSystem, true);
+await starSystemView.loadStarSystem(starSystem, true);
 
 engine.starMap.setCurrentStarSystem(seed);
 
-engine.init(true);
+await engine.init(true);
 
-const nbRadius = starSystem.model.getBodyTypeOfStar(0) === BodyType.BLACK_HOLE ? 8 : 3;
+const nbRadius = starSystem.model.getBodyTypeOfStellarObject(0) === BodyType.BLACK_HOLE ? 8 : 3;
 const planet = starSystem.planets.length > 0 ? starSystem.planets[0] : starSystem.stellarObjects[0];
-positionNearObjectBrightSide(scene.getActiveController(), planet, starSystem, nbRadius);
+positionNearObjectBrightSide(scene.getActiveControls(), planet, starSystem, nbRadius);
 
 starSystemView.ui.setEnabled(true);
-starSystemView.showUI();
+starSystemView.showHtmlUI();
diff --git a/src/ts/settings.ts b/src/ts/settings.ts
index 638ffe2c8..7697e7f1e 100644
--- a/src/ts/settings.ts
+++ b/src/ts/settings.ts
@@ -23,6 +23,11 @@ export const Settings = {
     EARTH_RADIUS: 1000e3, // target is 6000e3
     AU: 150e9, // target is 150e9
 
+    /**
+     * The distance light travels in one year.
+     */
+    LIGHT_YEAR: 3e8 * 60 * 60 * 24 * 365.25,
+
     VERTEX_RESOLUTION: 64,
     MIN_DISTANCE_BETWEEN_VERTICES: 1.5,
 
diff --git a/src/ts/spacelegs/characterControlsInputs.ts b/src/ts/spacelegs/characterControlsInputs.ts
index 86f1e5195..ef13c689b 100644
--- a/src/ts/spacelegs/characterControlsInputs.ts
+++ b/src/ts/spacelegs/characterControlsInputs.ts
@@ -3,7 +3,6 @@ import Action from "@brianchirls/game-input/Action";
 import PressInteraction from "@brianchirls/game-input/interactions/PressInteraction";
 import { InputDevices } from "../inputs/devices";
 import { InputMap } from "../inputs/inputMap";
-import { InputMaps } from "../inputs/inputMaps";
 
 const gamepad = InputDevices.GAMEPAD;
 const keyboard = InputDevices.KEYBOARD;
@@ -61,4 +60,4 @@ export const CharacterInputs = new InputMap<{
     run: runAction
 });
 
-InputMaps.push(CharacterInputs);
+CharacterInputs.setEnabled(false);
\ No newline at end of file
diff --git a/src/ts/spaceship/shipControls.ts b/src/ts/spaceship/shipControls.ts
index ed0a438f0..8995b3428 100644
--- a/src/ts/spaceship/shipControls.ts
+++ b/src/ts/spaceship/shipControls.ts
@@ -26,6 +26,10 @@ import { ArcRotateCamera } from "@babylonjs/core/Cameras/arcRotateCamera";
 import { Spaceship } from "./spaceship";
 import { SpaceShipControlsInputs } from "./spaceShipControlsInputs";
 import { moveTowards } from "../utils/moveTowards";
+import { createNotification } from "../utils/notification";
+import { StarSystemInputs } from "../inputs/starSystemInputs";
+import { buttonInputToString, pressInteractionToStrings } from "../utils/inputControlsString";
+import { ButtonInputControl } from "@brianchirls/game-input/browser";
 
 export class ShipControls implements Controls {
     readonly spaceship: Spaceship;
@@ -48,7 +52,7 @@ export class ShipControls implements Controls {
         this.firstPersonCamera = new FreeCamera("firstPersonCamera", Vector3.Zero(), scene);
         this.firstPersonCamera.parent = this.getTransform();
         this.firstPersonCamera.position = new Vector3(0, 1.2, 4);
-        
+
         this.thirdPersonCamera = new ArcRotateCamera("thirdPersonCamera", -3.14 / 2, 3.14 / 2.2, ShipControls.BASE_CAMERA_RADIUS, Vector3.Zero(), scene);
         this.thirdPersonCamera.parent = this.getTransform();
         this.thirdPersonCamera.lowerRadiusLimit = 10;
@@ -56,10 +60,6 @@ export class ShipControls implements Controls {
 
         this.scene = scene;
 
-        SpaceShipControlsInputs.map.toggleFlightAssist.on("complete", () => {
-            this.spaceship.setFlightAssistEnabled(!this.spaceship.getFlightAssistEnabled());
-        });
-
         SpaceShipControlsInputs.map.toggleWarpDrive.on("complete", () => {
             this.spaceship.toggleWarpDrive();
         });
@@ -72,7 +72,7 @@ export class ShipControls implements Controls {
 
         SpaceShipControlsInputs.map.throttleToZero.on("complete", () => {
             this.spaceship.setMainEngineThrottle(0);
-            this.spaceship.getWarpDrive().increaseTargetThrottle(-this.spaceship.getWarpDrive().getTargetThrottle());
+            this.spaceship.getWarpDrive().increaseTargetThrottle(-this.spaceship.getWarpDrive().getThrottle());
         });
 
         this.baseFov = this.thirdPersonCamera.fov;
@@ -87,6 +87,15 @@ export class ShipControls implements Controls {
             this.shakeCamera(2500);
             this.targetFov = this.baseFov * 0.5;
         });
+
+        this.spaceship.onLandingObservable.add(() => {
+            const bindingsString = pressInteractionToStrings(StarSystemInputs.map.toggleSpaceShipCharacter).join(", ");
+            createNotification(`Landing complete! Use ${bindingsString} to disembark.`, 5000);
+        });
+
+        this.spaceship.onLandingEngaged.add(() => {
+            createNotification(`Landing sequence engaged.`, 5000);
+        });
     }
 
     private shakeCamera(duration: number) {
@@ -117,8 +126,8 @@ export class ShipControls implements Controls {
         if (this.spaceship.getWarpDrive().isDisabled()) {
             this.spaceship.increaseMainEngineThrottle(deltaTime * SpaceShipControlsInputs.map.throttle.value);
 
-            if(SpaceShipControlsInputs.map.upDown.value !== 0) {
-                if(this.spaceship.isLanded()) {
+            if (SpaceShipControlsInputs.map.upDown.value !== 0) {
+                if (this.spaceship.isLanded()) {
                     this.spaceship.takeOff();
                 }
                 this.spaceship.aggregate.body.applyForce(
@@ -127,12 +136,12 @@ export class ShipControls implements Controls {
                 );
             }
         } else {
-            this.spaceship.getWarpDrive().increaseTargetThrottle(deltaTime * SpaceShipControlsInputs.map.throttle.value);
+            this.spaceship.getWarpDrive().increaseTargetThrottle(0.5 * deltaTime * SpaceShipControlsInputs.map.throttle.value);
         }
 
         if (!this.spaceship.isLanded()) {
-            roll(this.getTransform(), inputRoll * deltaTime);
-            pitch(this.getTransform(), inputPitch * deltaTime);
+            roll(this.getTransform(), 2.0 * inputRoll * deltaTime);
+            pitch(this.getTransform(), 2.0 * inputPitch * deltaTime);
         }
 
         // camera shake
diff --git a/src/ts/spaceship/spaceShipControlsInputs.ts b/src/ts/spaceship/spaceShipControlsInputs.ts
index e5a49875e..fc01904c7 100644
--- a/src/ts/spaceship/spaceShipControlsInputs.ts
+++ b/src/ts/spaceship/spaceShipControlsInputs.ts
@@ -2,7 +2,6 @@ import Action from "@brianchirls/game-input/Action";
 import PressInteraction from "@brianchirls/game-input/interactions/PressInteraction";
 import { InputDevices } from "../inputs/devices";
 import { AxisComposite } from "@brianchirls/game-input/browser";
-import { InputMaps } from "../inputs/inputMaps";
 import { InputMap } from "../inputs/inputMap";
 
 const gamepad = InputDevices.GAMEPAD;
@@ -21,7 +20,7 @@ const upDown = new AxisComposite({
 });
 
 const upDownAction = new Action({
-    bindings: [upDown],
+    bindings: [upDown]
 });
 
 const throttle = new AxisComposite({
@@ -53,30 +52,17 @@ const rollPitch = new Action({
 
             // dead zone
             const deadZone = 0.1;
-            if (Math.abs(pointerX) < deadZone) {
-                pointerX = 0;
-            }
-            if (Math.abs(pointerY) < deadZone) {
-                pointerY = 0;
-            }
 
-            // logarithmic scale
-            pointerX = Math.sign(pointerX) * Math.log(1 + Math.abs(pointerX));
-            pointerY = Math.sign(pointerY) * Math.log(1 + Math.abs(pointerY));
+            pointerX = Math.sign(pointerX) * Math.max(0, Math.abs(pointerX) - deadZone) ** 2;
+            pointerY = Math.sign(pointerY) * Math.max(0, Math.abs(pointerY) - deadZone) ** 2;
 
             return [pointerX, pointerY];
         }
     ]
 });
 
-const toggleFlightAssist = new Action({
-    bindings: [keyboard.getControl("KeyF")]
-});
-
-const toggleFlightAssistInteraction = new PressInteraction(toggleFlightAssist);
-
 const toggleWarpDrive = new Action({
-    bindings: [keyboard.getControl("KeyH")],
+    bindings: [keyboard.getControl("KeyH")]
 });
 
 const toggleWarpDriveInteraction = new PressInteraction(toggleWarpDrive);
@@ -92,23 +78,21 @@ const throttleToZero = new Action({
 const throttleToZeroInteraction = new PressInteraction(throttleToZero);
 
 export const SpaceShipControlsInputs = new InputMap<{
-    landing: PressInteraction,
-    upDown: Action<number>,
-    throttle: Action<number>,
-    rollPitch: Action<[number, number]>,
-    toggleFlightAssist: PressInteraction,
-    toggleWarpDrive: PressInteraction,
-    ignorePointer: Action<number>,
-    throttleToZero: PressInteraction
+    landing: PressInteraction;
+    upDown: Action<number>;
+    throttle: Action<number>;
+    rollPitch: Action<[number, number]>;
+    toggleWarpDrive: PressInteraction;
+    ignorePointer: Action<number>;
+    throttleToZero: PressInteraction;
 }>("SpaceShipInputs", {
     landing: landingInteraction,
     upDown: upDownAction,
     throttle: throttleAction,
     rollPitch: rollPitch,
-    toggleFlightAssist: toggleFlightAssistInteraction,
     toggleWarpDrive: toggleWarpDriveInteraction,
     ignorePointer: ignorePointer,
     throttleToZero: throttleToZeroInteraction
 });
 
-InputMaps.push(SpaceShipControlsInputs);
\ No newline at end of file
+SpaceShipControlsInputs.setEnabled(false);
\ No newline at end of file
diff --git a/src/ts/spaceship/spaceship.ts b/src/ts/spaceship/spaceship.ts
index 2c5eaf64b..214b250e4 100644
--- a/src/ts/spaceship/spaceship.ts
+++ b/src/ts/spaceship/spaceship.ts
@@ -55,8 +55,6 @@ export class Spaceship implements Transformable {
     readonly aggregate: PhysicsAggregate;
     private readonly collisionObservable: Observable<IPhysicsCollisionEvent>;
 
-    private flightAssistEnabled = true;
-
     private readonly warpDrive = new WarpDrive(false);
 
     private mainEngineThrottle = 0;
@@ -87,11 +85,15 @@ export class Spaceship implements Transformable {
     readonly disableWarpDriveSound: AudioInstance;
     readonly acceleratingWarpDriveSound: AudioInstance;
     readonly deceleratingWarpDriveSound: AudioInstance;
+    readonly hyperSpaceSound: AudioInstance;
     readonly thrusterSound: AudioInstance;
 
     readonly onWarpDriveEnabled = new Observable<void>();
     readonly onWarpDriveDisabled = new Observable<void>();
 
+    readonly onLandingEngaged = new Observable<void>();
+    readonly onLandingObservable = new Observable<void>();
+
     constructor(scene: Scene) {
         this.instanceRoot = Assets.CreateWandererInstance();
         setRotationQuaternion(this.instanceRoot, Quaternion.Identity());
@@ -106,7 +108,7 @@ export class Spaceship implements Transformable {
             scene
         );
         for (const child of this.instanceRoot.getChildMeshes()) {
-            if(child.name.includes("mainThruster")) {
+            if (child.name.includes("mainThruster")) {
                 const mainThruster = new MainThruster(child, getForwardDirection(this.instanceRoot).negate(), this.aggregate);
                 this.mainThrusters.push(mainThruster);
                 continue;
@@ -117,6 +119,7 @@ export class Spaceship implements Transformable {
             this.aggregate.shape.addChildFromParent(this.instanceRoot, childShape, child);
         }
         this.aggregate.body.disablePreStep = false;
+        this.aggregate.body.setAngularDamping(0.9);
 
         this.aggregate.body.setCollisionCallbackEnabled(true);
 
@@ -136,17 +139,20 @@ export class Spaceship implements Transformable {
         this.disableWarpDriveSound = new AudioInstance(Assets.DISABLE_WARP_DRIVE_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 1, true, this.getTransform());
         this.acceleratingWarpDriveSound = new AudioInstance(Assets.ACCELERATING_WARP_DRIVE_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 0, false, this.getTransform());
         this.deceleratingWarpDriveSound = new AudioInstance(Assets.DECELERATING_WARP_DRIVE_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 0, false, this.getTransform());
+        this.hyperSpaceSound = new AudioInstance(Assets.HYPER_SPACE_SOUND, AudioMasks.HYPER_SPACE, 0.0, false, this.getTransform());
         this.thrusterSound = new AudioInstance(Assets.THRUSTER_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 0, false, this.getTransform());
 
         AudioManager.RegisterSound(this.enableWarpDriveSound);
         AudioManager.RegisterSound(this.disableWarpDriveSound);
         AudioManager.RegisterSound(this.acceleratingWarpDriveSound);
         AudioManager.RegisterSound(this.deceleratingWarpDriveSound);
+        AudioManager.RegisterSound(this.hyperSpaceSound);
         AudioManager.RegisterSound(this.thrusterSound);
 
         this.thrusterSound.sound.play();
         this.acceleratingWarpDriveSound.sound.play();
         this.deceleratingWarpDriveSound.sound.play();
+        this.hyperSpaceSound.sound.play();
 
         this.scene = scene;
     }
@@ -206,14 +212,6 @@ export class Spaceship implements Transformable {
         return this.warpDrive;
     }
 
-    public setFlightAssistEnabled(enabled: boolean) {
-        this.flightAssistEnabled = enabled;
-    }
-
-    public getFlightAssistEnabled(): boolean {
-        return this.flightAssistEnabled;
-    }
-
     /**
      * Returns the speed of the ship in m/s
      * If warp drive is enabled, returns the warp speed
@@ -221,11 +219,11 @@ export class Spaceship implements Transformable {
      * @returns The speed of the ship in m/s
      */
     public getSpeed(): number {
-        return this.warpDrive.isEnabled() ? this.warpDrive.getWarpSpeed() : this.aggregate.body.getLinearVelocity().length();
+        return this.warpDrive.isEnabled() ? this.warpDrive.getWarpSpeed() : this.aggregate.body.getLinearVelocity().dot(getForwardDirection(this.getTransform()));
     }
 
     public getThrottle(): number {
-        return this.warpDrive.isEnabled() ? this.warpDrive.getTargetThrottle() : this.mainEngineThrottle;
+        return this.warpDrive.isEnabled() ? this.warpDrive.getThrottle() : this.mainEngineThrottle;
     }
 
     public increaseMainEngineThrottle(delta: number) {
@@ -244,7 +242,8 @@ export class Spaceship implements Transformable {
         if (this.landingTarget === null) {
             throw new Error("Landing target is null");
         }
-        console.log("landing on", this.landingTarget.getTransform().name);
+
+        this.onLandingEngaged.notifyObservers();
     }
 
     public engageLandingOnPad(landingPad: LandingPad) {
@@ -259,6 +258,8 @@ export class Spaceship implements Transformable {
         this.state = ShipState.LANDED;
         this.aggregate.body.setMotionType(PhysicsMotionType.STATIC);
         this.landingTarget = null;
+
+        this.onLandingObservable.notifyObservers();
     }
 
     public isLanded(): boolean {
@@ -352,12 +353,12 @@ export class Spaceship implements Transformable {
 
             const otherSpeed = linearVelocity.subtract(forwardDirection.scale(forwardSpeed));
 
-            if(this.mainEngineThrottle !== 0) this.thrusterSound.setTargetVolume(1);
+            if (this.mainEngineThrottle !== 0) this.thrusterSound.setTargetVolume(1);
             else this.thrusterSound.setTargetVolume(0);
 
-            if(forwardSpeed < this.mainEngineTargetSpeed) {
+            if (forwardSpeed < this.mainEngineTargetSpeed) {
                 this.aggregate.body.applyForce(forwardDirection.scale(3000), this.aggregate.body.getObjectCenterWorld());
-                this.mainThrusters.forEach(thruster => {
+                this.mainThrusters.forEach((thruster) => {
                     thruster.setThrottle(this.mainEngineThrottle);
                 });
             } else {
@@ -375,7 +376,7 @@ export class Spaceship implements Transformable {
             this.acceleratingWarpDriveSound.setTargetVolume(0);
             this.deceleratingWarpDriveSound.setTargetVolume(0);
         } else {
-            this.mainThrusters.forEach(thruster => {
+            this.mainThrusters.forEach((thruster) => {
                 thruster.setThrottle(0);
             });
 
@@ -392,23 +393,24 @@ export class Spaceship implements Transformable {
             }
         }
 
-        this.mainThrusters.forEach(thruster => {
+        this.mainThrusters.forEach((thruster) => {
             thruster.update(deltaTime);
         });
 
-        if (this.flightAssistEnabled) {
-            this.aggregate.body.setAngularDamping(0.9);
-        } else {
-            //FIXME: for some reason, the angular damping is not working
-            this.aggregate.body.setAngularDamping(1);
-        }
-
         if (this.state === ShipState.LANDING) {
             this.land(deltaTime);
         }
     }
 
     public dispose() {
+        AudioManager.DisposeSound(this.enableWarpDriveSound);
+        AudioManager.DisposeSound(this.disableWarpDriveSound);
+        AudioManager.DisposeSound(this.acceleratingWarpDriveSound);
+        AudioManager.DisposeSound(this.deceleratingWarpDriveSound);
+        AudioManager.DisposeSound(this.thrusterSound);
+
+        this.warpTunnel.dispose();
+        this.hyperSpaceTunnel.dispose();
         this.aggregate.dispose();
         this.instanceRoot.dispose();
     }
diff --git a/src/ts/spaceship/warpDrive.ts b/src/ts/spaceship/warpDrive.ts
index 49a71ad6a..0dbcdc3b9 100644
--- a/src/ts/spaceship/warpDrive.ts
+++ b/src/ts/spaceship/warpDrive.ts
@@ -17,6 +17,7 @@
 
 import { Settings } from "../settings";
 import { clamp } from "../utils/math";
+import { moveTowards } from "../utils/moveTowards";
 
 enum WarpDriveState {
     /**
@@ -69,21 +70,14 @@ export interface ReadonlyWarpDrive {
      * Returns the current target throttle of the warp drive.
      * @returns The current target throttle of the warp drive.
      */
-    getTargetThrottle(): number;
-
-    /**
-     * Returns the current internal throttle of the warp drive.
-     * @returns The current internal throttle of the warp drive.
-     */
-    getInternalThrottle(): number;
+    getThrottle(): number;
 }
 
 export class WarpDrive implements ReadonlyWarpDrive {
     /**
-     * Internal throttle of the warp drive. It is a value between 0 and 1. It defines the current speed ratio with the target speed.
-     * (0 means that the ship is not moving, 1 means that the ship is moving at the target speed)
+     * The throttle lags behind the target throttle. Hence, the current throttle is not equal to the target throttle.
      */
-    private internalThrottle = 0;
+    private currentThrottle = 0;
 
     /**
      * User throttle of the warp drive. It is a value between 0 and 1. It constrains the target speed of the warp drive.
@@ -92,9 +86,9 @@ export class WarpDrive implements ReadonlyWarpDrive {
     private targetThrottle = 1;
 
     /**
-     * Acceleration of the internal throtle.
+     * Speed at which the throttle catches up to the target throttle.
      */
-    private readonly internalThrottleAcceleration = 0.04;
+    private readonly throttleUpdateSpeed = 0.2;
 
     /**
      * Maximum speed of the warp drive in m/s. It can be reached when the ship is far from any body and the user throttle is set to 1.
@@ -142,7 +136,7 @@ export class WarpDrive implements ReadonlyWarpDrive {
     private disable(): void {
         this.state = WarpDriveState.DISABLED;
         this.targetSpeed = 0;
-        this.internalThrottle = 0;
+        this.currentThrottle = 0;
         this.currentSpeed = 0;
     }
 
@@ -180,38 +174,25 @@ export class WarpDrive implements ReadonlyWarpDrive {
         this.targetThrottle = clamp(this.targetThrottle + delta, 0, 1);
     }
 
-    /**
-     * Increases the internal throttle by the given delta and clamps it between 0 and 1.
-     * @param delta The delta to apply to the internal throttle.
-     */
-    private increaseInternalThrottle(delta: number): void {
-        this.internalThrottle = clamp(this.internalThrottle + delta, 0, this.targetThrottle);
-    }
-
     public getWarpSpeed(): number {
         return this.currentSpeed;
     }
 
-    public getTargetThrottle(): number {
+    public getThrottle(): number {
         return this.targetThrottle;
     }
 
-    public getInternalThrottle(): number {
-        return this.internalThrottle;
-    }
-
     /**
      * Updates the current speed of the warp drive speed based on the current speed of the ship and the target speed.
      * @param currentForwardSpeed The current speed of the warp drive projected on the forward direction of the ship.
      * @param deltaTime The time elapsed since the last update in seconds.
      */
     private updateWarpDriveSpeed(currentForwardSpeed: number, deltaTime: number): void {
-        const sign = Math.sign(this.targetSpeed - currentForwardSpeed);
+        const deltaThrottle = this.throttleUpdateSpeed * deltaTime;
 
-        const deltaThrottle = this.internalThrottleAcceleration * deltaTime;
-        this.increaseInternalThrottle(deltaThrottle * sign);
+        this.currentThrottle = moveTowards(this.currentThrottle, this.targetThrottle, deltaThrottle);
 
-        this.currentSpeed = Math.max(WarpDrive.MIN_SPEED, this.internalThrottle * this.targetSpeed);
+        this.currentSpeed = Math.max(WarpDrive.MIN_SPEED, this.currentThrottle * this.targetSpeed);
     }
 
     /**
@@ -235,7 +216,7 @@ export class WarpDrive implements ReadonlyWarpDrive {
             case WarpDriveState.DISABLED:
                 this.targetSpeed = 0;
                 this.currentSpeed = 0;
-                this.internalThrottle = 0;
+                this.currentThrottle = 0;
                 break;
         }
     }
diff --git a/src/ts/spaceshipExtended/physicsSpaceshipInputs.ts b/src/ts/spaceshipExtended/physicsSpaceshipInputs.ts
index 9911a5889..86937a9aa 100644
--- a/src/ts/spaceshipExtended/physicsSpaceshipInputs.ts
+++ b/src/ts/spaceshipExtended/physicsSpaceshipInputs.ts
@@ -4,14 +4,14 @@ import { InputDevices } from "../inputs/devices";
 const keyboard = InputDevices.KEYBOARD;
 
 const upAction = new Action({
-  bindings: [keyboard.getControl("Space")]
+    bindings: [keyboard.getControl("Space")]
 });
 
 const forwardAction = new Action({
-  bindings: [keyboard.getControl("KeyW")]
+    bindings: [keyboard.getControl("KeyW")]
 });
 
 export const PhysicsSpaceShipControlsInputs = {
-  up: upAction,
-  forward: forwardAction
+    up: upAction,
+    forward: forwardAction
 };
diff --git a/src/ts/spacestation/spaceStation.ts b/src/ts/spacestation/spaceStation.ts
index c92202142..2eec86115 100644
--- a/src/ts/spacestation/spaceStation.ts
+++ b/src/ts/spacestation/spaceStation.ts
@@ -29,13 +29,13 @@ import { OrbitProperties } from "../orbit/orbitProperties";
 import { Vector3 } from "@babylonjs/core/Maths/math.vector";
 import { OrbitalObjectPhysicalProperties } from "../architecture/physicalProperties";
 import { PhysicsAggregate } from "@babylonjs/core/Physics/v2/physicsAggregate";
-import { PhysicsMotionType, PhysicsShapeType } from "@babylonjs/core";
 import { LandingPad } from "../landingPad/landingPad";
 import { PhysicsShapeConvexHull, PhysicsShapeMesh } from "@babylonjs/core/Physics/v2/physicsShape";
 import { Mesh } from "@babylonjs/core/Meshes/mesh";
 import { LockConstraint } from "@babylonjs/core/Physics/v2/physicsConstraint";
 import { CollisionMask } from "../settings";
 import { CelestialBody } from "../architecture/celestialBody";
+import { PhysicsMotionType, PhysicsShapeType } from "@babylonjs/core/Physics/v2/IPhysicsEnginePlugin";
 
 export class SpaceStation implements OrbitalObject, Cullable {
     readonly name: string;
diff --git a/src/ts/starSystem/starSystemController.ts b/src/ts/starSystem/starSystemController.ts
index 14150f70c..4d2d439c8 100644
--- a/src/ts/starSystem/starSystemController.ts
+++ b/src/ts/starSystem/starSystemController.ts
@@ -37,13 +37,12 @@ import { OrbitalObject } from "../architecture/orbitalObject";
 import { CelestialBody } from "../architecture/celestialBody";
 import { StellarObject } from "../architecture/stellarObject";
 import { Planet } from "../architecture/planet";
+import { SystemTarget } from "../utils/systemTarget";
 
 export class StarSystemController {
     readonly scene: UberScene;
 
-    readonly postProcessManager: PostProcessManager;
-
-    private readonly universeRotation: Quaternion = Quaternion.Identity();
+    readonly universeRotation: Quaternion = Quaternion.Identity();
 
     private readonly orbitalObjects: OrbitalObject[] = [];
 
@@ -76,6 +75,11 @@ export class StarSystemController {
      */
     readonly mandelbulbs: Mandelbulb[] = [];
 
+    /**
+     * The list of all system targets in the system
+     */
+    private systemTargets: SystemTarget[] = [];
+
     /**
      * The model of the star system that describes it and generates the randomness
      */
@@ -87,7 +91,6 @@ export class StarSystemController {
 
     constructor(model: StarSystemModel | SystemSeed, scene: UberScene) {
         this.scene = scene;
-        this.postProcessManager = new PostProcessManager(this.scene);
 
         this.model = model instanceof StarSystemModel ? model : new StarSystemModel(model);
     }
@@ -157,6 +160,7 @@ export class StarSystemController {
      */
     public translateEverythingNow(displacement: Vector3): void {
         for (const object of this.orbitalObjects) translate(object.getTransform(), displacement);
+        this.systemTargets.forEach((target) => translate(target.getTransform(), displacement));
     }
 
     /**
@@ -187,7 +191,7 @@ export class StarSystemController {
 
         smallerDistance = -1;
         for (const spacestation of this.spaceStations) {
-            const distance = spacestation.getTransform().getAbsolutePosition().subtract(position).length() - spacestation.getBoundingRadius() * 10;
+            const distance = spacestation.getTransform().getAbsolutePosition().subtract(position).length() - spacestation.getBoundingRadius() * 100;
             if (distance < smallerDistance && distance < 0) {
                 nearest = spacestation;
                 smallerDistance = distance;
@@ -255,7 +259,7 @@ export class StarSystemController {
     /**
      * Inits the post processes and moves the system forward in time to the current time (it is additive)
      */
-    public initPositions(nbWarmUpUpdates: number, chunkForge: ChunkForge): void {
+    public initPositions(nbWarmUpUpdates: number, chunkForge: ChunkForge, postProcessManager: PostProcessManager): void {
         for (const object of this.orbitalObjects) {
             const orbit = object.getOrbitProperties();
             const displacement = new Vector3(orbit.radius, 0, 0);
@@ -267,66 +271,67 @@ export class StarSystemController {
             translate(object.getTransform(), displacement);
         }
 
-        this.update(Date.now() / 1000, chunkForge);
-        for (let i = 0; i < nbWarmUpUpdates; i++) this.update(1, chunkForge);
+        this.update(Date.now() / 1000, chunkForge, postProcessManager);
+        for (let i = 0; i < nbWarmUpUpdates; i++) this.update(1, chunkForge, postProcessManager);
     }
 
     /**
      * Inits the post processes of all the bodies in the system
+     * This method cannot be awaited as its completion depends on the execution of BabylonJS that happens afterward.
      */
-    public async initPostProcesses() {
+    public async initPostProcesses(postProcessManager: PostProcessManager): Promise<void> {
         const promises: Promise<void>[] = [];
 
-        this.postProcessManager.addStarField(this.stellarObjects, this.celestialBodies, this.universeRotation);
+        postProcessManager.addStarField(this.stellarObjects, this.celestialBodies, this.universeRotation);
         for (const object of this.celestialBodies) {
             for (const postProcess of object.postProcesses) {
                 switch (postProcess) {
                     case PostProcessType.RING:
-                        promises.push(this.postProcessManager.addRings(object, this.stellarObjects));
+                        promises.push(postProcessManager.addRings(object, this.stellarObjects));
                         break;
                     case PostProcessType.ATMOSPHERE:
                         if (!(object instanceof GasPlanet) && !(object instanceof TelluricPlanet))
                             throw new Error("Atmosphere post process can only be added to gas or telluric planets. Source:" + object.name);
-                        this.postProcessManager.addAtmosphere(object as GasPlanet | TelluricPlanet, this.stellarObjects);
+                        postProcessManager.addAtmosphere(object as GasPlanet | TelluricPlanet, this.stellarObjects);
                         break;
                     case PostProcessType.CLOUDS:
                         if (!(object instanceof TelluricPlanet)) throw new Error("Clouds post process can only be added to telluric planets. Source:" + object.name);
-                        promises.push(this.postProcessManager.addClouds(object as TelluricPlanet, this.stellarObjects));
+                        promises.push(postProcessManager.addClouds(object as TelluricPlanet, this.stellarObjects));
                         break;
                     case PostProcessType.OCEAN:
                         if (!(object instanceof TelluricPlanet)) throw new Error("Ocean post process can only be added to telluric planets. Source:" + object.name);
-                        this.postProcessManager.addOcean(object as TelluricPlanet, this.stellarObjects);
+                        postProcessManager.addOcean(object as TelluricPlanet, this.stellarObjects);
                         break;
                     case PostProcessType.VOLUMETRIC_LIGHT:
                         if (!(object instanceof Star) && !(object instanceof NeutronStar))
                             throw new Error("Volumetric light post process can only be added to stars and neutron stars. Source:" + object.name);
-                        this.postProcessManager.addVolumetricLight(object);
+                        postProcessManager.addVolumetricLight(object);
                         break;
                     case PostProcessType.MANDELBULB:
                         if (!(object instanceof Mandelbulb)) throw new Error("Mandelbulb post process can only be added to mandelbulbs. Source:" + object.name);
-                        this.postProcessManager.addMandelbulb(object as Mandelbulb, this.stellarObjects);
+                        postProcessManager.addMandelbulb(object as Mandelbulb, this.stellarObjects);
                         break;
                     case PostProcessType.BLACK_HOLE:
                         if (!(object instanceof BlackHole)) throw new Error("Black hole post process can only be added to black holes. Source:" + object.name);
-                        this.postProcessManager.addBlackHole(object as BlackHole, this.universeRotation);
+                        postProcessManager.addBlackHole(object as BlackHole, this.universeRotation);
                         break;
                     case PostProcessType.MATTER_JETS:
                         if (!(object instanceof NeutronStar)) throw new Error("Matter jets post process can only be added to neutron stars. Source:" + object.name);
-                        this.postProcessManager.addMatterJet(object as NeutronStar);
+                        postProcessManager.addMatterJet(object as NeutronStar);
                         break;
                     case PostProcessType.SHADOW:
-                        promises.push(this.postProcessManager.addShadowCaster(object, this.stellarObjects));
+                        promises.push(postProcessManager.addShadowCaster(object, this.stellarObjects));
                         break;
                     case PostProcessType.LENS_FLARE:
-                        this.postProcessManager.addLensFlare(object as StellarObject);
+                        postProcessManager.addLensFlare(object as StellarObject);
                         break;
                 }
             }
         }
 
         return Promise.all(promises).then(() => {
-            this.postProcessManager.setBody(this.getNearestCelestialBody(this.scene.getActiveCamera().globalPosition));
-            this.postProcessManager.init();
+            postProcessManager.setBody(this.getNearestCelestialBody(this.scene.getActiveCamera().globalPosition));
+            postProcessManager.rebuild();
         });
     }
 
@@ -335,9 +340,10 @@ export class StarSystemController {
      * The nearest object is kept in place and the other objects are updated accordingly.
      * @param deltaTime The time elapsed since the last update
      * @param chunkForge The chunk forge used to update the LOD of the telluric planets
+     * @param postProcessManager
      */
-    public update(deltaTime: number, chunkForge: ChunkForge): void {
-        const controller = this.scene.getActiveController();
+    public update(deltaTime: number, chunkForge: ChunkForge, postProcessManager: PostProcessManager): void {
+        const controller = this.scene.getActiveControls();
         this.computeNearestOrbitalObject(controller.getActiveCamera().globalPosition);
         this.computeClosestToScreenCenterOrbitalObject();
 
@@ -377,6 +383,10 @@ export class StarSystemController {
                 rotateAround(object.getTransform(), nearestBody.getTransform().getAbsolutePosition(), nearestBody.getRotationAxis(), -dthetaNearest);
             }
 
+            this.systemTargets.forEach((target) => {
+                rotateAround(target.getTransform(), nearestBody.getTransform().getAbsolutePosition(), nearestBody.getRotationAxis(), -dthetaNearest);
+            });
+
             // the starfield is rotated to give the impression the nearest body is rotating, which is only an illusion
             const starfieldAdditionalRotation = Quaternion.RotationAxis(nearestBody.getRotationAxis(), dthetaNearest);
             this.universeRotation.copyFrom(starfieldAdditionalRotation.multiply(this.universeRotation));
@@ -400,6 +410,10 @@ export class StarSystemController {
                 // the body is translated so that the nearest body can stay in place
                 translate(object.getTransform(), negatedDisplacement);
             }
+
+            this.systemTargets.forEach((target) => {
+                translate(target.getTransform(), negatedDisplacement);
+            });
         } else {
             // if we don't compensate the translation of the nearest body, we must simply update its position
             translate(nearestBody.getTransform(), nearestBodyDisplacement);
@@ -435,11 +449,11 @@ export class StarSystemController {
         // floating origin
         this.applyFloatingOrigin();
 
-        this.updateShaders(deltaTime);
+        this.updateShaders(deltaTime, postProcessManager);
     }
 
     public applyFloatingOrigin() {
-        const controller = this.scene.getActiveController();
+        const controller = this.scene.getActiveControls();
         if (controller.getActiveCamera().globalPosition.length() > 500) {
             const displacementTranslation = controller.getTransform().getAbsolutePosition().negate();
             this.translateEverythingNow(displacementTranslation);
@@ -450,9 +464,10 @@ export class StarSystemController {
     /**
      * Updates the shaders of all the bodies in the system with the given delta time
      * @param deltaTime The time elapsed in seconds since the last update
+     * @param postProcessManager
      */
-    public updateShaders(deltaTime: number) {
-        const controller = this.scene.getActiveController();
+    public updateShaders(deltaTime: number, postProcessManager: PostProcessManager) {
+        const controller = this.scene.getActiveControls();
         const nearestBody = this.getNearestCelestialBody(this.scene.getActiveCamera().globalPosition);
 
         for (const planet of this.planets) {
@@ -463,16 +478,38 @@ export class StarSystemController {
             if (stellarObject instanceof Star) stellarObject.updateMaterial(deltaTime);
         }
 
-        this.postProcessManager.setBody(nearestBody);
-        this.postProcessManager.update(deltaTime);
+        postProcessManager.setBody(nearestBody);
+        postProcessManager.update(deltaTime);
+    }
+
+    addSystemTarget(seed: SystemSeed, systemDirection: Vector3, distance: number): SystemTarget {
+        const placeholderTransform = new SystemTarget(seed, this.scene);
+        placeholderTransform.getTransform().position.copyFrom(systemDirection.scale(distance));
+
+        this.systemTargets.forEach((target) => {
+            target.dispose();
+        });
+        this.systemTargets = [placeholderTransform];
+
+        return placeholderTransform;
     }
 
     /**
      * Disposes all the bodies in the system
      */
     public dispose() {
-        this.postProcessManager.dispose();
-        for (const spacestation of this.spaceStations) spacestation.dispose();
-        for (const body of this.celestialBodies) body.dispose();
+        for (const object of this.orbitalObjects) object.dispose();
+        this.systemTargets.forEach((target) => target.dispose());
+
+        this.systemTargets = [];
+
+        this.orbitalObjects.length = 0;
+        this.spaceStations.length = 0;
+        this.celestialBodies.length = 0;
+        this.stellarObjects.length = 0;
+        this.planets.length = 0;
+        this.telluricPlanets.length = 0;
+        this.gasPlanets.length = 0;
+        this.mandelbulbs.length = 0;
     }
 }
diff --git a/src/ts/starSystem/starSystemHelper.ts b/src/ts/starSystem/starSystemHelper.ts
index 2101299f2..ba8ba1b97 100644
--- a/src/ts/starSystem/starSystemHelper.ts
+++ b/src/ts/starSystem/starSystemHelper.ts
@@ -40,7 +40,7 @@ import { CelestialBody } from "../architecture/celestialBody";
 export class StarSystemHelper {
     public static MakeStar(starsystem: StarSystemController, model?: number | StarModel): Star {
         if (model === undefined) {
-            model = starsystem.model.getStarSeed(starsystem.stellarObjects.length);
+            model = starsystem.model.getStellarObjectSeed(starsystem.stellarObjects.length);
         }
         const name = starName(starsystem.model.getName(), starsystem.stellarObjects.length);
         const star = new Star(name, starsystem.scene, model, starsystem.stellarObjects[0]);
@@ -63,7 +63,10 @@ export class StarSystemHelper {
      * @param starsystem
      * @param model The model or seed to use for the planet generation (by default, the next available seed planned by the system model)
      */
-    public static MakeBlackHole(starsystem: StarSystemController, model: number | BlackHoleModel = starsystem.model.getStarSeed(starsystem.stellarObjects.length)): BlackHole {
+    public static MakeBlackHole(
+        starsystem: StarSystemController,
+        model: number | BlackHoleModel = starsystem.model.getStellarObjectSeed(starsystem.stellarObjects.length)
+    ): BlackHole {
         const name = starName(starsystem.model.getName(), starsystem.stellarObjects.length);
         const blackHole = new BlackHole(name, starsystem.scene, model, starsystem.stellarObjects.length > 0 ? starsystem.stellarObjects[0] : null);
         starsystem.addStellarObject(blackHole);
@@ -72,12 +75,12 @@ export class StarSystemHelper {
 
     public static MakeNeutronStar(
         starsystem: StarSystemController,
-        model: number | NeutronStarModel = starsystem.model.getStarSeed(starsystem.stellarObjects.length)
+        model: number | NeutronStarModel = starsystem.model.getStellarObjectSeed(starsystem.stellarObjects.length)
     ): NeutronStar {
-        if (starsystem.stellarObjects.length >= starsystem.model.getNbStars())
+        if (starsystem.stellarObjects.length >= starsystem.model.getNbStellarObjects())
             console.warn(`You are adding a neutron star
         to a system that already has ${starsystem.stellarObjects.length} stars.
-        The capacity of the generator was supposed to be ${starsystem.model.getNbStars()} starsystem is not a problem, but it may be.`);
+        The capacity of the generator was supposed to be ${starsystem.model.getNbStellarObjects()} starsystem is not a problem, but it may be.`);
         const name = starName(starsystem.model.getName(), starsystem.stellarObjects.length);
         const neutronStar = new NeutronStar(name, starsystem.scene, model, starsystem.stellarObjects.length > 0 ? starsystem.stellarObjects[0] : null);
 
@@ -90,8 +93,8 @@ export class StarSystemHelper {
      * @param starsystem
      * @param seed The seed to use for the star generation (by default, the next available seed planned by the system model)
      */
-    public static MakeStellarObject(starsystem: StarSystemController, seed: number = starsystem.model.getStarSeed(starsystem.stellarObjects.length)): StellarObject {
-        const stellarObjectType = starsystem.model.getBodyTypeOfStar(starsystem.stellarObjects.length);
+    public static MakeStellarObject(starsystem: StarSystemController, seed: number = starsystem.model.getStellarObjectSeed(starsystem.stellarObjects.length)): StellarObject {
+        const stellarObjectType = starsystem.model.getBodyTypeOfStellarObject(starsystem.stellarObjects.length);
         if (stellarObjectType === BodyType.BLACK_HOLE) {
             const blackHole = StarSystemHelper.MakeBlackHole(starsystem, seed);
             StarSystemHelper.MakeSpaceStations(starsystem, blackHole);
@@ -114,7 +117,7 @@ export class StarSystemHelper {
      * @param starsystem
      * @param n The number of stars to make (by default, the number of stars planned by the system model)
      */
-    public static MakeStellarObjects(starsystem: StarSystemController, n = starsystem.model.getNbStars()): void {
+    public static MakeStellarObjects(starsystem: StarSystemController, n = starsystem.model.getNbStellarObjects()): void {
         if (n < 1) throw new Error("Cannot make less than 1 star");
         for (let i = 0; i < n; i++) StarSystemHelper.MakeStellarObject(starsystem);
     }
@@ -149,27 +152,40 @@ export class StarSystemHelper {
         console.assert(n >= 0, `Cannot make a negative amount of planets : ${n}`);
 
         for (let i = 0; i < n; i++) {
-            const bodyType = starsystem.model.getBodyTypeOfPlanet(starsystem.planets.length);
-            if (bodyType === BodyType.TELLURIC_PLANET) {
-                const planet = StarSystemHelper.MakeTelluricPlanet(starsystem);
-                StarSystemHelper.MakeSatellites(starsystem, planet);
-                StarSystemHelper.MakeSpaceStations(starsystem, planet);
-            } else if (bodyType === BodyType.GAS_PLANET) {
-                const planet = StarSystemHelper.MakeGasPlanet(starsystem);
-                StarSystemHelper.MakeSatellites(starsystem, planet);
-                StarSystemHelper.MakeSpaceStations(starsystem, planet);
-            } else {
-                throw new Error(`Unknown body type ${bodyType}`);
-            }
+            this.MakePlanet(starsystem);
+        }
+    }
+
+    public static MakePlanet(starsystem: StarSystemController) {
+        const bodyType = starsystem.model.getBodyTypeOfPlanet(starsystem.planets.length);
+        if (bodyType === BodyType.TELLURIC_PLANET) {
+            const planet = StarSystemHelper.MakeTelluricPlanet(starsystem);
+            StarSystemHelper.MakeSatellites(starsystem, planet);
+            StarSystemHelper.MakeSpaceStations(starsystem, planet);
+        } else if (bodyType === BodyType.GAS_PLANET) {
+            const planet = StarSystemHelper.MakeGasPlanet(starsystem);
+            StarSystemHelper.MakeSatellites(starsystem, planet);
+            StarSystemHelper.MakeSpaceStations(starsystem, planet);
+        } else {
+            throw new Error(`Unknown body type ${bodyType}`);
         }
     }
 
-    public static MakeSpaceStations(starsystem: StarSystemController, body: CelestialBody, n = body.model.getNbSpaceStations()): void {
+    public static MakeSpaceStation(starsystem: StarSystemController, body: CelestialBody): SpaceStation {
+        const spacestation = new SpaceStation(starsystem.scene, body);
+        starsystem.addSpaceStation(spacestation);
+        return spacestation;
+    }
+
+    public static MakeSpaceStations(starsystem: StarSystemController, body: CelestialBody, n = body.model.getNbSpaceStations()): SpaceStation[] {
         console.assert(n >= 0, `Cannot make a negative amount of space stations : ${n}`);
+        const spaceStations = [];
         for (let i = 0; i < n; i++) {
-            const spacestation = new SpaceStation(starsystem.scene, body);
-            starsystem.addSpaceStation(spacestation);
+            const spacestation = StarSystemHelper.MakeSpaceStation(starsystem, body);
+            spaceStations.push(spacestation);
         }
+
+        return spaceStations;
     }
 
     public static MakeSatellite(
@@ -192,7 +208,7 @@ export class StarSystemHelper {
      * @param planet The planet to make satellites for
      * @param n The number of satellites to make
      */
-    public static MakeSatellites(starsystem: StarSystemController, planet: Planet, n = planet.model.nbMoons): void {
+    public static MakeSatellites(starsystem: StarSystemController, planet: Planet, n = planet.model.nbMoons): TelluricPlanet[] {
         if (n < 0) throw new Error(`Cannot make a negative amount of satellites : ${n}`);
         if (planet.model.childrenBodies.length + n > planet.model.nbMoons)
             console.warn(
@@ -203,14 +219,19 @@ export class StarSystemHelper {
             You can just leave starsystem argument empty to make as many as the planet had planned.`
             );
 
-        for (let i = 0; i < n; i++) StarSystemHelper.MakeSatellite(starsystem, planet, getMoonSeed(planet.model, planet.model.childrenBodies.length));
+        const satellites = [];
+        for (let i = 0; i < n; i++) {
+            satellites.push(StarSystemHelper.MakeSatellite(starsystem, planet, getMoonSeed(planet.model, planet.model.childrenBodies.length)));
+        }
+
+        return satellites;
     }
 
     /**
      * Generates the system using the seed provided in the constructor
      */
     public static Generate(starsystem: StarSystemController) {
-        StarSystemHelper.MakeStellarObjects(starsystem, starsystem.model.getNbStars());
+        StarSystemHelper.MakeStellarObjects(starsystem, starsystem.model.getNbStellarObjects());
         StarSystemHelper.MakePlanets(starsystem, starsystem.model.getNbPlanets());
     }
 }
diff --git a/src/ts/starSystem/starSystemModel.ts b/src/ts/starSystem/starSystemModel.ts
index 5109144a6..d52aea2d5 100644
--- a/src/ts/starSystem/starSystemModel.ts
+++ b/src/ts/starSystem/starSystemModel.ts
@@ -52,18 +52,18 @@ export class StarSystemModel {
         return this.name;
     }
 
-    getNbStars(): number {
+    getNbStellarObjects(): number {
         //return 1 + Math.floor(2 * this.rng(GenerationSteps.NbStars));
         return 1;
     }
 
     getNbPlanets(): number {
-        if (this.getBodyTypeOfStar(0) === BodyType.BLACK_HOLE) return 0; //Fixme: will not apply when more than one star
+        if (this.getBodyTypeOfStellarObject(0) === BodyType.BLACK_HOLE) return 0; //Fixme: will not apply when more than one star
         return randRangeInt(0, 7, this.rng, GenerationSteps.NB_PLANETS);
     }
 
-    public getStarSeed(index: number) {
-        if (index > this.getNbStars()) throw new Error("Star out of bound! " + index);
+    public getStellarObjectSeed(index: number) {
+        if (index > this.getNbStellarObjects()) throw new Error("Star out of bound! " + index);
         return centeredRand(this.rng, GenerationSteps.GENERATE_STARS + index) * Settings.SEED_HALF_RANGE;
     }
 
@@ -72,8 +72,8 @@ export class StarSystemModel {
      * @param index
      * @see https://physics.stackexchange.com/questions/442154/how-common-are-neutron-stars
      */
-    public getBodyTypeOfStar(index: number) {
-        if (index > this.getNbStars()) throw new Error("Star out of bound! " + index);
+    public getBodyTypeOfStellarObject(index: number) {
+        if (index > this.getNbStellarObjects()) throw new Error("Star out of bound! " + index);
 
         // percentages are taken from https://physics.stackexchange.com/questions/442154/how-common-are-neutron-stars
         if (uniformRandBool(0.0006, this.rng, GenerationSteps.GENERATE_STARS + index)) return BodyType.BLACK_HOLE;
diff --git a/src/ts/starSystem/starSystemView.ts b/src/ts/starSystem/starSystemView.ts
index 8ea1016ba..3d17b588b 100644
--- a/src/ts/starSystem/starSystemView.ts
+++ b/src/ts/starSystem/starSystemView.ts
@@ -42,36 +42,130 @@ import { ChunkForge } from "../planets/telluricPlanet/terrain/chunks/chunkForge"
 import { DefaultControls } from "../defaultController/defaultControls";
 import { CharacterControls } from "../spacelegs/characterControls";
 import { Assets } from "../assets";
-import { getRotationQuaternion, setRotationQuaternion } from "../uberCore/transforms/basicTransform";
+import { getForwardDirection, getRotationQuaternion, setRotationQuaternion, translate } from "../uberCore/transforms/basicTransform";
 import { Observable } from "@babylonjs/core/Misc/observable";
 import { NeutronStar } from "../stellarObjects/neutronStar/neutronStar";
 import { View } from "../utils/view";
 import { syncCamera } from "../utils/cameraSyncing";
-
+import { SystemSeed } from "../utils/systemSeed";
+import { StarSector } from "../starmap/starSector";
+import { StarMap } from "../starmap/starMap";
+import { SystemTarget } from "../utils/systemTarget";
+import { StarSystemInputs } from "../inputs/starSystemInputs";
+import { createNotification } from "../utils/notification";
+import { axisCompositeToString } from "../utils/inputControlsString";
+import { SpaceShipControlsInputs } from "../spaceship/spaceShipControlsInputs";
+import { AxisComposite } from "@brianchirls/game-input/browser";
+import { BodyType } from "../model/common";
+import { getMoonSeed } from "../planets/common";
+import { Planet } from "../architecture/planet";
+import { AudioManager } from "../audio/audioManager";
+import { AudioMasks } from "../audio/audioMasks";
+import { TransformRotationAnimation } from "../uberCore/transforms/animations/rotation";
+import { PostProcessManager } from "../postProcesses/postProcessManager";
+import { wait } from "../utils/wait";
+import { CharacterInputs } from "../spacelegs/characterControlsInputs";
+import { DefaultControlsInputs } from "../defaultController/defaultControlsInputs";
+
+/**
+ * The star system view is the part of Cosmos Journeyer responsible to display the current star system, along with the
+ * player's spaceship, character and GUI. It also handles the loading of the star system and its initialization.
+ * While the player may travel to another star system, the star system view stays the same, only the star system controller changes.
+ */
 export class StarSystemView implements View {
-    private readonly helmetOverlay: HelmetOverlay;
+    /**
+     * The HTML UI responsible for the name of the closest orbital object, the velocity of the spaceship and the target helper radar.
+     */
+    readonly helmetOverlay: HelmetOverlay;
+
+    /**
+     * A debug HTML UI to change the properties of the closest celestial body
+     */
     readonly bodyEditor: BodyEditor;
+
+    /**
+     * The BabylonJS scene, upgraded with some helper methods and properties
+     */
     readonly scene: UberScene;
 
+    /**
+     * The Havok physics plugin used inside the scene
+     */
     readonly havokPlugin: HavokPlugin;
 
+    /**
+     * The default controls are used for debug purposes. They allow to move freely between orbital objects without speed limitations.
+     * @private
+     */
     private defaultControls: DefaultControls | null = null;
+
+    /**
+     * The spaceship controls are used to control the spaceship. They allow to move the spaceship and to enable the warp drive.
+     * @private
+     */
     private spaceshipControls: ShipControls | null = null;
+
+    /**
+     * The character controls are used to control the character when out of the spaceship. They allow to move the character.
+     * @private
+     */
     private characterControls: CharacterControls | null = null;
 
+    /**
+     * A debug helper to display the orbits of the orbital objects
+     * @private
+     */
     private readonly orbitRenderer: OrbitRenderer = new OrbitRenderer();
+
+    /**
+     * A debug helper to display the axes of the orbital objects
+     * @private
+     */
     private readonly axisRenderer: AxisRenderer = new AxisRenderer();
 
+    /**
+     * The GPU accelerated GUI used to display orbital objects overlays and information when targeted.
+     */
     readonly ui: SystemUI;
 
+    /**
+     * An animation to unzoom the camera when opening the star map
+     * @private
+     */
     private static readonly UN_ZOOM_ANIMATION = new Animation("unZoom", "radius", 60, Animation.ANIMATIONTYPE_FLOAT, Animation.ANIMATIONLOOPMODE_CYCLE);
 
+    /**
+     * The controller of the current star system. This controller is unique per star system and is destroyed when the star system is changed.
+     * @private
+     */
     private starSystem: StarSystemController | null = null;
 
+    /**
+     * The chunk forge used to generate surface chunks for telluric planets. It is constant for the whole game.
+     * @private
+     */
     private readonly chunkForge: ChunkForge = new ChunkForgeWorkers(Settings.VERTEX_RESOLUTION);
 
+    /**
+     * An observable that notifies when the star system is initialized.
+     * This is when the current star system becomes playable and the post processes are initialized.
+     */
     readonly onInitStarSystem = new Observable<void>();
 
+    /**
+     * Whether the star system is currently loading or not
+     * @private
+     */
+    private isLoadingSystem = false;
+
+    readonly postProcessManager: PostProcessManager;
+
+    /**
+     * Creates an empty star system view with a scene, a gui and a havok plugin
+     * To fill it with a star system, use `loadStarSystem` and then `initStarSystem`
+     * @param engine The BabylonJS engine
+     * @param havokInstance The Havok physics instance
+     */
     constructor(engine: Engine, havokInstance: HavokPhysicsWithBindings) {
         this.helmetOverlay = new HelmetOverlay();
         this.bodyEditor = new BodyEditor(EditorVisibility.HIDDEN);
@@ -91,62 +185,162 @@ export class StarSystemView implements View {
             }
         ]);
 
-        document.addEventListener("keydown", (e) => {
-            if (e.key === "o") {
-                const enabled = !this.ui.isEnabled();
-                if (enabled) Assets.MENU_HOVER_SOUND.play();
-                else Assets.MENU_HOVER_SOUND.play();
-                this.ui.setEnabled(enabled);
+        StarSystemInputs.map.toggleOverlay.on("complete", () => {
+            const enabled = !this.ui.isEnabled();
+            if (enabled) Assets.MENU_HOVER_SOUND.play();
+            else Assets.MENU_HOVER_SOUND.play();
+            this.ui.setEnabled(enabled);
+            this.helmetOverlay.setVisibility(enabled);
+        });
+
+        StarSystemInputs.map.toggleOrbitsAndAxis.on("complete", () => {
+            const enabled = !this.orbitRenderer.isVisible();
+            if (enabled) Assets.MENU_HOVER_SOUND.play();
+            else Assets.MENU_HOVER_SOUND.play();
+            this.orbitRenderer.setVisibility(enabled);
+            this.axisRenderer.setVisibility(enabled);
+        });
+
+        StarSystemInputs.map.toggleDebugUi.on("complete", () => {
+            this.bodyEditor.setVisibility(this.bodyEditor.getVisibility() === EditorVisibility.HIDDEN ? EditorVisibility.NAVBAR : EditorVisibility.HIDDEN);
+        });
+
+        StarSystemInputs.map.cycleViews.on("complete", () => {
+            if (this.scene.getActiveControls() === this.getSpaceshipControls()) {
+                this.switchToDefaultControls();
+            } else if (this.scene.getActiveControls() === this.getDefaultControls()) {
+                this.switchToCharacterControls();
+            } else if (this.scene.getActiveControls() === this.getCharacterControls()) {
+                this.switchToSpaceshipControls();
             }
-            if (e.key === "n") {
-                const enabled = !this.orbitRenderer.isVisible();
-                if (enabled) Assets.MENU_HOVER_SOUND.play();
-                else Assets.MENU_HOVER_SOUND.play();
-                this.orbitRenderer.setVisibility(enabled);
-                this.axisRenderer.setVisibility(enabled);
+        });
+
+        StarSystemInputs.map.setTarget.on("complete", () => {
+            const closestObjectToCenter = this.getStarSystem().getClosestToScreenCenterOrbitalObject();
+
+            if (this.ui.getTarget() === closestObjectToCenter) {
+                this.helmetOverlay.setTarget(null);
+                this.ui.setTarget(null);
+                Assets.TARGET_UNLOCK_SOUND.play();
+                return;
             }
-            if (e.key === "u") this.bodyEditor.setVisibility(this.bodyEditor.getVisibility() === EditorVisibility.HIDDEN ? EditorVisibility.NAVBAR : EditorVisibility.HIDDEN);
-            if (e.key === "b") this.helmetOverlay.setVisibility(!this.helmetOverlay.isVisible());
 
-            if (e.key === "t") {
-                const closestObjectToCenter = this.getStarSystem().getClosestToScreenCenterOrbitalObject();
+            if (closestObjectToCenter === null) return;
 
-                if (this.ui.getTarget() === closestObjectToCenter) {
-                    this.helmetOverlay.setTarget(null);
-                    this.ui.setTarget(null);
-                    Assets.TARGET_UNLOCK_SOUND.play();
-                    return;
-                }
+            this.helmetOverlay.setTarget(closestObjectToCenter.getTransform());
+            this.ui.setTarget(closestObjectToCenter);
+            Assets.TARGET_LOCK_SOUND.play();
+        });
 
-                if (closestObjectToCenter === null) return;
+        StarSystemInputs.map.jumpToSystem.on("complete", async () => {
+            if (this.isLoadingSystem) return;
+            const target = this.ui.getTarget();
+            if (!(target instanceof SystemTarget)) return;
+
+            const shipControls = this.getSpaceshipControls();
+
+            // first, align spaceship with target
+            const currentForward = getForwardDirection(shipControls.getTransform());
+            const targetForward = target.getTransform().getAbsolutePosition().subtract(shipControls.getTransform().getAbsolutePosition()).normalize();
+
+            const rotationAxis = Vector3.Cross(currentForward, targetForward);
+            const rotationAngle = Vector3.GetAngleBetweenVectors(currentForward, targetForward, rotationAxis);
+
+            const rotationAnimation = new TransformRotationAnimation(shipControls.getTransform(), rotationAxis, rotationAngle, rotationAngle * 2);
+            await new Promise<void>((resolve) => {
+                const observer = this.scene.onBeforePhysicsObservable.add(() => {
+                    rotationAnimation.update(this.scene.getEngine().getDeltaTime() / 1000);
+                    if (rotationAnimation.isFinished()) {
+                        observer.remove();
+                        resolve();
+                    }
+                });
+            });
 
-                this.helmetOverlay.setTarget(closestObjectToCenter.getTransform());
-                this.ui.setTarget(closestObjectToCenter);
-                Assets.TARGET_LOCK_SOUND.play();
-            }
+            // then, initiate hyper space jump
+
+            if (!this.spaceshipControls?.spaceship.getWarpDrive().isEnabled()) this.spaceshipControls?.spaceship.enableWarpDrive();
+            this.spaceshipControls?.spaceship.hyperSpaceTunnel.setEnabled(true);
+            this.spaceshipControls?.spaceship.warpTunnel.getTransform().setEnabled(false);
+            this.spaceshipControls?.spaceship.hyperSpaceSound.setTargetVolume(1);
+            AudioManager.SetMask(AudioMasks.HYPER_SPACE);
+            const observer = this.scene.onBeforeRenderObservable.add(() => {
+                const deltaSeconds = this.scene.getEngine().getDeltaTime() / 1000;
+                this.spaceshipControls?.spaceship.hyperSpaceTunnel.update(deltaSeconds);
+            });
 
-            if (e.key === "g") {
-                if (this.scene.getActiveController() === this.getSpaceshipControls()) {
-                    this.switchToDefaultControls();
-                } else if (this.scene.getActiveController() === this.getDefaultControls()) {
-                    this.switchToCharacterControls();
-                } else if (this.scene.getActiveController() === this.getCharacterControls()) {
-                    this.switchToSpaceshipControls();
+            const systemSeed = target.seed;
+            this.isLoadingSystem = true;
+            await this.loadStarSystem(new StarSystemController(systemSeed, this.scene), true);
+            await this.initStarSystem();
+
+            this.spaceshipControls?.spaceship.hyperSpaceTunnel.setEnabled(false);
+            this.spaceshipControls?.spaceship.warpTunnel.getTransform().setEnabled(true);
+            this.spaceshipControls?.spaceship.hyperSpaceSound.setTargetVolume(0);
+            this.isLoadingSystem = false;
+            AudioManager.SetMask(AudioMasks.STAR_SYSTEM_VIEW);
+            observer.remove();
+            this.ui.setTarget(null);
+        });
+
+        StarSystemInputs.map.toggleSpaceShipCharacter.on("complete", () => {
+            const characterControls = this.getCharacterControls();
+            const shipControls = this.getSpaceshipControls();
+
+            if (this.scene.getActiveControls() === shipControls) {
+                console.log("disembark");
+
+                characterControls.getTransform().setEnabled(true);
+                CharacterInputs.setEnabled(true);
+                characterControls.getTransform().setAbsolutePosition(shipControls.getTransform().absolutePosition);
+                translate(characterControls.getTransform(), getForwardDirection(shipControls.getTransform()).scale(10));
+
+                setRotationQuaternion(characterControls.getTransform(), getRotationQuaternion(shipControls.getTransform()).clone());
+                SpaceShipControlsInputs.setEnabled(false);
+
+                this.scene.setActiveControls(characterControls);
+                this.postProcessManager.rebuild();
+
+                shipControls.spaceship.acceleratingWarpDriveSound.setTargetVolume(0);
+                shipControls.spaceship.deceleratingWarpDriveSound.setTargetVolume(0);
+            } else if (this.scene.getActiveControls() === characterControls) {
+                console.log("embark");
+
+                characterControls.getTransform().setEnabled(false);
+                CharacterInputs.setEnabled(false);
+
+                this.scene.setActiveControls(shipControls);
+                SpaceShipControlsInputs.setEnabled(true);
+
+                this.postProcessManager.rebuild();
+
+                if (shipControls.spaceship.isLanded()) {
+                    const bindings = SpaceShipControlsInputs.map.upDown.bindings;
+                    const control = bindings[0].control;
+                    if (!(control instanceof AxisComposite)) {
+                        throw new Error("Up down is not an axis composite");
+                    }
+                    createNotification(`Hold ${axisCompositeToString(control)[1][1]} to lift off.`, 5000);
                 }
             }
         });
 
         this.scene = new UberScene(engine, ScenePerformancePriority.Intermediate);
         this.scene.clearColor = new Color4(0, 0, 0, 0);
+        // The right-handed system allows to use directly GLTF models without having to flip them with a transform
         this.scene.useRightHandedSystem = true;
 
         this.havokPlugin = new HavokPlugin(true, havokInstance);
         setMaxLinVel(this.havokPlugin, 10000, 10000);
         this.scene.enablePhysics(Vector3.Zero(), this.havokPlugin);
 
+        // small ambient light helps with seeing dark objects. This is unrealistic but I feel it is better.
         const ambientLight = new HemisphericLight("ambientLight", Vector3.Zero(), this.scene);
         ambientLight.intensity = 0.3;
 
+        this.postProcessManager = new PostProcessManager(this.scene);
+
+        // main update loop for the star system
         this.scene.onBeforePhysicsObservable.add(() => {
             const deltaSeconds = engine.getDeltaTime() / 1000;
             this.update(deltaSeconds * Settings.TIME_MULTIPLIER);
@@ -154,7 +348,6 @@ export class StarSystemView implements View {
 
         window.addEventListener("resize", () => {
             this.bodyEditor.resize();
-            this.scene.getEngine().resize(true);
         });
 
         this.bodyEditor.resize();
@@ -163,41 +356,121 @@ export class StarSystemView implements View {
         this.ui = new SystemUI(engine);
     }
 
-    initStarSystem() {
-        this.scene.getEngine().loadingScreen.displayLoadingUI();
-        this.scene.getEngine().loadingScreen.loadingUIText = `Warping to ${this.getStarSystem().model.getName()}`;
+    /**
+     * Dispose the previous star system and incrementally loads the new star system. All the assets are instantiated but the system still need to be initialized
+     * @param starSystem the star system to be set
+     * @param needsGenerating whether the star system needs to be generated or not
+     * @param timeOut
+     */
+    public async loadStarSystem(starSystem: StarSystemController, needsGenerating = true, timeOut = 700) {
+        if (this.starSystem !== null) {
+            this.chunkForge.reset();
+            this.postProcessManager.reset();
+            this.starSystem.dispose();
+            this.ui.disposeObjectOverlays();
+        }
+        this.starSystem = starSystem;
 
-        this.getStarSystem().initPositions(10, this.chunkForge);
-        this.ui.createObjectOverlays(this.getStarSystem().getOrbitalObjects());
+        if (!needsGenerating) return;
 
-        const firstBody = this.getStarSystem().getBodies()[0];
-        if (firstBody === undefined) throw new Error("No bodies in star system");
+        // Incrementally generate the star system
+
+        const offset = 1e10;
+
+        const systemModel = starSystem.model;
+        const targetNbStellarObjects = systemModel.getNbStellarObjects();
+
+        // Stellar objects
+        let objectIndex = 0;
+        for (let i = 0; i < targetNbStellarObjects; i++) {
+            console.log("Stellar:", i + 1, "of", targetNbStellarObjects);
+            const stellarObject = StarSystemHelper.MakeStellarObject(starSystem);
+            stellarObject.getTransform().setAbsolutePosition(new Vector3(offset * ++objectIndex, 0, 0));
+
+            await wait(timeOut);
+        }
+
+        const planets: Planet[] = [];
+
+        // Planets
+        for (let i = 0; i < systemModel.getNbPlanets(); i++) {
+            console.log("Planet:", i + 1, "of", systemModel.getNbPlanets());
+            const bodyType = starSystem.model.getBodyTypeOfPlanet(starSystem.planets.length);
+
+            const planet = bodyType === BodyType.TELLURIC_PLANET ? StarSystemHelper.MakeTelluricPlanet(starSystem) : StarSystemHelper.MakeGasPlanet(starSystem);
+            planet.getTransform().setAbsolutePosition(new Vector3(offset * ++objectIndex, 0, 0));
+
+            planets.push(planet);
+
+            await wait(timeOut);
+        }
+
+        // Satellites
+        for (let i = 0; i < planets.length; i++) {
+            const planet = planets[i];
+            for (let j = 0; j < planet.model.nbMoons; j++) {
+                console.log("Satellite:", j + 1, "of", planet.model.nbMoons);
+                const satellite = StarSystemHelper.MakeSatellite(starSystem, planet, getMoonSeed(planet.model, j));
+                satellite.getTransform().setAbsolutePosition(new Vector3(offset * ++objectIndex, 0, 0));
+
+                await wait(timeOut);
+            }
+        }
+
+        // Space stations
+        for (let i = 0; i < planets.length; i++) {
+            const planet = planets[i];
+            for (let j = 0; j < planet.model.getNbSpaceStations(); j++) {
+                console.log("Space station:", j + 1, "of", planet.model.getNbSpaceStations());
+                const spaceStation = StarSystemHelper.MakeSpaceStation(starSystem, planet);
+                spaceStation.getTransform().setAbsolutePosition(new Vector3(offset * ++objectIndex, 0, 0));
+
+                await wait(timeOut);
+            }
+        }
+    }
 
-        this.orbitRenderer.setOrbitalObjects(this.getStarSystem().getOrbitalObjects());
-        this.axisRenderer.setObjects(this.getStarSystem().getOrbitalObjects());
+    /**
+     * Initializes the star system. It initializes the positions of the orbital objects, the UI, the chunk forge and the post processes
+     * As it initializes the post processes using `initPostProcesses`, it returns a promise that resolves when the post processes are initialized.
+     */
+    public initStarSystem(): Promise<void> {
+        const starSystem = this.getStarSystem();
+        starSystem.initPositions(2, this.chunkForge, this.postProcessManager);
+        this.ui.createObjectOverlays(starSystem.getOrbitalObjects());
+
+        this.orbitRenderer.setOrbitalObjects(starSystem.getOrbitalObjects());
+        this.axisRenderer.setObjects(starSystem.getOrbitalObjects());
 
         this.helmetOverlay.setTarget(null);
 
-        const activeController = this.scene.getActiveController();
+        const firstBody = starSystem.getBodies()[0];
+        if (firstBody === undefined) throw new Error("No bodies in star system");
+
+        const activeController = this.scene.getActiveControls();
         let controllerDistanceFactor = 5;
         if (firstBody instanceof BlackHole) controllerDistanceFactor = 7;
         else if (firstBody instanceof NeutronStar) controllerDistanceFactor = 100_000;
-        positionNearObjectBrightSide(activeController, firstBody, this.getStarSystem(), controllerDistanceFactor);
+        positionNearObjectBrightSide(activeController, firstBody, starSystem, controllerDistanceFactor);
 
-        this.getStarSystem()
-            .initPostProcesses()
-            .then(() => {
-                this.onInitStarSystem.notifyObservers();
-                this.scene.getEngine().loadingScreen.hideLoadingUI();
-            });
+        const initPostProcessesPromise = starSystem.initPostProcesses(this.postProcessManager);
+
+        initPostProcessesPromise.then(() => {
+            this.onInitStarSystem.notifyObservers();
+            this.scene.getEngine().loadingScreen.hideLoadingUI();
+        });
+
+        return initPostProcessesPromise;
     }
 
-    async initAssets() {
+    /**
+     * Initializes the assets using the scene of the star system view.
+     * It then initializes the default controls, the spaceship controls and the character controls with the associated 3D models and cameras.
+     * This method must be awaited before doing anything that requires the assets or the controls to be initialized.
+     */
+    public async initAssets() {
         await Assets.Init(this.scene);
 
-        const canvas = this.scene.getEngine().getRenderingCanvas();
-        if (canvas === null) throw new Error("Canvas is null");
-
         const maxZ = Settings.EARTH_RADIUS * 1e5;
 
         this.defaultControls = new DefaultControls(this.scene);
@@ -211,22 +484,21 @@ export class StarSystemView implements View {
         this.characterControls.getTransform().setEnabled(false);
         this.characterControls.getActiveCamera().maxZ = maxZ;
 
-        this.scene.setActiveController(this.spaceshipControls);
+        this.scene.setActiveControls(this.spaceshipControls);
     }
 
     /**
      * Updates the system view. It updates the underlying star system, the UI, the chunk forge and the controls
      * @param deltaSeconds the time elapsed since the last update in seconds
      */
-    update(deltaSeconds: number) {
-        const starSystem = this.getStarSystem();
+    public update(deltaSeconds: number) {
+        if (this.isLoadingSystem) return;
 
-        Assets.BUTTERFLY_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveController().getTransform().getAbsolutePosition(), deltaSeconds);
-        Assets.GRASS_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveController().getTransform().getAbsolutePosition(), deltaSeconds);
+        const starSystem = this.getStarSystem();
 
         this.chunkForge.update();
 
-        starSystem.update(deltaSeconds, this.chunkForge);
+        starSystem.update(deltaSeconds, this.chunkForge, this.postProcessManager);
 
         if (this.spaceshipControls === null) throw new Error("Spaceship controls is null");
         if (this.characterControls === null) throw new Error("Character controls is null");
@@ -239,9 +511,9 @@ export class StarSystemView implements View {
 
         const warpDrive = this.spaceshipControls.spaceship.getWarpDrive();
         if (warpDrive.isEnabled()) {
-            this.helmetOverlay.displaySpeed(warpDrive.getInternalThrottle(), warpDrive.getTargetThrottle(), this.spaceshipControls.spaceship.getSpeed());
+            this.helmetOverlay.displaySpeed(warpDrive.getThrottle(), this.spaceshipControls.spaceship.getSpeed());
         } else {
-            this.helmetOverlay.displaySpeed(this.spaceshipControls.spaceship.getThrottle(), 1, this.spaceshipControls.spaceship.getSpeed());
+            this.helmetOverlay.displaySpeed(this.spaceshipControls.spaceship.getThrottle(), this.spaceshipControls.spaceship.getSpeed());
         }
 
         this.characterControls.setClosestWalkableObject(nearestBody);
@@ -252,73 +524,111 @@ export class StarSystemView implements View {
         const nearestOrbitalObject = starSystem.getNearestOrbitalObject();
         const nearestCelestialBody = starSystem.getNearestCelestialBody(this.scene.getActiveCamera().globalPosition);
 
-        this.bodyEditor.update(nearestCelestialBody, starSystem.postProcessManager, this.scene);
+        this.bodyEditor.update(nearestCelestialBody, this.postProcessManager, this.scene);
 
-        this.helmetOverlay.update(nearestOrbitalObject, this.scene.getActiveController().getTransform());
+        this.helmetOverlay.update(nearestOrbitalObject, this.scene.getActiveControls().getTransform());
 
         this.orbitRenderer.update();
+
+        Assets.BUTTERFLY_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveControls().getTransform().getAbsolutePosition(), deltaSeconds);
+        Assets.GRASS_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveControls().getTransform().getAbsolutePosition(), deltaSeconds);
     }
 
-    getSpaceshipControls() {
+    /**
+     * Returns the spaceship controls
+     * @returns the spaceship controls
+     * @throws Error if the spaceship controls is null (the assets are not initialized, you must call `initAssets` before)
+     */
+    public getSpaceshipControls() {
         if (this.spaceshipControls === null) throw new Error("Spaceship controls is null");
         return this.spaceshipControls;
     }
 
-    getCharacterControls() {
+    /**
+     * Returns the character controls
+     * @returns the character controls
+     * @throws Error if the character controls is null (the assets are not initialized, you must call `initAssets` before)
+     */
+    public getCharacterControls() {
         if (this.characterControls === null) throw new Error("Character controls is null");
         return this.characterControls;
     }
 
-    getDefaultControls() {
+    /**
+     * Returns the default controls
+     * @returns the default controls
+     * @throws Error if the default controls is null (the assets are not initialized, you must call `initAssets` before)
+     */
+    public getDefaultControls() {
         if (this.defaultControls === null) throw new Error("Default controls is null");
         return this.defaultControls;
     }
 
-    switchToSpaceshipControls() {
+    /**
+     * Switches the active controller to the spaceship controls
+     */
+    public switchToSpaceshipControls() {
         const shipControls = this.getSpaceshipControls();
         const characterControls = this.getCharacterControls();
         const defaultControls = this.getDefaultControls();
 
         characterControls.getTransform().setEnabled(false);
-        this.scene.setActiveController(shipControls);
+        CharacterInputs.setEnabled(false);
+        this.scene.setActiveControls(shipControls);
         setRotationQuaternion(shipControls.getTransform(), getRotationQuaternion(defaultControls.getTransform()).clone());
-        this.getStarSystem().postProcessManager.rebuild();
+        this.postProcessManager.rebuild();
 
         shipControls.spaceship.setEnabled(true, this.havokPlugin);
+        SpaceShipControlsInputs.setEnabled(true);
     }
 
-    switchToCharacterControls() {
+    /**
+     * Switches the active controller to the character controls
+     */
+    public switchToCharacterControls() {
         const shipControls = this.getSpaceshipControls();
         const characterControls = this.getCharacterControls();
         const defaultControls = this.getDefaultControls();
 
         characterControls.getTransform().setEnabled(true);
+        CharacterInputs.setEnabled(true);
         characterControls.getTransform().setAbsolutePosition(defaultControls.getTransform().absolutePosition);
-        this.scene.setActiveController(characterControls);
+        this.scene.setActiveControls(characterControls);
         setRotationQuaternion(characterControls.getTransform(), getRotationQuaternion(defaultControls.getTransform()).clone());
-        this.getStarSystem().postProcessManager.rebuild();
+        this.postProcessManager.rebuild();
 
         shipControls.spaceship.warpTunnel.setThrottle(0);
         shipControls.spaceship.setEnabled(false, this.havokPlugin);
+        SpaceShipControlsInputs.setEnabled(false);
         this.stopBackgroundSounds();
     }
 
-    switchToDefaultControls() {
+    /**
+     * Switches the active controller to the default controls
+     */
+    public switchToDefaultControls() {
         const shipControls = this.getSpaceshipControls();
         const characterControls = this.getCharacterControls();
         const defaultControls = this.getDefaultControls();
 
         characterControls.getTransform().setEnabled(false);
+        CharacterInputs.setEnabled(false);
+
         shipControls.spaceship.warpTunnel.setThrottle(0);
         shipControls.spaceship.setEnabled(false, this.havokPlugin);
+        SpaceShipControlsInputs.setEnabled(false);
+
         this.stopBackgroundSounds();
 
-        this.scene.setActiveController(defaultControls);
+        this.scene.setActiveControls(defaultControls);
         setRotationQuaternion(defaultControls.getTransform(), getRotationQuaternion(shipControls.getTransform()).clone());
-        this.getStarSystem().postProcessManager.rebuild();
+        this.postProcessManager.rebuild();
     }
 
-    stopBackgroundSounds() {
+    /**
+     * Stops the background sounds of the spaceship
+     */
+    public stopBackgroundSounds() {
         this.spaceshipControls?.spaceship.acceleratingWarpDriveSound.setTargetVolume(0);
         this.spaceshipControls?.spaceship.deceleratingWarpDriveSound.setTargetVolume(0);
         this.spaceshipControls?.spaceship.thrusterSound.setTargetVolume(0);
@@ -329,43 +639,31 @@ export class StarSystemView implements View {
      * @returns the star system
      * @throws Error if the star system is null
      */
-    getStarSystem() {
+    public getStarSystem() {
         if (this.starSystem === null) throw new Error("Star system not initialized");
         return this.starSystem;
     }
 
-    /**
-     * Sets the star system and generates it if needed and disposes the old one. Does not perform the init method
-     * @param starSystem the star system to be set
-     * @param needsGenerating whether the star system needs to be generated or not
-     */
-    setStarSystem(starSystem: StarSystemController, needsGenerating = true) {
-        if (this.starSystem !== null) this.starSystem.dispose();
-        this.starSystem = starSystem;
-
-        if (needsGenerating) StarSystemHelper.Generate(this.starSystem);
-    }
-
-    hideUI() {
+    public hideHtmlUI() {
         this.bodyEditor.setVisibility(EditorVisibility.HIDDEN);
         this.helmetOverlay.setVisibility(false);
     }
 
-    showUI() {
+    public showHtmlUI() {
         this.helmetOverlay.setVisibility(true);
         this.bodyEditor.setVisibility(EditorVisibility.HIDDEN);
     }
 
-    unZoom(callback: () => void) {
-        const activeControls = this.scene.getActiveController();
+    public unZoom(callback: () => void) {
+        const activeControls = this.scene.getActiveControls();
         if (activeControls !== this.getSpaceshipControls()) {
             callback();
             return;
         }
         activeControls.getActiveCamera().animations = [StarSystemView.UN_ZOOM_ANIMATION];
-        this.scene.beginAnimation(this.scene.getActiveController().getActiveCamera(), 0, 60, false, 2.0, () => {
-            this.scene.getActiveController().getActiveCamera().animations = [];
-            this.hideUI();
+        this.scene.beginAnimation(this.scene.getActiveControls().getActiveCamera(), 0, 60, false, 2.0, () => {
+            this.scene.getActiveControls().getActiveCamera().animations = [];
+            this.hideHtmlUI();
             callback();
             this.scene.onAfterRenderObservable.addOnce(() => {
                 (activeControls as ShipControls).thirdPersonCamera.radius = 30;
@@ -373,6 +671,33 @@ export class StarSystemView implements View {
         });
     }
 
+    /**
+     * Creates a visible target inside the current star system to aim for another star system.
+     * This target will display the name of the target system and its distance.
+     * @param targetSeed the seed of the target system
+     */
+    public setSystemAsTarget(targetSeed: SystemSeed) {
+        const currentSystem = this.getStarSystem();
+        const currentSeed = currentSystem.model.seed;
+
+        const currentSystemStarSector = new StarSector(new Vector3(currentSeed.starSectorX, currentSeed.starSectorY, currentSeed.starSectorZ));
+
+        const targetSystemStarSector = new StarSector(new Vector3(targetSeed.starSectorX, targetSeed.starSectorY, targetSeed.starSectorZ));
+
+        const currentSystemUniversePosition = currentSystemStarSector.getPositionOfStar(currentSeed.index);
+        const targetSystemUniversePosition = targetSystemStarSector.getPositionOfStar(targetSeed.index);
+
+        const direction = targetSystemUniversePosition.subtract(currentSystemUniversePosition).normalize();
+        direction.applyRotationQuaternionInPlace(currentSystem.universeRotation);
+
+        const distance = StarMap.StarMapDistanceToLy(Vector3.Distance(currentSystemUniversePosition, targetSystemUniversePosition));
+
+        const target = currentSystem.addSystemTarget(targetSeed, direction, distance);
+        this.ui.addObjectOverlay(target);
+        this.ui.setTarget(target);
+        this.helmetOverlay.setTarget(target.getTransform());
+    }
+
     public render() {
         this.scene.render();
 
diff --git a/src/ts/starmap/starMap.ts b/src/ts/starmap/starMap.ts
index f4ef6e888..37edd986a 100644
--- a/src/ts/starmap/starMap.ts
+++ b/src/ts/starmap/starMap.ts
@@ -55,6 +55,9 @@ import { syncCamera } from "../utils/cameraSyncing";
 import { AudioInstance } from "../utils/audioInstance";
 import { AudioManager } from "../audio/audioManager";
 import { AudioMasks } from "../audio/audioMasks";
+import { Settings } from "../settings";
+import { parseDistance } from "../utils/parseToStrings";
+import { StarMapInputs } from "../inputs/starMapInputs";
 
 export class StarMap implements View {
     readonly scene: Scene;
@@ -96,7 +99,7 @@ export class StarMap implements View {
     private readonly travelLine: ThickLines;
     private readonly thickLines: ThickLines[];
 
-    public readonly onWarpObservable: Observable<SystemSeed> = new Observable();
+    public readonly onTargetSetObservable: Observable<SystemSeed> = new Observable();
 
     /**
      * The position of the star sector the player is currently in (relative to the global node).
@@ -142,8 +145,8 @@ export class StarMap implements View {
             this.dispatchWarpCallbacks();
         });
 
-        document.addEventListener("keydown", (e) => {
-            if (e.key === "f") this.focusOnCurrentSystem();
+        StarMapInputs.map.focusOnCurrentSystem.on("complete", () => {
+            this.focusOnCurrentSystem();
         });
 
         const pipeline = new DefaultRenderingPipeline("pipeline", false, this.scene, [this.controls.getActiveCamera()]);
@@ -224,7 +227,15 @@ export class StarMap implements View {
             }
         ]);
 
-        this.travelLine = new ThickLines("travelLine", { points: [], thickness: 0.01, color: Color3.Red() }, this.scene);
+        this.travelLine = new ThickLines(
+            "travelLine",
+            {
+                points: [],
+                thickness: 0.01,
+                color: Color3.Red()
+            },
+            this.scene
+        );
         this.thickLines = [this.travelLine];
 
         // then generate missing star sectors
@@ -277,7 +288,7 @@ export class StarMap implements View {
 
     private dispatchWarpCallbacks() {
         if (this.selectedSystemSeed === null) throw new Error("No system selected!");
-        this.onWarpObservable.notifyObservers(this.selectedSystemSeed);
+        this.onTargetSetObservable.notifyObservers(this.selectedSystemSeed);
     }
 
     /**
@@ -376,8 +387,8 @@ export class StarMap implements View {
         const starSystemSeed = data.seed;
         const starSystemModel = new StarSystemModel(starSystemSeed);
 
-        const starSeed = starSystemModel.getStarSeed(0);
-        const stellarObjectType = starSystemModel.getBodyTypeOfStar(0);
+        const starSeed = starSystemModel.getStellarObjectSeed(0);
+        const stellarObjectType = starSystemModel.getBodyTypeOfStellarObject(0);
 
         let starModel: StarModel | BlackHoleModel | NeutronStarModel | null = null;
         switch (stellarObjectType) {
@@ -433,6 +444,7 @@ export class StarMap implements View {
 
             initializedInstance.actionManager.registerAction(
                 new ExecuteCodeAction(ActionManager.OnPointerOverTrigger, () => {
+                    if (this.starMapUI.isHovered()) return;
                     this.starMapUI.setHoveredStarSystemMesh(initializedInstance);
                     Assets.MENU_HOVER_SOUND.play();
                 })
@@ -450,13 +462,15 @@ export class StarMap implements View {
 
         initializedInstance.actionManager?.registerAction(
             new ExecuteCodeAction(ActionManager.OnPickTrigger, () => {
+                if (this.starMapUI.isHovered()) return;
+
                 Assets.STAR_MAP_CLICK_SOUND.play();
 
                 let text = "";
                 if (this.currentSystemSeed !== null) {
                     const currentInstance = this.seedToInstanceMap.get(this.currentSystemSeed.toString()) as InstancedMesh;
-                    const distance = 15 * currentInstance.getAbsolutePosition().subtract(initializedInstance.getAbsolutePosition()).length();
-                    text += `Distance: ${distance.toFixed(2)}ly\n`;
+                    const distance = StarMap.StarMapDistanceToLy(Vector3.Distance(currentInstance.getAbsolutePosition(), initializedInstance.getAbsolutePosition()));
+                    text += `Distance: ${parseDistance(distance)}\n`;
                 }
 
                 if (starModel === null) throw new Error("Star model is null!");
@@ -488,6 +502,10 @@ export class StarMap implements View {
         else this.loadedStarSectors.get(data.sectorString)?.starInstances.push(initializedInstance);
     }
 
+    public static StarMapDistanceToLy(distance: number): number {
+        return distance * 15 * Settings.LIGHT_YEAR;
+    }
+
     private focusCameraOnStar(starInstance: InstancedMesh, skipAnimation = false) {
         const cameraDir = getForwardDirection(this.controls.getTransform());
         const starDir = starInstance.position.subtract(this.controls.getTransform().getAbsolutePosition()).normalize();
diff --git a/src/ts/starmap/starMapUI.ts b/src/ts/starmap/starMapUI.ts
index db783cd33..ad479171f 100644
--- a/src/ts/starmap/starMapUI.ts
+++ b/src/ts/starmap/starMapUI.ts
@@ -49,6 +49,8 @@ export class StarMapUI {
 
     static ALPHA_ANIMATION = new Animation("alphaAnimation", "alpha", 60, Animation.ANIMATIONTYPE_FLOAT, Animation.ANIMATIONLOOPMODE_CYCLE);
 
+    private _isHovered = false;
+
     constructor(engine: Engine) {
         this.scene = new Scene(engine);
         this.scene.useRightHandedSystem = true;
@@ -67,6 +69,14 @@ export class StarMapUI {
         this.systemUI.zIndex = 6;
         this.systemUI.alpha = 0.95;
 
+        this.systemUI.onPointerEnterObservable.add(() => {
+            this._isHovered = true;
+        });
+
+        this.systemUI.onPointerOutObservable.add(() => {
+            this._isHovered = false;
+        });
+
         this.namePlate = new TextBlock();
         this.namePlate.text = "";
         this.namePlate.fontSize = 24;
@@ -82,12 +92,13 @@ export class StarMapUI {
         this.descriptionPanel.textHorizontalAlignment = TextBlock.HORIZONTAL_ALIGNMENT_LEFT;
         this.descriptionPanel.setPadding(0, 15, 10, 15);
 
-        this.warpButton = Button.CreateSimpleButton("warpButton", "Engage Warp Drive");
+        this.warpButton = Button.CreateSimpleButton("warpButton", "Set Warp Destination");
         //this.warpButton.width = "100px";
         this.warpButton.height = "40px";
         this.warpButton.background = "midnightblue";
         this.warpButton.fontWeight = "bold";
         this.warpButton.fontFamily = Settings.MAIN_FONT;
+        this.warpButton.isPointerBlocker = false;
         //this.warpButton.horizontalAlignment = Control.HORIZONTAL_ALIGNMENT_RIGHT;
 
         this.systemUI.addControl(this.namePlate);
@@ -120,6 +131,10 @@ export class StarMapUI {
         this.hoveredSystemRing.animations = [StarMapUI.ALPHA_ANIMATION];
     }
 
+    isHovered() {
+        return this._isHovered;
+    }
+
     update(activeCamera: Camera) {
         if (this.systemUI.linkedMesh === null || this.systemUI.linkedMesh === undefined) this.gui.removeControl(this.systemUI);
         else {
diff --git a/src/ts/starmap/starSector.ts b/src/ts/starmap/starSector.ts
index e9323b4ae..480bea535 100644
--- a/src/ts/starmap/starSector.ts
+++ b/src/ts/starmap/starSector.ts
@@ -28,11 +28,6 @@ export function vector3ToString(v: Vector3): string {
     return `${v.x},${v.y},${v.z}`;
 }
 
-export function stringToVector3(s: string): Vector3 {
-    const [x, y, z] = s.split(",").map(Number);
-    return new Vector3(x, y, z);
-}
-
 export type BuildData = {
     name: string;
     seed: SystemSeed;
@@ -87,14 +82,21 @@ export class StarSector {
                 seed: systemSeed,
                 sectorString: sectorString,
                 scale: 0.5 + this.rng(100 * i) / 2,
-                position: new Vector3(centeredRand(this.rng, 10 * i + 1) / 2, centeredRand(this.rng, 10 * i + 2) / 2, centeredRand(this.rng, 10 * i + 3) / 2).addInPlace(
-                    this.position
-                )
+                position: this.getPositionOfStar(i)
             });
         }
         return data;
     }
 
+    getPositionOfStar(starIndex: number): Vector3 {
+        if (starIndex >= this.nbStars) throw new Error(`Star index ${starIndex} is out of bounds for sector ${this.position}`);
+        return new Vector3(
+            centeredRand(this.rng, 10 * starIndex + 1) / 2,
+            centeredRand(this.rng, 10 * starIndex + 2) / 2,
+            centeredRand(this.rng, 10 * starIndex + 3) / 2
+        ).addInPlace(this.position);
+    }
+
     /**
      * Returns a string that uniquely identifies this sector (its position relative to the global node)
      * @returns a string that uniquely identifies this sector
diff --git a/src/ts/stellarObjects/blackHole/blackHole.ts b/src/ts/stellarObjects/blackHole/blackHole.ts
index 8fd5a38e9..ab0409e35 100644
--- a/src/ts/stellarObjects/blackHole/blackHole.ts
+++ b/src/ts/stellarObjects/blackHole/blackHole.ts
@@ -51,7 +51,7 @@ export class BlackHole implements StellarObject, Cullable {
 
         this.parent = parentBody;
 
-        this.transform = new TransformNode(`${name}Transform`, scene);
+        this.transform = new TransformNode(name, scene);
         this.transform.rotate(Axis.X, this.model.physicalProperties.axialTilt);
 
         this.light = new PointLight(`${name}Light`, Vector3.Zero(), scene);
diff --git a/src/ts/stellarObjects/neutronStar/neutronStar.ts b/src/ts/stellarObjects/neutronStar/neutronStar.ts
index 78c03a389..60ec13f9d 100644
--- a/src/ts/stellarObjects/neutronStar/neutronStar.ts
+++ b/src/ts/stellarObjects/neutronStar/neutronStar.ts
@@ -71,7 +71,7 @@ export class NeutronStar implements StellarObject, Cullable {
         this.parent = parentBody;
 
         this.mesh = MeshBuilder.CreateSphere(
-            `${name}Mesh`,
+            name,
             {
                 diameter: this.model.radius * 2,
                 segments: 32
diff --git a/src/ts/stellarObjects/star/star.ts b/src/ts/stellarObjects/star/star.ts
index 7150fe055..3902f4bcc 100644
--- a/src/ts/stellarObjects/star/star.ts
+++ b/src/ts/stellarObjects/star/star.ts
@@ -76,7 +76,7 @@ export class Star implements StellarObject, Cullable {
 
         this.mesh = isSphere
             ? MeshBuilder.CreateSphere(
-                  `${name}Mesh`,
+                  name,
                   {
                       diameter: this.model.radius * 2,
                       segments: 32
diff --git a/src/ts/uberCore/postProcesses/uberPostProcess.ts b/src/ts/uberCore/postProcesses/uberPostProcess.ts
index c496fafee..71d52bc69 100644
--- a/src/ts/uberCore/postProcesses/uberPostProcess.ts
+++ b/src/ts/uberCore/postProcesses/uberPostProcess.ts
@@ -22,6 +22,8 @@ import { Texture } from "@babylonjs/core/Materials/Textures/texture";
 import { PostProcess } from "@babylonjs/core/PostProcesses/postProcess";
 import { SamplerEnumType, ShaderSamplers, ShaderUniforms, UniformEnumType } from "./types";
 import { Scene } from "@babylonjs/core/scene";
+import { Constants } from "@babylonjs/core/Engines/constants";
+import { Camera } from "@babylonjs/core/Cameras/camera";
 
 /**
  * A wrapper around BabylonJS post processes that allows more predictable and easier to use uniforms
@@ -34,7 +36,7 @@ export class UberPostProcess extends PostProcess {
         const uniformNames = uniforms.map((uniform) => uniform.name);
         const samplerNames = samplers.map((sampler) => sampler.name);
 
-        super(name, fragmentName, uniformNames, samplerNames, 1, null, Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false);
+        super(name, fragmentName, uniformNames, samplerNames, 1, null, Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, null, Constants.TEXTURETYPE_HALF_FLOAT);
 
         this.uniforms.push(...uniforms);
         this.samplers.push(...samplers);
@@ -101,4 +103,8 @@ export class UberPostProcess extends PostProcess {
             }
         }
     }
+
+    public override dispose(camera: Camera) {
+        super.dispose(camera);
+    }
 }
diff --git a/src/ts/uberCore/uberScene.ts b/src/ts/uberCore/uberScene.ts
index 4d62f4041..70e202b68 100644
--- a/src/ts/uberCore/uberScene.ts
+++ b/src/ts/uberCore/uberScene.ts
@@ -23,40 +23,81 @@ import "@babylonjs/core/Rendering/depthRendererSceneComponent";
 import { Camera } from "@babylonjs/core/Cameras/camera";
 import { Color4 } from "@babylonjs/core/Maths/math.color";
 
+/**
+ * A very thin wrapper around Babylon's Scene class to add some convenience methods.
+ * The functionality added is support for the general purpose controls and the use of a depth renderer by default.
+ */
 export class UberScene extends Scene {
-    private activeController: Controls | null = null;
+    /**
+     * The active controls for the scene.
+     * @private
+     */
+    private activeControls: Controls | null = null;
+
+    /**
+     * The depth renderer for the scene.
+     * @private
+     */
     private depthRenderer: DepthRenderer | null = null;
 
+    /**
+     * Creates a new UberScene.
+     * @param engine The BabylonJS engine.
+     * @param performancePriority The performance priority of the scene (default: ScenePerformancePriority.BackwardCompatible).
+     */
     constructor(engine: Engine, performancePriority = ScenePerformancePriority.BackwardCompatible) {
         super(engine);
         this.performancePriority = performancePriority;
         this.clearColor = new Color4(0, 0, 0, 0);
     }
 
+    /**
+     * Returns the depth renderer for the scene. If it does not exist, it throws an error.
+     * @returns The depth renderer.
+     * @throws An error if the depth renderer does not exist.
+     */
     public getDepthRenderer(): DepthRenderer {
         if (this.depthRenderer === null) throw new Error("Depth Renderer not initialized");
         return this.depthRenderer;
     }
 
-    public setActiveController(controller: Controls) {
-        this.activeController = controller;
-        this.setActiveCamera(controller.getActiveCamera());
+    /**
+     * Sets the active controls for the scene. This also sets the active camera of the scene using the active camera of the controls.
+     * @param controls The active controls.
+     */
+    public setActiveControls(controls: Controls) {
+        this.activeControls = controls;
+        this.setActiveCamera(controls.getActiveCamera());
     }
 
+    /**
+     * Sets the active camera for the scene and the depth renderer. If the depth renderer does not exist, it is created.
+     * @param camera The new active camera.
+     */
     public setActiveCamera(camera: Camera) {
         if (this.activeCamera !== null) this.activeCamera.detachControl();
         this.activeCamera = camera;
         camera.attachControl(true);
 
-        if (this.depthRenderer !== null) this.depthRenderer.dispose();
-        this.depthRenderer = this.enableDepthRenderer(null, false, true);
+        // When changing camera, we must also change the active camera of the depth renderer
+        if (this.depthRenderer === null) this.depthRenderer = this.enableDepthRenderer(null, false, true);
+        this.depthRenderer.getDepthMap().activeCamera = camera;
     }
 
-    public getActiveController(): Controls {
-        if (this.activeController === null) throw new Error("Controller not set");
-        return this.activeController;
+    /**
+     * Returns the active controls for the scene. If they do not exist, it throws an error.
+     * @returns The active controls.
+     * @throws An error if the active controls do not exist.
+     */
+    public getActiveControls(): Controls {
+        if (this.activeControls === null) throw new Error("Controls not set");
+        return this.activeControls;
     }
 
+    /**
+     * Returns the active camera for the scene. If it does not exist, it throws an error.
+     * @returns The active camera.
+     */
     public getActiveCamera(): Camera {
         if (this.activeCamera === null) throw new Error("Camera not set");
         return this.activeCamera;
diff --git a/src/ts/ui/bodyEditor/panels/generalPanel.ts b/src/ts/ui/bodyEditor/panels/generalPanel.ts
index 8510e7127..0237d5841 100644
--- a/src/ts/ui/bodyEditor/panels/generalPanel.ts
+++ b/src/ts/ui/bodyEditor/panels/generalPanel.ts
@@ -58,9 +58,9 @@ export class GeneralPanel extends EditorPanel {
                 document.getElementById("cameraFOV") as HTMLElement,
                 0,
                 360,
-                (scene.getActiveController().getActiveCamera().fov * 360) / Math.PI,
+                (scene.getActiveControls().getActiveCamera().fov * 360) / Math.PI,
                 (val: number) => {
-                    scene.getActiveController().getActiveCamera().fov = (val * Math.PI) / 360;
+                    scene.getActiveControls().getActiveCamera().fov = (val * Math.PI) / 360;
                     Settings.FOV = (val * Math.PI) / 360;
                 }
             ),
diff --git a/src/ts/ui/helmetOverlay.ts b/src/ts/ui/helmetOverlay.ts
index 5d5f9d713..f96dc25a4 100644
--- a/src/ts/ui/helmetOverlay.ts
+++ b/src/ts/ui/helmetOverlay.ts
@@ -56,7 +56,7 @@ export class HelmetOverlay {
             this.targetHelper.style.display = "block";
         }
 
-        if(this.currentTarget === target) {
+        if (this.currentTarget === target) {
             this.currentTarget = null;
             return;
         }
@@ -80,8 +80,18 @@ export class HelmetOverlay {
         }
     }
 
-    displaySpeed(shipInternalThrottle: number, shipTargetThrottle: number, speed: number) {
-        const throttleString = `${(100 * shipInternalThrottle).toFixed(0)}% | ${(100 * shipTargetThrottle).toFixed(0)}%`;
-        (document.querySelector("#speedometer") as HTMLElement).innerText = `${throttleString} | ${parseSpeed(speed)}`;
+    displaySpeed(shipThrottle: number, speed: number) {
+        const throttleContainer = document.getElementById("throttle");
+        if (throttleContainer === null) throw new Error("Throttle container not found");
+        throttleContainer.style.alignItems = shipThrottle < 0 ? "flex-start" : "flex-end";
+
+        const throttleStripes = document.getElementById("throttleStripes");
+        if (throttleStripes === null) throw new Error("Throttle bar not found");
+        throttleStripes.style.height = `${(100 * Math.abs(shipThrottle)).toFixed(0)}%`;
+        throttleStripes.classList.toggle("reversed", shipThrottle < 0);
+
+        const speedIndicator = document.getElementById("speed");
+        if (speedIndicator === null) throw new Error("Speed indicator not found");
+        speedIndicator.innerText = parseSpeed(speed);
     }
 }
diff --git a/src/ts/ui/objectOverlay.ts b/src/ts/ui/objectOverlay.ts
index f71358ed1..bd6cf2347 100644
--- a/src/ts/ui/objectOverlay.ts
+++ b/src/ts/ui/objectOverlay.ts
@@ -24,8 +24,10 @@ import { Vector3 } from "@babylonjs/core/Maths/math.vector";
 import { getAngularSize } from "../utils/isObjectVisibleOnScreen";
 import { Camera } from "@babylonjs/core/Cameras/camera";
 import { LocalDirection } from "../uberCore/localDirections";
-import { OrbitalObject } from "../architecture/orbitalObject";
 import { Settings } from "../settings";
+import { Transformable } from "../architecture/transformable";
+import { BoundingSphere } from "../architecture/boundingSphere";
+import { TypedObject } from "../architecture/typedObject";
 
 export class ObjectOverlay {
     readonly textRoot: StackPanel;
@@ -34,24 +36,24 @@ export class ObjectOverlay {
     readonly typeText: TextBlock;
     readonly distanceText: TextBlock;
     readonly etaText: TextBlock;
-    readonly object: OrbitalObject;
+    readonly object: Transformable & BoundingSphere & TypedObject;
 
     private lastDistance = 0;
 
     static readonly WIDTH = 300;
 
-    constructor(object: OrbitalObject) {
+    constructor(object: Transformable & BoundingSphere & TypedObject) {
         this.object = object;
 
-        this.textRoot = new StackPanel(object.name + "OverlayTextRoot");
+        this.textRoot = new StackPanel(object.getTransform().name + "OverlayTextRoot");
         this.textRoot.width = `${ObjectOverlay.WIDTH}px`;
         this.textRoot.height = "130px";
         this.textRoot.background = "transparent";
         this.textRoot.zIndex = 6;
         this.textRoot.alpha = 0.95;
 
-        this.namePlate = new TextBlock(object.name + "OverlayNamePlate");
-        this.namePlate.text = object.name;
+        this.namePlate = new TextBlock(object.getTransform().name + "OverlayNamePlate");
+        this.namePlate.text = object.getTransform().name;
         this.namePlate.color = "white";
         this.namePlate.zIndex = 6;
         this.namePlate.height = "50px";
@@ -61,7 +63,7 @@ export class ObjectOverlay {
         this.namePlate.textVerticalAlignment = TextBlock.VERTICAL_ALIGNMENT_CENTER;
         this.textRoot.addControl(this.namePlate);
 
-        this.typeText = new TextBlock(object.name + "OverlayTypeText");
+        this.typeText = new TextBlock(object.getTransform().name + "OverlayTypeText");
         this.typeText.text = object.getTypeName();
         this.typeText.color = "white";
         this.typeText.zIndex = 6;
@@ -72,7 +74,7 @@ export class ObjectOverlay {
         this.typeText.textVerticalAlignment = TextBlock.VERTICAL_ALIGNMENT_CENTER;
         this.textRoot.addControl(this.typeText);
 
-        this.distanceText = new TextBlock(object.name + "OverlayDistanceText");
+        this.distanceText = new TextBlock(object.getTransform().name + "OverlayDistanceText");
         this.distanceText.color = "white";
         this.distanceText.zIndex = 6;
         this.distanceText.height = "20px";
@@ -82,7 +84,7 @@ export class ObjectOverlay {
         this.distanceText.textVerticalAlignment = TextBlock.VERTICAL_ALIGNMENT_CENTER;
         this.textRoot.addControl(this.distanceText);
 
-        this.etaText = new TextBlock(object.name + "OverlayEtaText");
+        this.etaText = new TextBlock(object.getTransform().name + "OverlayEtaText");
         this.etaText.color = "white";
         this.etaText.zIndex = 6;
         this.etaText.height = "20px";
@@ -92,7 +94,7 @@ export class ObjectOverlay {
         this.etaText.textVerticalAlignment = TextBlock.VERTICAL_ALIGNMENT_CENTER;
         this.textRoot.addControl(this.etaText);
 
-        this.cursor = new Image(object.name + "Cursor", cursorImage);
+        this.cursor = new Image(object.getTransform().name + "Cursor", cursorImage);
         this.cursor.fixedRatio = 1;
         this.cursor.width = 1;
         this.cursor.alpha = 0.8;
@@ -104,7 +106,7 @@ export class ObjectOverlay {
         this.cursor.linkWithMesh(this.object.getTransform());
     }
 
-    update(camera: Camera, target: OrbitalObject | null) {
+    update(camera: Camera, target: (Transformable & BoundingSphere & TypedObject) | null) {
         const viewRay = camera.getDirection(LocalDirection.BACKWARD);
         const objectRay = this.object.getTransform().getAbsolutePosition().subtract(camera.globalPosition);
         const distance = objectRay.length();
@@ -139,7 +141,7 @@ export class ObjectOverlay {
         this.distanceText.text = parseDistance(distance);
 
         const nbSeconds = distance / speed;
-        this.etaText.text = speed > 0 && nbSeconds < 60 * 60 * 24 ? parseSeconds(nbSeconds) : "∞";
+        this.etaText.text = speed > 0 ? parseSeconds(nbSeconds) : "∞";
 
         this.lastDistance = distance;
     }
diff --git a/src/ts/ui/pauseMenu.ts b/src/ts/ui/pauseMenu.ts
index d72f936a9..19870e2e4 100644
--- a/src/ts/ui/pauseMenu.ts
+++ b/src/ts/ui/pauseMenu.ts
@@ -25,9 +25,15 @@ export class PauseMenu {
 
     private readonly screenshotButton: HTMLElement;
     private readonly shareButton: HTMLElement;
+    private readonly contributeButton: HTMLElement;
+    private readonly settingsButton: HTMLElement;
     private readonly saveButton: HTMLElement;
     private readonly resumeButton: HTMLElement;
 
+    private readonly settingsPanel: HTMLElement;
+    private readonly contibutePanel: HTMLElement;
+    private activePanel: HTMLElement | null = null;
+
     readonly onScreenshot = new Observable<void>();
     readonly onShare = new Observable<void>();
     readonly onSave = new Observable<void>();
@@ -44,6 +50,20 @@ export class PauseMenu {
         this.shareButton = document.getElementById("shareButton") as HTMLElement;
         this.shareButton.addEventListener("click", () => this.onShare.notifyObservers());
 
+        this.contributeButton = document.getElementById("pauseContributeButton") as HTMLElement;
+        this.contributeButton.addEventListener("click", () => {
+            Assets.MENU_SELECT_SOUND.play();
+
+            this.setActivePanel(this.activePanel === this.contibutePanel ? null : this.contibutePanel);
+        });
+
+        this.settingsButton = document.getElementById("pauseSettingsButton") as HTMLElement;
+        this.settingsButton.addEventListener("click", () => {
+            Assets.MENU_SELECT_SOUND.play();
+
+            this.setActivePanel(this.activePanel === this.settingsPanel ? null : this.settingsPanel);
+        });
+
         this.saveButton = document.getElementById("saveButton") as HTMLElement;
         this.saveButton.addEventListener("click", () => this.onSave.notifyObservers());
 
@@ -62,12 +82,34 @@ export class PauseMenu {
             });
         });
 
+        const settingsPanel = document.getElementById("settingsPanel");
+        if (settingsPanel === null) throw new Error("#settingsPanel not found");
+        this.settingsPanel = settingsPanel;
+
+        const contributePanel = document.getElementById("contribute");
+        if (contributePanel === null) throw new Error("#contribute not found");
+        this.contibutePanel = contributePanel;
+
         this.setVisibility(false);
     }
 
+    private setActivePanel(panel: HTMLElement | null) {
+        if (this.activePanel !== null) {
+            this.activePanel.classList.remove("visible");
+        }
+
+        this.activePanel = panel;
+
+        if (this.activePanel !== null) {
+            this.activePanel.classList.add("visible");
+        }
+    }
+
     public setVisibility(visible: boolean) {
         this.rootNode.style.display = visible ? "grid" : "none";
         this.mask.style.display = visible ? "block" : "none";
+
+        this.activePanel?.classList.remove("visible");
     }
 
     public isVisible(): boolean {
diff --git a/src/ts/ui/systemUI.ts b/src/ts/ui/systemUI.ts
index 4654db05b..1a1b2c9b3 100644
--- a/src/ts/ui/systemUI.ts
+++ b/src/ts/ui/systemUI.ts
@@ -19,10 +19,12 @@ import { Scene } from "@babylonjs/core/scene";
 import { AdvancedDynamicTexture } from "@babylonjs/gui/2D/advancedDynamicTexture";
 import { ObjectOverlay } from "./objectOverlay";
 import { Camera } from "@babylonjs/core/Cameras/camera";
-import { OrbitalObject } from "../architecture/orbitalObject";
 import { Engine } from "@babylonjs/core/Engines/engine";
 import { FreeCamera } from "@babylonjs/core/Cameras/freeCamera";
 import { Vector3 } from "@babylonjs/core/Maths/math.vector";
+import { Transformable } from "../architecture/transformable";
+import { BoundingSphere } from "../architecture/boundingSphere";
+import { TypedObject } from "../architecture/typedObject";
 
 export class SystemUI {
     readonly scene: Scene;
@@ -30,7 +32,7 @@ export class SystemUI {
     readonly gui: AdvancedDynamicTexture;
     private objectOverlays: ObjectOverlay[] = [];
 
-    private target: OrbitalObject | null = null;
+    private target: (Transformable & BoundingSphere & TypedObject) | null = null;
 
     constructor(engine: Engine) {
         this.scene = new Scene(engine);
@@ -50,22 +52,23 @@ export class SystemUI {
         return this.gui.rootContainer.alpha === 1;
     }
 
-    public createObjectOverlays(objects: OrbitalObject[]) {
-        this.removeObjectOverlays();
+    public createObjectOverlays(objects: (Transformable & BoundingSphere & TypedObject)[]) {
+        this.disposeObjectOverlays();
 
         for (const object of objects) {
-            const overlay = new ObjectOverlay(object);
-            this.gui.addControl(overlay.textRoot);
-            this.gui.addControl(overlay.cursor);
-            this.objectOverlays.push(overlay);
+            this.addObjectOverlay(object);
         }
+    }
 
-        for (const overlay of this.objectOverlays) {
-            overlay.init();
-        }
+    public addObjectOverlay(object: Transformable & BoundingSphere & TypedObject) {
+        const overlay = new ObjectOverlay(object);
+        this.gui.addControl(overlay.textRoot);
+        this.gui.addControl(overlay.cursor);
+        this.objectOverlays.push(overlay);
+        overlay.init();
     }
 
-    public removeObjectOverlays() {
+    public disposeObjectOverlays() {
         for (const overlay of this.objectOverlays) {
             overlay.dispose();
         }
@@ -78,7 +81,7 @@ export class SystemUI {
         }
     }
 
-    public setTarget(object: OrbitalObject | null) {
+    public setTarget(object: (Transformable & BoundingSphere & TypedObject) | null) {
         if (this.target === object) {
             this.target = null;
             return;
diff --git a/src/ts/utils/audioInstance.ts b/src/ts/utils/audioInstance.ts
index 312e8bafb..253e916f6 100644
--- a/src/ts/utils/audioInstance.ts
+++ b/src/ts/utils/audioInstance.ts
@@ -85,7 +85,6 @@ export class AudioInstance {
         );
         this.sound.setPlaybackRate(moveTowards(this.sound.getPlaybackRate(), this.targetPlaybackSpeed * this.playbackSpeedMultiplier, this.blendSpeed * deltaSeconds));
 
-
         /*if (this.parent !== null) {
             const worldPosition = Vector3.TransformCoordinates(this.localPosition, this.parent.getWorldMatrix());
             const camera = this.parent.getScene().activeCamera;
@@ -95,4 +94,8 @@ export class AudioInstance {
             this.spatialVolumeMultiplier = 1 / (1 + 0.01 * distance);
         }*/
     }
+
+    dispose() {
+        this.sound.dispose();
+    }
 }
diff --git a/src/ts/utils/hyperSpaceTunnel.ts b/src/ts/utils/hyperSpaceTunnel.ts
index e9a7f129e..2f64c039b 100644
--- a/src/ts/utils/hyperSpaceTunnel.ts
+++ b/src/ts/utils/hyperSpaceTunnel.ts
@@ -17,178 +17,175 @@ import { Transformable } from "../architecture/transformable";
  * @see https://playground.babylonjs.com/#W9LE0U#28
  */
 export class HyperSpaceTunnel implements Transformable {
-  maxNbDrops = 1000;
-  maxLineSize = 12.0;
-  positiveDepth = 600.0;
-  negativeDepth = 100.0;
-  radius = 50;
-  minSpeed = 200.0;
-  maxSpeed = 400.0;
+    maxNbDrops = 500;
+    maxLineSize = 12.0;
+    positiveDepth = 600.0;
+    negativeDepth = 100.0;
+    radius = 50;
+    minSpeed = 200.0;
+    maxSpeed = 400.0;
+
+    drops: [Vector3, Vector3][] = [];
+    speeds: number[] = [];
+    colors: [Color4, Color4][] = [];
+    deltaSpeed: number;
+
+    private parent: TransformNode | null = null;
+
+    readonly direction: Vector3;
+    readonly v1: Vector3;
+    readonly v2: Vector3;
+
+    readonly spaceLines: LinesMesh;
+    readonly warpCone: Mesh;
+
+    readonly warpConeMaterial: ShaderMaterial;
+
+    private throttle = 1;
+
+    private diameterTop = 0;
+    private diameterBottom = 160;
+
+    private elapsedSeconds = 0;
+
+    constructor(direction: Vector3, scene: Scene) {
+        this.deltaSpeed = this.maxSpeed - this.minSpeed;
+
+        this.direction = direction;
+
+        // find two orthogonal vectors to the direction vector (see  https://en.wikipedia.org/wiki/Gram%E2%80%93Schmidt_process)
+        const v1 = new Vector3(Math.random(), Math.random(), Math.random()).normalize();
+        v1.subtractInPlace(this.direction.scale(this.direction.dot(v1))).normalize();
+
+        const v2 = Vector3.Cross(this.direction, v1).normalize();
+
+        this.v1 = v1;
+        this.v2 = v2;
+
+        for (let d = 0; d < this.maxNbDrops; d++) {
+            this.drops.push(this.getRandomStartingPositions());
+
+            const color0 = new Color4(1.0, 1.0, 0.7, 1.0);
+            const color1 = new Color4(1.0, 1.0, 0.7, 1.0);
+            this.colors.push([color0, color1]);
+
+            this.speeds.push(this.minSpeed + this.deltaSpeed * Math.random());
+        }
+
+        this.spaceLines = MeshBuilder.CreateLineSystem(
+            "rain",
+            {
+                lines: this.drops,
+                updatable: true,
+                colors: this.colors
+            },
+            scene
+        );
+
+        this.warpCone = MeshBuilder.CreateCylinder(
+            "cone",
+            {
+                diameterTop: this.diameterTop,
+                diameterBottom: this.diameterBottom,
+                height: this.positiveDepth + this.negativeDepth,
+                sideOrientation: Mesh.BACKSIDE,
+                subdivisions: 64
+            },
+            scene
+        );
+        this.warpCone.parent = this.parent;
+        this.warpCone.rotation.x = Math.PI / 2;
+        this.warpCone.position.z = this.positiveDepth / 2;
+        this.warpCone.bakeCurrentTransformIntoVertices();
+
+        Effect.ShadersStore["warpConeMaterialFragmentShader"] = warpConeFragment;
+        Effect.ShadersStore["warpConeMaterialVertexShader"] = warpConeVertex;
+        this.warpConeMaterial = new ShaderMaterial("warpConeMaterial", scene, "warpConeMaterial", {
+            attributes: ["position", "uv"],
+            uniforms: ["worldViewProjection", "time"],
+            samplers: ["warpNoise"]
+        });
+        this.warpConeMaterial.setTexture("warpNoise", Assets.SEAMLESS_PERLIN);
+
+        this.warpCone.material = this.warpConeMaterial;
+    }
+
+    private getRandomStartingPositions(): [Vector3, Vector3] {
+        const theta = Math.random() * Math.PI * 2;
+        const radiusScaling = 1 + (Math.random() * 2 - 1) * 0.5;
+
+        const p0 = new Vector3(Math.cos(theta), Math.sin(theta), 0).scale((radiusScaling * this.diameterTop) / 2);
+        const p1 = new Vector3(Math.cos(theta), Math.sin(theta), 0).scale((radiusScaling * this.diameterBottom) / 2);
+        p0.addInPlace(this.direction.scale(this.positiveDepth));
+        p1.subtractInPlace(this.direction.scale(this.negativeDepth));
+
+        const direction = p1.subtract(p0).normalize();
+
+        const lineSize = this.maxLineSize * Math.random();
+
+        const point0 = p0;
+        const point1 = point0.add(direction.scale(lineSize));
 
-  drops: [Vector3, Vector3][] = [];
-  speeds: number[] = [];
-  colors: [Color4, Color4][] = [];
-  deltaSpeed: number;
+        return [point0, point1];
+    }
 
-  private parent: TransformNode | null = null;
+    setParent(parent: TransformNode) {
+        this.parent = parent;
+    }
 
-  readonly direction: Vector3;
-  readonly v1: Vector3;
-  readonly v2: Vector3;
+    setEnabled(enabled: boolean) {
+        this.spaceLines.setEnabled(enabled);
+        this.warpCone.setEnabled(enabled);
+    }
 
-  readonly spaceLines: LinesMesh;
-  readonly warpCone: Mesh;
+    getTransform(): TransformNode {
+        return this.spaceLines;
+    }
 
-  private throttle = 1;
+    rainFalls(deltaTime: number) {
+        for (let d = 0; d < this.maxNbDrops; d++) {
+            const drop = this.drops[d];
+            const speed = this.speeds[d] * this.throttle;
+            const direction = drop[0].subtract(drop[1]).normalize();
+            drop[0].subtractInPlace(direction.scale(speed * deltaTime));
+            drop[1].subtractInPlace(direction.scale(speed * deltaTime));
+
+            if (drop[0].dot(this.direction) < -this.negativeDepth) {
+                const [point0, point1] = this.getRandomStartingPositions();
+
+                drop[0].copyFrom(point0);
+                drop[1].copyFrom(point1);
+            }
+        }
+    }
 
-  private diameterTop = 20;
-  private diameterBottom = 100;
+    update(deltaSeconds: number) {
+        this.elapsedSeconds += deltaSeconds;
 
-  constructor(direction: Vector3, scene: Scene) {
-    this.deltaSpeed = this.maxSpeed - this.minSpeed;
+        this.warpConeMaterial.setFloat("time", this.elapsedSeconds);
+        this.rainFalls(deltaSeconds);
 
-    this.direction = direction;
+        MeshBuilder.CreateLineSystem("rain", { lines: this.drops, instance: this.spaceLines });
 
-    // find two orthogonal vectors to the direction vector (see  https://en.wikipedia.org/wiki/Gram%E2%80%93Schmidt_process)
-    const v1 = new Vector3(Math.random(), Math.random(), Math.random()).normalize();
-    v1.subtractInPlace(this.direction.scale(this.direction.dot(v1))).normalize();
+        if (this.parent === null) return;
 
-    const v2 = Vector3.Cross(this.direction, v1).normalize();
+        this.spaceLines.position = this.parent.getAbsolutePosition();
+        this.warpCone.position = this.parent.getAbsolutePosition();
 
-    this.v1 = v1;
-    this.v2 = v2;
+        const targetForward = getForwardDirection(this.parent);
+        const currentForward = getForwardDirection(this.getTransform());
 
-    for (let d = 0; d < this.maxNbDrops; d++) {
-      this.drops.push(this.getRandomStartingPositions());
+        if (targetForward.equalsWithEpsilon(currentForward, 0.001)) return;
 
-      const color0 = new Color4(1.0, 1.0, 0.7, 1.0);
-      const color1 = new Color4(1.0, 1.0, 0.7, 1.0);
-      this.colors.push([color0, color1]);
+        const rotationAxis = Vector3.Cross(currentForward, targetForward);
+        const theta = Math.acos(Vector3.Dot(currentForward, targetForward));
 
-      this.speeds.push(this.minSpeed + this.deltaSpeed * Math.random());
+        rotate(this.spaceLines, rotationAxis, theta);
+        rotate(this.warpCone, rotationAxis, theta);
     }
 
-    const rain = MeshBuilder.CreateLineSystem(
-      "rain",
-      {
-        lines: this.drops,
-        updatable: true,
-        //useVertexAlpha: true,
-        colors: this.colors
-      },
-      scene
-    );
-
-    this.spaceLines = rain;
-    this.warpCone = MeshBuilder.CreateCylinder(
-      "cone",
-      {
-        diameterTop: this.diameterTop,
-        diameterBottom: this.diameterBottom,
-        height: this.positiveDepth + this.negativeDepth,
-        cap: Mesh.NO_CAP,
-        sideOrientation: Mesh.BACKSIDE
-      },
-      scene
-    );
-    this.warpCone.parent = this.parent;
-    this.warpCone.rotation.x = Math.PI / 2;
-    this.warpCone.position.z = this.positiveDepth / 2;
-    this.warpCone.bakeCurrentTransformIntoVertices();
-    this.warpCone.visibility = 0.5;
-
-    Effect.ShadersStore["warpConeMaterialFragmentShader"] = warpConeFragment;
-    Effect.ShadersStore["warpConeMaterialVertexShader"] = warpConeVertex;
-    const warpConeMaterial = new ShaderMaterial("warpConeMaterial", scene, "warpConeMaterial", {
-      attributes: ["position", "uv"],
-      uniforms: ["worldViewProjection", "time"],
-      samplers: ["warpNoise"]
-    });
-    warpConeMaterial.setTexture("warpNoise", Assets.WARP_NOISE);
-
-    this.warpCone.material = warpConeMaterial;
-
-    let clock = 0.0;
-    scene.registerBeforeRender(() => {
-      const deltaTime = scene.getEngine().getDeltaTime() / 1000;
-      clock += deltaTime;
-
-      warpConeMaterial.setFloat("time", clock);
-      this.rainFalls(deltaTime);
-
-      MeshBuilder.CreateLineSystem("rain", { lines: this.drops, instance: rain });
-
-      if (this.parent === null) return;
-
-      this.spaceLines.position = this.parent.getAbsolutePosition();
-      this.warpCone.position = this.parent.getAbsolutePosition();
-
-      const targetForward = getForwardDirection(this.parent);
-      const currentForward = getForwardDirection(this.getTransform());
-
-      if (targetForward.equalsWithEpsilon(currentForward, 0.001)) return;
-
-      const rotationAxis = Vector3.Cross(currentForward, targetForward);
-      const angle = Math.acos(Vector3.Dot(currentForward, targetForward));
-
-      const theta = angle; //Math.min(0.3 * deltaTime, angle);
-
-      rotate(this.spaceLines, rotationAxis, theta);
-      rotate(this.warpCone, rotationAxis, theta);
-    });
-  }
-
-  private getRandomStartingPositions(): [Vector3, Vector3] {
-    const theta = Math.random() * Math.PI * 2;
-    const radiusScaling = 1 + (Math.random() * 2 - 1) * 0.5;
-
-    const p0 = new Vector3(Math.cos(theta), Math.sin(theta), 0).scale((radiusScaling * this.diameterTop) / 2);
-    const p1 = new Vector3(Math.cos(theta), Math.sin(theta), 0).scale((radiusScaling * this.diameterBottom) / 2);
-    p0.addInPlace(this.direction.scale(this.positiveDepth));
-    p1.subtractInPlace(this.direction.scale(this.negativeDepth));
-
-    const direction = p1.subtract(p0).normalize();
-
-    const lineSize = this.maxLineSize * Math.random();
-
-    const point0 = p0;
-    const point1 = point0.add(direction.scale(lineSize));
-
-    return [point0, point1];
-  }
-
-  setParent(parent: TransformNode) {
-    this.parent = parent;
-  }
-
-  setEnabled(enabled: boolean) {
-    this.spaceLines.setEnabled(enabled);
-    this.warpCone.setEnabled(enabled);
-  }
-
-  getTransform(): TransformNode {
-    return this.spaceLines;
-  }
-
-  rainFalls(deltaTime: number) {
-    for (let d = 0; d < this.maxNbDrops; d++) {
-      const drop = this.drops[d];
-      const speed = this.speeds[d] * this.throttle;
-      const direction = drop[0].subtract(drop[1]).normalize();
-      drop[0].subtractInPlace(direction.scale(speed * deltaTime));
-      drop[1].subtractInPlace(direction.scale(speed * deltaTime));
-
-      if (drop[0].dot(this.direction) < -this.negativeDepth) {
-        const [point0, point1] = this.getRandomStartingPositions();
-
-        drop[0].copyFrom(point0);
-        drop[1].copyFrom(point1);
-      }
+    dispose() {
+        this.spaceLines.dispose();
+        this.warpCone.dispose();
     }
-  }
-
-  dispose() {
-    this.spaceLines.dispose();
-    this.warpCone.dispose();
-  }
-}
\ No newline at end of file
+}
diff --git a/src/ts/utils/inputControlsString.ts b/src/ts/utils/inputControlsString.ts
index 045ac2901..c97448014 100644
--- a/src/ts/utils/inputControlsString.ts
+++ b/src/ts/utils/inputControlsString.ts
@@ -1,10 +1,6 @@
-import {
-    AxisComposite,
-    ButtonInputControl,
-    StickInputControl,
-    Vector2InputControl
-} from "@brianchirls/game-input/browser";
+import { AxisComposite, ButtonInputControl, StickInputControl, Vector2InputControl } from "@brianchirls/game-input/browser";
 import DPadComposite from "@brianchirls/game-input/controls/DPadComposite";
+import PressInteraction from "@brianchirls/game-input/interactions/PressInteraction";
 
 export function stickInputToString(input: StickInputControl): [string, string][] {
     const keys: [string, string][] = [];
@@ -22,23 +18,22 @@ export function dPadCompositeToString(input: DPadComposite): [string, string][]
         let name = child.name;
         // remove the "key:" prefix
         name = name.replace("key:", "");
-        // remove the occasional Key
-        name = name.replace("Key", "");
         keys.push([key, name]);
     });
     return keys;
 }
 
 export function vector2ToString(input: Vector2InputControl): [string, string][] {
-    return [["x", "pointerX"], ["y", "pointerY"]];
+    return [
+        ["x", "pointerX"],
+        ["y", "pointerY"]
+    ];
 }
 
 export function buttonInputToString(input: ButtonInputControl): string {
     let name = input.name;
     // remove the "key:" prefix
     name = name.replace("key:", "");
-    // remove the occasional Key
-    name = name.replace("Key", "");
     return name;
 }
 
@@ -49,9 +44,12 @@ export function axisCompositeToString(input: AxisComposite): [string, string][]
 
         // remove the "key:" prefix
         name = name.replace("key:", "");
-        // remove the occasional Key
-        name = name.replace("Key", "");
         keys.push([key, name]);
     });
     return keys;
 }
+
+export function pressInteractionToStrings(pressInteraction: PressInteraction): string[] {
+    const bindings = pressInteraction.action.bindings;
+    return bindings.map((binding) => buttonInputToString(binding.control as ButtonInputControl));
+}
diff --git a/src/ts/utils/notification.ts b/src/ts/utils/notification.ts
new file mode 100644
index 000000000..7508e5413
--- /dev/null
+++ b/src/ts/utils/notification.ts
@@ -0,0 +1,37 @@
+import { Assets } from "../assets";
+
+export function createNotification(text: string, duration: number) {
+    const container = document.getElementById("notificationContainer");
+    if (container === null) throw new Error("No notification container found");
+
+    const newNotification = document.createElement("div");
+    newNotification.classList.add("notification");
+
+    const textNode = document.createElement("p");
+    textNode.textContent = text;
+
+    newNotification.appendChild(textNode);
+
+    const progress = document.createElement("div");
+    progress.classList.add("notification-progress");
+
+    const progressBar = document.createElement("div");
+    progressBar.classList.add("notification-progress-bar");
+    progress.appendChild(progressBar);
+
+    newNotification.appendChild(progress);
+
+    container.appendChild(newNotification);
+
+    Assets.MENU_SELECT_SOUND.play();
+
+    // animate progress bar
+    progressBar.style.animation = `progress ${duration}ms linear`;
+
+    setTimeout(() => {
+        newNotification.style.animation = "popOut 0.5s ease-in-out";
+        setTimeout(() => {
+            newNotification.remove();
+        }, 500);
+    }, duration);
+}
diff --git a/src/ts/utils/parseToStrings.ts b/src/ts/utils/parseToStrings.ts
index 7ff8e8d47..577adb4b5 100644
--- a/src/ts/utils/parseToStrings.ts
+++ b/src/ts/utils/parseToStrings.ts
@@ -36,8 +36,10 @@ export function parseDistance(distance: number): string {
         return `${(distance / 1000).toFixed(2)} km`;
     } else if (distance < 20000000) {
         return `${(distance / 1000000).toFixed(2)} Mm`;
-    } else {
+    } else if (distance < 0.3 * Settings.LIGHT_YEAR) {
         return `${(distance / Settings.C).toFixed(2)} ls`;
+    } else {
+        return `${(distance / Settings.LIGHT_YEAR).toFixed(2)} ly`;
     }
 }
 
@@ -48,8 +50,10 @@ export function parseSeconds(seconds: number): string {
         return `${(seconds / 60).toFixed(0)} min`;
     } else if (seconds < 86400) {
         return `${(seconds / 3600).toFixed(0)} h`;
+    } else if (seconds < 604800) {
+        return `${(seconds / (60 * 60 * 24)).toFixed(0)} d`;
     } else {
-        return `${(seconds / 86400).toFixed(0)} d`;
+        return `${(seconds / (60 * 60 * 24 * 365.25)).toFixed(0)} y`;
     }
 }
 
diff --git a/src/ts/utils/solidPlume.ts b/src/ts/utils/solidPlume.ts
index 4ff4fba64..914cb0284 100644
--- a/src/ts/utils/solidPlume.ts
+++ b/src/ts/utils/solidPlume.ts
@@ -22,7 +22,7 @@ export class SolidPlume {
 
     SPS: SolidParticleSystem;
 
-    private nbSubTimeSteps = 5;
+    private nbSubTimeSteps = 1;
     private subTimeStep = 0;
 
     constructor(engineAnchor: TransformNode, scene: Scene) {
@@ -114,7 +114,7 @@ export class SolidPlume {
         const r = Math.sqrt(Math.random());
         const theta = Math.random() * 2 * Math.PI;
 
-        const position = new Vector3(r * Math.cos(theta), r * Math.sin(theta), 0);
+        const position = new Vector3(r * Math.cos(theta), r * Math.sin(theta), Math.random() * SolidPlume.TUNNEL_LENGTH);
 
         particle.position.copyFrom(position);
 
diff --git a/src/ts/utils/systemTarget.ts b/src/ts/utils/systemTarget.ts
new file mode 100644
index 000000000..757f2f4e4
--- /dev/null
+++ b/src/ts/utils/systemTarget.ts
@@ -0,0 +1,40 @@
+import { Scene } from "@babylonjs/core/scene";
+import { TransformNode } from "@babylonjs/core/Meshes";
+import { Transformable } from "../architecture/transformable";
+import { BoundingSphere } from "../architecture/boundingSphere";
+import { TypedObject } from "../architecture/typedObject";
+import { SystemSeed } from "./systemSeed";
+import { StarSystemModel } from "../starSystem/starSystemModel";
+
+export class SystemTarget implements Transformable, BoundingSphere, TypedObject {
+    readonly name: string;
+    private readonly transform: TransformNode;
+    private readonly scene: Scene;
+
+    readonly seed: SystemSeed;
+
+    constructor(seed: SystemSeed, scene: Scene) {
+        const systemModel = new StarSystemModel(seed);
+        this.name = systemModel.getName();
+        this.transform = new TransformNode(this.name, scene);
+        this.scene = scene;
+
+        this.seed = seed;
+    }
+
+    getTransform(): TransformNode {
+        return this.transform;
+    }
+
+    dispose(): void {
+        this.getTransform().dispose();
+    }
+
+    getBoundingRadius(): number {
+        return 0;
+    }
+
+    getTypeName(): string {
+        return "Star system";
+    }
+}
diff --git a/src/ts/utils/view.ts b/src/ts/utils/view.ts
index ef44c42b1..6f3567e75 100644
--- a/src/ts/utils/view.ts
+++ b/src/ts/utils/view.ts
@@ -1,10 +1,27 @@
 import { Scene } from "@babylonjs/core/scene";
 
+/**
+ * A view is a super set of a scene. In order to prevent interactions between post-processes and the GUI, we actually
+ * need to use multiple scenes (layers), hence the concept of a view that is composed of multiple scenes.
+ */
 export interface View {
+    /**
+     * Renders the view. It is composed of multiple scene layers: a main scene (bottom layer) and other scenes to handle the UI for example.
+     */
     render(): void;
 
+    /**
+     * Remove user input to ensure the player does not interact with the view when another view is displayed
+     */
     detachControl(): void;
+
+    /**
+     * Attach user input to the view to allow the player to interact with it
+     */
     attachControl(): void;
 
+    /**
+     * Returns the bottom layer scene of the view. This is useful for taking a screenshot of the view for example as we can only use one camera at a time.
+     */
     getMainScene(): Scene;
 }
diff --git a/src/ts/utils/wait.ts b/src/ts/utils/wait.ts
new file mode 100644
index 000000000..abfef668e
--- /dev/null
+++ b/src/ts/utils/wait.ts
@@ -0,0 +1,7 @@
+export async function wait(nbMilliseconds: number) {
+    return new Promise<void>((resolve) => {
+        setTimeout(() => {
+            resolve();
+        }, nbMilliseconds);
+    });
+}
diff --git a/src/ts/xr.ts b/src/ts/xr.ts
index 71ca5c3ed..7a7bf94b5 100644
--- a/src/ts/xr.ts
+++ b/src/ts/xr.ts
@@ -31,7 +31,9 @@ import { TelluricPlanet } from "./planets/telluricPlanet/telluricPlanet";
 import { ChunkForgeWorkers } from "./planets/telluricPlanet/terrain/chunks/chunkForgeWorkers";
 import { Star } from "./stellarObjects/star/star";
 import { Settings } from "./settings";
-import { ScenePerformancePriority } from "@babylonjs/core";
+import { ScenePerformancePriority } from "@babylonjs/core/scene";
+
+import "@babylonjs/core";
 
 const canvas = document.getElementById("renderer") as HTMLCanvasElement;
 canvas.width = window.innerWidth;