fix nextjs CVE

cache planets for one minute so we dont spam ESI
update official instance url
2026-02-12 02:38:48 +01:00 · 2025-12-12 12:22:33 +02:00 · 2025-11-09 23:07:23 +02:00 · 2025-08-01 09:45:25 +03:00 · 2025-05-17 20:28:01 +03:00 · 2025-05-17 19:51:21 +03:00
40 changed files with 2658 additions and 764 deletions
--- a/.env.example
+++ b/.env.example
@@ -4,3 +4,4 @@ EVE_SSO_SECRET=Secret Key
 EVE_SSO_CALLBACK_URL=Callback URL (This should be the domain you are hosting at or if run locally it should be http://localhost:3000)
 NEXT_PUBLIC_PRAISAL_URL=https://praisal.avanto.tk/appraisal/structured.json?persist=no
 SENTRY_AUTH_TOKEN=Sentry token for error reporting.
+LOG_LEVEL=warn
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@

 Simple tool to track your PI planet extractors. Login with your characters and enjoy the PI!

-Any questions, feedback or suggestions are welcome at [EVE PI Discord](https://discord.gg/GPtw5kfuJu)
+Any questions, feedback or suggestions are welcome at [EVE PI Discord](https://discord.gg/bCdXzU8PHK)

-## [Avanto hosted PI tool](https://pi.avanto.tk)
+## [Hosted PI tool](https://pi.calli.fi)

 ![Screenshot of PI tool](https://github.com/calli-eve/eve-pi/blob/main/images/eve-pi.png)
 ![3D render of a planet](https://github.com/calli-eve/eve-pi/blob/main/images/3dplanet.png)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
---
-version: "2.1"
 services:
  eve-pi:
    image: ghcr.io/calli-eve/eve-pi:latest
@@ -10,6 +8,7 @@ services:
      - EVE_SSO_SECRET=${EVE_SSO_SECRET}
      - NEXT_PUBLIC_PRAISAL_URL=${NEXT_PUBLIC_PRAISAL_URL}
      - SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
+      - LOG_LEVEL=warn
    ports:
      - 3000:3000
    restart: unless-stopped
--- a/next.config.js
+++ b/next.config.js
@@ -43,11 +43,6 @@ module.exports = withSentryConfig(
    // Transpiles SDK to be compatible with IE11 (increases bundle size)
    transpileClientSDK: true,

-    // Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
-    // This can increase your server load as well as your hosting bill.
-    // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
-    // side errors will fail.
-    tunnelRoute: "/monitoring",

    // Hides source maps from generated client bundles
    hideSourceMaps: true,
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,15 +16,18 @@
        "@mui/material": "^5.13.5",
        "@sentry/nextjs": "^8.2.1",
        "@types/node": "20.3.1",
+        "@types/pino": "^7.0.4",
        "@types/react": "18.2.12",
        "@types/react-dom": "18.2.5",
        "autoprefixer": "10.4.14",
        "chart.js": "^4.4.7",
        "crypto-js": "^4.1.1",
        "eslint": "8.42.0",
-        "luxon": "^3.3.0",
-        "next": "^14.2.23",
+        "luxon": "^3.6.1",
+        "next": "14.2.35",
        "next-plausible": "^3.12.0",
+        "pino": "^9.6.0",
+        "pino-pretty": "^13.0.0",
        "react": "^18.3.1",
        "react-chartjs-2": "^5.3.0",
        "react-color": "^2.19.3",
@@ -37,7 +40,7 @@
      },
      "devDependencies": {
        "@types/crypto-js": "^4.1.1",
-        "@types/luxon": "^3.3.0",
+        "@types/luxon": "^3.6.1",
        "@types/react-color": "^3.0.7",
        "@types/three": "^0.152.1",
        "eslint-config-next": "^14.2.23",
@@ -994,9 +997,9 @@
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
    },
    "node_modules/@next/env": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.23.tgz",
-      "integrity": "sha512-CysUC9IO+2Bh0omJ3qrb47S8DtsTKbFidGm6ow4gXIG6reZybqxbkH2nhdEm1tC8SmgzDdpq3BIML0PWsmyUYA==",
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.35.tgz",
+      "integrity": "sha512-DuhvCtj4t9Gwrx80dmz2F4t/zKQ4ktN8WrMwOuVzkJfBilwAwGr6v16M5eI8yCuZ63H9TTuEU09Iu2HqkzFPVQ==",
      "license": "MIT"
    },
    "node_modules/@next/eslint-plugin-next": {
@@ -1069,9 +1072,9 @@
      }
    },
    "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.23.tgz",
-      "integrity": "sha512-WhtEntt6NcbABA8ypEoFd3uzq5iAnrl9AnZt9dXdO+PZLACE32z3a3qA5OoV20JrbJfSJ6Sd6EqGZTrlRnGxQQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.33.tgz",
+      "integrity": "sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA==",
      "cpu": [
        "arm64"
      ],
@@ -1085,9 +1088,9 @@
      }
    },
    "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.23.tgz",
-      "integrity": "sha512-vwLw0HN2gVclT/ikO6EcE+LcIN+0mddJ53yG4eZd0rXkuEr/RnOaMH8wg/sYl5iz5AYYRo/l6XX7FIo6kwbw1Q==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.33.tgz",
+      "integrity": "sha512-8HGBeAE5rX3jzKvF593XTTFg3gxeU4f+UWnswa6JPhzaR6+zblO5+fjltJWIZc4aUalqTclvN2QtTC37LxvZAA==",
      "cpu": [
        "x64"
      ],
@@ -1101,9 +1104,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.23.tgz",
-      "integrity": "sha512-uuAYwD3At2fu5CH1wD7FpP87mnjAv4+DNvLaR9kiIi8DLStWSW304kF09p1EQfhcbUI1Py2vZlBO2VaVqMRtpg==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.33.tgz",
+      "integrity": "sha512-JXMBka6lNNmqbkvcTtaX8Gu5by9547bukHQvPoLe9VRBx1gHwzf5tdt4AaezW85HAB3pikcvyqBToRTDA4DeLw==",
      "cpu": [
        "arm64"
      ],
@@ -1117,9 +1120,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.23.tgz",
-      "integrity": "sha512-Mm5KHd7nGgeJ4EETvVgFuqKOyDh+UMXHXxye6wRRFDr4FdVRI6YTxajoV2aHE8jqC14xeAMVZvLqYqS7isHL+g==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.33.tgz",
+      "integrity": "sha512-Bm+QulsAItD/x6Ih8wGIMfRJy4G73tu1HJsrccPW6AfqdZd0Sfm5Imhgkgq2+kly065rYMnCOxTBvmvFY1BKfg==",
      "cpu": [
        "arm64"
      ],
@@ -1133,9 +1136,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.23.tgz",
-      "integrity": "sha512-Ybfqlyzm4sMSEQO6lDksggAIxnvWSG2cDWnG2jgd+MLbHYn2pvFA8DQ4pT2Vjk3Cwrv+HIg7vXJ8lCiLz79qoQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.33.tgz",
+      "integrity": "sha512-FnFn+ZBgsVMbGDsTqo8zsnRzydvsGV8vfiWwUo1LD8FTmPTdV+otGSWKc4LJec0oSexFnCYVO4hX8P8qQKaSlg==",
      "cpu": [
        "x64"
      ],
@@ -1149,9 +1152,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.23.tgz",
-      "integrity": "sha512-OSQX94sxd1gOUz3jhhdocnKsy4/peG8zV1HVaW6DLEbEmRRtUCUQZcKxUD9atLYa3RZA+YJx+WZdOnTkDuNDNA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.33.tgz",
+      "integrity": "sha512-345tsIWMzoXaQndUTDv1qypDRiebFxGYx9pYkhwY4hBRaOLt8UGfiWKr9FSSHs25dFIf8ZqIFaPdy5MljdoawA==",
      "cpu": [
        "x64"
      ],
@@ -1165,9 +1168,9 @@
      }
    },
    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.23.tgz",
-      "integrity": "sha512-ezmbgZy++XpIMTcTNd0L4k7+cNI4ET5vMv/oqNfTuSXkZtSA9BURElPFyarjjGtRgZ9/zuKDHoMdZwDZIY3ehQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nscpt0G6UCTkrT2ppnJnFsYbPDQwmum4GNXYTeoTIdsmMydSKFz9Iny2jpaRupTb+Wl298+Rh82WKzt9LCcqSQ==",
      "cpu": [
        "arm64"
      ],
@@ -1181,9 +1184,9 @@
      }
    },
    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.23.tgz",
-      "integrity": "sha512-zfHZOGguFCqAJ7zldTKg4tJHPJyJCOFhpoJcVxKL9BSUHScVDnMdDuOU1zPPGdOzr/GWxbhYTjyiEgLEpAoFPA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.33.tgz",
+      "integrity": "sha512-pc9LpGNKhJ0dXQhZ5QMmYxtARwwmWLpeocFmVG5Z0DzWq5Uf0izcI8tLc+qOpqxO1PWqZ5A7J1blrUIKrIFc7Q==",
      "cpu": [
        "ia32"
      ],
@@ -1197,9 +1200,9 @@
      }
    },
    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.23.tgz",
-      "integrity": "sha512-xCtq5BD553SzOgSZ7UH5LH+OATQihydObTrCTvVzOro8QiWYKdBVwcB2Mn2MLMo6DGW9yH1LSPw7jS7HhgJgjw==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nOjfZMy8B94MdisuzZo9/57xuFVLHJaDj5e/xrduJp9CV2/HrfxTRH2fbyLe+K9QT41WBLUd4iXX3R7jBp0EUg==",
      "cpu": [
        "x64"
      ],
@@ -2516,10 +2519,11 @@
      "license": "MIT"
    },
    "node_modules/@types/luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg==",
-      "dev": true
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-GEo4k1yY5PBaPLqEbk+vp2LhVCKPa/TQlTjuCf3exvx6fjB+jVuDa/Zopi8eznEkJf8yeZRzSK/kzG14g5aXPQ==",
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/@types/mysql": {
      "version": "2.15.26",
@@ -2560,6 +2564,15 @@
        "@types/pg": "*"
      }
    },
+    "node_modules/@types/pino": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/pino/-/pino-7.0.4.tgz",
+      "integrity": "sha512-yKw1UbZOTe7vP1xMQT+oz3FexwgIpBTrM+AC62vWgAkNRULgLTJWfYX+H5/sKPm8VXFbIcXkC3VZPyuaNioZFg==",
+      "license": "MIT",
+      "dependencies": {
+        "pino": "*"
+      }
+    },
    "node_modules/@types/prop-types": {
      "version": "15.7.5",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@@ -3174,6 +3187,15 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/atomic-sleep": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
+      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
    "node_modules/autoprefixer": {
      "version": "10.4.14",
      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
@@ -3712,6 +3734,12 @@
        "simple-swizzle": "^0.2.2"
      }
    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "license": "MIT"
+    },
    "node_modules/commander": {
      "version": "2.20.3",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -3844,6 +3872,15 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/debug": {
      "version": "4.4.0",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -5045,6 +5082,12 @@
        "node": ">=6"
      }
    },
+    "node_modules/fast-copy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
+      "integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==",
+      "license": "MIT"
+    },
    "node_modules/fast-deep-equal": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5101,6 +5144,21 @@
      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
    },
+    "node_modules/fast-redact": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
+      "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "license": "MIT"
+    },
    "node_modules/fast-uri": {
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
@@ -5606,6 +5664,12 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/help-me": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
+      "license": "MIT"
+    },
    "node_modules/hoist-non-react-statics": {
      "version": "3.3.2",
      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -6301,6 +6365,15 @@
        "url": "https://github.com/chalk/supports-color?sponsor=1"
      }
    },
+    "node_modules/joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6459,9 +6532,10 @@
      }
    },
    "node_modules/luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "license": "MIT",
      "engines": {
        "node": ">=12"
      }
@@ -6645,12 +6719,12 @@
      "peer": true
    },
    "node_modules/next": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.23.tgz",
-      "integrity": "sha512-mjN3fE6u/tynneLiEg56XnthzuYw+kD7mCujgVqioxyPqbmiotUCGJpIZGS/VaPg3ZDT1tvWxiVyRzeqJFm/kw==",
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.35.tgz",
+      "integrity": "sha512-KhYd2Hjt/O1/1aZVX3dCwGXM1QmOV4eNM2UTacK5gipDdPN/oHHK/4oVGy7X8GMfPMsUTUEmGlsy0EY1YGAkig==",
      "license": "MIT",
      "dependencies": {
-        "@next/env": "14.2.23",
+        "@next/env": "14.2.35",
        "@swc/helpers": "0.5.5",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001579",
@@ -6665,15 +6739,15 @@
        "node": ">=18.17.0"
      },
      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.2.23",
-        "@next/swc-darwin-x64": "14.2.23",
-        "@next/swc-linux-arm64-gnu": "14.2.23",
-        "@next/swc-linux-arm64-musl": "14.2.23",
-        "@next/swc-linux-x64-gnu": "14.2.23",
-        "@next/swc-linux-x64-musl": "14.2.23",
-        "@next/swc-win32-arm64-msvc": "14.2.23",
-        "@next/swc-win32-ia32-msvc": "14.2.23",
-        "@next/swc-win32-x64-msvc": "14.2.23"
+        "@next/swc-darwin-arm64": "14.2.33",
+        "@next/swc-darwin-x64": "14.2.33",
+        "@next/swc-linux-arm64-gnu": "14.2.33",
+        "@next/swc-linux-arm64-musl": "14.2.33",
+        "@next/swc-linux-x64-gnu": "14.2.33",
+        "@next/swc-linux-x64-musl": "14.2.33",
+        "@next/swc-win32-arm64-msvc": "14.2.33",
+        "@next/swc-win32-ia32-msvc": "14.2.33",
+        "@next/swc-win32-x64-msvc": "14.2.33"
      },
      "peerDependencies": {
        "@opentelemetry/api": "^1.1.0",
@@ -6940,6 +7014,15 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/on-exit-leak-free": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
+      "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
    "node_modules/once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -7187,6 +7270,67 @@
        "url": "https://github.com/sponsors/jonschlinkert"
      }
    },
+    "node_modules/pino": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-9.6.0.tgz",
+      "integrity": "sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==",
+      "license": "MIT",
+      "dependencies": {
+        "atomic-sleep": "^1.0.0",
+        "fast-redact": "^3.1.1",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pino-std-serializers": "^7.0.0",
+        "process-warning": "^4.0.0",
+        "quick-format-unescaped": "^4.0.3",
+        "real-require": "^0.2.0",
+        "safe-stable-stringify": "^2.3.1",
+        "sonic-boom": "^4.0.1",
+        "thread-stream": "^3.0.0"
+      },
+      "bin": {
+        "pino": "bin.js"
+      }
+    },
+    "node_modules/pino-abstract-transport": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
+      "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
+      "license": "MIT",
+      "dependencies": {
+        "split2": "^4.0.0"
+      }
+    },
+    "node_modules/pino-pretty": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-13.0.0.tgz",
+      "integrity": "sha512-cQBBIVG3YajgoUjo1FdKVRX6t9XPxwB9lcNJVD5GCnNM4Y6T12YYx8c6zEejxQsU0wrg9TwmDulcE9LR7qcJqA==",
+      "license": "MIT",
+      "dependencies": {
+        "colorette": "^2.0.7",
+        "dateformat": "^4.6.3",
+        "fast-copy": "^3.0.2",
+        "fast-safe-stringify": "^2.1.1",
+        "help-me": "^5.0.0",
+        "joycon": "^3.1.1",
+        "minimist": "^1.2.6",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pump": "^3.0.0",
+        "secure-json-parse": "^2.4.0",
+        "sonic-boom": "^4.0.1",
+        "strip-json-comments": "^3.1.1"
+      },
+      "bin": {
+        "pino-pretty": "bin.js"
+      }
+    },
+    "node_modules/pino-std-serializers": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
+      "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==",
+      "license": "MIT"
+    },
    "node_modules/possible-typed-array-names": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -7330,6 +7474,22 @@
        "node": ">=6.0.0"
      }
    },
+    "node_modules/process-warning": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.1.tgz",
+      "integrity": "sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
    "node_modules/progress": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -7391,6 +7551,12 @@
        }
      ]
    },
+    "node_modules/quick-format-unescaped": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
+      "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==",
+      "license": "MIT"
+    },
    "node_modules/raf-schd": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -7546,6 +7712,15 @@
        "node": ">=8.10.0"
      }
    },
+    "node_modules/real-require": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
+      "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
    "node_modules/redux": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
@@ -7898,6 +8073,15 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/safe-stable-stringify": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
+      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/scheduler": {
      "version": "0.23.2",
      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
@@ -7926,6 +8110,12 @@
        "url": "https://opencollective.com/webpack"
      }
    },
+    "node_modules/secure-json-parse": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
+      "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==",
+      "license": "BSD-3-Clause"
+    },
    "node_modules/semver": {
      "version": "7.7.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
@@ -8208,6 +8398,15 @@
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
    },
+    "node_modules/sonic-boom": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
+      "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
+      "license": "MIT",
+      "dependencies": {
+        "atomic-sleep": "^1.0.0"
+      }
+    },
    "node_modules/source-map": {
      "version": "0.5.7",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -8246,6 +8445,15 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
    "node_modules/stacktrace-parser": {
      "version": "0.1.10",
      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
@@ -8744,6 +8952,15 @@
      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
    },
+    "node_modules/thread-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
+      "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
+      "license": "MIT",
+      "dependencies": {
+        "real-require": "^0.2.0"
+      }
+    },
    "node_modules/three": {
      "version": "0.154.0",
      "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz",
@@ -10041,9 +10258,9 @@
      }
    },
    "@next/env": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.23.tgz",
-      "integrity": "sha512-CysUC9IO+2Bh0omJ3qrb47S8DtsTKbFidGm6ow4gXIG6reZybqxbkH2nhdEm1tC8SmgzDdpq3BIML0PWsmyUYA=="
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.35.tgz",
+      "integrity": "sha512-DuhvCtj4t9Gwrx80dmz2F4t/zKQ4ktN8WrMwOuVzkJfBilwAwGr6v16M5eI8yCuZ63H9TTuEU09Iu2HqkzFPVQ=="
    },
    "@next/eslint-plugin-next": {
      "version": "14.2.23",
@@ -10094,57 +10311,57 @@
      }
    },
    "@next/swc-darwin-arm64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.23.tgz",
-      "integrity": "sha512-WhtEntt6NcbABA8ypEoFd3uzq5iAnrl9AnZt9dXdO+PZLACE32z3a3qA5OoV20JrbJfSJ6Sd6EqGZTrlRnGxQQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.33.tgz",
+      "integrity": "sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA==",
      "optional": true
    },
    "@next/swc-darwin-x64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.23.tgz",
-      "integrity": "sha512-vwLw0HN2gVclT/ikO6EcE+LcIN+0mddJ53yG4eZd0rXkuEr/RnOaMH8wg/sYl5iz5AYYRo/l6XX7FIo6kwbw1Q==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.33.tgz",
+      "integrity": "sha512-8HGBeAE5rX3jzKvF593XTTFg3gxeU4f+UWnswa6JPhzaR6+zblO5+fjltJWIZc4aUalqTclvN2QtTC37LxvZAA==",
      "optional": true
    },
    "@next/swc-linux-arm64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.23.tgz",
-      "integrity": "sha512-uuAYwD3At2fu5CH1wD7FpP87mnjAv4+DNvLaR9kiIi8DLStWSW304kF09p1EQfhcbUI1Py2vZlBO2VaVqMRtpg==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.33.tgz",
+      "integrity": "sha512-JXMBka6lNNmqbkvcTtaX8Gu5by9547bukHQvPoLe9VRBx1gHwzf5tdt4AaezW85HAB3pikcvyqBToRTDA4DeLw==",
      "optional": true
    },
    "@next/swc-linux-arm64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.23.tgz",
-      "integrity": "sha512-Mm5KHd7nGgeJ4EETvVgFuqKOyDh+UMXHXxye6wRRFDr4FdVRI6YTxajoV2aHE8jqC14xeAMVZvLqYqS7isHL+g==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.33.tgz",
+      "integrity": "sha512-Bm+QulsAItD/x6Ih8wGIMfRJy4G73tu1HJsrccPW6AfqdZd0Sfm5Imhgkgq2+kly065rYMnCOxTBvmvFY1BKfg==",
      "optional": true
    },
    "@next/swc-linux-x64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.23.tgz",
-      "integrity": "sha512-Ybfqlyzm4sMSEQO6lDksggAIxnvWSG2cDWnG2jgd+MLbHYn2pvFA8DQ4pT2Vjk3Cwrv+HIg7vXJ8lCiLz79qoQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.33.tgz",
+      "integrity": "sha512-FnFn+ZBgsVMbGDsTqo8zsnRzydvsGV8vfiWwUo1LD8FTmPTdV+otGSWKc4LJec0oSexFnCYVO4hX8P8qQKaSlg==",
      "optional": true
    },
    "@next/swc-linux-x64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.23.tgz",
-      "integrity": "sha512-OSQX94sxd1gOUz3jhhdocnKsy4/peG8zV1HVaW6DLEbEmRRtUCUQZcKxUD9atLYa3RZA+YJx+WZdOnTkDuNDNA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.33.tgz",
+      "integrity": "sha512-345tsIWMzoXaQndUTDv1qypDRiebFxGYx9pYkhwY4hBRaOLt8UGfiWKr9FSSHs25dFIf8ZqIFaPdy5MljdoawA==",
      "optional": true
    },
    "@next/swc-win32-arm64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.23.tgz",
