diff --git a/interface/package-lock.json b/interface/package-lock.json
index 3272ddc92..22b7b9914 100644
--- a/interface/package-lock.json
+++ b/interface/package-lock.json
@@ -11,27 +11,28 @@
         "@emotion/react": "^11.9.0",
         "@emotion/styled": "^11.8.1",
         "@msgpack/msgpack": "^2.7.2",
-        "@mui/icons-material": "^5.6.0",
-        "@mui/material": "^5.6.0",
-        "@types/lodash": "^4.14.181",
-        "@types/node": "^17.0.23",
+        "@mui/icons-material": "^5.6.2",
+        "@mui/material": "^5.6.2",
+        "@table-library/react-table-library": "^3.1.0",
+        "@types/lodash": "^4.14.182",
+        "@types/node": "^17.0.26",
         "@types/react": "^17.0.43",
         "@types/react-dom": "^17.0.14",
         "@types/react-router-dom": "^5.3.3",
-        "async-validator": "^4.0.7",
+        "async-validator": "^4.0.8",
         "axios": "^0.26.1",
-        "http-proxy-middleware": "^2.0.4",
+        "http-proxy-middleware": "^2.0.6",
         "jwt-decode": "^3.1.2",
         "lodash": "^4.17.21",
-        "notistack": "^2.0.3",
+        "notistack": "^2.0.4",
         "parse-ms": "^3.0.0",
         "react": "^17.0.2",
         "react-app-rewired": "^2.2.1",
         "react-dom": "^17.0.2",
-        "react-dropzone": "^12.0.4",
+        "react-dropzone": "^12.0.5",
         "react-icons": "^4.3.1",
         "react-router-dom": "^6.3.0",
-        "react-scripts": "5.0.0",
+        "react-scripts": "5.0.1",
         "sockette": "^2.0.6",
         "typescript": "^4.6.3"
       },
@@ -1947,9 +1948,9 @@
       }
     },
     "node_modules/@emotion/babel-plugin": {
-      "version": "11.7.2",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz",
-      "integrity": "sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==",
+      "version": "11.9.2",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz",
+      "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==",
       "dependencies": {
         "@babel/helper-module-imports": "^7.12.13",
         "@babel/plugin-syntax-jsx": "^7.12.13",
@@ -2855,15 +2856,15 @@
       }
     },
     "node_modules/@mui/base": {
-      "version": "5.0.0-alpha.75",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.75.tgz",
-      "integrity": "sha512-eQ8SP2ML5nJyOdSqmk26ezg/eEP1k42Z+k6uMfNbgHZc8iZwgw9iVe+6g5j/qZPKS88AtxVG8YsLLZkXT82/Bw==",
+      "version": "5.0.0-alpha.77",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.77.tgz",
+      "integrity": "sha512-Zqm3qlczGViD3lJSYo8ZnQLHJ3PwGYftbDfVuh2Rq5OD88F7H6oDILlqknzty59NDkeSVO2qlymYmHOY1nLodg==",
       "dependencies": {
         "@babel/runtime": "^7.17.2",
         "@emotion/is-prop-valid": "^1.1.2",
         "@mui/types": "^7.1.3",
-        "@mui/utils": "^5.6.0",
-        "@popperjs/core": "^2.11.4",
+        "@mui/utils": "^5.6.1",
+        "@popperjs/core": "^2.11.5",
         "clsx": "^1.1.1",
         "prop-types": "^15.7.2",
         "react-is": "^17.0.2"
@@ -2876,7 +2877,7 @@
         "url": "https://opencollective.com/mui"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0",
+        "@types/react": "^17.0.0 || ^18.0.0",
         "react": "^17.0.0 || ^18.0.0",
         "react-dom": "^17.0.0 || ^18.0.0"
       },
@@ -2887,9 +2888,9 @@
       }
     },
     "node_modules/@mui/icons-material": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.0.tgz",
-      "integrity": "sha512-2GDGt+/BbwM3oVkF84b9FFKQdQ9TxBJIRnTwT99vO2mimdfJaojxMRB2lkysm9tUY4HOf0yoU6O//X6GTC0Zhw==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.2.tgz",
+      "integrity": "sha512-9QdI7axKuBAyaGz4mtdi7Uy1j73/thqFmEuxpJHxNC7O8ADEK1Da3t2veK2tgmsXsUlAHcAG63gg+GvWWeQNqQ==",
       "dependencies": {
         "@babel/runtime": "^7.17.2"
       },
@@ -2902,7 +2903,7 @@
       },
       "peerDependencies": {
         "@mui/material": "^5.0.0",
-        "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0",
+        "@types/react": "^17.0.0 || ^18.0.0",
         "react": "^17.0.0 || ^18.0.0"
       },
       "peerDependenciesMeta": {
@@ -2912,15 +2913,15 @@
       }
     },
     "node_modules/@mui/material": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.0.tgz",
-      "integrity": "sha512-yh4FoRRPTgJWjv1oIu3YuvfYGD/WOEnyGizQ9fKs+hlMjIc0rzFpyUCo++P/3BUd0/hRKcI8D8mrpJK9OiOy1g==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.2.tgz",
+      "integrity": "sha512-bwMvroBrMgUTwUh/BcjhtcJwEw9uH4chV3+ZSj6RckOJtMj8U4yEeD7S4NgHE8Ioj5eObKFzHpih/cTD1sDRpg==",
       "dependencies": {
         "@babel/runtime": "^7.17.2",
-        "@mui/base": "5.0.0-alpha.75",
-        "@mui/system": "^5.6.0",
+        "@mui/base": "5.0.0-alpha.77",
+        "@mui/system": "^5.6.2",
         "@mui/types": "^7.1.3",
-        "@mui/utils": "^5.6.0",
+        "@mui/utils": "^5.6.1",
         "@types/react-transition-group": "^4.4.4",
         "clsx": "^1.1.1",
         "csstype": "^3.0.11",
@@ -2939,7 +2940,7 @@
       "peerDependencies": {
         "@emotion/react": "^11.5.0",
         "@emotion/styled": "^11.3.0",
-        "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0",
+        "@types/react": "^17.0.0 || ^18.0.0",
         "react": "^17.0.0 || ^18.0.0",
         "react-dom": "^17.0.0 || ^18.0.0"
       },
@@ -2956,12 +2957,12 @@
       }
     },
     "node_modules/@mui/private-theming": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.0.tgz",
-      "integrity": "sha512-62jUFaMGfW3nvq/worcOAEiY++rWd44tpWShq4o97DybWmmWvEFYlBIuHEcXrtBIK/cloaQw8jqelQIFZeiVdw==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.2.tgz",
+      "integrity": "sha512-IbrSfFXfiZdyhRMC2bgGTFtb16RBQ5mccmjeh3MtAERWuepiCK7gkW5D9WhEsfTu6iez+TEjeUKSgmMHlsM2mg==",
       "dependencies": {
         "@babel/runtime": "^7.17.2",
-        "@mui/utils": "^5.6.0",
+        "@mui/utils": "^5.6.1",
         "prop-types": "^15.7.2"
       },
       "engines": {
@@ -2972,7 +2973,7 @@
         "url": "https://opencollective.com/mui"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0",
+        "@types/react": "^17.0.0 || ^18.0.0",
         "react": "^17.0.0 || ^18.0.0"
       },
       "peerDependenciesMeta": {
@@ -2982,9 +2983,9 @@
       }
     },
     "node_modules/@mui/styled-engine": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.0.tgz",
-      "integrity": "sha512-K1WPKTruJTPA49cub0HtDCBBvosPKizqgZ4RenAfWz/ldlFtM4p7e7Mt3YEnNWTOJMHvDGcEke1tCuELkVAMyA==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.1.tgz",
+      "integrity": "sha512-jEhH6TBY8jc9S8yVncXmoTYTbATjEu44RMFXj6sIYfKr5NArVwTwRo3JexLL0t3BOAiYM4xsFLgfKEIvB9SAeQ==",
       "dependencies": {
         "@babel/runtime": "^7.17.2",
         "@emotion/cache": "^11.7.1",
@@ -3012,15 +3013,15 @@
       }
     },
     "node_modules/@mui/system": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.0.tgz",
-      "integrity": "sha512-FoytH73hY78Dll6F0fg7AI/hnpplygbFeW0HsqBfwFWrt2PMc2YSq2ICqHzd2CZPIhzEgRHDTSI8bMTLtG9W7A==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.2.tgz",
+      "integrity": "sha512-Wg9TRbvavSwEYk6UdpnoDx+CqJfaAN7AzlmwEx7DtGmx0snFVBST8FVb1Ev1vXosxEnq6/fe7ZDRobFVewvEPQ==",
       "dependencies": {
         "@babel/runtime": "^7.17.2",
-        "@mui/private-theming": "^5.6.0",
-        "@mui/styled-engine": "^5.6.0",
+        "@mui/private-theming": "^5.6.2",
+        "@mui/styled-engine": "^5.6.1",
         "@mui/types": "^7.1.3",
-        "@mui/utils": "^5.6.0",
+        "@mui/utils": "^5.6.1",
         "clsx": "^1.1.1",
         "csstype": "^3.0.11",
         "prop-types": "^15.7.2"
@@ -3035,7 +3036,7 @@
       "peerDependencies": {
         "@emotion/react": "^11.5.0",
         "@emotion/styled": "^11.3.0",
-        "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0",
+        "@types/react": "^17.0.0 || ^18.0.0",
         "react": "^17.0.0 || ^18.0.0"
       },
       "peerDependenciesMeta": {
@@ -3064,9 +3065,9 @@
       }
     },
     "node_modules/@mui/utils": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.0.tgz",
-      "integrity": "sha512-LbZKkCOn4243vbEVGbaKV7t6eN6kz7t95DR6AcUCRk4daH3l7CXPYkWsyzysRWdXgSzHmIyrgg4FZKzTy0dTHQ==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.1.tgz",
+      "integrity": "sha512-CPrzrkiBusCZBLWu0Sg5MJvR3fKJyK3gKecLVX012LULyqg2U64Oz04BKhfkbtBrPBbSQxM+DWW9B1c9hmV9nQ==",
       "dependencies": {
         "@babel/runtime": "^7.17.2",
         "@types/prop-types": "^15.7.4",
@@ -3258,9 +3259,9 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz",
-      "integrity": "sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
+      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw=="
     },
     "node_modules/@sindresorhus/is": {
       "version": "0.14.0",
@@ -3547,6 +3548,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/@table-library/react-table-library": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-3.1.0.tgz",
+      "integrity": "sha512-YCWmLPdElk/4+VPSxDcgQXlJx+jxYH2xJwr8NXm9e1AEy17K8mtrjzD5SQXDOiVT8vSOzD21eEldfIaI/kooHA==",
+      "dependencies": {
+        "clsx": "1.1.1",
+        "react-virtualized-auto-sizer": "1.0.6",
+        "react-window": "1.8.6",
+        "use-double-click": "1.0.5"
+      },
+      "peerDependencies": {
+        "@emotion/react": ">= 11",
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -3593,9 +3610,9 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.0.tgz",
+      "integrity": "sha512-r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA==",
       "dependencies": {
         "@babel/types": "^7.3.0"
       }
@@ -3736,9 +3753,9 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.181",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz",
-      "integrity": "sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag=="
+      "version": "4.14.182",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
+      "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="
     },
     "node_modules/@types/mime": {
       "version": "1.3.2",
@@ -3746,9 +3763,9 @@
       "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
     },
     "node_modules/@types/node": {
-      "version": "17.0.23",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
-      "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="
+      "version": "17.0.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz",
+      "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A=="
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -3756,14 +3773,14 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "node_modules/@types/prettier": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz",
-      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz",
+      "integrity": "sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw=="
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.4",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
     },
     "node_modules/@types/q": {
       "version": "1.5.5",
@@ -3781,9 +3798,9 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "node_modules/@types/react": {
-      "version": "17.0.43",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.43.tgz",
-      "integrity": "sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==",
+      "version": "17.0.44",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.44.tgz",
+      "integrity": "sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -3791,11 +3808,11 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "17.0.14",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.14.tgz",
-      "integrity": "sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ==",
+      "version": "17.0.15",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.15.tgz",
+      "integrity": "sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw==",
       "dependencies": {
-        "@types/react": "*"
+        "@types/react": "^17"
       }
     },
     "node_modules/@types/react-is": {
@@ -3908,13 +3925,13 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz",
-      "integrity": "sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz",
+      "integrity": "sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.18.0",
-        "@typescript-eslint/type-utils": "5.18.0",
-        "@typescript-eslint/utils": "5.18.0",
+        "@typescript-eslint/scope-manager": "5.19.0",
+        "@typescript-eslint/type-utils": "5.19.0",
+        "@typescript-eslint/utils": "5.19.0",
         "debug": "^4.3.2",
         "functional-red-black-tree": "^1.0.1",
         "ignore": "^5.1.8",
@@ -3940,25 +3957,25 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz",
-      "integrity": "sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.19.0.tgz",
+      "integrity": "sha512-F+X/TTzmb2UXbghY1LrNLNDjMcGZMhKzXuzvu0xD+YEB77EamLM7zMOLuz2kP5807IJRDLBoAFFPYa7HT62sYg==",
       "dependencies": {
-        "@typescript-eslint/utils": "5.18.0"
+        "@typescript-eslint/utils": "5.19.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3972,13 +3989,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz",
-      "integrity": "sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.19.0.tgz",
+      "integrity": "sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.18.0",
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/typescript-estree": "5.18.0",
+        "@typescript-eslint/scope-manager": "5.19.0",
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/typescript-estree": "5.19.0",
         "debug": "^4.3.2"
       },
       "engines": {
@@ -3998,12 +4015,12 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz",
-      "integrity": "sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz",
+      "integrity": "sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g==",
       "dependencies": {
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/visitor-keys": "5.18.0"
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/visitor-keys": "5.19.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4014,11 +4031,11 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz",
-      "integrity": "sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz",
+      "integrity": "sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q==",
       "dependencies": {
-        "@typescript-eslint/utils": "5.18.0",
+        "@typescript-eslint/utils": "5.19.0",
         "debug": "^4.3.2",
         "tsutils": "^3.21.0"
       },
@@ -4039,9 +4056,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz",
-      "integrity": "sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.19.0.tgz",
+      "integrity": "sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -4051,12 +4068,12 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz",
-      "integrity": "sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz",
+      "integrity": "sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw==",
       "dependencies": {
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/visitor-keys": "5.18.0",
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/visitor-keys": "5.19.0",
         "debug": "^4.3.2",
         "globby": "^11.0.4",
         "is-glob": "^4.0.3",
@@ -4077,28 +4094,28 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz",
-      "integrity": "sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.19.0.tgz",
+      "integrity": "sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ==",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.18.0",
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/typescript-estree": "5.18.0",
+        "@typescript-eslint/scope-manager": "5.19.0",
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/typescript-estree": "5.19.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -4134,11 +4151,11 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz",
-      "integrity": "sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz",
+      "integrity": "sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ==",
       "dependencies": {
-        "@typescript-eslint/types": "5.18.0",
+        "@typescript-eslint/types": "5.19.0",
         "eslint-visitor-keys": "^3.0.0"
       },
       "engines": {
@@ -4291,9 +4308,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
@@ -4601,13 +4618,14 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4617,13 +4635,14 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz",
-      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
+      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
       "dependencies": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4643,17 +4662,17 @@
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
     },
     "node_modules/async-validator": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.7.tgz",
-      "integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ=="
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.8.tgz",
+      "integrity": "sha512-vx1kyOCuSJqB5IVatlybUkV/e22sdx+V0XohCWbBfbbzbiLFt6fHxfWg6UEBhFw0gVgZtaSLTJtugmP4rdGQAQ=="
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -5447,9 +5466,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001325",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
-      "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==",
+      "version": "1.0.30001332",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
       "funding": [
         {
           "type": "opencollective",
@@ -5836,9 +5855,9 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "node_modules/core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
+      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -5846,11 +5865,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz",
-      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz",
+      "integrity": "sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==",
       "dependencies": {
-        "browserslist": "^4.19.1",
+        "browserslist": "^4.20.2",
         "semver": "7.0.0"
       },
       "funding": {
@@ -5867,9 +5886,9 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.0.tgz",
+      "integrity": "sha512-ylOC9nVy0ak1N+fPIZj00umoZHgUVqmucklP5RT5N+vJof38klKn8Ze6KGyvchdClvEBr6LcQqJpI216LUMqYA==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -6000,17 +6019,17 @@
       }
     },
     "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/css-minimizer-webpack-plugin": {
@@ -6427,14 +6446,18 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/defined": {
@@ -6595,9 +6618,9 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -6608,9 +6631,9 @@
       }
     },
     "node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "funding": [
         {
           "type": "github",
@@ -6729,9 +6752,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.104",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
-      "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ=="
+      "version": "1.4.111",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz",
+      "integrity": "sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw=="
     },
     "node_modules/emittery": {
       "version": "0.8.1",
@@ -6775,9 +6798,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-      "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
+      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -6811,9 +6834,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
-      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
+      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -6826,7 +6849,7 @@
         "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.0",
@@ -6848,6 +6871,14 @@
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -6975,9 +7006,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
-      "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
+      "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
       "dependencies": {
         "@eslint/eslintrc": "^1.2.1",
         "@humanwhocodes/config-array": "^0.9.2",
@@ -7026,9 +7057,9 @@
       }
     },
     "node_modules/eslint-config-react-app": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz",
-      "integrity": "sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
+      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
       "dependencies": {
         "@babel/core": "^7.16.0",
         "@babel/eslint-parser": "^7.16.3",
@@ -7327,9 +7358,9 @@
       }
     },
     "node_modules/eslint-plugin-testing-library": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz",
-      "integrity": "sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.3.1.tgz",
+      "integrity": "sha512-OfF4dlG/q6ck6DL3P8Z0FPdK0dU5K57gsBu7eUcaVbwYKaNzjgejnXiM9CCUevppORkvfek+9D3Uj/9ZZ8Vz8g==",
       "dependencies": {
         "@typescript-eslint/utils": "^5.13.0"
       },
@@ -8071,9 +8102,9 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz",
-      "integrity": "sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz",
+      "integrity": "sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==",
       "dependencies": {
         "@babel/code-frame": "^7.8.3",
         "@types/json-schema": "^7.0.5",
@@ -8193,17 +8224,17 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
@@ -8267,9 +8298,9 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -8312,6 +8343,14 @@
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
+    "node_modules/functions-have-names": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
+      "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -8580,6 +8619,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -8829,9 +8879,9 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz",
-      "integrity": "sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -8852,9 +8902,9 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -10818,17 +10868,17 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/jest-snapshot/node_modules/supports-color": {
@@ -11541,9 +11591,9 @@
       }
     },
     "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "engines": {
         "node": ">=6.11.5"
       }
@@ -11634,11 +11684,14 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-      "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
     "node_modules/magic-string": {
@@ -11695,6 +11748,11 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/memoize-one": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -11963,9 +12021,9 @@
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
     "node_modules/node-releases": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
+      "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw=="
     },
     "node_modules/nodemon": {
       "version": "2.0.15",
@@ -12078,9 +12136,9 @@
       }
     },
     "node_modules/notistack": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.3.tgz",
-      "integrity": "sha512-krmVFtTO9kEY1Pa4NrbyexrjiRcV6TqBM2xLx8nuDea1g96Z/OZfkvVLmYKkTvoSJ3jyQntWK16z86ssW5kt4A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.4.tgz",
+      "integrity": "sha512-kOJmKvTG91ElMzi4aHu82BDe1liQ0zMrBp+TnWJptgowDsTbeTKbZmsRqJNIj145BmlOtZsEE9xjcrN46zVo3w==",
       "dependencies": {
         "clsx": "^1.1.0",
         "hoist-non-react-statics": "^3.3.0"
@@ -12093,8 +12151,8 @@
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
         "@mui/material": "^5.0.0",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       },
       "peerDependenciesMeta": {
         "@emotion/react": {
@@ -12174,9 +12232,9 @@
       }
     },
     "node_modules/object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
       "engines": {
         "node": ">= 6"
       }
@@ -12904,9 +12962,9 @@
       }
     },
     "node_modules/postcss-custom-properties": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.6.tgz",
-      "integrity": "sha512-QEnQkDkb+J+j2bfJisJJpTAFL+lUFl66rUNvnjPBIvRbZACLG4Eu5bmBCIY4FJCqhwsfbBpmJUyb3FcR/31lAg==",
+      "version": "12.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz",
+      "integrity": "sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -13201,17 +13259,17 @@
       }
     },
     "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/postcss-logical": {
@@ -14192,9 +14250,9 @@
       }
     },
     "node_modules/react-dev-utils": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz",
-      "integrity": "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
+      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
       "dependencies": {
         "@babel/code-frame": "^7.16.0",
         "address": "^1.1.2",
@@ -14215,7 +14273,7 @@
         "open": "^8.4.0",
         "pkg-up": "^3.1.0",
         "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.10",
+        "react-error-overlay": "^6.0.11",
         "recursive-readdir": "^2.2.2",
         "shell-quote": "^1.7.3",
         "strip-ansi": "^6.0.1",
@@ -14365,9 +14423,9 @@
       }
     },
     "node_modules/react-dropzone": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.4.tgz",
-      "integrity": "sha512-fcqHEYe1MzAghU6/Hz86lHDlBNsA+lO48nAcm7/wA+kIzwS6uuJbUG33tBZjksj7GAZ1iUQ6NHwjUURPmSGang==",
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.5.tgz",
+      "integrity": "sha512-zUjZigD0VJ91CSm9T1h7ErxFReBLaa9sjS2dUL0+inb0RROZpSJTNDHPY1rrBES5V2NXhF8v0kghmaHc81BMFg==",
       "dependencies": {
         "attr-accept": "^2.2.2",
         "file-selector": "^0.4.0",
@@ -14381,9 +14439,9 @@
       }
     },
     "node_modules/react-error-overlay": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz",
-      "integrity": "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA=="
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
+      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
     "node_modules/react-icons": {
       "version": "4.3.1",
@@ -14431,9 +14489,9 @@
       }
     },
     "node_modules/react-scripts": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz",
-      "integrity": "sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
+      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
       "dependencies": {
         "@babel/core": "^7.16.0",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
@@ -14451,7 +14509,7 @@
         "dotenv": "^10.0.0",
         "dotenv-expand": "^5.1.0",
         "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.0",
+        "eslint-config-react-app": "^7.0.1",
         "eslint-webpack-plugin": "^3.1.1",
         "file-loader": "^6.2.0",
         "fs-extra": "^10.0.0",
@@ -14468,7 +14526,7 @@
         "postcss-preset-env": "^7.0.1",
         "prompts": "^2.4.2",
         "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.0",
+        "react-dev-utils": "^12.0.1",
         "react-refresh": "^0.11.0",
         "resolve": "^1.20.0",
         "resolve-url-loader": "^4.0.0",
@@ -14503,17 +14561,17 @@
       }
     },
     "node_modules/react-scripts/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/react-transition-group": {
@@ -14531,6 +14589,34 @@
         "react-dom": ">=16.6.0"
       }
     },
+    "node_modules/react-virtualized-auto-sizer": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz",
+      "integrity": "sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==",
+      "engines": {
+        "node": ">8.0.0"
+      },
+      "peerDependencies": {
+        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0",
+        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0"
+      }
+    },
+    "node_modules/react-window": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz",
+      "integrity": "sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0",
+        "memoize-one": ">=3.1.1 <6"
+      },
+      "engines": {
+        "node": ">8.0.0"
+      },
+      "peerDependencies": {
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0"
+      }
+    },
     "node_modules/read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -14638,12 +14724,13 @@
       "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz",
-      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14916,9 +15003,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.70.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz",
-      "integrity": "sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==",
+      "version": "2.70.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.2.tgz",
+      "integrity": "sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -15861,28 +15948,28 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "node_modules/tailwindcss": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz",
-      "integrity": "sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==",
+      "version": "3.0.24",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
+      "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
       "dependencies": {
         "arg": "^5.0.1",
-        "chalk": "^4.1.2",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "cosmiconfig": "^7.0.1",
         "detective": "^5.2.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
+        "lilconfig": "^2.0.5",
         "normalize-path": "^3.0.0",
-        "object-hash": "^2.2.0",
-        "postcss": "^8.4.6",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.12",
         "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.0",
+        "postcss-load-config": "^3.1.4",
         "postcss-nested": "5.0.6",
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^6.0.10",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.0"
@@ -15895,70 +15982,14 @@
         "node": ">=12.13.0"
       },
       "peerDependencies": {
-        "autoprefixer": "^10.0.2",
         "postcss": "^8.0.9"
       }
     },
-    "node_modules/tailwindcss/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
     "node_modules/tailwindcss/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/tailwindcss/node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/tailwindcss/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -15970,25 +16001,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/tailwindcss/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -16537,18 +16549,18 @@
       }
     },
     "node_modules/update-notifier/node_modules/semver": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-      "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^7.4.0"
+        "lru-cache": "^6.0.0"
       },
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/update-notifier/node_modules/supports-color": {
@@ -16583,6 +16595,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/use-double-click": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/use-double-click/-/use-double-click-1.0.5.tgz",
+      "integrity": "sha512-71LUca6NtzpzHYlcfM/dOdmwvmvpMbzeIVQpN87w+DctpLiMCXtZpsN8FNWPgHpPBtNhvucPUHIDh5al8D8C7w==",
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -16723,9 +16748,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.71.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz",
-      "integrity": "sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==",
+      "version": "5.72.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+      "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -17131,26 +17156,26 @@
       }
     },
     "node_modules/workbox-background-sync": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.2.tgz",
-      "integrity": "sha512-EjG37LSMDJ1TFlFg56wx6YXbH4/NkG09B9OHvyxx+cGl2gP5OuOzsCY3rOPJSpbcz6jpuA40VIC3HzSD4OvE1g==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz",
+      "integrity": "sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==",
       "dependencies": {
         "idb": "^6.1.4",
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-broadcast-update": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.2.tgz",
-      "integrity": "sha512-DjJYraYnprTZE/AQNoeogaxI1dPuYmbw+ZJeeP8uXBSbg9SNv5wLYofQgywXeRepv4yr/vglMo9yaHUmBMc+4Q==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz",
+      "integrity": "sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==",
       "dependencies": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-build": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.2.tgz",
-      "integrity": "sha512-TVi4Otf6fgwikBeMpXF9n0awHfZTMNu/nwlMIT9W+c13yvxkmDFMPb7vHYK6RUmbcxwPnz4I/R+uL76+JxG4JQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.3.tgz",
+      "integrity": "sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==",
       "dependencies": {
         "@apideck/better-ajv-errors": "^0.3.1",
         "@babel/core": "^7.11.1",
@@ -17174,21 +17199,21 @@
         "strip-comments": "^2.0.1",
         "tempy": "^0.6.0",
         "upath": "^1.2.0",
-        "workbox-background-sync": "6.5.2",
-        "workbox-broadcast-update": "6.5.2",
-        "workbox-cacheable-response": "6.5.2",
-        "workbox-core": "6.5.2",
-        "workbox-expiration": "6.5.2",
-        "workbox-google-analytics": "6.5.2",
-        "workbox-navigation-preload": "6.5.2",
-        "workbox-precaching": "6.5.2",
-        "workbox-range-requests": "6.5.2",
-        "workbox-recipes": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2",
-        "workbox-streams": "6.5.2",
-        "workbox-sw": "6.5.2",
-        "workbox-window": "6.5.2"
+        "workbox-background-sync": "6.5.3",
+        "workbox-broadcast-update": "6.5.3",
+        "workbox-cacheable-response": "6.5.3",
+        "workbox-core": "6.5.3",
+        "workbox-expiration": "6.5.3",
+        "workbox-google-analytics": "6.5.3",
+        "workbox-navigation-preload": "6.5.3",
+        "workbox-precaching": "6.5.3",
+        "workbox-range-requests": "6.5.3",
+        "workbox-recipes": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3",
+        "workbox-streams": "6.5.3",
+        "workbox-sw": "6.5.3",
+        "workbox-window": "6.5.3"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -17279,117 +17304,117 @@
       }
     },
     "node_modules/workbox-cacheable-response": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.2.tgz",
-      "integrity": "sha512-UnHGih6xqloV808T7ve1iNKZMbpML0jGLqkkmyXkJbZc5j16+HRSV61Qrh+tiq3E3yLvFMGJ3AUBODOPNLWpTg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz",
+      "integrity": "sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==",
       "dependencies": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-core": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.2.tgz",
-      "integrity": "sha512-IlxLGQf+wJHCR+NM0UWqDh4xe/Gu6sg2i4tfZk6WIij34IVk9BdOQgi6WvqSHd879jbQIUgL2fBdJUJyAP5ypQ=="
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.3.tgz",
+      "integrity": "sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q=="
     },
     "node_modules/workbox-expiration": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.2.tgz",
-      "integrity": "sha512-5Hfp0uxTZJrgTiy9W7AjIIec+9uTOtnxY/tRBm4DbqcWKaWbVTa+izrKzzOT4MXRJJIJUmvRhWw4oo8tpmMouw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.3.tgz",
+      "integrity": "sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==",
       "dependencies": {
         "idb": "^6.1.4",
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-google-analytics": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.2.tgz",
-      "integrity": "sha512-8SMar+N0xIreP5/2we3dwtN1FUmTMScoopL86aKdXBpio8vXc8Oqb5fCJG32ialjN8BAOzDqx/FnGeCtkIlyvw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz",
+      "integrity": "sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==",
       "dependencies": {
-        "workbox-background-sync": "6.5.2",
-        "workbox-core": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2"
+        "workbox-background-sync": "6.5.3",
+        "workbox-core": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3"
       }
     },
     "node_modules/workbox-navigation-preload": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.2.tgz",
-      "integrity": "sha512-iqDNWWMswjCsZuvGFDpcX1Z8InBVAlVBELJ28xShsWWntALzbtr0PXMnm2WHkXCc56JimmGldZi1N5yDPiTPOg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz",
+      "integrity": "sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==",
       "dependencies": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-precaching": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.2.tgz",
-      "integrity": "sha512-OZAlQ8AAT20KugGKKuJMHdQ8X1IyNQaLv+mPTHj+8Dmv8peBq5uWNzs4g/1OSFmXsbXZ6a1CBC6YtQWVPhJQ9w==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.3.tgz",
+      "integrity": "sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==",
       "dependencies": {
-        "workbox-core": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2"
+        "workbox-core": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3"
       }
     },
     "node_modules/workbox-range-requests": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.2.tgz",
