diff --git a/package-lock.json b/package-lock.json
index 6d7654d2..32d20d18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "bootstrap": "^5.1.3",
         "bootstrap-icons": "^1.9.1",
         "cac": "^6.7.12",
-        "chalk": "^5.0.1",
+        "chalk": "^4.1.2",
         "chart.js": "^3.9.1",
         "compression": "^1.7.4",
         "cookie-parser": "^1.4.6",
@@ -337,34 +337,6 @@
         "node": ">=v14"
       }
     },
-    "node_modules/@commitlint/format/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/@commitlint/format/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@commitlint/is-ignored": {
       "version": "17.0.3",
       "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.0.3.tgz",
@@ -430,34 +402,6 @@
         "node": ">=v14"
       }
     },
-    "node_modules/@commitlint/load/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/@commitlint/load/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@commitlint/message": {
       "version": "17.0.0",
       "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.0.0.tgz",
@@ -562,34 +506,6 @@
         "node": ">=v14"
       }
     },
-    "node_modules/@commitlint/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/@commitlint/types/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -1796,16 +1712,31 @@
       }
     },
     "node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "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": "^12.17.0 || ^14.13 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/chalk/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/chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -2121,34 +2052,6 @@
         "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
       }
     },
-    "node_modules/concurrently/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/concurrently/node_modules/chalk/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/concurrently/node_modules/yargs": {
       "version": "17.5.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
@@ -4543,32 +4446,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/express-jsdoc-swagger/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/express-jsdoc-swagger/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/express-rate-limit": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.4.0.tgz",
@@ -6132,34 +6009,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/inquirer/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/interpret": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
@@ -6442,32 +6291,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/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/jake/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/joycon": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
@@ -6841,34 +6664,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/log-symbols/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/longest": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-2.0.1.tgz",
@@ -7488,34 +7283,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "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/ora/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==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -10148,27 +9915,6 @@
       "requires": {
         "@commitlint/types": "^17.0.0",
         "chalk": "^4.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@commitlint/is-ignored": {
@@ -10221,27 +9967,6 @@
         "lodash": "^4.17.19",
         "resolve-from": "^5.0.0",
         "typescript": "^4.6.4"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@commitlint/message": {
@@ -10322,27 +10047,6 @@
       "dev": true,
       "requires": {
         "chalk": "^4.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@cspotcode/source-map-support": {
@@ -11308,9 +11012,23 @@
       }
     },
     "chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="
+      "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"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
     },
     "chardet": {
       "version": "0.7.0",
@@ -11561,27 +11279,6 @@
         "yargs": "^17.3.1"
       },
       "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "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==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
         "yargs": {
           "version": "17.5.1",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
@@ -13299,25 +12996,6 @@
         "glob": "^7.1.6",
         "merge": "^2.1.1",
         "swagger-ui-express": "^4.3.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        }
       }
     },
     "express-rate-limit": {
@@ -14460,27 +14138,6 @@
         "strip-ansi": "^6.0.0",
         "through": "^2.3.6",
         "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "interpret": {
@@ -14678,25 +14335,6 @@
         "chalk": "^4.0.2",
         "filelist": "^1.0.1",
         "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        }
       }
     },
     "joycon": {
@@ -14988,27 +14626,6 @@
       "requires": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "longest": {
@@ -15453,27 +15070,6 @@
         "log-symbols": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "os-tmpdir": {
diff --git a/package.json b/package.json
index 9c9e89a8..ca2bd863 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "bootstrap": "^5.1.3",
     "bootstrap-icons": "^1.9.1",
     "cac": "^6.7.12",
-    "chalk": "^5.0.1",
+    "chalk": "^4.1.2",
     "chart.js": "^3.9.1",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
diff --git a/src/apps/ui/components/dashboard/SessionDetails.vue b/src/apps/ui/components/dashboard/SessionDetails.vue
index 50b6d86e..fe107ecb 100644
--- a/src/apps/ui/components/dashboard/SessionDetails.vue
+++ b/src/apps/ui/components/dashboard/SessionDetails.vue
@@ -101,6 +101,8 @@ const deleteALogLoading = ref(false);
 const deleteALogLogObject = ref(null);
 const deleteALogLogIndex = ref(null);
 
+const downloadAVideoSelectedVideoIndex = ref(-1);
+
 // watches
 //  update exercise db as changes in categories
 watch(chooseExerciseCategoryId, async (currentValue, oldValue) => {
@@ -1439,12 +1441,17 @@ function clearAndDismissDeleteALogModal() {
                 <span class="d-flex justify-content-between gap-2">
                   <!-- download video -->
                   <a
-                    :href="`/api/v1/videos/${log?.videos[0]?.id}/download`"
+                    @click="downloadAVideoSelectedVideoIndex = 0"
+                    :href="`/api/v1/videos/${
+                      downloadAVideoSelectedVideoIndex === -1
+                        ? null
+                        : log?.videos[downloadAVideoSelectedVideoIndex]?.id
+                    }/download`"
                     class="btn btn-sm btn-outline-dark"
                     type="button"
                     :class="{ disabled: !log?.videos?.length }"
                   >
-                    <i class="bi bi-cloud-download"></i>
+                    <i class="bi bi-download"></i>
                   </a>
 
                   <!-- history -->
diff --git a/src/apps/ui/pages/dashboard/Exercise.vue b/src/apps/ui/pages/dashboard/Exercise.vue
index af04a273..659cbaed 100644
--- a/src/apps/ui/pages/dashboard/Exercise.vue
+++ b/src/apps/ui/pages/dashboard/Exercise.vue
@@ -9,6 +9,8 @@ import useUserStore from '../../store/user.store.js';
 import useAppStore from '../../store/app.store.js';
 import { useRouter } from 'vue-router';
 
+import { orderBy } from 'lodash-es';
+
 import { reactive, computed, ref, onMounted } from 'vue';
 
 const userStore = useUserStore();
@@ -36,6 +38,7 @@ let exerciseDetails = reactive({});
 const getExerciseDetailsLoading = ref(null);
 const notAvailableYet = ref(false);
 const searchText = ref('');
+const showDetails = ref(false);
 
 onMounted(async () => {
   try {
@@ -81,11 +84,23 @@ onMounted(async () => {
 
 // ----------- chart starts
 const chartData = computed(() => ({
-  labels: setsHistory.value?.map((s) => dayjs(s.created_at).format('MM/DD')).sort(),
+  labels: orderBy(setsHistory.value, (x) => new Date(x.created_at), ['asc']).map((x) =>
+    dayjs(x.created_at).format('MM/DD'),
+  ),
   datasets: [
     {
       label: 'e1RM',
-      data: setsHistory.value?.map((s) => s.e1RM).sort(),
+      data: orderBy(setsHistory.value, (x) => new Date(x.created_at), ['asc']).map((x) => x.e1RM),
+      backgroundColor: '#F5C2C7',
+      borderColor: '#DC3545',
+    },
+    {
+      label: 'Volume',
+      data: orderBy(setsHistory.value, (x) => new Date(x.created_at), ['asc']).map(
+        (x) => x.weight * x.reps,
+      ),
+      borderColor: '#47b784',
+      borderWidth: 3,
     },
   ],
 }));
@@ -141,6 +156,12 @@ async function exerciseTable(title, page = null) {
   el.download = `${dayjs().format('YYYY-MM-DD-h-mm-A')}--${title}.csv`;
   el.click();
 }
+
+function calculateRelativeIntensity(weight, e1rm, nullFormat = '0') {
+  return Math.floor((weight / e1rm) * 100) == Infinity
+    ? nullFormat
+    : `${Math.floor((weight / e1rm) * 100)}%`;
+}
 </script>
 
 <template>
@@ -196,6 +217,16 @@ async function exerciseTable(title, page = null) {
                   <i class="bi bi-arrow-repeat"></i>
                 </button>
 
+                <!-- hide/show details -->
+                <button
+                  @click="showDetails = !showDetails"
+                  class="btn btn-sm btn-outline-secondary"
+                  type="button"
+                >
+                  <i v-if="showDetails" class="bi bi-eye-slash"></i>
+                  <i v-else class="bi bi-eye"></i>
+                </button>
+
                 <!-- download -->
                 <div class="dropdown">
                   <button
@@ -261,26 +292,42 @@ async function exerciseTable(title, page = null) {
                 <table class="table table-striped table-hover table-sm p-0 m-0">
                   <thead>
                     <tr>
-                      <th class="align-middle text-center" scope="col">#</th>
+                      <!-- <th class="align-middle text-center" scope="col">#</th> -->
                       <th class="align-middle text-center" scope="col">Reps</th>
                       <th class="align-middle text-center" scope="col">Weight</th>
                       <th class="align-middle text-center" scope="col">Rpe</th>
+                      <th class="align-middle text-center" scope="col">RI</th>
                       <th class="align-middle text-center" scope="col">e1RM</th>
+                      <th class="align-middle text-center" scope="col">Volume</th>
                       <th class="align-middle text-center" scope="col">Session</th>
                       <th class="align-middle text-center" scope="col">Video</th>
                       <th class="align-middle text-center" scope="col">Date</th>
-                      <th class="align-middle text-center" scope="col">Notes</th>
+                      <th v-if="showDetails" class="align-middle text-center" scope="col">Notes</th>
                     </tr>
                   </thead>
                   <tbody>
                     <tr v-for="(s, index) in setsHistory" :key="s.id">
-                      <th class="align-middle text-center" scope="row">
+                      <!-- checkbox -->
+                      <!-- <th class="align-middle text-center" scope="row">
                         <input class="form-check-input" type="checkbox" :value="s.id" />
-                      </th>
+                      </th> -->
+
                       <td class="align-middle text-center">{{ s.reps }}</td>
                       <td class="align-middle text-center">{{ s.weight }}</td>
                       <td class="align-middle text-center">@{{ s.rpe }}</td>
+
+                      <!-- r% -->
+                      <td class="align-middle text-center">
+                        {{ calculateRelativeIntensity(s.weight, s.e1RM, '-') }}
+                      </td>
+
+                      <!-- e1rm -->
                       <td class="align-middle text-center">{{ s.e1RM === 0 ? '-' : s.e1RM }}</td>
+
+                      <!-- volume -->
+                      <td class="align-middle text-center">{{ s.reps * s.weight }}</td>
+
+                      <!-- session details -->
                       <td class="align-middle text-center">
                         <router-link
                           :to="`/dashboard/sessions/${s.session_id}`"
@@ -289,6 +336,8 @@ async function exerciseTable(title, page = null) {
                           <i class="bi bi-journal-text"></i> {{ s.session_id }}
                         </router-link>
                       </td>
+
+                      <!-- video -->
                       <td class="align-middle text-center">
                         <router-link
                           :to="`/dashboard/videos/${s.session_id}`"
@@ -297,10 +346,14 @@ async function exerciseTable(title, page = null) {
                           <i class="bi bi-play-circle-fill"></i>
                         </router-link>
                       </td>
+
+                      <!-- date -->
                       <td class="align-middle text-center">
                         {{ dayjs(s.created_at).format('MM/DD') }}
                       </td>
-                      <td class="align-middle text-center">{{ s.notes }}</td>
+
+                      <!-- notes -->
+                      <td v-if="showDetails" class="align-middle text-center">{{ s.notes }}</td>
                     </tr>
                   </tbody>
                 </table>
diff --git a/src/apps/ui/pages/dashboard/Profile.vue b/src/apps/ui/pages/dashboard/Profile.vue
index b0b21b40..2547ffe7 100644
--- a/src/apps/ui/pages/dashboard/Profile.vue
+++ b/src/apps/ui/pages/dashboard/Profile.vue
@@ -6,7 +6,7 @@ import { useRouter } from 'vue-router';
 import api from '../../../../utils/fetch-with-style.js';
 import useUserStore from '../../store/user.store.js';
 import dayjs from 'dayjs';
-import { omit } from 'lodash-es';
+import { omit, meanBy } from 'lodash-es';
 
 import useAppStore from '../../store/app.store.js';
 const appStore = useAppStore();
@@ -29,35 +29,7 @@ const weeklyWeightIn = reactive({});
 const recentPrs = reactive({});
 
 onMounted(async () => {
-  // ----------- chart starts
-  today.value = dayjs().format('MMMM DD, YYYY');
-  const data = {
-    type: 'line',
-    data: {
-      labels: ['Mercury', 'Venus', 'Earth', 'Mars', 'Jupiter', 'Saturn', 'Uranus', 'Neptune'],
-      options: {
-        responsive: true,
-      },
-      datasets: [
-        {
-          label: 'Number of Moons',
-          data: [0, 0, 1, 2, 79, 82, 27, 14],
-          backgroundColor: 'rgba(54,73,93,.5)',
-          borderColor: '#36495d',
-          borderWidth: 3,
-        },
-        {
-          label: 'Planetary Mass (relative to the Sun x 10^-6)',
-          data: [0.166, 2.081, 3.003, 0.323, 954.792, 285.886, 43.662, 51.514],
-          backgroundColor: 'rgba(71, 183,132,.5)',
-          borderColor: '#47b784',
-          borderWidth: 3,
-        },
-      ],
-    },
-  };
-
-  // ----------- chart ends
+  appStore.loading = true;
 
   // warn user if they have not update user details
   const { user } = userStore;
@@ -78,6 +50,12 @@ onMounted(async () => {
   // recovery
   const r = await getRecovery();
   recovery.value = r || [];
+
+  appStore.loading = false;
+});
+
+const averageSleep = computed(() => {
+  return meanBy(recovery.value, (i) => i.hours_of_sleep).toFixed(2);
 });
 
 async function getRecentPrs() {
@@ -189,7 +167,10 @@ const { lineChartProps } = useLineChart({
 <template>
   <VideosAndProfileHeader />
 
-  <div class="container px-3 animate__animated animate__fadeIn animate__faster">
+  <div
+    v-if="!appStore.loading"
+    class="container px-3 animate__animated animate__fadeIn animate__faster"
+  >
     <div class="my-3 d-flex flex-column gap-3">
       <!-- alert -->
       <div v-if="alert.type" :class="`alert-${alert.type}`" class="mb-0 alert">
@@ -244,7 +225,7 @@ const { lineChartProps } = useLineChart({
 
             <!-- sleep -->
             <div class="d-flex flex-column align-items-center">
-              <small> ~ 7 hrs</small>
+              <small> ~ {{ averageSleep }} hrs</small>
               <small class="text-muted">Sleep</small>
             </div>