-      "integrity": "sha512-ezmbgZy++XpIMTcTNd0L4k7+cNI4ET5vMv/oqNfTuSXkZtSA9BURElPFyarjjGtRgZ9/zuKDHoMdZwDZIY3ehQ==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nscpt0G6UCTkrT2ppnJnFsYbPDQwmum4GNXYTeoTIdsmMydSKFz9Iny2jpaRupTb+Wl298+Rh82WKzt9LCcqSQ==",
      "optional": true
    },
    "@next/swc-win32-ia32-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.23.tgz",
-      "integrity": "sha512-zfHZOGguFCqAJ7zldTKg4tJHPJyJCOFhpoJcVxKL9BSUHScVDnMdDuOU1zPPGdOzr/GWxbhYTjyiEgLEpAoFPA==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.33.tgz",
+      "integrity": "sha512-pc9LpGNKhJ0dXQhZ5QMmYxtARwwmWLpeocFmVG5Z0DzWq5Uf0izcI8tLc+qOpqxO1PWqZ5A7J1blrUIKrIFc7Q==",
      "optional": true
    },
    "@next/swc-win32-x64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.23.tgz",
-      "integrity": "sha512-xCtq5BD553SzOgSZ7UH5LH+OATQihydObTrCTvVzOro8QiWYKdBVwcB2Mn2MLMo6DGW9yH1LSPw7jS7HhgJgjw==",
+      "version": "14.2.33",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.33.tgz",
+      "integrity": "sha512-nOjfZMy8B94MdisuzZo9/57xuFVLHJaDj5e/xrduJp9CV2/HrfxTRH2fbyLe+K9QT41WBLUd4iXX3R7jBp0EUg==",
      "optional": true
    },
    "@nodelib/fs.scandir": {
@@ -10963,9 +11180,9 @@
      "dev": true
    },
    "@types/luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-GEo4k1yY5PBaPLqEbk+vp2LhVCKPa/TQlTjuCf3exvx6fjB+jVuDa/Zopi8eznEkJf8yeZRzSK/kzG14g5aXPQ==",
      "dev": true
    },
    "@types/mysql": {
@@ -11004,6 +11221,14 @@
        "@types/pg": "*"
      }
    },
+    "@types/pino": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/pino/-/pino-7.0.4.tgz",
+      "integrity": "sha512-yKw1UbZOTe7vP1xMQT+oz3FexwgIpBTrM+AC62vWgAkNRULgLTJWfYX+H5/sKPm8VXFbIcXkC3VZPyuaNioZFg==",
+      "requires": {
+        "pino": "*"
+      }
+    },
    "@types/prop-types": {
      "version": "15.7.5",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@@ -11492,6 +11717,11 @@
      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
      "dev": true
    },
+    "atomic-sleep": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
+      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="
+    },
    "autoprefixer": {
      "version": "10.4.14",
      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
@@ -11826,6 +12056,11 @@
        "simple-swizzle": "^0.2.2"
      }
    },
+    "colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
+    },
    "commander": {
      "version": "2.20.3",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -11926,6 +12161,11 @@
        "is-data-view": "^1.0.1"
      }
    },
+    "dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="
+    },
    "debug": {
      "version": "4.4.0",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -12755,6 +12995,11 @@
      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
    },
+    "fast-copy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
+      "integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ=="
+    },
    "fast-deep-equal": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -12805,6 +13050,16 @@
      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
    },
+    "fast-redact": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
+      "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A=="
+    },
+    "fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+    },
    "fast-uri": {
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
@@ -13133,6 +13388,11 @@
        "function-bind": "^1.1.2"
      }
    },
+    "help-me": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg=="
+    },
    "hoist-non-react-statics": {
      "version": "3.3.2",
      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -13563,6 +13823,11 @@
        }
      }
    },
+    "joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw=="
+    },
    "js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -13688,9 +13953,9 @@
      }
    },
    "luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ=="
    },
    "magic-string": {
      "version": "0.30.17",
@@ -13813,20 +14078,20 @@
      "peer": true
    },
    "next": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.23.tgz",
-      "integrity": "sha512-mjN3fE6u/tynneLiEg56XnthzuYw+kD7mCujgVqioxyPqbmiotUCGJpIZGS/VaPg3ZDT1tvWxiVyRzeqJFm/kw==",
+      "version": "14.2.35",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.35.tgz",
+      "integrity": "sha512-KhYd2Hjt/O1/1aZVX3dCwGXM1QmOV4eNM2UTacK5gipDdPN/oHHK/4oVGy7X8GMfPMsUTUEmGlsy0EY1YGAkig==",
      "requires": {
-        "@next/env": "14.2.23",
-        "@next/swc-darwin-arm64": "14.2.23",
-        "@next/swc-darwin-x64": "14.2.23",
-        "@next/swc-linux-arm64-gnu": "14.2.23",
-        "@next/swc-linux-arm64-musl": "14.2.23",
-        "@next/swc-linux-x64-gnu": "14.2.23",
-        "@next/swc-linux-x64-musl": "14.2.23",
-        "@next/swc-win32-arm64-msvc": "14.2.23",
-        "@next/swc-win32-ia32-msvc": "14.2.23",
-        "@next/swc-win32-x64-msvc": "14.2.23",
+        "@next/env": "14.2.35",
+        "@next/swc-darwin-arm64": "14.2.33",
+        "@next/swc-darwin-x64": "14.2.33",
+        "@next/swc-linux-arm64-gnu": "14.2.33",
+        "@next/swc-linux-arm64-musl": "14.2.33",
+        "@next/swc-linux-x64-gnu": "14.2.33",
+        "@next/swc-linux-x64-musl": "14.2.33",
+        "@next/swc-win32-arm64-msvc": "14.2.33",
+        "@next/swc-win32-ia32-msvc": "14.2.33",
+        "@next/swc-win32-x64-msvc": "14.2.33",
        "@swc/helpers": "0.5.5",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001579",
@@ -13983,6 +14248,11 @@
        "es-object-atoms": "^1.0.0"
      }
    },
+    "on-exit-leak-free": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
+      "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA=="
+    },
    "once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -14149,6 +14419,57 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
    },
+    "pino": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-9.6.0.tgz",
+      "integrity": "sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==",
+      "requires": {
+        "atomic-sleep": "^1.0.0",
+        "fast-redact": "^3.1.1",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pino-std-serializers": "^7.0.0",
+        "process-warning": "^4.0.0",
+        "quick-format-unescaped": "^4.0.3",
+        "real-require": "^0.2.0",
+        "safe-stable-stringify": "^2.3.1",
+        "sonic-boom": "^4.0.1",
+        "thread-stream": "^3.0.0"
+      }
+    },
+    "pino-abstract-transport": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
+      "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
+      "requires": {
+        "split2": "^4.0.0"
+      }
+    },
+    "pino-pretty": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-13.0.0.tgz",
+      "integrity": "sha512-cQBBIVG3YajgoUjo1FdKVRX6t9XPxwB9lcNJVD5GCnNM4Y6T12YYx8c6zEejxQsU0wrg9TwmDulcE9LR7qcJqA==",
+      "requires": {
+        "colorette": "^2.0.7",
+        "dateformat": "^4.6.3",
+        "fast-copy": "^3.0.2",
+        "fast-safe-stringify": "^2.1.1",
+        "help-me": "^5.0.0",
+        "joycon": "^3.1.1",
+        "minimist": "^1.2.6",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pump": "^3.0.0",
+        "secure-json-parse": "^2.4.0",
+        "sonic-boom": "^4.0.1",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "pino-std-serializers": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
+      "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA=="
+    },
    "possible-typed-array-names": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -14233,6 +14554,11 @@
        "fast-diff": "^1.1.2"
      }
    },
+    "process-warning": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.1.tgz",
+      "integrity": "sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q=="
+    },
    "progress": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -14272,6 +14598,11 @@
      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
    },
+    "quick-format-unescaped": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
+      "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg=="
+    },
    "raf-schd": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -14391,6 +14722,11 @@
        "picomatch": "^2.2.1"
      }
    },
+    "real-require": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
+      "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg=="
+    },
    "redux": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
@@ -14606,6 +14942,11 @@
        "is-regex": "^1.2.1"
      }
    },
+    "safe-stable-stringify": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
+      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA=="
+    },
    "scheduler": {
      "version": "0.23.2",
      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
@@ -14625,6 +14966,11 @@
        "ajv-keywords": "^3.5.2"
      }
    },
+    "secure-json-parse": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
+      "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="
+    },
    "semver": {
      "version": "7.7.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
@@ -14816,6 +15162,14 @@
        }
      }
    },
+    "sonic-boom": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
+      "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
+      "requires": {
+        "atomic-sleep": "^1.0.0"
+      }
+    },
    "source-map": {
      "version": "0.5.7",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -14844,6 +15198,11 @@
        }
      }
    },
+    "split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="
+    },
    "stacktrace-parser": {
      "version": "0.1.10",
      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
@@ -15175,6 +15534,14 @@
      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
    },
+    "thread-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
+      "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
+      "requires": {
+        "real-require": "^0.2.0"
+      }
+    },
    "three": {
      "version": "0.154.0",
      "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz",
--- a/package.json
+++ b/package.json
@@ -18,15 +18,18 @@
    "@mui/material": "^5.13.5",
    "@sentry/nextjs": "^8.2.1",
    "@types/node": "20.3.1",
+    "@types/pino": "^7.0.4",
    "@types/react": "18.2.12",
    "@types/react-dom": "18.2.5",
    "autoprefixer": "10.4.14",
    "chart.js": "^4.4.7",
    "crypto-js": "^4.1.1",
    "eslint": "8.42.0",
-    "luxon": "^3.3.0",
-    "next": "^14.2.23",
+    "luxon": "^3.6.1",
+    "next": "14.2.35",
    "next-plausible": "^3.12.0",
+    "pino": "^9.6.0",
+    "pino-pretty": "^13.0.0",
    "react": "^18.3.1",
    "react-chartjs-2": "^5.3.0",
    "react-color": "^2.19.3",
@@ -39,7 +42,7 @@
  },
  "devDependencies": {
    "@types/crypto-js": "^4.1.1",
-    "@types/luxon": "^3.3.0",
+    "@types/luxon": "^3.6.1",
    "@types/react-color": "^3.0.7",
    "@types/three": "^0.152.1",
    "eslint-config-next": "^14.2.23",
--- a/src/app/components/Account/AccountCard.tsx
+++ b/src/app/components/Account/AccountCard.tsx
@@ -1,30 +1,191 @@
-import { AccessToken } from "@/types";
-import { Box, Stack, Typography, useTheme, Paper, IconButton } from "@mui/material";
+import { AccessToken, PlanetWithInfo, Pin } from "@/types";
+import { Box, Stack, Typography, useTheme, Paper, IconButton, Divider } from "@mui/material";
 import { CharacterRow } from "../Characters/CharacterRow";
 import { PlanetaryInteractionRow } from "../PlanetaryInteraction/PlanetaryInteractionRow";
 import { SessionContext } from "@/app/context/Context";
-import { useContext, useState } from "react";
+import { useContext, useState, useEffect } from "react";
 import { PlanRow } from "./PlanRow";
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
 import { planetCalculations } from "@/planets";
 import { EvePraisalResult } from "@/eve-praisal";
-import { STORAGE_IDS } from "@/const";
+import { STORAGE_IDS, PI_SCHEMATICS, PI_PRODUCT_VOLUMES, STORAGE_CAPACITIES } from "@/const";
+import { DateTime } from "luxon";
+import { PlanetCalculations, AlertState, StorageContent, StorageInfo } from "@/types/planet";

 interface AccountTotals {
  monthlyEstimate: number;
  storageValue: number;
+  planetCount: number;
+  characterCount: number;
+  runningExtractors: number;
+  totalExtractors: number;
 }

+const calculateAlertState = (planetDetails: PlanetCalculations): AlertState => {
+  const hasLowStorage = planetDetails.storageInfo.some(storage => storage.fillRate > 60);
+  const hasLowImports = planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24);
+  
+  return {
+    expired: planetDetails.expired,
+    hasLowStorage,
+    hasLowImports,
+    hasLargeExtractorDifference: planetDetails.hasLargeExtractorDifference
+  };
+};
+
+const calculatePlanetDetails = (planet: PlanetWithInfo, piPrices: EvePraisalResult | undefined, balanceThreshold: number): PlanetCalculations => {
+  const { expired, extractors, localProduction: rawProduction, localImports, localExports: rawExports } = planetCalculations(planet);
+  
+  // Convert localProduction to include factoryCount
+  const localProduction = new Map(Array.from(rawProduction).map(([key, value]) => [
+    key,
+    {
+      ...value,
+      factoryCount: value.count || 1
+    }
+  ]));
+
+  // Calculate extractor averages and check for large differences
+  const extractorAverages = extractors
+    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
+    .map(e => {
+      const cycleTime = e.extractor_details?.cycle_time || 3600;
+      const qtyPerCycle = e.extractor_details?.qty_per_cycle || 0;
+      return {
+        typeId: e.extractor_details!.product_type_id!,
+        averagePerHour: (qtyPerCycle * 3600) / cycleTime
+      };
+    });
+
+  const hasLargeExtractorDifference = extractorAverages.length === 2 && 
+    Math.abs(extractorAverages[0].averagePerHour - extractorAverages[1].averagePerHour) > balanceThreshold;
+
+  // Calculate storage info
+  const storageFacilities = planet.info.pins.filter((pin: Pin) => 
+    STORAGE_IDS().some(storage => storage.type_id === pin.type_id)
+  );
+
+  const storageInfo = storageFacilities.map((storage: Pin) => {
+    if (!storage || !storage.contents) return null;
+
+    const storageType = STORAGE_IDS().find(s => s.type_id === storage.type_id)?.name || 'Unknown';
+    const storageCapacity = STORAGE_CAPACITIES[storage.type_id] || 0;
+    
+    const totalVolume = (storage.contents || [])
+      .reduce((sum: number, item: StorageContent) => {
+        const volume = PI_PRODUCT_VOLUMES[item.type_id] || 0;
+        return sum + (item.amount * volume);
+      }, 0);
+
+    const totalValue = (storage.contents || [])
+      .reduce((sum: number, item: StorageContent) => {
+        const price = piPrices?.appraisal.items.find((a) => a.typeID === item.type_id)?.prices.sell.min ?? 0;
+        return sum + (item.amount * price);
+      }, 0);
+
+    const fillRate = storageCapacity > 0 ? (totalVolume / storageCapacity) * 100 : 0;
+
+    return {
+      type: storageType,
+      type_id: storage.type_id,
+      capacity: storageCapacity,
+      used: totalVolume,
+      fillRate: fillRate,
+      value: totalValue
+    };
+  }).filter(Boolean) as StorageInfo[];
+
+  // Calculate import depletion times
+  const importDepletionTimes = localImports.map(i => {
+    // Find all storage facilities containing this import
+    const storagesWithImport = storageFacilities.filter((storage: Pin) => 
+      storage.contents?.some((content: StorageContent) => content.type_id === i.type_id)
+    );
+    
+    // Get the total amount in all storage facilities
+    const totalAmount = storagesWithImport.reduce((sum: number, storage: Pin) => {
+      const content = storage.contents?.find((content: StorageContent) => content.type_id === i.type_id);
+      return sum + (content?.amount ?? 0);
+    }, 0);
+
+    // Calculate consumption rate per hour
+    const schematic = PI_SCHEMATICS.find(s => s.schematic_id === i.schematic_id);
+    const cycleTime = schematic?.cycle_time ?? 3600;
+    const consumptionPerHour = i.quantity * i.factoryCount * (3600 / cycleTime);
+
+    // Calculate time until depletion in hours, starting from last_update
+    const lastUpdate = DateTime.fromISO(planet.last_update);
+    const now = DateTime.now();
+    const hoursSinceUpdate = now.diff(lastUpdate, 'hours').hours;
+    const remainingAmount = Math.max(0, totalAmount - (consumptionPerHour * hoursSinceUpdate));
+    const hoursUntilDepletion = consumptionPerHour > 0 ? remainingAmount / consumptionPerHour : 0;
+
+    // Calculate monthly cost
+    const price = piPrices?.appraisal.items.find((a) => a.typeID === i.type_id)?.prices.sell.min ?? 0;
+    const monthlyCost = (consumptionPerHour * 24 * 30 * price) / 1000000; // Cost in millions
+
+    return {
+      typeId: i.type_id,
+      hoursUntilDepletion,
+      monthlyCost
+    };
+  });
+
+  // Convert localExports to match the LocalExport interface
+  const localExports = rawExports.map(e => {
+    const schematic = PI_SCHEMATICS.flatMap(s => s.outputs)
+      .find(s => s.type_id === e.typeId)?.schematic_id ?? 0;
+    const factoryCount = planet.info.pins
+      .filter(p => p.schematic_id === schematic)
+      .length;
+    
+    return {
+      type_id: e.typeId,
+      schematic_id: schematic,
+      quantity: e.amount / factoryCount, // Convert total amount back to per-factory quantity
+      factoryCount
+    };
+  });
+
+  return {
+    expired,
+    extractors,
+    localProduction,
+    localImports,
+    localExports,
+    storageInfo,
+    extractorAverages,
+    hasLargeExtractorDifference,
+    importDepletionTimes,
+    visibility: 'visible' as const
+  };
+};
+
 const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalResult | undefined): AccountTotals => {
  let totalMonthlyEstimate = 0;
  let totalStorageValue = 0;
+  let totalPlanetCount = 0;
+  let totalCharacterCount = characters.length;
+  let runningExtractors = 0;
+  let totalExtractors = 0;

  characters.forEach((character) => {
+    totalPlanetCount += character.planets.length;
    character.planets.forEach((planet) => {
-      const { localExports } = planetCalculations(planet);
+      const { localExports, extractors } = planetCalculations(planet);
      const planetConfig = character.planetConfig.find(p => p.planetId === planet.planet_id);
      
+      // Count running and total extractors
+      if (!planetConfig?.excludeFromTotals) {
+        extractors.forEach(extractor => {
+          totalExtractors++;
+          if (extractor.expiry_time && new Date(extractor.expiry_time) > new Date()) {
+            runningExtractors++;
+          }
+        });
+      }
+      
      // Calculate monthly estimate
      if (!planetConfig?.excludeFromTotals) {
        localExports.forEach((exportItem) => {
@@ -56,15 +217,59 @@ const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalR

  return {
    monthlyEstimate: totalMonthlyEstimate,
-    storageValue: totalStorageValue
+    storageValue: totalStorageValue,
+    planetCount: totalPlanetCount,
+    characterCount: totalCharacterCount,
+    runningExtractors,
+    totalExtractors
  };
 };

-export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
+export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { characters: AccessToken[], isCollapsed?: boolean }) => {
  const theme = useTheme();
-  const [isCollapsed, setIsCollapsed] = useState(false);
-  const { planMode, piPrices } = useContext(SessionContext);
-  const { monthlyEstimate, storageValue } = calculateAccountTotals(characters, piPrices);
+  const [localIsCollapsed, setLocalIsCollapsed] = useState(false);
+  const { planMode, piPrices, alertMode, balanceThreshold } = useContext(SessionContext);
+  const { monthlyEstimate, storageValue, planetCount, characterCount, runningExtractors, totalExtractors } = calculateAccountTotals(characters, piPrices);
+
+  // Calculate planet details and alert states for each planet
+  const planetDetails = characters.reduce((acc, character) => {
+    character.planets.forEach(planet => {
+      const details = calculatePlanetDetails(planet, piPrices, balanceThreshold);
+      acc[`${character.character.characterId}-${planet.planet_id}`] = {
+        ...details,
+        alertState: calculateAlertState(details)
+      };
+    });
+    return acc;
+  }, {} as Record<string, PlanetCalculations & { alertState: AlertState }>);
+
+  // Update local collapse state when prop changes
+  useEffect(() => {
+    setLocalIsCollapsed(propIsCollapsed ?? false);
+  }, [propIsCollapsed]);
+
+  const getAlertVisibility = (alertState: AlertState) => {
+    if (!alertMode) return 'visible';
+    if (alertState.expired) return 'visible';
+    if (alertState.hasLowStorage) return 'visible';
+    if (alertState.hasLowImports) return 'visible';
+    if (alertState.hasLargeExtractorDifference) return 'visible';
+    return 'hidden';
+  };
+
+  // Check if any planet in the account has alerts
+  const hasAnyAlerts = Object.values(planetDetails).some(details => {
+    const alertState = calculateAlertState(details);
+    return alertState.expired || 
+           alertState.hasLowStorage || 
+           alertState.hasLowImports || 
+           alertState.hasLargeExtractorDifference;
+  });
+
+  // If in alert mode and no alerts, hide the entire card
+  if (alertMode && !hasAnyAlerts) {
+    return null;
+  }

  return (
    <Paper
@@ -97,7 +302,12 @@ export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
            display: 'flex',
            alignItems: 'center',
            justifyContent: 'space-between',
+            cursor: 'pointer',
+            '&:hover': {
+              backgroundColor: theme.palette.action.hover,
+            },
          }}
+          onClick={() => setLocalIsCollapsed(!localIsCollapsed)}
        >
          <Box>
            <Typography 
@@ -111,39 +321,92 @@ export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
                ? `Account: ${characters[0].account}`
                : "No account name"}
            </Typography>
-            <Typography 
-              sx={{ 
-                fontSize: "0.8rem",
-                color: theme.palette.text.secondary,
-              }}
-            >
-              Monthly Estimate: {monthlyEstimate >= 1000 
-                ? `${(monthlyEstimate / 1000).toFixed(2)} B` 
-                : `${monthlyEstimate.toFixed(2)} M`} ISK
-            </Typography>
-            <Typography 
-              sx={{ 
-                fontSize: "0.8rem",
-                color: theme.palette.text.secondary,
-              }}
-            >
-              Storage Value: {storageValue >= 1000 
-                ? `${(storageValue / 1000).toFixed(2)} B` 
-                : `${storageValue.toFixed(2)} M`} ISK
-            </Typography>
+            <Box sx={{ 
+              display: 'flex', 
+              gap: 2,
+              flexWrap: 'wrap',
+              mt: 1,
+              alignItems: 'center'
+            }}>
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: theme.palette.text.secondary,
+                }}
+              >
+                Monthly: {monthlyEstimate >= 1000 
+                  ? `${(monthlyEstimate / 1000).toFixed(2)} B` 
+                  : `${monthlyEstimate.toFixed(2)} M`} ISK
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: theme.palette.text.secondary,
+                }}
+              >
+                Storage: {storageValue >= 1000 
+                  ? `${(storageValue / 1000).toFixed(2)} B` 
+                  : `${storageValue.toFixed(2)} M`} ISK
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: theme.palette.text.secondary,
+                }}
+              >
+                Planets: {planetCount}
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: theme.palette.text.secondary,
+                }}
+              >
+                Characters: {characterCount}
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: runningExtractors < totalExtractors ? theme.palette.error.main : theme.palette.text.secondary,
+                }}
+              >
+                Extractors: {runningExtractors}/{totalExtractors}
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: Object.values(planetDetails).some(d => d.alertState.hasLowStorage) ? theme.palette.error.main : theme.palette.text.secondary,
+                }}
+              >
+                Storage Alerts: {Object.values(planetDetails).filter(d => d.alertState.hasLowStorage).length}
+              </Typography>
+              <Divider orientation="vertical" flexItem sx={{ height: 16, borderColor: theme.palette.divider }} />
+              <Typography 
+                sx={{ 
+                  fontSize: "0.8rem",
+                  color: Object.values(planetDetails).some(d => d.alertState.hasLargeExtractorDifference) ? theme.palette.error.main : theme.palette.text.secondary,
+                }}
+              >
+                Balance Alerts: {Object.values(planetDetails).filter(d => d.alertState.hasLargeExtractorDifference).length}
+              </Typography>
+            </Box>
          </Box>
          <IconButton 
            size="small" 