-      "integrity": "sha512-zi5VqF1mWqfCyJLTMXn1EuH/E6nisqWDK1VmOJ+TnjxGttaQrseOhMn+BMvULFHeF8AvrQ0ogfQ6bSv0rcfAlg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz",
+      "integrity": "sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==",
       "dependencies": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-recipes": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.2.tgz",
-      "integrity": "sha512-2lcUKMYDiJKvuvRotOxLjH2z9K7jhj8GNUaHxHNkJYbTCUN3LsX1cWrsgeJFDZ/LgI565t3fntpbG9J415ZBXA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.3.tgz",
+      "integrity": "sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==",
       "dependencies": {
-        "workbox-cacheable-response": "6.5.2",
-        "workbox-core": "6.5.2",
-        "workbox-expiration": "6.5.2",
-        "workbox-precaching": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2"
+        "workbox-cacheable-response": "6.5.3",
+        "workbox-core": "6.5.3",
+        "workbox-expiration": "6.5.3",
+        "workbox-precaching": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3"
       }
     },
     "node_modules/workbox-routing": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.2.tgz",
-      "integrity": "sha512-nR1w5PjF6IVwo0SX3oE88LhmGFmTnqqU7zpGJQQPZiKJfEKgDENQIM9mh3L1ksdFd9Y3CZVkusopHfxQvit/BA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.3.tgz",
+      "integrity": "sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==",
       "dependencies": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-strategies": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.2.tgz",
-      "integrity": "sha512-fgbwaUMxbG39BHjJIs2y2X21C0bmf1Oq3vMQxJ1hr6y5JMJIm8rvKCcf1EIdAr+PjKdSk4ddmgyBQ4oO8be4Uw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.3.tgz",
+      "integrity": "sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==",
       "dependencies": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/workbox-streams": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.2.tgz",
-      "integrity": "sha512-ovD0P4UrgPtZ2Lfc/8E8teb1RqNOSZr+1ZPqLR6sGRZnKZviqKbQC3zVvvkhmOIwhWbpL7bQlWveLVONHjxd5w==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.3.tgz",
+      "integrity": "sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==",
       "dependencies": {
-        "workbox-core": "6.5.2",
-        "workbox-routing": "6.5.2"
+        "workbox-core": "6.5.3",
+        "workbox-routing": "6.5.3"
       }
     },
     "node_modules/workbox-sw": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.2.tgz",
-      "integrity": "sha512-2KhlYqtkoqlnPdllj2ujXUKRuEFsRDIp6rdE4l1PsxiFHRAFaRTisRQpGvRem5yxgXEr+fcEKiuZUW2r70KZaw=="
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.3.tgz",
+      "integrity": "sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A=="
     },
     "node_modules/workbox-webpack-plugin": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.2.tgz",
-      "integrity": "sha512-StrJ7wKp5tZuGVcoKLVjFWlhDy+KT7ZWsKnNcD6F08wA9Cpt6JN+PLIrplcsTHbQpoAV8+xg6RvcG0oc9z+RpQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz",
+      "integrity": "sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA==",
       "dependencies": {
         "fast-json-stable-stringify": "^2.1.0",
         "pretty-bytes": "^5.4.1",
         "upath": "^1.2.0",
         "webpack-sources": "^1.4.3",
-        "workbox-build": "6.5.2"
+        "workbox-build": "6.5.3"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -17416,12 +17441,12 @@
       }
     },
     "node_modules/workbox-window": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.2.tgz",
-      "integrity": "sha512-2kZH37r9Wx8swjEOL4B8uGM53lakMxsKkQ7mOKzGA/QAn/DQTEZGrdHWtypk2tbhKY5S0jvPS+sYDnb2Z3378A==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.3.tgz",
+      "integrity": "sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==",
       "dependencies": {
         "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "node_modules/wrap-ansi": {
@@ -17541,6 +17566,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
@@ -18846,9 +18876,9 @@
       }
     },
     "@emotion/babel-plugin": {
-      "version": "11.7.2",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz",
-      "integrity": "sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==",
+      "version": "11.9.2",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz",
+      "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==",
       "requires": {
         "@babel/helper-module-imports": "^7.12.13",
         "@babel/plugin-syntax-jsx": "^7.12.13",
@@ -19525,38 +19555,38 @@
       "integrity": "sha512-rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="
     },
     "@mui/base": {
-      "version": "5.0.0-alpha.75",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.75.tgz",
-      "integrity": "sha512-eQ8SP2ML5nJyOdSqmk26ezg/eEP1k42Z+k6uMfNbgHZc8iZwgw9iVe+6g5j/qZPKS88AtxVG8YsLLZkXT82/Bw==",
+      "version": "5.0.0-alpha.77",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.77.tgz",
+      "integrity": "sha512-Zqm3qlczGViD3lJSYo8ZnQLHJ3PwGYftbDfVuh2Rq5OD88F7H6oDILlqknzty59NDkeSVO2qlymYmHOY1nLodg==",
       "requires": {
         "@babel/runtime": "^7.17.2",
         "@emotion/is-prop-valid": "^1.1.2",
         "@mui/types": "^7.1.3",
-        "@mui/utils": "^5.6.0",
-        "@popperjs/core": "^2.11.4",
+        "@mui/utils": "^5.6.1",
+        "@popperjs/core": "^2.11.5",
         "clsx": "^1.1.1",
         "prop-types": "^15.7.2",
         "react-is": "^17.0.2"
       }
     },
     "@mui/icons-material": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.0.tgz",
-      "integrity": "sha512-2GDGt+/BbwM3oVkF84b9FFKQdQ9TxBJIRnTwT99vO2mimdfJaojxMRB2lkysm9tUY4HOf0yoU6O//X6GTC0Zhw==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.2.tgz",
+      "integrity": "sha512-9QdI7axKuBAyaGz4mtdi7Uy1j73/thqFmEuxpJHxNC7O8ADEK1Da3t2veK2tgmsXsUlAHcAG63gg+GvWWeQNqQ==",
       "requires": {
         "@babel/runtime": "^7.17.2"
       }
     },
     "@mui/material": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.0.tgz",
-      "integrity": "sha512-yh4FoRRPTgJWjv1oIu3YuvfYGD/WOEnyGizQ9fKs+hlMjIc0rzFpyUCo++P/3BUd0/hRKcI8D8mrpJK9OiOy1g==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.2.tgz",
+      "integrity": "sha512-bwMvroBrMgUTwUh/BcjhtcJwEw9uH4chV3+ZSj6RckOJtMj8U4yEeD7S4NgHE8Ioj5eObKFzHpih/cTD1sDRpg==",
       "requires": {
         "@babel/runtime": "^7.17.2",
-        "@mui/base": "5.0.0-alpha.75",
-        "@mui/system": "^5.6.0",
+        "@mui/base": "5.0.0-alpha.77",
+        "@mui/system": "^5.6.2",
         "@mui/types": "^7.1.3",
-        "@mui/utils": "^5.6.0",
+        "@mui/utils": "^5.6.1",
         "@types/react-transition-group": "^4.4.4",
         "clsx": "^1.1.1",
         "csstype": "^3.0.11",
@@ -19567,19 +19597,19 @@
       }
     },
     "@mui/private-theming": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.0.tgz",
-      "integrity": "sha512-62jUFaMGfW3nvq/worcOAEiY++rWd44tpWShq4o97DybWmmWvEFYlBIuHEcXrtBIK/cloaQw8jqelQIFZeiVdw==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.2.tgz",
+      "integrity": "sha512-IbrSfFXfiZdyhRMC2bgGTFtb16RBQ5mccmjeh3MtAERWuepiCK7gkW5D9WhEsfTu6iez+TEjeUKSgmMHlsM2mg==",
       "requires": {
         "@babel/runtime": "^7.17.2",
-        "@mui/utils": "^5.6.0",
+        "@mui/utils": "^5.6.1",
         "prop-types": "^15.7.2"
       }
     },
     "@mui/styled-engine": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.0.tgz",
-      "integrity": "sha512-K1WPKTruJTPA49cub0HtDCBBvosPKizqgZ4RenAfWz/ldlFtM4p7e7Mt3YEnNWTOJMHvDGcEke1tCuELkVAMyA==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.1.tgz",
+      "integrity": "sha512-jEhH6TBY8jc9S8yVncXmoTYTbATjEu44RMFXj6sIYfKr5NArVwTwRo3JexLL0t3BOAiYM4xsFLgfKEIvB9SAeQ==",
       "requires": {
         "@babel/runtime": "^7.17.2",
         "@emotion/cache": "^11.7.1",
@@ -19587,15 +19617,15 @@
       }
     },
     "@mui/system": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.0.tgz",
-      "integrity": "sha512-FoytH73hY78Dll6F0fg7AI/hnpplygbFeW0HsqBfwFWrt2PMc2YSq2ICqHzd2CZPIhzEgRHDTSI8bMTLtG9W7A==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.2.tgz",
+      "integrity": "sha512-Wg9TRbvavSwEYk6UdpnoDx+CqJfaAN7AzlmwEx7DtGmx0snFVBST8FVb1Ev1vXosxEnq6/fe7ZDRobFVewvEPQ==",
       "requires": {
         "@babel/runtime": "^7.17.2",
-        "@mui/private-theming": "^5.6.0",
-        "@mui/styled-engine": "^5.6.0",
+        "@mui/private-theming": "^5.6.2",
+        "@mui/styled-engine": "^5.6.1",
         "@mui/types": "^7.1.3",
-        "@mui/utils": "^5.6.0",
+        "@mui/utils": "^5.6.1",
         "clsx": "^1.1.1",
         "csstype": "^3.0.11",
         "prop-types": "^15.7.2"
@@ -19608,9 +19638,9 @@
       "requires": {}
     },
     "@mui/utils": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.0.tgz",
-      "integrity": "sha512-LbZKkCOn4243vbEVGbaKV7t6eN6kz7t95DR6AcUCRk4daH3l7CXPYkWsyzysRWdXgSzHmIyrgg4FZKzTy0dTHQ==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.1.tgz",
+      "integrity": "sha512-CPrzrkiBusCZBLWu0Sg5MJvR3fKJyK3gKecLVX012LULyqg2U64Oz04BKhfkbtBrPBbSQxM+DWW9B1c9hmV9nQ==",
       "requires": {
         "@babel/runtime": "^7.17.2",
         "@types/prop-types": "^15.7.4",
@@ -19719,9 +19749,9 @@
       }
     },
     "@rushstack/eslint-patch": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz",
-      "integrity": "sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
+      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw=="
     },
     "@sindresorhus/is": {
       "version": "0.14.0",
@@ -19902,6 +19932,17 @@
         "defer-to-connect": "^1.0.1"
       }
     },
+    "@table-library/react-table-library": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-3.1.0.tgz",
+      "integrity": "sha512-YCWmLPdElk/4+VPSxDcgQXlJx+jxYH2xJwr8NXm9e1AEy17K8mtrjzD5SQXDOiVT8vSOzD21eEldfIaI/kooHA==",
+      "requires": {
+        "clsx": "1.1.1",
+        "react-virtualized-auto-sizer": "1.0.6",
+        "react-window": "1.8.6",
+        "use-double-click": "1.0.5"
+      }
+    },
     "@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -19942,9 +19983,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.0.tgz",
+      "integrity": "sha512-r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA==",
       "requires": {
         "@babel/types": "^7.3.0"
       }
@@ -20085,9 +20126,9 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
     },
     "@types/lodash": {
-      "version": "4.14.181",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz",
-      "integrity": "sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag=="
+      "version": "4.14.182",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
+      "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="
     },
     "@types/mime": {
       "version": "1.3.2",
@@ -20095,9 +20136,9 @@
       "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
     },
     "@types/node": {
-      "version": "17.0.23",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz",
-      "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="
+      "version": "17.0.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz",
+      "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -20105,14 +20146,14 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "@types/prettier": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz",
-      "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz",
+      "integrity": "sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw=="
     },
     "@types/prop-types": {
-      "version": "15.7.4",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
     },
     "@types/q": {
       "version": "1.5.5",
@@ -20130,9 +20171,9 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "@types/react": {
-      "version": "17.0.43",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.43.tgz",
-      "integrity": "sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==",
+      "version": "17.0.44",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.44.tgz",
+      "integrity": "sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -20140,11 +20181,11 @@
       }
     },
     "@types/react-dom": {
-      "version": "17.0.14",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.14.tgz",
-      "integrity": "sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ==",
+      "version": "17.0.15",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.15.tgz",
+      "integrity": "sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw==",
       "requires": {
-        "@types/react": "*"
+        "@types/react": "^17"
       }
     },
     "@types/react-is": {
@@ -20257,13 +20298,13 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz",
-      "integrity": "sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz",
+      "integrity": "sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg==",
       "requires": {
-        "@typescript-eslint/scope-manager": "5.18.0",
-        "@typescript-eslint/type-utils": "5.18.0",
-        "@typescript-eslint/utils": "5.18.0",
+        "@typescript-eslint/scope-manager": "5.19.0",
+        "@typescript-eslint/type-utils": "5.19.0",
+        "@typescript-eslint/utils": "5.19.0",
         "debug": "^4.3.2",
         "functional-red-black-tree": "^1.0.1",
         "ignore": "^5.1.8",
@@ -20273,65 +20314,65 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         }
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz",
-      "integrity": "sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.19.0.tgz",
+      "integrity": "sha512-F+X/TTzmb2UXbghY1LrNLNDjMcGZMhKzXuzvu0xD+YEB77EamLM7zMOLuz2kP5807IJRDLBoAFFPYa7HT62sYg==",
       "requires": {
-        "@typescript-eslint/utils": "5.18.0"
+        "@typescript-eslint/utils": "5.19.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz",
-      "integrity": "sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.19.0.tgz",
+      "integrity": "sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ==",
       "requires": {
-        "@typescript-eslint/scope-manager": "5.18.0",
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/typescript-estree": "5.18.0",
+        "@typescript-eslint/scope-manager": "5.19.0",
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/typescript-estree": "5.19.0",
         "debug": "^4.3.2"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz",
-      "integrity": "sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz",
+      "integrity": "sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g==",
       "requires": {
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/visitor-keys": "5.18.0"
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/visitor-keys": "5.19.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz",
-      "integrity": "sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz",
+      "integrity": "sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q==",
       "requires": {
-        "@typescript-eslint/utils": "5.18.0",
+        "@typescript-eslint/utils": "5.19.0",
         "debug": "^4.3.2",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz",
-      "integrity": "sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw=="
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.19.0.tgz",
+      "integrity": "sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w=="
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz",
-      "integrity": "sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz",
+      "integrity": "sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw==",
       "requires": {
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/visitor-keys": "5.18.0",
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/visitor-keys": "5.19.0",
         "debug": "^4.3.2",
         "globby": "^11.0.4",
         "is-glob": "^4.0.3",
@@ -20340,24 +20381,24 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         }
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz",
-      "integrity": "sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.19.0.tgz",
+      "integrity": "sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ==",
       "requires": {
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.18.0",
-        "@typescript-eslint/types": "5.18.0",
-        "@typescript-eslint/typescript-estree": "5.18.0",
+        "@typescript-eslint/scope-manager": "5.19.0",
+        "@typescript-eslint/types": "5.19.0",
+        "@typescript-eslint/typescript-estree": "5.19.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -20379,11 +20420,11 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz",
-      "integrity": "sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==",
+      "version": "5.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz",
+      "integrity": "sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ==",
       "requires": {
-        "@typescript-eslint/types": "5.18.0",
+        "@typescript-eslint/types": "5.19.0",
         "eslint-visitor-keys": "^3.0.0"
       }
     },
@@ -20529,9 +20570,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -20757,23 +20798,25 @@
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
     },
     "array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz",
-      "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
+      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
       "requires": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
     "asap": {
@@ -20787,17 +20830,17 @@
       "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
     },
     "async-validator": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.7.tgz",
-      "integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ=="
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.8.tgz",
+      "integrity": "sha512-vx1kyOCuSJqB5IVatlybUkV/e22sdx+V0XohCWbBfbbzbiLFt6fHxfWg6UEBhFw0gVgZtaSLTJtugmP4rdGQAQ=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -21392,9 +21435,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001325",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
-      "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ=="
+      "version": "1.0.30001332",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -21684,16 +21727,16 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
+      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ=="
     },
     "core-js-compat": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz",
-      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz",
+      "integrity": "sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==",
       "requires": {
-        "browserslist": "^4.19.1",
+        "browserslist": "^4.20.2",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -21705,9 +21748,9 @@
       }
     },
     "core-js-pure": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ=="
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.0.tgz",
+      "integrity": "sha512-ylOC9nVy0ak1N+fPIZj00umoZHgUVqmucklP5RT5N+vJof38klKn8Ze6KGyvchdClvEBr6LcQqJpI216LUMqYA=="
     },
     "core-util-is": {
       "version": "1.0.3",
@@ -21790,11 +21833,11 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         }
       }
@@ -22092,11 +22135,12 @@
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "requires": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "defined": {
@@ -22225,9 +22269,9 @@
       }
     },
     "dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "requires": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -22235,9 +22279,9 @@
       }
     },
     "domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
     },
     "domexception": {
       "version": "2.0.1",
@@ -22325,9 +22369,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.104",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.104.tgz",
-      "integrity": "sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ=="
+      "version": "1.4.111",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz",
+      "integrity": "sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw=="
     },
     "emittery": {
       "version": "0.8.1",
@@ -22359,9 +22403,9 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-      "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
+      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -22389,9 +22433,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
-      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
+      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -22404,7 +22448,7 @@
         "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.0",
@@ -22420,6 +22464,14 @@
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -22507,9 +22559,9 @@
       }
     },
     "eslint": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
-      "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz",
+      "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==",
       "requires": {
         "@eslint/eslintrc": "^1.2.1",
         "@humanwhocodes/config-array": "^0.9.2",
@@ -22664,9 +22716,9 @@
       }
     },
     "eslint-config-react-app": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz",
-      "integrity": "sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
+      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
       "requires": {
         "@babel/core": "^7.16.0",
         "@babel/eslint-parser": "^7.16.3",
@@ -22891,9 +22943,9 @@
       "requires": {}
     },
     "eslint-plugin-testing-library": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz",
-      "integrity": "sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.3.1.tgz",
+      "integrity": "sha512-OfF4dlG/q6ck6DL3P8Z0FPdK0dU5K57gsBu7eUcaVbwYKaNzjgejnXiM9CCUevppORkvfek+9D3Uj/9ZZ8Vz8g==",
       "requires": {
         "@typescript-eslint/utils": "^5.13.0"
       }
@@ -23302,9 +23354,9 @@
       "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "fork-ts-checker-webpack-plugin": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz",
-      "integrity": "sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz",
+      "integrity": "sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==",
       "requires": {
         "@babel/code-frame": "^7.8.3",
         "@types/json-schema": "^7.0.5",
@@ -23378,11 +23430,11 @@
           }
         },
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         },
         "supports-color": {
@@ -23426,9 +23478,9 @@
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "requires": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -23461,6 +23513,11 @@
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
+    "functions-have-names": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
+      "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA=="
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -23655,6 +23712,14 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -23852,9 +23917,9 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz",
-      "integrity": "sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "requires": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -23864,9 +23929,9 @@
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "requires": {
         "agent-base": "6",
         "debug": "4"
@@ -25266,11 +25331,11 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         },
         "supports-color": {
@@ -25792,9 +25857,9 @@
       }
     },
     "loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
       "version": "2.0.2",
@@ -25867,9 +25932,12 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-      "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "requires": {
+        "yallist": "^4.0.0"
+      }
     },
     "magic-string": {
       "version": "0.25.9",
@@ -25913,6 +25981,11 @@
         "fs-monkey": "1.0.3"
       }
     },
+    "memoize-one": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+    },
     "memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -26108,9 +26181,9 @@
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
     "node-releases": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
+      "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw=="
     },
     "nodemon": {
       "version": "2.0.15",
@@ -26192,9 +26265,9 @@
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
     },
     "notistack": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.3.tgz",
-      "integrity": "sha512-krmVFtTO9kEY1Pa4NrbyexrjiRcV6TqBM2xLx8nuDea1g96Z/OZfkvVLmYKkTvoSJ3jyQntWK16z86ssW5kt4A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.4.tgz",
+      "integrity": "sha512-kOJmKvTG91ElMzi4aHu82BDe1liQ0zMrBp+TnWJptgowDsTbeTKbZmsRqJNIj145BmlOtZsEE9xjcrN46zVo3w==",
       "requires": {
         "clsx": "^1.1.0",
         "hoist-non-react-statics": "^3.3.0"
@@ -26251,9 +26324,9 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
     },
     "object-inspect": {
       "version": "1.12.0",
@@ -26747,9 +26820,9 @@
       "requires": {}
     },
     "postcss-custom-properties": {
-      "version": "12.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.6.tgz",
-      "integrity": "sha512-QEnQkDkb+J+j2bfJisJJpTAFL+lUFl66rUNvnjPBIvRbZACLG4Eu5bmBCIY4FJCqhwsfbBpmJUyb3FcR/31lAg==",
+      "version": "12.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz",
+      "integrity": "sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
@@ -26908,11 +26981,11 @@
           }
         },
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         }
       }
@@ -27566,9 +27639,9 @@
       }
     },
     "react-dev-utils": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz",
-      "integrity": "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
+      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
       "requires": {
         "@babel/code-frame": "^7.16.0",
         "address": "^1.1.2",
@@ -27589,7 +27662,7 @@
         "open": "^8.4.0",
         "pkg-up": "^3.1.0",
         "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.10",
+        "react-error-overlay": "^6.0.11",
         "recursive-readdir": "^2.2.2",
         "shell-quote": "^1.7.3",
         "strip-ansi": "^6.0.1",
@@ -27693,9 +27766,9 @@
       }
     },
     "react-dropzone": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.4.tgz",
-      "integrity": "sha512-fcqHEYe1MzAghU6/Hz86lHDlBNsA+lO48nAcm7/wA+kIzwS6uuJbUG33tBZjksj7GAZ1iUQ6NHwjUURPmSGang==",
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.5.tgz",
+      "integrity": "sha512-zUjZigD0VJ91CSm9T1h7ErxFReBLaa9sjS2dUL0+inb0RROZpSJTNDHPY1rrBES5V2NXhF8v0kghmaHc81BMFg==",
       "requires": {
         "attr-accept": "^2.2.2",
         "file-selector": "^0.4.0",
@@ -27703,9 +27776,9 @@
       }
     },
     "react-error-overlay": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz",
-      "integrity": "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA=="
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
+      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
     "react-icons": {
       "version": "4.3.1",
@@ -27741,9 +27814,9 @@
       }
     },
     "react-scripts": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz",
-      "integrity": "sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
+      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
       "requires": {
         "@babel/core": "^7.16.0",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
@@ -27761,7 +27834,7 @@
         "dotenv": "^10.0.0",
         "dotenv-expand": "^5.1.0",
         "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.0",
+        "eslint-config-react-app": "^7.0.1",
         "eslint-webpack-plugin": "^3.1.1",
         "file-loader": "^6.2.0",
         "fs-extra": "^10.0.0",
@@ -27779,7 +27852,7 @@
         "postcss-preset-env": "^7.0.1",
         "prompts": "^2.4.2",
         "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.0",
+        "react-dev-utils": "^12.0.1",
         "react-refresh": "^0.11.0",
         "resolve": "^1.20.0",
         "resolve-url-loader": "^4.0.0",
@@ -27796,11 +27869,11 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         }
       }
@@ -27816,6 +27889,21 @@
         "prop-types": "^15.6.2"
       }
     },
+    "react-virtualized-auto-sizer": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz",
+      "integrity": "sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==",
+      "requires": {}
+    },
+    "react-window": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz",
+      "integrity": "sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==",
+      "requires": {
+        "@babel/runtime": "^7.0.0",
+        "memoize-one": ">=3.1.1 <6"
+      }
+    },
     "read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -27906,12 +27994,13 @@
       "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
     },
     "regexp.prototype.flags": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz",
-      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       }
     },
     "regexpp": {
@@ -28098,9 +28187,9 @@
       }
     },
     "rollup": {
-      "version": "2.70.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz",
-      "integrity": "sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==",
+      "version": "2.70.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.2.tgz",
+      "integrity": "sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==",
       "requires": {
         "fsevents": "~2.3.2"
       }
@@ -28828,75 +28917,38 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "tailwindcss": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz",
-      "integrity": "sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==",
+      "version": "3.0.24",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
+      "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
       "requires": {
         "arg": "^5.0.1",
-        "chalk": "^4.1.2",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
-        "cosmiconfig": "^7.0.1",
         "detective": "^5.2.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
+        "lilconfig": "^2.0.5",
         "normalize-path": "^3.0.0",
-        "object-hash": "^2.2.0",
-        "postcss": "^8.4.6",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.12",
         "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.0",
+        "postcss-load-config": "^3.1.4",
         "postcss-nested": "5.0.6",
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^6.0.10",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
-        "cosmiconfig": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-          "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.2.1",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.10.0"
-          }
-        },
         "glob-parent": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -28904,19 +28956,6 @@
           "requires": {
             "is-glob": "^4.0.3"
           }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -29310,12 +29349,12 @@
           "dev": true
         },
         "semver": {
-          "version": "7.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz",
-          "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
-            "lru-cache": "^7.4.0"
+            "lru-cache": "^6.0.0"
           }
         },
         "supports-color": {
@@ -29346,6 +29385,12 @@
         "prepend-http": "^2.0.0"
       }
     },
+    "use-double-click": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/use-double-click/-/use-double-click-1.0.5.tgz",
+      "integrity": "sha512-71LUca6NtzpzHYlcfM/dOdmwvmvpMbzeIVQpN87w+DctpLiMCXtZpsN8FNWPgHpPBtNhvucPUHIDh5al8D8C7w==",
+      "requires": {}
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -29461,9 +29506,9 @@
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
     },
     "webpack": {
-      "version": "5.71.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.71.0.tgz",
-      "integrity": "sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==",
+      "version": "5.72.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+      "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -29753,26 +29798,26 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
     "workbox-background-sync": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.2.tgz",
-      "integrity": "sha512-EjG37LSMDJ1TFlFg56wx6YXbH4/NkG09B9OHvyxx+cGl2gP5OuOzsCY3rOPJSpbcz6jpuA40VIC3HzSD4OvE1g==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz",
+      "integrity": "sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==",
       "requires": {
         "idb": "^6.1.4",
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-broadcast-update": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.2.tgz",
-      "integrity": "sha512-DjJYraYnprTZE/AQNoeogaxI1dPuYmbw+ZJeeP8uXBSbg9SNv5wLYofQgywXeRepv4yr/vglMo9yaHUmBMc+4Q==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz",
+      "integrity": "sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==",
       "requires": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-build": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.2.tgz",
-      "integrity": "sha512-TVi4Otf6fgwikBeMpXF9n0awHfZTMNu/nwlMIT9W+c13yvxkmDFMPb7vHYK6RUmbcxwPnz4I/R+uL76+JxG4JQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.3.tgz",
+      "integrity": "sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==",
       "requires": {
         "@apideck/better-ajv-errors": "^0.3.1",
         "@babel/core": "^7.11.1",
@@ -29796,21 +29841,21 @@
         "strip-comments": "^2.0.1",
         "tempy": "^0.6.0",
         "upath": "^1.2.0",
-        "workbox-background-sync": "6.5.2",
-        "workbox-broadcast-update": "6.5.2",
-        "workbox-cacheable-response": "6.5.2",
-        "workbox-core": "6.5.2",
-        "workbox-expiration": "6.5.2",
-        "workbox-google-analytics": "6.5.2",
-        "workbox-navigation-preload": "6.5.2",
-        "workbox-precaching": "6.5.2",
-        "workbox-range-requests": "6.5.2",
-        "workbox-recipes": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2",
-        "workbox-streams": "6.5.2",
-        "workbox-sw": "6.5.2",
-        "workbox-window": "6.5.2"
+        "workbox-background-sync": "6.5.3",
+        "workbox-broadcast-update": "6.5.3",
+        "workbox-cacheable-response": "6.5.3",
+        "workbox-core": "6.5.3",
+        "workbox-expiration": "6.5.3",
+        "workbox-google-analytics": "6.5.3",
+        "workbox-navigation-preload": "6.5.3",
+        "workbox-precaching": "6.5.3",
+        "workbox-range-requests": "6.5.3",
+        "workbox-recipes": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3",
+        "workbox-streams": "6.5.3",
+        "workbox-sw": "6.5.3",
+        "workbox-window": "6.5.3"
       },
       "dependencies": {
         "@apideck/better-ajv-errors": {
@@ -29884,117 +29929,117 @@
       }
     },
     "workbox-cacheable-response": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.2.tgz",
-      "integrity": "sha512-UnHGih6xqloV808T7ve1iNKZMbpML0jGLqkkmyXkJbZc5j16+HRSV61Qrh+tiq3E3yLvFMGJ3AUBODOPNLWpTg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz",
+      "integrity": "sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==",
       "requires": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-core": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.2.tgz",
-      "integrity": "sha512-IlxLGQf+wJHCR+NM0UWqDh4xe/Gu6sg2i4tfZk6WIij34IVk9BdOQgi6WvqSHd879jbQIUgL2fBdJUJyAP5ypQ=="
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.3.tgz",
+      "integrity": "sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q=="
     },
     "workbox-expiration": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.2.tgz",
-      "integrity": "sha512-5Hfp0uxTZJrgTiy9W7AjIIec+9uTOtnxY/tRBm4DbqcWKaWbVTa+izrKzzOT4MXRJJIJUmvRhWw4oo8tpmMouw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.3.tgz",
+      "integrity": "sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==",
       "requires": {
         "idb": "^6.1.4",
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-google-analytics": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.2.tgz",
-      "integrity": "sha512-8SMar+N0xIreP5/2we3dwtN1FUmTMScoopL86aKdXBpio8vXc8Oqb5fCJG32ialjN8BAOzDqx/FnGeCtkIlyvw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz",
+      "integrity": "sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==",
       "requires": {
-        "workbox-background-sync": "6.5.2",
-        "workbox-core": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2"
+        "workbox-background-sync": "6.5.3",
+        "workbox-core": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3"
       }
     },
     "workbox-navigation-preload": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.2.tgz",
-      "integrity": "sha512-iqDNWWMswjCsZuvGFDpcX1Z8InBVAlVBELJ28xShsWWntALzbtr0PXMnm2WHkXCc56JimmGldZi1N5yDPiTPOg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz",
+      "integrity": "sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==",
       "requires": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-precaching": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.2.tgz",
-      "integrity": "sha512-OZAlQ8AAT20KugGKKuJMHdQ8X1IyNQaLv+mPTHj+8Dmv8peBq5uWNzs4g/1OSFmXsbXZ6a1CBC6YtQWVPhJQ9w==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.3.tgz",
+      "integrity": "sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==",
       "requires": {
-        "workbox-core": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2"
+        "workbox-core": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3"
       }
     },
     "workbox-range-requests": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.2.tgz",
-      "integrity": "sha512-zi5VqF1mWqfCyJLTMXn1EuH/E6nisqWDK1VmOJ+TnjxGttaQrseOhMn+BMvULFHeF8AvrQ0ogfQ6bSv0rcfAlg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz",
+      "integrity": "sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==",
       "requires": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-recipes": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.2.tgz",
-      "integrity": "sha512-2lcUKMYDiJKvuvRotOxLjH2z9K7jhj8GNUaHxHNkJYbTCUN3LsX1cWrsgeJFDZ/LgI565t3fntpbG9J415ZBXA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.3.tgz",
+      "integrity": "sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==",
       "requires": {
-        "workbox-cacheable-response": "6.5.2",
-        "workbox-core": "6.5.2",
-        "workbox-expiration": "6.5.2",
-        "workbox-precaching": "6.5.2",
-        "workbox-routing": "6.5.2",
-        "workbox-strategies": "6.5.2"
+        "workbox-cacheable-response": "6.5.3",
+        "workbox-core": "6.5.3",
+        "workbox-expiration": "6.5.3",
+        "workbox-precaching": "6.5.3",
+        "workbox-routing": "6.5.3",
+        "workbox-strategies": "6.5.3"
       }
     },
     "workbox-routing": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.2.tgz",
-      "integrity": "sha512-nR1w5PjF6IVwo0SX3oE88LhmGFmTnqqU7zpGJQQPZiKJfEKgDENQIM9mh3L1ksdFd9Y3CZVkusopHfxQvit/BA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.3.tgz",
+      "integrity": "sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==",
       "requires": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-strategies": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.2.tgz",
-      "integrity": "sha512-fgbwaUMxbG39BHjJIs2y2X21C0bmf1Oq3vMQxJ1hr6y5JMJIm8rvKCcf1EIdAr+PjKdSk4ddmgyBQ4oO8be4Uw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.3.tgz",
+      "integrity": "sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==",
       "requires": {
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "workbox-streams": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.2.tgz",
-      "integrity": "sha512-ovD0P4UrgPtZ2Lfc/8E8teb1RqNOSZr+1ZPqLR6sGRZnKZviqKbQC3zVvvkhmOIwhWbpL7bQlWveLVONHjxd5w==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.3.tgz",
+      "integrity": "sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==",
       "requires": {
-        "workbox-core": "6.5.2",
-        "workbox-routing": "6.5.2"
+        "workbox-core": "6.5.3",
+        "workbox-routing": "6.5.3"
       }
     },
     "workbox-sw": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.2.tgz",
-      "integrity": "sha512-2KhlYqtkoqlnPdllj2ujXUKRuEFsRDIp6rdE4l1PsxiFHRAFaRTisRQpGvRem5yxgXEr+fcEKiuZUW2r70KZaw=="
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.3.tgz",
+      "integrity": "sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A=="
     },
     "workbox-webpack-plugin": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.2.tgz",
-      "integrity": "sha512-StrJ7wKp5tZuGVcoKLVjFWlhDy+KT7ZWsKnNcD6F08wA9Cpt6JN+PLIrplcsTHbQpoAV8+xg6RvcG0oc9z+RpQ==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz",
+      "integrity": "sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA==",
       "requires": {
         "fast-json-stable-stringify": "^2.1.0",
         "pretty-bytes": "^5.4.1",
         "upath": "^1.2.0",
         "webpack-sources": "^1.4.3",
-        "workbox-build": "6.5.2"
+        "workbox-build": "6.5.3"
       },
       "dependencies": {
         "source-map": {
@@ -30014,12 +30059,12 @@
       }
     },
     "workbox-window": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.2.tgz",
-      "integrity": "sha512-2kZH37r9Wx8swjEOL4B8uGM53lakMxsKkQ7mOKzGA/QAn/DQTEZGrdHWtypk2tbhKY5S0jvPS+sYDnb2Z3378A==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.3.tgz",
+      "integrity": "sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==",
       "requires": {
         "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.5.2"
+        "workbox-core": "6.5.3"
       }
     },
     "wrap-ansi": {
@@ -30103,6 +30148,11 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
diff --git a/interface/package.json b/interface/package.json
index c3688025f..b79479f39 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -7,27 +7,28 @@
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
     "@msgpack/msgpack": "^2.7.2",
-    "@mui/icons-material": "^5.6.0",
-    "@mui/material": "^5.6.0",
-    "@types/lodash": "^4.14.181",
-    "@types/node": "^17.0.23",
+    "@mui/icons-material": "^5.6.2",
+    "@mui/material": "^5.6.2",
+    "@table-library/react-table-library": "^3.1.0",
+    "@types/lodash": "^4.14.182",
+    "@types/node": "^17.0.26",
     "@types/react": "^17.0.43",
     "@types/react-dom": "^17.0.14",
     "@types/react-router-dom": "^5.3.3",
-    "async-validator": "^4.0.7",
+    "async-validator": "^4.0.8",
     "axios": "^0.26.1",
-    "http-proxy-middleware": "^2.0.4",
+    "http-proxy-middleware": "^2.0.6",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
-    "notistack": "^2.0.3",
+    "notistack": "^2.0.4",
     "parse-ms": "^3.0.0",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
     "react-app-rewired": "^2.2.1",
-    "react-dropzone": "^12.0.4",
+    "react-dom": "^17.0.2",
+    "react-dropzone": "^12.0.5",
     "react-icons": "^4.3.1",
     "react-router-dom": "^6.3.0",
-    "react-scripts": "5.0.0",
+    "react-scripts": "5.0.1",
     "sockette": "^2.0.6",
     "typescript": "^4.6.3"
   },
diff --git a/interface/src/framework/ap/APSettingsForm.tsx b/interface/src/framework/ap/APSettingsForm.tsx
index f15c6b802..8080f4f0f 100644
--- a/interface/src/framework/ap/APSettingsForm.tsx
+++ b/interface/src/framework/ap/APSettingsForm.tsx
@@ -14,6 +14,7 @@ import {
   ValidatedPasswordField,
   ValidatedTextField
 } from '../../components';
+
 import { APProvisionMode, APSettings } from '../../types';
 import { numberValue, updateValue, useRest } from '../../utils';
 import * as APApi from '../../api/ap';
diff --git a/interface/src/framework/security/ManageUsersForm.tsx b/interface/src/framework/security/ManageUsersForm.tsx
index f5dbfaae2..0dd1868d2 100644
--- a/interface/src/framework/security/ManageUsersForm.tsx
+++ b/interface/src/framework/security/ManageUsersForm.tsx
@@ -1,6 +1,6 @@
 import { FC, useContext, useState } from 'react';
 
-import { Button, IconButton, Table, TableBody, TableCell, TableFooter, TableHead, TableRow } from '@mui/material';
+import { Button, IconButton, Box } from '@mui/material';
 import SaveIcon from '@mui/icons-material/Save';
 import DeleteIcon from '@mui/icons-material/Delete';
 import PersonAddIcon from '@mui/icons-material/PersonAdd';
@@ -9,6 +9,10 @@ import CheckIcon from '@mui/icons-material/Check';
 import CloseIcon from '@mui/icons-material/Close';
 import VpnKeyIcon from '@mui/icons-material/VpnKey';
 
+import { Table } from '@table-library/react-table-library/table';
+import { useTheme } from '@table-library/react-table-library/theme';
+import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
+
 import * as SecurityApi from '../../api/security';
 import { SecuritySettings, User } from '../../types';
 import { ButtonRow, FormLoader, MessageBox, SectionContent } from '../../components';
@@ -19,16 +23,6 @@ import { AuthenticatedContext } from '../../contexts/authentication';
 import GenerateToken from './GenerateToken';
 import UserForm from './UserForm';
 