-            onClick={() => setIsCollapsed(!isCollapsed)}
            sx={{ 
-              transform: isCollapsed ? 'rotate(-90deg)' : 'rotate(0deg)',
+              transform: localIsCollapsed ? 'rotate(-90deg)' : 'rotate(0deg)',
              transition: 'transform 0.2s ease-in-out'
            }}
          >
-            {isCollapsed ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
+            {localIsCollapsed ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
          </IconButton>
        </Box>
-        {!isCollapsed && characters.map((c) => (
+        {!localIsCollapsed && characters.map((c) => (
          <Stack
            key={c.character.characterId}
            direction="row"
@@ -153,7 +416,17 @@ export const AccountCard = ({ characters }: { characters: AccessToken[] }) => {
            {planMode ? (
              <PlanRow character={c} />
            ) : (
-              <PlanetaryInteractionRow character={c} />
+              <PlanetaryInteractionRow 
+                character={c} 
+                planetDetails={c.planets.reduce((acc, planet) => {
+                  const details = planetDetails[`${c.character.characterId}-${planet.planet_id}`];
+                  acc[planet.planet_id] = {
+                    ...details,
+                    visibility: getAlertVisibility(details.alertState)
+                  };
+                  return acc;
+                }, {} as Record<number, PlanetCalculations & { visibility: string }>)}
+              />
            )}
          </Stack>
        ))}
--- a/src/app/components/AlertModeButton/AlertModeButton.tsx
+++ b/src/app/components/AlertModeButton/AlertModeButton.tsx
@@ -1,21 +0,0 @@
-import { SessionContext } from "@/app/context/Context";
-import { Button, Tooltip } from "@mui/material";
-import { useContext } from "react";
-
-export const AlertModeButton = () => {
-  const { alertMode, toggleAlertMode } = useContext(SessionContext);
-  return (
-    <Tooltip title="Toggle alert mode to show only accounts and planets that need action.">
-      <Button
-        style={{
-          backgroundColor: alertMode
-            ? "rgba(144, 202, 249, 0.08)"
-            : "inherit",
-        }}
-        onClick={toggleAlertMode}
-      >
-        Alert mode
-      </Button>
-    </Tooltip>
-  );
-};
--- a/src/app/components/AppBar/AppBar.tsx
+++ b/src/app/components/AppBar/AppBar.tsx
@@ -12,20 +12,25 @@ import * as React from "react";
 import { DowloadButton } from "../Backup/DowloadButton";
 import { UploadButton } from "../Backup/UploadButton";
 import { CCPButton } from "../CCP/CCPButton";
-import { CompactModeButton } from "../CompactModeButton/CompactModeButton";
 import { DiscordButton } from "../Discord/DiscordButton";
 import { GitHubButton } from "../Github/GitHubButton";
 import { LoginButton } from "../Login/LoginButton";
-import { PlanModeButton } from "../PlanModeButton/PlanModeButton";
 import { SettingsButton } from "../Settings/SettingsButtons";
-import { AlertModeButton } from "../AlertModeButton/AlertModeButton";
-import { SupportButton } from "../SupportButton/SupportButton";
-
+import {
+  Button,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogContentText,
+  DialogActions,
+} from "@mui/material";
+import { useState } from "react";

 function ResponsiveAppBar() {
  const [anchorElNav, setAnchorElNav] = React.useState<null | HTMLElement>(
    null,
  );
+  const [faqOpen, setFaqOpen] = useState(false);

  const handleOpenNavMenu = (event: React.MouseEvent<HTMLElement>) => {
    setAnchorElNav(event.currentTarget);
@@ -102,23 +107,26 @@ function ResponsiveAppBar() {
              <MenuItem onClick={handleCloseNavMenu}>
                <GitHubButton />
              </MenuItem>
-              <MenuItem onClick={handleCloseNavMenu}>
-                <CCPButton />
-              </MenuItem>
-              <MenuItem onClick={handleCloseNavMenu}>
-                <SupportButton />
-              </MenuItem>
+
              <MenuItem onClick={handleCloseNavMenu}>
                <SettingsButton />
              </MenuItem>
-              <MenuItem onClick={handleCloseNavMenu}>
-                <CompactModeButton />
+              <MenuItem
+                onClick={() => {
+                  handleCloseNavMenu();
+                  setFaqOpen(true);
+                }}
+              >
+                <Button
+                  href=""
+                  style={{ width: "100%" }}
+                  sx={{ color: "white", display: "flex", justifyContent: "flex-start" }}
+                >
+                  FAQ
+                </Button>
              </MenuItem>
              <MenuItem onClick={handleCloseNavMenu}>
-                <PlanModeButton />
-              </MenuItem>
-              <MenuItem onClick={handleCloseNavMenu}>
-                <AlertModeButton />
+                <CCPButton />
              </MenuItem>
            </Menu>
          </Box>
@@ -146,7 +154,7 @@ function ResponsiveAppBar() {
              flexGrow: 1,
              display: { xs: "none", md: "flex" },
              alignItems: "center",
-              gap: "0.2rem"
+              gap: "0.2rem",
            }}
          >
            <LoginButton />
@@ -154,15 +162,132 @@ function ResponsiveAppBar() {
            <UploadButton />
            <DiscordButton />
            <GitHubButton />
-            <CCPButton />
-            <SupportButton />
+           
            <SettingsButton />
-            <CompactModeButton />
-            <PlanModeButton />
-            <AlertModeButton />
+            <Button onClick={() => setFaqOpen(true)} color="inherit">
+              FAQ
+            </Button>
+            <CCPButton />
          </Box>
        </Toolbar>
      </Container>
+      <Dialog
+        open={faqOpen}
+        onClose={() => setFaqOpen(false)}
+        aria-labelledby="faq-dialog-title"
+      >
+        <DialogTitle id="faq-dialog-title">
+          Frequently Asked Questions
+        </DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+            <strong>EVE Online Partner Code</strong>
+            <br />
+            Consider using my partner code for CCP related purchases to support
+            this project:
+            <Button
+              href=""
+              style={{ width: "100%" }}
+              sx={{ color: "white", display: "block" }}
+              onClick={() => {
+                navigator.clipboard.writeText("CALLIEVE");
+              }}
+            >
+              CALLIEVE
+            </Button>{" "}
+            Click button above to copy to clipboard.
+            <br />
+            <br />
+            <strong>What is this application?</strong>
+            <br />
+            This EVE Online Planetary Interaction tool that helps you track and
+            manage your colonies and production chains. Main usecase is to see
+            if your extractors are running.
+            <br />
+            <br />
+            <strong>How do I add characters?</strong>
+            <br />
+            You can add characters by clicking the &quot;Add Character&quot;
+            button in the app bar and following the authentication process.
+            <br />
+            <br />
+            <strong>Why don&apos;t my storage numbers add up?</strong>
+            <br />
+            EVE Online API (ESI) provides planetary interaction endpoints. These
+            are updated when you submit changes to planet. For example after an
+            extractor restart.
+            <br />
+            <br />
+            <strong>What does exclude mean?</strong>
+            <br />
+            Exclude means that this planet will not be counted in totals. This
+            is useful if you have longer production chains where exports of a
+            planet are consumed by another planet.
+            <br />
+            <br />
+            <strong>How do see my planets production chains?</strong>
+            <br />
+            Click on the planet row to open the extraction simulation.
+            <br />
+            <br />
+            <strong>What is Compact Mode?</strong>
+            <br />
+            Compact Mode reduces the size of character cards to show more
+            information at once. You can toggle it in the settings.
+            <br />
+            <br />
+            <strong>What is Alert Mode?</strong>
+            <br />
+            Alert mode shows only the planets that have extractors offline and
+            need attention.
+            <br />
+            <br />
+            <strong>What does off-blanace mean?</strong>
+            <br />
+            Off-blanace alert shows up for planets that have two extractors that
+            are extracting different amount of material. Treshold can be set in
+            settings. Generally you want to keep this below 1000.
+            <br />
+            <br />
+            <strong>How do I reorder accounts?</strong>
+            <br />
+            You can drag and drop account cards to reorder them. The order will
+            be saved automatically.
+            <br />
+            <br />
+            <strong>How do I add a character to account groups?</strong>
+            <br />
+            You can add a character to an account group by clicking the cog on
+            the character card and typing in the account/group name.
+            <br />
+            <br />
+            <strong>I like icons! Why so much text?</strong>
+            <br />
+            Toggle this option in settings.
+            <br />
+            <br />
+            <strong>I like colors! Why your alert colors are so ugly?</strong>
+            <br />
+            Change the color scheme in settings.
+            <br />
+            <br />
+            <strong>What does the 3D view do?</strong>
+            <br />
+            Nothing. Just made it for fun
+            <br />
+            <br />
+            <strong>Why are planet settings empty?</strong>
+            <br />
+            Its a work in progress feature. Plan is to be able to configuer
+            planet and planet exports to belong to production chains.
+            <br />
+            <br />
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setFaqOpen(false)}>Close</Button>
+        </DialogActions>
+      </Dialog>
    </AppBar>
  );
 }
--- a/src/app/components/Characters/CharacterRow.tsx
+++ b/src/app/components/Characters/CharacterRow.tsx
@@ -7,16 +7,18 @@ import { styled, useTheme } from "@mui/material/styles";
 import React from "react";
 import { CharacterDialog } from "./CharacterDialog";
 import { AccessToken } from "@/types";
-import { Box, Button, Tooltip } from "@mui/material";
+import { Box, Tooltip, IconButton, Typography } from "@mui/material";
+import SettingsIcon from "@mui/icons-material/Settings";
 import { EVE_IMAGE_URL } from "@/const";
 import { CharacterContext } from "@/app/context/Context";

 const StackItem = styled(Stack)(({ theme }) => ({
  ...theme.typography.body2,
  padding: theme.custom.compactMode ? theme.spacing(1) : theme.spacing(2),
+  display: "flex",
  textAlign: "left",
-  justifyContent: "center",
-  alignItems: "center",
+  justifyContent: "flex-start",
+  alignItems: "flex-start",
 }));

 export const CharacterRow = ({ character }: { character: AccessToken }) => {
@@ -29,8 +31,6 @@ export const CharacterRow = ({ character }: { character: AccessToken }) => {
  return (
    <StackItem
      key={character.character.characterId}
-      alignItems="flex-start"
-      justifyContent="flex-start"
    >
      <CharacterDialog
        character={selectedCharacter}
@@ -38,13 +38,49 @@ export const CharacterRow = ({ character }: { character: AccessToken }) => {
        updateCharacter={updateCharacter}
        closeDialog={() => setSelectedCharacter(undefined)}
      />
+      <Typography
+        sx={{
+          whiteSpace: "nowrap",
+          fontSize: theme.custom.smallText,
+          textAlign: "left",
+          lineHeight: 1.2,
+          marginBottom: "0.4rem",
+          marginLeft: "0.2rem",
+          overflow: "visible",
+          textOverflow: "clip",
+          width: "1rem"
+        }}
+      >
+        {character.character.name}
+      </Typography>
      <Tooltip title={character.comment}>
        <Box
          display="flex"
          flexDirection="column"
          maxWidth={120}
          onClick={() => setSelectedCharacter(character)}
+          position="relative"
+          sx={{ cursor: "pointer" }}
        >
+          <IconButton
+            size="small"
+            onClick={(e) => {
+              e.stopPropagation();
+              setSelectedCharacter(character);
+            }}
+            sx={{
+              p: 0,
+              position: "absolute",
+              top: 4,
+              left: 4,
+              backgroundColor: "rgba(0, 0, 0, 0.5)",
+              "&:hover": {
+                backgroundColor: "rgba(0, 0, 0, 0.7)",
+              },
+            }}
+          >
+            <SettingsIcon fontSize="small" sx={{ color: "white" }} />
+          </IconButton>
          <Image
            unoptimized
            src={`${EVE_IMAGE_URL}/characters/${character.character.characterId}/portrait?size=128`}
@@ -53,16 +89,6 @@ export const CharacterRow = ({ character }: { character: AccessToken }) => {
            height={theme.custom.cardImageSize}
            style={{ marginBottom: "0.2rem", borderRadius: 8 }}
          />
-          <Button
-            style={{
-              padding: 6,
-              fontSize: theme.custom.smallText,
-              lineHeight: 1,
-            }}
-            variant="outlined"
-          >
-            {character.character.name}
-          </Button>
        </Box>
      </Tooltip>
    </StackItem>
--- a/src/app/components/CompactModeButton/CompactModeButton.tsx
+++ b/src/app/components/CompactModeButton/CompactModeButton.tsx
@@ -1,21 +0,0 @@
-import { SessionContext } from "@/app/context/Context";
-import { Button, Tooltip } from "@mui/material";
-import { useContext } from "react";
-
-export const CompactModeButton = () => {
-  const { compactMode, toggleCompactMode } = useContext(SessionContext);
-  return (
-    <Tooltip title="Toggle compact layout for widescreen">
-      <Button
-        style={{
-          backgroundColor: compactMode
-            ? "rgba(144, 202, 249, 0.08)"
-            : "inherit",
-        }}
-        onClick={toggleCompactMode}
-      >
-        Compact mode
-      </Button>
-    </Tooltip>
-  );
-};
--- a/src/app/components/Discord/DiscordButton.tsx
+++ b/src/app/components/Discord/DiscordButton.tsx
@@ -4,7 +4,7 @@ export const DiscordButton = () => {
    <Box>
      <Tooltip title="Come nerd out in discord about PI and this tool">
        <Button
-          href="https://discord.gg/GPtw5kfuJu"
+          href="https://discord.gg/bCdXzU8PHK"
          target="_blank"
          style={{ width: "100%" }}
          sx={{ color: "white", display: "block" }}
--- a/src/app/components/MainGrid.tsx
+++ b/src/app/components/MainGrid.tsx
@@ -5,13 +5,22 @@ import {
  Grid,
  ThemeProvider,
  createTheme,
+  Button,
+  Tooltip,
 } from "@mui/material";
 import { AccountCard } from "./Account/AccountCard";
 import { AccessToken } from "@/types";
 import { CharacterContext, SessionContext } from "../context/Context";
 import ResponsiveAppBar from "./AppBar/AppBar";
 import { Summary } from "./Summary/Summary";
-import { DragDropContext, Droppable, Draggable, DropResult } from "@hello-pangea/dnd";
+import {
+  DragDropContext,
+  Droppable,
+  Draggable,
+  DropResult,
+} from "@hello-pangea/dnd";
+import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
+import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";

 interface Grouped {
  [key: string]: AccessToken[];
@@ -39,8 +48,10 @@ declare module "@mui/material/styles" {
 }

 export const MainGrid = () => {
-  const { characters, updateCharacter } = useContext(CharacterContext);
+  const { characters } = useContext(CharacterContext);
+  const { compactMode, toggleCompactMode, alertMode, toggleAlertMode, planMode, togglePlanMode, extractionTimeMode, toggleExtractionTimeMode } = useContext(SessionContext);
  const [accountOrder, setAccountOrder] = useState<string[]>([]);
+  const [allCollapsed, setAllCollapsed] = useState(false);

  // Initialize account order when characters change
  useEffect(() => {
@@ -50,15 +61,19 @@ export const MainGrid = () => {
        group[account ?? ""] = group[account ?? ""] ?? [];
        group[account ?? ""].push(character);
        return group;
-      }, {})
+      }, {}),
    );

-    const savedOrder = localStorage.getItem('accountOrder');
+    const savedOrder = localStorage.getItem("accountOrder");
    if (savedOrder) {
      try {
        const parsedOrder = JSON.parse(savedOrder);
-        const validOrder = parsedOrder.filter((account: string) => currentAccounts.includes(account));
-        const newAccounts = currentAccounts.filter(account => !validOrder.includes(account));
+        const validOrder = parsedOrder.filter((account: string) =>
+          currentAccounts.includes(account),
+        );
+        const newAccounts = currentAccounts.filter(
+          (account) => !validOrder.includes(account),
+        );
        setAccountOrder([...validOrder, ...newAccounts]);
      } catch (e) {
        setAccountOrder(currentAccounts);
@@ -70,7 +85,7 @@ export const MainGrid = () => {

  useEffect(() => {
    if (accountOrder.length > 0) {
-      localStorage.setItem('accountOrder', JSON.stringify(accountOrder));
+      localStorage.setItem("accountOrder", JSON.stringify(accountOrder));
    }
  }, [accountOrder]);

@@ -81,7 +96,6 @@ export const MainGrid = () => {
    return group;
  }, {});

-  const { compactMode } = useContext(SessionContext);
  const [darkTheme, setDarkTheme] = useState(
    createTheme({
      palette: {
@@ -134,13 +148,83 @@ export const MainGrid = () => {
      <Box sx={{ flexGrow: 1 }}>
        <ResponsiveAppBar />
        {compactMode ? <></> : <Summary characters={characters} />}
+        <Box
+          sx={{
+            display: "flex",
+            justifyContent: "flex-start",
+            padding: 1,
+            gap: 1,
+          }}
+        >
+          <Button
+            startIcon={
+              allCollapsed ? <KeyboardArrowDownIcon /> : <KeyboardArrowUpIcon />
+            }
+            onClick={() => setAllCollapsed(!allCollapsed)}
+            size="small"
+          >
+            {allCollapsed ? "Expand All" : "Collapse All"}
+          </Button>
+          <Tooltip title="Toggle compact layout for widescreen">
+            <Button
+              size="small"
+              style={{
+                backgroundColor: compactMode
+                  ? "rgba(144, 202, 249, 0.16)"
+                  : "inherit",
+              }}
+              onClick={toggleCompactMode}
+            >
+              Compact mode
+            </Button>
+          </Tooltip>
+          <Tooltip title="Toggle alert mode to show only accounts and planets that need action.">
+            <Button
+              size="small"
+              style={{
+                backgroundColor: alertMode
+                  ? "rgba(144, 202, 249, 0.16)"
+                  : "inherit",
+              }}
+              onClick={toggleAlertMode}
+            >
+              Alert mode
+            </Button>
+          </Tooltip>
+          <Tooltip title="Toggle plan mode that show layout for widescreen">
+            <Button
+              size="small"
+              style={{
+                backgroundColor: planMode
+                  ? "rgba(144, 202, 249, 0.16)"
+                  : "inherit",
+              }}
+              onClick={togglePlanMode}
+            >
+              Plan mode
+            </Button>
+          </Tooltip>
+          <Tooltip title="Toggle extraction time display mode">
+            <Button
+              size="small"
+              style={{
+                backgroundColor: extractionTimeMode
+                  ? "rgba(144, 202, 249, 0.16)"
+                  : "inherit",
+              }}
+              onClick={toggleExtractionTimeMode}
+            >
+              Extraction datetime
+            </Button>
+          </Tooltip>
+        </Box>
        <DragDropContextComponent onDragEnd={handleDragEnd}>
          <DroppableComponent droppableId="accounts">
            {(provided: any) => (
              <Grid
                container
                spacing={1}
-                sx={{ padding: 1 }}
+                sx={{ padding: 1, width: "100%" }}
                {...provided.droppableProps}
                ref={provided.innerRef}
              >
@@ -159,14 +243,18 @@ export const MainGrid = () => {
                        {...provided.draggableProps}
                        {...provided.dragHandleProps}
                        sx={{
-                          '& > *': {
-                            width: '100%',
+                          "& > *": {
+                            width: "100%",
                          },
                        }}
                      >
-                        {groupByAccount[account] && groupByAccount[account].length > 0 && (
-                          <AccountCard characters={groupByAccount[account]} />
-                        )}
+                        {groupByAccount[account] &&
+                          groupByAccount[account].length > 0 && (
+                            <AccountCard
+                              characters={groupByAccount[account]}
+                              isCollapsed={allCollapsed}
+                            />
+                          )}
                      </Grid>
                    )}
                  </DraggableComponent>
--- a/src/app/components/PlanModeButton/PlanModeButton.tsx
+++ b/src/app/components/PlanModeButton/PlanModeButton.tsx
@@ -1,15 +0,0 @@
-import { SessionContext } from "@/app/context/Context";
-import { Button, Tooltip } from "@mui/material";
-import { useContext } from "react";
-
-export const PlanModeButton = () => {
-  const { planMode, togglePlanMode } = useContext(SessionContext);
-  return (
-    <Tooltip title="Toggle plan mode that show layout for widescreen">
-      <Button onClick={togglePlanMode} style={{backgroundColor: planMode ? 'rgba(144, 202, 249, 0.08)' : 'inherit'}}>
-        Plan mode
-
-      </Button>
-    </Tooltip>
-  );
-};
--- a/src/app/components/PlanetConfig/PlanetConfigDialog.tsx
+++ b/src/app/components/PlanetConfig/PlanetConfigDialog.tsx
@@ -3,8 +3,6 @@ import { planetCalculations } from "@/planets";
 import { AccessToken, PlanetWithInfo } from "@/types";
 import {
  Card,
-  Checkbox,
-  FormControlLabel,
  Table,
  TableBody,
  TableCell,
@@ -15,17 +13,11 @@ import {
 } from "@mui/material";
 import { DateTime } from "luxon";
 import Countdown from "react-countdown";
-import { timeColor } from "../PlanetaryInteraction/timeColors";
+import { timeColor } from "../PlanetaryInteraction/alerts";
 import Image from "next/image";
 import { ColorContext, SessionContext } from "@/app/context/Context";
 import { useContext } from "react";

-export type PlanetConfig = {
-  characterId: number;
-  planetId: number;
-  excludeFromTotals: boolean;
-};
-
 export const PlanetConfigDialog = ({
  planet,
  character,
@@ -35,14 +27,9 @@ export const PlanetConfigDialog = ({
 }) => {
  const theme = useTheme();
  const { colors } = useContext(ColorContext);
-  const { piPrices, readPlanetConfig, updatePlanetConfig } =
-    useContext(SessionContext);
+  const { piPrices } = useContext(SessionContext);
  const { extractors, localProduction, localImports, localExports } =
    planetCalculations(planet);
-  const planetConfig = readPlanetConfig({
-    characterId: character.character.characterId,
-    planetId: planet.planet_id,
-  });

  return (
    <Card style={{ padding: "1rem", margin: "1rem" }}>
@@ -189,23 +176,6 @@ export const PlanetConfigDialog = ({
          </TableRow>
        </TableBody>
      </Table>
-      <Card style={{ marginTop: "1rem" }}>
-        <Typography>Planet configuration</Typography>
-        <FormControlLabel
-          control={
-            <Checkbox
-              checked={planetConfig.excludeFromTotals}
-              onChange={() =>
-                updatePlanetConfig({
-                  ...planetConfig,
-                  excludeFromTotals: !planetConfig.excludeFromTotals,
-                })
-              }
-            />
-          }
-          label="Consumed by production chain"
-        />
-      </Card>
    </Card>
  );
 };
--- a/src/app/components/PlanetaryInteraction/ExtractionSimulation.ts
+++ b/src/app/components/PlanetaryInteraction/ExtractionSimulation.ts
@@ -65,6 +65,7 @@ export interface ProductionNode {
    quantity: number;
  }>;
  cycleTime: number;
+  factoryCount: number;
 }

 export interface ProductionChainBalance {
--- a/src/app/components/PlanetaryInteraction/ExtractionSimulationDisplay.tsx
+++ b/src/app/components/PlanetaryInteraction/ExtractionSimulationDisplay.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Box, Paper, Typography, Stack } from '@mui/material';
 import { Line } from 'react-chartjs-2';
-import { useTheme } from '@mui/material';
 import { getProgramOutputPrediction, ProductionNode } from './ExtractionSimulation';
 import { PI_TYPES_MAP } from '@/const';
 import { ProductionChainVisualization } from './ProductionChainVisualization';
@@ -15,6 +14,8 @@ import {
  Tooltip,
  Legend
 } from 'chart.js';
+import { DateTime } from 'luxon';
+import Countdown from 'react-countdown';

 ChartJS.register(
  CategoryScale,
@@ -43,6 +44,7 @@ export const ExtractionSimulationDisplay: React.FC<ExtractionSimulationDisplayPr
  extractors,
  productionNodes
 }) => {
+
  const CYCLE_TIME = 30 * 60; // 30 minutes in seconds

  // Calculate program duration and cycles for each extractor
@@ -57,6 +59,7 @@ export const ExtractionSimulationDisplay: React.FC<ExtractionSimulationDisplayPr
    };
  });

+
  const maxCycles = Math.max(...extractorPrograms.map(e => e.cycles));

  // Get output predictions for each extractor
@@ -156,14 +159,18 @@ export const ExtractionSimulationDisplay: React.FC<ExtractionSimulationDisplayPr
  const installedSchematicIds = Array.from(new Set(productionNodes.map(node => node.schematicId)));

  // Create factories array with correct counts
-  const factories = installedSchematicIds.map(schematicId => ({
-    schematic_id: schematicId,
-    count: productionNodes.filter(node => node.schematicId === schematicId).length
-  }));
+  const factories = installedSchematicIds.map(schematicId => {
+    const node = productionNodes.find(n => n.schematicId === schematicId);
+    if (!node) return { schematic_id: schematicId, count: 0 };
+    return {
+      schematic_id: schematicId,
+      count: node.factoryCount
+    };
+  });

  return (
    <Box>
-      <Paper sx={{ p: 2 }}>
+      {extractors.length > 0 ? <Paper sx={{ p: 2 }}>
        <Typography variant="h6" gutterBottom>
          Extraction Simulation
        </Typography>
@@ -191,20 +198,27 @@ export const ExtractionSimulationDisplay: React.FC<ExtractionSimulationDisplayPr
              <Typography variant="body2" component="div" sx={{ pl: 2 }}>
                • Expiry Time: {new Date(expiryTime).toLocaleString()}
              </Typography>
+              <Typography variant="body2" component="div" sx={{ pl: 2 }}>
+                • Factory Count: {factories.find(f => f.schematic_id === typeId)?.count ?? 0}
+              </Typography>
+              <Typography variant="body2" component="div" sx={{ pl: 2 }}>
+                • Expires in: <Countdown overtime={true} date={DateTime.fromISO(expiryTime).toMillis()} />
+              </Typography>
            </Stack>
          ))}
        </Box>
        <div style={{ height: '300px' }}>
          <Line data={chartData} options={chartOptions} />
        </div>
-      </Paper>
+      </Paper> : null}

      <ProductionChainVisualization
        extractedTypeIds={extractedTypeIds}
        extractors={extractors.map(e => ({
          typeId: e.typeId,
          baseValue: e.baseValue,
-          cycleTime: CYCLE_TIME
+          cycleTime: CYCLE_TIME,
+          expiryTime: e.expiryTime
        }))}
        factories={factories}
        extractorTotals={extractorTotals}
--- a/src/app/components/PlanetaryInteraction/ExtractionSimulationTooltip.tsx
+++ b/src/app/components/PlanetaryInteraction/ExtractionSimulationTooltip.tsx
@@ -0,0 +1,210 @@
+import React from 'react';
+import { Box, Paper, Typography, Stack } from '@mui/material';
+import { Line } from 'react-chartjs-2';
+import { getProgramOutputPrediction } from './ExtractionSimulation';
+import { PI_TYPES_MAP } from '@/const';
+import {
+  Chart as ChartJS,
+  CategoryScale,
+  LinearScale,
+  PointElement,
+  LineElement,
+  Title,
+  Tooltip,
+  Legend
+} from 'chart.js';
+import { DateTime } from 'luxon';
+import Countdown from 'react-countdown';
+
+ChartJS.register(
+  CategoryScale,
+  LinearScale,
+  PointElement,
+  LineElement,
+  Title,
+  Tooltip,
+  Legend
+);
+
+interface ExtractorConfig {
+  typeId: number;
+  baseValue: number;
+  cycleTime: number;
+  installTime: string;
+  expiryTime: string;
+}
+
+interface ExtractionSimulationTooltipProps {
+  extractors: ExtractorConfig[];
+}
+
+export const ExtractionSimulationTooltip: React.FC<ExtractionSimulationTooltipProps> = ({
+  extractors
+}) => {
+  const CYCLE_TIME = 30 * 60; // 30 minutes in seconds
+
+  // Calculate program duration and cycles for each extractor
+  const extractorPrograms = extractors.map(extractor => {
+    const installDate = new Date(extractor.installTime);
+    const expiryDate = new Date(extractor.expiryTime);
+    const programDuration = (expiryDate.getTime() - installDate.getTime()) / 1000; // Convert to seconds
+    return {
+      ...extractor,
+      programDuration,
+      cycles: Math.floor(programDuration / CYCLE_TIME)
+    };
+  });
+
+  const maxCycles = Math.max(...extractorPrograms.map(e => e.cycles));
+
+  // Get output predictions for each extractor
+  const extractorOutputs = extractorPrograms.map(extractor => ({
+    typeId: extractor.typeId,
+    cycleTime: CYCLE_TIME,
+    cycles: extractor.cycles,
+    prediction: getProgramOutputPrediction(
+      extractor.baseValue,
+      CYCLE_TIME,
+      extractor.cycles
+    )
+  }));
+
+  // Create datasets for the chart
+  const datasets = extractorOutputs.map((output, index) => {
+    const hue = (360 / extractors.length) * index;
+    return {
+      label: `${PI_TYPES_MAP[output.typeId]?.name ?? `Resource ${output.typeId}`}`,
+      data: output.prediction,
+      borderColor: `hsl(${hue}, 70%, 50%)`,
+      backgroundColor: `hsl(${hue}, 70%, 80%)`,
+      tension: 0.4
+    };
+  });
+
+  const chartData = {
+    labels: Array.from({ length: maxCycles }, (_, i) => {
+      return (i % 4 === 0) ? `Cycle ${i + 1}` : '';
+    }),
+    datasets
+  };
+
+  const chartOptions = {
+    responsive: true,
+    maintainAspectRatio: false,
+    plugins: {
+      legend: {
+        position: 'top' as const,
+      },
+      title: {
+        display: true,
+        text: 'Extraction Output Prediction'
+      },
+      tooltip: {
+        callbacks: {
+          title: (context: any) => `Cycle ${context[0].dataIndex + 1}`,
+          label: (context: any) => `Output: ${context.raw.toFixed(1)} units`
+        }
+      }
+    },
+    scales: {
+      y: {
+        beginAtZero: true,
+        title: {
+          display: true,
+          text: 'Units per Cycle'
+        }
+      },
+      x: {
+        ticks: {
+          autoSkip: true,
+          maxTicksLimit: 24
+        }
+      }
+    }
+  };
+
+  return (
+    <Paper sx={{ p: 1, bgcolor: 'background.paper', minWidth: 800 }}>
+      <Stack direction="row" spacing={2} sx={{ width: '100%' }}>
+        <Box sx={{ flex: 1, minWidth: 0 }}>
+          <div style={{ height: '200px' }}>
+            <Line data={chartData} options={chartOptions} />
+          </div>
+        </Box>
+        <Box sx={{ flex: 1, minWidth: 0 }}>
+          <Stack spacing={1}>
+            {extractorPrograms.map(({ typeId, cycleTime, cycles, installTime, expiryTime }, idx) => {
+              const prediction = getProgramOutputPrediction(
+                extractors[idx].baseValue,
+                CYCLE_TIME,
+                cycles
+              );
+              const totalOutput = prediction.reduce((sum, val) => sum + val, 0);
+              
+              return (
+                <Paper key={typeId} sx={{ p: 1, bgcolor: 'background.default' }}>
+                  <Typography variant="subtitle2">
+                    {PI_TYPES_MAP[typeId]?.name}
+                  </Typography>
+                  <Stack spacing={0.5}>
+                    <Typography variant="body2">
+                      • Total Output: {totalOutput.toFixed(1)} units per program
+                    </Typography>
+                    <Typography variant="body2">
+                      • Cycle Time: {(cycleTime / 60).toFixed(1)} minutes
+                    </Typography>
+                    <Typography variant="body2">
+                      • Program Cycles: {cycles}
+                    </Typography>
+                    <Typography variant="body2">
+                      • Average per Cycle: {(totalOutput / cycles).toFixed(1)} units
+                    </Typography>
+                    <Typography variant="body2">
+                      • Average per hour: {(totalOutput / cycles  * 2).toFixed(1)} units
+                    </Typography>
+                    <Typography variant="body2">
+                      • Expires in: <Countdown overtime={true} date={DateTime.fromISO(expiryTime).toMillis()} />
+                    </Typography>
+                  </Stack>
+                </Paper>
+              );
+            })}
+            {extractors.length === 2 && (
+              <Paper sx={{ p: 1, bgcolor: 'background.default' }}>
+                <Typography variant="subtitle2" color="error">
+                  Balance
+                </Typography>
+                <Stack spacing={0.5}>
+                  {extractors.map((extractor, index) => {
+                    const averagePerHour = (extractor.baseValue * 3600) / extractor.cycleTime;
+                    return (
+                      <Typography key={index} variant="body2">
+                        • {PI_TYPES_MAP[extractor.typeId]?.name}: {averagePerHour.toFixed(1)} u/h
+                      </Typography>
+                    );
+                  })}
+                  <Typography 
+                    variant="body2" 
+                    color="error"
+                    sx={{ 
+                      mt: 1,
+                      fontWeight: 'bold',
+                      borderTop: '1px solid',
+                      borderColor: 'divider',
+                      pt: 1
+                    }}
+                  >
+                    Difference: {Math.abs(
+                      (extractors[0].baseValue * 3600 / extractors[0].cycleTime) - 
+                      (extractors[1].baseValue * 3600 / extractors[1].cycleTime)
+                    ).toFixed(1)} u/h
+                  </Typography>
+                </Stack>
+              </Paper>
+            )}
+          </Stack>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+}; 
--- a/src/app/components/PlanetaryInteraction/PlanetCard.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetCard.tsx
@@ -1,31 +1,24 @@
-import { Stack, Typography, styled, useTheme } from "@mui/material";
+import { Stack, Typography, styled, useTheme, Tooltip } from "@mui/material";
 import Image from "next/image";
 import {
  AccessToken,
-  Planet,
-  PlanetInfo,
-  PlanetInfoUniverse,
  PlanetWithInfo,
 } from "@/types";
-import React, { forwardRef, useContext, useEffect, useState } from "react";
+import { PlanetCalculations } from "@/types/planet";
+import React, { useContext } from "react";
 import { DateTime } from "luxon";
-import { EXTRACTOR_TYPE_IDS } from "@/const";
 import Countdown from "react-countdown";
-import PinsCanvas3D from "./PinsCanvas3D";
-import Slide from "@mui/material/Slide";
-import { TransitionProps } from "@mui/material/transitions";
-import Dialog from "@mui/material/Dialog";
-import AppBar from "@mui/material/AppBar";
-import Toolbar from "@mui/material/Toolbar";
-import IconButton from "@mui/material/IconButton";
-import CloseIcon from "@mui/icons-material/Close";
-import Button from "@mui/material/Button";
-import {
-  alertModeVisibility,
-  extractorsHaveExpired,
-  timeColor,
-} from "./timeColors";
-import { ColorContext, SessionContext } from "@/app/context/Context";
+import { ColorContext } from "@/app/context/Context";
+import { ExtractionSimulationTooltip } from "./ExtractionSimulationTooltip";
+import { timeColor } from "./alerts";
+
+interface ExtractorConfig {
+  typeId: number;
+  baseValue: number;
+  cycleTime: number;
+  installTime: string;
+  expiryTime: string;
+}

 const StackItem = styled(Stack)(({ theme }) => ({
  ...theme.typography.body2,
@@ -36,128 +29,128 @@ const StackItem = styled(Stack)(({ theme }) => ({
  alignItems: "center",
 }));

-const Transition = forwardRef(function Transition(
-  props: TransitionProps & {
-    children: React.ReactElement;
-  },
-  ref: React.Ref<unknown>,
-) {
-  return <Slide direction="up" ref={ref} {...props} />;
-});
-
 export const PlanetCard = ({
  character,
  planet,
+  planetDetails,
 }: {
  character: AccessToken;
  planet: PlanetWithInfo;
+  planetDetails: PlanetCalculations;
 }) => {
-  const { alertMode } = useContext(SessionContext);
-
-  const planetInfo = planet.info;
-  const planetInfoUniverse = planet.infoUniverse;
-
-  const [planetRenderOpen, setPlanetRenderOpen] = useState(false);
-
  const theme = useTheme();
-
-  const handle3DrenderOpen = () => {
-    setPlanetRenderOpen(true);
-  };
-
-  const handle3DrenderClose = () => {
-    setPlanetRenderOpen(false);
-  };
-
-  const extractorsExpiryTime =
-    (planetInfo &&
-      planetInfo.pins
-        .filter((p) => EXTRACTOR_TYPE_IDS.some((e) => e === p.type_id))
-        .map((p) => p.expiry_time)) ??
-    [];
-
  const { colors } = useContext(ColorContext);
-  const expired = extractorsHaveExpired(extractorsExpiryTime);
+
+  const extractorConfigs: ExtractorConfig[] = planetDetails.extractors
+    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
+    .map(e => ({
+      typeId: e.extractor_details!.product_type_id!,
+      baseValue: e.extractor_details!.qty_per_cycle!,
+      cycleTime: e.extractor_details?.cycle_time || 3600,
+      installTime: e.install_time ?? "",
+      expiryTime: e.expiry_time ?? ""
+    }));

  return (
-    <StackItem
-      alignItems="flex-start"
-      height="100%"
-      position="relative"
-      minHeight={theme.custom.cardMinHeight}
-      visibility={alertModeVisibility(alertMode, expired)}
+    <Tooltip
+      title={
+        planetDetails.extractors.length > 0 ? (
+          <ExtractionSimulationTooltip
+            extractors={extractorConfigs}
+          />
+        ) : null
+      }
+      componentsProps={{
+        tooltip: {
+          sx: {
+            bgcolor: 'background.paper',
+            '& .MuiTooltip-arrow': {
+              color: 'background.paper',
+            },
+            maxWidth: 'none',
+            width: 'fit-content'
+          }
+        }
+      }}
    >
-      <Image
-        unoptimized
-        src={`/${planet.planet_type}.png`}
-        alt=""
-        width={theme.custom.cardImageSize}
-        height={theme.custom.cardImageSize}
-        style={{ borderRadius: 8, marginRight: 4 }}
-        onClick={handle3DrenderOpen}
-      />
-      {expired && (
-        <Image
-          width={32}
-          height={32}
-          src={`/stopped.png`}
-          alt=""
-          style={{ position: "absolute", top: theme.custom.stoppedPosition }}
-        />
-      )}
-      <div style={{ position: "absolute", top: 5, left: 10 }}>
-        <Typography fontSize={theme.custom.smallText}>
-          {planetInfoUniverse?.name}
-        </Typography>
-        <Typography fontSize={theme.custom.smallText}>
-          L{planet.upgrade_level}
-        </Typography>
-      </div>
-
-      {extractorsExpiryTime.map((e, idx) => {
-        return (
-          <Typography
-            key={`${e}-${idx}-${character.character.characterId}`}
-            color={timeColor(e, colors)}
-            fontSize={theme.custom.smallText}
-          >
-            {e ? (
-              <Countdown
-                overtime={true}
-                date={DateTime.fromISO(e).toMillis()}
-              />
-            ) : (
-              "STOPPED"
-            )}
-          </Typography>
-        );
-      })}
-      <Dialog
-        fullScreen
-        open={planetRenderOpen}
-        onClose={handle3DrenderClose}
-        TransitionComponent={Transition}
+      <StackItem
+        alignItems="flex-start"
+        height="100%"
+        position="relative"
+        minHeight={theme.custom.cardMinHeight}
+        style={{ visibility: planetDetails.visibility }}
      >
-        <AppBar sx={{ position: "relative" }}>
-          <Toolbar>
-            <IconButton
-              edge="start"
-              color="inherit"
-              onClick={handle3DrenderClose}
-              aria-label="close"
-            >
-              <CloseIcon />
-            </IconButton>
-            <Typography sx={{ ml: 2, flex: 1 }} variant="h6" component="div">
-              {planetInfoUniverse?.name}
-            </Typography>
-            <Button autoFocus color="inherit" onClick={handle3DrenderClose}>
-              Close
-            </Button>
-          </Toolbar>
-        </AppBar>
-        <PinsCanvas3D planetInfo={planetInfo} />
-      </Dialog>
-    </StackItem>
+        <div style={{ position: 'relative' }}>
+          <Image
+            unoptimized
+            src={`/${planet.planet_type}.png`}
+            alt=""
+            width={theme.custom.cardImageSize}
+            height={theme.custom.cardImageSize}
+            style={{ 
+              borderRadius: 8, 
+              marginRight: 4,
+              position: 'relative',
+              zIndex: 0
+            }}
+          />
+          <div style={{
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: theme.custom.cardImageSize,
+            height: theme.custom.cardImageSize,
+            backgroundColor: 'rgba(0, 0, 0, 0.8)',
+            borderRadius: 8,
+          }} />
+        </div>
+        {planetDetails.expired && (
+          <Image
+            width={32}
+            height={32}
+            src={`/stopped.png`}
+            alt=""
+            style={{ position: "absolute", top: theme.custom.stoppedPosition }}
+          />
+        )}
+        <div style={{ position: "absolute", top: 5, left: 10 }}>
+          <Typography fontSize={theme.custom.smallText}>
+            {planet.infoUniverse?.name}
+          </Typography>
+          {planetDetails.extractors.map((e, idx) => {
+            const average = planetDetails.extractorAverages[idx];
+            return (
+              <div key={`${e}-${idx}-${character.character.characterId}`}>
+                <Typography
+                  color={timeColor(e.expiry_time, colors)}
+                  fontSize={theme.custom.smallText}
+                >
+                  {!planetDetails.expired && e.expiry_time && <Countdown
+                      overtime={true}
+                      date={DateTime.fromISO(e.expiry_time).toMillis()}
+                    />
+                  }
+                </Typography>
+                {!planetDetails.expired && e && average && (
+                  <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
+                    <Image
+                      unoptimized
+                      src={`https://images.evetech.net/types/${e.extractor_details?.product_type_id}/icon?size=32`}
+                      alt=""
+                      width={16}
+                      height={16}
+                      style={{ borderRadius: 4 }}
+                    />
+                    <Typography fontSize={theme.custom.smallText}>
+                      {average.averagePerHour.toFixed(1)}/h
+                    </Typography>
+                  </div>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      </StackItem>
+    </Tooltip>
  );
 };
--- a/src/app/components/PlanetaryInteraction/PlanetTableRow.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetTableRow.tsx
@@ -1,10 +1,10 @@
 import { ColorContext, SessionContext } from "@/app/context/Context";
-import { PI_TYPES_MAP, STORAGE_IDS, STORAGE_CAPACITIES, PI_PRODUCT_VOLUMES } from "@/const";
-import { planetCalculations } from "@/planets";
+import { PI_TYPES_MAP, EVE_IMAGE_URL, LAUNCHPAD_IDS } from "@/const";
 import { AccessToken, PlanetWithInfo } from "@/types";
+import { PlanetCalculations, StorageInfo } from "@/types/planet";
 import CloseIcon from "@mui/icons-material/Close";
 import MoreVertIcon from '@mui/icons-material/MoreVert';
-import { Button, Tooltip, Typography, useTheme, Menu, MenuItem, IconButton } from "@mui/material";
+import { Button, Tooltip, Typography, useTheme, Menu, MenuItem, IconButton, Checkbox, FormControlLabel } from "@mui/material";
 import AppBar from "@mui/material/AppBar";
 import Dialog from "@mui/material/Dialog";
 import Slide from "@mui/material/Slide";
@@ -18,12 +18,13 @@ import React, { forwardRef, useContext, useState } from "react";
 import Countdown from "react-countdown";
 import { PlanetConfigDialog } from "../PlanetConfig/PlanetConfigDialog";
 import PinsCanvas3D from "./PinsCanvas3D";
-import { alertModeVisibility, timeColor } from "./timeColors";
+import { timeColor } from "./alerts";
 import { ExtractionSimulationDisplay } from './ExtractionSimulationDisplay';
-import { ProductionNode } from './ExtractionSimulation';
+import { ExtractionSimulationTooltip } from './ExtractionSimulationTooltip';
 import { Collapse, Box, Stack } from "@mui/material";
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import ExpandLessIcon from '@mui/icons-material/ExpandLess';
+import Table from "@mui/material/Table";
+import TableHead from "@mui/material/TableHead";
+import TableBody from "@mui/material/TableBody";

 const Transition = forwardRef(function Transition(
  props: TransitionProps & {
@@ -34,14 +35,28 @@ const Transition = forwardRef(function Transition(
  return <Slide direction="up" ref={ref} {...props} />;
 });

+interface SchematicInput {
+  type_id: number;
+  quantity: number;
+}
+
+interface SchematicOutput {
+  type_id: number;
+  quantity: number;
+}
+
 export const PlanetTableRow = ({
  planet,
  character,
+  planetDetails,
 }: {
  planet: PlanetWithInfo;
  character: AccessToken;
+  planetDetails: PlanetCalculations;
 }) => {
  const theme = useTheme();
+  const { showProductIcons, extractionTimeMode, alertMode } = useContext(SessionContext);
+  const { colors } = useContext(ColorContext);

  const [planetRenderOpen, setPlanetRenderOpen] = useState(false);
  const [planetConfigOpen, setPlanetConfigOpen] = useState(false);
@@ -72,71 +87,99 @@ export const PlanetTableRow = ({
    setPlanetConfigOpen(false);
  };

-  const { piPrices, alertMode } = useContext(SessionContext);
+  const { piPrices, updatePlanetConfig, readPlanetConfig } = useContext(SessionContext);
  const planetInfo = planet.info;
  const planetInfoUniverse = planet.infoUniverse;
-  const { expired, extractors, localProduction, localImports, localExports } =
-    planetCalculations(planet);
-  const planetConfig = character.planetConfig.find(
-    (p) => p.planetId === planet.planet_id,
-  );
-  const { colors } = useContext(ColorContext);
-  // Convert local production to ProductionNode array for simulation
-  const productionNodes: ProductionNode[] = Array.from(localProduction).map(([schematicId, schematic]) => ({
-    schematicId: schematicId,
-    typeId: schematic.outputs[0].type_id,
-    name: schematic.name,
-    inputs: schematic.inputs.map(input => ({
-      typeId: input.type_id,
-      quantity: input.quantity
-    })),
-    outputs: schematic.outputs.map(output => ({
-      typeId: output.type_id,
-      quantity: output.quantity
-    })),
-    cycleTime: schematic.cycle_time
-  }));
+  const planetConfig = readPlanetConfig({
+    characterId: character.character.characterId,
+    planetId: planet.planet_id,
+  });

-  const storageFacilities = planetInfo.pins.filter(pin => 
-    STORAGE_IDS().some(storage => storage.type_id === pin.type_id)
+  const handleExcludeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    updatePlanetConfig({
+      ...planetConfig,
+      excludeFromTotals: event.target.checked,
+    });
+  };
+
+  // Check if there are any alerts
+  const hasAlerts = alertMode && (
+    planetDetails.expired ||
+    planetDetails.storageInfo.some(storage => storage.fillRate > 60) ||
+    planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24) ||
+    planetDetails.hasLargeExtractorDifference
  );

-  const getStorageInfo = (pin: any) => {
-    if (!pin || !pin.contents) return null;
+  // If in alert mode and no alerts, hide the row
+  if (alertMode && !hasAlerts) {
+    return null;
+  }

-    const storageType = PI_TYPES_MAP[pin.type_id].name;
-    const storageCapacity = STORAGE_CAPACITIES[pin.type_id] || 0;
-    
-    const totalVolume = (pin.contents || [])
-      .reduce((sum: number, item: any) => {
-        const volume = PI_PRODUCT_VOLUMES[item.type_id] || 0;
-        return sum + (item.amount * volume);
-      }, 0);
+  const renderProductDisplay = (typeId: number, amount?: number) => {
+    if (!typeId || !PI_TYPES_MAP[typeId]) {
+      return (
+        <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%" }}>
+          <Typography fontSize={theme.custom.smallText} color="text.secondary">
+            No product
+          </Typography>
+          {amount !== undefined && (
+            <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px", flexShrink: 0 }}>
+              {amount}
+            </Typography>
+          )}
+        </div>
+      );
+    }

-    const totalValue = (pin.contents || [])
-      .reduce((sum: number, item: any) => {
-        const price = piPrices?.appraisal.items.find((a) => a.typeID === item.type_id)?.prices.sell.min ?? 0;
-        return sum + (item.amount * price);
-      }, 0);
-
-    const fillRate = storageCapacity > 0 ? (totalVolume / storageCapacity) * 100 : 0;
-
-    return {
-      type: storageType,
-      capacity: storageCapacity,
-      used: totalVolume,
-      fillRate: fillRate,
-      value: totalValue
-    };
+    if (showProductIcons) {
+      return (
+        <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%" }}>
+          <Image
+            src={`${EVE_IMAGE_URL}/types/${typeId}/icon?size=32`}
+            alt={PI_TYPES_MAP[typeId].name}
+            width={32}
+            height={32}
+            style={{ marginRight: "5px" }}
+          />
+          {amount !== undefined && (
+            <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px", flexShrink: 0 }}>
+              {amount}
+            </Typography>
+          )}
+        </div>
+      );
+    }
+    return (
+      <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%" }}>
+        <Typography fontSize={theme.custom.smallText}>
+          {PI_TYPES_MAP[typeId].name}
+        </Typography>
+        {amount !== undefined && (
+          <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px", flexShrink: 0 }}>
+            {amount}
+          </Typography>
+        )}
+      </div>
+    );
  };

  return (
    <>
      <TableRow
-        style={{ visibility: alertModeVisibility(alertMode, expired) }}
-        sx={{ "&:last-child td, &:last-child th": { border: 0 } }}
+        style={{ visibility: planetDetails.visibility }}
+        sx={{ 
+          "&:last-child td, &:last-child th": { border: 0 },
+          cursor: 'pointer',
+          '&:hover': {
+            backgroundColor: 'action.hover'
+          }
+        }}
+        onClick={(e: React.MouseEvent<HTMLTableRowElement>) => {
+          if (!(e.target as HTMLElement).closest('.clickable-cell')) return;
+          setSimulationOpen(!simulationOpen);
+        }}
      >
-        <TableCell component="th" scope="row">
+        <TableCell component="th" scope="row" className="clickable-cell">
          <Tooltip
            title={`${
              planet.planet_type.charAt(0).toUpperCase() +
@@ -151,18 +194,66 @@ export const PlanetTableRow = ({
                height={theme.custom.cardImageSize / 6}
                style={{ marginRight: "5px" }}
              />
-              {planetInfoUniverse?.name}
+              <Tooltip
+                placement="right"
+                title={
+                  planetDetails.extractors.length > 0 ? (
+                    <ExtractionSimulationTooltip
+                      extractors={planetDetails.extractors
+                        .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
+                        .map(e => ({
+                          typeId: e.extractor_details!.product_type_id!,
+                          baseValue: e.extractor_details!.qty_per_cycle!,
+                          cycleTime: e.extractor_details!.cycle_time || 3600,
+                          installTime: e.install_time ?? "",
+                          expiryTime: e.expiry_time ?? ""
+                        }))}
+                    />
+                  ) : null
+                }
+                componentsProps={{
+                  tooltip: {
+                    sx: {
+                      bgcolor: 'background.paper',
+                      '& .MuiTooltip-arrow': {
+                        color: 'background.paper',
+                      },
+                      maxWidth: 'none',
+                      width: 'fit-content'
+                    }
+                  }
+                }}
+              >
+                <Stack spacing={0}>
+                  <Typography 
+                    fontSize={theme.custom.smallText}
+                    color={planetDetails.hasLargeExtractorDifference ? 'error' : 'inherit'}
+                  >
+                    {planetInfoUniverse?.name}
+                  </Typography>
+                  {planetDetails.hasLargeExtractorDifference && (
+                    <Typography 
+                      fontSize={theme.custom.smallText}
+                      color="error"
+                      sx={{ opacity: 0.7 }}
+                    >
+                      off-balance
+                    </Typography>
+                  )}
+                </Stack>
+              </Tooltip>
            </div>
          </Tooltip>
        </TableCell>
-        <TableCell>{planet.upgrade_level}</TableCell>
-        <TableCell>
+        <TableCell className="clickable-cell">{planet.upgrade_level}</TableCell>
+        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {extractors.map((e, idx) => {
+            {planetDetails.extractors.length === 0 &&<Typography fontSize={theme.custom.smallText}>No extractors</Typography>}
+            {planetDetails.extractors.map((e, idx) => {
              return (
                <div
                  key={`${e}-${idx}-${character.character.characterId}`}
-                  style={{ display: "flex" }}
+                  style={{ display: "flex", alignItems: "center" }}
                >
                  <Typography
                    color={timeColor(e.expiry_time, colors)}
@@ -170,88 +261,113 @@ export const PlanetTableRow = ({
                    paddingRight={1}
                  >
                    {e ? (
-                      <Countdown
-                        overtime={true}
-                        date={DateTime.fromISO(e.expiry_time ?? "").toMillis()}
-                      />
+                      extractionTimeMode ? (
+                        DateTime.fromISO(e.expiry_time ?? "").toFormat('yyyy-MM-dd HH:mm:ss')
+                      ) : (
+                        <Countdown
+                          overtime={true}
+                          date={DateTime.fromISO(e.expiry_time ?? "").toMillis()}
+                        />
+                      )
                    ) : (
                      "STOPPED"
                    )}
                  </Typography>
-                  <Typography fontSize={theme.custom.smallText}>
-                    {
-                      PI_TYPES_MAP[e.extractor_details?.product_type_id ?? 0]
-                        ?.name
-                    }
-                  </Typography>
+                  {renderProductDisplay(e.extractor_details?.product_type_id ?? 0)}
                </div>
              );
            })}
          </div>
        </TableCell>
-        <TableCell>
+        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {Array.from(localProduction).map((schematic, idx) => {
+            {Array.from(planetDetails.localProduction).map((schematic, idx) => {
              return (
-                <Typography
+                <div
                  key={`prod-${character.character.characterId}-${planet.planet_id}-${idx}`}
-                  fontSize={theme.custom.smallText}
+                  style={{ display: "flex", alignItems: "center" }}
                >
-                  {schematic[1].name}
-                </Typography>
+                  {renderProductDisplay(schematic[1].outputs[0].type_id)}
+                </div>
              );
            })}
          </div>
        </TableCell>
-        <TableCell>
+        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localImports.map((i) => (
-              <Typography
-                key={`import-${character.character.characterId}-${planet.planet_id}-${i.type_id}`}
-                fontSize={theme.custom.smallText}
+            {planetDetails.localImports.map((i) => {
+              const depletionTime = planetDetails.importDepletionTimes.find(d => d.typeId === i.type_id);
+              return (
+                <div
+                  key={`import-${character.character.characterId}-${planet.planet_id}-${i.type_id}`}
+                  style={{ display: "flex", alignItems: "center" }}
+                >
+                  <Tooltip title={
+                    <>
+                      <div>Will be depleted in {depletionTime?.hoursUntilDepletion.toFixed(1)} hours</div>
+                      <div>Monthly cost: {depletionTime?.monthlyCost.toFixed(2)}M ISK</div>
+                    </>
+                  }>
+                    <div style={{ display: "flex", alignItems: "center" }}>
+                      {renderProductDisplay(i.type_id, i.quantity * i.factoryCount)}
+                      {depletionTime && (
+                        <Typography 
+                          fontSize={theme.custom.smallText} 
+                          color={depletionTime.hoursUntilDepletion < 24 ? 'error' : depletionTime.hoursUntilDepletion < 48 ? 'warning' : 'success'}
+                          sx={{ ml: 1 }}
+                        >
+                          ({depletionTime.hoursUntilDepletion.toFixed(1)}h)
+                        </Typography>
+                      )}
+                    </div>
+                  </Tooltip>
+                </div>
+              );
+            })}
+          </div>
+        </TableCell>
+        <TableCell className="clickable-cell">
+          <div style={{ display: "flex", flexDirection: "column" }}>
+            {planetDetails.localExports.map((exports) => (
+              <div
+                key={`export-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
+                style={{ display: "flex", alignItems: "center" }}
              >
-                {PI_TYPES_MAP[i.type_id].name} ({i.quantity}/h)
-              </Typography>
+                {renderProductDisplay(exports.type_id, exports.quantity * exports.factoryCount)}
+              </div>
            ))}
          </div>
        </TableCell>
        <TableCell>
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
-              <Typography
-                key={`export-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
-                fontSize={theme.custom.smallText}
-              >
-                {PI_TYPES_MAP[exports.typeId].name}
-              </Typography>
+            {planetDetails.localExports.map((exports) => (
+              <FormControlLabel
+                key={`export-excluded-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
+                control={
+                  <Checkbox
+                    checked={planetConfig.excludeFromTotals}
+                    onChange={handleExcludeChange}
+                    size="small"
+                  />
+                }
+                label=""
+              />
            ))}
          </div>
        </TableCell>
-        <TableCell>
+        <TableCell className="clickable-cell">
          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
              <Typography
-                key={`export-excluded-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-uph-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                fontSize={theme.custom.smallText}
              >
-                {planetConfig?.excludeFromTotals ? "ex" : ""}
+                {exports.quantity * exports.factoryCount}
              </Typography>
            ))}
          </div>
        </TableCell>
-        <TableCell>
-          <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
-              <Typography
-                key={`export-uph-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
-                fontSize={theme.custom.smallText}
-              >
-                {exports.amount}
-              </Typography>
-            ))}
-          </div>
-        </TableCell>
-        <TableCell>
+        <TableCell className="clickable-cell">
          <div
            style={{
              display: "flex",
@@ -260,11 +376,11 @@ export const PlanetTableRow = ({
              textAlign: "end",
            }}
          >
-            {localExports.map((e) => {
+            {planetDetails.localExports.map((e) => {
              const valueInMillions =
-                (((piPrices?.appraisal.items.find((a) => a.typeID === e.typeId)
+                (((piPrices?.appraisal.items.find((a) => a.typeID === e.type_id)
                  ?.prices.sell.min ?? 0) *
-                  e.amount) /
+                  e.quantity * e.factoryCount) /
                  1000000) *
                24 *
                30;
@@ -275,7 +391,7 @@ export const PlanetTableRow = ({

              return (
                <Typography
-                  key={`export-praisal-${character.character.characterId}-${planet.planet_id}-${e.typeId}`}
+                  key={`export-praisal-${character.character.characterId}-${planet.planet_id}-${e.type_id}`}
                  fontSize={theme.custom.smallText}
                >
                  {displayValue}
@@ -284,49 +400,122 @@ export const PlanetTableRow = ({
            })}
          </div>
        </TableCell>
-        <TableCell>
-          <div style={{ display: "flex", flexDirection: "column" }}>
-            {storageFacilities
-              .sort((a, b) => {
-                const isALaunchpad = a.type_id === 2256 || a.type_id === 2542 || a.type_id === 2543 || a.type_id === 2544 || a.type_id === 2552 || a.type_id === 2555 || a.type_id === 2556 || a.type_id === 2557;
-                const isBLaunchpad = b.type_id === 2256 || b.type_id === 2542 || b.type_id === 2543 || b.type_id === 2544 || b.type_id === 2552 || b.type_id === 2555 || b.type_id === 2556 || b.type_id === 2557;
-                return isALaunchpad === isBLaunchpad ? 0 : isALaunchpad ? -1 : 1;
-              })
-              .map((storage) => {
-                const storageInfo = getStorageInfo(storage);
-                if (!storageInfo) return null;
-                
-                const isLaunchpad = storage.type_id === 2256 || 
-                                  storage.type_id === 2542 || 
-                                  storage.type_id === 2543 || 
-                                  storage.type_id === 2544 || 
-                                  storage.type_id === 2552 || 
-                                  storage.type_id === 2555 || 
-                                  storage.type_id === 2556 || 
-                                  storage.type_id === 2557;
-                
-                const fillRate = storageInfo.fillRate;
-                const color = fillRate > 95 ? '#ff0000' : fillRate > 80 ? '#ffd700' : 'inherit';
-                
-                return (
-                  <div key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.pin_id}`} style={{ display: "flex", alignItems: "center" }}>
-                    <Typography fontSize={theme.custom.smallText} style={{ marginRight: "5px" }}>
-                      {isLaunchpad ? 'L' : 'S'}
-                    </Typography>
-                    <Typography fontSize={theme.custom.smallText} style={{ color }}>
-                      {fillRate.toFixed(1)}%
-                    </Typography>
-                    {storageInfo.value > 0 && (
-                      <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px" }}>
-                        ({Math.round(storageInfo.value / 1000000)}M)
+        <TableCell className="clickable-cell">
+          <Tooltip
+            title={
+              <Box sx={{ p: 1 }}>
+                <Typography variant="subtitle2" sx={{ mb: 1 }}>
+                  Storage Facilities
+                </Typography>
+                <Table size="small">
+                  <TableHead>
+                    <TableRow>
+                      <TableCell>Type</TableCell>
+                      <TableCell align="right">Capacity</TableCell>
+                      <TableCell align="right">Used</TableCell>
+                      <TableCell align="right">Fill Rate</TableCell>
+                      <TableCell align="right">Value</TableCell>
+                    </TableRow>
+                  </TableHead>
+                  <TableBody>
+                    {planetDetails.storageInfo
+                      .map(storage => ({
+                        ...storage,
+                        isLaunchpad: LAUNCHPAD_IDS.includes(storage.type_id)
+                      }))
+                      .sort((a, b) => (b.isLaunchpad ? 1 : 0) - (a.isLaunchpad ? 1 : 0))
+                      .map((storage, idx) => {
+                        const fillRate = storage.fillRate;
+                        const color = fillRate > 90 ? '#ff0000' : fillRate > 80 ? '#ffa500' : fillRate > 60 ? '#ffd700' : 'inherit';
+                        const contents = planet.info.pins.find(p => p.type_id === storage.type_id)?.contents || [];
+                        
+                        return (
+                          <React.Fragment key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.type}-${idx}`}>
+                            <TableRow>
+                              <TableCell>{storage.isLaunchpad ? 'Launchpad' : 'Storage'}</TableCell>
+                              <TableCell align="right">{storage.capacity.toFixed(1)} m³</TableCell>
+                              <TableCell align="right">{storage.used.toFixed(1)} m³</TableCell>
+                              <TableCell align="right" sx={{ color }}>{fillRate.toFixed(1)}%</TableCell>
+                              <TableCell align="right">
+                                {storage.value > 0 ? (
+                                  storage.value >= 1000000000 
+                                    ? `${(storage.value / 1000000000).toFixed(2)} B` 
+                                    : `${(storage.value / 1000000).toFixed(0)} M`
+                                ) : '-'} ISK
+                              </TableCell>
+                            </TableRow>
+                            {contents.length > 0 && (
+                              <TableRow>
+                                <TableCell colSpan={5} sx={{ pt: 0, pb: 0 }}>
+                                  <Table size="small">
+                                    <TableBody>
+                                      {contents.map((content, idy) => (
+                                        <TableRow key={`content-${character.character.characterId}-${planet.planet_id}-${storage.type}-${content.type_id}-${idx}-${idy}`}>
+                                          <TableCell sx={{ pl: 2 }}>
+                                            {PI_TYPES_MAP[content.type_id]?.name}
+                                          </TableCell>
+                                          <TableCell align="right" colSpan={4}>
+                                            {content.amount.toFixed(1)} units
+                                          </TableCell>
+                                        </TableRow>
+                                      ))}
+                                    </TableBody>
+                                  </Table>
+                                </TableCell>
+                              </TableRow>
+                            )}
+                          </React.Fragment>
+                        );
+                      })}
+                  </TableBody>
+                </Table>
+              </Box>
+            }
+            componentsProps={{
+              tooltip: {
+                sx: {
+                  bgcolor: 'background.paper',
+                  '& .MuiTooltip-arrow': {
+                    color: 'background.paper',
+                  },
+                  maxWidth: 'none',
+                  width: 'fit-content'
+                }
+              }
+            }}
+          >
+            <div style={{ display: "flex", flexDirection: "column" }}>
+              {planetDetails.storageInfo.length === 0 &&<Typography fontSize={theme.custom.smallText}>No storage</Typography>}
+              {planetDetails.storageInfo
+                .map(storage => ({
+                  ...storage,
+                  isLaunchpad: LAUNCHPAD_IDS.includes(storage.type_id)
+                }))
+                .sort((a, b) => (b.isLaunchpad ? 1 : 0) - (a.isLaunchpad ? 1 : 0))
+                .map((storage, idx) => {
+                  const fillRate = storage.fillRate;
+                  const color = fillRate > 90 ? '#ff0000' : fillRate > 80 ? '#ffa500' : fillRate > 60 ? '#ffd700' : 'inherit';
+                  
+                  return (
+                    <div key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.type}-${idx}`} style={{ display: "flex", alignItems: "center" }}>
+                      <Typography fontSize={theme.custom.smallText} style={{ marginRight: "5px" }}>
+                        {storage.isLaunchpad ? 'L' : 'S'}
                      </Typography>
-                    )}
-                  </div>
-                );
-              })}
-          </div>
+                      <Typography fontSize={theme.custom.smallText} style={{ color }}>
+                        {fillRate.toFixed(1)}%
+                      </Typography>
+                      {storage.value > 0 && (
+                        <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px" }}>
+                          ({Math.round(storage.value / 1000000)}M)
+                        </Typography>
+                      )}
+                    </div>
+                  );
+                })}
+            </div>
+          </Tooltip>
        </TableCell>
-        <TableCell>
+        <TableCell className="menu-cell">
          <IconButton
            aria-label="more"
            aria-controls="planet-menu"
@@ -348,14 +537,6 @@ export const PlanetTableRow = ({
            }}>
              Configure Planet
            </MenuItem>
-            {extractors.length > 0 && (
-              <MenuItem onClick={() => {
-                setSimulationOpen(!simulationOpen);
-                handleMenuClose();
-              }}>
-                {simulationOpen ? 'Hide Extraction Simulation' : 'Show Extraction Simulation'}
-              </MenuItem>
-            )}
            <MenuItem onClick={() => {
              handle3DrenderOpen();
              handleMenuClose();
@@ -366,11 +547,11 @@ export const PlanetTableRow = ({
        </TableCell>
      </TableRow>
      <TableRow>
-        <TableCell colSpan={6} style={{ paddingBottom: 0, paddingTop: 0 }}>
+        <TableCell colSpan={6} style={{ paddingBottom: 0, paddingTop: 0, border: 'none' }}>
          <Collapse in={simulationOpen} timeout="auto" unmountOnExit>
            <Box sx={{ my: 2 }}>
              <ExtractionSimulationDisplay
-                extractors={extractors
+                extractors={planetDetails.extractors
                  .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
                  .map(e => ({
                    typeId: e.extractor_details!.product_type_id!,
@@ -379,7 +560,21 @@ export const PlanetTableRow = ({
                    installTime: e.install_time ?? "",
                    expiryTime: e.expiry_time ?? ""
                  }))}
-                productionNodes={productionNodes}
+                productionNodes={Array.from(planetDetails.localProduction).map(([schematicId, schematic]) => ({
+                  schematicId: schematicId,
+                  typeId: schematic.outputs[0].type_id,
+                  name: schematic.name,
+                  inputs: schematic.inputs.map((input: SchematicInput) => ({
+                    typeId: input.type_id,
+                    quantity: input.quantity
+                  })),
+                  outputs: schematic.outputs.map((output: SchematicOutput) => ({
+                    typeId: output.type_id,
+                    quantity: output.quantity
+                  })),
+                  cycleTime: schematic.cycle_time,
+                  factoryCount: schematic.factoryCount || 1
+                }))}
              />
            </Box>
          </Collapse>
--- a/src/app/components/PlanetaryInteraction/PlanetaryInteractionRow.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetaryInteractionRow.tsx
@@ -1,5 +1,5 @@
 import { AccessToken } from "@/types";
-import { Stack, Tooltip, Typography, styled, useTheme } from "@mui/material";
+import { IconButton, Stack, Tooltip, Typography, styled, useTheme } from "@mui/material";
 import { PlanetCard } from "./PlanetCard";
 import { NoPlanetCard } from "./NoPlanetCard";
 import Table from "@mui/material/Table";
@@ -10,7 +10,8 @@ import TableHead from "@mui/material/TableHead";
 import TableRow from "@mui/material/TableRow";
 import Paper from "@mui/material/Paper";
 import { PlanetTableRow } from "./PlanetTableRow";
-import Image from "next/image";
+import { Settings } from "@mui/icons-material";
+import { PlanetCalculations } from "@/types/planet";

 const StackItem = styled(Stack)(({ theme }) => ({
  ...theme.typography.body2,
@@ -22,8 +23,10 @@ const StackItem = styled(Stack)(({ theme }) => ({

 const PlanetaryIteractionTable = ({
  character,
+  planetDetails,
 }: {
  character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
  const theme = useTheme();

@@ -36,8 +39,8 @@ const PlanetaryIteractionTable = ({

  return (
    <StackItem width="100%">
-      <TableContainer component={Paper}>
-        <Table size="small" aria-label="a dense table">
+      <TableContainer component={Paper} sx={{ width: '100%' }}>
+        <Table size="small" aria-label="a dense table" sx={{ width: '100%' }}>
          <TableHead>
            <TableRow>
              <TableCell width="8%">
@@ -84,8 +87,8 @@ const PlanetaryIteractionTable = ({
                </Tooltip>
              </TableCell>
              <TableCell width="2%">
-                <Tooltip title="How many units per hour factories are producing">
-                  <Typography fontSize={theme.custom.smallText}>u/h</Typography>
+                <Tooltip title="How many units per hour factories are producing on this planet">
+                  <Typography fontSize={theme.custom.smallText}>uph</Typography>
                </Tooltip>
              </TableCell>
              <TableCell width="4%" align="right">
@@ -98,10 +101,17 @@ const PlanetaryIteractionTable = ({
              <TableCell width="10%">
                <Tooltip title="Storage facility fill rate">
                  <Typography fontSize={theme.custom.smallText}>
-                    Storage Fill rate
+                    Storage%
                  </Typography>
                </Tooltip>
              </TableCell>
+              <TableCell>
+                <Tooltip title="Planet settings">
+                <IconButton aria-label="settings">
+                  <Settings fontSize="small" />
+                </IconButton>
+                </Tooltip>
+              </TableCell>
            </TableRow>
          </TableHead>
          <TableBody>
@@ -110,6 +120,7 @@ const PlanetaryIteractionTable = ({
                key={`${character.character.characterId}-${planet.planet_id}`}
                planet={planet}
                character={character}
+                planetDetails={planetDetails[planet.planet_id]}
              />
            ))}
          </TableBody>
@@ -121,8 +132,10 @@ const PlanetaryIteractionTable = ({

 const PlanetaryInteractionIconsRow = ({
  character,
+  planetDetails,
 }: {
  character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
  return (
    <StackItem>
@@ -132,6 +145,7 @@ const PlanetaryInteractionIconsRow = ({
            key={`${character.character.characterId}-${planet.planet_id}`}
            planet={planet}
            character={character}
+            planetDetails={planetDetails[planet.planet_id]}
          />
        ))}
        {Array.from(Array(6 - character.planets.length).keys()).map((i, id) => (
@@ -146,14 +160,16 @@ const PlanetaryInteractionIconsRow = ({

 export const PlanetaryInteractionRow = ({
  character,
+  planetDetails,
 }: {
  character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
  const theme = useTheme();

  return theme.custom.compactMode ? (
-    <PlanetaryInteractionIconsRow character={character} />
+    <div style={{ marginTop: "1.2rem" }}><PlanetaryInteractionIconsRow character={character} planetDetails={planetDetails} /></div>
  ) : (
-    <PlanetaryIteractionTable character={character} />
+    <div style={{ marginTop: "1.4rem" }}><PlanetaryIteractionTable character={character} planetDetails={planetDetails} /></div>
  );
 };
--- a/src/app/components/PlanetaryInteraction/ProductionChainVisualization.tsx
+++ b/src/app/components/PlanetaryInteraction/ProductionChainVisualization.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
-import { Box, Paper, Typography, Grid, Stack, Divider } from '@mui/material';
+import { Box, Paper, Typography, Grid, Stack } from '@mui/material';
 import { EVE_IMAGE_URL } from '@/const';
 import { PI_TYPES_MAP } from '@/const';
+import { DateTime } from 'luxon';
+import Countdown from 'react-countdown';
+import Image from 'next/image';

 interface Factory {
  schematic_id: number;
@@ -29,6 +32,7 @@ interface ProductionChainVisualizationProps {
    typeId: number;
    baseValue: number;
    cycleTime: number;
+    expiryTime: string;
  }>;
  factories: Factory[];
  extractorTotals: Map<number, number>;
@@ -39,8 +43,10 @@ export const ProductionChainVisualization: React.FC<ProductionChainVisualization
  extractedTypeIds,
  factories,
  extractorTotals,
-  productionNodes
+  productionNodes,
+  extractors
 }) => {
+
  // Get all type IDs involved in the production chain
  const allTypeIds = new Set<number>();
  const requiredInputs = new Set<number>();
@@ -214,9 +220,15 @@ export const ProductionChainVisualization: React.FC<ProductionChainVisualization

  // Get factory count for a type
  const getFactoryCount = (typeId: number): number => {
-    const node = nodesByOutput.get(typeId);
-    if (!node) return 0;
-    return factories.find(f => f.schematic_id === node.schematicId)?.count ?? 0;
+    // First find the node that produces this type
+    const producingNode = productionNodes.find(node => 
+      node.outputs.some(output => output.typeId === typeId)
+    );
+    
+    if (!producingNode) return 0;
+    
+    // Then find the factory count for this schematic
+    return factories.find(f => f.schematic_id === producingNode.schematicId)?.count ?? 0;
  };

  // Get input requirements for a type
@@ -232,6 +244,11 @@ export const ProductionChainVisualization: React.FC<ProductionChainVisualization
    return node?.cycleTime;
  };

+  // Get extractor expiry time for a type
+  const getExtractorExpiryTime = (typeId: number): string | undefined => {
+    return extractors.find(e => e.typeId === typeId)?.expiryTime;
+  };
+
  return (
    <Paper sx={{ p: 2, my: 2 }}>
      <Typography variant="h6" gutterBottom>
@@ -258,6 +275,7 @@ export const ProductionChainVisualization: React.FC<ProductionChainVisualization
                  const consumption = consumptionTotals.get(typeId) ?? 0;
                  const inputs = getInputRequirements(typeId);
                  const cycleTime = getSchematicCycleTime(typeId);
+                  const expiryTime = getExtractorExpiryTime(typeId);

                  return (
                    <Grid item key={typeId} xs={12} sm={6} md={4}>
@@ -274,7 +292,7 @@ export const ProductionChainVisualization: React.FC<ProductionChainVisualization
                        }}
                      >
                        <Box sx={{ display: 'flex', alignItems: 'center', gap: 2 }}>
-                          <img 
+                          <Image 
                            src={`${EVE_IMAGE_URL}/types/${typeId}/icon`} 
                            alt={type?.name ?? `Type ${typeId}`}
                            width={48}
@@ -292,19 +310,49 @@ export const ProductionChainVisualization: React.FC<ProductionChainVisualization
                          </Box>
                        </Box>
                        <Stack spacing={0.5}>
-                          {production > 0 && (
-                            <>
-                              <Typography variant="caption" color="success.main">
-                                Production: {production.toFixed(1)} units total
+                          {factoryCount > 0 && (
+                            <Typography variant="caption" color="info.main">
+                              Factories: {factoryCount}
+                            </Typography>
+                          )}
+                          {inputs.length > 0 && (
+                            <Box>
+                              <Typography variant="caption" color="text.secondary">
+                                Inputs:
                              </Typography>
-                            </>
+                              {inputs.map(input => (
+                                <Typography 
+                                  key={input.typeId} 
+                                  variant="caption" 
+                                  sx={{ display: 'block', ml: 1 }}
+                                >
+                                  {PI_TYPES_MAP[input.typeId]?.name}: {input.quantity * factoryCount}/cycle
+                                </Typography>
+                              ))}
+                            </Box>
+                          )}
+                          {expiryTime && (
+                            <Box>
+                              <Typography variant="caption" color="text.secondary">
+                                Extractor expires in:
+                              </Typography>
+                              <Typography variant="caption" sx={{ ml: 1 }}>
+                                <Countdown
+                                  overtime={true}
+                                  date={DateTime.fromISO(expiryTime).toMillis()}
+                                />
+                              </Typography>
+                            </Box>
+                          )}
+                          {production > 0 && (
+                            <Typography variant="caption" color="success.main">
+                              Production: {production.toFixed(1)} units total
+                            </Typography>
                          )}
                          {consumption > 0 && (
-                            <>
-                              <Typography variant="caption" color="error.main">
-                                Consumption: {consumption.toFixed(1)} units total
-                              </Typography>
-                            </>
+                            <Typography variant="caption" color="error.main">
+                              Consumption: {consumption.toFixed(1)} units total
+                            </Typography>
                          )}
                          {isImported && (
                            <>
--- a/src/app/components/PlanetaryInteraction/timeColors.ts
+++ b/src/app/components/PlanetaryInteraction/timeColors.ts
--- a/src/app/components/Settings/SettingsButtons.tsx
+++ b/src/app/components/Settings/SettingsButtons.tsx
@@ -1,6 +1,7 @@
 import {
  ColorContext,
  ColorSelectionType,
+  SessionContext,
 } from "@/app/context/Context";
 import {
  Button,
@@ -10,14 +11,18 @@ import {
  DialogTitle,
  Tooltip,
  Typography,
+  TextField,
+  Box,
+  FormControlLabel,
+  Checkbox,
 } from "@mui/material";
 import { ColorChangeHandler, ColorResult, CompactPicker } from "react-color";
-import React from "react";
-import { useContext } from "react";
+import React, { useState, useContext } from "react";

 export const SettingsButton = () => {
  const { colors, setColors } = useContext(ColorContext);
-  const [open, setOpen] = React.useState(false);
+  const { balanceThreshold, setBalanceThreshold, showProductIcons, setShowProductIcons } = useContext(SessionContext);
+  const [open, setOpen] = useState(false);

  const handleClickOpen = () => {
    setOpen(true);
@@ -26,6 +31,7 @@ export const SettingsButton = () => {
  const handleClose = () => {
    setOpen(false);
  };
+
  const handleColorSelection = (key: string, currentColors: ColorSelectionType) => (selection: ColorResult) => {
    console.log(key, selection.hex)
    setColors({
@@ -34,10 +40,23 @@ export const SettingsButton = () => {
    })
  };

+  const handleBalanceThresholdChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = parseInt(event.target.value);
+    if (!isNaN(value) && value >= 0 && value <= 100000) {
+      setBalanceThreshold(value);
+    }
+  };
+
+  const handleShowProductIconsChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setShowProductIcons(event.target.checked);
+  };
+
  return (
    <Tooltip title="Toggle settings dialog">
      <>
-        <Button onClick={handleClickOpen}>Settings</Button>
+        <Button onClick={handleClickOpen} color="inherit">
+          Settings
+        </Button>
        <Dialog
          open={open}
          onClose={handleClose}
@@ -45,9 +64,35 @@ export const SettingsButton = () => {
          aria-describedby="alert-dialog-description"
        >
          <DialogTitle id="alert-dialog-title">
-            {"Override default timer colors"}
+            {"Settings"}
          </DialogTitle>
+
          <DialogContent style={{ paddingTop: "1rem" }}>
+            <Box sx={{ mt: 2 }}>
+              <Typography variant="subtitle1">Display Settings</Typography>
+              <FormControlLabel
+                control={
+                  <Checkbox
+                    checked={showProductIcons}
+                    onChange={handleShowProductIconsChange}
+                  />
+                }
+                label="Show product icons instead of names"
+              />
+            </Box>
+            <Box sx={{ mt: 2 }}>
+              <Typography variant="subtitle1">Balance Threshold</Typography>
+              <TextField
+                type="number"
+                value={balanceThreshold}
+                onChange={handleBalanceThresholdChange}
+                fullWidth
+                margin="normal"
+                inputProps={{ min: 0, max: 100000 }}
+                helperText="Set the threshold for balance alerts (0-100,000)"
+                error={balanceThreshold < 0 || balanceThreshold > 100000}
+              />
+            </Box>
            {Object.keys(colors).map((key) => {
              return (
                <div key={`color-row-${key}`}>
--- a/src/app/components/Summary/Summary.tsx
+++ b/src/app/components/Summary/Summary.tsx
@@ -1,5 +1,5 @@
 import { SessionContext } from "@/app/context/Context";
-import { PI_TYPES_MAP } from "@/const";
+import { PI_TYPES_MAP, STORAGE_IDS } from "@/const";
 import { planetCalculations } from "@/planets";
 import { AccessToken } from "@/types";
 import {
@@ -19,10 +19,12 @@ import {
  AccordionSummary,
  AccordionDetails,
  TableSortLabel,
+  Box,
+  TextField,
 } from "@mui/material";
-import { useContext, useState } from "react";
+import { useContext, useState, useEffect } from "react";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { argv0 } from "process";
+import { DateTime } from "luxon";

 const StackItem = styled(Stack)(({ theme }) => ({
  ...theme.typography.body2,
@@ -41,13 +43,39 @@ const displayValue = (valueInMillions: number): string =>
    ? `${(valueInMillions / 1000).toFixed(2)} B`
    : `${valueInMillions.toFixed(2)} M`;

-type SortBy = "name" | "perHour" | "price";
+type SortBy = "name" | "perHour" | "storage" | "price" | "storagePrice" | "progress";
 type SortDirection = "asc" | "desc";

 export const Summary = ({ characters }: { characters: AccessToken[] }) => {
  const { piPrices } = useContext(SessionContext);
  const [sortDirection, setSortDirection] = useState<SortDirection>("asc");
  const [sortBy, setSortBy] = useState<SortBy>("name");
+  const [startDate, setStartDate] = useState<string>(DateTime.now().startOf('day').toISO());
+  const [activityPercentage, setActivityPercentage] = useState<number>(100);
+
+  // Load saved values from localStorage on mount
+  useEffect(() => {
+    const savedDate = localStorage.getItem('productionStartDate');
+    if (savedDate) {
+      setStartDate(savedDate);
+    }
+
+    const savedActivity = localStorage.getItem('activityPercentage');
+    if (savedActivity) {
+      setActivityPercentage(parseFloat(savedActivity));
+    }
+  }, []);
+
+  // Save values to localStorage when they change
+  useEffect(() => {
+    localStorage.setItem('productionStartDate', startDate);
+  }, [startDate]);
+
+  useEffect(() => {
+    localStorage.setItem('activityPercentage', activityPercentage.toString());
+  }, [activityPercentage]);
+
+  // Calculate exports and storage amounts
  const exports = characters.flatMap((char) => {
    return char.planets
      .filter(
@@ -62,6 +90,28 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
      });
  });

+  // Calculate storage amounts
+  const storageAmounts = characters.reduce<Grouped>((totals, character) => {
+    character.planets
+      .filter(
+        (p) =>
+          !character.planetConfig.some(
+            (c) => c.planetId == p.planet_id && c.excludeFromTotals,
+          ),
+      )
+      .forEach((planet) => {
+        planet.info.pins
+          .filter(pin => STORAGE_IDS().some(storage => storage.type_id === pin.type_id))
+          .forEach(storage => {
+            storage.contents?.forEach(content => {
+              const current = totals[content.type_id] || 0;
+              totals[content.type_id] = current + content.amount;
+            });
+          });
+      });
+    return totals;
+  }, {});
+
  const groupedByMaterial = exports.reduce<Grouped>((totals, material) => {
    const { typeId, amount } = material;
    const newTotal = isNaN(totals[typeId]) ? amount : totals[typeId] + amount;
@@ -69,27 +119,44 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
    return totals;
  }, {});

+  const startDateTime = DateTime.fromISO(startDate);
+  const hoursSinceStart = DateTime.now().diff(startDateTime, 'hours').hours;
+
  const withProductNameAndPrice = Object.keys(groupedByMaterial).map(
    (typeIdString) => {
      const typeId = parseInt(typeIdString);
      const amount = groupedByMaterial[typeId];
+      const storageAmount = storageAmounts[typeId] || 0;
+      const adjustedAmount = amount * (activityPercentage / 100);
      const valueInMillions =
        (((piPrices?.appraisal.items.find((a) => a.typeID === typeId)?.prices
          .sell.min ?? 0) *
-          amount) /
+          adjustedAmount) /
          1000000) *
        24 *
        30;
+      const storageValueInMillions =
+        ((piPrices?.appraisal.items.find((a) => a.typeID === typeId)?.prices
+          .sell.min ?? 0) *
+          storageAmount) /
+        1000000;
+
+      // Calculate expected production and progress
+      const expectedProduction = adjustedAmount * hoursSinceStart;
+      const progress = hoursSinceStart > 0 ? (storageAmount / expectedProduction) * 100 : 0;

      return {
        typeId,
-        amount,
+        amount: adjustedAmount,
+        storageAmount,
        materialName: PI_TYPES_MAP[typeId].name,
        price: valueInMillions,
+        storageValue: storageValueInMillions,
+        progress,
      };
    },
  );
-  const theme = useTheme();
+

  return (
    <StackItem width="100%">
@@ -98,14 +165,48 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
          <h2>Totals</h2>
        </AccordionSummary>
        <AccordionDetails>
-          <TableContainer component={Paper}>
-            <Table size="small" aria-label="a dense table">
+          <Box sx={{ display: 'flex', alignItems: 'center', gap: 2, mb: 2 }}>
+            <TextField
+              label="Production Start Date"
+              type="date"
+              value={DateTime.fromISO(startDate).toFormat('yyyy-MM-dd')}
+              onChange={(e) => {
+                const newDate = DateTime.fromFormat(e.target.value, 'yyyy-MM-dd').startOf('day').toISO();
+                if (newDate) setStartDate(newDate);
+              }}
+              InputLabelProps={{
+                shrink: true,
+              }}
+              size="small"
+            />
+            <TextField
+              label="Activity %"
+              type="number"
+              value={activityPercentage}
+              onChange={(e) => {
+                const value = Math.min(100, Math.max(0, parseFloat(e.target.value) || 0));
+                setActivityPercentage(value);
+              }}
+              InputLabelProps={{
+                shrink: true,
+              }}
+              inputProps={{
+                min: 0,
+                max: 100,
+                step: 1,
+              }}
+              size="small"
+              sx={{ width: '100px' }}
+            />
+          </Box>
+          <TableContainer component={Paper} sx={{ width: '100%' }}>
+            <Table size="small" aria-label="a dense table" sx={{ width: '100%' }}>
              <TableHead>
                <TableRow>
-                  <TableCell width="40%">
+                  <TableCell width="20%">
                    <Tooltip title="What exports factories are producing">
                      <TableSortLabel
-                        active={true}
+                        active={sortBy === "name"}
                        direction={sortDirection}
                        onClick={() => {
                          setSortDirection(
@@ -118,10 +219,10 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
                      </TableSortLabel>
                    </Tooltip>
                  </TableCell>
-                  <TableCell width="10%">
-                    <Tooltip title="How many units per hour factories are producing">
+                  <TableCell width="10%" align="right">
+                    <Tooltip title={`Adjusted production rate (${activityPercentage}% activity)`}>
                      <TableSortLabel
-                        active={true}
+                        active={sortBy === "perHour"}
                        direction={sortDirection}
                        onClick={() => {
                          setSortDirection(
@@ -135,9 +236,41 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
                    </Tooltip>
                  </TableCell>
                  <TableCell width="10%" align="right">
-                    <Tooltip title="How many million ISK per month this planet is exporting (Jita sell min)">
+                    <Tooltip title="Amount currently in storage">
                      <TableSortLabel
-                        active={true}
+                        active={sortBy === "storage"}
+                        direction={sortDirection}
+                        onClick={() => {
+                          setSortDirection(
+                            sortDirection === "asc" ? "desc" : "asc",
+                          );
+                          setSortBy("storage");
+                        }}
+                      >
+                        Units in storage
+                      </TableSortLabel>
+                    </Tooltip>
+                  </TableCell>
+                  <TableCell width="15%" align="right">
+                    <Tooltip title="Current ISK value of storage">
+                      <TableSortLabel
+                        active={sortBy === "storagePrice"}
+                        direction={sortDirection}
+                        onClick={() => {
+                          setSortDirection(
+                            sortDirection === "asc" ? "desc" : "asc",
+                          );
+                          setSortBy("storagePrice");
+                        }}
+                      >
+                        Produced ISK value
+                      </TableSortLabel>
+                    </Tooltip>
+                  </TableCell>
+                  <TableCell width="15%" align="right">
+                    <Tooltip title="Monthly ISK value from production">
+                      <TableSortLabel
+                        active={sortBy === "price"}
                        direction={sortDirection}
                        onClick={() => {
                          setSortDirection(
@@ -146,7 +279,23 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
                          setSortBy("price");
                        }}
                      >
-                        ISK/M
+                        Maximum possible ISK/M
+                      </TableSortLabel>
+                    </Tooltip>
+                  </TableCell>
+                  <TableCell width="15%" align="right">
+                    <Tooltip title="Progress towards monthly production target">
+                      <TableSortLabel
+                        active={sortBy === "progress"}
+                        direction={sortDirection}
+                        onClick={() => {
+                          setSortDirection(
+                            sortDirection === "asc" ? "desc" : "asc",
+                          );
+                          setSortBy("progress");
+                        }}
+                      >
+                        Progress from start date
                      </TableSortLabel>
                    </Tooltip>
                  </TableCell>
@@ -167,12 +316,30 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
                      if (sortDirection === "desc")
                        return a.amount > b.amount ? -1 : 1;
                    }
+                    if (sortBy === "storage") {
+                      if (sortDirection === "asc")
+                        return a.storageAmount > b.storageAmount ? 1 : -1;
+                      if (sortDirection === "desc")
+                        return a.storageAmount > b.storageAmount ? -1 : 1;
+                    }
                    if (sortBy === "price") {
                      if (sortDirection === "asc")
                        return a.price > b.price ? 1 : -1;
                      if (sortDirection === "desc")
                        return a.price > b.price ? -1 : 1;
                    }
+                    if (sortBy === "storagePrice") {
+                      if (sortDirection === "asc")
+                        return a.storageValue > b.storageValue ? 1 : -1;
+                      if (sortDirection === "desc")
+                        return a.storageValue > b.storageValue ? -1 : 1;
+                    }
+                    if (sortBy === "progress") {
+                      if (sortDirection === "asc")
+                        return a.progress > b.progress ? 1 : -1;
+                      if (sortDirection === "desc")
+                        return a.progress > b.progress ? -1 : 1;
+                    }
                    return 0;
                  })
                  .map((product) => (
@@ -180,7 +347,10 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
                      key={product.materialName}
                      material={product.materialName}
                      amount={product.amount}
+                      storageAmount={product.storageAmount}
                      price={product.price}
+                      storageValue={product.storageValue}
+                      progress={product.progress}
                    />
                  ))}
                <SummaryRow
@@ -189,6 +359,10 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
                    (amount, p) => amount + p.price,
                    0,
                  )}
+                  storageValue={withProductNameAndPrice.reduce(
+                    (amount, p) => amount + p.storageValue,
+                    0,
+                  )}
                />
              </TableBody>
            </Table>
@@ -202,17 +376,32 @@ export const Summary = ({ characters }: { characters: AccessToken[] }) => {
 const SummaryRow = ({
  material,
  amount,
+  storageAmount,
  price,
+  storageValue,
+  progress,
 }: {
  material: string;
  amount?: number;
+  storageAmount?: number;
  price: number;
+  storageValue?: number;
+  progress?: number;
 }) => (
  <TableRow>
    <TableCell component="th" scope="row">
      {material}
    </TableCell>
-    <TableCell>{amount}</TableCell>
+    <TableCell align="right">{amount?.toFixed(1)}</TableCell>
+    <TableCell align="right">{storageAmount?.toFixed(1)}</TableCell>
+        <TableCell align="right">{storageValue !== undefined && displayValue(storageValue)}</TableCell>
    <TableCell align="right">{displayValue(price)}</TableCell>
+    <TableCell align="right">
+      {progress !== undefined && (
+        <Typography color={progress >= 100 ? 'success.main' : progress >= 75 ? 'warning.main' : 'error.main'}>
+          {progress.toFixed(1)}%
+        </Typography>
+      )}
+    </TableCell>
  </TableRow>
 );
--- a/src/app/components/SupportButton/SupportButton.tsx
+++ b/src/app/components/SupportButton/SupportButton.tsx
@@ -1,23 +0,0 @@
-import { Box, Button, Tooltip } from "@mui/material";
-export const SupportButton = () => {
-  return (
-    <Box>
-      <Tooltip
-        title={`
-          Consider using code 'CALLIEVE' on EVE store checkout to support the project! Click to copy to clipboard ;)
-        `}
-      >
-        <Button
-          href=""
-          style={{ width: "100%" }}
-          sx={{ color: "white", display: "block" }}
-          onClick={() => {
-            navigator.clipboard.writeText("CALLIEVE");
-          }}
-        >
-          CALLIEVE
-        </Button>
-      </Tooltip>
-    </Box>
-  );
-};
--- a/src/app/context/Context.tsx
+++ b/src/app/context/Context.tsx
@@ -1,7 +1,6 @@
 import { EvePraisalResult } from "@/eve-praisal";
-import { AccessToken, CharacterUpdate } from "@/types";
+import { AccessToken, CharacterUpdate, PlanetConfig } from "@/types";
 import { Dispatch, SetStateAction, createContext } from "react";
-import { PlanetConfig } from "../components/PlanetConfig/PlanetConfigDialog";

 export const CharacterContext = createContext<{
  characters: AccessToken[];
@@ -27,6 +26,8 @@ export const SessionContext = createContext<{
  togglePlanMode: () => void;
  alertMode: boolean;
  toggleAlertMode: () => void;
+  extractionTimeMode: boolean;
+  toggleExtractionTimeMode: () => void;
  piPrices: EvePraisalResult | undefined;
  updatePlanetConfig: (config: PlanetConfig) => void;
  readPlanetConfig: ({
@@ -36,6 +37,10 @@ export const SessionContext = createContext<{
    characterId: number;
    planetId: number;
  }) => PlanetConfig;
+  balanceThreshold: number;
+  setBalanceThreshold: Dispatch<SetStateAction<number>>;
+  showProductIcons: boolean;
+  setShowProductIcons: (show: boolean) => void;
 }>({
  sessionReady: false,
  refreshSession: () => {},
@@ -48,6 +53,8 @@ export const SessionContext = createContext<{
  togglePlanMode: () => {},
  alertMode: false,
  toggleAlertMode: () => {},
+  extractionTimeMode: false,
+  toggleExtractionTimeMode: () => {},
  piPrices: undefined,
  updatePlanetConfig: () => {},
  readPlanetConfig: ({
@@ -59,7 +66,12 @@ export const SessionContext = createContext<{
  }) => {
    return { characterId, planetId, excludeFromTotals: true };
  },
+  balanceThreshold: 1000,
+  setBalanceThreshold: () => {},
+  showProductIcons: false,
+  setShowProductIcons: () => {},
 });
+
 export type ColorSelectionType = {
  defaultColor: string;
  expiredColor: string;
@@ -81,6 +93,7 @@ export const defaultColors = {
  dayColor: "#2F695A",
  twoDaysColor: "#2F695A",
 };
+
 export const ColorContext = createContext<{
  colors: ColorSelectionType;
  setColors: (colors: ColorSelectionType) => void;
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -17,7 +17,22 @@ import {
 import { useSearchParams } from "next/navigation";
 import { EvePraisalResult, fetchAllPrices } from "@/eve-praisal";
 import { getPlanet, getPlanetUniverse, getPlanets } from "@/planets";
-import { PlanetConfig } from "./components/PlanetConfig/PlanetConfigDialog";
+import { PlanetConfig } from "@/types";
+
+// Add batch processing utility
+const processInBatches = async <T, R>(
+  items: T[],
+  batchSize: number,
+  processFn: (item: T) => Promise<R>
+): Promise<R[]> => {
+  const results: R[] = [];
+  for (let i = 0; i < items.length; i += batchSize) {
+    const batch = items.slice(i, i + batchSize);
+    const batchResults = await Promise.all(batch.map(processFn));
+    results.push(...batchResults);
+  }
+  return results;
+};

 const Home = () => {
  const searchParams = useSearchParams();
@@ -29,6 +44,9 @@ const Home = () => {
  const [piPrices, setPiPrices] = useState<EvePraisalResult | undefined>(
    undefined,
  );
+  const [balanceThreshold, setBalanceThreshold] = useState(1000);
+  const [showProductIcons, setShowProductIcons] = useState(false);
+  const [extractionTimeMode, setExtractionTimeMode] = useState(false);

  const [colors, setColors] = useState<ColorSelectionType>(defaultColors);
  const [alertMode, setAlertMode] = useState(false);
@@ -60,15 +78,13 @@ const Home = () => {
  };

  const refreshSession = async (characters: AccessToken[]) => {
-    return Promise.all(
-      characters.map((c) => {
-        try {
-          return refreshToken(c);
-        } catch {
-          return { ...c, needsLogin: true };
-        }
-      }),
-    );
+    return processInBatches(characters, 50, async (c) => {
+      try {
+        return await refreshToken(c);
+      } catch {
+        return { ...c, needsLogin: true };
+      }
+    });
  };

  const handleCallback = async (
@@ -104,24 +120,24 @@ const Home = () => {
  const initializeCharacterPlanets = (
    characters: AccessToken[],
  ): Promise<AccessToken[]> =>
-    Promise.all(
-      characters.map(async (c) => {
-        if (c.needsLogin || c.character === undefined)
-          return { ...c, planets: [] };
-        const planets = await getPlanets(c);
-        const planetsWithInfo: PlanetWithInfo[] = await Promise.all(
-          planets.map(async (p) => ({
-            ...p,
-            info: await getPlanet(c, p),
-            infoUniverse: await getPlanetUniverse(p),
-          })),
-        );
-        return {
-          ...c,
-          planets: planetsWithInfo,
-        };
-      }),
-    );
+    processInBatches(characters, 50, async (c) => {
+      if (c.needsLogin || c.character === undefined)
+        return { ...c, planets: [] };
+      const planets = await getPlanets(c);
+      const planetsWithInfo: PlanetWithInfo[] = await processInBatches(
+        planets,
+        3,
+        async (p) => ({
+          ...p,
+          info: await getPlanet(c, p),
+          infoUniverse: await getPlanetUniverse(p),
+        })
+      );
+      return {
+        ...c,
+        planets: planetsWithInfo,
+      };
+    });

  const saveCharacters = (characters: AccessToken[]): AccessToken[] => {
    localStorage.setItem("characters", JSON.stringify(characters));
@@ -147,6 +163,10 @@ const Home = () => {
    setAlertMode(!alertMode);
  };

+  const toggleExtractionTimeMode = () => {
+    setExtractionTimeMode(!extractionTimeMode);
+  };
+
  const updatePlanetConfig = (config: PlanetConfig) => {
    const charactersToSave = characters.map((c) => {
      if (c.character.characterId === config.characterId) {
@@ -199,6 +219,17 @@ const Home = () => {
    setAlertMode(JSON.parse(storedAlertMode));
  }, []);

+  useEffect(() => {
+    const storedBalanceThreshold = localStorage.getItem("balanceThreshold");
+    if (storedBalanceThreshold) {
+      setBalanceThreshold(parseInt(storedBalanceThreshold));
+    }
+  }, []);
+
+  useEffect(() => {
+    localStorage.setItem("balanceThreshold", balanceThreshold.toString());
+  }, [balanceThreshold]);
+
  useEffect(() => {
    localStorage.setItem("compactMode", compactMode ? "true" : "false");
  }, [compactMode]);
@@ -211,6 +242,17 @@ const Home = () => {
    localStorage.setItem("colors", JSON.stringify(colors));
  }, [colors]);

+  useEffect(() => {
+    const savedMode = localStorage.getItem('extractionTimeMode');
+    if (savedMode) {
+      setExtractionTimeMode(savedMode === 'true');
+    }
+  }, []);
+
+  useEffect(() => {
+    localStorage.setItem('extractionTimeMode', extractionTimeMode.toString());
+  }, [extractionTimeMode]);
+
  useEffect(() => {
    fetch("api/env")
      .then((r) => r.json())
@@ -236,7 +278,7 @@ const Home = () => {
  }, []);

  useEffect(() => {
-    const ESI_CACHE_TIME_MS = 600000;
+    const ESI_CACHE_TIME_MS = 3000000;
    const interval = setInterval(() => {
      const characters = initializeCharacters();
      refreshSession(characters)
@@ -262,8 +304,14 @@ const Home = () => {
        piPrices,
        alertMode,
        toggleAlertMode,
+        extractionTimeMode,
+        toggleExtractionTimeMode,
        updatePlanetConfig,
        readPlanetConfig,
+        balanceThreshold,
+        setBalanceThreshold,
+        showProductIcons,
+        setShowProductIcons,
      }}
    >
      <CharacterContext.Provider
--- a/src/const.ts
+++ b/src/const.ts
@@ -1080,3 +1080,5 @@ export const STORAGE_CAPACITIES: Record<number, number> = {
  2556: 10000, // Plasma Launchpad
  2557: 10000, // Storm Launchpad
 };
+
+export const LAUNCHPAD_IDS = [2256, 2542, 2543, 2544, 2552, 2555, 2556, 2557];
--- a/src/pages/api/env.ts
+++ b/src/pages/api/env.ts
@@ -1,11 +1,51 @@
 import { NextApiRequest, NextApiResponse } from "next";
+import logger from "@/utils/logger";

 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  if (req.method === "GET") {
-    const EVE_SSO_CALLBACK_URL = process.env.EVE_SSO_CALLBACK_URL;
-    const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID;
-    res.json({ EVE_SSO_CLIENT_ID, EVE_SSO_CALLBACK_URL });
+    logger.info({ 
+      event: 'env_request_start'
+    });
+
+    try {
+      const EVE_SSO_CALLBACK_URL = process.env.EVE_SSO_CALLBACK_URL;
+      const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID;
+
+      if (!EVE_SSO_CALLBACK_URL || !EVE_SSO_CLIENT_ID) {
+        logger.error({ 
+          event: 'env_request_failed',
+          reason: 'missing_env_vars',
+          vars: {
+            hasCallbackUrl: !!EVE_SSO_CALLBACK_URL,
+            hasClientId: !!EVE_SSO_CLIENT_ID
+          }
+        });
+        return res.status(500).json({ error: 'Missing required environment variables' });
+      }
+
+      logger.info({ 
+        event: 'env_request_success',
+        vars: {
+          hasCallbackUrl: true,
+          hasClientId: true
+        }
+      });
+
+      return res.json({ EVE_SSO_CLIENT_ID, EVE_SSO_CALLBACK_URL });
+    } catch (e) {
+      logger.error({ 
+        event: 'env_request_failed',
+        reason: 'unexpected_error',
+        error: e
+      });
+      return res.status(500).json({ error: 'Internal server error' });
+    }
  } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
    res.status(404).end();
  }
 };
--- a/src/pages/api/praisal.ts
+++ b/src/pages/api/praisal.ts
@@ -1,19 +1,45 @@
 import { getPraisal } from "@/eve-praisal";
 import { NextApiRequest, NextApiResponse } from "next";
+import logger from "@/utils/logger";

 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  if (req.method === "POST") {
-    const praisalRequest: { quantity: number; type_id: number }[] = JSON.parse(
-      req.body
-    );
+    logger.info({ 
+      event: 'praisal_request_start'
+    });
+
    try {
+      const praisalRequest: { quantity: number; type_id: number }[] = JSON.parse(
+        req.body
+      );
+
+      logger.info({ 
+        event: 'praisal_request_parsed',
+        items: praisalRequest.length
+      });
+
      const praisal = await getPraisal(praisalRequest);
+
+      logger.info({ 
+        event: 'praisal_request_success',
+        items: praisalRequest.length
+      });
+
      return res.json(praisal);
    } catch (e) {
-      console.log(e);
-      res.status(404).end();
+      logger.error({ 
+        event: 'praisal_request_failed',
+        error: e,
+        body: req.body
+      });
+      return res.status(500).json({ error: 'Failed to get praisal' });
    }
  } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
    res.status(404).end();
  }
 };
--- a/src/pages/api/refresh.ts
+++ b/src/pages/api/refresh.ts
@@ -1,7 +1,8 @@
 import { AccessToken } from "@/types";
-import { extractCharacterFromToken } from "@/utils";
+import { extractCharacterFromToken } from "@/utils/utils";
 import { NextApiRequest, NextApiResponse } from "next";
 import crypto from "crypto-js";
+import logger from "@/utils/logger";

 const EVE_SSO_TOKEN_URL = "https://login.eveonline.com/v2/oauth/token";
 const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID ?? "";
@@ -10,6 +11,14 @@ const EVE_SSO_SECRET = process.env.EVE_SSO_SECRET ?? "";
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  if (req.method === "POST") {
    const accessToken: AccessToken = req.body;
+    logger.info({ 
+      event: 'token_refresh_start',
+      character: {
+        name: accessToken.character.name,
+        characterId: accessToken.character.characterId
+      }
+    });
+
    const params = new URLSearchParams({
      grant_type: "refresh_token",
      refresh_token: crypto.AES.decrypt(
@@ -33,7 +42,20 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
        body: params,
        headers,
      }).then((res) => res.json());
+
      const character = extractCharacterFromToken(response);
+      if (!character) {
+        logger.error({ 
+          event: 'token_refresh_failed',
+          reason: 'character_extraction_failed',
+          character: {
+            name: accessToken.character.name,
+            characterId: accessToken.character.characterId
+          }
+        });
+        return res.json({ ...accessToken, needsLogin: true });
+      }
+
      const token: AccessToken = {
        access_token: response.access_token,
        token_type: response.token_type,
@@ -51,12 +73,26 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
        planetConfig: accessToken.planetConfig ?? [],
      };

-      console.log("Refresh", character.name, character.characterId);
+      logger.info({ 
+        event: 'token_refresh_success',
+        character: {
+          name: character.name,
+          characterId: character.characterId
+        }
+      });

      return res.json(token);
    } catch (e) {
-      console.log(e);
-      res.json({ ...accessToken, needsLogin: true });
+      logger.error({ 
+        event: 'token_refresh_failed',
+        reason: 'api_error',
+        error: e,
+        character: {
+          name: accessToken.character.name,
+          characterId: accessToken.character.characterId
+        }
+      });
+      return res.json({ ...accessToken, needsLogin: true });
    }
  } else {
    res.status(404).end();
--- a/src/pages/api/revoke.ts
+++ b/src/pages/api/revoke.ts
@@ -1,6 +1,7 @@
 import { AccessToken } from "@/types";
 import { NextApiRequest, NextApiResponse } from "next";
 import crypto from "crypto-js";
+import logger from "@/utils/logger";

 const EVE_SSO_REVOKE_URL = "https://login.eveonline.com/v2/oauth/revoke";
 const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID ?? "";
@@ -9,6 +10,14 @@ const EVE_SSO_SECRET = process.env.EVE_SSO_SECRET ?? "";
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  if (req.method === "POST") {
    const accessToken: AccessToken = req.body;
+    logger.info({ 
+      event: 'token_revoke_start',
+      character: {
+        name: accessToken.character.name,
+        characterId: accessToken.character.characterId
+      }
+    });
+
    const params = new URLSearchParams({
      grant_type: "refresh_token",
      refresh_token: crypto.AES.decrypt(
@@ -27,24 +36,42 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
    };

    try {
-      await fetch(EVE_SSO_REVOKE_URL, {
+      const response = await fetch(EVE_SSO_REVOKE_URL, {
        method: "POST",
        body: params,
        headers,
-      }).then((res) => res.json());
+      });

-      console.log(
-        "Revoke",
-        accessToken.character.name,
-        accessToken.character.characterId
-      );
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+
+      logger.info({ 
+        event: 'token_revoke_success',
+        character: {
+          name: accessToken.character.name,
+          characterId: accessToken.character.characterId
+        }
+      });

      return res.end();
    } catch (e) {
-      console.log(e);
+      logger.error({ 
+        event: 'token_revoke_failed',
+        error: e,
+        character: {
+          name: accessToken.character.name,
+          characterId: accessToken.character.characterId
+        }
+      });
      return res.status(500).end();
    }
  } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
    res.status(404).end();
  }
 };
--- a/src/pages/api/token.ts
+++ b/src/pages/api/token.ts
@@ -1,7 +1,8 @@
 import { AccessToken } from "@/types";
-import { extractCharacterFromToken } from "@/utils";
+import { extractCharacterFromToken } from "@/utils/utils";
 import { NextApiRequest, NextApiResponse } from "next";
 import crypto from "crypto-js";
+import logger from "@/utils/logger";

 const EVE_SSO_TOKEN_URL = "https://login.eveonline.com/v2/oauth/token";
 const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID ?? "";
@@ -10,7 +11,19 @@ const EVE_SSO_SECRET = process.env.EVE_SSO_SECRET ?? "";
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  if (req.method === "GET") {
    const code = req.query.code as string;
-    if (!code || code === undefined) return res.status(404).end();
+    if (!code || code === undefined) {
+      logger.warn({ 
+        event: 'token_request_failed',
+        reason: 'missing_code',
+        query: req.query
+      });
+      return res.status(404).end();
+    }
+
+    logger.info({ 
+      event: 'token_request_start',
+      code: code
+    });

    const params = new URLSearchParams({
      grant_type: "authorization_code",
@@ -26,34 +39,69 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
      "User-Agent": "https://github.com/calli-eve/eve-pi",
    };

-    const response = await fetch(EVE_SSO_TOKEN_URL, {
-      method: "POST",
-      body: params,
-      headers,
-    }).then((res) => res.json());
+    try {
+      const response = await fetch(EVE_SSO_TOKEN_URL, {
+        method: "POST",
+        body: params,
+        headers,
+      });

-    const character = extractCharacterFromToken(response);
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }

-    console.log("Login", character.name, character.characterId);
+      const data = await response.json();
+      const character = extractCharacterFromToken(data);

-    const token: AccessToken = {
-      access_token: response.access_token,
-      token_type: response.token_type,
-      refresh_token: crypto.AES.encrypt(
-        response.refresh_token,
-        EVE_SSO_SECRET,
-      ).toString(),
-      expires_at: Date.now() + response.expires_in * 1000,
-      character,
-      needsLogin: false,
-      account: "-",
-      comment: "",
-      system: "",
-      planets: [],
-      planetConfig: [],
-    };
-    res.json(token);
+      if (!character) {
+        logger.error({ 
+          event: 'token_request_failed',
+          reason: 'character_extraction_failed',
+          data
+        });
+        return res.status(500).end();
+      }
+
+      logger.info({ 
+        event: 'token_request_success',
+        character: {
+          name: character.name,
+          characterId: character.characterId
+        }
+      });
+
+      const token: AccessToken = {
+        access_token: data.access_token,
+        token_type: data.token_type,
+        refresh_token: crypto.AES.encrypt(
+          data.refresh_token,
+          EVE_SSO_SECRET,
+        ).toString(),
+        expires_at: Date.now() + data.expires_in * 1000,
+        character,
+        needsLogin: false,
+        account: "-",
+        comment: "",
+        system: "",
+        planets: [],
+        planetConfig: [],
+      };
+      return res.json(token);
+    } catch (e) {
+      logger.error({ 
+        event: 'token_request_failed',
+        reason: 'api_error',
+        error: e,
+        code: code
+      });
+      return res.status(500).end();
+    }
  } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
    res.status(404).end();
  }
 };
--- a/src/planets.ts
+++ b/src/planets.ts
@@ -7,7 +7,7 @@ import {
 } from "@/types";
 import { Api } from "@/esi-api";
 import { EXTRACTOR_TYPE_IDS, FACTORY_IDS, PI_SCHEMATICS } from "@/const";
-import { extractorsHaveExpired } from "./app/components/PlanetaryInteraction/timeColors";
+import { extractorsHaveExpired } from "./app/components/PlanetaryInteraction/alerts";

 export const getPlanets = async (character: AccessToken): Promise<Planet[]> => {
  const api = new Api();
@@ -22,10 +22,51 @@ export const getPlanets = async (character: AccessToken): Promise<Planet[]> => {
  return planets;
 };

+interface CachedPlanetData {
+  data: PlanetInfo;
+  timestamp: number;
+}
+
+const CACHE_DURATION_MS = 60_000; // 1 minute
+const CACHE_STORAGE_KEY = "planet_cache";
+
+const loadCacheFromStorage = (): Map<string, CachedPlanetData> => {
+  try {
+    const stored = localStorage.getItem(CACHE_STORAGE_KEY);
+    if (stored) {
+      const parsed = JSON.parse(stored);
+      return new Map(Object.entries(parsed));
+    }
+  } catch (error) {
+    console.error("Failed to load planet cache from localStorage:", error);
+  }
+  return new Map();
+};
+
+const saveCacheToStorage = (cache: Map<string, CachedPlanetData>) => {
+  try {
+    const obj = Object.fromEntries(cache);
+    localStorage.setItem(CACHE_STORAGE_KEY, JSON.stringify(obj));
+  } catch (error) {
+    console.error("Failed to save planet cache to localStorage:", error);
+  }
+};
+
+const planetCache = loadCacheFromStorage();
+
 export const getPlanet = async (
  character: AccessToken,
  planet: Planet,
 ): Promise<PlanetInfo> => {
+  const cacheKey = `${character.character.characterId}-${planet.planet_id}`;
+  const cached = planetCache.get(cacheKey);
+
+  if (cached && Date.now() - cached.timestamp < CACHE_DURATION_MS) {
+    console.log(`[Cache HIT] Planet ${planet.planet_id} for character ${character.character.characterId}`);
+    return cached.data;
+  }
+
+  console.log(`[Cache MISS] Fetching planet ${planet.planet_id} for character ${character.character.characterId}`);
  const api = new Api();
  const planetInfo = (
    await api.v3.getCharactersCharacterIdPlanetsPlanetId(
@@ -36,6 +77,14 @@ export const getPlanet = async (
      },
    )
  ).data;
+
+  planetCache.set(cacheKey, {
+    data: planetInfo,
+    timestamp: Date.now(),
+  });
+
+  saveCacheToStorage(planetCache);
+
  return planetInfo;
 };

@@ -61,10 +110,19 @@ export const planetCalculations = (planet: PlanetWithInfo) => {
        const schematic = PI_SCHEMATICS.find(
          (s) => s.schematic_id == f.schematic_id,
        );
-        if (schematic) acc.set(f.schematic_id, schematic);
+        if (schematic) {
+          const existing = acc.get(f.schematic_id);
+          if (existing) {
+            // If we already have this schematic, increment its count
+            existing.count = (existing.count || 0) + 1;
+          } else {
+            // First time seeing this schematic, set count to 1
+            acc.set(f.schematic_id, { ...schematic, count: 1 });
+          }
+        }
      }
      return acc;
-    }, new Map<SchematicId, (typeof PI_SCHEMATICS)[number]>());
+    }, new Map<SchematicId, (typeof PI_SCHEMATICS)[number] & { count: number }>());

  const locallyProduced = Array.from(localProduction)
    .flatMap((p) => p[1].outputs)
@@ -85,7 +143,13 @@ export const planetCalculations = (planet: PlanetWithInfo) => {
        ![...locallyProduced, ...locallyExcavated].some(
          (lp) => lp === p.type_id,
        ),
-    );
+    ).map((p) => ({
+      ...p,
+      factoryCount: planetInfo.pins
+        .filter((f) => f.schematic_id === p.schematic_id)
+        .length,
+    }));
+

  const localExports = locallyProduced
    .filter((p) => !locallyConsumed.some((lp) => lp === p))
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,5 +1,3 @@
-import { PlanetConfig } from "./app/components/PlanetConfig/PlanetConfigDialog";
-
 export interface AccessToken {
  access_token: string;
  expires_at: number;
@@ -119,3 +117,9 @@ export interface Pin {
    amount: number;
  }>;
 }
+
+export interface PlanetConfig {
+  characterId: number;
+  planetId: number;
+  excludeFromTotals: boolean;
+}
--- a/src/types/planet.ts
+++ b/src/types/planet.ts
@@ -0,0 +1,83 @@
+import { Pin, PlanetWithInfo } from '../types';
+
+export interface StorageContent {
+  type_id: number;
+  amount: number;
+}
+
+export interface StorageInfo {
+  type: string;
+  type_id: number;
+  capacity: number;
+  used: number;
+  fillRate: number;
+  value: number;
+}
+
+export interface PlanetCalculations {
+  expired: boolean;
+  extractors: Pin[];
+  localProduction: Map<number, LocalProductionInfo>;
+  localImports: LocalImport[];
+  localExports: LocalExport[];
+  storageInfo: StorageInfo[];
+  extractorAverages: ExtractorAverage[];
+  hasLargeExtractorDifference: boolean;
+  importDepletionTimes: ImportDepletionTime[];
+  visibility: 'visible' | 'hidden';
+}
+
+export interface AlertState {
+  expired: boolean;
+  hasLowStorage: boolean;
+  hasLowImports: boolean;
+  hasLargeExtractorDifference: boolean;
+}
+
+export interface ExtractorAverage {
+  typeId: number;
+  averagePerHour: number;
+}
+
+export interface ImportDepletionTime {
+  typeId: number;
+  hoursUntilDepletion: number;
+  monthlyCost: number;
+}
+
+export interface LocalProductionInfo {
+  name: string;
+  cycle_time: number;
+  schematic_id: number;
+  inputs: SchematicInput[];
+  outputs: SchematicOutput[];
+  factoryCount: number;
+}
+
+export interface LocalImport {
+  type_id: number;
+  schematic_id: number;
+  quantity: number;
+  factoryCount: number;
+}
+
+export interface LocalExport {
+  type_id: number;
+  schematic_id: number;
+  quantity: number;
+  factoryCount: number;
+}
+
+export interface SchematicInput {
+  schematic_id: number;
+  type_id: number;
+  quantity: number;
+  is_input: number;
+}
+
+export interface SchematicOutput {
+  schematic_id: number;
+  type_id: number;
+  quantity: number;
+  is_input: number;
+} 
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,13 +0,0 @@
-import { AccessToken, Character } from "./types";
-
-export const extractCharacterFromToken = (token: AccessToken): Character => {
-  const decodedToken = parseJwt(token.access_token);
-  return {
-    name: decodedToken.name,
-    characterId: decodedToken.sub.split(":")[2],
-  };
-};
-
-const parseJwt = (token: string) => {
-  return JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
-};
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -0,0 +1,16 @@
+import pino from 'pino';
+
+const logger = pino({
+  level: process.env.LOG_LEVEL || 'info',
+  formatters: {
+    level: (label) => {
+      return { level: label };
+    },
+  },
+  timestamp: () => `,"time":"${new Date().toISOString()}"`,
+  base: {
+    env: process.env.NODE_ENV,
+  },
+});
+
+export default logger; 
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -0,0 +1,22 @@
+import { AccessToken, Character } from "../types";
+
+export const extractCharacterFromToken = (token: AccessToken): Character | null => {
+  const decodedToken = parseJwt(token.access_token);
+  if (!decodedToken || !decodedToken.name || !decodedToken.sub) {
+    return null;
+  }
+  return {
+    name: decodedToken.name,
+    characterId: decodedToken.sub.split(":")[2],
+  };
+};
+
+const parseJwt = (token: string | undefined) => {
+  if (!token) return null;
+  try {
+    return JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
+  } catch (error) {
+    console.error('Failed to parse JWT token:', error);
+    return null;
+  }
+};
Author	SHA1	Message	Date
calli	e47c572423	fix nextjs CVE	2025-12-12 12:22:33 +02:00
calli	5c6f912721	cache planets for one minute so we dont spam ESI	2025-11-09 23:07:23 +02:00
calli	470935fe9d	update official instance url	2025-08-01 09:45:25 +03:00
calli	7ce238c9c7	increase batch from 5 to 50	2025-05-17 20:28:01 +03:00
calli	6523000e69	lets batch the requests for users with gazillion characters	2025-05-17 19:51:21 +03:00
calli	b993b28840	Add balance and storage alert counts to account card	2025-05-17 17:21:49 +03:00
calli	c036bc10e1	Sort storages	2025-05-17 17:21:37 +03:00
calli	b743193f46	update discord link	2025-05-17 17:10:58 +03:00
calli	02ebaf6e35	remove unused imports	2025-05-02 23:00:56 +03:00
calli	3a0843e54c	make keys unique for the new tooltip	2025-05-02 22:00:40 +03:00
calli	e43bd91bef	make active filters more visible	2025-05-02 21:54:22 +03:00
calli	cc76765278	add a storage tooltip	2025-05-02 21:54:09 +03:00
calli	73b54f6bf5	hoist calculations and alerts to accountCard level	2025-05-02 21:41:48 +03:00
calli	cbef0fd39b	rename timeColors to alerts to better describe the alert logic file	2025-04-30 17:57:52 +03:00
calli	e085fcd59b	add import tooltip to show import spesifics	2025-04-30 17:30:36 +03:00
calli	370400ce99	extract launchpad ids to const and recolor storage fill rates	2025-04-28 18:32:26 +03:00
calli	93507ea98e	add pino logger configuration correctly	2025-04-28 18:27:35 +03:00
calli	7915d2bd29	update docker compose file	2025-04-28 18:27:18 +03:00
calli	294720f776	use planets last_update to calculate the imports depletion	2025-04-28 18:10:32 +03:00
calli	f60003accf	add log level to env	2025-04-28 17:57:51 +03:00
calli	6f28cc0093	Add import exhaustion estimate	2025-04-28 17:55:44 +03:00
calli	c986884ed5	Improve logging and handle errors beter	2025-04-28 17:55:31 +03:00
calli	4fc97d473e	add toggle to show exact date time when extractors need a restart	2025-04-28 17:21:46 +03:00
calli	de49595f55	ui tweaks. add FAQ section. move filters to submenu	2025-04-25 09:38:10 +03:00
calli	a1f682e9fc	Align tables a bit better and add setting to show icons instead of product texts	2025-04-25 09:01:51 +03:00
calli	67acea9be4	increase automatic refresh to 5 minutes	2025-04-23 18:59:34 +03:00
calli	98b450fcc7	rearrange character layout and align tables to character image	2025-04-23 18:52:05 +03:00
calli	eb15696241	make account card clickable for easier collapse action	2025-04-23 17:59:50 +03:00
calli	741b2480b9	add account level statistics	2025-04-23 17:41:09 +03:00
calli	b185e5d044	hide extraction simulation for planets without extractors	2025-04-23 15:23:57 +03:00
calli	f0d4708b43	show extraction tooltip only if we have extractors	2025-04-23 15:23:32 +03:00
calli	0f33a7ff0c	Move activity level local storage read to useState	2025-04-23 15:18:32 +03:00
calli	bbdcece163	Show imports per planet	2025-04-23 15:15:26 +03:00
calli	2a1e74ca79	Remove sentry tunnel routing	2025-04-23 15:14:59 +03:00
calli	0e141321b6	add realized production to totals and settings for comparing it to estimates	2025-04-23 12:31:43 +03:00
calli	d433f5420e	Update luxon dependecy	2025-04-23 12:31:19 +03:00
calli	fa5f79068f	Refactor compact view planet card to be more compact and show extraction estimates	2025-04-23 11:35:22 +03:00
calli	c07dba3afc	Fix extraction amounts to use correct extractors	2025-04-23 11:33:08 +03:00
calli	a871bac35f	Move extraction details expand to row click	2025-04-23 11:32:44 +03:00
calli	eca35f51ac	Use nextjs Image instead of html img	2025-04-23 11:32:19 +03:00
calli	9e9ab359ec	Add a cell to table header to even it out	2025-04-23 11:31:51 +03:00
calli	1fc0efd3da	Add mass collapse and expand	2025-04-23 11:30:59 +03:00
calli	00a06a9681	add off-balance alert treshold to settings	2025-04-22 18:08:53 +03:00
calli	ac56adbcbe	Add singleplanet P2 blance alert	2025-04-22 18:03:17 +03:00
calli	a738dc4a22	add planet extraction simulation to tooltip	2025-04-22 17:53:51 +03:00
calli	efc28f7e36	move exclusion directly to planet list and add more info to simulation	2025-04-22 17:35:16 +03:00