-function compareUsers(a: User, b: User) {
-  if (a.username < b.username) {
-    return -1;
-  }
-  if (a.username > b.username) {
-    return 1;
-  }
-  return 0;
-}
-
 const ManageUsersForm: FC = () => {
   const { loadData, saving, data, setData, saveData, errorMessage } = useRest<SecuritySettings>({
     read: SecurityApi.readSecuritySettings,
@@ -40,6 +34,45 @@ const ManageUsersForm: FC = () => {
   const [generatingToken, setGeneratingToken] = useState<string>();
   const authenticatedContext = useContext(AuthenticatedContext);
 
+  const table_theme = useTheme({
+    BaseRow: `
+      font-size: 14px;
+      color: white;
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      color: #90CAF9;
+      border-bottom: 1px solid #e0e0e0;
+    `,
+    Row: `
+      &:nth-of-type(odd) {
+        background-color: #303030;
+      }
+      &:nth-of-type(even) {
+        background-color: #1e1e1e;
+      }
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        color: white;
+      }
+    `,
+    BaseCell: `
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+    `
+  });
+
   const content = () => {
     if (!data) {
       return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
@@ -48,13 +81,14 @@ const ManageUsersForm: FC = () => {
     const noAdminConfigured = () => !data.users.find((u) => u.admin);
 
     const removeUser = (toRemove: User) => {
-      const users = data.users.filter((u) => u.username !== toRemove.username);
+      const users = data.users.filter((u) => u.id !== toRemove.id);
       setData({ ...data, users });
     };
 
     const createUser = () => {
       setCreating(true);
       setUser({
+        id: '',
         username: '',
         password: '',
         admin: true
@@ -72,7 +106,7 @@ const ManageUsersForm: FC = () => {
 
     const doneEditingUser = () => {
       if (user) {
-        const users = [...data.users.filter((u) => u.username !== user.username), user];
+        const users = [...data.users.filter((u) => u.id !== user.id), user];
         setData({ ...data, users });
         setUser(undefined);
       }
@@ -82,8 +116,8 @@ const ManageUsersForm: FC = () => {
       setGeneratingToken(undefined);
     };
 
-    const generateToken = (username: string) => {
-      setGeneratingToken(username);
+    const generateToken = (id: string) => {
+      setGeneratingToken(id);
     };
 
     const onSubmit = async () => {
@@ -93,66 +127,71 @@ const ManageUsersForm: FC = () => {
 
     return (
       <>
-        <Table size="small">
-          <TableHead>
-            <TableRow>
-              <TableCell>Username</TableCell>
-              <TableCell align="center">is Admin?</TableCell>
-              <TableCell />
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            {data.users.sort(compareUsers).map((u) => (
-              <TableRow key={u.username}>
-                <TableCell component="th" scope="row">
-                  {u.username}
-                </TableCell>
-                <TableCell align="center">{u.admin ? <CheckIcon /> : <CloseIcon />}</TableCell>
-                <TableCell align="center">
-                  <IconButton
-                    size="small"
-                    disabled={!authenticatedContext.me.admin}
-                    aria-label="Generate Token"
-                    onClick={() => generateToken(u.username)}
-                  >
-                    <VpnKeyIcon />
-                  </IconButton>
-                  <IconButton size="small" aria-label="Delete" onClick={() => removeUser(u)}>
-                    <DeleteIcon />
-                  </IconButton>
-                  <IconButton size="small" aria-label="Edit" onClick={() => editUser(u)}>
-                    <EditIcon />
-                  </IconButton>
-                </TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-          <TableFooter>
-            <TableRow>
-              <TableCell colSpan={2} />
-              <TableCell align="center">
-                <Button startIcon={<PersonAddIcon />} variant="outlined" color="secondary" onClick={createUser}>
-                  Add
-                </Button>
-              </TableCell>
-            </TableRow>
-          </TableFooter>
+        <Table data={{ nodes: data.users }} theme={table_theme}>
+          {(tableList: any) => (
+            <>
+              <Header>
+                <HeaderRow>
+                  <HeaderCell>USERNAME</HeaderCell>
+                  <HeaderCell>IS ADMIN</HeaderCell>
+                  <HeaderCell />
+                </HeaderRow>
+              </Header>
+              <Body>
+                {tableList.map((u: User, index: number) => (
+                  <Row key={u.id} item={u}>
+                    <Cell>{u.id}</Cell>
+                    <Cell>{u.admin ? <CheckIcon /> : <CloseIcon />}</Cell>
+                    <Cell>
+                      <IconButton
+                        size="small"
+                        disabled={!authenticatedContext.me.admin}
+                        aria-label="Generate Token"
+                        onClick={() => generateToken(u.id)}
+                      >
+                        <VpnKeyIcon />
+                      </IconButton>
+                      <IconButton size="small" aria-label="Delete" onClick={() => removeUser(u)}>
+                        <DeleteIcon />
+                      </IconButton>
+                      <IconButton size="small" aria-label="Edit" onClick={() => editUser(u)}>
+                        <EditIcon />
+                      </IconButton>
+                    </Cell>
+                  </Row>
+                ))}
+              </Body>
+            </>
+          )}
         </Table>
+
         {noAdminConfigured() && (
           <MessageBox level="warning" message="You must have at least one admin user configured" my={2} />
         )}
-        <ButtonRow>
-          <Button
-            startIcon={<SaveIcon />}
-            disabled={saving || noAdminConfigured()}
-            variant="outlined"
-            color="primary"
-            type="submit"
-            onClick={onSubmit}
-          >
-            Save
-          </Button>
-        </ButtonRow>
+
+        <Box display="flex" flexWrap="wrap">
+          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
+            <Button
+              startIcon={<SaveIcon />}
+              disabled={saving || noAdminConfigured()}
+              variant="outlined"
+              color="primary"
+              type="submit"
+              onClick={onSubmit}
+            >
+              Save
+            </Button>
+          </Box>
+
+          <Box flexWrap="nowrap" whiteSpace="nowrap">
+            <ButtonRow>
+              <Button startIcon={<PersonAddIcon />} variant="outlined" color="secondary" onClick={createUser}>
+                Add
+              </Button>
+            </ButtonRow>
+          </Box>
+        </Box>
+
         <GenerateToken username={generatingToken} onClose={closeGenerateToken} />
         <UserForm
           user={user}
diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx
index 21cf4072c..ca8781858 100644
--- a/interface/src/project/DashboardData.tsx
+++ b/interface/src/project/DashboardData.tsx
@@ -1,11 +1,7 @@
-import { FC, useState, useContext, useEffect } from 'react';
+import { FC, useState, useContext, useCallback, useEffect } from 'react';
 
 import {
   Button,
-  Table,
-  TableBody,
-  TableHead,
-  TableRow,
   Typography,
   Box,
   Dialog,
@@ -20,15 +16,19 @@ import {
   ListItem,
   ListItemText,
   Grid,
-  useMediaQuery
+  FormControlLabel,
+  Checkbox
 } from '@mui/material';
 
-import TableCell, { tableCellClasses } from '@mui/material/TableCell';
-
-import { styled } from '@mui/material/styles';
-
 import { useSnackbar } from 'notistack';
 
+import { Table } from '@table-library/react-table-library/table';
+import { useTheme } from '@table-library/react-table-library/theme';
+import { useSort, SortToggleType } from '@table-library/react-table-library/sort';
+import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
+import { useRowSelect } from '@table-library/react-table-library/select';
+
+import DownloadIcon from '@mui/icons-material/GetApp';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import EditIcon from '@mui/icons-material/Edit';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
@@ -37,10 +37,13 @@ import CancelIcon from '@mui/icons-material/Cancel';
 import SendIcon from '@mui/icons-material/TrendingFlat';
 import SaveIcon from '@mui/icons-material/Save';
 import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
-import FavoriteBorderIcon from '@mui/icons-material/FavoriteBorder';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
+import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
+import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
+import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined';
+import StarIcon from '@mui/icons-material/Star';
 
 import DeviceIcon from './DeviceIcon';
 
@@ -50,14 +53,15 @@ import { formatDurationMin, pluralize } from '../utils';
 
 import { AuthenticatedContext } from '../contexts/authentication';
 
-import { ButtonRow, FormLoader, ValidatedTextField, SectionContent, MessageBox } from '../components';
+import { ButtonRow, ValidatedTextField, SectionContent, MessageBox } from '../components';
 
 import * as EMSESP from './api';
 
-import { numberValue, updateValue, extractErrorMessage, useRest } from '../utils';
+import { numberValue, updateValue, extractErrorMessage } from '../utils';
 
 import {
   SensorData,
+  Device,
   CoreData,
   DeviceData,
   DeviceValue,
@@ -70,81 +74,315 @@ import {
   DeviceEntityMask
 } from './types';
 
-const StyledTableCell = styled(TableCell)(({ theme }) => ({
-  [`&.${tableCellClasses.head}`]: {
-    backgroundColor: theme.palette.common.black,
-    color: theme.palette.common.white,
-    fontSize: 14
-  }
-}));
-
-const StyledTableRow = styled(TableRow)(({ theme }) => ({
-  '&:nth-of-type(odd)': {
-    backgroundColor: theme.palette.action.hover
-  },
-  '&:hover': {
-    backgroundColor: theme.palette.info.light
-  }
-}));
-
 const DashboardData: FC = () => {
-  const { loadData, data, errorMessage } = useRest<CoreData>({ read: EMSESP.readCoreData });
-
   const { me } = useContext(AuthenticatedContext);
 
   const { enqueueSnackbar } = useSnackbar();
 
-  const [deviceData, setDeviceData] = useState<DeviceData>();
-  const [sensorData, setSensorData] = useState<SensorData>();
+  const [coreData, setCoreData] = useState<CoreData>({ devices: [], active_sensors: 0, analog_enabled: false });
+  const [deviceData, setDeviceData] = useState<DeviceData>({ label: '', data: [] });
+  const [sensorData, setSensorData] = useState<SensorData>({ sensors: [], analogs: [] });
   const [deviceValue, setDeviceValue] = useState<DeviceValue>();
   const [sensor, setSensor] = useState<Sensor>();
   const [analog, setAnalog] = useState<Analog>();
-  const [selectedDevice, setSelectedDevice] = useState<number>();
   const [deviceDialog, setDeviceDialog] = useState<number>(-1);
+  const [onlyFav, setOnlyFav] = useState(false);
 
-  const desktopWindow = useMediaQuery('(min-width:600px)');
+  const device_theme = useTheme({
+    BaseRow: `
+      font-size: 14px;
+      color: white;
+      height: 46px;
+      &:focus {
+        z-index: 2;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      }
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      color: #90CAF9;
+      border-bottom: 1px solid #e0e0e0;
+      font-weight: 500;
+    `,
+    Row: `
+      background-color: #1e1e1e;
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        z-index: 2;
+        color: white;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      },
+      &.tr.tr-body.row-select.row-select-single-selected, &.tr.tr-body.row-select.row-select-selected {
+        background-color: #3d4752;
+        color: white;
+        font-weight: normal;
+        z-index: 2;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      }
+    `,
+    BaseCell: `
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+      &:nth-of-type(1) {
+        min-width: 42px;
+        width: 42px;
+        div {
+          width: 100%;
+        }
+      }
+      &:nth-of-type(2) {
+        min-width: 120px;
+        width: 120px;
+      }
+      &:nth-of-type(3) {
+        flex: 1;
+      }
+      &:nth-of-type(4) {
+        text-align: center;
+        max-width: 100px;
+      }
+      &:last-of-type {
+        text-align: right;
+        min-width: 64px;
+      }
+    `
+  });
 
-  const refreshAllData = () => {
-    if (analog || sensor || deviceValue) {
+  const data_theme = useTheme({
+    BaseRow: `
+      font-size: 14px;
+      color: white;
+      height: 32px;
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      color: #90CAF9;
+      border-bottom: 1px solid #e0e0e0;
+      font-weight: 500;
+    `,
+    Row: `
+      &:nth-of-type(odd) {
+        background-color: #303030;
+      }
+      &:nth-of-type(even) {
+        background-color: #1e1e1e;
+      }
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        z-index: 2;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+        color: white;
+        cursor: 'pointer',
+      }
+    `,
+    BaseCell: `
+      padding-left: 8px;
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+      &:last-of-type {
+        text-align: right;
+        min-width: 64px;
+      }
+    `,
+    HeaderCell: `
+      padding-left: 0px;
+      &:not(:last-of-type) {
+        border-right: 1px solid #565656;
+      }
+    `
+  });
+
+  const getSortIcon = (state: any, sortKey: any) => {
+    if (state.sortKey === sortKey && state.reverse) {
+      return <KeyboardArrowDownOutlinedIcon />;
+    }
+    if (state.sortKey === sortKey && !state.reverse) {
+      return <KeyboardArrowUpOutlinedIcon />;
+    }
+    return <UnfoldMoreOutlinedIcon />;
+  };
+
+  const analog_sort = useSort(
+    { nodes: sensorData.analogs },
+    {},
+    {
+      sortIcon: {
+        iconDefault: <UnfoldMoreOutlinedIcon />,
+        iconUp: <KeyboardArrowUpOutlinedIcon />,
+        iconDown: <KeyboardArrowDownOutlinedIcon />
+      },
+      sortFns: {
+        GPIO: (array) => array.sort((a, b) => a.g - b.g),
+        NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)),
+        TYPE: (array) => array.sort((a, b) => a.t - b.t)
+      }
+    }
+  );
+
+  const sensor_sort = useSort(
+    { nodes: sensorData.sensors },
+    {},
+    {
+      sortIcon: {
+        iconDefault: <UnfoldMoreOutlinedIcon />,
+        iconUp: <KeyboardArrowUpOutlinedIcon />,
+        iconDown: <KeyboardArrowDownOutlinedIcon />
+      },
+      sortFns: {
+        NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)),
+        TEMPERATURE: (array) => array.sort((a, b) => a.t - b.t)
+      }
+    }
+  );
+
+  const dv_sort = useSort(
+    { nodes: deviceData.data },
+    {},
+    {
+      sortIcon: {
+        iconDefault: <UnfoldMoreOutlinedIcon />,
+        iconUp: <KeyboardArrowUpOutlinedIcon />,
+        iconDown: <KeyboardArrowDownOutlinedIcon />
+      },
+      sortToggleType: SortToggleType.AlternateWithReset,
+      sortFns: {
+        NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2)))
+      }
+    }
+  );
+
+  const device_select = useRowSelect(
+    { nodes: coreData.devices },
+    {
+      onChange: onSelectChange
+    }
+  );
+
+  function onSelectChange(action: any, state: any) {
+    if (action.type === 'ADD_BY_ID_EXCLUSIVELY') {
+      refreshData();
+    } else {
+      setSensorData({ sensors: [], analogs: [] });
+    }
+  }
+
+  const escapeCsvCell = (cell: any) => {
+    if (cell == null) {
+      return '';
+    }
+    const sc = cell.toString().trim();
+    if (sc === '' || sc === '""') {
+      return sc;
+    }
+    if (sc.includes('"') || sc.includes(',') || sc.includes('\n') || sc.includes('\r')) {
+      return '"' + sc.replace(/"/g, '""') + '"';
+    }
+    return sc;
+  };
+
+  const makeCsvData = (columns: any, data: any) => {
+    return data.reduce((csvString: any, rowItem: any) => {
+      return csvString + columns.map(({ accessor }: any) => escapeCsvCell(accessor(rowItem))).join(',') + '\r\n';
+    }, columns.map(({ name }: any) => escapeCsvCell(name)).join(',') + '\r\n');
+  };
+
+  const downloadAsCsv = (columns: any, data: any, filename: string) => {
+    const csvData = makeCsvData(columns, data);
+    const csvFile = new Blob([csvData], { type: 'text/csv' });
+    const downloadLink = document.createElement('a');
+
+    downloadLink.download = filename;
+    downloadLink.href = window.URL.createObjectURL(csvFile);
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+    document.body.removeChild(downloadLink);
+  };
+
+  const hasMask = (id: string, mask: number) => (parseInt(id.slice(0, 2), 16) & mask) === mask;
+
+  const handleDownloadCsv = () => {
+    const columns = [
+      { accessor: (dv: any) => dv.id.slice(2), name: 'Entity' },
+      { accessor: (dv: any) => dv.v, name: 'Value' },
+      { accessor: (dv: any) => (dv.u >= 1 && dv.u <= 2 ? 'C' : DeviceValueUOM_s[dv.u]), name: 'UoM' }
+    ];
+    downloadAsCsv(
+      columns,
+      onlyFav ? deviceData.data.filter((dv) => hasMask(dv.id, DeviceEntityMask.DV_FAVORITE)) : deviceData.data,
+      'device_entities'
+    );
+  };
+
+  const refreshDataIndex = (selectedDevice: string) => {
+    if (selectedDevice === 'sensor') {
+      fetchSensorData();
       return;
     }
-    loadData();
-    if (sensorData) {
-      fetchSensorData();
-    } else if (selectedDevice) {
+
+    setSensorData({ sensors: [], analogs: [] });
+    if (selectedDevice) {
       fetchDeviceData(selectedDevice);
+    } else {
+      fetchCoreData();
     }
   };
 
   const refreshData = () => {
-    if (analog || sensor || deviceValue) {
-      return;
-    }
-    if (sensorData) {
-      fetchSensorData();
-    } else if (selectedDevice) {
-      fetchDeviceData(selectedDevice);
-    } else {
-      loadData();
-    }
+    refreshDataIndex(device_select.state.id);
   };
 
+  const fetchCoreData = useCallback(async () => {
+    try {
+      setCoreData((await EMSESP.readCoreData()).data);
+    } catch (error: any) {
+      enqueueSnackbar(extractErrorMessage(error, 'Failed to fetch core data'), { variant: 'error' });
+    }
+  }, [enqueueSnackbar]);
+
+  useEffect(() => {
+    fetchCoreData();
+  }, [fetchCoreData]);
+
   useEffect(() => {
     const timer = setInterval(() => refreshData(), 60000);
     return () => {
       clearInterval(timer);
     };
     // eslint-disable-next-line
-  }, [analog, sensor, deviceValue, sensorData, selectedDevice]);
+  }, [analog, sensor, deviceValue, sensorData]);
 
-  const fetchDeviceData = async (unique_id: number) => {
+  const fetchDeviceData = async (id: string) => {
+    const unique_id = parseInt(id);
     try {
       setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data);
     } catch (error: any) {
       enqueueSnackbar(extractErrorMessage(error, 'Problem fetching device data'), { variant: 'error' });
-    } finally {
-      setSelectedDevice(unique_id);
-      setSensorData(undefined);
     }
   };
 
@@ -153,8 +391,6 @@ const DashboardData: FC = () => {
       setSensorData((await EMSESP.readSensorData()).data);
     } catch (error: any) {
       enqueueSnackbar(extractErrorMessage(error, 'Problem fetching sensor data'), { variant: 'error' });
-    } finally {
-      setSelectedDevice(undefined);
     }
   };
 
@@ -192,10 +428,10 @@ const DashboardData: FC = () => {
   }
 
   const sendDeviceValue = async () => {
-    if (selectedDevice && deviceValue) {
+    if (deviceValue) {
       try {
         const response = await EMSESP.writeValue({
-          id: selectedDevice,
+          id: Number(device_select.state.id),
           devicevalue: deviceValue
         });
         if (response.status === 204) {
@@ -209,9 +445,8 @@ const DashboardData: FC = () => {
       } catch (error: any) {
         enqueueSnackbar(extractErrorMessage(error, 'Problem writing value'), { variant: 'error' });
       } finally {
+        refreshData();
         setDeviceValue(undefined);
-        fetchDeviceData(selectedDevice);
-        loadData();
       }
     }
   };
@@ -225,7 +460,7 @@ const DashboardData: FC = () => {
             {deviceValue.l && (
               <ValidatedTextField
                 name="v"
-                label={deviceValue.n.slice(2)}
+                label={deviceValue.id.slice(2)}
                 value={deviceValue.v}
                 autoFocus
                 sx={{ width: '30ch' }}
@@ -240,7 +475,7 @@ const DashboardData: FC = () => {
             {!deviceValue.l && (
               <ValidatedTextField
                 name="v"
-                label={deviceValue.n.slice(2)}
+                label={deviceValue.id.slice(2)}
                 value={deviceValue.u ? numberValue(deviceValue.v) : deviceValue.v}
                 autoFocus
                 sx={{ width: '30ch' }}
@@ -279,14 +514,14 @@ const DashboardData: FC = () => {
   };
 
   const addAnalogSensor = () => {
-    setAnalog({ i: 0, n: '', u: 0, v: 0, o: 0, t: 0, f: 1 });
+    setAnalog({ id: '0', g: 0, n: '', u: 0, v: 0, o: 0, t: 0, f: 1 });
   };
 
   const sendSensor = async () => {
     if (sensor) {
       try {
         const response = await EMSESP.writeSensor({
-          id_str: sensor.is,
+          id: sensor.id,
           name: sensor.n,
           offset: sensor.o
         });
@@ -314,7 +549,7 @@ const DashboardData: FC = () => {
           <DialogTitle>Edit Temperature Sensor</DialogTitle>
           <DialogContent dividers>
             <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
-              <Typography variant="body2">Sensor ID {sensor.is}</Typography>
+              <Typography variant="body2">Sensor ID {sensor.id}</Typography>
             </Box>
             <Grid container spacing={1}>
               <Grid item>
@@ -369,32 +604,32 @@ const DashboardData: FC = () => {
   };
 
   const renderDeviceDialog = () => {
-    if (data && data.devices.length > 0 && deviceDialog !== -1) {
+    if (coreData && coreData.devices.length > 0 && deviceDialog !== -1) {
       return (
         <Dialog open={deviceDialog !== -1} onClose={() => setDeviceDialog(-1)}>
           <DialogTitle>Device Details</DialogTitle>
           <DialogContent dividers>
             <List dense={true}>
               <ListItem>
-                <ListItemText primary="Type" secondary={data.devices[deviceDialog].t} />
+                <ListItemText primary="Type" secondary={coreData.devices[deviceDialog].t} />
               </ListItem>
               <ListItem>
-                <ListItemText primary="Name" secondary={data.devices[deviceDialog].n} />
+                <ListItemText primary="Name" secondary={coreData.devices[deviceDialog].n} />
               </ListItem>
               <ListItem>
-                <ListItemText primary="Brand" secondary={data.devices[deviceDialog].b} />
+                <ListItemText primary="Brand" secondary={coreData.devices[deviceDialog].b} />
               </ListItem>
               <ListItem>
                 <ListItemText
                   primary="Device ID"
-                  secondary={'0x' + ('00' + data.devices[deviceDialog].d.toString(16).toUpperCase()).slice(-2)}
+                  secondary={'0x' + ('00' + coreData.devices[deviceDialog].d.toString(16).toUpperCase()).slice(-2)}
                 />
               </ListItem>
               <ListItem>
-                <ListItemText primary="Product ID" secondary={data.devices[deviceDialog].p} />
+                <ListItemText primary="Product ID" secondary={coreData.devices[deviceDialog].p} />
               </ListItem>
               <ListItem>
-                <ListItemText primary="Version" secondary={data.devices[deviceDialog].v} />
+                <ListItemText primary="Version" secondary={coreData.devices[deviceDialog].v} />
               </ListItem>
             </List>
           </DialogContent>
@@ -408,104 +643,80 @@ const DashboardData: FC = () => {
     }
   };
 
-  const toggleDeviceData = (index: number) => {
-    loadData();
-    if (selectedDevice === index) {
-      setSelectedDevice(undefined);
-    } else {
-      fetchDeviceData(index);
-    }
-  };
-
-  const toggleSensorData = () => {
-    loadData();
-    if (sensorData) {
-      setSensorData(undefined);
-    } else {
-      fetchSensorData();
-    }
-  };
-
-  const renderCoreData = () => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
-    }
-
-    return (
-      <IconContext.Provider value={{ color: 'lightblue', size: '24', style: { verticalAlign: 'middle' } }}>
-        {data.devices.length === 0 && <MessageBox my={2} level="warning" message="Scanning for EMS devices..." />}
-        <Table size="small">
-          <TableHead>
-            <TableRow>
-              <StyledTableCell padding="checkbox" align="left" colSpan={2}>
-                TYPE
-              </StyledTableCell>
-              {desktopWindow && <StyledTableCell>DESCRIPTION</StyledTableCell>}
-              <StyledTableCell align="center">ENTITIES</StyledTableCell>
-              <StyledTableCell />
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            {data.devices.map((device, index) => (
-              <TableRow
-                hover
-                selected={device.i === selectedDevice}
-                key={index}
-                onClick={() => device.e && toggleDeviceData(device.i)}
-              >
-                <TableCell padding="checkbox">
-                  <DeviceIcon type={device.t} />
-                </TableCell>
-                <TableCell>{device.t}</TableCell>
-                {desktopWindow && <TableCell>{device.n}</TableCell>}
-                <TableCell align="center">{device.e}</TableCell>
-                <TableCell align="right">
-                  <IconButton size="small" onClick={() => setDeviceDialog(index)}>
-                    <InfoOutlinedIcon color="info" fontSize="small" sx={{ verticalAlign: 'middle' }} />
-                  </IconButton>
-                </TableCell>
-              </TableRow>
-            ))}
-            {(data.active_sensors > 0 || data.analog_enabled) && (
-              <TableRow hover selected={sensorData !== undefined} onClick={() => toggleSensorData()}>
-                <TableCell>
-                  <DeviceIcon type="Sensor" />
-                </TableCell>
-                <TableCell>Sensors</TableCell>
-                {desktopWindow && <TableCell>Attached EMS-ESP Sensors</TableCell>}
-                <TableCell align="center">{data.active_sensors}</TableCell>
-                <TableCell align="right">
-                  <IconButton size="small" onClick={() => addAnalogSensor()} disabled={!data.analog_enabled}>
-                    <AddCircleOutlineOutlinedIcon fontSize="small" sx={{ verticalAlign: 'middle' }} />
-                  </IconButton>
-                </TableCell>
-              </TableRow>
-            )}
-          </TableBody>
-        </Table>
-      </IconContext.Provider>
-    );
-  };
+  const renderCoreData = () => (
+    <IconContext.Provider value={{ color: 'lightblue', size: '24', style: { verticalAlign: 'middle' } }}>
+      {coreData.devices.length === 0 && <MessageBox my={2} level="warning" message="Scanning for EMS devices..." />}
+      <Table data={{ nodes: coreData.devices }} select={device_select} theme={device_theme} layout={{ custom: true }}>
+        {(tableList: any) => (
+          <>
+            <Header>
+              <HeaderRow>
+                <HeaderCell />
+                <HeaderCell resize>TYPE</HeaderCell>
+                <HeaderCell resize>DESCRIPTION</HeaderCell>
+                <HeaderCell>ENTITIES</HeaderCell>
+                <HeaderCell />
+              </HeaderRow>
+            </Header>
+            <Body>
+              {tableList.map((device: Device, index: number) => (
+                <Row key={device.id} item={device}>
+                  <Cell>
+                    {/* <IconButton onClick={() => refreshDataIndex(device.id)}> */}
+                    <DeviceIcon type={device.t} />
+                    {/* </IconButton> */}
+                  </Cell>
+                  <Cell>{device.t}</Cell>
+                  <Cell>{device.n}</Cell>
+                  <Cell>{device.e}</Cell>
+                  <Cell>
+                    <IconButton size="small" onClick={() => setDeviceDialog(index)}>
+                      <InfoOutlinedIcon color="info" sx={{ fontSize: 16, verticalAlign: 'middle' }} />
+                    </IconButton>
+                  </Cell>
+                </Row>
+              ))}
+              {(coreData.active_sensors > 0 || coreData.analog_enabled) && (
+                <Row key="sensor" item={{ id: 'sensor' }}>
+                  <Cell>
+                    {/* <IconButton onClick={() => refreshDataIndex('sensor')}> */}
+                    <DeviceIcon type="Sensor" />
+                    {/* </IconButton> */}
+                  </Cell>
+                  <Cell>Sensors</Cell>
+                  <Cell>Attached EMS-ESP Sensors</Cell>
+                  <Cell>{coreData.active_sensors}</Cell>
+                  <Cell>
+                    <IconButton size="small" onClick={() => addAnalogSensor()}>
+                      <AddCircleOutlineOutlinedIcon sx={{ fontSize: 16, verticalAlign: 'middle' }} />
+                    </IconButton>
+                  </Cell>
+                </Row>
+              )}
+            </Body>
+          </>
+        )}
+      </Table>
+    </IconContext.Provider>
+  );
 
   const renderDeviceData = () => {
-    if (data?.devices.length === 0 || !deviceData || !selectedDevice) {
+    if (!device_select.state.id || device_select.state.id === 'sensor') {
       return;
     }
 
-    const hasMask = (entityName: string, mask: number) => (parseInt(entityName.slice(0, 2), 16) & mask) === mask;
-
     const sendCommand = (dv: DeviceValue) => {
-      if (dv.c && me.admin && !hasMask(dv.n, DeviceEntityMask.DV_READONLY)) {
+      if (dv.c && me.admin && !hasMask(dv.id, DeviceEntityMask.DV_READONLY)) {
         setDeviceValue(dv);
       }
     };
 
     const renderNameCell = (dv: DeviceValue) => (
       <>
-        {dv.n.slice(2)}&nbsp;
-        {hasMask(dv.n, DeviceEntityMask.DV_FAVORITE) && <FavoriteBorderIcon color="success" sx={{ fontSize: 12 }} />}
-        {hasMask(dv.n, DeviceEntityMask.DV_READONLY) && <EditOffOutlinedIcon color="primary" sx={{ fontSize: 12 }} />}
-        {hasMask(dv.n, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && (
+        {dv.id.slice(2)}&nbsp;
+        {hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) && <StarIcon color="primary" sx={{ fontSize: 12 }} />}
+        {hasMask(dv.id, DeviceEntityMask.DV_READONLY) && <EditOffOutlinedIcon color="primary" sx={{ fontSize: 12 }} />}
+        {hasMask(dv.id, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && (
           <CommentsDisabledOutlinedIcon color="primary" sx={{ fontSize: 12 }} />
         )}
       </>
@@ -516,47 +727,74 @@ const DashboardData: FC = () => {
         <Typography sx={{ pt: 2, pb: 1 }} variant="h6" color="primary">
           {deviceData.label}
         </Typography>
-        <Table size="small">
-          <TableHead>
-            <TableRow>
-              <StyledTableCell padding="checkbox" style={{ width: 18 }}></StyledTableCell>
-              <StyledTableCell align="left">ENTITY NAME</StyledTableCell>
-              <StyledTableCell align="right">VALUE</StyledTableCell>
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            {deviceData.data.map((dv, i) => (
-              <StyledTableRow key={i} onClick={() => sendCommand(dv)}>
-                <StyledTableCell padding="checkbox">
-                  {dv.c && me.admin && !hasMask(dv.n, DeviceEntityMask.DV_READONLY) && (
-                    <IconButton size="small">
-                      <EditIcon color="primary" fontSize="small" />
-                    </IconButton>
-                  )}
-                </StyledTableCell>
-                <StyledTableCell component="th" scope="row">
-                  {renderNameCell(dv)}
-                </StyledTableCell>
-                <StyledTableCell align="right">
-                  {isCmdOnly(dv) ? <PlayArrowIcon color="primary" sx={{ fontSize: 14 }} /> : formatValue(dv.v, dv.u)}
-                </StyledTableCell>
-              </StyledTableRow>
-            ))}
-          </TableBody>
+
+        <FormControlLabel
+          control={<Checkbox size="small" name="onlyFav" checked={onlyFav} onChange={() => setOnlyFav(!onlyFav)} />}
+          label={<span style={{ fontSize: '12px' }}>show only favorites</span>}
+        />
+
+        <Table
+          data={{
+            nodes: onlyFav
+              ? deviceData.data.filter((dv) => hasMask(dv.id, DeviceEntityMask.DV_FAVORITE))
+              : deviceData.data
+          }}
+          theme={data_theme}
+          sort={dv_sort}
+        >
+          {(tableList: any) => (
+            <>
+              <Header>
+                <HeaderRow>
+                  <HeaderCell resize>
+                    <Button
+                      fullWidth
+                      style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                      endIcon={getSortIcon(dv_sort.state, 'NAME')}
+                      onClick={() => dv_sort.fns.onToggleSort({ sortKey: 'NAME' })}
+                    >
+                      ENTITY NAME
+                    </Button>
+                  </HeaderCell>
+                  <HeaderCell resize>VALUE</HeaderCell>
+                  <HeaderCell />
+                </HeaderRow>
+              </Header>
+              <Body>
+                {tableList.map((dv: DeviceValue) => (
+                  <Row key={dv.id} item={dv} onClick={() => sendCommand(dv)}>
+                    <Cell>{renderNameCell(dv)}</Cell>
+                    <Cell>{formatValue(dv.v, dv.u)}</Cell>
+                    <Cell>
+                      {dv.c && me.admin && !hasMask(dv.id, DeviceEntityMask.DV_READONLY) && (
+                        <IconButton size="small" onClick={() => sendCommand(dv)}>
+                          {isCmdOnly(dv) ? (
+                            <PlayArrowIcon color="primary" sx={{ fontSize: 16 }} />
+                          ) : (
+                            <EditIcon color="primary" sx={{ fontSize: 16 }} />
+                          )}
+                        </IconButton>
+                      )}
+                    </Cell>
+                  </Row>
+                ))}
+              </Body>
+            </>
+          )}
         </Table>
       </>
     );
   };
 
-  const updateSensor = (sensordata: Sensor) => {
-    if (sensordata && me.admin) {
-      setSensor(sensordata);
+  const updateSensor = (s: Sensor) => {
+    if (s && me.admin) {
+      setSensor(s);
     }
   };
 
-  const updateAnalog = (analogdata: Analog) => {
+  const updateAnalog = (a: Analog) => {
     if (me.admin) {
-      setAnalog(analogdata);
+      setAnalog(a);
     }
   };
 
@@ -565,31 +803,52 @@ const DashboardData: FC = () => {
       <Typography sx={{ pt: 2, pb: 1 }} variant="h6" color="primary">
         Temperature Sensors
       </Typography>
-      <Table size="small">
-        <TableHead>
-          <TableRow>
-            <StyledTableCell padding="checkbox" style={{ width: 18 }}></StyledTableCell>
-            <StyledTableCell align="left">NAME</StyledTableCell>
-            <StyledTableCell align="right">TEMPERATURE</StyledTableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {sensorData?.sensors.map((sensor_data) => (
-            <StyledTableRow key={sensor_data.n} onClick={() => updateSensor(sensor_data)}>
-              <StyledTableCell padding="checkbox">
-                {me.admin && (
-                  <IconButton edge="start" size="small">
-                    <EditIcon color="primary" fontSize="small" />
-                  </IconButton>
-                )}
-              </StyledTableCell>
-              <StyledTableCell component="th" scope="row">
-                {sensor_data.n}
-              </StyledTableCell>
-              <StyledTableCell align="right">{formatValue(sensor_data.t, sensor_data.u)}</StyledTableCell>
-            </StyledTableRow>
-          ))}
-        </TableBody>
+
+      <Table data={{ nodes: sensorData.sensors }} theme={data_theme} sort={sensor_sort}>
+        {(tableList: any) => (
+          <>
+            <Header>
+              <HeaderRow>
+                <HeaderCell resize>
+                  <Button
+                    fullWidth
+                    style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                    endIcon={getSortIcon(sensor_sort.state, 'NAME')}
+                    onClick={() => sensor_sort.fns.onToggleSort({ sortKey: 'NAME' })}
+                  >
+                    NAME
+                  </Button>
+                </HeaderCell>
+                <HeaderCell resize>
+                  <Button
+                    fullWidth
+                    style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                    endIcon={getSortIcon(sensor_sort.state, 'TEMPERATURE')}
+                    onClick={() => sensor_sort.fns.onToggleSort({ sortKey: 'TEMPERATURE' })}
+                  >
+                    TEMPERATURE
+                  </Button>
+                </HeaderCell>
+                <HeaderCell />
+              </HeaderRow>
+            </Header>
+            <Body>
+              {tableList.map((s: Sensor) => (
+                <Row key={s.id} item={s} onClick={() => updateSensor(s)}>
+                  <Cell>{s.n}</Cell>
+                  <Cell>{formatValue(s.t, s.u)}</Cell>
+                  <Cell>
+                    {me.admin && (
+                      <IconButton onClick={() => updateSensor(s)}>
+                        <EditIcon color="primary" sx={{ fontSize: 16 }} />
+                      </IconButton>
+                    )}
+                  </Cell>
+                </Row>
+              ))}
+            </Body>
+          </>
+        )}
       </Table>
     </>
   );
@@ -599,35 +858,65 @@ const DashboardData: FC = () => {
       <Typography sx={{ pt: 2, pb: 1 }} variant="h6" color="primary">
         Analog Sensors
       </Typography>
-      <Table size="small">
-        <TableHead>
-          <TableRow>
-            <StyledTableCell padding="checkbox" style={{ width: 18 }}></StyledTableCell>
-            <StyledTableCell>GPIO</StyledTableCell>
-            <StyledTableCell>NAME</StyledTableCell>
-            <StyledTableCell>TYPE</StyledTableCell>
-            <StyledTableCell align="right">VALUE</StyledTableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {sensorData?.analogs.map((analog_data) => (
-            <StyledTableRow key={analog_data.i} onClick={() => updateAnalog(analog_data)}>
-              <StyledTableCell padding="checkbox">
-                {me.admin && (
-                  <IconButton edge="start" size="small">
-                    <EditIcon color="primary" fontSize="small" />
-                  </IconButton>
-                )}
-              </StyledTableCell>
-              <StyledTableCell component="th" scope="row">
-                {analog_data.i}
-              </StyledTableCell>
-              <StyledTableCell>{analog_data.n}</StyledTableCell>
-              <StyledTableCell>{AnalogTypeNames[analog_data.t]}</StyledTableCell>
-              <StyledTableCell align="right">{formatValue(analog_data.v, analog_data.u)}</StyledTableCell>
-            </StyledTableRow>
-          ))}
-        </TableBody>
+
+      <Table data={{ nodes: sensorData.analogs }} theme={data_theme} sort={analog_sort}>
+        {(tableList: any) => (
+          <>
+            <Header>
+              <HeaderRow>
+                <HeaderCell resize>
+                  <Button
+                    fullWidth
+                    style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                    endIcon={getSortIcon(analog_sort.state, 'GPIO')}
+                    onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'GPIO' })}
+                  >
+                    GPIO
+                  </Button>
+                </HeaderCell>
+                <HeaderCell resize>
+                  <Button
+                    fullWidth
+                    style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                    endIcon={getSortIcon(analog_sort.state, 'NAME')}
+                    onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'NAME' })}
+                  >
+                    NAME
+                  </Button>
+                </HeaderCell>
+                <HeaderCell resize>
+                  <Button
+                    fullWidth
+                    style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                    endIcon={getSortIcon(analog_sort.state, 'TYPE')}
+                    onClick={() => analog_sort.fns.onToggleSort({ sortKey: 'TYPE' })}
+                  >
+                    TYPE
+                  </Button>
+                </HeaderCell>
+                <HeaderCell resize>VALUE</HeaderCell>
+                <HeaderCell />
+              </HeaderRow>
+            </Header>
+            <Body>
+              {tableList.map((a: Analog) => (
+                <Row key={a.id} item={a} onClick={() => updateAnalog(a)}>
+                  <Cell>{a.g}</Cell>
+                  <Cell>{a.n}</Cell>
+                  <Cell>{AnalogTypeNames[a.t]} </Cell>
+                  <Cell>{a.t ? formatValue(a.v, a.u) : ''}</Cell>
+                  <Cell>
+                    {me.admin && (
+                      <IconButton onClick={() => updateAnalog(a)}>
+                        <EditIcon color="primary" sx={{ fontSize: 16 }} />
+                      </IconButton>
+                    )}
+                  </Cell>
+                </Row>
+              ))}
+            </Body>
+          </>
+        )}
       </Table>
     </>
   );
@@ -636,7 +925,7 @@ const DashboardData: FC = () => {
     if (analog) {
       try {
         const response = await EMSESP.writeAnalog({
-          id: analog.i,
+          gpio: analog.g,
           name: analog.n,
           offset: analog.o,
           factor: analog.f,
@@ -664,7 +953,7 @@ const DashboardData: FC = () => {
     if (analog) {
       try {
         const response = await EMSESP.writeAnalog({
-          id: analog.i,
+          gpio: analog.g,
           name: analog.n,
           offset: analog.o,
           factor: analog.f,
@@ -697,9 +986,9 @@ const DashboardData: FC = () => {
             <Grid container spacing={2}>
               <Grid item>
                 <ValidatedTextField
-                  name="i"
+                  name="g"
                   label="GPIO"
-                  value={numberValue(analog.i)}
+                  value={analog.g}
                   type="number"
                   variant="outlined"
                   autoFocus
@@ -781,7 +1070,7 @@ const DashboardData: FC = () => {
                   </Grid>
                 </>
               )}
-              {analog.t === AnalogType.DIGITAL_OUT && (analog.i === 25 || analog.i === 26) && (
+              {analog.t === AnalogType.DIGITAL_OUT && (analog.id === '25' || analog.id === '26') && (
                 <>
                   <Grid item>
                     <ValidatedTextField
@@ -797,7 +1086,7 @@ const DashboardData: FC = () => {
                   </Grid>
                 </>
               )}
-              {analog.t === AnalogType.DIGITAL_OUT && analog.i !== 25 && analog.i !== 26 && (
+              {analog.t === AnalogType.DIGITAL_OUT && analog.id !== '25' && analog.id !== '26' && (
                 <>
                   <Grid item>
                     <ValidatedTextField
@@ -881,33 +1170,26 @@ const DashboardData: FC = () => {
     }
   };
 
-  const content = () => {
-    if (!data) {
-      return <FormLoader onRetry={loadData} errorMessage={errorMessage} />;
-    }
-
-    return (
-      <>
-        {renderCoreData()}
-        {renderDeviceData()}
-        {renderDeviceDialog()}
-        {sensorData && sensorData.sensors.length > 0 && renderDallasData()}
-        {sensorData && sensorData.analogs.length > 0 && renderAnalogData()}
-        {renderDeviceValueDialog()}
-        {renderSensorDialog()}
-        {renderAnalogDialog()}
-        <ButtonRow>
-          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={refreshAllData}>
-            Refresh
-          </Button>
-        </ButtonRow>
-      </>
-    );
-  };
-
   return (
     <SectionContent title="Device and Sensor Data" titleGutter>
-      {content()}
+      {renderCoreData()}
+      {renderDeviceData()}
+      {renderDeviceDialog()}
+      {sensorData.sensors.length !== 0 && renderDallasData()}
+      {sensorData.analogs.length !== 0 && renderAnalogData()}
+      {renderDeviceValueDialog()}
+      {renderSensorDialog()}
+      {renderAnalogDialog()}
+      <ButtonRow>
+        <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={refreshData}>
+          Refresh
+        </Button>
+        {device_select.state.id && device_select.state.id !== 'sensor' && (
+          <Button startIcon={<DownloadIcon />} variant="outlined" onClick={handleDownloadCsv}>
+            Export
+          </Button>
+        )}
+      </ButtonRow>
     </SectionContent>
   );
 };
diff --git a/interface/src/project/DashboardStatus.tsx b/interface/src/project/DashboardStatus.tsx
index 6f81074ad..1e9d7113f 100644
--- a/interface/src/project/DashboardStatus.tsx
+++ b/interface/src/project/DashboardStatus.tsx
@@ -3,25 +3,23 @@ import { useSnackbar } from 'notistack';
 import {
   Avatar,
   Button,
-  Table,
-  TableContainer,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableRow,
   List,
   ListItem,
   ListItemAvatar,
   ListItemText,
-  Theme,
-  useTheme,
   Box,
   Dialog,
   DialogActions,
   DialogContent,
-  DialogTitle
+  DialogTitle,
+  Theme,
+  useTheme
 } from '@mui/material';
 
+import { Table } from '@table-library/react-table-library/table';
+import { useTheme as tableTheme } from '@table-library/react-table-library/theme';
+import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
+
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';
@@ -32,14 +30,12 @@ import { AuthenticatedContext } from '../contexts/authentication';
 
 import { ButtonRow, FormLoader, SectionContent } from '../components';
 
-import { Status, busConnectionStatus } from './types';
+import { Status, busConnectionStatus, Stat } from './types';
 
-import { formatDurationSec, pluralize } from '../utils';
+import { formatDurationSec, pluralize, extractErrorMessage, useRest } from '../utils';
 
 import * as EMSESP from './api';
 
-import { extractErrorMessage, useRest } from '../utils';
-
 export const isConnected = ({ status }: Status) => status !== busConnectionStatus.BUS_STATUS_OFFLINE;
 
 const busStatusHighlight = ({ status }: Status, theme: Theme) => {
@@ -60,7 +56,7 @@ const busStatus = ({ status }: Status) => {
     case busConnectionStatus.BUS_STATUS_CONNECTED:
       return 'Connected';
     case busConnectionStatus.BUS_STATUS_TX_ERRORS:
-      return 'Tx issues - try a different Tx-Mode';
+      return 'Tx issues - try a different Tx Mode';
     case busConnectionStatus.BUS_STATUS_OFFLINE:
       return 'Disconnected';
     default:
@@ -68,41 +64,17 @@ const busStatus = ({ status }: Status) => {
   }
 };
 
-const formatRow = (name: string, success: number, fail: number, quality: number) => {
-  if (success === 0 && fail === 0) {
-    return (
-      <TableRow>
-        <TableCell sx={{ color: 'gray' }}>{name}</TableCell>
-        <TableCell />
-        <TableCell />
-        <TableCell />
-      </TableRow>
-    );
+const showQuality = (stat: Stat) => {
+  if (stat.q === 0 || stat.s + stat.f === 0) {
+    return;
   }
-
-  return (
-    <TableRow>
-      <TableCell>{name}</TableCell>
-      <TableCell>{Intl.NumberFormat().format(success)}</TableCell>
-      <TableCell>{Intl.NumberFormat().format(fail)}</TableCell>
-      {showQuality(quality)}
-    </TableRow>
-  );
-};
-
-const showQuality = (quality: number) => {
-  if (quality === 0) {
-    return <TableCell />;
+  if (stat.q === 100) {
+    return <div style={{ color: '#00FF7F' }}>{stat.q}%</div>;
   }
-
-  if (quality === 100) {
-    return <TableCell sx={{ color: '#00FF7F' }}>{quality}%</TableCell>;
-  }
-
-  if (quality >= 95) {
-    return <TableCell sx={{ color: 'orange' }}>{quality}%</TableCell>;
+  if (stat.q >= 95) {
+    return <div style={{ color: 'orange' }}>{stat.q}%</div>;
   } else {
-    return <TableCell sx={{ color: 'red' }}>{quality}%</TableCell>;
+    return <div style={{ color: 'red' }}>{stat.q}%</div>;
   }
 };
 
@@ -115,6 +87,48 @@ const DashboardStatus: FC = () => {
 
   const { me } = useContext(AuthenticatedContext);
 
+  const stats_theme = tableTheme({
+    BaseRow: `
+      font-size: 14px;
+      color: white;
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      color: #90CAF9;
+      border-bottom: 1px solid #e0e0e0;
+    `,
+    Row: `
+      &:nth-of-type(odd) {
+        background-color: #303030;
+      }
+      &:nth-of-type(even) {
+        background-color: #1e1e1e;
+      }
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        color: white;
+      }
+    `,
+    BaseCell: `
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+      &:nth-of-type(1) {
+        flex: 1;
+      }
+    `
+  });
+
   useEffect(() => {
     const timer = setInterval(() => loadData(), 30000);
     return () => {
@@ -183,27 +197,30 @@ const DashboardStatus: FC = () => {
             />
           </ListItem>
           <Box m={3}></Box>
-          <TableContainer>
-            <Table size="small">
-              <TableHead>
-                <TableRow>
-                  <TableCell></TableCell>
-                  <TableCell>SUCCESS</TableCell>
-                  <TableCell>FAIL</TableCell>
-                  <TableCell>QUALITY</TableCell>
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {formatRow('EMS Telegrams Received (Rx)', data.rx_received, data.rx_fails, data.rx_quality)}
-                {formatRow('EMS Reads (Tx)', data.tx_reads, data.tx_read_fails, data.tx_read_quality)}
-                {formatRow('EMS Writes (Tx)', data.tx_writes, data.tx_write_fails, data.tx_write_quality)}
-                {formatRow('Temperature Sensor Reads', data.sensor_reads, data.sensor_fails, data.sensor_quality)}
-                {formatRow('Analog Sensor Reads', data.analog_reads, data.analog_fails, data.analog_quality)}
-                {formatRow('MQTT Publishes', data.mqtt_count, data.mqtt_fails, data.mqtt_quality)}
-                {formatRow('API Calls', data.api_calls, data.api_fails, data.api_quality)}
-              </TableBody>
-            </Table>
-          </TableContainer>
+          <Table data={{ nodes: data.stats }} theme={stats_theme} layout={{ custom: true }}>
+            {(tableList: any) => (
+              <>
+                <Header>
+                  <HeaderRow>
+                    <HeaderCell></HeaderCell>
+                    <HeaderCell>SUCCESS</HeaderCell>
+                    <HeaderCell>FAIL</HeaderCell>
+                    <HeaderCell>QUALITY</HeaderCell>
+                  </HeaderRow>
+                </Header>
+                <Body>
+                  {tableList.map((stat: Stat) => (
+                    <Row key={stat.id} item={stat}>
+                      <Cell>{stat.id}</Cell>
+                      <Cell>{Intl.NumberFormat().format(stat.s)}</Cell>
+                      <Cell>{Intl.NumberFormat().format(stat.f)}</Cell>
+                      <Cell>{showQuality(stat)}</Cell>
+                    </Row>
+                  ))}
+                </Body>
+              </>
+            )}
+          </Table>
         </List>
         {renderScanDialog()}
         <Box display="flex" flexWrap="wrap">
diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx
index 3eba6cbc2..c8c020ddf 100644
--- a/interface/src/project/SettingsCustomization.tsx
+++ b/interface/src/project/SettingsCustomization.tsx
@@ -2,10 +2,6 @@ import { FC, useState, useEffect, useCallback } from 'react';
 
 import {
   Button,
-  Table,
-  TableBody,
-  TableHead,
-  TableRow,
   Typography,
   Box,
   MenuItem,
@@ -14,22 +10,31 @@ import {
   DialogContent,
   DialogTitle,
   ToggleButton,
-  ToggleButtonGroup
+  ToggleButtonGroup,
+  Tooltip,
+  Grid,
+  TextField
 } from '@mui/material';
 
-import TableCell, { tableCellClasses } from '@mui/material/TableCell';
-
-import { styled } from '@mui/material/styles';
+import { Table } from '@table-library/react-table-library/table';
+import { useTheme } from '@table-library/react-table-library/theme';
+import { useSort, SortToggleType } from '@table-library/react-table-library/sort';
+import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
 
 import { useSnackbar } from 'notistack';
 
 import SaveIcon from '@mui/icons-material/Save';
 import CancelIcon from '@mui/icons-material/Cancel';
 import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
-import FavoriteBorderOutlinedIcon from '@mui/icons-material/FavoriteBorderOutlined';
+import StarIcon from '@mui/icons-material/Star';
 import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined';
 import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
+import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
+import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
+import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined';
+import SearchIcon from '@mui/icons-material/Search';
+import FilterListIcon from '@mui/icons-material/FilterList';
 
 import { ButtonRow, FormLoader, ValidatedTextField, SectionContent } from '../components';
 
@@ -37,26 +42,116 @@ import * as EMSESP from './api';
 
 import { extractErrorMessage } from '../utils';
 
-import { DeviceShort, Devices, DeviceEntity } from './types';
-
-const StyledTableCell = styled(TableCell)(({ theme }) => ({
-  [`&.${tableCellClasses.head}`]: {
-    backgroundColor: '#607d8b'
-  }
-}));
+import { DeviceShort, Devices, DeviceEntity, DeviceEntityMask } from './types';
 
 const SettingsCustomization: FC = () => {
   const { enqueueSnackbar } = useSnackbar();
 
-  const [deviceEntities, setDeviceEntities] = useState<DeviceEntity[]>();
+  const [deviceEntities, setDeviceEntities] = useState<DeviceEntity[]>([{ id: '', v: 0, s: '', m: 0, w: false }]);
   const [devices, setDevices] = useState<Devices>();
   const [errorMessage, setErrorMessage] = useState<string>();
   const [selectedDevice, setSelectedDevice] = useState<number>(0);
   const [confirmReset, setConfirmReset] = useState<boolean>(false);
+  const [selectedFilters, setSelectedFilters] = useState<number>(0);
+  const [search, setSearch] = useState('');
 
   // eslint-disable-next-line
   const [masks, setMasks] = useState(() => ['']);
 
+  const entities_theme = useTheme({
+    BaseRow: `
+      font-size: 14px;
+      color: white;
+      height: 32px;
+    `,
+    HeaderRow: `
+      text-transform: uppercase;
+      background-color: black;
+      border-bottom: 1px solid #e0e0e0;
+      color: #90CAF9;
+      font-weight: 500;
+    `,
+    Row: `
+      background-color: #1e1e1e;
+      border-top: 1px solid #565656;
+      border-bottom: 1px solid #565656;
+      position: relative;
+      z-index: 1;
+      &:not(:last-of-type) {
+        margin-bottom: -1px;
+      }
+      &:not(:first-of-type) {
+        margin-top: -1px;
+      }
+      &:hover {
+        z-index: 2;
+        color: white;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      },
+      &.tr.tr-body.row-select.row-select-single-selected, &.tr.tr-body.row-select.row-select-selected {
+        background-color: #3d4752;
+        color: white;
+        font-weight: normal;
+        z-index: 2;
+        border-top: 1px solid #177ac9;
+        border-bottom: 1px solid #177ac9;
+      }
+    `,
+    BaseCell: `
+      padding-left: 8px;
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+      border-bottom: 1px solid transparent;
+      &:nth-of-type(1) {
+        left: 0px;
+        min-width: 124px;
+        width: 124px;
+        padding-left: 0px;
+
+      }
+      &:nth-of-type(2) {
+        min-width: 70%;
+        width: 70%;
+      }
+    `,
+    HeaderCell: `
+      padding-left: 0px;
+      &:nth-of-type(1) {
+        padding-left: 24px;
+      }
+      &:nth-of-type(3) {
+        border-left: 1px solid #565656;
+      }
+    `
+  });
+
+  const getSortIcon = (state: any, sortKey: any) => {
+    if (state.sortKey === sortKey && state.reverse) {
+      return <KeyboardArrowDownOutlinedIcon />;
+    }
+    if (state.sortKey === sortKey && !state.reverse) {
+      return <KeyboardArrowUpOutlinedIcon />;
+    }
+    return <UnfoldMoreOutlinedIcon />;
+  };
+
+  const entity_sort = useSort(
+    { nodes: deviceEntities },
+    {},
+    {
+      sortIcon: {
+        iconDefault: <UnfoldMoreOutlinedIcon />,
+        iconUp: <KeyboardArrowUpOutlinedIcon />,
+        iconDown: <KeyboardArrowDownOutlinedIcon />
+      },
+      sortToggleType: SortToggleType.AlternateWithReset,
+      sortFns: {
+        NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id))
+      }
+    }
+  );
+
   const fetchDevices = useCallback(async () => {
     try {
       setDevices((await EMSESP.readDevices()).data);
@@ -93,47 +188,112 @@ const SettingsCustomization: FC = () => {
     return value;
   }
 
+  const getMaskNumber = (newMask: string[]) => {
+    var new_mask = 0;
+    for (let entry of newMask) {
+      new_mask |= Number(entry);
+    }
+    return new_mask;
+  };
+
+  const getMaskString = (m: number) => {
+    var new_masks = [];
+    if ((m & 1) === 1) {
+      new_masks.push('1');
+    }
+    if ((m & 2) === 2) {
+      new_masks.push('2');
+    }
+    if ((m & 4) === 4) {
+      new_masks.push('4');
+    }
+    if ((m & 8) === 8) {
+      new_masks.push('8');
+    }
+    return new_masks;
+  };
+
+  const maskDisabled = (set: boolean) => {
+    setDeviceEntities(
+      deviceEntities.map(function (de) {
+        if ((de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase())) {
+          return {
+            ...de,
+            m: set
+              ? de.m | (DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE)
+              : de.m & ~(DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE)
+          };
+        } else {
+          return de;
+        }
+      })
+    );
+  };
+
+  function compareDevices(a: DeviceShort, b: DeviceShort) {
+    if (a.s < b.s) {
+      return -1;
+    }
+    if (a.s > b.s) {
+      return 1;
+    }
+    return 0;
+  }
+
+  const changeSelectedDevice = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const selected_device = parseInt(event.target.value, 10);
+    setSelectedDevice(selected_device);
+    fetchDeviceEntities(selected_device);
+  };
+
+  const resetCustomization = async () => {
+    try {
+      await EMSESP.resetCustomizations();
+      enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' });
+    } catch (error: any) {
+      enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' });
+    } finally {
+      setConfirmReset(false);
+    }
+  };
+
+  const saveCustomization = async () => {
+    if (deviceEntities && selectedDevice) {
+      const masked_entities = deviceEntities
+        .filter((de) => de.m !== de.om)
+        .map((new_de) => new_de.m.toString(16).padStart(2, '0') + new_de.s);
+
+      if (masked_entities.length > 60) {
+        enqueueSnackbar('Selected entities exceeded limit of 60. Please Save in batches', { variant: 'warning' });
+        return;
+      }
+
+      try {
+        const response = await EMSESP.writeMaskedEntities({
+          id: selectedDevice,
+          entity_ids: masked_entities
+        });
+        if (response.status === 200) {
+          enqueueSnackbar('Customization saved', { variant: 'success' });
+        } else {
+          enqueueSnackbar('Customization save failed', { variant: 'error' });
+        }
+      } catch (error: any) {
+        enqueueSnackbar(extractErrorMessage(error, 'Problem sending entity list'), { variant: 'error' });
+      }
+      setInitialMask(deviceEntities);
+    }
+  };
+
   const renderDeviceList = () => {
     if (!devices) {
       return <FormLoader errorMessage={errorMessage} />;
     }
 
-    function compareDevices(a: DeviceShort, b: DeviceShort) {
-      if (a.s < b.s) {
-        return -1;
-      }
-      if (a.s > b.s) {
-        return 1;
-      }
-      return 0;
-    }
-
-    const changeSelectedDevice = (event: React.ChangeEvent<HTMLInputElement>) => {
-      const selected_device = parseInt(event.target.value, 10);
-      setSelectedDevice(selected_device);
-      fetchDeviceEntities(selected_device);
-    };
-
     return (
       <>
         <Box color="warning.main">
-          <Typography variant="body2">Select a device and customize each of its entities using the options:</Typography>
-          <Typography mt={1} ml={2} display="block" variant="body2" sx={{ alignItems: 'center', display: 'flex' }}>
-            <FavoriteBorderOutlinedIcon color="success" sx={{ fontSize: 13 }} />
-            &nbsp;mark it as favorite to be listed at the top of the Dashboard
-          </Typography>
-          <Typography ml={2} display="block" variant="body2" sx={{ alignItems: 'center', display: 'flex' }}>
-            <EditOffOutlinedIcon color="secondary" sx={{ fontSize: 13 }} />
-            &nbsp;make it read-only, only if it has write operation available
-          </Typography>
-          <Typography ml={2} display="block" variant="body2" sx={{ alignItems: 'center', display: 'flex' }}>
-            <CommentsDisabledOutlinedIcon color="secondary" sx={{ fontSize: 13 }} />
-            &nbsp;excluded it from MQTT and API outputs
-          </Typography>
-          <Typography ml={2} mb={1} display="block" variant="body2" sx={{ alignItems: 'center', display: 'flex' }}>
-            <VisibilityOffOutlinedIcon color="secondary" sx={{ fontSize: 13 }} />
-            &nbsp;hide it from the Dashboard
-          </Typography>
+          <Typography variant="body2">Select a device and customize each of its entities using the options.</Typography>
         </Box>
         <ValidatedTextField
           name="device"
@@ -158,131 +318,177 @@ const SettingsCustomization: FC = () => {
     );
   };
 
-  const saveCustomization = async () => {
-    if (deviceEntities && selectedDevice) {
-      const masked_entities = deviceEntities
-        .filter((de) => de.m !== de.om)
-        .map((new_de) => new_de.m.toString(16).padStart(2, '0') + new_de.s);
-
-      if (masked_entities.length > 50) {
-        enqueueSnackbar(
-          'Too many selected entities (' + masked_entities.length + '). Limit is 50. Please Save in batches',
-          { variant: 'warning' }
-        );
-        return;
-      }
-
-      try {
-        const response = await EMSESP.writeMaskedEntities({
-          id: selectedDevice,
-          entity_ids: masked_entities
-        });
-        if (response.status === 200) {
-          enqueueSnackbar('Customization saved', { variant: 'success' });
-        } else {
-          enqueueSnackbar('Customization save failed', { variant: 'error' });
-        }
-      } catch (error: any) {
-        enqueueSnackbar(extractErrorMessage(error, 'Problem sending entity list'), { variant: 'error' });
-      }
-      setInitialMask(deviceEntities);
-    }
-  };
-
   const renderDeviceData = () => {
-    if (devices?.devices.length === 0 || !deviceEntities) {
+    if (devices?.devices.length === 0 || deviceEntities[0].id === '') {
       return;
     }
 
-    const setMask = (de: DeviceEntity, newMask: string[]) => {
-      var new_mask = 0;
-      for (let entry of newMask) {
-        new_mask |= Number(entry);
-      }
-      de.m = new_mask;
-      setMasks(newMask);
-    };
-
-    const getMask = (de: DeviceEntity) => {
-      var new_masks = [];
-      if ((de.m & 1) === 1 || de.n === '') {
-        new_masks.push('1');
-      }
-      if ((de.m & 2) === 2) {
-        new_masks.push('2');
-      }
-      if ((de.m & 4) === 4 && de.w) {
-        new_masks.push('4');
-      }
-      if ((de.m & 8) === 8) {
-        new_masks.push('8');
-      }
-
-      return new_masks;
-    };
+    const shown_data = deviceEntities.filter(
+      (de) => (de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase())
+    );
 
     return (
-      <Table size="small" padding="normal">
-        <TableHead>
-          <TableRow>
-            <StyledTableCell align="center">OPTIONS</StyledTableCell>
-            <StyledTableCell align="left">ENTITY NAME (CODE)</StyledTableCell>
-            <StyledTableCell align="right">VALUE</StyledTableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {deviceEntities.map((de) => (
-            <TableRow key={de.s} hover>
-              <StyledTableCell padding="none">
-                <ToggleButtonGroup
-                  size="small"
-                  color="secondary"
-                  value={getMask(de)}
-                  onChange={(event, mask) => {
-                    setMask(de, mask);
-                  }}
-                >
-                  <ToggleButton value="8" color="success" disabled={(de.m & 1) !== 0 || de.n === ''}>
-                    <FavoriteBorderOutlinedIcon sx={{ fontSize: 14 }} />
-                  </ToggleButton>
-                  <ToggleButton value="4" disabled={!de.w}>
-                    <EditOffOutlinedIcon sx={{ fontSize: 14 }} />
-                  </ToggleButton>
-                  <ToggleButton value="2">
-                    <CommentsDisabledOutlinedIcon sx={{ fontSize: 14 }} />
-                  </ToggleButton>
-                  <ToggleButton value="1">
-                    <VisibilityOffOutlinedIcon sx={{ fontSize: 14 }} />
-                  </ToggleButton>
-                </ToggleButtonGroup>
-              </StyledTableCell>
-              <StyledTableCell>
-                {de.n}&nbsp;({de.s})
-              </StyledTableCell>
-              <StyledTableCell align="right">{formatValue(de.v)}</StyledTableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-      </Table>
-    );
-  };
+      <>
+        <Grid container mb={1} mt={0} spacing={1} direction="row" justifyContent="flex-start" alignItems="center">
+          <Grid item>
+            <Typography variant="subtitle2" color="primary">
+              #:
+            </Typography>
+          </Grid>
+          <Grid item>
+            <Typography variant="subtitle2">
+              {shown_data.length}/{deviceEntities.length}
+            </Typography>
+          </Grid>
+          <Grid item>
+            <SearchIcon color="primary" sx={{ fontSize: 16, verticalAlign: 'middle' }} />:
+          </Grid>
+          <Grid item xs={2}>
+            <TextField
+              size="small"
+              variant="outlined"
+              onChange={(event) => {
+                setSearch(event.target.value);
+              }}
+            />
+          </Grid>
+          <Grid item>
+            <FilterListIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />:
+          </Grid>
+          <Grid item>
+            <ToggleButtonGroup
+              size="small"
+              color="secondary"
+              value={getMaskString(selectedFilters)}
+              onChange={(event, mask) => {
+                setSelectedFilters(getMaskNumber(mask));
+              }}
+            >
+              <ToggleButton value="8">
+                <Tooltip arrow placement="top" title="mark it as favorite to be listed at the top of the Dashboard">
+                  <StarIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
+              </ToggleButton>
+              <ToggleButton value="4">
+                <Tooltip arrow placement="top" title="make it read-only, only if it has write operation available">
+                  <EditOffOutlinedIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
+              </ToggleButton>
+              <ToggleButton value="2">
+                <Tooltip arrow placement="top" title="excluded it from MQTT and API outputs">
+                  <CommentsDisabledOutlinedIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
+              </ToggleButton>
+              <ToggleButton value="1">
+                <Tooltip arrow placement="top" title="hide it from the Dashboard">
+                  <VisibilityOffOutlinedIcon sx={{ fontSize: 14 }} />
+                </Tooltip>
+              </ToggleButton>
+            </ToggleButtonGroup>
+          </Grid>
 
-  const resetCustomization = async () => {
-    try {
-      await EMSESP.resetCustomizations();
-      enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' });
-    } catch (error: any) {
-      enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' });
-    } finally {
-      setConfirmReset(false);
-    }
+          <Grid item>
+            <CommentsDisabledOutlinedIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />
+            <VisibilityOffOutlinedIcon color="primary" sx={{ fontSize: 14, verticalAlign: 'middle' }} />:
+          </Grid>
+          <Grid item>
+            <Button
+              size="small"
+              sx={{ fontSize: 10 }}
+              variant="outlined"
+              color="inherit"
+              onClick={() => maskDisabled(false)}
+            >
+              enable
+            </Button>
+          </Grid>
+          <Grid item>
+            <Button
+              size="small"
+              sx={{ fontSize: 10 }}
+              variant="outlined"
+              color="inherit"
+              onClick={() => maskDisabled(true)}
+            >
+              disable
+            </Button>
+          </Grid>
+        </Grid>
+        <Table
+          data={{ nodes: shown_data }}
+          theme={entities_theme}
+          sort={entity_sort}
+          layout={{ custom: true, horizontalScroll: true }}
+        >
+          {(tableList: any) => (
+            <>
+              <Header>
+                <HeaderRow>
+                  <HeaderCell pinLeft>OPTIONS</HeaderCell>
+                  <HeaderCell resize>
+                    <Button
+                      fullWidth
+                      style={{ fontSize: '14px', justifyContent: 'flex-start' }}
+                      endIcon={getSortIcon(entity_sort.state, 'NAME')}
+                      onClick={() => entity_sort.fns.onToggleSort({ sortKey: 'NAME' })}
+                    >
+                      NAME
+                    </Button>
+                  </HeaderCell>
+                  <HeaderCell>VALUE</HeaderCell>
+                  <HeaderCell />
+                </HeaderRow>
+              </Header>
+              <Body>
+                {tableList.map((de: DeviceEntity) => (
+                  <Row key={de.id} item={de}>
+                    <Cell>
+                      <ToggleButtonGroup
+                        size="small"
+                        color="secondary"
+                        value={getMaskString(de.m)}
+                        onChange={(event, mask) => {
+                          de.m = getMaskNumber(mask);
+                          if (de.m & DeviceEntityMask.DV_WEB_EXCLUDE) {
+                            de.m = de.m & ~DeviceEntityMask.DV_FAVORITE;
+                          }
+                          setMasks(['']);
+                        }}
+                      >
+                        <ToggleButton value="8" disabled={(de.m & 1) !== 0 || de.id === ''}>
+                          <StarIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                        <ToggleButton value="4" disabled={!de.w || (de.m & 3) === 3}>
+                          <EditOffOutlinedIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                        <ToggleButton value="2">
+                          <CommentsDisabledOutlinedIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                        <ToggleButton value="1">
+                          <VisibilityOffOutlinedIcon sx={{ fontSize: 14 }} />
+                        </ToggleButton>
+                      </ToggleButtonGroup>
+                    </Cell>
+                    <Cell>
+                      {de.id}&nbsp;({de.s})
+                    </Cell>
+                    <Cell>{formatValue(de.v)}</Cell>
+                  </Row>
+                ))}
+              </Body>
+            </>
+          )}
+        </Table>
+      </>
+    );
   };
 
   const renderResetDialog = () => (
     <Dialog open={confirmReset} onClose={() => setConfirmReset(false)}>
       <DialogTitle>Reset</DialogTitle>
       <DialogContent dividers>
-        Are you sure you want remove all customizations? EMS-ESP will then restart.
+        Are you sure you want remove all customizations including the custom settings of the Temperature and Analog
+        sensors?
       </DialogContent>
       <DialogActions>
         <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setConfirmReset(false)} color="secondary">
diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
index dc73bbe5e..c78745e55 100644
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -38,38 +38,23 @@ export enum busConnectionStatus {
   BUS_STATUS_OFFLINE = 2
 }
 
+export interface Stat {
+  id: string; // name
+  s: number; // success
+  f: number;  // fail
+  q: number;  // quality
+}
 export interface Status {
   status: busConnectionStatus;
   tx_mode: number;
-  rx_received: number;
-  tx_reads: number;
-  tx_writes: number;
-  rx_quality: number;
-  tx_read_quality: number;
-  tx_write_quality: number;
-  tx_read_fails: number;
-  tx_write_fails: number;
-  rx_fails: number;
-  sensor_fails: number;
-  sensor_reads: number;
-  sensor_quality: number;
-  analog_fails: number;
-  analog_reads: number;
-  analog_quality: number;
-  mqtt_count: number;
-  mqtt_fails: number;
-  mqtt_quality: number;
-  api_calls: number;
-  api_fails: number;
-  api_quality: number;
+  uptime: number;
   num_devices: number;
   num_sensors: number;
   num_analogs: number;
-  uptime: number;
+  stats: Stat[];
 }
-
 export interface Device {
-  i: number; // id
+  id: string; // id index
   t: string; // type
   b: string; // brand
   n: string; // name
@@ -80,7 +65,7 @@ export interface Device {
 }
 
 export interface Sensor {
-  is: string; // id string
+  id: string; // id string
   n: string; // name/alias
   t?: number; // temp, optional
   o: number; // offset
@@ -88,9 +73,10 @@ export interface Sensor {
 }
 
 export interface Analog {
-  i: number;
+  id: string; // id string
+  g: number; // GPIO
   n: string;
-  v?: number;
+  v: number; // is optional
   u: number;
   o: number;
   f: number;
@@ -98,7 +84,7 @@ export interface Analog {
 }
 
 export interface WriteSensor {
-  id_str: string;
+  id: string;
   name: string;
   offset: number;
 }
@@ -126,11 +112,11 @@ export interface Devices {
 }
 
 export interface DeviceValue {
-  v?: any; // value, in any format
+  id: string; // index, contains mask+name
+  v: any; // value, in any format
   u: number; // uom
-  n: string; // name
-  c: string; // command
-  l: string[]; // list
+  c?: string; // command, optional
+  l?: string[]; // list, optional
   h?: string; // help text, optional
   s?: string; // steps for up/down, optional
   m?: string; // min, optional
@@ -143,8 +129,8 @@ export interface DeviceData {
 }
 
 export interface DeviceEntity {
-  v?: any; // value, in any format
-  n: string; // name
+  id: string; // name
+  v: any; // value, in any format
   s: string; // shortname
   m: number; // mask
   om?: number; // original mask before edits
@@ -277,7 +263,7 @@ export interface WriteValue {
 }
 
 export interface WriteAnalog {
-  id: number;
+  gpio: number;
   name: string;
   factor: number;
   offset: number;
diff --git a/interface/src/types/security.ts b/interface/src/types/security.ts
index 90db06a1e..472248b12 100644
--- a/interface/src/types/security.ts
+++ b/interface/src/types/security.ts
@@ -1,4 +1,5 @@
 export interface User {
+  id: string; // needed for Table
   username: string;
   password: string;
   admin: boolean;
diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h
index cdbd8d085..51f57461e 100644
--- a/lib/framework/SecuritySettingsService.h
+++ b/lib/framework/SecuritySettingsService.h
@@ -43,6 +43,7 @@ class SecuritySettings {
         JsonArray users = root.createNestedArray("users");
         for (User user : settings.users) {
             JsonObject userRoot  = users.createNestedObject();
+            userRoot["id"]       = user.username; // for React Table
             userRoot["username"] = user.username;
             userRoot["password"] = user.password;
             userRoot["admin"]    = user.admin;
diff --git a/mock-api/server.js b/mock-api/server.js
index 49e86fa46..898d644e0 100644
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -253,7 +253,7 @@ const UPLOAD_FIRMWARE_ENDPOINT = REST_ENDPOINT_ROOT + 'uploadFirmware'
 const SIGN_IN_ENDPOINT = REST_ENDPOINT_ROOT + 'signIn'
 const GENERATE_TOKEN_ENDPOINT = REST_ENDPOINT_ROOT + 'generateToken'
 const system_status = {
-  emsesp_version: '3.4.0demo',
+  emsesp_version: '3.4demo',
   esp_platform: 'ESP32',
   max_alloc_heap: 113792,
   psram_size: 0,
@@ -270,8 +270,8 @@ const system_status = {
 security_settings = {
   jwt_secret: 'naughty!',
   users: [
-    { username: 'admin', password: 'admin', admin: true },
-    { username: 'guest', password: 'guest', admin: false },
+    { id: 'admin', username: 'admin', password: 'admin', admin: true },
+    { id: 'guest', username: 'guest', password: 'guest', admin: false },
   ],
 }
 const features = {
@@ -362,11 +362,11 @@ const emsesp_devices = {
 }
 
 const emsesp_coredata = {
+  // devices: [],
   devices: [
     {
-      i: 2,
+      id: '2',
       t: 'Boiler',
-      s: 'Boiler',
       b: 'Nefit',
       n: 'GBx72/Trendline/Cerapur/Greenstar Si/27i',
       d: 8,
@@ -375,9 +375,8 @@ const emsesp_coredata = {
       e: 68,
     },
     {
-      i: 1,
+      id: '1',
       t: 'Thermostat',
-      s: 'Thermostat',
       b: '',
       n: 'RC20/Moduline 300',
       d: 23,
@@ -386,9 +385,8 @@ const emsesp_coredata = {
       e: 5,
     },
     {
-      i: 4,
+      id: '4',
       t: 'Thermostat',
-      s: 'Thermostat',
       b: 'Buderus',
       n: 'RC100/Moduline 1000/1010',
       d: 16,
@@ -403,49 +401,37 @@ const emsesp_coredata = {
 
 const emsesp_sensordata = {
   sensors: [
-    { is: '28-233D-9497-0C03', n: 'Dallas 1', t: 25.7, o: 1.2, u: 1 },
-    { is: '28-243D-7437-1E3A', n: 'Dallas 2 outside', t: 26.1, o: 0, u: 1 },
-    { is: '28-243E-7437-1E3B', n: 'Zolder', t: 27.1, o: 0, u: 16 },
-    { is: '28-183D-1892-0C33', n: 'Roof', o: 2, u: 1 },
+    { id: '28-233D-9497-0C03', n: 'Dallas 1', t: 25.7, o: 1.2, u: 1 },
+    { id: '28-243D-7437-1E3A', n: 'Dallas 2 outside', t: 26.1, o: 0, u: 1 },
+    { id: '28-243E-7437-1E3B', n: 'Zolder', t: 27.1, o: 0, u: 16 },
+    { id: '28-183D-1892-0C33', n: 'Roof', o: 2, u: 1 },
   ],
   // sensors: [],
   analogs: [
-    { i: 36, n: 'motor', u: 0, o: 17, f: 0, t: 0 },
-    { i: 37, n: 'External switch', v: 13, u: 0, o: 17, f: 0, t: 1 },
-    { i: 39, n: 'Pulse count', v: 144, u: 0, o: 0, f: 0, t: 2 },
-    { i: 40, n: 'Pressure', v: 16, u: 17, o: 0, f: 0, t: 3 },
+    { id: '1', g: 36, n: 'motor', v: 0, u: 0, o: 17, f: 0, t: 0 },
+    { id: '2', g: 37, n: 'External switch', v: 13, u: 0, o: 17, f: 0, t: 1 },
+    { id: '3', g: 39, n: 'Pulse count', v: 144, u: 0, o: 0, f: 0, t: 2 },
+    { id: '4', g: 40, n: 'Pressure', v: 16, u: 17, o: 0, f: 0, t: 3 },
   ],
   // analogs: [],
 }
 
 const status = {
-  analog_fails: 0,
-  analog_quality: 100,
-  analog_reads: 203,
-  api_calls: 4,
-  api_fails: 0,
-  api_quality: 100,
-  mqtt_count: 40243,
-  mqtt_fails: 0,
-  mqtt_quality: 100,
-  num_analogs: 1,
-  num_devices: 2,
-  num_sensors: 1,
-  rx_fails: 11,
-  rx_quality: 100,
-  rx_received: 56506,
-  sensor_fails: 0,
-  sensor_quality: 100,
-  sensor_reads: 15438,
   status: 0,
   tx_mode: 1,
-  tx_read_fails: 0,
-  tx_read_quality: 100,
-  tx_reads: 9026,
-  tx_write_fails: 2,
-  tx_write_quality: 95,
-  tx_writes: 33,
   uptime: 77186,
+  num_devices: 2,
+  num_sensors: 1,
+  num_analogs: 1,
+  stats: [
+    { id: 'EMS Telegrams Received (Rx)', s: 56506, f: 11, q: 100 },
+    { id: 'EMS Reads (Tx)', s: 9026, f: 0, q: 100 },
+    { id: 'EMS Writes (Tx)', s: 33, f: 2, q: 95 },
+    { id: 'Temperature Sensor Reads', s: 56506, f: 11, q: 100 },
+    { id: 'Analog Sensor Reads', s: 0, f: 0, q: 100 },
+    { id: 'MQTT Publishes', s: 12, f: 10, q: 20 },
+    { id: 'API Calls', s: 0, f: 0, q: 0 },
+  ],
 }
 
 // Dashboard data
@@ -455,31 +441,28 @@ const emsesp_devicedata_1 = {
     {
       v: '(0)',
       u: 0,
-      n: '00error code',
-      c: '',
+      id: '00error code',
     },
     {
       v: '14:54:39 06/06/2021',
       u: 0,
-      n: '00date/time',
-      c: '',
+      id: '00date/time',
     },
     {
       v: 18,
       u: 1,
-      n: '00hc1 selected room temperature',
+      id: '00hc1 selected room temperature',
       c: 'hc1/seltemp',
     },
     {
       v: 22.6,
       u: 1,
-      n: '00hc1 current room temperature',
-      c: '',
+      id: '00hc1 current room temperature',
     },
     {
       v: 'auto',
       u: 0,
-      n: '00hc1 mode',
+      id: '00hc1 mode',
       c: 'hc1/mode',
     },
   ],
@@ -488,81 +471,81 @@ const emsesp_devicedata_1 = {
 const emsesp_devicedata_2 = {
   label: 'Boiler: Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i',
   data: [
-    { u: 0, n: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] },
-    { v: 'false', u: 0, n: '08heating active' },
-    { v: 'false', u: 0, n: '04tapwater active' },
-    { v: 5, u: 1, n: '04selected flow temperature', c: 'selflowtemp' },
-    { v: 0, u: 3, n: '0Eburner selected max power', c: 'selburnpow' },
-    { v: 0, u: 3, n: '00heating pump modulation' },
-    { v: 53.4, u: 1, n: '00current flow temperature' },
-    { v: 52.7, u: 1, n: '00return temperature' },
-    { v: 1.3, u: 10, n: '00system pressure' },
-    { v: 54.9, u: 1, n: '00actual boiler temperature' },
-    { v: 'false', u: 0, n: '00gas' },
-    { v: 'false', u: 0, n: '00gas stage 2' },
-    { v: 0, u: 9, n: '00flame current' },
-    { v: 'false', u: 0, n: '00heating pump' },
-    { v: 'false', u: 0, n: '00fan' },
-    { v: 'false', u: 0, n: '00ignition' },
-    { v: 'false', u: 0, n: '00oil preheating' },
-    { v: 'true', u: 0, n: '00heating activated', c: 'heatingactivated', l: ['off', 'on'] },
-    { v: 80, u: 1, n: '00heating temperature', c: 'heatingtemp' },
-    { v: 70, u: 3, n: '00burner pump max power', c: 'pumpmodmax' },
-    { v: 30, u: 3, n: '00burner pump min power', c: 'pumpmodmin' },
-    { v: 1, u: 8, n: '00pump delay', c: 'pumpdelay' },
-    { v: 10, u: 8, n: '00burner min period', c: 'burnminperiod' },
-    { v: 0, u: 3, n: '00burner min power', c: 'burnminpower' },
-    { v: 50, u: 3, n: '00burner max power', c: 'burnmaxpower' },
-    { v: -6, u: 2, n: '00hysteresis on temperature', c: 'boilhyston' },
-    { v: 6, u: 2, n: '00hysteresis off temperature', c: 'boilhystoff' },
-    { v: 0, u: 1, n: '00set flow temperature' },
-    { v: 0, u: 3, n: '00burner set power' },
-    { v: 0, u: 3, n: '00burner current power' },
-    { v: 326323, u: 0, n: '00burner starts' },
-    { v: 553437, u: 8, n: '00total burner operating time' },
-    { v: 451286, u: 8, n: '00total heat operating time' },
-    { v: 4672173, u: 8, n: '00total UBA operating time' },
-    { v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, n: '00last error code' },
-    { v: '0H', u: 0, n: '00service code' },
-    { v: 203, u: 0, n: '00service code number' },
-    { v: 'H00', u: 0, n: '00maintenance message' },
-    { v: 'manual', u: 0, n: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
-    { v: 6000, u: 7, n: '00time to next maintenance', c: 'maintenancetime' },
-    { v: '01.01.2012', u: 0, n: '00next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' },
-    { v: 'true', u: 0, n: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
-    { v: 62, u: 1, n: '00dhw set temperature' },
-    { v: 60, u: 1, n: '00dhw selected temperature', c: 'wwseltemp' },
-    { v: 'flow', u: 0, n: '00dhw type' },
-    { v: 'hot', u: 0, n: '00dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] },
-    { v: 40, u: 2, n: '00dhw flow temperature offset', c: 'wwflowtempoffset' },
-    { v: 100, u: 3, n: '00dhw max power', c: 'wwmaxpower' },
-    { v: 'false', u: 0, n: '00dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] },
-    { v: '3-way valve', u: 0, n: '00dhw charging type' },
-    { v: -5, u: 2, n: '00dhw hysteresis on temperature', c: 'wwhyston' },
-    { v: 0, u: 2, n: '00dhw hysteresis off temperature', c: 'wwhystoff' },
-    { v: 70, u: 1, n: '00dhw disinfection temperature', c: 'wwdisinfectiontemp' },
+    { v: 0, u: 0, id: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] },
+    { v: 'false', u: 0, id: '08heating active' },
+    { v: 'false', u: 0, id: '04tapwater active' },
+    { v: 5, u: 1, id: '04selected flow temperature', c: 'selflowtemp' },
+    { v: 0, u: 3, id: '0Eburner selected max power', c: 'selburnpow' },
+    { v: 0, u: 3, id: '00heating pump modulation' },
+    { v: 53.4, u: 1, id: '00current flow temperature' },
+    { v: 52.7, u: 1, id: '00return temperature' },
+    { v: 1.3, u: 10, id: '00system pressure' },
+    { v: 54.9, u: 1, id: '00actual boiler temperature' },
+    { v: 'false', u: 0, id: '00gas' },
+    { v: 'false', u: 0, id: '00gas stage 2' },
+    { v: 0, u: 9, id: '00flame current' },
+    { v: 'false', u: 0, id: '00heating pump' },
+    { v: 'false', u: 0, id: '00fan' },
+    { v: 'false', u: 0, id: '00ignition' },
+    { v: 'false', u: 0, id: '00oil preheating' },
+    { v: 'true', u: 0, id: '00heating activated', c: 'heatingactivated', l: ['off', 'on'] },
+    { v: 80, u: 1, id: '00heating temperature', c: 'heatingtemp' },
+    { v: 70, u: 3, id: '00burner pump max power', c: 'pumpmodmax' },
+    { v: 30, u: 3, id: '00burner pump min power', c: 'pumpmodmin' },
+    { v: 1, u: 8, id: '00pump delay', c: 'pumpdelay' },
+    { v: 10, u: 8, id: '00burner min period', c: 'burnminperiod' },
+    { v: 0, u: 3, id: '00burner min power', c: 'burnminpower' },
+    { v: 50, u: 3, id: '00burner max power', c: 'burnmaxpower' },
+    { v: -6, u: 2, id: '00hysteresis on temperature', c: 'boilhyston' },
+    { v: 6, u: 2, id: '00hysteresis off temperature', c: 'boilhystoff' },
+    { v: 0, u: 1, id: '00set flow temperature' },
+    { v: 0, u: 3, id: '00burner set power' },
+    { v: 0, u: 3, id: '00burner current power' },
+    { v: 326323, u: 0, id: '00burner starts' },
+    { v: 553437, u: 8, id: '00total burner operating time' },
+    { v: 451286, u: 8, id: '00total heat operating time' },
+    { v: 4672173, u: 8, id: '00total UBA operating time' },
+    { v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, id: '00last error code' },
+    { v: '0H', u: 0, id: '00service code' },
+    { v: 203, u: 0, id: '00service code number' },
+    { v: 'H00', u: 0, id: '00maintenance message' },
+    { v: 'manual', u: 0, id: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
+    { v: 6000, u: 7, id: '00time to next maintenance', c: 'maintenancetime' },
+    { v: '01.01.2012', u: 0, id: '00next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' },
+    { v: 'true', u: 0, id: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
+    { v: 62, u: 1, id: '00dhw set temperature' },
+    { v: 60, u: 1, id: '00dhw selected temperature', c: 'wwseltemp' },
+    { v: 'flow', u: 0, id: '00dhw type' },
+    { v: 'hot', u: 0, id: '00dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] },
+    { v: 40, u: 2, id: '00dhw flow temperature offset', c: 'wwflowtempoffset' },
+    { v: 100, u: 3, id: '00dhw max power', c: 'wwmaxpower' },
+    { v: 'false', u: 0, id: '00dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] },
+    { v: '3-way valve', u: 0, id: '00dhw charging type' },
+    { v: -5, u: 2, id: '00dhw hysteresis on temperature', c: 'wwhyston' },
+    { v: 0, u: 2, id: '00dhw hysteresis off temperature', c: 'wwhystoff' },
+    { v: 70, u: 1, id: '00dhw disinfection temperature', c: 'wwdisinfectiontemp' },
     {
       v: 'off',
       u: 0,
-      n: '00dhw circulation pump mode',
+      id: '00dhw circulation pump mode',
       c: 'wwcircmode',
       l: ['off', '1x3min', '2x3min', '3x3min', '4x3min', '5x3min', '6x3min', 'continuous'],
     },
-    { v: 'false', u: 0, n: '00dhw circulation active', c: 'wwcirc', l: ['off', 'on'] },
-    { v: 47.3, u: 1, n: '00dhw current intern temperature' },
-    { v: 0, u: 4, n: '00dhw current tap water flow' },
-    { v: 47.3, u: 1, n: '00dhw storage intern temperature' },
-    { v: 'true', u: 0, n: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] },
-    { v: 'false', u: 0, n: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
-    { v: 'false', u: 0, n: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
-    { v: 'false', u: 0, n: '00dhw charging' },
-    { v: 'false', u: 0, n: '00dhw recharging' },
-    { v: 'true', u: 0, n: '00dhw temperature ok' },
-    { v: 'false', u: 0, n: '00dhw active' },
-    { v: 'true', u: 0, n: '00dhw 3way valve active' },
-    { v: 0, u: 3, n: '00dhw set pump power' },
-    { v: 288768, u: 0, n: '00dhw starts' },
-    { v: 102151, u: 8, n: '00dhw active time' },
+    { v: 'false', u: 0, id: '00dhw circulation active', c: 'wwcirc', l: ['off', 'on'] },
+    { v: 47.3, u: 1, id: '00dhw current intern temperature' },
+    { v: 0, u: 4, id: '00dhw current tap water flow' },
+    { v: 47.3, u: 1, id: '00dhw storage intern temperature' },
+    { v: 'true', u: 0, id: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] },
+    { v: 'false', u: 0, id: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
+    { v: 'false', u: 0, id: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
+    { v: 'false', u: 0, id: '00dhw charging' },
+    { v: 'false', u: 0, id: '00dhw recharging' },
+    { v: 'true', u: 0, id: '00dhw temperature ok' },
+    { v: 'false', u: 0, id: '00dhw active' },
+    { v: 'true', u: 0, id: '00dhw 3way valve active' },
+    { v: 0, u: 3, id: '00dhw set pump power' },
+    { v: 288768, u: 0, id: '00dhw starts' },
+    { v: 102151, u: 8, id: '00dhw active time' },
   ],
 }
 
@@ -572,19 +555,19 @@ const emsesp_devicedata_4 = {
     {
       v: 16,
       u: 1,
-      n: '00hc2 selected room temperature',
+      id: '08hc2 selected room temperature',
       c: 'hc2/seltemp',
     },
     {
       v: 18.6,
       u: 1,
-      n: '00hc2 current room temperature',
+      id: '02hc2 current room temperature',
       c: '',
     },
     {
       v: 'off',
       u: 0,
-      n: '00hc2 mode',
+      id: '02hc2 mode',
       c: 'hc2/mode',
     },
   ],
@@ -593,35 +576,35 @@ const emsesp_devicedata_4 = {
 const emsesp_deviceentities_1 = [
   {
     v: '(0)',
-    n: 'error code',
+    id: 'error code',
     s: 'errorcode',
     m: 0,
     w: false,
   },
   {
     v: '14:54:39 06/06/2021',
-    n: 'date/time',
+    id: 'date/time',
     s: 'datetime',
     m: 0,
     w: false,
   },
   {
     v: 18.2,
-    n: 'hc1 selected room temperature',
+    id: 'hc1 selected room temperature',
     s: 'hc1/seltemp',
     m: 0,
     w: true,
   },
   {
     v: 22.6,
-    n: 'hc1 current room temperature',
+    id: 'hc1 current room temperature',
     s: 'hc1/curtemp',
     m: 0,
     w: false,
   },
   {
     v: 'auto',
-    n: 'hc1 mode',
+    id: 'hc1 mode',
     s: 'hc1/mode',
     m: 0,
     w: true,
@@ -629,107 +612,107 @@ const emsesp_deviceentities_1 = [
 ]
 
 const emsesp_deviceentities_2 = [
-  { v: false, n: 'heating active', s: 'heatingactive', m: 0 },
-  { v: false, n: 'tapwater active', s: 'tapwateractive', m: 0 },
-  { v: 5, n: 'selected flow temperature', s: 'selflowtemp', m: 0 },
-  { v: 0, n: 'burner selected max power', s: 'selburnpow', m: 0 },
-  { v: 0, n: 'heating pump modulation', s: 'heatingpumpmod', m: 0 },
-  { n: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0 },
-  { n: 'outside temperature', s: 'outdoortemp', m: 0 },
-  { v: 53, n: 'current flow temperature', s: 'curflowtemp', m: 0 },
-  { v: 51.8, n: 'return temperature', s: 'rettemp', m: 0 },
-  { n: 'mixing switch temperature', s: 'switchtemp', m: 0 },
-  { v: 1.3, n: 'system pressure', s: 'syspress', m: 0 },
-  { v: 54.6, n: 'actual boiler temperature', s: 'boiltemp', m: 0 },
-  { n: 'exhaust temperature', s: 'exhausttemp', m: 0 },
-  { v: false, n: 'gas', s: 'burngas', m: 0 },
-  { v: false, n: 'gas stage 2', s: 'burngas2', m: 0 },
-  { v: 0, n: 'flame current', s: 'flamecurr', m: 0 },
-  { v: false, n: 'heating pump', s: 'heatingpump', m: 0 },
-  { v: false, n: 'fan', s: 'fanwork', m: 0 },
-  { v: false, n: 'ignition', s: 'ignwork', m: 0 },
-  { v: false, n: 'oil preheating', s: 'oilpreheat', m: 0 },
-  { v: true, n: 'heating activated', s: 'heatingactivated', m: 0 },
-  { v: 80, n: 'heating temperature', s: 'heatingtemp', m: 0 },
-  { v: 70, n: 'burner pump max power', s: 'pumpmodmax', m: 0 },
-  { v: 30, n: 'burner pump min power', s: 'pumpmodmin', m: 0 },
-  { v: 1, n: 'pump delay', s: 'pumpdelay', m: 0 },
-  { v: 10, n: 'burner min period', s: 'burnminperiod', m: 0 },
-  { v: 0, n: 'burner min power', s: 'burnminpower', m: 0 },
-  { v: 50, n: 'burner max power', s: 'burnmaxpower', m: 0 },
-  { v: -6, n: 'hysteresis on temperature', s: 'boilhyston', m: 0 },
-  { v: 6, n: 'hysteresis off temperature', s: 'boilhystoff', m: 0 },
-  { v: 0, n: 'set flow temperature', s: 'setflowtemp', m: 0 },
-  { v: 0, n: 'burner set power', s: 'setburnpow', m: 0 },
-  { v: 0, n: 'burner current power', s: 'curburnpow', m: 0 },
-  { v: 326323, n: 'burner starts', s: 'burnstarts', m: 0 },
-  { v: 553437, n: 'total burner operating time', s: 'burnworkmin', m: 0 },
-  { v: 451286, n: 'total heat operating time', s: 'heatworkmin', m: 0 },
-  { v: 4672175, n: 'total UBA operating time', s: 'ubauptime', m: 0 },
-  { v: '1C(210) 06.06.2020 12:07 (0 min)', n: 'last error code', s: 'lastcode', m: 0 },
-  { v: '0H', n: 'service code', s: 'servicecode', m: 0 },
-  { v: 203, n: 'service code number', s: 'servicecodenumber', m: 0 },
-  { v: 'H00', n: 'maintenance message', s: 'maintenancemessage', m: 0 },
-  { v: 'manual', n: 'maintenance scheduled', s: 'maintenance', m: 0 },
-  { v: 6000, n: 'time to next maintenance', s: 'maintenancetime', m: 0 },
-  { v: '01.01.2012', n: 'next maintenance date', s: 'maintenancedate', m: 0 },
-  { v: true, n: 'dhw turn on/off', s: 'wwtapactivated', m: 0 },
-  { v: 62, n: 'dhw set temperature', s: 'wwsettemp', m: 0 },
-  { v: 60, n: 'dhw selected temperature', s: 'wwseltemp', m: 0 },
-  { n: 'dhw selected lower temperature', s: 'wwseltemplow', m: 2 },
-  { n: 'dhw selected temperature for off', s: 'wwseltempoff', m: 2 },
-  { n: 'dhw single charge temperature', s: 'wwseltempsingle', m: 2 },
-  { v: 'flow', n: 'dhw type', s: 'wwtype', m: 0 },
-  { v: 'hot', n: 'dhw comfort', s: 'wwcomfort', m: 0 },
-  { v: 40, n: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0 },
-  { v: 100, n: 'dhw max power', s: 'wwmaxpower', m: 0 },
-  { v: false, n: 'dhw circulation pump available', s: 'wwcircpump', m: 0 },
-  { v: '3-way valve', n: 'dhw charging type', s: 'wwchargetype', m: 0 },
-  { v: -5, n: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0 },
-  { v: 0, n: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0 },
-  { v: 70, n: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0 },
-  { v: 'off', n: 'dhw circulation pump mode', s: 'wwcircmode', m: 0 },
-  { v: false, n: 'dhw circulation active', s: 'wwcirc', m: 0 },
-  { v: 46.4, n: 'dhw current intern temperature', s: 'wwcurtemp', m: 0 },
-  { n: 'dhw current extern temperature', s: 'wwcurtemp2', m: 2 },
-  { v: 0, n: 'dhw current tap water flow', s: 'wwcurflow', m: 0 },
-  { v: 46.3, n: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0 },
-  { n: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 2 },
-  { v: true, n: 'dhw activated', s: 'wwactivated', m: 0 },
-  { v: false, n: 'dhw one time charging', s: 'wwonetime', m: 0 },
-  { v: false, n: 'dhw disinfecting', s: 'wwdisinfecting', m: 0 },
-  { v: false, n: 'dhw charging', s: 'wwcharging', m: 0 },
-  { v: false, n: 'dhw recharging', s: 'wwrecharging', m: 0 },
-  { v: true, n: 'dhw temperature ok', s: 'wwtempok', m: 0 },
-  { v: false, n: 'dhw active', s: 'wwactive', m: 0 },
-  { v: true, n: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0 },
-  { v: 0, n: 'dhw set pump power', s: 'wwsetpumppower', m: 0 },
-  { n: 'dhw mixer temperature', s: 'wwmixertemp', m: 2 },
-  { n: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 2 },
-  { v: 288768, n: 'dhw starts', s: 'wwstarts', m: 0 },
-  { v: 102151, n: 'dhw active time', s: 'wwworkm', m: 0 },
+  { v: false, id: 'heating active', s: 'heatingactive', m: 0, w: false },
+  { v: false, id: 'tapwater active', s: 'tapwateractive', m: 0, w: false },
+  { v: 5, id: 'selected flow temperature', s: 'selflowtemp', m: 0, w: true },
+  { v: 0, id: 'burner selected max power', s: 'selburnpow', m: 0, w: true },
+  { v: 0, id: 'heating pump modulation', s: 'heatingpumpmod', m: 0, w: false },
+  { id: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0, w: false },
+  { id: 'outside temperature', s: 'outdoortemp', m: 0, w: false },
+  { v: 53, id: 'current flow temperature', s: 'curflowtemp', m: 0, w: false },
+  { v: 51.8, id: 'return temperature', s: 'rettemp', m: 0, w: false },
+  { id: 'mixing switch temperature', s: 'switchtemp', m: 0, w: false },
+  { v: 1.3, id: 'system pressure', s: 'syspress', m: 0, w: false },
+  { v: 54.6, id: 'actual boiler temperature', s: 'boiltemp', m: 0, w: false },
+  { id: 'exhaust temperature', s: 'exhausttemp', m: 0, w: false },
+  { v: false, id: 'gas', s: 'burngas', m: 0, w: false },
+  { v: false, id: 'gas stage 2', s: 'burngas2', m: 0, w: false },
+  { v: 0, id: 'flame current', s: 'flamecurr', m: 0, w: false },
+  { v: false, id: 'heating pump', s: 'heatingpump', m: 0, w: false },
+  { v: false, id: 'fan', s: 'fanwork', m: 0, w: false },
+  { v: false, id: 'ignition', s: 'ignwork', m: 0, w: false },
+  { v: false, id: 'oil preheating', s: 'oilpreheat', m: 0, w: false },
+  { v: true, id: 'heating activated', s: 'heatingactivated', m: 0, w: false },
+  { v: 80, id: 'heating temperature', s: 'heatingtemp', m: 0, w: false },
+  { v: 70, id: 'burner pump max power', s: 'pumpmodmax', m: 0, w: false },
+  { v: 30, id: 'burner pump min power', s: 'pumpmodmin', m: 0, w: false },
+  { v: 1, id: 'pump delay', s: 'pumpdelay', m: 0, w: false },
+  { v: 10, id: 'burner min period', s: 'burnminperiod', m: 0, w: false },
+  { v: 0, id: 'burner min power', s: 'burnminpower', m: 0, w: false },
+  { v: 50, id: 'burner max power', s: 'burnmaxpower', m: 0, w: false },
+  { v: -6, id: 'hysteresis on temperature', s: 'boilhyston', m: 0, w: false },
+  { v: 6, id: 'hysteresis off temperature', s: 'boilhystoff', m: 0, w: false },
+  { v: 0, id: 'set flow temperature', s: 'setflowtemp', m: 0, w: true },
+  { v: 0, id: 'burner set power', s: 'setburnpow', m: 0, w: false },
+  { v: 0, id: 'burner current power', s: 'curburnpow', m: 0, w: false },
+  { v: 326323, id: 'burner starts', s: 'burnstarts', m: 0, w: false },
+  { v: 553437, id: 'total burner operating time', s: 'burnworkmin', m: 0, w: false },
+  { v: 451286, id: 'total heat operating time', s: 'heatworkmin', m: 0, w: false },
+  { v: 4672175, id: 'total UBA operating time', s: 'ubauptime', m: 0, w: false },
+  { v: '1C(210) 06.06.2020 12:07 (0 min)', id: 'last error code', s: 'lastcode', m: 0, w: false },
+  { v: '0H', id: 'service code', s: 'servicecode', m: 0, w: false },
+  { v: 203, id: 'service code number', s: 'servicecodenumber', m: 0, w: false },
+  { v: 'H00', id: 'maintenance message', s: 'maintenancemessage', m: 0, w: false },
+  { v: 'manual', id: 'maintenance scheduled', s: 'maintenance', m: 0, w: false },
+  { v: 6000, id: 'time to next maintenance', s: 'maintenancetime', m: 0, w: false },
+  { v: '01.01.2012', id: 'next maintenance date', s: 'maintenancedate', m: 0, w: false },
+  { v: true, id: 'dhw turn on/off', s: 'wwtapactivated', m: 0, w: false },
+  { v: 62, id: 'dhw set temperature', s: 'wwsettemp', m: 0, w: false },
+  { v: 60, id: 'dhw selected temperature', s: 'wwseltemp', m: 0, w: true },
+  { id: 'dhw selected lower temperature', s: 'wwseltemplow', m: 2 },
+  { id: 'dhw selected temperature for off', s: 'wwseltempoff', m: 2 },
+  { id: 'dhw single charge temperature', s: 'wwseltempsingle', m: 2 },
+  { v: 'flow', id: 'dhw type', s: 'wwtype', m: 0, w: false },
+  { v: 'hot', id: 'dhw comfort', s: 'wwcomfort', m: 0, w: false },
+  { v: 40, id: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0, w: false },
+  { v: 100, id: 'dhw max power', s: 'wwmaxpower', m: 0, w: false },
+  { v: false, id: 'dhw circulation pump available', s: 'wwcircpump', m: 0, w: false },
+  { v: '3-way valve', id: 'dhw charging type', s: 'wwchargetype', m: 0, w: false },
+  { v: -5, id: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0, w: false },
+  { v: 0, id: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0, w: false },
+  { v: 70, id: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0, w: false },
+  { v: 'off', id: 'dhw circulation pump mode', s: 'wwcircmode', m: 0, w: false },
+  { v: false, id: 'dhw circulation active', s: 'wwcirc', m: 0, w: false },
+  { v: 46.4, id: 'dhw current intern temperature', s: 'wwcurtemp', m: 0, w: false },
+  { id: 'dhw current extern temperature', s: 'wwcurtemp2', m: 2 },
+  { v: 0, id: 'dhw current tap water flow', s: 'wwcurflow', m: 0, w: false },
+  { v: 46.3, id: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0, w: false },
+  { id: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 2 },
+  { v: true, id: 'dhw activated', s: 'wwactivated', m: 0, w: false },
+  { v: false, id: 'dhw one time charging', s: 'wwonetime', m: 0, w: false },
+  { v: false, id: 'dhw disinfecting', s: 'wwdisinfecting', m: 0, w: false },
+  { v: false, id: 'dhw charging', s: 'wwcharging', m: 0, w: false },
+  { v: false, id: 'dhw recharging', s: 'wwrecharging', m: 0, w: false },
+  { v: true, id: 'dhw temperature ok', s: 'wwtempok', m: 0, w: false },
+  { v: false, id: 'dhw active', s: 'wwactive', m: 0, w: false },
+  { v: true, id: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0, w: false },
+  { v: 0, id: 'dhw set pump power', s: 'wwsetpumppower', m: 0, w: true },
+  { id: 'dhw mixer temperature', s: 'wwmixertemp', m: 2 },
+  { id: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 2 },
+  { v: 288768, id: 'dhw starts', s: 'wwstarts', m: 0, w: false },
+  { v: 102151, id: 'dhw active time', s: 'wwworkm', m: 0, w: false },
 ]
 
 const emsesp_deviceentities_4 = [
   {
     v: 16,
-    n: 'hc2 selected room temperature',
+    id: 'hc2 selected room temperature',
     s: 'hc2/seltemp',
-    m: 0,
+    m: 8,
     w: true,
   },
   {
     v: 18.5,
-    n: 'hc2 current room temperature',
+    id: 'hc2 current room temperature',
     s: 'hc2/curtemp',
-    m: 3,
+    m: 2,
     w: false,
   },
   {
     v: 'off',
-    n: 'hc2 mode',
+    id: 'hc2 mode',
     s: 'hc2/mode',
-    m: 3,
+    m: 2,
     w: true,
   },
 ]
@@ -870,9 +853,11 @@ rest_server.post(EMSESP_SETTINGS_ENDPOINT, (req, res) => {
   // res.status(200).json(settings); // no restart needed
 })
 rest_server.get(EMSESP_CORE_DATA_ENDPOINT, (req, res) => {
+  console.log('send back core data...')
   res.json(emsesp_coredata)
 })
 rest_server.get(EMSESP_SENSOR_DATA_ENDPOINT, (req, res) => {
+  console.log('send back sensor data...')
   res.json(emsesp_sensordata)
 })
 rest_server.get(EMSESP_DEVICES_ENDPOINT, (req, res) => {
@@ -887,6 +872,7 @@ rest_server.get(EMSESP_STATUS_ENDPOINT, (req, res) => {
 })
 rest_server.post(EMSESP_DEVICEDATA_ENDPOINT, (req, res) => {
   const id = req.body.id
+  console.log('send back device data for ' + id)
   if (id === 1) {
     const encoded = msgpack.encode(emsesp_devicedata_1)
     res.write(encoded, 'binary')
@@ -930,15 +916,15 @@ function updateMask(entity, de, dd) {
   objIndex = de.findIndex((obj) => obj.s == name)
   if (objIndex !== -1) {
     de[objIndex].m = new_mask
-    const fullname = de[objIndex].n
-    objIndex = dd.data.findIndex((obj) => obj.n.slice(2) == fullname)
+    const fullname = de[objIndex].id
+    objIndex = dd.data.findIndex((obj) => obj.id.slice(2) == fullname)
     if (objIndex !== -1) {
       // see if the mask has changed
-      const old_mask = parseInt(dd.data[objIndex].n.slice(0, 2), 16)
+      const old_mask = parseInt(dd.data[objIndex].id.slice(0, 2), 16)
       if (old_mask !== new_mask) {
         const mask_hex = entity.slice(0, 2)
-        console.log('Updating ' + dd.data[objIndex].n + ' -> ' + mask_hex + fullname)
-        dd.data[objIndex].n = mask_hex + fullname
+        console.log('Updating ' + dd.data[objIndex].id + ' -> ' + mask_hex + fullname)
+        dd.data[objIndex].id = mask_hex + fullname
       }
     }
   } else {
@@ -948,6 +934,7 @@ function updateMask(entity, de, dd) {
 
 rest_server.post(EMSESP_MASKED_ENTITIES_ENDPOINT, (req, res) => {
   const id = req.body.id
+  console.log('customization id = ' + id)
   console.log(req.body.entity_ids)
   for (const entity of req.body.entity_ids) {
     if (id === 1) {
@@ -986,7 +973,7 @@ rest_server.post(EMSESP_WRITE_VALUE_ENDPOINT, (req, res) => {
 rest_server.post(EMSESP_WRITE_SENSOR_ENDPOINT, (req, res) => {
   const sensor = req.body
   console.log('Write sensor: ' + JSON.stringify(sensor))
-  objIndex = emsesp_sensordata.sensors.findIndex((obj) => obj.is == sensor.id_str)
+  objIndex = emsesp_sensordata.sensors.findIndex((obj) => obj.id == sensor.id)
   emsesp_sensordata.sensors[objIndex].n = sensor.name
   emsesp_sensordata.sensors[objIndex].o = sensor.offset
   res.sendStatus(200)
@@ -995,12 +982,13 @@ rest_server.post(EMSESP_WRITE_SENSOR_ENDPOINT, (req, res) => {
 rest_server.post(EMSESP_WRITE_ANALOG_ENDPOINT, (req, res) => {
   const analog = req.body
   console.log('Write analog: ' + JSON.stringify(analog))
-  objIndex = emsesp_sensordata.analogs.findIndex((obj) => obj.i == analog.id)
+  objIndex = emsesp_sensordata.analogs.findIndex((obj) => obj.i == analog.i)
 
   if (objIndex === -1) {
     console.log('new analog')
     emsesp_sensordata.analogs.push({
-      i: analog.id,
+      id: analog.i.toString(),
+      i: analog.i,
       n: analog.name,
       f: analog.factor,
       o: analog.offset,
@@ -1009,9 +997,10 @@ rest_server.post(EMSESP_WRITE_ANALOG_ENDPOINT, (req, res) => {
     })
   } else {
     if (analog.type === -1) {
-      console.log('removing analog ' + analog.id)
+      console.log('removing analog ' + analog.i)
       emsesp_sensordata.analogs[objIndex].t = -1
     } else {
+      console.log('updating analog ' + analog.i)
       emsesp_sensordata.analogs[objIndex].n = analog.name
       emsesp_sensordata.analogs[objIndex].o = analog.offset
       emsesp_sensordata.analogs[objIndex].f = analog.factor
diff --git a/platformio.ini b/platformio.ini
index 1effc65e3..2b4a1b130 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -61,10 +61,7 @@ extra_scripts =
   pre:scripts/build_interface.py
   scripts/rename_fw.py
 board = esp32dev
-platform = espressif32
-; platform_packages =
-;   toolchain-xtensa32@~2.80400.0
-;   framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git
+platform = espressif32@3.5.0
 board_build.partitions = esp32_partition_app1984k_spiffs64k.csv
 build_flags = ${common.build_flags}
 build_unflags = ${common.unbuild_flags}
diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
index 8c42fdd55..7a6856f53 100644
--- a/src/analogsensor.cpp
+++ b/src/analogsensor.cpp
@@ -69,7 +69,7 @@ void AnalogSensor::reload() {
             // update existing sensors
             bool found = false;
             for (const auto & sensor : settings.analogCustomizations) { //search customlist
-                if (sensor_.id() == sensor.id) {
+                if (sensor_.gpio() == sensor.gpio) {
                     // for output sensors set value to new start-value
                     if ((sensor.type == AnalogType::COUNTER || sensor.type >= AnalogType::DIGITAL_OUT)
                         && (sensor_.type() != sensor.type || sensor_.offset() != sensor.offset || sensor_.factor() != sensor.factor)) {
@@ -94,12 +94,12 @@ void AnalogSensor::reload() {
         for (const auto & sensor : settings.analogCustomizations) {
             bool found = false;
             for (const auto & sensor_ : sensors_) {
-                if (sensor_.id() == sensor.id) {
+                if (sensor_.gpio() == sensor.gpio) {
                     found = true;
                 }
             }
             if (!found) {
-                sensors_.emplace_back(sensor.id, sensor.name, sensor.offset, sensor.factor, sensor.uom, sensor.type);
+                sensors_.emplace_back(sensor.gpio, sensor.name, sensor.offset, sensor.factor, sensor.uom, sensor.type);
                 sensors_.back().ha_registered = false; // this will trigger recrate of the HA config
                 if (sensor.type == AnalogType::COUNTER || sensor.type >= AnalogType::DIGITAL_OUT) {
                     sensors_.back().set_value(sensor.offset);
@@ -112,64 +112,64 @@ void AnalogSensor::reload() {
     });
 
     // sort the list based on GPIO (id)
-    std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.id() < b.id(); });
+    // std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.id() < b.id(); });
 
     // activate each sensor
     for (auto & sensor : sensors_) {
         sensor.ha_registered = false; // force HA configs to be re-created
         if (sensor.type() == AnalogType::ADC) {
-            LOG_DEBUG(F("Adding analog ADC sensor on GPIO%d"), sensor.id());
+            LOG_DEBUG(F("Adding analog ADC sensor on GPIO%d"), sensor.gpio());
             // analogSetPinAttenuation does not work with analogReadMilliVolts
             sensor.analog_       = 0; // initialize
             sensor.last_reading_ = 0;
         } else if (sensor.type() == AnalogType::COUNTER) {
-            LOG_DEBUG(F("Adding analog I/O Counter sensor on GPIO%d"), sensor.id());
-            pinMode(sensor.id(), INPUT_PULLUP);
-            if (sensor.id() == 25 || sensor.id() == 26) {
-                dacWrite(sensor.id(), 255);
+            LOG_DEBUG(F("Adding analog I/O Counter sensor on GPIO%d"), sensor.gpio());
+            pinMode(sensor.gpio(), INPUT_PULLUP);
+            if (sensor.gpio() == 25 || sensor.gpio() == 26) {
+                dacWrite(sensor.gpio(), 255);
             }
             sensor.polltime_ = 0;
-            sensor.poll_     = digitalRead(sensor.id());
+            sensor.poll_     = digitalRead(sensor.gpio());
             publish_sensor(sensor);
         } else if (sensor.type() == AnalogType::TIMER || sensor.type() == AnalogType::RATE) {
-            LOG_DEBUG(F("Adding analog Timer/Rate sensor on GPIO%d"), sensor.id());
-            pinMode(sensor.id(), INPUT_PULLUP);
+            LOG_DEBUG(F("Adding analog Timer/Rate sensor on GPIO%d"), sensor.gpio());
+            pinMode(sensor.gpio(), INPUT_PULLUP);
             sensor.polltime_      = uuid::get_uptime();
             sensor.last_polltime_ = uuid::get_uptime();
-            sensor.poll_          = digitalRead(sensor.id());
+            sensor.poll_          = digitalRead(sensor.gpio());
             sensor.set_offset(0);
             sensor.set_value(0);
             publish_sensor(sensor);
         } else if (sensor.type() == AnalogType::DIGITAL_IN) {
-            LOG_DEBUG(F("Adding analog Read sensor on GPIO%d"), sensor.id());
-            pinMode(sensor.id(), INPUT_PULLUP);
-            sensor.set_value(digitalRead(sensor.id())); // initial value
-            sensor.set_uom(0);                          // no uom, just for safe measures
+            LOG_DEBUG(F("Adding analog Read sensor on GPIO%d"), sensor.gpio());
+            pinMode(sensor.gpio(), INPUT_PULLUP);
+            sensor.set_value(digitalRead(sensor.gpio())); // initial value
+            sensor.set_uom(0);                            // no uom, just for safe measures
             sensor.polltime_ = 0;
-            sensor.poll_     = digitalRead(sensor.id());
+            sensor.poll_     = digitalRead(sensor.gpio());
             publish_sensor(sensor);
         } else if (sensor.type() == AnalogType::DIGITAL_OUT) {
-            LOG_DEBUG(F("Adding analog Write sensor on GPIO%d"), sensor.id());
-            pinMode(sensor.id(), OUTPUT);
-            if (sensor.id() == 25 || sensor.id() == 26) {
+            LOG_DEBUG(F("Adding analog Write sensor on GPIO%d"), sensor.gpio());
+            pinMode(sensor.gpio(), OUTPUT);
+            if (sensor.gpio() == 25 || sensor.gpio() == 26) {
                 if (sensor.offset() > 255) {
                     sensor.set_offset(255);
                 } else if (sensor.offset() < 0) {
                     sensor.set_offset(0);
                 }
-                dacWrite(sensor.id(), sensor.offset());
+                dacWrite(sensor.gpio(), sensor.offset());
                 sensor.set_value(sensor.offset());
             } else {
-                digitalWrite(sensor.id(), sensor.offset() > 0 ? 1 : 0);
-                sensor.set_value(digitalRead(sensor.id()));
+                digitalWrite(sensor.gpio(), sensor.offset() > 0 ? 1 : 0);
+                sensor.set_value(digitalRead(sensor.gpio()));
             }
             sensor.set_uom(0); // no uom, just for safe measures
             publish_sensor(sensor);
         } else if (sensor.type() >= AnalogType::PWM_0) {
-            LOG_DEBUG(F("Adding PWM output sensor on GPIO%d"), sensor.id());
+            LOG_DEBUG(F("Adding PWM output sensor on GPIO%d"), sensor.gpio());
             uint channel = sensor.type() - AnalogType::PWM_0;
             ledcSetup(channel, sensor.factor(), 13);
-            ledcAttachPin(sensor.id(), channel);
+            ledcAttachPin(sensor.gpio(), channel);
             if (sensor.offset() > 100) {
                 sensor.set_offset(100);
             } else if (sensor.offset() < 0) {
@@ -193,8 +193,8 @@ void AnalogSensor::measure() {
         // go through the list of adc sensors
         for (auto & sensor : sensors_) {
             if (sensor.type() == AnalogType::ADC) {
-                uint16_t a = analogReadMilliVolts(sensor.id()); // e.g. ADC1_CHANNEL_0_GPIO_NUM
-                if (!sensor.analog_) {                          // init first time
+                uint16_t a = analogReadMilliVolts(sensor.gpio()); // e.g. ADC1_CHANNEL_0_GPIO_NUM
+                if (!sensor.analog_) {                            // init first time
                     sensor.analog_ = a;
                     sensor.sum_    = a * 512;
                 } else { // simple moving average filter
@@ -218,7 +218,7 @@ void AnalogSensor::measure() {
         if (sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::COUNTER || sensor.type() == AnalogType::TIMER
             || sensor.type() == AnalogType::RATE) {
             auto old_value       = sensor.value(); // remember current value before reading
-            auto current_reading = digitalRead(sensor.id());
+            auto current_reading = digitalRead(sensor.gpio());
             if (sensor.poll_ != current_reading) {     // check for pinchange
                 sensor.polltime_ = uuid::get_uptime(); // remember time of pinchange
                 sensor.poll_     = current_reading;
@@ -258,17 +258,17 @@ void AnalogSensor::loop() {
 }
 
 // update analog information name and offset
-bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, float factor, uint8_t uom, int8_t type) {
+bool AnalogSensor::update(uint8_t gpio, const std::string & name, float offset, float factor, uint8_t uom, int8_t type) {
     boolean found_sensor = false; // see if we can find the sensor in our customization list
 
     EMSESP::webCustomizationService.update(
         [&](WebCustomization & settings) {
             for (auto & AnalogCustomization : settings.analogCustomizations) {
-                if (AnalogCustomization.id == id) {
+                if (AnalogCustomization.gpio == gpio) {
                     found_sensor = true; // found the record
                     // see if it's marked for deletion
                     if (type == AnalogType::MARK_DELETED) {
-                        LOG_DEBUG(F("Removing analog sensor ID %d"), id);
+                        LOG_DEBUG(F("Removing analog sensor GPIO %d"), gpio);
                         settings.analogCustomizations.remove(AnalogCustomization);
                     } else {
                         // update existing record
@@ -277,7 +277,7 @@ bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, fl
                         AnalogCustomization.factor = factor;
                         AnalogCustomization.uom    = uom;
                         AnalogCustomization.type   = type;
-                        LOG_DEBUG(F("Customizing existing analog sensor ID %d"), id);
+                        LOG_DEBUG(F("Customizing existing analog GPIO %d"), gpio);
                     }
                     return StateUpdateResult::CHANGED; // persist the change
                 }
@@ -288,7 +288,7 @@ bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, fl
 
     // if the sensor exists and we're using HA, delete the old HA record
     if (found_sensor && Mqtt::ha_enabled()) {
-        remove_ha_topic(id); // id is the GPIO
+        remove_ha_topic(gpio); // the GPIO
     }
 
     // we didn't find it, it's new, so create and store it
@@ -296,14 +296,14 @@ bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, fl
         EMSESP::webCustomizationService.update(
             [&](WebCustomization & settings) {
                 auto newSensor   = AnalogCustomization();
-                newSensor.id     = id;
+                newSensor.gpio   = gpio;
                 newSensor.name   = name;
                 newSensor.offset = offset;
                 newSensor.factor = factor;
                 newSensor.uom    = uom;
                 newSensor.type   = type;
                 settings.analogCustomizations.push_back(newSensor);
-                LOG_DEBUG(F("Adding new customization for analog sensor ID %d"), id);
+                LOG_DEBUG(F("Adding new customization for analog sensor GPIO %d"), gpio);
                 return StateUpdateResult::CHANGED; // persist the change
             },
             "local");
@@ -339,15 +339,15 @@ void AnalogSensor::publish_sensor(const Sensor & sensor) const {
 }
 
 // send empty config topic to remove the entry from HA
-void AnalogSensor::remove_ha_topic(const uint8_t id) const {
+void AnalogSensor::remove_ha_topic(const uint8_t gpio) const {
     if (!Mqtt::ha_enabled()) {
         return;
     }
 #ifdef EMSESP_DEBUG
-    LOG_DEBUG(F("Removing HA config for analog sensor ID %d"), id);
+    LOG_DEBUG(F("Removing HA config for analog sensor GPIO %d"), gpio);
 #endif
     char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
-    snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), id);
+    snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), gpio);
     Mqtt::publish_ha(topic);
 }
 
@@ -372,7 +372,7 @@ void AnalogSensor::publish_values(const bool force) {
             if (Mqtt::is_nested() || Mqtt::ha_enabled()) {
                 // nested
                 char       s[10];
-                JsonObject dataSensor = doc.createNestedObject(Helpers::smallitoa(s, sensor.id()));
+                JsonObject dataSensor = doc.createNestedObject(Helpers::smallitoa(s, sensor.gpio()));
                 dataSensor["name"]    = sensor.name();
                 switch (sensor.type()) {
                 case AnalogType::COUNTER:
@@ -391,7 +391,7 @@ void AnalogSensor::publish_values(const bool force) {
 
                 // create HA config
                 if (Mqtt::ha_enabled() && (!sensor.ha_registered || force)) {
-                    LOG_DEBUG(F("Recreating HA config for analog sensor ID %d"), sensor.id());
+                    LOG_DEBUG(F("Recreating HA config for analog sensor GPIO %d"), sensor.gpio());
 
                     StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> config;
 
@@ -400,13 +400,13 @@ void AnalogSensor::publish_values(const bool force) {
                     config["stat_t"] = stat_t;
 
                     char str[50];
-                    snprintf(str, sizeof(str), "{{value_json['%d'].value}}", sensor.id());
+                    snprintf(str, sizeof(str), "{{value_json['%d'].value}}", sensor.gpio());
                     config["val_tpl"] = str;
 
                     snprintf(str, sizeof(str), "Analog Sensor %s", sensor.name().c_str());
                     config["name"] = str;
 
-                    snprintf(str, sizeof(str), "analogsensor_%d", sensor.id());
+                    snprintf(str, sizeof(str), "analogsensor_%d", sensor.gpio());
                     config["uniq_id"] = str;
 
                     JsonObject dev = config.createNestedObject("dev");
@@ -414,7 +414,7 @@ void AnalogSensor::publish_values(const bool force) {
                     ids.add("ems-esp");
 
                     char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
-                    snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), sensor.id());
+                    snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), sensor.gpio());
 
                     Mqtt::publish_ha(topic, config.as<JsonObject>());
 
@@ -437,7 +437,7 @@ void AnalogSensor::publish_values(const bool force) {
 bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) const {
     for (const auto & sensor : sensors_) {
         if (strcmp(cmd, sensor.name().c_str()) == 0) {
-            output["id"]     = sensor.id();
+            output["gpio"]   = sensor.gpio();
             output["name"]   = sensor.name();
             output["type"]   = sensor.type();
             output["uom"]    = sensor.uom();
@@ -460,7 +460,7 @@ bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject
     for (const auto & sensor : sensors_) {
         if (id == -1) { // show number and id
             JsonObject dataSensor = output.createNestedObject(sensor.name());
-            dataSensor["id"]      = sensor.id();
+            dataSensor["gpio"]    = sensor.gpio();
             dataSensor["type"]    = FL_(enum_sensortype)[sensor.type()];
             if (sensor.type() == AnalogType::ADC) {
                 dataSensor["uom"]    = EMSdevice::uom_to_string(sensor.uom());
@@ -486,8 +486,8 @@ bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject
 }
 
 // this creates the sensor, initializing everything
-AnalogSensor::Sensor::Sensor(const uint8_t id, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type)
-    : id_(id)
+AnalogSensor::Sensor::Sensor(const uint8_t gpio, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type)
+    : gpio_(gpio)
     , name_(name)
     , offset_(offset)
     , factor_(factor)
@@ -500,20 +500,20 @@ AnalogSensor::Sensor::Sensor(const uint8_t id, const std::string & name, const f
 std::string AnalogSensor::Sensor::name() const {
     if (name_.empty()) {
         char name[50];
-        snprintf(name, sizeof(name), "Analog Sensor GPIO%d", id_);
+        snprintf(name, sizeof(name), "Analog Sensor GPIO%d", gpio_);
         return name;
     }
     return name_;
 }
 
 // set the counter value, id is gpio-no
-bool AnalogSensor::command_setvalue(const char * value, const int8_t id) {
+bool AnalogSensor::command_setvalue(const char * value, const int8_t gpio) {
     float val;
     if (!Helpers::value2float(value, val)) {
         return false;
     }
     for (auto & sensor : sensors_) {
-        if (sensor.id() == id) {
+        if (sensor.gpio() == gpio) {
             if (sensor.type() == AnalogType::COUNTER) {
                 if (val < 0 || value[0] == '+') { // sign corrects values
                     sensor.set_offset(sensor.value() + val);
@@ -529,18 +529,18 @@ bool AnalogSensor::command_setvalue(const char * value, const int8_t id) {
                 return true;
             } else if (sensor.type() == AnalogType::DIGITAL_OUT) {
                 uint8_t v = val;
-                if (sensor.id() == 25 || sensor.id() == 26) {
+                if (sensor.gpio() == 25 || sensor.gpio() == 26) {
                     sensor.set_offset(v);
                     sensor.set_value(v);
-                    pinMode(sensor.id(), OUTPUT);
-                    dacWrite(sensor.id(), sensor.offset());
+                    pinMode(sensor.gpio(), OUTPUT);
+                    dacWrite(sensor.gpio(), sensor.offset());
                     publish_sensor(sensor);
                     return true;
                 } else if (v == 0 || v == 1) {
                     sensor.set_offset(v);
                     sensor.set_value(v);
-                    pinMode(sensor.id(), OUTPUT);
-                    digitalWrite(sensor.id(), sensor.offset() > 0 ? 1 : 0);
+                    pinMode(sensor.gpio(), OUTPUT);
+                    digitalWrite(sensor.gpio(), sensor.offset() > 0 ? 1 : 0);
                     publish_sensor(sensor);
                     return true;
                 }
diff --git a/src/analogsensor.h b/src/analogsensor.h
index fc7f72ea6..3c10c11c8 100644
--- a/src/analogsensor.h
+++ b/src/analogsensor.h
@@ -36,7 +36,7 @@ class AnalogSensor {
   public:
     class Sensor {
       public:
-        Sensor(const uint8_t id, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type);
+        Sensor(const uint8_t gpio, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type);
         ~Sensor() = default;
 
         void set_offset(const float offset) {
@@ -48,8 +48,8 @@ class AnalogSensor {
             name_ = name;
         }
 
-        uint8_t id() const {
-            return id_;
+        uint8_t gpio() const {
+            return gpio_;
         }
 
         float value() const {
@@ -99,7 +99,7 @@ class AnalogSensor {
         uint32_t last_polltime_ = 0; // for timer
 
       private:
-        uint8_t     id_;
+        uint8_t     gpio_;
         std::string name_;
         float       offset_;
         float       factor_;
@@ -157,7 +157,7 @@ class AnalogSensor {
         return sensors_.size();
     }
 
-    bool update(uint8_t id, const std::string & name, float offset, float factor, uint8_t uom, int8_t type);
+    bool update(uint8_t gpio, const std::string & name, float offset, float factor, uint8_t uom, int8_t type);
     bool get_value_info(JsonObject & output, const char * cmd, const int8_t id) const;
 
 #ifdef EMSESP_DEBUG
@@ -171,7 +171,7 @@ class AnalogSensor {
     static uuid::log::Logger logger_;
 
     void remove_ha_topic(const uint8_t id) const;
-    bool command_setvalue(const char * value, const int8_t id);
+    bool command_setvalue(const char * value, const int8_t gpio);
     void measure();
     bool command_info(const char * value, const int8_t id, JsonObject & output) const;
     bool command_commands(const char * value, const int8_t id, JsonObject & output);
diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp
index 3d4be1a15..a66e070fd 100644
--- a/src/dallassensor.cpp
+++ b/src/dallassensor.cpp
@@ -149,7 +149,7 @@ void DallasSensor::loop() {
                             // check if we already have this sensor
                             bool found = false;
                             for (auto & sensor : sensors_) {
-                                if (sensor.id() == get_id(addr)) {
+                                if (sensor.internal_id() == get_id(addr)) {
                                     t += sensor.offset();
                                     if (t != sensor.temperature_c) {
                                         publish_sensor(sensor);
@@ -171,7 +171,7 @@ void DallasSensor::loop() {
                                 sensors_.back().apply_customization();
                                 publish_sensor(sensors_.back()); // call publish single
                                 // sort the sensors based on name
-                                std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.name() < b.name(); });
+                                // std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.name() < b.name(); });
                             }
                         } else {
                             sensorfails_++;
@@ -180,12 +180,12 @@ void DallasSensor::loop() {
 
                     default:
                         sensorfails_++;
-                        LOG_ERROR(F("Unknown dallas sensor %s"), Sensor(addr).id_str().c_str());
+                        LOG_ERROR(F("Unknown dallas sensor %s"), Sensor(addr).id().c_str());
                         break;
                     }
                 } else {
                     sensorfails_++;
-                    LOG_ERROR(F("Invalid dallas sensor %s"), Sensor(addr).id_str().c_str());
+                    LOG_ERROR(F("Invalid dallas sensor %s"), Sensor(addr).id().c_str());
                 }
             } else {
                 if (!parasite_) {
@@ -229,7 +229,7 @@ bool DallasSensor::temperature_convert_complete() {
 int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) {
 #ifndef EMSESP_STANDALONE
     if (!bus_.reset()) {
-        LOG_ERROR(F("Bus reset failed before reading scratchpad from %s"), Sensor(addr).id_str().c_str());
+        LOG_ERROR(F("Bus reset failed before reading scratchpad from %s"), Sensor(addr).id().c_str());
         return EMS_VALUE_SHORT_NOTSET;
     }
     YIELD;
@@ -241,7 +241,7 @@ int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) {
     YIELD;
 
     if (!bus_.reset()) {
-        LOG_ERROR(F("Bus reset failed after reading scratchpad from %s"), Sensor(addr).id_str().c_str());
+        LOG_ERROR(F("Bus reset failed after reading scratchpad from %s"), Sensor(addr).id().c_str());
         return EMS_VALUE_SHORT_NOTSET;
     }
     YIELD;
@@ -257,7 +257,7 @@ int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) {
                     scratchpad[6],
                     scratchpad[7],
                     scratchpad[8],
-                    Sensor(addr).id_str().c_str());
+                    Sensor(addr).id().c_str());
         return EMS_VALUE_SHORT_NOTSET;
     }
 
@@ -290,15 +290,15 @@ int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) {
 }
 
 // update dallas information name and offset
-bool DallasSensor::update(const std::string & id_str, const std::string & name, int16_t offset) {
+bool DallasSensor::update(const std::string & id, const std::string & name, int16_t offset) {
     // find the sensor
     for (auto & sensor : sensors_) {
-        if (sensor.id_str() == id_str) {
+        if (sensor.id() == id) {
             // found a match, update the sensor object
 
             // if HA is enabled then delete the old record
             if (Mqtt::ha_enabled()) {
-                remove_ha_topic(id_str);
+                remove_ha_topic(id);
             }
 
             sensor.set_name(name);
@@ -310,21 +310,21 @@ bool DallasSensor::update(const std::string & id_str, const std::string & name,
                     // look it up to see if it exists
                     bool found = false;
                     for (auto & SensorCustomization : settings.sensorCustomizations) {
-                        if (SensorCustomization.id_str == id_str) {
+                        if (SensorCustomization.id == id) {
                             SensorCustomization.name   = name;
                             SensorCustomization.offset = offset;
                             found                      = true;
-                            LOG_DEBUG(F("Customizing existing sensor ID %s"), id_str.c_str());
+                            LOG_DEBUG(F("Customizing existing sensor ID %s"), id.c_str());
                             break;
                         }
                     }
                     if (!found) {
                         SensorCustomization newSensor = SensorCustomization();
-                        newSensor.id_str              = id_str;
+                        newSensor.id                  = id;
                         newSensor.name                = name;
                         newSensor.offset              = offset;
                         settings.sensorCustomizations.push_back(newSensor);
-                        LOG_DEBUG(F("Adding new customization for sensor ID %s"), id_str.c_str());
+                        LOG_DEBUG(F("Adding new customization for sensor ID %s"), id.c_str());
                     }
                     sensor.ha_registered = false; // it's changed so we may need to recreate the HA config
                     return StateUpdateResult::CHANGED;
@@ -361,7 +361,7 @@ bool DallasSensor::command_info(const char * value, const int8_t id, JsonObject
     for (const auto & sensor : sensors_) {
         if (id == -1) { // show number and id
             JsonObject dataSensor = output.createNestedObject(sensor.name());
-            dataSensor["id_str"]  = sensor.id_str();
+            dataSensor["id"]      = sensor.id();
             if (Helpers::hasValue(sensor.temperature_c)) {
                 dataSensor["temp"] = Helpers::round2((float)(sensor.temperature_c), 10, EMSESP::system_.fahrenheit() ? 2 : 0);
             }
@@ -377,8 +377,8 @@ bool DallasSensor::command_info(const char * value, const int8_t id, JsonObject
 bool DallasSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) {
     for (const auto & sensor : sensors_) {
         if (strcmp(cmd, sensor.name().c_str()) == 0) {
-            output["id_str"] = sensor.id_str();
-            output["name"]   = sensor.name();
+            output["id"]   = sensor.id();
+            output["name"] = sensor.name();
             if (Helpers::hasValue(sensor.temperature_c)) {
                 output["value"] = Helpers::round2((float)(sensor.temperature_c), 10, EMSESP::system_.fahrenheit() ? 2 : 0);
             }
@@ -408,15 +408,15 @@ void DallasSensor::publish_sensor(const Sensor & sensor) {
 }
 
 // send empty config topic to remove the entry from HA
-void DallasSensor::remove_ha_topic(const std::string & id_str) {
+void DallasSensor::remove_ha_topic(const std::string & id) {
     if (!Mqtt::ha_enabled()) {
         return;
     }
 #ifdef EMSESP_DEBUG
-    LOG_DEBUG(F("Removing HA config for temperature sensor ID %s"), id_str.c_str());
+    LOG_DEBUG(F("Removing HA config for temperature sensor ID %s"), id.c_str());
 #endif
     // use '_' as HA doesn't like '-' in the topic name
-    std::string sensorid = id_str;
+    std::string sensorid = id;
     std::replace(sensorid.begin(), sensorid.end(), '-', '_');
     char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
     snprintf(topic, sizeof(topic), "sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), sensorid.c_str());
@@ -442,7 +442,7 @@ void DallasSensor::publish_values(const bool force) {
     for (auto & sensor : sensors_) {
         bool has_value = Helpers::hasValue(sensor.temperature_c);
         if (Mqtt::is_nested() || Mqtt::ha_enabled()) {
-            JsonObject dataSensor = doc.createNestedObject(sensor.id_str());
+            JsonObject dataSensor = doc.createNestedObject(sensor.id());
             dataSensor["name"]    = sensor.name();
             if (has_value) {
                 dataSensor["temp"] = Helpers::round2((float)(sensor.temperature_c), 10, EMSESP::system_.fahrenheit() ? 2 : 0);
@@ -455,7 +455,7 @@ void DallasSensor::publish_values(const bool force) {
         // to e.g. homeassistant/sensor/ems-esp/dallassensor_28-233D-9497-0C03/config
         if (Mqtt::ha_enabled()) {
             if (!sensor.ha_registered || force) {
-                LOG_DEBUG(F("Recreating HA config for sensor ID %s"), sensor.id_str().c_str());
+                LOG_DEBUG(F("Recreating HA config for sensor ID %s"), sensor.id().c_str());
 
                 StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> config;
                 config["dev_cla"] = FJSON("temperature");
@@ -467,13 +467,13 @@ void DallasSensor::publish_values(const bool force) {
                 config["unit_of_meas"] = EMSdevice::uom_to_string(DeviceValueUOM::DEGREES);
 
                 char str[50];
-                snprintf(str, sizeof(str), "{{value_json['%s'].temp}}", sensor.id_str().c_str());
+                snprintf(str, sizeof(str), "{{value_json['%s'].temp}}", sensor.id().c_str());
                 config["val_tpl"] = str;
 
                 snprintf(str, sizeof(str), "Temperature Sensor %s", sensor.name().c_str());
                 config["name"] = str;
 
-                snprintf(str, sizeof(str), "dallasensor_%s", sensor.id_str().c_str());
+                snprintf(str, sizeof(str), "dallasensor_%s", sensor.id().c_str());
                 config["uniq_id"] = str;
 
                 JsonObject dev = config.createNestedObject("dev");
@@ -482,7 +482,7 @@ void DallasSensor::publish_values(const bool force) {
 
                 char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
                 // use '_' as HA doesn't like '-' in the topic name
-                std::string sensorid = sensor.id_str();
+                std::string sensorid = sensor.id();
                 std::replace(sensorid.begin(), sensorid.end(), '-', '_');
 
                 snprintf(topic, sizeof(topic), "sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), sensorid.c_str());
@@ -500,18 +500,18 @@ void DallasSensor::publish_values(const bool force) {
 
 // skip crc from id
 DallasSensor::Sensor::Sensor(const uint8_t addr[])
-    : id_(((uint64_t)addr[0] << 48) | ((uint64_t)addr[1] << 40) | ((uint64_t)addr[2] << 32) | ((uint64_t)addr[3] << 24) | ((uint64_t)addr[4] << 16)
-          | ((uint64_t)addr[5] << 8) | ((uint64_t)addr[6])) {
+    : internal_id_(((uint64_t)addr[0] << 48) | ((uint64_t)addr[1] << 40) | ((uint64_t)addr[2] << 32) | ((uint64_t)addr[3] << 24) | ((uint64_t)addr[4] << 16)
+                   | ((uint64_t)addr[5] << 8) | ((uint64_t)addr[6])) {
     // create ID string
-    char id[20];
-    snprintf(id,
-             sizeof(id),
+    char id_s[20];
+    snprintf(id_s,
+             sizeof(id_s),
              "%02X-%04X-%04X-%04X",
-             (unsigned int)(id_ >> 48) & 0xFF,
-             (unsigned int)(id_ >> 32) & 0xFFFF,
-             (unsigned int)(id_ >> 16) & 0xFFFF,
-             (unsigned int)(id_)&0xFFFF);
-    id_str_ = std::string(id);
+             (unsigned int)(internal_id_ >> 48) & 0xFF,
+             (unsigned int)(internal_id_ >> 32) & 0xFFFF,
+             (unsigned int)(internal_id_ >> 16) & 0xFFFF,
+             (unsigned int)(internal_id_)&0xFFFF);
+    id_     = std::string(id_s);
     name_   = std::string{}; // name (alias) is empty
     offset_ = 0;             // 0 degrees offset
 }
@@ -525,7 +525,7 @@ uint64_t DallasSensor::get_id(const uint8_t addr[]) {
 // if empty, return the ID as a string
 std::string DallasSensor::Sensor::name() const {
     if (name_.empty()) {
-        return id_str_;
+        return id_;
     }
     return name_;
 }
@@ -538,9 +538,9 @@ bool DallasSensor::Sensor::apply_customization() {
         if (!sensors.empty()) {
             for (const auto & sensor : sensors) {
 #if defined(EMSESP_DEBUG)
-                LOG_DEBUG(F("Loading customization for dallas sensor %s"), sensor.id_str.c_str());
+                LOG_DEBUG(F("Loading customization for dallas sensor %s"), sensor.id.c_str());
 #endif
-                if (id_str_ == sensor.id_str) {
+                if (id_ == sensor.id) {
                     set_name(sensor.name);
                     set_offset(sensor.offset);
                     return true;
diff --git a/src/dallassensor.h b/src/dallassensor.h
index c9567e32f..78bc9e29d 100644
--- a/src/dallassensor.h
+++ b/src/dallassensor.h
@@ -40,12 +40,12 @@ class DallasSensor {
         Sensor(const uint8_t addr[]);
         ~Sensor() = default;
 
-        uint64_t id() const {
-            return id_;
+        uint64_t internal_id() const {
+            return internal_id_;
         }
 
-        std::string id_str() const {
-            return id_str_;
+        std::string id() const {
+            return id_;
         }
 
         int16_t offset() const {
@@ -67,8 +67,8 @@ class DallasSensor {
         bool    ha_registered = false;
 
       private:
-        uint64_t    id_;
-        std::string id_str_;
+        uint64_t    internal_id_;
+        std::string id_;
         std::string name_;
         int16_t     offset_;
     };
@@ -109,7 +109,7 @@ class DallasSensor {
         return sensors_.size();
     }
 
-    bool update(const std::string & id_str, const std::string & name, int16_t offset);
+    bool update(const std::string & id, const std::string & name, int16_t offset);
 
 #ifdef EMSESP_DEBUG
     void test();
@@ -150,7 +150,7 @@ class DallasSensor {
     bool     temperature_convert_complete();
     int16_t  get_temperature_c(const uint8_t addr[]);
     uint64_t get_id(const uint8_t addr[]);
-    void     remove_ha_topic(const std::string & id_str);
+    void     remove_ha_topic(const std::string & id);
 
     bool command_info(const char * value, const int8_t id, JsonObject & output);
     bool command_commands(const char * value, const int8_t id, JsonObject & output);
diff --git a/src/devices/boiler.h b/src/devices/boiler.h
index 00d019898..71e71365c 100644
--- a/src/devices/boiler.h
+++ b/src/devices/boiler.h
@@ -193,7 +193,7 @@ class Boiler : public EMSdevice {
     // Pool unit
     int8_t poolSetTemp_;
 
-/*
+    /*
  * Hybrid heatpump with telegram 0xBB is readable and writeable in boiler and thermostat
  * thermostat always overwrites settings in boiler
  * enable settings here if no thermostat is used in system
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index ec265050d..f2dc222a4 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -346,7 +346,7 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
     heating_circuits_.push_back(new_hc);
 
     // sort based on hc number so there's a nice order when displaying
-    // TODO temporarily commented out the HC sorting until I'm 100% sure the return object still references the newly created object
+    // NOTE temporarily commented out the HC sorting until I'm 100% sure the return object still references the newly created object
     // not sure if new_hc and heating_circuits_.back() will still reference the new HC after its sorted - to check!
     // std::sort(heating_circuits_.begin(), heating_circuits_.end());
 
diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 4711ddcbf..fe52772a7 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -656,119 +656,118 @@ void EMSdevice::generate_values_web(JsonObject & output) {
     output["label"] = to_string_short();
     JsonArray data  = output.createNestedArray("data");
 
-    // do two passes. First for all entities marked as favorites, then for all others. This sorts the list.
-    for (int8_t fav = 1; fav >= 0; fav--) {
-        for (auto & dv : devicevalues_) {
-            // check conditions:
-            //  1. full_name cannot be empty
-            //  2. it must have a valid value, if it is not a command like 'reset'
-            //  3. show favorites first
-            bool show = (fav && dv.has_state(DeviceValueState::DV_FAVORITE)) || (!fav && !dv.has_state(DeviceValueState::DV_FAVORITE));
-            if (show && !dv.has_state(DeviceValueState::DV_WEB_EXCLUDE) && dv.full_name && (dv.hasValue() || (dv.type == DeviceValueType::CMD))) {
-                JsonObject obj        = data.createNestedObject(); // create the object, we know there is a value
-                uint8_t    fahrenheit = 0;
+    for (auto & dv : devicevalues_) {
+        // check conditions:
+        //  1. full_name cannot be empty
+        //  2. it must have a valid value, if it is not a command like 'reset'
+        //  3. show favorites first
+        if (!dv.has_state(DeviceValueState::DV_WEB_EXCLUDE) && dv.full_name && (dv.hasValue() || (dv.type == DeviceValueType::CMD))) {
+            JsonObject obj        = data.createNestedObject(); // create the object, we know there is a value
+            uint8_t    fahrenheit = 0;
 
-                // handle Booleans (true, false), use strings, no native true/false)
-                if (dv.type == DeviceValueType::BOOL) {
-                    bool value_b = (bool)*(uint8_t *)(dv.value_p);
-                    if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
-                        obj["v"] = value_b ? 1 : 0;
-                    } else {
-                        char s[7];
-                        obj["v"] = Helpers::render_boolean(s, value_b);
-                    }
-                }
-
-                // handle TEXT strings
-                else if (dv.type == DeviceValueType::STRING) {
-                    obj["v"] = (char *)(dv.value_p);
-                }
-
-                // handle ENUMs
-                else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) {
-                    obj["v"] = dv.options[*(uint8_t *)(dv.value_p)];
-                }
-
-                // handle numbers
-                else {
-                    // If a divider is specified, do the division to 2 decimals places and send back as double/float
-                    // otherwise force as an integer whole
-                    // the nested if's is necessary due to the way the ArduinoJson templates are pre-processed by the compiler
-                    int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0;
-                    fahrenheit = !EMSESP::system_.fahrenheit() ? 0 : (dv.uom == DeviceValueUOM::DEGREES) ? 2 : (dv.uom == DeviceValueUOM::DEGREES_R) ? 1 : 0;
-
-                    if ((dv.type == DeviceValueType::INT) && Helpers::hasValue(*(int8_t *)(dv.value_p))) {
-                        obj["v"] = Helpers::round2(*(int8_t *)(dv.value_p), divider, fahrenheit);
-                    } else if ((dv.type == DeviceValueType::UINT) && Helpers::hasValue(*(uint8_t *)(dv.value_p))) {
-                        obj["v"] = Helpers::round2(*(uint8_t *)(dv.value_p), divider, fahrenheit);
-                    } else if ((dv.type == DeviceValueType::SHORT) && Helpers::hasValue(*(int16_t *)(dv.value_p))) {
-                        obj["v"] = Helpers::round2(*(int16_t *)(dv.value_p), divider, fahrenheit);
-                    } else if ((dv.type == DeviceValueType::USHORT) && Helpers::hasValue(*(uint16_t *)(dv.value_p))) {
-                        obj["v"] = Helpers::round2(*(uint16_t *)(dv.value_p), divider, fahrenheit);
-                    } else if ((dv.type == DeviceValueType::ULONG) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) {
-                        obj["v"] = Helpers::round2(*(uint32_t *)(dv.value_p), divider, fahrenheit);
-                    } else if ((dv.type == DeviceValueType::TIME) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) {
-                        uint32_t time_value = *(uint32_t *)(dv.value_p);
-                        obj["v"]            = (divider > 0) ? time_value / divider : time_value; // sometimes we need to divide by 60
-                    }
-                }
-
-                // add the unit of measure (uom)
-                obj["u"] = fahrenheit ? (uint8_t)DeviceValueUOM::FAHRENHEIT : dv.uom;
-
-                auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string
-
-                // add name, prefixing the tag if it exists
-                if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) {
-                    obj["n"] = mask + read_flash_string(dv.full_name);
-                } else if (dv.tag < DeviceValueTAG::TAG_HC1) {
-                    obj["n"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name);
+            // handle Booleans (true, false), use strings, no native true/false)
+            if (dv.type == DeviceValueType::BOOL) {
+                bool value_b = (bool)*(uint8_t *)(dv.value_p);
+                if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
+                    obj["v"] = value_b ? 1 : 0;
                 } else {
-                    obj["n"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name);
+                    char s[7];
+                    obj["v"] = Helpers::render_boolean(s, value_b);
                 }
+            }
 
-                // add commands and options
-                if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) {
-                    // add the name of the Command function
-                    if (dv.tag >= DeviceValueTAG::TAG_HC1) {
-                        obj["c"] = tag_to_mqtt(dv.tag) + "/" + read_flash_string(dv.short_name);
-                    } else {
-                        obj["c"] = dv.short_name;
-                    }
-                    // add the Command options
-                    if (dv.type == DeviceValueType::ENUM || (dv.type == DeviceValueType::CMD && dv.options_size > 1)) {
-                        JsonArray l = obj.createNestedArray("l");
-                        for (uint8_t i = 0; i < dv.options_size; i++) {
-                            if (!read_flash_string(dv.options[i]).empty()) {
-                                l.add(read_flash_string(dv.options[i]));
-                            }
-                        }
-                    } else if (dv.type == DeviceValueType::BOOL) {
-                        JsonArray l = obj.createNestedArray("l");
-                        char      result[10];
-                        l.add(Helpers::render_boolean(result, false));
-                        l.add(Helpers::render_boolean(result, true));
-                    }
-                    // add command help template
-                    else if (dv.type == DeviceValueType::STRING || dv.type == DeviceValueType::CMD) {
-                        if (dv.options_size == 1) {
-                            obj["h"] = dv.options[0];
+            // handle TEXT strings
+            else if (dv.type == DeviceValueType::STRING) {
+                obj["v"] = (char *)(dv.value_p);
+            }
+
+            // handle ENUMs
+            else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) {
+                obj["v"] = dv.options[*(uint8_t *)(dv.value_p)];
+            }
+
+            // handle numbers
+            else {
+                // If a divider is specified, do the division to 2 decimals places and send back as double/float
+                // otherwise force as an integer whole
+                // the nested if's is necessary due to the way the ArduinoJson templates are pre-processed by the compiler
+                int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0;
+                fahrenheit     = !EMSESP::system_.fahrenheit() ? 0 : (dv.uom == DeviceValueUOM::DEGREES) ? 2 : (dv.uom == DeviceValueUOM::DEGREES_R) ? 1 : 0;
+
+                if ((dv.type == DeviceValueType::INT) && Helpers::hasValue(*(int8_t *)(dv.value_p))) {
+                    obj["v"] = Helpers::round2(*(int8_t *)(dv.value_p), divider, fahrenheit);
+                } else if ((dv.type == DeviceValueType::UINT) && Helpers::hasValue(*(uint8_t *)(dv.value_p))) {
+                    obj["v"] = Helpers::round2(*(uint8_t *)(dv.value_p), divider, fahrenheit);
+                } else if ((dv.type == DeviceValueType::SHORT) && Helpers::hasValue(*(int16_t *)(dv.value_p))) {
+                    obj["v"] = Helpers::round2(*(int16_t *)(dv.value_p), divider, fahrenheit);
+                } else if ((dv.type == DeviceValueType::USHORT) && Helpers::hasValue(*(uint16_t *)(dv.value_p))) {
+                    obj["v"] = Helpers::round2(*(uint16_t *)(dv.value_p), divider, fahrenheit);
+                } else if ((dv.type == DeviceValueType::ULONG) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) {
+                    obj["v"] = Helpers::round2(*(uint32_t *)(dv.value_p), divider, fahrenheit);
+                } else if ((dv.type == DeviceValueType::TIME) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) {
+                    uint32_t time_value = *(uint32_t *)(dv.value_p);
+                    obj["v"]            = (divider > 0) ? time_value / divider : time_value; // sometimes we need to divide by 60
+                } else {
+                    // must have a value for sorting to work
+                    obj["v"] = "";
+                }
+            }
+
+            // add the unit of measure (uom)
+            obj["u"] = fahrenheit ? (uint8_t)DeviceValueUOM::FAHRENHEIT : dv.uom;
+
+            auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string
+
+            // add name, prefixing the tag if it exists. This is the id used for the table sorting
+            if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) {
+                obj["id"] = mask + read_flash_string(dv.full_name);
+            } else if (dv.tag < DeviceValueTAG::TAG_HC1) {
+                obj["id"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name);
+            } else {
+                obj["id"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name);
+            }
+
+            // add commands and options
+            if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) {
+                // add the name of the Command function
+                if (dv.tag >= DeviceValueTAG::TAG_HC1) {
+                    obj["c"] = tag_to_mqtt(dv.tag) + "/" + read_flash_string(dv.short_name);
+                } else {
+                    obj["c"] = dv.short_name;
+                }
+                // add the Command options
+                if (dv.type == DeviceValueType::ENUM || (dv.type == DeviceValueType::CMD && dv.options_size > 1)) {
+                    JsonArray l = obj.createNestedArray("l");
+                    for (uint8_t i = 0; i < dv.options_size; i++) {
+                        if (!read_flash_string(dv.options[i]).empty()) {
+                            l.add(read_flash_string(dv.options[i]));
                         }
                     }
-                    // add steps to numeric values with divider/multiplier
-                    else {
-                        int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0;
-                        char   s[10];
-                        if (divider > 0) {
-                            obj["s"] = Helpers::render_value(s, (float)1 / divider, 1);
-                        } else if (divider < 0) {
-                            obj["s"] = Helpers::render_value(s, (-1) * divider, 0);
-                        }
-                        int16_t dv_set_min, dv_set_max;
-                        if (dv.get_min_max(dv_set_min, dv_set_max)) {
-                            obj["m"] = Helpers::render_value(s, dv_set_min, 0);
-                            obj["x"] = Helpers::render_value(s, dv_set_max, 0);
-                        }
+                } else if (dv.type == DeviceValueType::BOOL) {
+                    JsonArray l = obj.createNestedArray("l");
+                    char      result[10];
+                    l.add(Helpers::render_boolean(result, false));
+                    l.add(Helpers::render_boolean(result, true));
+                }
+                // add command help template
+                else if (dv.type == DeviceValueType::STRING || dv.type == DeviceValueType::CMD) {
+                    if (dv.options_size == 1) {
+                        obj["h"] = dv.options[0];
+                    }
+                }
+                // add steps to numeric values with divider/multiplier
+                else {
+                    int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0;
+                    char   s[10];
+                    if (divider > 0) {
+                        obj["s"] = Helpers::render_value(s, (float)1 / divider, 1);
+                    } else if (divider < 0) {
+                        obj["s"] = Helpers::render_value(s, (-1) * divider, 0);
+                    }
+                    int16_t dv_set_min, dv_set_max;
+                    if (dv.get_min_max(dv_set_min, dv_set_max)) {
+                        obj["m"] = Helpers::render_value(s, dv_set_min, 0);
+                        obj["x"] = Helpers::render_value(s, dv_set_max, 0);
                     }
                 }
             }
@@ -838,19 +837,22 @@ void EMSdevice::generate_values_web_all(JsonArray & output) {
                     obj["v"]            = (divider > 0) ? time_value / divider : time_value * factor; // sometimes we need to divide by 60
                 }
             }
+        } else {
+            // must always have v for sorting to work in web
+            obj["v"] = "";
         }
 
-        // add name, prefixing the tag if it exists
+        // add name, prefixing the tag if it exists as the id (key for table sorting)
         if (dv.full_name) {
             if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) {
-                obj["n"] = dv.full_name;
+                obj["id"] = dv.full_name;
             } else {
                 char name[50];
                 snprintf(name, sizeof(name), "%s %s", tag_to_string(dv.tag).c_str(), read_flash_string(dv.full_name).c_str());
-                obj["n"] = name;
+                obj["id"] = name;
             }
         } else {
-            obj["n"] = "";
+            obj["id"] = "";
         }
 
         // shortname
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index f2e8e93b8..4e37ee919 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -432,12 +432,12 @@ void EMSESP::show_sensor_values(uuid::console::Shell & shell) {
                                (fahrenheit == 0) ? 'C' : 'F',
                                COLOR_RESET,
                                Helpers::render_value(s2, sensor.offset(), 10, fahrenheit),
-                               sensor.id_str().c_str());
+                               sensor.id().c_str());
             } else {
                 shell.printfln(F("  %s (offset %s, ID: %s)"),
                                sensor.name().c_str(),
                                Helpers::render_value(s, sensor.offset(), 10, fahrenheit),
-                               sensor.id_str().c_str());
+                               sensor.id().c_str());
             }
         }
         shell.println();
diff --git a/src/system.cpp b/src/system.cpp
index f2063415f..4eaa88ec0 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1036,7 +1036,7 @@ bool System::command_customizations(const char * value, const int8_t id, JsonObj
         JsonArray sensorsJson = node.createNestedArray("sensors");
         for (const auto & sensor : settings.sensorCustomizations) {
             JsonObject sensorJson = sensorsJson.createNestedObject();
-            sensorJson["id_str"]  = sensor.id_str; // key, is
+            sensorJson["id"]      = sensor.id;     // key
             sensorJson["name"]    = sensor.name;   // n
             sensorJson["offset"]  = sensor.offset; // o
         }
@@ -1044,7 +1044,7 @@ bool System::command_customizations(const char * value, const int8_t id, JsonObj
         JsonArray analogJson = node.createNestedArray("analogs");
         for (const AnalogCustomization & sensor : settings.analogCustomizations) {
             JsonObject sensorJson = analogJson.createNestedObject();
-            sensorJson["gpio"]    = sensor.id;
+            sensorJson["gpio"]    = sensor.gpio;
             sensorJson["name"]    = sensor.name;
             if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX) {
                 sensorJson["type"] = sensor.type;
diff --git a/src/test/test.cpp b/src/test/test.cpp
index 52e546ce4..029636c9f 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -550,6 +550,11 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "dallas") {
         shell.printfln(F("Testing adding Dallas sensor"));
+        emsesp::EMSESP::dallassensor_.test();
+    }
+
+    if (command == "dallas_full") {
+        shell.printfln(F("Testing adding and changing Dallas sensor"));
         Mqtt::ha_enabled(true);
         Mqtt::nested_format(1);
         // Mqtt::nested_format(0);
diff --git a/src/version.h b/src/version.h
index 16885163f..2c5e4afad 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.4.0b12"
+#define EMSESP_APP_VERSION "3.4.0b12t4"
diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp
index 3b01c0291..2634030fd 100644
--- a/src/web/WebCustomizationService.cpp
+++ b/src/web/WebCustomizationService.cpp
@@ -61,7 +61,7 @@ void WebCustomization::read(WebCustomization & settings, JsonObject & root) {
     JsonArray sensorsJson = root.createNestedArray("sensors");
     for (const SensorCustomization & sensor : settings.sensorCustomizations) {
         JsonObject sensorJson = sensorsJson.createNestedObject();
-        sensorJson["id_str"]  = sensor.id_str; // is
+        sensorJson["id"]      = sensor.id;     // is
         sensorJson["name"]    = sensor.name;   // n
         sensorJson["offset"]  = sensor.offset; // o
     }
@@ -70,7 +70,7 @@ void WebCustomization::read(WebCustomization & settings, JsonObject & root) {
     JsonArray analogJson = root.createNestedArray("analogs");
     for (const AnalogCustomization & sensor : settings.analogCustomizations) {
         JsonObject sensorJson = analogJson.createNestedObject();
-        sensorJson["id"]      = sensor.id;     // i
+        sensorJson["gpio"]    = sensor.gpio;   // g
         sensorJson["name"]    = sensor.name;   // n
         sensorJson["offset"]  = sensor.offset; // o
         sensorJson["factor"]  = sensor.factor; // f
@@ -101,7 +101,7 @@ StateUpdateResult WebCustomization::update(JsonObject & root, WebCustomization &
         for (const JsonObject sensorJson : root["sensors"].as<JsonArray>()) {
             // create each of the sensor, overwritting any previous settings
             auto sensor   = SensorCustomization();
-            sensor.id_str = sensorJson["id_str"].as<std::string>();
+            sensor.id     = sensorJson["id"].as<std::string>();
             sensor.name   = sensorJson["name"].as<std::string>();
             sensor.offset = sensorJson["offset"];
             settings.sensorCustomizations.push_back(sensor); // add to list
@@ -114,7 +114,7 @@ StateUpdateResult WebCustomization::update(JsonObject & root, WebCustomization &
         for (const JsonObject analogJson : root["analogs"].as<JsonArray>()) {
             // create each of the sensor, overwritting any previous settings
             auto sensor   = AnalogCustomization();
-            sensor.id     = analogJson["id"];
+            sensor.gpio   = analogJson["gpio"];
             sensor.name   = analogJson["name"].as<std::string>();
             sensor.offset = analogJson["offset"];
             sensor.factor = analogJson["factor"];
diff --git a/src/web/WebCustomizationService.h b/src/web/WebCustomizationService.h
index 526259dbe..d595c1f43 100644
--- a/src/web/WebCustomizationService.h
+++ b/src/web/WebCustomizationService.h
@@ -35,14 +35,14 @@ namespace emsesp {
 // Customization for dallas sensor
 class SensorCustomization {
   public:
-    std::string id_str;
+    std::string id;
     std::string name;
     uint16_t    offset;
 };
 
 class AnalogCustomization {
   public:
-    uint8_t     id;
+    uint8_t     gpio;
     std::string name;
     float       offset;
     float       factor;
@@ -51,7 +51,7 @@ class AnalogCustomization {
 
     // used for removing from a list
     bool operator==(const AnalogCustomization & a) const {
-        return id == a.id;
+        return gpio == a.gpio;
     }
     bool operator!=(const AnalogCustomization & a) const {
         return !operator==(a);
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index b4d61dc65..0d9347ce5 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -76,17 +76,18 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
     // list is already sorted by device type
     // Ignore Contoller
     JsonArray devices = root.createNestedArray("devices");
+    char      buffer[3];
     for (const auto & emsdevice : EMSESP::emsdevices) {
         if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::CONTROLLER || emsdevice->count_entities() > 0)) {
             JsonObject obj = devices.createNestedObject();
-            obj["i"]       = emsdevice->unique_id();        // a unique id
-            obj["t"]       = emsdevice->device_type_name(); // type
-            obj["b"]       = emsdevice->brand_to_string();  // brand
-            obj["n"]       = emsdevice->name();             // name
-            obj["d"]       = emsdevice->device_id();        // deviceid
-            obj["p"]       = emsdevice->product_id();       // productid
-            obj["v"]       = emsdevice->version();          // version
-            obj["e"]       = emsdevice->count_entities();   // number of entities (device values)
+            obj["id"]      = Helpers::smallitoa(buffer, emsdevice->unique_id()); // a unique id as a string
+            obj["t"]       = emsdevice->device_type_name();                      // type
+            obj["b"]       = emsdevice->brand_to_string();                       // brand
+            obj["n"]       = emsdevice->name();                                  // name
+            obj["d"]       = emsdevice->device_id();                             // deviceid
+            obj["p"]       = emsdevice->product_id();                            // productid
+            obj["v"]       = emsdevice->version();                               // version
+            obj["e"]       = emsdevice->count_entities();                        // number of entities (device values)
         }
     }
 
@@ -110,8 +111,8 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
     if (EMSESP::dallassensor_.have_sensors()) {
         for (const auto & sensor : EMSESP::dallassensor_.sensors()) {
             JsonObject obj = sensors.createNestedObject();
-            obj["is"]      = sensor.id_str(); // id
-            obj["n"]       = sensor.name();   // name
+            obj["id"]      = sensor.id();   // id as string
+            obj["n"]       = sensor.name(); // name
             if (EMSESP::system_.fahrenheit()) {
                 if (Helpers::hasValue(sensor.temperature_c)) {
                     obj["t"] = (float)sensor.temperature_c * 0.18 + 32;
@@ -129,14 +130,16 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
     }
 
     // analog sensors
-    // assume list is already sorted by id
     JsonArray analogs = root.createNestedArray("analogs");
     if (EMSESP::analog_enabled() && EMSESP::analogsensor_.have_sensors()) {
+        uint8_t count = 0;
+        char    buffer[3];
         for (const auto & sensor : EMSESP::analogsensor_.sensors()) {
             // don't send if it's marked for removal
             if (sensor.type() != AnalogSensor::AnalogType::MARK_DELETED) {
                 JsonObject obj = analogs.createNestedObject();
-                obj["i"]       = sensor.id();
+                obj["id"]      = Helpers::smallitoa(buffer, ++count); // needed for sorting table
+                obj["g"]       = sensor.gpio();
                 obj["n"]       = sensor.name();
                 obj["u"]       = sensor.uom();
                 obj["o"]       = sensor.offset();
@@ -145,6 +148,8 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
 
                 if (sensor.type() != AnalogSensor::AnalogType::NOTUSED) {
                     obj["v"] = Helpers::round2(sensor.value(), 0); // is optional and is a float
+                } else {
+                    obj["v"] = 0; // must have a value for web sorting to work
                 }
             }
         }
@@ -170,6 +175,13 @@ void WebDataService::device_data(AsyncWebServerRequest * request, JsonVariant &
                 JsonObject output = response->getRoot();
                 emsdevice->generate_values_web(output);
 #endif
+
+                // #ifdef EMSESP_USE_SERIAL
+                // #ifdef EMSESP_DEBUG
+                //                 serializeJson(output, Serial);
+                // #endif
+                // #endif
+
                 response->setLength();
                 request->send(response);
                 return;
@@ -246,8 +258,8 @@ void WebDataService::write_sensor(AsyncWebServerRequest * request, JsonVariant &
     if (json.is<JsonObject>()) {
         JsonObject sensor = json;
 
-        std::string id_str = sensor["id_str"]; // this is the key
-        std::string name   = sensor["name"];
+        std::string id   = sensor["id"]; // this is the key
+        std::string name = sensor["name"];
 
         // calculate offset. We'll convert it to an int and * 10
         float   offset   = sensor["offset"];
@@ -255,7 +267,7 @@ void WebDataService::write_sensor(AsyncWebServerRequest * request, JsonVariant &
         if (EMSESP::system_.fahrenheit()) {
             offset10 = offset / 0.18;
         }
-        ok = EMSESP::dallassensor_.update(id_str, name, offset10);
+        ok = EMSESP::dallassensor_.update(id, name, offset10);
     }
 
     AsyncWebServerResponse * response = request->beginResponse(ok ? 200 : 204);
@@ -268,13 +280,13 @@ void WebDataService::write_analog(AsyncWebServerRequest * request, JsonVariant &
     if (json.is<JsonObject>()) {
         JsonObject analog = json;
 
-        uint8_t     id     = analog["id"]; // this is the unique key
+        uint8_t     gpio   = analog["gpio"]; // this is the unique key, the GPIO
         std::string name   = analog["name"];
         float       factor = analog["factor"];
         float       offset = analog["offset"];
         uint8_t     uom    = analog["uom"];
         int8_t      type   = analog["type"];
-        ok                 = EMSESP::analogsensor_.update(id, name, offset, factor, uom, type);
+        ok                 = EMSESP::analogsensor_.update(gpio, name, offset, factor, uom, type);
     }
 
     AsyncWebServerResponse * response = request->beginResponse(ok ? 200 : 204);
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index bb9dd3050..f4122656b 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -129,34 +129,57 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) {
     auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_MEDIUM_DYN);
     JsonObject root     = response->getRoot();
 
-    root["status"]           = EMSESP::bus_status();    // 0, 1 or 2
-    root["num_devices"]      = EMSESP::count_devices(); // excluding Controller
-    root["num_sensors"]      = EMSESP::dallassensor_.no_sensors();
-    root["num_analogs"]      = EMSESP::analogsensor_.no_sensors();
-    root["tx_mode"]          = EMSESP::txservice_.tx_mode();
-    root["rx_received"]      = EMSESP::rxservice_.telegram_count();
-    root["tx_reads"]         = EMSESP::txservice_.telegram_read_count();
-    root["tx_writes"]        = EMSESP::txservice_.telegram_write_count();
-    root["rx_quality"]       = EMSESP::rxservice_.quality();
-    root["tx_read_quality"]  = EMSESP::txservice_.read_quality();
-    root["tx_write_quality"] = EMSESP::txservice_.write_quality();
-    root["rx_fails"]         = EMSESP::rxservice_.telegram_error_count();
-    root["tx_read_fails"]    = EMSESP::txservice_.telegram_read_fail_count();
-    root["tx_write_fails"]   = EMSESP::txservice_.telegram_write_fail_count();
-    root["sensor_fails"]     = EMSESP::dallassensor_.fails();
-    root["sensor_reads"]     = EMSESP::dallassensor_.reads();
-    root["sensor_quality"] = EMSESP::dallassensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::dallassensor_.fails()) / EMSESP::dallassensor_.reads());
-    root["analog_fails"]   = EMSESP::analogsensor_.fails();
-    root["analog_reads"]   = EMSESP::analogsensor_.reads();
-    root["analog_quality"] = EMSESP::analogsensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::analogsensor_.fails()) / EMSESP::analogsensor_.reads());
-    root["mqtt_fails"]     = Mqtt::publish_fails();
-    root["mqtt_count"]     = Mqtt::publish_count();
-    root["mqtt_quality"]   = Mqtt::publish_count() == 0 ? 100 : 100 - (Mqtt::publish_fails() * 100) / (Mqtt::publish_count() + Mqtt::publish_fails());
-    root["api_calls"]      = WebAPIService::api_count(); // + WebAPIService::api_fails();
-    root["api_fails"]      = WebAPIService::api_fails();
-    root["api_quality"] =
-        WebAPIService::api_count() == 0 ? 100 : 100 - (WebAPIService::api_fails() * 100) / (WebAPIService::api_count() + WebAPIService::api_fails());
-    root["uptime"] = EMSbus::bus_uptime();
+    root["status"]      = EMSESP::bus_status(); // 0, 1 or 2
+    root["tx_mode"]     = EMSESP::txservice_.tx_mode();
+    root["uptime"]      = EMSbus::bus_uptime();
+    root["num_devices"] = EMSESP::count_devices(); // excluding Controller
+    root["num_sensors"] = EMSESP::dallassensor_.no_sensors();
+    root["num_analogs"] = EMSESP::analogsensor_.no_sensors();
+
+    JsonArray  statsJson = root.createNestedArray("stats");
+    JsonObject statJson;
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "EMS Telegrams Received (Rx)";
+    statJson["s"]  = EMSESP::rxservice_.telegram_count();
+    statJson["f"]  = EMSESP::rxservice_.telegram_error_count();
+    statJson["q"]  = EMSESP::rxservice_.quality();
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "EMS Reads (Tx)";
+    statJson["s"]  = EMSESP::txservice_.telegram_read_count();
+    statJson["f"]  = EMSESP::txservice_.telegram_read_fail_count();
+    statJson["q"]  = EMSESP::txservice_.read_quality();
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "EMS Writes (Tx)";
+    statJson["s"]  = EMSESP::txservice_.telegram_write_count();
+    statJson["f"]  = EMSESP::txservice_.telegram_write_fail_count();
+    statJson["q"]  = EMSESP::txservice_.write_quality();
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "Temperature Sensor Reads";
+    statJson["s"]  = EMSESP::dallassensor_.reads();
+    statJson["f"]  = EMSESP::dallassensor_.fails();
+    statJson["q"]  = EMSESP::dallassensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::dallassensor_.fails()) / EMSESP::dallassensor_.reads());
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "Analog Sensor Reads";
+    statJson["s"]  = EMSESP::analogsensor_.reads();
+    statJson["f"]  = EMSESP::analogsensor_.fails();
+    statJson["q"]  = EMSESP::analogsensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::analogsensor_.fails()) / EMSESP::analogsensor_.reads());
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "MQTT Publishes";
+    statJson["s"]  = Mqtt::publish_count();
+    statJson["f"]  = Mqtt::publish_fails();
+    statJson["q"]  = Mqtt::publish_count() == 0 ? 100 : 100 - (Mqtt::publish_fails() * 100) / (Mqtt::publish_count() + Mqtt::publish_fails());
+
+    statJson       = statsJson.createNestedObject();
+    statJson["id"] = "API Calls";
+    statJson["s"]  = WebAPIService::api_count(); // + WebAPIService::api_fails();
+    statJson["f"]  = WebAPIService::api_fails();
+    statJson["q"] = WebAPIService::api_count() == 0 ? 100 : 100 - (WebAPIService::api_fails() * 100) / (WebAPIService::api_count() + WebAPIService::api_fails());
 
     response->setLength();
     request->send(response);