diff --git a/package-lock.json b/package-lock.json
index 1f18f099..b7c22f81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@beam-australia/react-env": "^3.1.1",
         "@dnd-kit/core": "^6.1.0",
+        "@firebase/util": "^1.9.7",
         "@headlessui/react": "^1.7.13",
         "@mdi/js": "^7.1.96",
         "@mdi/react": "^1.6.1",
@@ -17,10 +18,12 @@
         "@paypal/paypal-js": "^7.1.0",
         "@paypal/react-paypal-js": "^8.1.3",
         "@react-pdf/renderer": "^3.1.14",
+        "@react-spring/web": "^9.7.4",
         "@tanstack/react-table": "^8.10.1",
         "@types/node": "18.13.0",
         "@types/react": "18.0.27",
         "@types/react-dom": "18.0.10",
+        "@use-gesture/react": "^10.3.1",
         "axios": "^1.3.5",
         "bcrypt": "^5.1.1",
         "chart.js": "^4.2.1",
@@ -768,11 +771,27 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/analytics-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/analytics-types": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.8.0.tgz",
       "integrity": "sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw=="
     },
+    "node_modules/@firebase/analytics/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/app": {
       "version": "0.9.7",
       "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.9.7.tgz",
@@ -815,6 +834,14 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/app-check-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/app-check-interop-types": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.2.0.tgz",
@@ -825,6 +852,14 @@
       "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.5.0.tgz",
       "integrity": "sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ=="
     },
+    "node_modules/@firebase/app-check/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/app-compat": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.7.tgz",
@@ -837,11 +872,27 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@firebase/app-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/app-types": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.0.tgz",
       "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q=="
     },
+    "node_modules/@firebase/app/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/auth": {
       "version": "0.22.0",
       "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.22.0.tgz",
@@ -873,6 +924,14 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/auth-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/auth-interop-types": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz",
@@ -887,6 +946,14 @@
         "@firebase/util": "1.x"
       }
     },
+    "node_modules/@firebase/auth/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/component": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz",
@@ -896,6 +963,14 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@firebase/component/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/database": {
       "version": "0.14.4",
       "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz",
@@ -922,6 +997,14 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@firebase/database-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/database-types": {
       "version": "0.10.4",
       "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz",
@@ -931,6 +1014,22 @@
         "@firebase/util": "1.9.3"
       }
     },
+    "node_modules/@firebase/database-types/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@firebase/database/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/firestore": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.10.0.tgz",
@@ -967,6 +1066,14 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/firestore-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/firestore-types": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.1.tgz",
@@ -976,6 +1083,14 @@
         "@firebase/util": "1.x"
       }
     },
+    "node_modules/@firebase/firestore/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/functions": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.9.4.tgz",
@@ -1008,11 +1123,27 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/functions-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/functions-types": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.0.tgz",
       "integrity": "sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw=="
     },
+    "node_modules/@firebase/functions/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/installations": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.4.tgz",
@@ -1042,6 +1173,14 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/installations-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/installations-types": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.5.0.tgz",
@@ -1050,6 +1189,14 @@
         "@firebase/app-types": "0.x"
       }
     },
+    "node_modules/@firebase/installations/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/logger": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.0.tgz",
@@ -1088,11 +1235,27 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/messaging-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/messaging-interop-types": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.0.tgz",
       "integrity": "sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ=="
     },
+    "node_modules/@firebase/messaging/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/performance": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.4.tgz",
@@ -1124,11 +1287,27 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/performance-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/performance-types": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.2.0.tgz",
       "integrity": "sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA=="
     },
+    "node_modules/@firebase/performance/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/remote-config": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.4.tgz",
@@ -1160,11 +1339,27 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/remote-config-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/remote-config-types": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.3.0.tgz",
       "integrity": "sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA=="
     },
+    "node_modules/@firebase/remote-config/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/storage": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.11.2.tgz",
@@ -1194,6 +1389,14 @@
         "@firebase/app-compat": "0.x"
       }
     },
+    "node_modules/@firebase/storage-compat/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/storage-types": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.8.0.tgz",
@@ -1203,7 +1406,7 @@
         "@firebase/util": "1.x"
       }
     },
-    "node_modules/@firebase/util": {
+    "node_modules/@firebase/storage/node_modules/@firebase/util": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
       "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
@@ -1211,6 +1414,14 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@firebase/util": {
+      "version": "1.9.7",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.7.tgz",
+      "integrity": "sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@firebase/webchannel-wrapper": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.9.0.tgz",
@@ -2219,6 +2430,72 @@
       "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.5.0.tgz",
       "integrity": "sha512-XsVRkt0hQ60I4e3leAVt+aZR3KJCaJd179BfJHAv4F4x6Vq3yqkry8lcbUWKGKDw1j3/8sW4FsgGR41SFvsG9A=="
     },
+    "node_modules/@react-spring/animated": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.4.tgz",
+      "integrity": "sha512-7As+8Pty2QlemJ9O5ecsuPKjmO0NKvmVkRR1n6mEotFgWar8FKuQt2xgxz3RTgxcccghpx1YdS1FCdElQNexmQ==",
+      "dependencies": {
+        "@react-spring/shared": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@react-spring/core": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.4.tgz",
+      "integrity": "sha512-GzjA44niEJBFUe9jN3zubRDDDP2E4tBlhNlSIkTChiNf9p4ZQlgXBg50qbXfSXHQPHak/ExYxwhipKVsQ/sUTw==",
+      "dependencies": {
+        "@react-spring/animated": "~9.7.4",
+        "@react-spring/shared": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-spring/donate"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@react-spring/rafz": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.4.tgz",
+      "integrity": "sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA=="
+    },
+    "node_modules/@react-spring/shared": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.4.tgz",
+      "integrity": "sha512-bEPI7cQp94dOtCFSEYpxvLxj0+xQfB5r9Ru1h8OMycsIq7zFZon1G0sHrBLaLQIWeMCllc4tVDYRTLIRv70C8w==",
+      "dependencies": {
+        "@react-spring/rafz": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@react-spring/types": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.4.tgz",
+      "integrity": "sha512-iQVztO09ZVfsletMiY+DpT/JRiBntdsdJ4uqk3UJFhrhS8mIC9ZOZbmfGSRs/kdbNPQkVyzucceDicQ/3Mlj9g=="
+    },
+    "node_modules/@react-spring/web": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.4.tgz",
+      "integrity": "sha512-UMvCZp7I5HCVIleSa4BwbNxynqvj+mJjG2m20VO2yPoi2pnCYANy58flvz9v/YcXTAvsmL655FV3pm5fbr6akA==",
+      "dependencies": {
+        "@react-spring/animated": "~9.7.4",
+        "@react-spring/core": "~9.7.4",
+        "@react-spring/shared": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/@rushstack/eslint-patch": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
@@ -2715,6 +2992,22 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@use-gesture/core": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
+      "integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw=="
+    },
+    "node_modules/@use-gesture/react": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz",
+      "integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==",
+      "dependencies": {
+        "@use-gesture/core": "10.3.1"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8.0"
+      }
+    },
     "node_modules/@wixc3/board-core": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@wixc3/board-core/-/board-core-2.2.0.tgz",
@@ -5031,6 +5324,14 @@
         "@google-cloud/storage": "^6.9.5"
       }
     },
+    "node_modules/firebase/node_modules/@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -10400,6 +10701,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/analytics-compat": {
@@ -10412,6 +10723,16 @@
         "@firebase/component": "0.6.4",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/analytics-types": {
@@ -10429,6 +10750,16 @@
         "@firebase/util": "1.9.3",
         "idb": "7.0.1",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/app-check": {
@@ -10440,6 +10771,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/app-check-compat": {
@@ -10453,6 +10794,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/app-check-interop-types": {
@@ -10475,6 +10826,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/app-types": {
@@ -10492,6 +10853,16 @@
         "@firebase/util": "1.9.3",
         "node-fetch": "2.6.7",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/auth-compat": {
@@ -10505,6 +10876,16 @@
         "@firebase/util": "1.9.3",
         "node-fetch": "2.6.7",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/auth-interop-types": {
@@ -10524,6 +10905,16 @@
       "requires": {
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/database": {
@@ -10537,6 +10928,16 @@
         "@firebase/util": "1.9.3",
         "faye-websocket": "0.11.4",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/database-compat": {
@@ -10550,6 +10951,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/database-types": {
@@ -10559,6 +10970,16 @@
       "requires": {
         "@firebase/app-types": "0.9.0",
         "@firebase/util": "1.9.3"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/firestore": {
@@ -10574,6 +10995,16 @@
         "@grpc/proto-loader": "^0.6.13",
         "node-fetch": "2.6.7",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/firestore-compat": {
@@ -10586,6 +11017,16 @@
         "@firebase/firestore-types": "2.5.1",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/firestore-types": {
@@ -10605,6 +11046,16 @@
         "@firebase/util": "1.9.3",
         "node-fetch": "2.6.7",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/functions-compat": {
@@ -10617,6 +11068,16 @@
         "@firebase/functions-types": "0.6.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/functions-types": {
@@ -10633,6 +11094,16 @@
         "@firebase/util": "1.9.3",
         "idb": "7.0.1",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/installations-compat": {
@@ -10645,6 +11116,16 @@
         "@firebase/installations-types": "0.5.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/installations-types": {
@@ -10671,6 +11152,16 @@
         "@firebase/util": "1.9.3",
         "idb": "7.0.1",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/messaging-compat": {
@@ -10682,6 +11173,16 @@
         "@firebase/messaging": "0.12.4",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/messaging-interop-types": {
@@ -10699,6 +11200,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/performance-compat": {
@@ -10712,6 +11223,16 @@
         "@firebase/performance-types": "0.2.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/performance-types": {
@@ -10729,6 +11250,16 @@
         "@firebase/logger": "0.4.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/remote-config-compat": {
@@ -10742,6 +11273,16 @@
         "@firebase/remote-config-types": "0.3.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/remote-config-types": {
@@ -10758,6 +11299,16 @@
         "@firebase/util": "1.9.3",
         "node-fetch": "2.6.7",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/storage-compat": {
@@ -10770,6 +11321,16 @@
         "@firebase/storage-types": "0.8.0",
         "@firebase/util": "1.9.3",
         "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "@firebase/storage-types": {
@@ -10778,9 +11339,9 @@
       "integrity": "sha512-isRHcGrTs9kITJC0AVehHfpraWFui39MPaU7Eo8QfWlqW7YPymBmRgjDrlOgFdURh6Cdeg07zmkLP5tzTKRSpg=="
     },
     "@firebase/util": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
-      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "version": "1.9.7",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.7.tgz",
+      "integrity": "sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==",
       "requires": {
         "tslib": "^2.1.0"
       }
@@ -11551,6 +12112,55 @@
       "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.5.0.tgz",
       "integrity": "sha512-XsVRkt0hQ60I4e3leAVt+aZR3KJCaJd179BfJHAv4F4x6Vq3yqkry8lcbUWKGKDw1j3/8sW4FsgGR41SFvsG9A=="
     },
+    "@react-spring/animated": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.4.tgz",
+      "integrity": "sha512-7As+8Pty2QlemJ9O5ecsuPKjmO0NKvmVkRR1n6mEotFgWar8FKuQt2xgxz3RTgxcccghpx1YdS1FCdElQNexmQ==",
+      "requires": {
+        "@react-spring/shared": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      }
+    },
+    "@react-spring/core": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.4.tgz",
+      "integrity": "sha512-GzjA44niEJBFUe9jN3zubRDDDP2E4tBlhNlSIkTChiNf9p4ZQlgXBg50qbXfSXHQPHak/ExYxwhipKVsQ/sUTw==",
+      "requires": {
+        "@react-spring/animated": "~9.7.4",
+        "@react-spring/shared": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      }
+    },
+    "@react-spring/rafz": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.4.tgz",
+      "integrity": "sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA=="
+    },
+    "@react-spring/shared": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.4.tgz",
+      "integrity": "sha512-bEPI7cQp94dOtCFSEYpxvLxj0+xQfB5r9Ru1h8OMycsIq7zFZon1G0sHrBLaLQIWeMCllc4tVDYRTLIRv70C8w==",
+      "requires": {
+        "@react-spring/rafz": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      }
+    },
+    "@react-spring/types": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.4.tgz",
+      "integrity": "sha512-iQVztO09ZVfsletMiY+DpT/JRiBntdsdJ4uqk3UJFhrhS8mIC9ZOZbmfGSRs/kdbNPQkVyzucceDicQ/3Mlj9g=="
+    },
+    "@react-spring/web": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.4.tgz",
+      "integrity": "sha512-UMvCZp7I5HCVIleSa4BwbNxynqvj+mJjG2m20VO2yPoi2pnCYANy58flvz9v/YcXTAvsmL655FV3pm5fbr6akA==",
+      "requires": {
+        "@react-spring/animated": "~9.7.4",
+        "@react-spring/core": "~9.7.4",
+        "@react-spring/shared": "~9.7.4",
+        "@react-spring/types": "~9.7.4"
+      }
+    },
     "@rushstack/eslint-patch": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
@@ -11978,6 +12588,19 @@
         "eslint-visitor-keys": "^3.3.0"
       }
     },
+    "@use-gesture/core": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
+      "integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw=="
+    },
+    "@use-gesture/react": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz",
+      "integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==",
+      "requires": {
+        "@use-gesture/core": "10.3.1"
+      }
+    },
     "@wixc3/board-core": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@wixc3/board-core/-/board-core-2.2.0.tgz",
@@ -13705,6 +14328,16 @@
         "@firebase/storage": "0.11.2",
         "@firebase/storage-compat": "0.3.2",
         "@firebase/util": "1.9.3"
+      },
+      "dependencies": {
+        "@firebase/util": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+          "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        }
       }
     },
     "firebase-admin": {
diff --git a/package.json b/package.json
index 936deba1..edebc0e7 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,12 @@
     "@paypal/paypal-js": "^7.1.0",
     "@paypal/react-paypal-js": "^8.1.3",
     "@react-pdf/renderer": "^3.1.14",
+    "@react-spring/web": "^9.7.4",
     "@tanstack/react-table": "^8.10.1",
     "@types/node": "18.13.0",
     "@types/react": "18.0.27",
     "@types/react-dom": "18.0.10",
+    "@use-gesture/react": "^10.3.1",
     "axios": "^1.3.5",
     "bcrypt": "^5.1.1",
     "chart.js": "^4.2.1",
@@ -99,4 +101,4 @@
     "postcss": "^8.4.21",
     "tailwindcss": "^3.2.4"
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/AIDetection.tsx b/src/components/AIDetection.tsx
index 4860ccde..29496800 100644
--- a/src/components/AIDetection.tsx
+++ b/src/components/AIDetection.tsx
@@ -9,7 +9,7 @@ import SegmentedProgressBar from "./SegmentedProgressBar";
 // Colors and texts scrapped from gpt's zero react bundle
 const AIDetection: React.FC<AIDetectionAttributes> = ({ predicted_class, confidence_category, class_probabilities, sentences }) => {
     const probabilityTooltipContent = `
-        GTP's Zero deep learning model predicts the <br/> 
+        Encoach's deep learning model predicts the <br/> 
         probability this text has been entirely <br/> 
         generated by AI. For instance, a 40% AI <br/> 
         probability does not indicate that the text<br/> 
@@ -19,7 +19,7 @@ const AIDetection: React.FC<AIDetectionAttributes> = ({ predicted_class, confide
     `;
     const confidenceTooltipContent = `
         Confidence scores are a safeguard to better<br/> 
-        understand AI identification results. GTP Zero<br/>
+        understand AI identification results. Encoach<br/>
         trained it's deep learning model on a diverse<br/>
         dataset of millions of human and AI-written<br/>
         documents. Green scores indicate that you can scan<br/>
@@ -32,19 +32,19 @@ const AIDetection: React.FC<AIDetectionAttributes> = ({ predicted_class, confide
     const confidenceKeywords = ["moderately", "highly", "confident", "uncertain"];
     var confidence = {
         low: {
-            ai: "GPT Zero is uncertain about this text. If GPT Zero had to classify it, it would be considered",
-            human: "GPT Zero is uncertain about this text. If GPT Zero had to classify it, it would likely be considered",
-            mixed: "GPT Zero is uncertain about this text. If GPT Zero had to classify it, it would likely be a"
+            ai: "Encoach is uncertain about this text. If Encoach had to classify it, it would be considered",
+            human: "Encoach is uncertain about this text. If Encoach had to classify it, it would likely be considered",
+            mixed: "Encoach is uncertain about this text. If Encoach had to classify it, it would likely be a"
         },
         medium: {
-            ai: "GPT Zero is moderately confident this text was",
-            human: "GPT Zero is moderately confident this text is entirely",
-            mixed: "GPT Zero is moderately confident this text is a"
+            ai: "Encoach is moderately confident this text was",
+            human: "Encoach is moderately confident this text is entirely",
+            mixed: "Encoach is moderately confident this text is a"
         },
         high: {
-            ai: "GPT Zero is highly confident this text was",
-            human: "GPT Zero is highly confident this text is entirely",
-            mixed: "GPT Zero is highly confident this text is a"
+            ai: "Encoach is highly confident this text was",
+            human: "Encoach is highly confident this text is entirely",
+            mixed: "Encoach is highly confident this text is a"
         }
     }
     var classPrediction = {
@@ -107,7 +107,7 @@ const AIDetection: React.FC<AIDetectionAttributes> = ({ predicted_class, confide
             <Tooltip id="probability-tooltip" className="z-50 bg-white shadow-md rounded-sm" style={tooltipStyle} />
             <Tooltip id="confidence-tooltip" className="z-50 bg-white shadow-md rounded-sm" style={tooltipStyle} />
             <div className="flex flex-col bg-white p-6 rounded-lg shadow-lg gap-16">
-                <h1 className="text-lg font-semibold">GPT Zero AI Detection Results</h1>
+                <h1 className="text-lg font-semibold">Encoach Detection Results</h1>
                 <div className="flex flex-row -md:flex-col -lg:gap-0 -xl:gap-10 gap-20 items-stretch -md:items-center">
                     <div className="flex -md:w-5/6 w-1/2 justify-center">
                         <div className="flex flex-col border rounded-xl">
diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx
new file mode 100644
index 00000000..61054e6b
--- /dev/null
+++ b/src/components/Dropdown.tsx
@@ -0,0 +1,84 @@
+import React, { useState, ReactNode, useRef, useEffect } from 'react';
+import { animated, useSpring } from '@react-spring/web';
+
+interface DropdownProps {
+    title: ReactNode;
+    open?: boolean;
+    className?: string;
+    contentWrapperClassName?: string;
+    bottomPadding?: number;
+    children: ReactNode;
+}
+
+const Dropdown: React.FC<DropdownProps> = ({
+    title,
+    open = false,
+    className = "w-full text-left font-semibold flex justify-between items-center p-4",
+    contentWrapperClassName = "px-6",
+    bottomPadding = 12,
+    children
+}) => {
+    const [isOpen, setIsOpen] = useState<boolean>(open);
+    const contentRef = useRef<HTMLDivElement>(null);
+    const [contentHeight, setContentHeight] = useState<number>(0);
+
+    useEffect(() => {
+        let resizeObserver: ResizeObserver | null = null;
+        
+        if (contentRef.current) {
+            resizeObserver = new ResizeObserver(entries => {
+                for (let entry of entries) {
+                    if (entry.borderBoxSize && entry.borderBoxSize.length > 0) {
+                        const height = entry.borderBoxSize[0].blockSize;
+                        setContentHeight(height + bottomPadding);
+                    } else {
+                        // Fallback for browsers that don't support borderBoxSize
+                        const height = entry.contentRect.height;
+                        setContentHeight(height + bottomPadding);
+                    }
+                }
+            });
+    
+            resizeObserver.observe(contentRef.current);
+        }
+    
+        return () => {
+            if (resizeObserver) {
+                resizeObserver.disconnect();
+            }
+        };
+    }, [bottomPadding]);
+
+    const springProps = useSpring({
+        height: isOpen ? contentHeight : 0,
+        opacity: isOpen ? 1 : 0,
+        config: { tension: 300, friction: 30 }
+    });
+
+    return (
+        <>
+            <button
+                onClick={() => setIsOpen(!isOpen)}
+                className={className}
+            >
+                {title}
+                <svg
+                    className={`w-4 h-4 transform transition-transform ${isOpen ? 'rotate-180' : ''}`}
+                    fill="none"
+                    stroke="currentColor"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg"
+                >
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+                </svg>
+            </button>
+            <animated.div style={springProps} className="overflow-hidden">
+                <div ref={contentRef} className={contentWrapperClassName} style={{paddingBottom: bottomPadding}}>
+                    {children}
+                </div>
+            </animated.div>
+        </>
+    );
+};
+
+export default Dropdown;
diff --git a/src/components/Exercises/Speaking.tsx b/src/components/Exercises/Speaking.tsx
index 4a35458a..106b76d4 100644
--- a/src/components/Exercises/Speaking.tsx
+++ b/src/components/Exercises/Speaking.tsx
@@ -1,33 +1,34 @@
-import {SpeakingExercise} from "@/interfaces/exam";
-import {CommonProps} from ".";
-import {Fragment, useEffect, useState} from "react";
-import {BsCheckCircleFill, BsMicFill, BsPauseCircle, BsPlayCircle, BsTrashFill} from "react-icons/bs";
+import { SpeakingExercise } from "@/interfaces/exam";
+import { CommonProps } from ".";
+import { Fragment, useEffect, useState } from "react";
+import { BsCheckCircleFill, BsMicFill, BsPauseCircle, BsPlayCircle, BsTrashFill } from "react-icons/bs";
 import dynamic from "next/dynamic";
 import Button from "../Low/Button";
 import useExamStore from "@/stores/examStore";
-import {downloadBlob} from "@/utils/evaluation";
+import { downloadBlob } from "@/utils/evaluation";
 import axios from "axios";
 import Modal from "../Modal";
 
-const Waveform = dynamic(() => import("../Waveform"), {ssr: false});
+const Waveform = dynamic(() => import("../Waveform"), { ssr: false });
 const ReactMediaRecorder = dynamic(() => import("react-media-recorder").then((mod) => mod.ReactMediaRecorder), {
 	ssr: false,
 });
 
-export default function Speaking({id, title, text, video_url, type, prompts, suffix, userSolutions, onNext, onBack}: SpeakingExercise & CommonProps) {
+export default function Speaking({ id, title, text, video_url, type, prompts, suffix, userSolutions, onNext, onBack }: SpeakingExercise & CommonProps) {
 	const [recordingDuration, setRecordingDuration] = useState(0);
 	const [isRecording, setIsRecording] = useState(false);
 	const [mediaBlob, setMediaBlob] = useState<string>();
 	const [audioURL, setAudioURL] = useState<string>();
 	const [isLoading, setIsLoading] = useState(false);
 	const [isPromptsModalOpen, setIsPromptsModalOpen] = useState(false);
+	const [inputText, setInputText] = useState("");
 
 	const hasExamEnded = useExamStore((state) => state.hasExamEnded);
 
 	const saveToStorage = async () => {
 		if (mediaBlob && mediaBlob.startsWith("blob")) {
 			const blobBuffer = await downloadBlob(mediaBlob);
-			const audioFile = new File([blobBuffer], "audio.wav", {type: "audio/wav"});
+			const audioFile = new File([blobBuffer], "audio.wav", { type: "audio/wav" });
 
 			const seed = Math.random().toString().replace("0.", "");
 
@@ -41,8 +42,8 @@ export default function Speaking({id, title, text, video_url, type, prompts, suf
 				},
 			};
 
-			const response = await axios.post<{path: string}>("/api/storage/insert", formData, config);
-			if (audioURL) await axios.post("/api/storage/delete", {path: audioURL});
+			const response = await axios.post<{ path: string }>("/api/storage/insert", formData, config);
+			if (audioURL) await axios.post("/api/storage/delete", { path: audioURL });
 			return response.data.path;
 		}
 
@@ -51,7 +52,7 @@ export default function Speaking({id, title, text, video_url, type, prompts, suf
 
 	useEffect(() => {
 		if (userSolutions.length > 0) {
-			const {solution} = userSolutions[0] as {solution?: string};
+			const { solution } = userSolutions[0] as { solution?: string };
 			if (solution && !mediaBlob) setMediaBlob(solution);
 			if (solution && !solution.startsWith("blob")) setAudioURL(solution);
 		}
@@ -78,8 +79,8 @@ export default function Speaking({id, title, text, video_url, type, prompts, suf
 	const next = async () => {
 		onNext({
 			exercise: id,
-			solutions: mediaBlob ? [{id, solution: mediaBlob}] : [],
-			score: {correct: 0, total: 100, missing: 0},
+			solutions: mediaBlob ? [{ id, solution: mediaBlob }] : [],
+			score: { correct: 0, total: 100, missing: 0 },
 			type,
 		});
 	};
@@ -87,12 +88,33 @@ export default function Speaking({id, title, text, video_url, type, prompts, suf
 	const back = async () => {
 		onBack({
 			exercise: id,
-			solutions: mediaBlob ? [{id, solution: mediaBlob}] : [],
-			score: {correct: 0, total: 100, missing: 0},
+			solutions: mediaBlob ? [{ id, solution: mediaBlob }] : [],
+			score: { correct: 0, total: 100, missing: 0 },
 			type,
 		});
 	};
 
+	const handleNoteWriting = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+		const newText = e.target.value;
+		const words = newText.match(/\S+/g);
+		const wordCount = words ? words.length : 0;
+		
+		if (wordCount <= 100) {
+			setInputText(newText);
+		} else {
+			let count = 0;
+			let lastIndex = 0;
+			const matches = newText.matchAll(/\S+/g);
+			for (const match of matches) {
+				count++;
+				if (count > 100) break;
+				lastIndex = match.index! + match[0].length;
+			}
+			
+			setInputText(newText.slice(0, lastIndex));
+		}
+	};
+
 	return (
 		<div className="flex flex-col h-full w-full gap-9">
 			<Modal title="Prompts" className="!w-96 aspect-square" isOpen={isPromptsModalOpen} onClose={() => setIsPromptsModalOpen(false)}>
@@ -112,7 +134,7 @@ export default function Speaking({id, title, text, video_url, type, prompts, suf
 					<div className="flex flex-col gap-0">
 						<span className="font-semibold">{title}</span>
 						{prompts.length > 0 && (
-							<span className="font-semibold">You should talk for at least 30 seconds for your answer to be valid.</span>
+							<span className="font-semibold">You should talk for at least 1 minute and 30 seconds for your answer to be valid.</span>
 						)}
 					</div>
 					{!video_url && (
@@ -138,10 +160,24 @@ export default function Speaking({id, title, text, video_url, type, prompts, suf
 				</div>
 			</div>
 
+			{prompts && prompts.length > 0 && (
+				<div className="w-full h-full flex flex-col gap-4">
+					<textarea
+						onContextMenu={(e) => e.preventDefault()}
+						className="w-full h-full min-h-[200px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl"
+						onChange={handleNoteWriting}
+						value={inputText}
+						placeholder="Write your notes here..."
+						spellCheck={false}
+					/>
+					<span className="text-base self-end text-mti-gray-cool">Word Count: {(inputText.match(/\S+/g) || []).length}/100</span>
+				</div>
+			)}
+
 			<ReactMediaRecorder
 				audio
 				onStop={(blob) => setMediaBlob(blob)}
-				render={({status, startRecording, stopRecording, pauseRecording, resumeRecording, clearBlobUrl, mediaBlobUrl}) => (
+				render={({ status, startRecording, stopRecording, pauseRecording, resumeRecording, clearBlobUrl, mediaBlobUrl }) => (
 					<div className="w-full p-4 px-8 bg-transparent border-2 border-mti-gray-platinum rounded-2xl flex-col gap-8 items-center">
 						<p className="text-base font-normal">Record your answer:</p>
 						<div className="flex gap-8 items-center justify-center py-8">
diff --git a/src/components/InfiniteCarousel.tsx b/src/components/InfiniteCarousel.tsx
new file mode 100644
index 00000000..bdc4657f
--- /dev/null
+++ b/src/components/InfiniteCarousel.tsx
@@ -0,0 +1,168 @@
+import React, { useRef, useEffect, useState, useCallback, ReactNode } from 'react';
+import { useSpring, animated } from '@react-spring/web';
+import { useDrag } from '@use-gesture/react';
+import clsx from 'clsx';
+
+interface InfiniteCarouselProps {
+  children: React.ReactNode;
+  height: string;
+  speed?: number;
+  gap?: number;
+  overlay?: ReactNode;
+  overlayFunc?: (index: number) => void;
+  overlayClassName?: string;
+}
+
+const InfiniteCarousel: React.FC<InfiniteCarouselProps> = ({
+  children,
+  height,
+  speed = 20000,
+  gap = 16,
+  overlay = undefined,
+  overlayFunc = undefined,
+  overlayClassName = ""
+}) => {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [containerWidth, setContainerWidth] = useState<number>(0);
+  const itemCount = React.Children.count(children);
+  const [isDragging, setIsDragging] = useState<boolean>(false);
+  const [itemWidth, setItemWidth] = useState<number>(0);
+  const [isInfinite, setIsInfinite] = useState<boolean>(true);
+  const dragStartX = useRef<number>(0);
+
+  useEffect(() => {
+    const handleResize = () => {
+      if (containerRef.current) {
+        const containerWidth = containerRef.current.clientWidth;
+        setContainerWidth(containerWidth);
+
+        const firstChild = containerRef.current.firstElementChild?.firstElementChild as HTMLElement;
+        if (firstChild) {
+          const childWidth = firstChild.offsetWidth;
+          setItemWidth(childWidth);
+
+          const totalContentWidth = (childWidth + gap) * itemCount - gap;
+          setIsInfinite(totalContentWidth > containerWidth);
+        }
+      }
+    };
+
+    handleResize();
+    window.addEventListener('resize', handleResize);
+
+    return () => {
+      window.removeEventListener('resize', handleResize);
+    };
+  }, [gap, itemCount]);
+
+  const totalWidth = (itemWidth + gap) * itemCount;
+
+  const [{ x }, api] = useSpring(() => ({
+    from: { x: 0 },
+    to: { x: -totalWidth },
+    config: { duration: speed },
+    loop: true,
+  }));
+
+  const startAnimation = useCallback(() => {
+    if (isInfinite) {
+      api.start({
+        from: { x: x.get() },
+        to: { x: x.get() - totalWidth },
+        config: { duration: speed },
+        loop: true,
+      });
+    } else {
+      api.stop();
+      api.start({ x: 0, immediate: true });
+    }
+  }, [api, x, totalWidth, speed, isInfinite]);
+
+  useEffect(() => {
+    if (containerWidth > 0 && !isDragging) {
+      startAnimation();
+    }
+  }, [containerWidth, isDragging, startAnimation]);
+
+  const bind = useDrag(({ down, movement: [mx], first }) => {
+    if (!isInfinite) return;
+    if (first) {
+      setIsDragging(true);
+      api.stop();
+      dragStartX.current = x.get();
+    }
+    if (down) {
+      let newX = dragStartX.current + mx;
+      newX = ((newX % totalWidth) + totalWidth) % totalWidth;
+      if (newX > 0) newX -= totalWidth;
+      api.start({ x: newX, immediate: true });
+    } else {
+      setIsDragging(false);
+      startAnimation();
+    }
+  }, {
+    filterTaps: true,
+    from: () => [x.get(), 0],
+  });
+
+  return (
+    <div
+      className="overflow-hidden relative select-none"
+      style={{ height, touchAction: 'pan-y' }}
+      ref={containerRef}
+      {...(isInfinite ? bind() : {})}
+    >
+      <animated.div
+        className="flex"
+        style={{
+          display: 'flex',
+          willChange: 'transform',
+          transform: isInfinite
+            ? x.to((x) => `translate3d(${x}px, 0, 0)`)
+            : 'none',
+          gap: `${gap}px`,
+          width: 'fit-content',
+        }}
+      >
+        {React.Children.map(children, (child, i) => (
+          <div
+            key={i}
+            className="flex-shrink-0 relative"
+          >
+            {overlay !== undefined && overlayFunc !== undefined && (
+              <div className={clsx('absolute', overlayClassName)} onClick={() => overlayFunc(i)}>
+                {overlay}
+              </div>
+            )}
+            <div
+              className="select-none"
+              style={{ pointerEvents: 'none' }}
+            >
+              {child}
+            </div>
+          </div>
+        ))}
+        {isInfinite && React.Children.map(children, (child, i) => (
+          <div
+            key={`clone-${i}`}
+            className="flex-shrink-0 relative"
+          >
+            {overlay !== undefined && overlayFunc !== undefined && (
+              <div className={clsx('absolute', overlayClassName)} onClick={() => overlayFunc(i)}>
+                {overlay}
+              </div>
+            )}
+            <div
+              className="select-none"
+              style={{ pointerEvents: 'none' }}
+            >
+              {child}
+            </div>
+          </div>
+        ))}
+      </animated.div>
+    </div>
+  );
+};
+
+export default InfiniteCarousel;
\ No newline at end of file
diff --git a/src/components/Low/Select.tsx b/src/components/Low/Select.tsx
index 4381455c..186f6a2c 100644
--- a/src/components/Low/Select.tsx
+++ b/src/components/Low/Select.tsx
@@ -4,7 +4,7 @@ import ReactSelect, {GroupBase, StylesConfig} from "react-select";
 
 interface Option {
 	[key: string]: any;
-	value: string;
+	value: string | null;
 	label: string;
 }
 
diff --git a/src/components/ModuleBadge.tsx b/src/components/ModuleBadge.tsx
new file mode 100644
index 00000000..fc763487
--- /dev/null
+++ b/src/components/ModuleBadge.tsx
@@ -0,0 +1,24 @@
+import clsx from "clsx";
+import { BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen } from "react-icons/bs";
+
+const ModuleBadge: React.FC<{ module: string; level?: number }> = ({ module, level }) => (
+    <div
+        className={clsx(
+            "flex gap-2 items-center w-fit text-white -md:px-4 xl:px-4 md:px-2 py-2 rounded-xl",
+            module === "reading" && "bg-ielts-reading",
+            module === "listening" && "bg-ielts-listening",
+            module === "writing" && "bg-ielts-writing",
+            module === "speaking" && "bg-ielts-speaking",
+            module === "level" && "bg-ielts-level",
+        )}>
+        {module === "reading" && <BsBook className="w-4 h-4" />}
+        {module === "listening" && <BsHeadphones className="w-4 h-4" />}
+        {module === "writing" && <BsPen className="w-4 h-4" />}
+        {module === "speaking" && <BsMegaphone className="w-4 h-4" />}
+        {module === "level" && <BsClipboard className="w-4 h-4" />}
+        {/* do not switch to level && it will convert the 0.0 to 0*/}
+        {level !== undefined && (<span className="text-sm">{level.toFixed(1)}</span>)}
+    </div>
+);
+
+export default ModuleBadge;
\ No newline at end of file
diff --git a/src/components/PermissionList.tsx b/src/components/PermissionList.tsx
index a54b8541..828c6aac 100644
--- a/src/components/PermissionList.tsx
+++ b/src/components/PermissionList.tsx
@@ -1,77 +1,62 @@
-import { Permission } from "@/interfaces/permissions";
-import {
-  createColumnHelper,
-  flexRender,
-  getCoreRowModel,
-  useReactTable,
-} from "@tanstack/react-table";
+import {Permission} from "@/interfaces/permissions";
+import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import Link from "next/link";
+import {convertCamelCaseToReadable} from "@/utils/string";
 
-
-interface Props{
-  permissions: Permission[]
+interface Props {
+	permissions: Permission[];
 }
 
 const columnHelper = createColumnHelper<Permission>();
 
 const defaultColumns = [
-  columnHelper.accessor('type', {
-    header: () => <span>Type</span>,
-    cell: ({row, getValue}) => (
-      <Link href={`/permissions/${row.original.id}`} key={row.id} className="underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer">
-       {getValue() as string}
-        </Link>
-    )
-  })
+	columnHelper.accessor("type", {
+		header: () => <span>Type</span>,
+		cell: ({row, getValue}) => (
+			<Link
+				href={`/permissions/${row.original.id}`}
+				key={row.id}
+				className="underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer">
+				{convertCamelCaseToReadable(getValue() as string)}
+			</Link>
+		),
+	}),
 ];
 
 export default function PermissionList({permissions}: Props) {
-  
-  const table = useReactTable({
-    data: permissions,
-    columns: defaultColumns,
-    getCoreRowModel: getCoreRowModel(),
-
-  })
-  return (
-    <div className="w-full">
-        <div className="w-full flex flex-col gap-2">
-          <table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
-            <thead>
-              {table.getHeaderGroups().map((headerGroup) => (
-                <tr key={headerGroup.id}>
-                  {headerGroup.headers.map((header) => (
-                    <th className="py-4 px-4 text-left" key={header.id}>
-                      {header.isPlaceholder
-                        ? null
-                        : flexRender(
-                            header.column.columnDef.header,
-                            header.getContext()
-                          )}
-                    </th>
-                  ))}
-                </tr>
-              ))}
-            </thead>
-            <tbody className="px-2">
-              {table.getRowModel().rows.map((row) => (
-                <tr
-                  className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
-                  key={row.id}
-                >
-                  {row.getVisibleCells().map((cell) => (
-                    <td className="px-4 py-2 items-center w-fit" key={cell.id}>
-                      {flexRender(
-                        cell.column.columnDef.cell,
-                        cell.getContext()
-                      )}
-                    </td>
-                  ))}
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </div>
-      </div>
-  )
+	const table = useReactTable({
+		data: permissions,
+		columns: defaultColumns,
+		getCoreRowModel: getCoreRowModel(),
+	});
+	return (
+		<div className="w-full">
+			<div className="w-full flex flex-col gap-2">
+				<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
+					<thead>
+						{table.getHeaderGroups().map((headerGroup) => (
+							<tr key={headerGroup.id}>
+								{headerGroup.headers.map((header) => (
+									<th className="py-4 px-4 text-left" key={header.id}>
+										{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+									</th>
+								))}
+							</tr>
+						))}
+					</thead>
+					<tbody className="px-2">
+						{table.getRowModel().rows.map((row) => (
+							<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
+								{row.getVisibleCells().map((cell) => (
+									<td className="px-4 py-2 items-center w-fit" key={cell.id}>
+										{flexRender(cell.column.columnDef.cell, cell.getContext())}
+									</td>
+								))}
+							</tr>
+						))}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	);
 }
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 42f3b2c8..47eded75 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -14,6 +14,7 @@ import {
 	BsClipboardData,
 	BsFileLock,
 } from "react-icons/bs";
+import { CiDumbbell } from "react-icons/ci";
 import {RiLogoutBoxFill} from "react-icons/ri";
 import {SlPencil} from "react-icons/sl";
 import {FaAward} from "react-icons/fa";
@@ -109,6 +110,9 @@ export default function Sidebar({path, navDisabled = false, focusMode = false, u
 				{checkAccess(user, getTypesOfUser(["agent"]), "viewRecords") && (
 					<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" isMinimized={isMinimized} />
 				)}
+				{checkAccess(user, getTypesOfUser(["agent"]), "viewRecords") && (
+					<Nav disabled={disableNavigation} Icon={CiDumbbell} label="Training" path={path} keyPath="/training" isMinimized={isMinimized} />
+				)}
 				{checkAccess(user, ["admin", "developer", "agent", "corporate", "mastercorporate"], "viewPaymentRecords") && (
 					<Nav
 						disabled={disableNavigation}
@@ -171,6 +175,9 @@ export default function Sidebar({path, navDisabled = false, focusMode = false, u
 				{checkAccess(user, getTypesOfUser(["agent"]), "viewRecords") && (
 					<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" isMinimized={true} />
 				)}
+				{checkAccess(user, getTypesOfUser(["agent"]), "viewRecords") && (
+					<Nav disabled={disableNavigation} Icon={CiDumbbell} label="Training" path={path} keyPath="/training" isMinimized={true} />
+				)}
 				{checkAccess(user, getTypesOfUser(["student"])) && (
 					<Nav disabled={disableNavigation} Icon={BsShieldFill} label="Settings" path={path} keyPath="/settings" isMinimized={true} />
 				)}
diff --git a/src/components/Solutions/InteractiveSpeaking.tsx b/src/components/Solutions/InteractiveSpeaking.tsx
index f5c657d4..6038e1a9 100644
--- a/src/components/Solutions/InteractiveSpeaking.tsx
+++ b/src/components/Solutions/InteractiveSpeaking.tsx
@@ -24,7 +24,7 @@ export default function InteractiveSpeaking({
 	onBack,
 }: InteractiveSpeakingExercise & CommonProps) {
 	const [solutionsURL, setSolutionsURL] = useState<string[]>([]);
-	const [diffNumber, setDiffNumber] = useState<0 | 1 | 2 | 3>(0);
+	const [diffNumber, setDiffNumber] = useState(0);
 
 	useEffect(() => {
 		if (userSolutions && userSolutions.length > 0 && userSolutions[0].solution) {
@@ -115,13 +115,13 @@ export default function InteractiveSpeaking({
 								{userSolutions &&
 									userSolutions.length > 0 &&
 									userSolutions[0].evaluation &&
-									userSolutions[0].evaluation[`transcript_${(index + 1) as 1 | 2 | 3}`] &&
-									userSolutions[0].evaluation[`fixed_text_${(index + 1) as 1 | 2 | 3}`] && (
+									userSolutions[0].evaluation[`transcript_${(index + 1)}`] &&
+									userSolutions[0].evaluation[`fixed_text_${(index + 1)}`] && (
 										<Button
 											className="w-full max-w-[180px] !py-2 self-center"
 											color="pink"
 											variant="outline"
-											onClick={() => setDiffNumber((index + 1) as 1 | 2 | 3)}>
+											onClick={() => setDiffNumber((index + 1))}>
 											View Correction
 										</Button>
 									)}
@@ -144,9 +144,20 @@ export default function InteractiveSpeaking({
 								})}
 							</div>
 							{userSolutions[0].evaluation &&
-							Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).length === 3 ? (
+								Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).length > 0 ? (
 								<Tab.Group>
 									<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
+										<Tab
+											className={({selected}) =>
+												clsx(
+													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
+													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
+													"transition duration-300 ease-in-out",
+													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+												)
+											}>
+											General Feedback
+										</Tab>
 										<Tab
 											className={({selected}) =>
 												clsx(
@@ -158,70 +169,22 @@ export default function InteractiveSpeaking({
 											}>
 											Evaluation
 										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer (Prompt 1)
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer (Prompt 2)
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer (Prompt 3)
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Global Overview
-										</Tab>
+										{Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).map((key, index) => (
+											<Tab
+												key={key}
+												className={({ selected }) =>
+													clsx(
+														"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
+														"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
+														"transition duration-300 ease-in-out",
+														selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+													)
+												}>
+												Recommended Answer<br />(Prompt {index + 1})
+											</Tab>
+										))}
 									</Tab.List>
 									<Tab.Panels>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer_1!.answer.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer_2!.answer.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer_3!.answer.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
 										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
 											<div className="flex flex-col gap-4">
 												{Object.keys(userSolutions[0].evaluation!.task_response).map((key) => {
@@ -230,15 +193,25 @@ export default function InteractiveSpeaking({
 
 													return (
 														<div key={key} className="flex flex-col gap-2">
-															<span className={"font-semibold"}>
+															<div className={clsx("bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 w-fit")} key={key}>
 																{key}: Level {grade}
-															</span>
-															{typeof taskResponse !== "number" && <span>{taskResponse.comment}</span>}
+															</div>
+															{typeof taskResponse !== "number" && <span className="px-2 py-2">{taskResponse.comment}</span>}
 														</div>
 													);
 												})}
 											</div>
 										</Tab.Panel>
+										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
+											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
+										</Tab.Panel>
+										{Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).map((key, index) => (
+											<Tab.Panel key={key} className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
+												<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
+													{userSolutions[0].evaluation![`perfect_answer_${(index + 1)}`].answer.replaceAll(/\s{2,}/g, "\n\n")}
+												</span>
+											</Tab.Panel>
+										))}
 									</Tab.Panels>
 								</Tab.Group>
 							) : (
diff --git a/src/components/Solutions/Speaking.tsx b/src/components/Solutions/Speaking.tsx
index 6b1fef98..90501894 100644
--- a/src/components/Solutions/Speaking.tsx
+++ b/src/components/Solutions/Speaking.tsx
@@ -138,7 +138,7 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 								})}
 							</div>
 							{userSolutions[0].evaluation &&
-							(userSolutions[0].evaluation.perfect_answer || userSolutions[0].evaluation.perfect_answer_1) ? (
+								(userSolutions[0].evaluation.perfect_answer || userSolutions[0].evaluation.perfect_answer_1) ? (
 								<Tab.Group>
 									<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
 										<Tab
@@ -150,10 +150,21 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
 												)
 											}>
+											General Feedback
+										</Tab>
+										<Tab
+											className={({ selected }) =>
+												clsx(
+													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
+													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
+													"transition duration-300 ease-in-out",
+													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+												)
+											}>
 											Evaluation
 										</Tab>
 										<Tab
-											className={({selected}) =>
+											className={({ selected }) =>
 												clsx(
 													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
 													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
@@ -163,30 +174,9 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 											}>
 											Recommended Answer
 										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Global Overview
-										</Tab>
 									</Tab.List>
 									<Tab.Panels>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer &&
-													userSolutions[0].evaluation!.perfect_answer.replaceAll(/\s{2,}/g, "\n\n")}
-												{userSolutions[0].evaluation!.perfect_answer_1 &&
-													userSolutions[0].evaluation!.perfect_answer_1.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
+										{/* General Feedback */}
 										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
 											<div className="flex flex-col gap-4">
 												{Object.keys(userSolutions[0].evaluation!.task_response).map((key) => {
@@ -195,15 +185,28 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 
 													return (
 														<div key={key} className="flex flex-col gap-2">
-															<span className={"font-semibold"}>
+															<div className={clsx("bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 w-fit")} key={key}>
 																{key}: Level {grade}
-															</span>
-															{typeof taskResponse !== "number" && <span>{taskResponse.comment}</span>}
+															</div>
+															{typeof taskResponse !== "number" && <span className="px-2 py-2">{taskResponse.comment}</span>}
 														</div>
 													);
 												})}
 											</div>
 										</Tab.Panel>
+										{/* Evaluation */}
+										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
+											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
+										</Tab.Panel>
+										{/* Recommended Answer */}
+										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
+											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
+												{userSolutions[0].evaluation!.perfect_answer &&
+													userSolutions[0].evaluation!.perfect_answer.replaceAll(/\s{2,}/g, "\n\n")}
+												{userSolutions[0].evaluation!.perfect_answer_1 &&
+													userSolutions[0].evaluation!.perfect_answer_1.replaceAll(/\s{2,}/g, "\n\n")}
+											</span>
+										</Tab.Panel>
 									</Tab.Panels>
 								</Tab.Group>
 							) : (
@@ -224,7 +227,7 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 						onBack({
 							exercise: id,
 							solutions: userSolutions,
-							score: {total: 100, missing: 0, correct: speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
+							score: { total: 100, missing: 0, correct: speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 },
 							type,
 						})
 					}
diff --git a/src/components/Solutions/Writing.tsx b/src/components/Solutions/Writing.tsx
index e24aab44..37eea2cf 100644
--- a/src/components/Solutions/Writing.tsx
+++ b/src/components/Solutions/Writing.tsx
@@ -137,6 +137,17 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 							{userSolutions[0].evaluation && userSolutions[0].evaluation.perfect_answer ? (
 								<Tab.Group>
 									<Tab.List className="flex space-x-1 rounded-xl bg-ielts-writing/20 p-1">
+										<Tab
+											className={({selected}) =>
+												clsx(
+													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-writing/80",
+													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-writing focus:outline-none focus:ring-2",
+													"transition duration-300 ease-in-out",
+													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-writing",
+												)
+											}>
+											General Feedback
+										</Tab>
 										<Tab
 											className={({selected}) =>
 												clsx(
@@ -159,17 +170,6 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 											}>
 											Recommended Answer
 										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-writing/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-writing focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-writing",
-												)
-											}>
-											Global Overview
-										</Tab>
 										{aiEval && user?.type !== "student" && (
 											<Tab
 												className={({selected}) =>
@@ -185,14 +185,7 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 										)}
 									</Tab.List>
 									<Tab.Panels>
-										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer.replaceAll(/\s{2,}/g, "\n\n").replaceAll("\\n", "\n")}
-											</span>
-										</Tab.Panel>
+										{/* Global */}
 										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
 											<div className="flex flex-col gap-4">
 												{Object.keys(userSolutions[0].evaluation!.task_response).map((key) => {
@@ -201,15 +194,25 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 
 													return (
 														<div key={key} className="flex flex-col gap-2">
-															<span className={"font-semibold"}>
+															<div className={clsx("bg-ielts-writing text-ielts-writing-light rounded-xl px-4 py-2 w-fit")} key={key}>
 																{key}: Level {grade}
-															</span>
-															{typeof taskResponse !== "number" && <span>{taskResponse.comment}</span>}
+															</div>
+															{typeof taskResponse !== "number" && <span className="px-2 py-2">{taskResponse.comment}</span>}
 														</div>
 													);
 												})}
 											</div>
 										</Tab.Panel>
+										{/* Evaluation */}
+										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
+											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
+										</Tab.Panel>
+										{/* Recommended Answer */}
+										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
+											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
+												{userSolutions[0].evaluation!.perfect_answer.replaceAll(/\s{2,}/g, "\n\n").replaceAll("\\n", "\n")}
+											</span>
+										</Tab.Panel>
 										{aiEval && user?.type !== "student" && (
 											<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
 												<AIDetection {...aiEval} />
diff --git a/src/components/StatGridItem.tsx b/src/components/StatGridItem.tsx
new file mode 100644
index 00000000..10c93fe6
--- /dev/null
+++ b/src/components/StatGridItem.tsx
@@ -0,0 +1,289 @@
+import React from 'react';
+import { BsClock, BsXCircle } from 'react-icons/bs';
+import clsx from 'clsx';
+import { Stat, User } from '@/interfaces/user';
+import { Module } from "@/interfaces";
+import ai_usage from "@/utils/ai.detection";
+import { calculateBandScore } from "@/utils/score";
+import moment from 'moment';
+import { Assignment } from '@/interfaces/results';
+import { uuidv4 } from "@firebase/util";
+import { useRouter } from "next/router";
+import { uniqBy } from "lodash";
+import { sortByModule } from "@/utils/moduleUtils";
+import { convertToUserSolutions } from "@/utils/stats";
+import { getExamById } from "@/utils/exams";
+import { Exam, UserSolution } from '@/interfaces/exam';
+import ModuleBadge from './ModuleBadge';
+
+const formatTimestamp = (timestamp: string | number) => {
+    const time = typeof timestamp === "string" ? parseInt(timestamp) : timestamp;
+    const date = moment(time);
+    const formatter = "YYYY/MM/DD - HH:mm";
+    return date.format(formatter);
+};
+
+const aggregateScoresByModule = (stats: Stat[]): { module: Module; total: number; missing: number; correct: number }[] => {
+    const scores: {
+        [key in Module]: { total: number; missing: number; correct: number };
+    } = {
+        reading: {
+            total: 0,
+            correct: 0,
+            missing: 0,
+        },
+        listening: {
+            total: 0,
+            correct: 0,
+            missing: 0,
+        },
+        writing: {
+            total: 0,
+            correct: 0,
+            missing: 0,
+        },
+        speaking: {
+            total: 0,
+            correct: 0,
+            missing: 0,
+        },
+        level: {
+            total: 0,
+            correct: 0,
+            missing: 0,
+        },
+    };
+
+    stats.forEach((x) => {
+        scores[x.module!] = {
+            total: scores[x.module!].total + x.score.total,
+            correct: scores[x.module!].correct + x.score.correct,
+            missing: scores[x.module!].missing + x.score.missing,
+        };
+    });
+
+    return Object.keys(scores)
+        .filter((x) => scores[x as Module].total > 0)
+        .map((x) => ({ module: x as Module, ...scores[x as Module] }));
+};
+
+interface StatsGridItemProps {
+    width?: string | undefined;
+    height?: string | undefined;
+    examNumber?: number | undefined;
+    stats: Stat[];
+    timestamp: string | number;
+    user: User,
+    assignments: Assignment[];
+    users: User[];
+    training?: boolean,
+    selectedTrainingExams?: string[];
+    maxTrainingExams?: number;
+    setSelectedTrainingExams?: React.Dispatch<React.SetStateAction<string[]>>;
+    setExams: (exams: Exam[]) => void;
+    setShowSolutions: (show: boolean) => void;
+    setUserSolutions: (solutions: UserSolution[]) => void;
+    setSelectedModules: (modules: Module[]) => void;
+    setInactivity: (inactivity: number) => void;
+    setTimeSpent: (time: number) => void;
+    renderPdfIcon: (session: string, color: string, textColor: string) => React.ReactNode;
+}
+
+const StatsGridItem: React.FC<StatsGridItemProps> = ({
+    stats,
+    timestamp,
+    user,
+    assignments,
+    users,
+    training,
+    selectedTrainingExams,
+    setSelectedTrainingExams,
+    setExams,
+    setShowSolutions,
+    setUserSolutions,
+    setSelectedModules,
+    setInactivity,
+    setTimeSpent,
+    renderPdfIcon,
+    width = undefined,
+    height = undefined,
+    examNumber = undefined,
+    maxTrainingExams = undefined
+}) => {
+    const router = useRouter();
+    const correct = stats.reduce((accumulator, current) => accumulator + current.score.correct, 0);
+    const total = stats.reduce((accumulator, current) => accumulator + current.score.total, 0);
+    const aggregatedScores = aggregateScoresByModule(stats).filter((x) => x.total > 0);
+    const assignmentID = stats.reduce((_, current) => current.assignment as any, "");
+    const assignment = assignments.find((a) => a.id === assignmentID);
+    const isDisabled = stats.some((x) => x.isDisabled);
+
+    const aiUsage = Math.round(ai_usage(stats) * 100);
+
+    const aggregatedLevels = aggregatedScores.map((x) => ({
+        module: x.module,
+        level: calculateBandScore(x.correct, x.total, x.module, user.focus),
+    }));
+
+    const textColor = clsx(
+        correct / total >= 0.7 && "text-mti-purple",
+        correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
+        correct / total < 0.3 && "text-mti-rose",
+    );
+
+    const { timeSpent, inactivity, session } = stats[0];
+
+    const selectExam = () => {
+        if (training && !isDisabled && typeof maxTrainingExams !== "undefined" && typeof setSelectedTrainingExams !== "undefined" && typeof timestamp == "string") {
+            setSelectedTrainingExams(prevExams => {
+                const uniqueExams = [...new Set(stats.map(stat => `${stat.module}-${stat.date}`))];
+                const indexes = uniqueExams.map(exam => prevExams.indexOf(exam)).filter(index => index !== -1);
+                if (indexes.length > 0) {
+                    const newExams = [...prevExams];
+                    indexes.sort((a, b) => b - a).forEach(index => {
+                        newExams.splice(index, 1);
+                    });
+                    return newExams;
+                } else {
+                    if (prevExams.length + uniqueExams.length <= maxTrainingExams) {
+                        return [...prevExams, ...uniqueExams];
+                    } else {
+                        return prevExams;
+                    }
+                }
+            });
+        } else {
+            const examPromises = uniqBy(stats, "exam").map((stat) => {
+                return getExamById(stat.module, stat.exam);
+            });
+
+            if (isDisabled) return;
+
+            Promise.all(examPromises).then((exams) => {
+                if (exams.every((x) => !!x)) {
+                    if (!!timeSpent) setTimeSpent(timeSpent);
+                    if (!!inactivity) setInactivity(inactivity);
+                    setUserSolutions(convertToUserSolutions(stats));
+                    setShowSolutions(true);
+                    setExams(exams.map((x) => x!).sort(sortByModule));
+                    setSelectedModules(
+                        exams
+                            .map((x) => x!)
+                            .sort(sortByModule)
+                            .map((x) => x!.module),
+                    );
+                    router.push("/exercises");
+                }
+            });
+        }
+    };
+
+    const content = (
+        <>
+            <div className="w-full flex justify-between -md:items-center 2xl:items-center">
+                <div className="flex flex-col md:gap-1 -md:gap-2 2xl:gap-2">
+                    <span className="font-medium">{formatTimestamp(timestamp)}</span>
+                    <div className="flex items-center gap-2">
+                        {!!timeSpent && (
+                            <span className="text-sm flex gap-2 items-center tooltip" data-tip="Time Spent">
+                                <BsClock /> {Math.floor(timeSpent / 60)} minutes
+                            </span>
+                        )}
+                        {!!inactivity && (
+                            <span className="text-sm flex gap-2 items-center tooltip" data-tip="Inactivity">
+                                <BsXCircle /> {Math.floor(inactivity / 60)} minutes
+                            </span>
+                        )}
+                    </div>
+                </div>
+                <div className="flex flex-col gap-2">
+                    <div className="flex flex-row gap-2">
+                        <span className={textColor}>
+                            Level{" "}
+                            {(aggregatedLevels.reduce((accumulator, current) => accumulator + current.level, 0) / aggregatedLevels.length).toFixed(1)}
+                        </span>
+                        {renderPdfIcon(session, textColor, textColor)}
+                    </div>
+                    {examNumber === undefined ? (
+                        <>
+                            {aiUsage >= 50 && user.type !== "student" && (
+                                <div className={clsx(
+                                    "ml-auto border px-1 rounded w-fit mr-1",
+                                    {
+                                        'bg-orange-100 border-orange-400 text-orange-700': aiUsage < 80,
+                                        'bg-red-100 border-red-400 text-red-700': aiUsage >= 80,
+                                    }
+                                )}>
+                                    <span className="text-xs">AI Usage</span>
+                                </div>
+                            )}
+                        </>
+                    ) : (
+                        <div className='flex justify-end'>
+                            <span className="font-semibold bg-gray-200 text-gray-800 px-2.5 py-0.5 rounded-full mt-0.5">{examNumber}</span>
+                        </div>
+                    )}
+                </div>
+            </div>
+
+            <div className="w-full flex flex-col gap-1">
+                <div className={clsx(
+                    "grid grid-cols-4 gap-2 place-items-start w-full -md:mt-2",
+                    examNumber !== undefined && "pr-10" 
+                )}>
+                    {aggregatedLevels.map(({ module, level }) => (
+                        <ModuleBadge key={module} module={module} level={level} />
+                    ))}
+                </div>
+
+                {assignment && (
+                    <span className="font-light text-sm">
+                        Assignment: {assignment.name}, Teacher: {users.find((u) => u.id === assignment.assigner)?.name}
+                    </span>
+                )}
+            </div>
+        </>
+    );
+
+    return (
+        <>
+            <div
+                key={uuidv4()}
+                className={clsx(
+                    "flex flex-col justify-between gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden",
+                    isDisabled && "grayscale tooltip",
+                    correct / total >= 0.7 && "hover:border-mti-purple",
+                    correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
+                    correct / total < 0.3 && "hover:border-mti-rose",
+                    typeof selectedTrainingExams !== "undefined" && typeof timestamp === "string" && selectedTrainingExams.some(exam => exam.includes(timestamp)) && "border-2 border-slate-600",
+                )}
+                onClick={examNumber === undefined ? selectExam : undefined}
+                style={{
+                    ...(width !== undefined && { width }),
+                    ...(height !== undefined && { height }),
+                }}
+                data-tip="This exam is still being evaluated..."
+                role="button">
+                {content}
+            </div>
+            <div
+                key={uuidv4()}
+                className={clsx(
+                    "flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:tooltip md:hidden",
+                    correct / total >= 0.7 && "hover:border-mti-purple",
+                    correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
+                    correct / total < 0.3 && "hover:border-mti-rose",
+                )}
+                data-tip="Your screen size is too small to view previous exams."
+                style={{
+                    ...(width !== undefined && { width }),
+                    ...(height !== undefined && { height }),
+                }}
+                role="button">
+                {content}
+            </div>
+        </>
+    );
+};
+
+export default StatsGridItem;
\ No newline at end of file
diff --git a/src/components/TrainingContent/AnimatedHighlight.tsx b/src/components/TrainingContent/AnimatedHighlight.tsx
new file mode 100644
index 00000000..493907c2
--- /dev/null
+++ b/src/components/TrainingContent/AnimatedHighlight.tsx
@@ -0,0 +1,23 @@
+import { useCallback } from "react";
+
+const HighlightedContent: React.FC<{ html: string; highlightPhrases: string[] }> = ({ html, highlightPhrases }) => {
+
+    const createHighlightedContent = useCallback(() => {
+        if (highlightPhrases.length === 0) {
+            return { __html: html };
+        }
+
+        const escapeRegExp = (string: string) => {
+            return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        };
+
+        const regex = new RegExp(`(${highlightPhrases.map(escapeRegExp).join('|')})`, 'gi');
+        const highlightedHtml = html.replace(regex, (match) => `<span style="background-color: yellow;">${match}</span>`);
+
+        return { __html: highlightedHtml };
+    }, [html, highlightPhrases]);
+
+    return <div dangerouslySetInnerHTML={createHighlightedContent()} />;
+};
+
+export default HighlightedContent;
diff --git a/src/components/TrainingContent/Exercise.tsx b/src/components/TrainingContent/Exercise.tsx
new file mode 100644
index 00000000..984a30be
--- /dev/null
+++ b/src/components/TrainingContent/Exercise.tsx
@@ -0,0 +1,91 @@
+import React, { useState, useCallback } from "react";
+import ExerciseWalkthrough from "@/training/ExerciseWalkthrough";
+import { ITrainingTip, WalkthroughConfigs } from "./TrainingInterfaces";
+
+
+// This wrapper is just to test new exercises from the handbook, will be removed when all the tips and exercises are in firestore
+const TrainingExercise: React.FC<ITrainingTip> = (trainingTip: ITrainingTip) => {
+  const leftText = "<div class=\"container mx-auto px-4 overflow-x-auto\"><table class=\"min-w-full bg-white border border-gray-300\"><thead><tr class=\"bg-gray-100\"><th class=\"py-2 px-4 border-b font-semibold text-left\">Category</th><th class=\"py-2 px-4 border-b font-semibold text-left\">Option A</th><th class=\"py-2 px-4 border-b font-semibold text-left\">Option B</th></tr></thead><tbody><tr><td class=\"py-2 px-4 border-b font-medium\">Self</td><td class=\"py-2 px-4 border-b\">You need to take care of yourself and connect with the people around you.</td><td class=\"py-2 px-4 border-b\">Focus on your interests and talents and meet people who are like you.</td></tr><tr class=\"bg-gray-50\"><td class=\"py-2 px-4 border-b font-medium\">Home</td><td class=\"py-2 px-4 border-b\">It's a good idea to paint your living room yellow.</td><td class=\"py-2 px-4 border-b\">You should arrange your home so that it makes you feel happy.</td></tr><tr><td class=\"py-2 px-4 border-b font-medium\">Financial Life</td><td class=\"py-2 px-4 border-b\">You can be happy if you have enough money, but don't want money too much.</td><td class=\"py-2 px-4 border-b\">If you waste money on things you don't need, you won't have enough money for things that you do need.</td></tr><tr class=\"bg-gray-50\"><td class=\"py-2 px-4 border-b font-medium\">Social Life</td><td class=\"py-2 px-4 border-b\">A good group of friends can increase your happiness.</td><td class=\"py-2 px-4 border-b\">Researchers say that a happy friend can increase our mood by nine percent.</td></tr><tr><td class=\"py-2 px-4 border-b font-medium\">Workplace</td><td class=\"py-2 px-4 border-b\">You spend a lot of time at work, so you should like your workplace.</td><td class=\"py-2 px-4 border-b\">Your boss needs to be someone you enjoy working for.</td></tr><tr class=\"bg-gray-50\"><td class=\"py-2 px-4 border-b font-medium\">Community</td><td class=\"py-2 px-4 border-b\">The place where you live is more important for happiness than anything else.</td><td class=\"py-2 px-4 border-b\">Live around people who have the same amount of money as you do.</td></tr></tbody></table></div>";
+  const tip = {
+    category: "Strategy",
+    body: "<p>Look for <b>clues to the main idea</b> in the first (and sometimes second) sentence of a paragraph.</p>"
+  }
+  const question = "<div class=\"container mx-auto px-4 py-8\"><h2 class=\"text-2xl font-bold mb-4\">Identifying Main Ideas</h2><p class=\"text-lg leading-relaxed mb-6\">Read the statements below. Circle the main idea in each pair of statements (a or b).</p></div>";
+  const rightTextData: WalkthroughConfigs[] = [
+    {
+      "html": "<div class='bg-blue-100 p-4 rounded-lg mb-4'><h2 class='text-xl font-bold mb-2'>Identifying Main Ideas</h2><p class='text-gray-700 leading-relaxed'>Let's analyze each pair of statements to determine which one represents the main idea. We'll focus on which statement is more general and encompasses the overall concept.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 5000,
+      "highlight": []
+    },
+    {
+      "html": "<div class='bg-green-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>1. Self</h3><p class='text-gray-700 leading-relaxed'>Main idea: <b>A. You need to take care of yourself and connect with the people around you.</b></p><p class='mt-2'>This statement is more comprehensive, covering both self-care and social connections. Option B is more specific and could be considered a subset of A.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": ["You need to take care of yourself and connect with the people around you."]
+    },
+    {
+      "html": "<div class='bg-yellow-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>2. Home</h3><p class='text-gray-700 leading-relaxed'>Main idea: <b>B. You should arrange your home so that it makes you feel happy.</b></p><p class='mt-2'>This statement is more general and applies to the entire home. Option A is a specific example that could fall under this broader concept.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": ["You should arrange your home so that it makes you feel happy."]
+    },
+    {
+      "html": "<div class='bg-pink-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>3. Financial Life</h3><p class='text-gray-700 leading-relaxed'>Main idea: <b>A. You can be happy if you have enough money, but don't want money too much.</b></p><p class='mt-2'>This statement provides a balanced view of money's role in happiness. Option B is more specific and could be seen as a consequence of wanting money too much.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": ["You can be happy if you have enough money, but don't want money too much."]
+    },
+    {
+      "html": "<div class='bg-purple-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>4. Social Life</h3><p class='text-gray-700 leading-relaxed'>Main idea: <b>A. A good group of friends can increase your happiness.</b></p><p class='mt-2'>This statement is more general about the impact of friendships. Option B provides a specific statistic that supports this main idea.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": ["A good group of friends can increase your happiness."]
+    },
+    {
+      "html": "<div class='bg-indigo-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>5. Workplace</h3><p class='text-gray-700 leading-relaxed'>Main idea: <b>A. You spend a lot of time at work, so you should like your workplace.</b></p><p class='mt-2'>This statement covers the overall importance of workplace satisfaction. Option B focuses on one specific aspect (the boss) and is less comprehensive.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": ["You spend a lot of time at work, so you should like your workplace."]
+    },
+    {
+      "html": "<div class='bg-red-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>6. Community</h3><p class='text-gray-700 leading-relaxed'>Main idea: <b>A. The place where you live is more important for happiness than anything else.</b></p><p class='mt-2'>While this statement might be debatable, it's more general and encompasses the overall importance of community. Option B is a specific suggestion about community demographics.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": ["The place where you live is more important for happiness than anything else."]
+    },
+    {
+      "html": "<div class='bg-orange-50 p-4 rounded-lg mb-4'><h3 class='text-lg font-semibold mb-2'>Key Strategy</h3><p class='text-gray-700 leading-relaxed'>When identifying main ideas:</p><ul class='list-disc pl-5 space-y-2'><li>Look for broader, more encompassing statements</li><li>Consider which statement other ideas could fall under</li><li>Identify which statement provides a general principle rather than a specific example</li></ul></div>",
+      "wordDelay": 200,
+      "holdDelay": 8000,
+      "highlight": []
+    },
+    {
+      "html": "<div class='bg-teal-50 p-4 rounded-lg'><h3 class='text-lg font-semibold mb-2'>Helpful Tip</h3><p class='text-gray-700 leading-relaxed'>Remember to look for clues to the main idea in the first (and sometimes second) sentence of a paragraph. In this exercise, we applied this concept to pairs of statements. This approach can help you quickly identify the central theme or main point in various types of text.</p></div>",
+      "wordDelay": 200,
+      "holdDelay": 5000,
+      "highlight": []
+    }
+  ]
+
+  const mockTip: ITrainingTip = {
+      id: "some random id",
+      tipCategory: tip.category,
+      tipHtml: tip.body,
+      standalone: false,
+      exercise: {
+        question: question,
+        highlightable: leftText,
+        segments: rightTextData
+      }
+  }
+
+  return (
+    <div className="flex flex-col p-10">
+      <ExerciseWalkthrough {...trainingTip}
+      />
+    </div>
+  );
+}
+
+export default TrainingExercise;
\ No newline at end of file
diff --git a/src/components/TrainingContent/ExerciseWalkthrough.tsx b/src/components/TrainingContent/ExerciseWalkthrough.tsx
new file mode 100644
index 00000000..07ea16ff
--- /dev/null
+++ b/src/components/TrainingContent/ExerciseWalkthrough.tsx
@@ -0,0 +1,287 @@
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { animated } from '@react-spring/web';
+import { FaRegCirclePlay, FaRegCircleStop } from "react-icons/fa6";
+import HighlightedContent from './AnimatedHighlight';
+import { ITrainingTip, SegmentRef, TimelineEvent } from './TrainingInterfaces';
+
+
+const ExerciseWalkthrough: React.FC<ITrainingTip> = (tip: ITrainingTip) => {
+    const [isAutoPlaying, setIsAutoPlaying] = useState<boolean>(false);
+    const [currentTime, setCurrentTime] = useState<number>(0);
+    const [walkthroughHtml, setWalkthroughHtml] = useState<string>('');
+    const [highlightedPhrases, setHighlightedPhrases] = useState<string[]>([]);
+    const [isPlaying, setIsPlaying] = useState<boolean>(false);
+    const timelineRef = useRef<TimelineEvent[]>([]);
+    const animationRef = useRef<number | null>(null);
+    const segmentsRef = useRef<SegmentRef[]>([]);
+
+    const toggleAutoPlay = useCallback(() => {
+        setIsAutoPlaying((prev) => {
+            if (!prev && currentTime === getMaxTime()) {
+                setCurrentTime(0);
+            }
+            return !prev;
+        });
+    }, [currentTime]);
+
+    const handleAnimationComplete = useCallback(() => {
+        setIsAutoPlaying(false);
+    }, []);
+
+    const handleResetAnimation = useCallback((newTime: number) => {
+        setCurrentTime(newTime);
+    }, []);
+
+    const getMaxTime = (): number => {
+        return tip.exercise?.segments.reduce((sum, segment) =>
+            sum + segment.wordDelay * segment.html.split(/\s+/).length + segment.holdDelay, 0
+        ) ?? 0;
+    };
+
+    useEffect(() => {
+        const timeline: TimelineEvent[] = [];
+        let currentTimePosition = 0;
+        segmentsRef.current = [];
+
+        tip.exercise?.segments.forEach((segment, index) => {
+            const parser = new DOMParser();
+            const doc = parser.parseFromString(segment.html, 'text/html');
+            const words: string[] = [];
+            const walkTree = (node: Node) => {
+                if (node.nodeType === Node.TEXT_NODE) {
+                    words.push(...(node.textContent?.split(/\s+/).filter(word => word.length > 0) || []));
+                } else if (node.nodeType === Node.ELEMENT_NODE) {
+                    Array.from(node.childNodes).forEach(walkTree);
+                }
+            };
+            walkTree(doc.body);
+
+            const textDuration = words.length * segment.wordDelay;
+
+            segmentsRef.current.push({
+                ...segment,
+                words: words,
+                startTime: currentTimePosition,
+                endTime: currentTimePosition + textDuration
+            });
+
+            timeline.push({
+                type: 'text',
+                start: currentTimePosition,
+                end: currentTimePosition + textDuration,
+                segmentIndex: index
+            });
+
+            currentTimePosition += textDuration;
+
+            timeline.push({
+                type: 'highlight',
+                start: currentTimePosition,
+                end: currentTimePosition + segment.holdDelay,
+                content: segment.highlight,
+                segmentIndex: index
+            });
+
+            currentTimePosition += segment.holdDelay;
+        });
+
+        timelineRef.current = timeline;
+    }, [tip.exercise?.segments]);
+
+    const updateText = useCallback(() => {
+        const currentEvent = timelineRef.current.find(
+            event => currentTime >= event.start && currentTime < event.end
+        );
+
+        if (currentEvent) {
+            if (currentEvent.type === 'text') {
+                const segment = segmentsRef.current[currentEvent.segmentIndex];
+                const elapsedTime = currentTime - currentEvent.start;
+                const wordsToShow = Math.min(Math.floor(elapsedTime / segment.wordDelay), segment.words.length);
+
+                const previousSegmentsHtml = segmentsRef.current
+                    .slice(0, currentEvent.segmentIndex)
+                    .map(seg => seg.html)
+                    .join('');
+
+                const parser = new DOMParser();
+                const doc = parser.parseFromString(segment.html, 'text/html');
+                let wordCount = 0;
+                const walkTree = (node: Node, action: (node: Node) => void): boolean => {
+                    if (node.nodeType === Node.TEXT_NODE && node.textContent) {
+                        const words = node.textContent.split(/(\s+)/).filter(word => word.length > 0);
+                        if (wordCount + words.filter(w => !/\s+/.test(w)).length <= wordsToShow) {
+                            action(node.cloneNode(true));
+                            wordCount += words.filter(w => !/\s+/.test(w)).length;
+                        } else {
+                            const remainingWords = wordsToShow - wordCount;
+                            const newTextContent = words.reduce((acc, word) => {
+                                if (!/\s+/.test(word) && acc.nonSpaceWords < remainingWords) {
+                                    acc.text += word;
+                                    acc.nonSpaceWords++;
+                                } else if (/\s+/.test(word) || acc.nonSpaceWords < remainingWords) {
+                                    acc.text += word;
+                                }
+                                return acc;
+                            }, { text: '', nonSpaceWords: 0 }).text;
+                            const newNode = node.cloneNode(false);
+                            newNode.textContent = newTextContent;
+                            action(newNode);
+                            wordCount = wordsToShow;
+                        }
+                    } else if (node.nodeType === Node.ELEMENT_NODE) {
+                        const clone = node.cloneNode(false);
+                        action(clone);
+                        Array.from(node.childNodes).some(child => {
+                            return walkTree(child, childNode => (clone as Node).appendChild(childNode));
+                        });
+                    }
+                    return wordCount >= wordsToShow;
+                };
+                const fragment = document.createDocumentFragment();
+                walkTree(doc.body, node => fragment.appendChild(node));
+
+                const serializer = new XMLSerializer();
+                const currentSegmentHtml = Array.from(fragment.childNodes)
+                    .map(node => serializer.serializeToString(node))
+                    .join('');
+                const newHtml = previousSegmentsHtml + currentSegmentHtml;
+
+                setWalkthroughHtml(newHtml);
+                setHighlightedPhrases([]);
+            } else if (currentEvent.type === 'highlight') {
+                const newHtml = segmentsRef.current
+                    .slice(0, currentEvent.segmentIndex + 1)
+                    .map(seg => seg.html)
+                    .join('');
+                setWalkthroughHtml(newHtml);
+                setHighlightedPhrases(currentEvent.content || []);
+            }
+        }
+    }, [currentTime]);
+
+    useEffect(() => {
+        updateText();
+    }, [currentTime, updateText]);
+
+    useEffect(() => {
+        if (isAutoPlaying) {
+            const lastEvent = timelineRef.current[timelineRef.current.length - 1];
+            if (lastEvent && currentTime >= lastEvent.end) {
+                setCurrentTime(0);
+            }
+            setIsPlaying(true);
+        } else {
+            setIsPlaying(false);
+        }
+    }, [isAutoPlaying, currentTime]);
+
+    useEffect(() => {
+        const animate = () => {
+            if (isPlaying) {
+                setCurrentTime((prevTime) => {
+                    const newTime = prevTime + 50;
+                    const lastEvent = timelineRef.current[timelineRef.current.length - 1];
+                    if (lastEvent && newTime >= lastEvent.end) {
+                        setIsPlaying(false);
+                        handleAnimationComplete();
+                        return lastEvent.end;
+                    }
+                    return newTime;
+                });
+            }
+            animationRef.current = requestAnimationFrame(animate);
+        };
+
+        animationRef.current = requestAnimationFrame(animate);
+
+        return () => {
+            if (animationRef.current) {
+                cancelAnimationFrame(animationRef.current);
+            }
+        };
+    }, [isPlaying, handleAnimationComplete]);
+
+    const handleSliderChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const newTime = parseInt(e.target.value, 10);
+        setCurrentTime(newTime);
+        handleResetAnimation(newTime);
+    };
+
+    const handleSliderMouseDown = () => {
+        setIsPlaying(false);
+    };
+
+    const handleSliderMouseUp = () => {
+        if (isAutoPlaying) {
+            setIsPlaying(true);
+        }
+    };
+
+    if (tip.standalone || !tip.exercise) {
+        return (
+            <div className="container mx-auto">
+                <h1 className='text-xl font-bold text-red-600'>The exercise for this tip is not available yet!</h1>
+                <div className="tip-container bg-blue-100 p-4 rounded-lg shadow-md mb-4 mt-10">
+                    <h3 className="text-xl font-semibold text-blue-800 mb-2">{tip.tipCategory}</h3>
+                    <div className="text-gray-700" dangerouslySetInnerHTML={{ __html: tip.tipHtml }} />
+                </div>
+            </div>
+        );
+    }
+
+
+    return (
+        <div className="container mx-auto">
+            <div className="tip-container bg-blue-100 p-4 rounded-lg shadow-md mb-4">
+                <h3 className="text-xl font-semibold text-blue-800 mb-2">{tip.tipCategory}</h3>
+                <div className="text-gray-700" dangerouslySetInnerHTML={{ __html: tip.tipHtml }} />
+            </div>
+            <div className='flex flex-col space-y-4'>
+                <div className='flex flex-row items-center space-x-4 py-4'>
+                    <button
+                        onClick={toggleAutoPlay}
+                        className="p-2 bg-blue-500 text-white rounded-full transition-colors duration-200 hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-opacity-50"
+                        aria-label={isAutoPlaying ? 'Pause' : 'Play'}
+                    >
+                        {isAutoPlaying ? (
+                            <FaRegCircleStop className="w-6 h-6" />
+                        ) : (
+                            <FaRegCirclePlay className="w-6 h-6" />
+                        )}
+                    </button>
+                    <input
+                        type="range"
+                        min="0"
+                        max={timelineRef.current.length > 0 ? timelineRef.current[timelineRef.current.length - 1].end : 0}
+                        value={currentTime}
+                        onChange={handleSliderChange}
+                        onMouseDown={handleSliderMouseDown}
+                        onMouseUp={handleSliderMouseUp}
+                        onTouchStart={handleSliderMouseDown}
+                        onTouchEnd={handleSliderMouseUp}
+                        className='flex-grow'
+                    />
+                </div>
+                <div className='flex flex-col md:flex-row space-y-4 md:space-y-0 md:space-x-4'>
+                    <div className='flex-1 bg-white p-6 rounded-lg shadow'>
+                        {/*<h2 className="text-xl font-bold mb-4">Question</h2>*/}
+                        <div className="mb-4" dangerouslySetInnerHTML={{ __html: tip.exercise.question }} />
+                        <HighlightedContent html={tip.exercise.highlightable} highlightPhrases={highlightedPhrases} />
+                    </div>
+                    <div className='flex-1'>
+                        <div className='bg-gray-50 rounded-lg shadow'>
+                            <div className='p-6 space-y-4'>
+                                <animated.div
+                                    dangerouslySetInnerHTML={{ __html: walkthroughHtml }}
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default ExerciseWalkthrough;
diff --git a/src/components/TrainingContent/TrainingInterfaces.ts b/src/components/TrainingContent/TrainingInterfaces.ts
new file mode 100644
index 00000000..549531d2
--- /dev/null
+++ b/src/components/TrainingContent/TrainingInterfaces.ts
@@ -0,0 +1,56 @@
+import { Stat } from "@/interfaces/user";
+
+export interface ITrainingContent {
+    id: string;
+    created_at: number;
+    exams: {
+        id: string;
+        date: number;
+        detailed_summary: string;
+        performance_comment: string;
+        score: number;
+        module: string;
+        stat_ids: string[];
+        stats?: Stat[];
+    }[];
+    tip_ids: string[];
+    tips?: ITrainingTip[];
+    weak_areas: {
+        area: string;
+        comment: string;
+    }[];
+}
+
+export interface ITrainingTip {
+    id: string;
+    tipCategory: string;
+    tipHtml: string;
+    standalone: boolean;
+    exercise?: {
+        question: string;
+        highlightable: string;
+        segments: WalkthroughConfigs[]
+    }
+}
+
+export interface WalkthroughConfigs {
+    html: string;
+    wordDelay: number;
+    holdDelay: number;
+    highlight: string[];
+}
+
+
+export interface TimelineEvent {
+    type: 'text' | 'highlight';
+    start: number;
+    end: number;
+    segmentIndex: number;
+    content?: string[];
+}
+
+export interface SegmentRef extends WalkthroughConfigs {
+    words: string[];
+    startTime: number;
+    endTime: number;
+}
\ No newline at end of file
diff --git a/src/components/TrainingContent/TrainingScore.tsx b/src/components/TrainingContent/TrainingScore.tsx
new file mode 100644
index 00000000..3f066dfd
--- /dev/null
+++ b/src/components/TrainingContent/TrainingScore.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import { RiArrowRightUpLine, RiArrowLeftDownLine } from 'react-icons/ri';
+import { FaChartLine } from 'react-icons/fa';
+import { GiLightBulb } from 'react-icons/gi';
+import clsx from 'clsx';
+import { ITrainingContent } from './TrainingInterfaces';
+
+interface TrainingScoreProps {
+    trainingContent: ITrainingContent
+    gridView: boolean;
+}
+
+const TrainingScore: React.FC<TrainingScoreProps> = ({
+    trainingContent,
+    gridView
+}) => {
+    const scores = trainingContent.exams.map(exam => exam.score);
+    const highestScore = Math.max(...scores);
+    const lowestScore = Math.min(...scores);
+    let averageScore = scores.length > 0
+        ? scores.reduce((sum, score) => sum + score, 0) / scores.length
+        : 0;
+    averageScore = Math.round(averageScore);
+
+    const containerClasses = clsx(
+        "flex flex-row mb-4",
+        gridView ? "gap-4 justify-between" : "gap-8"
+    );
+
+    const columnClasses = clsx(
+        "flex flex-col",
+        gridView ? "gap-4" : "gap-8"
+    ); 
+
+    return (
+        <div className={containerClasses}>
+            <div className={columnClasses}>
+                <div className="flex flex-row items-center gap-4">
+                    <div className="flex w-14 h-14 bg-[#F5F5F5] items-center justify-center rounded-xl border border-[#DBDBDB]">
+                        <svg width="20" height="20" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M11.7083 3.16669C11.4166 3.16669 11.1701 3.06599 10.9687 2.8646C10.7673 2.66321 10.6666 2.41669 10.6666 2.12502C10.6666 1.83335 10.7673 1.58683 10.9687 1.38544C11.1701 1.18405 11.4166 1.08335 11.7083 1.08335C12 1.08335 12.2465 1.18405 12.4479 1.38544C12.6493 1.58683 12.75 1.83335 12.75 2.12502C12.75 2.41669 12.6493 2.66321 12.4479 2.8646C12.2465 3.06599 12 3.16669 11.7083 3.16669ZM11.7083 16.9167C11.4166 16.9167 11.1701 16.816 10.9687 16.6146C10.7673 16.4132 10.6666 16.1667 10.6666 15.875C10.6666 15.5834 10.7673 15.3368 10.9687 15.1354C11.1701 14.934 11.4166 14.8334 11.7083 14.8334C12 14.8334 12.2465 14.934 12.4479 15.1354C12.6493 15.3368 12.75 15.5834 12.75 15.875C12.75 16.1667 12.6493 16.4132 12.4479 16.6146C12.2465 16.816 12 16.9167 11.7083 16.9167ZM15.0416 6.08335C14.75 6.08335 14.5034 5.98266 14.302 5.78127C14.1007 5.57988 14 5.33335 14 5.04169C14 4.75002 14.1007 4.50349 14.302 4.3021C14.5034 4.10071 14.75 4.00002 15.0416 4.00002C15.3333 4.00002 15.5798 4.10071 15.7812 4.3021C15.9826 4.50349 16.0833 4.75002 16.0833 5.04169C16.0833 5.33335 15.9826 5.57988 15.7812 5.78127C15.5798 5.98266 15.3333 6.08335 15.0416 6.08335ZM15.0416 14C14.75 14 14.5034 13.8993 14.302 13.6979C14.1007 13.4965 14 13.25 14 12.9584C14 12.6667 14.1007 12.4202 14.302 12.2188C14.5034 12.0174 14.75 11.9167 15.0416 11.9167C15.3333 11.9167 15.5798 12.0174 15.7812 12.2188C15.9826 12.4202 16.0833 12.6667 16.0833 12.9584C16.0833 13.25 15.9826 13.4965 15.7812 13.6979C15.5798 13.8993 15.3333 14 15.0416 14ZM16.2916 10.0417C16 10.0417 15.7534 9.94099 15.552 9.7396C15.3507 9.53821 15.25 9.29169 15.25 9.00002C15.25 8.70835 15.3507 8.46183 15.552 8.26044C15.7534 8.05905 16 7.95835 16.2916 7.95835C16.5833 7.95835 16.8298 8.05905 17.0312 8.26044C17.2326 8.46183 17.3333 8.70835 17.3333 9.00002C17.3333 9.29169 17.2326 9.53821 17.0312 9.7396C16.8298 9.94099 16.5833 10.0417 16.2916 10.0417ZM8.99996 17.3334C7.84718 17.3334 6.76385 17.1146 5.74996 16.6771C4.73607 16.2396 3.85413 15.6459 3.10413 14.8959C2.35413 14.1459 1.76038 13.2639 1.32288 12.25C0.885376 11.2361 0.666626 10.1528 0.666626 9.00002C0.666626 7.84724 0.885376 6.76391 1.32288 5.75002C1.76038 4.73613 2.35413 3.85419 3.10413 3.10419C3.85413 2.35419 4.73607 1.76044 5.74996 1.32294C6.76385 0.885437 7.84718 0.666687 8.99996 0.666687V2.33335C7.13885 2.33335 5.56246 2.97919 4.27079 4.27085C2.97913 5.56252 2.33329 7.13891 2.33329 9.00002C2.33329 10.8611 2.97913 12.4375 4.27079 13.7292C5.56246 15.0209 7.13885 15.6667 8.99996 15.6667V17.3334ZM8.99996 10.6667C8.54163 10.6667 8.14927 10.5035 7.82288 10.1771C7.49649 9.85071 7.33329 9.45835 7.33329 9.00002C7.33329 8.93058 7.33676 8.85766 7.34371 8.78127C7.35065 8.70488 7.36801 8.63196 7.39579 8.56252L5.66663 6.83335L6.83329 5.66669L8.56246 7.39585C8.61801 7.38196 8.76385 7.36113 8.99996 7.33335C9.45829 7.33335 9.85065 7.49655 10.177 7.82294C10.5034 8.14933 10.6666 8.54169 10.6666 9.00002C10.6666 9.45835 10.5034 9.85071 10.177 10.1771C9.85065 10.5035 9.45829 10.6667 8.99996 10.6667Z" fill="#40A1EA" />
+                        </svg>
+                    </div>
+                    <div className="flex flex-col">
+                        <p className="font-bold">{trainingContent.exams.length}</p>
+                        <p>Exams Selected</p>
+                    </div>
+                </div>
+                <div className="flex flex-row items-center gap-4">
+                    <div className="flex w-14 h-14 bg-[#F5F5F5] items-center justify-center rounded-xl border border-[#DBDBDB]">
+                        <RiArrowRightUpLine color={"#22E1B3"} size={gridView ? 28 : 26} />
+                    </div>
+                    <div className="flex flex-col">
+                        <p className="font-bold">{highestScore}%</p>
+                        <p>Highest Score</p>
+                    </div>
+                </div>
+            </div>
+            <div className={columnClasses}>
+                <div className="flex flex-row items-center gap-4">
+                    <div className="flex w-14 h-14 bg-[#F5F5F5] items-center justify-center rounded-xl border border-[#DBDBDB]">
+                        <FaChartLine color={"#40A1EA"} size={gridView ? 24 : 26} />
+                    </div>
+                    <div className="flex flex-col">
+                        <p className="font-bold">{averageScore}%</p>
+                        <p>Average Score</p>
+                    </div>
+                </div>
+                <div className="flex flex-row items-center gap-4">
+                    <div className="flex w-14 h-14 bg-[#F5F5F5] items-center justify-center rounded-xl border border-[#DBDBDB]">
+                        <RiArrowLeftDownLine color={"#E13922"} size={gridView ? 28 : 26} />
+                    </div>
+                    <div className="flex flex-col">
+                        <p className="font-bold">{lowestScore}%</p>
+                        <p>Lowest Score</p>
+                    </div>
+                </div>
+            </div>
+            {gridView && (
+                <div className="flex flex-col items-center justify-center gap-2 -lg:hidden">
+                    <div className="flex w-14 h-14 bg-[#F5F5F5] items-center justify-center rounded-xl border border-[#DBDBDB]">
+                        <GiLightBulb color={"#FFCC00"} size={28} />
+                    </div>
+                    <p><span className="font-bold">{trainingContent.tip_ids.length}</span> Tips</p>
+                </div>
+            )}
+        </div>
+    );
+};
+
+export default TrainingScore;
diff --git a/src/dashboards/AssignmentCreator.tsx b/src/dashboards/AssignmentCreator.tsx
index 4eea6685..b62bd856 100644
--- a/src/dashboards/AssignmentCreator.tsx
+++ b/src/dashboards/AssignmentCreator.tsx
@@ -2,7 +2,7 @@ import Input from "@/components/Low/Input";
 import Modal from "@/components/Modal";
 import {Module} from "@/interfaces";
 import clsx from "clsx";
-import {useState} from "react";
+import {useEffect, useState} from "react";
 import {BsBook, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
 import {generate} from "random-words";
 import {capitalize} from "lodash";
@@ -20,6 +20,7 @@ import {Assignment} from "@/interfaces/results";
 import Checkbox from "@/components/Low/Checkbox";
 import {InstructorGender, Variant} from "@/interfaces/exam";
 import Select from "@/components/Low/Select";
+import useExams from "@/hooks/useExams";
 
 interface Props {
 	isCreating: boolean;
@@ -43,6 +44,14 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 	const [instructorGender, setInstructorGender] = useState<InstructorGender>(assignment?.instructorGender || "varied");
 	// creates a new exam for each assignee or just one exam for all assignees
 	const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
+	const [useRandomExams, setUseRandomExams] = useState(true);
+	const [examIDs, setExamIDs] = useState<{id: string; module: Module}[]>([]);
+
+	const {exams} = useExams();
+
+	useEffect(() => {
+		setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
+	}, [selectedModules]);
 
 	const toggleModule = (module: Module) => {
 		const modules = selectedModules.filter((x) => x !== module);
@@ -60,6 +69,7 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 			assignees,
 			name,
 			startDate,
+			examIDs: !useRandomExams ? examIDs : undefined,
 			endDate,
 			selectedModules,
 			generateMultiple,
@@ -228,19 +238,52 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 					</div>
 				</div>
 
-				<div className="flex flex-col gap-3 w-full">
-					<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
-					<Select
-						value={{value: instructorGender, label: capitalize(instructorGender)}}
-						onChange={(value) => (value ? setInstructorGender(value.value as InstructorGender) : null)}
-						disabled={!selectedModules.includes("speaking") || !!assignment}
-						options={[
-							{value: "male", label: "Male"},
-							{value: "female", label: "Female"},
-							{value: "varied", label: "Varied"},
-						]}
-					/>
-				</div>
+				{selectedModules.includes("speaking") && (
+					<div className="flex flex-col gap-3 w-full">
+						<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
+						<Select
+							value={{value: instructorGender, label: capitalize(instructorGender)}}
+							onChange={(value) => (value ? setInstructorGender(value.value as InstructorGender) : null)}
+							disabled={!selectedModules.includes("speaking") || !!assignment}
+							options={[
+								{value: "male", label: "Male"},
+								{value: "female", label: "Female"},
+								{value: "varied", label: "Varied"},
+							]}
+						/>
+					</div>
+				)}
+
+				{selectedModules.length > 0 && (
+					<div className="flex flex-col gap-3 w-full">
+						<Checkbox isChecked={useRandomExams} onChange={setUseRandomExams}>
+							Random Exams
+						</Checkbox>
+						{!useRandomExams && (
+							<div className="grid md:grid-cols-2 w-full gap-4">
+								{selectedModules.map((module) => (
+									<div key={module} className="flex flex-col gap-3 w-full">
+										<label className="font-normal text-base text-mti-gray-dim">{capitalize(module)} Exam</label>
+										<Select
+											value={{
+												value: examIDs.find((e) => e.module === module)?.id || null,
+												label: examIDs.find((e) => e.module === module)?.id || "",
+											}}
+											onChange={(value) =>
+												value
+													? setExamIDs((prev) => [...prev.filter((x) => x.module !== module), {id: value.value!, module}])
+													: setExamIDs((prev) => prev.filter((x) => x.module !== module))
+											}
+											options={exams
+												.filter((x) => !x.isDiagnostic && x.module === module)
+												.map((x) => ({value: x.id, label: x.id}))}
+										/>
+									</div>
+								))}
+							</div>
+						)}
+					</div>
+				)}
 
 				<section className="w-full flex flex-col gap-3">
 					<span className="font-semibold">Assignees ({assignees.length} selected)</span>
@@ -322,7 +365,14 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 						</Button>
 					)}
 					<Button
-						disabled={selectedModules.length === 0 || !name || !startDate || !endDate || assignees.length === 0}
+						disabled={
+							selectedModules.length === 0 ||
+							!name ||
+							!startDate ||
+							!endDate ||
+							assignees.length === 0 ||
+							(!!examIDs && examIDs.length < selectedModules.length)
+						}
 						className="w-full max-w-[200px]"
 						onClick={createAssignment}
 						isLoading={isLoading}>
diff --git a/src/interfaces/exam.ts b/src/interfaces/exam.ts
index a7756dc5..18c222b2 100644
--- a/src/interfaces/exam.ts
+++ b/src/interfaces/exam.ts
@@ -1,19 +1,24 @@
-import {Module} from ".";
+import { Module } from ".";
 
 export type Exam = ReadingExam | ListeningExam | WritingExam | SpeakingExam | LevelExam;
 export type Variant = "full" | "partial";
 export type InstructorGender = "male" | "female" | "varied";
 export type Difficulty = "easy" | "medium" | "hard";
 
-export interface ReadingExam {
-	parts: ReadingPart[];
+interface ExamBase {
 	id: string;
-	module: "reading";
+	module: Module;
 	minTimer: number;
-	type: "academic" | "general";
 	isDiagnostic: boolean;
 	variant?: Variant;
 	difficulty?: Difficulty;
+	createdBy?: string; // option as it has been added later
+	createdAt?: string; // option as it has been added later
+}
+export interface ReadingExam extends ExamBase {
+	module: "reading";
+	parts: ReadingPart[];
+	type: "academic" | "general";
 }
 
 export interface ReadingPart {
@@ -24,14 +29,9 @@ export interface ReadingPart {
 	exercises: Exercise[];
 }
 
-export interface LevelExam {
+export interface LevelExam extends ExamBase {
 	module: "level";
-	id: string;
 	parts: LevelPart[];
-	minTimer: number;
-	isDiagnostic: boolean;
-	variant?: Variant;
-	difficulty?: Difficulty;
 }
 
 export interface LevelPart {
@@ -39,14 +39,9 @@ export interface LevelPart {
 	exercises: Exercise[];
 }
 
-export interface ListeningExam {
+export interface ListeningExam extends ExamBase {
 	parts: ListeningPart[];
-	id: string;
 	module: "listening";
-	minTimer: number;
-	isDiagnostic: boolean;
-	variant?: Variant;
-	difficulty?: Difficulty;
 }
 
 export interface ListeningPart {
@@ -72,14 +67,9 @@ export interface UserSolution {
 	isDisabled?: boolean;
 }
 
-export interface WritingExam {
+export interface WritingExam extends ExamBase {
 	module: "writing";
-	id: string;
 	exercises: WritingExercise[];
-	minTimer: number;
-	isDiagnostic: boolean;
-	variant?: Variant;
-	difficulty?: Difficulty;
 }
 
 interface WordCounter {
@@ -87,15 +77,10 @@ interface WordCounter {
 	limit: number;
 }
 
-export interface SpeakingExam {
-	id: string;
+export interface SpeakingExam  extends ExamBase {
 	module: "speaking";
 	exercises: (SpeakingExercise | InteractiveSpeakingExercise)[];
-	minTimer: number;
-	isDiagnostic: boolean;
-	variant?: Variant;
 	instructorGender: InstructorGender;
-	difficulty?: Difficulty;
 }
 
 export type Exercise =
@@ -115,17 +100,21 @@ export interface Evaluation {
 	misspelled_pairs?: {correction: string | null; misspelled: string}[];
 }
 
-interface InteractiveSpeakingEvaluation extends Evaluation {
-	perfect_answer_1?: {answer: string};
-	transcript_1?: string;
-	fixed_text_1?: string;
-	perfect_answer_2?: {answer: string};
-	transcript_2?: string;
-	fixed_text_2?: string;
-	perfect_answer_3?: {answer: string};
-	transcript_3?: string;
-	fixed_text_3?: string;
-}
+
+type InteractivePerfectAnswerKey = `perfect_answer_${number}`;
+type InteractiveTranscriptKey = `transcript_${number}`;
+type InteractiveFixedTextKey = `fixed_text_${number}`;
+
+type InteractivePerfectAnswerType = { [key in InteractivePerfectAnswerKey]: { answer: string } };
+type InteractiveTranscriptType = { [key in InteractiveTranscriptKey]?: string };
+type InteractiveFixedTextType = { [key in InteractiveFixedTextKey]?: string };
+
+interface InteractiveSpeakingEvaluation extends Evaluation,
+InteractivePerfectAnswerType, 
+InteractiveTranscriptType, 
+InteractiveFixedTextType 
+{}
+
 
 interface SpeakingEvaluation extends CommonEvaluation {
 	perfect_answer_1?: string;
diff --git a/src/pages/(admin)/Lists/ExamList.tsx b/src/pages/(admin)/Lists/ExamList.tsx
index efd212ca..71f685c1 100644
--- a/src/pages/(admin)/Lists/ExamList.tsx
+++ b/src/pages/(admin)/Lists/ExamList.tsx
@@ -1,154 +1,223 @@
-import {PERMISSIONS} from "@/constants/userPermissions";
+import { useMemo } from "react";
+import { PERMISSIONS } from "@/constants/userPermissions";
 import useExams from "@/hooks/useExams";
 import useUsers from "@/hooks/useUsers";
-import {Module} from "@/interfaces";
-import {Exam} from "@/interfaces/exam";
-import {Type, User} from "@/interfaces/user";
+import { Module } from "@/interfaces";
+import { Exam } from "@/interfaces/exam";
+import { Type, User } from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
-import {getExamById} from "@/utils/exams";
-import {countExercises} from "@/utils/moduleUtils";
-import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
+import { getExamById } from "@/utils/exams";
+import { countExercises } from "@/utils/moduleUtils";
+import {
+  createColumnHelper,
+  flexRender,
+  getCoreRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
 import axios from "axios";
 import clsx from "clsx";
-import {capitalize} from "lodash";
-import {useRouter} from "next/router";
-import {BsCheck, BsTrash, BsUpload} from "react-icons/bs";
-import {toast} from "react-toastify";
+import { capitalize } from "lodash";
+import { useRouter } from "next/router";
+import { BsCheck, BsTrash, BsUpload } from "react-icons/bs";
+import { toast } from "react-toastify";
 
-const CLASSES: {[key in Module]: string} = {
-	reading: "text-ielts-reading",
-	listening: "text-ielts-listening",
-	speaking: "text-ielts-speaking",
-	writing: "text-ielts-writing",
-	level: "text-ielts-level",
+const CLASSES: { [key in Module]: string } = {
+  reading: "text-ielts-reading",
+  listening: "text-ielts-listening",
+  speaking: "text-ielts-speaking",
+  writing: "text-ielts-writing",
+  level: "text-ielts-level",
 };
 
 const columnHelper = createColumnHelper<Exam>();
 
-export default function ExamList({user}: {user: User}) {
-	const {exams, reload} = useExams();
+export default function ExamList({ user }: { user: User }) {
+  const { exams, reload } = useExams();
+  const { users } = useUsers();
 
-	const setExams = useExamStore((state) => state.setExams);
-	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
+  const parsedExams = useMemo(() => {
+    return exams.map((exam) => {
+      if (exam.createdBy) {
+        const user = users.find((u) => u.id === exam.createdBy);
+        if (!user) return exam;
 
-	const router = useRouter();
+        return {
+          ...exam,
+          createdBy: user.type === "developer" ? "system" : user.name,
+        };
+      }
 
-	const loadExam = async (module: Module, examId: string) => {
-		const exam = await getExamById(module, examId.trim());
-		if (!exam) {
-			toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
-				toastId: "invalid-exam-id",
-			});
+      return exam;
+    });
+  }, [exams, users]);
 
-			return;
-		}
+  const setExams = useExamStore((state) => state.setExams);
+  const setSelectedModules = useExamStore((state) => state.setSelectedModules);
 
-		setExams([exam]);
-		setSelectedModules([module]);
+  const router = useRouter();
 
-		router.push("/exercises");
-	};
+  const loadExam = async (module: Module, examId: string) => {
+    const exam = await getExamById(module, examId.trim());
+    if (!exam) {
+      toast.error(
+        "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
+        {
+          toastId: "invalid-exam-id",
+        }
+      );
 
-	const deleteExam = async (exam: Exam) => {
-		if (!confirm(`Are you sure you want to delete this ${capitalize(exam.module)} exam?`)) return;
+      return;
+    }
 
-		axios
-			.delete(`/api/exam/${exam.module}/${exam.id}`)
-			.then(() => toast.success(`Deleted the "${exam.id}" exam`))
-			.catch((reason) => {
-				if (reason.response.status === 404) {
-					toast.error("Exam not found!");
-					return;
-				}
+    setExams([exam]);
+    setSelectedModules([module]);
 
-				if (reason.response.status === 403) {
-					toast.error("You do not have permission to delete this exam!");
-					return;
-				}
+    router.push("/exercises");
+  };
 
-				toast.error("Something went wrong, please try again later.");
-			})
-			.finally(reload);
-	};
+  const deleteExam = async (exam: Exam) => {
+    if (
+      !confirm(
+        `Are you sure you want to delete this ${capitalize(exam.module)} exam?`
+      )
+    )
+      return;
 
-	const getTotalExercises = (exam: Exam) => {
-		if (exam.module === "reading" || exam.module === "listening" || exam.module === "level") {
-			return countExercises(exam.parts.flatMap((x) => x.exercises));
-		}
+    axios
+      .delete(`/api/exam/${exam.module}/${exam.id}`)
+      .then(() => toast.success(`Deleted the "${exam.id}" exam`))
+      .catch((reason) => {
+        if (reason.response.status === 404) {
+          toast.error("Exam not found!");
+          return;
+        }
 
-		return countExercises(exam.exercises);
-	};
+        if (reason.response.status === 403) {
+          toast.error("You do not have permission to delete this exam!");
+          return;
+        }
 
-	const defaultColumns = [
-		columnHelper.accessor("id", {
-			header: "ID",
-			cell: (info) => info.getValue(),
-		}),
-		columnHelper.accessor("module", {
-			header: "Module",
-			cell: (info) => <span className={CLASSES[info.getValue()]}>{capitalize(info.getValue())}</span>,
-		}),
-		columnHelper.accessor((x) => getTotalExercises(x), {
-			header: "Exercises",
-			cell: (info) => info.getValue(),
-		}),
-		columnHelper.accessor("minTimer", {
-			header: "Timer",
-			cell: (info) => <>{info.getValue()} minute(s)</>,
-		}),
-		{
-			header: "",
-			id: "actions",
-			cell: ({row}: {row: {original: Exam}}) => {
-				return (
-					<div className="flex gap-4">
-						<div
-							data-tip="Load exam"
-							className="cursor-pointer tooltip"
-							onClick={async () => await loadExam(row.original.module, row.original.id)}>
-							<BsUpload className="hover:text-mti-purple-light transition ease-in-out duration-300" />
-						</div>
-						{PERMISSIONS.examManagement.delete.includes(user.type) && (
-							<div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deleteExam(row.original)}>
-								<BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
-							</div>
-						)}
-					</div>
-				);
-			},
-		},
-	];
+        toast.error("Something went wrong, please try again later.");
+      })
+      .finally(reload);
+  };
 
-	const table = useReactTable({
-		data: exams,
-		columns: defaultColumns,
-		getCoreRowModel: getCoreRowModel(),
-	});
+  const getTotalExercises = (exam: Exam) => {
+    if (
+      exam.module === "reading" ||
+      exam.module === "listening" ||
+      exam.module === "level"
+    ) {
+      return countExercises(exam.parts.flatMap((x) => x.exercises));
+    }
 
-	return (
-		<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
-			<thead>
-				{table.getHeaderGroups().map((headerGroup) => (
-					<tr key={headerGroup.id}>
-						{headerGroup.headers.map((header) => (
-							<th className="p-4 text-left" key={header.id}>
-								{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
-							</th>
-						))}
-					</tr>
-				))}
-			</thead>
-			<tbody className="px-2">
-				{table.getRowModel().rows.map((row) => (
-					<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
-						{row.getVisibleCells().map((cell) => (
-							<td className="px-4 py-2" key={cell.id}>
-								{flexRender(cell.column.columnDef.cell, cell.getContext())}
-							</td>
-						))}
-					</tr>
-				))}
-			</tbody>
-		</table>
-	);
+    return countExercises(exam.exercises);
+  };
+
+  const defaultColumns = [
+    columnHelper.accessor("id", {
+      header: "ID",
+      cell: (info) => info.getValue(),
+    }),
+    columnHelper.accessor("module", {
+      header: "Module",
+      cell: (info) => (
+        <span className={CLASSES[info.getValue()]}>
+          {capitalize(info.getValue())}
+        </span>
+      ),
+    }),
+    columnHelper.accessor((x) => getTotalExercises(x), {
+      header: "Exercises",
+      cell: (info) => info.getValue(),
+    }),
+    columnHelper.accessor("minTimer", {
+      header: "Timer",
+      cell: (info) => <>{info.getValue()} minute(s)</>,
+    }),
+    columnHelper.accessor("createdAt", {
+      header: "Created At",
+      cell: (info) => {
+        const value = info.getValue();
+        if (value) {
+          return new Date(value).toLocaleDateString();
+        }
+
+        return null;
+      },
+    }),
+    columnHelper.accessor("createdBy", {
+      header: "Created By",
+      cell: (info) => info.getValue(),
+    }),
+    {
+      header: "",
+      id: "actions",
+      cell: ({ row }: { row: { original: Exam } }) => {
+        return (
+          <div className="flex gap-4">
+            <div
+              data-tip="Load exam"
+              className="cursor-pointer tooltip"
+              onClick={async () =>
+                await loadExam(row.original.module, row.original.id)
+              }
+            >
+              <BsUpload className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+            </div>
+            {PERMISSIONS.examManagement.delete.includes(user.type) && (
+              <div
+                data-tip="Delete"
+                className="cursor-pointer tooltip"
+                onClick={() => deleteExam(row.original)}
+              >
+                <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
+              </div>
+            )}
+          </div>
+        );
+      },
+    },
+  ];
+
+  const table = useReactTable({
+    data: parsedExams,
+    columns: defaultColumns,
+    getCoreRowModel: getCoreRowModel(),
+  });
+
+  return (
+    <table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
+      <thead>
+        {table.getHeaderGroups().map((headerGroup) => (
+          <tr key={headerGroup.id}>
+            {headerGroup.headers.map((header) => (
+              <th className="p-4 text-left" key={header.id}>
+                {header.isPlaceholder
+                  ? null
+                  : flexRender(
+                      header.column.columnDef.header,
+                      header.getContext()
+                    )}
+              </th>
+            ))}
+          </tr>
+        ))}
+      </thead>
+      <tbody className="px-2">
+        {table.getRowModel().rows.map((row) => (
+          <tr
+            className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
+            key={row.id}
+          >
+            {row.getVisibleCells().map((cell) => (
+              <td className="px-4 py-2" key={cell.id}>
+                {flexRender(cell.column.columnDef.cell, cell.getContext())}
+              </td>
+            ))}
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
 }
diff --git a/src/pages/(generation)/LevelGeneration.tsx b/src/pages/(generation)/LevelGeneration.tsx
index 802d2230..3ebf73c0 100644
--- a/src/pages/(generation)/LevelGeneration.tsx
+++ b/src/pages/(generation)/LevelGeneration.tsx
@@ -193,7 +193,7 @@ const TaskTab = ({section, setSection}: {section: LevelSection; setSection: (sec
 						<label className="font-normal text-base text-mti-gray-dim">Exercise Type</label>
 						<Select
 							options={Object.keys(TYPES).map((key) => ({value: key, label: TYPES[key]}))}
-							onChange={(e) => setSection({...section, type: e!.value})}
+							onChange={(e) => setSection({...section, type: e!.value!})}
 							value={{value: section?.type || "multiple_choice_4", label: TYPES[section?.type || "multiple_choice_4"]}}
 						/>
 					</div>
@@ -296,7 +296,7 @@ const LevelGeneration = () => {
 					module: "level",
 					difficulty,
 					variant: "full",
-					isDiagnostic: true,
+					isDiagnostic: false,
 					parts: parts
 						.map((part, index) => {
 							const currentExercise = result.data.exercises[`exercise_${index + 1}`] as any;
diff --git a/src/pages/(generation)/ListeningGeneration.tsx b/src/pages/(generation)/ListeningGeneration.tsx
index fdbf36a7..85fd1064 100644
--- a/src/pages/(generation)/ListeningGeneration.tsx
+++ b/src/pages/(generation)/ListeningGeneration.tsx
@@ -1,526 +1,449 @@
 import MultipleChoiceEdit from "@/components/Generation/multiple.choice.edit";
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
-import { Difficulty, Exercise, ListeningExam } from "@/interfaces/exam";
+import {Difficulty, Exercise, ListeningExam} from "@/interfaces/exam";
 import useExamStore from "@/stores/examStore";
-import { getExamById } from "@/utils/exams";
-import { playSound } from "@/utils/sound";
-import { convertCamelCaseToReadable } from "@/utils/string";
-import { Tab } from "@headlessui/react";
+import {getExamById} from "@/utils/exams";
+import {playSound} from "@/utils/sound";
+import {convertCamelCaseToReadable} from "@/utils/string";
+import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
-import { capitalize, sample } from "lodash";
-import { useRouter } from "next/router";
-import { useEffect, useState, Dispatch, SetStateAction } from "react";
-import { BsArrowRepeat, BsCheck } from "react-icons/bs";
-import { toast } from "react-toastify";
+import {capitalize, sample} from "lodash";
+import {useRouter} from "next/router";
+import {useEffect, useState, Dispatch, SetStateAction} from "react";
+import {BsArrowRepeat, BsCheck} from "react-icons/bs";
+import {toast} from "react-toastify";
 import WriteBlanksEdit from "@/components/Generation/write.blanks.edit";
+import {generate} from "random-words";
 
 const DIFFICULTIES: Difficulty[] = ["easy", "medium", "hard"];
 
-const MULTIPLE_CHOICE = { type: "multipleChoice", label: "Multiple Choice" };
+const MULTIPLE_CHOICE = {type: "multipleChoice", label: "Multiple Choice"};
 const WRITE_BLANKS_QUESTIONS = {
-  type: "writeBlanksQuestions",
-  label: "Write the Blanks: Questions",
+	type: "writeBlanksQuestions",
+	label: "Write the Blanks: Questions",
 };
 const WRITE_BLANKS_FILL = {
-  type: "writeBlanksFill",
-  label: "Write the Blanks: Fill",
+	type: "writeBlanksFill",
+	label: "Write the Blanks: Fill",
 };
 const WRITE_BLANKS_FORM = {
-  type: "writeBlanksForm",
-  label: "Write the Blanks: Form",
+	type: "writeBlanksForm",
+	label: "Write the Blanks: Form",
 };
 const MULTIPLE_CHOICE_3 = {
-  type: "multipleChoice3Options",
-  label: "Multiple Choice",
+	type: "multipleChoice3Options",
+	label: "Multiple Choice",
 };
 
 const PartTab = ({
-  part,
-  difficulty,
-  availableTypes,
-  index,
-  setPart,
-  updatePart,
+	part,
+	difficulty,
+	availableTypes,
+	index,
+	setPart,
+	updatePart,
 }: {
-  part?: ListeningPart;
-  difficulty: Difficulty;
-  availableTypes: { type: string; label: string }[];
-  index: number;
-  setPart: (part?: ListeningPart) => void;
-  updatePart: Dispatch<SetStateAction<ListeningPart | undefined>>;
+	part?: ListeningPart;
+	difficulty: Difficulty;
+	availableTypes: {type: string; label: string}[];
+	index: number;
+	setPart: (part?: ListeningPart) => void;
+	updatePart: Dispatch<SetStateAction<ListeningPart | undefined>>;
 }) => {
-  const [topic, setTopic] = useState("");
-  const [isLoading, setIsLoading] = useState(false);
-  const [types, setTypes] = useState<string[]>([]);
+	const [topic, setTopic] = useState("");
+	const [isLoading, setIsLoading] = useState(false);
+	const [types, setTypes] = useState<string[]>([]);
 
-  const generate = () => {
-    const url = new URLSearchParams();
-    url.append("difficulty", difficulty);
+	const generate = () => {
+		const url = new URLSearchParams();
+		url.append("difficulty", difficulty);
 
-    if (topic) url.append("topic", topic);
-    if (types) types.forEach((t) => url.append("exercises", t));
+		if (topic) url.append("topic", topic);
+		if (types) types.forEach((t) => url.append("exercises", t));
 
-    setPart(undefined);
-    setIsLoading(true);
-    axios
-      .get(
-        `/api/exam/listening/generate/listening_section_${index}${
-          topic || types ? `?${url.toString()}` : ""
-        }`
-      )
-      .then((result) => {
-        playSound(typeof result.data === "string" ? "error" : "check");
-        if (typeof result.data === "string")
-          return toast.error(
-            "Something went wrong, please try to generate again."
-          );
-        setPart(result.data);
-      })
-      .catch((error) => {
-        console.log(error);
-        toast.error("Something went wrong!");
-      })
-      .finally(() => setIsLoading(false));
-  };
+		setPart(undefined);
+		setIsLoading(true);
+		axios
+			.get(`/api/exam/listening/generate/listening_section_${index}${topic || types ? `?${url.toString()}` : ""}`)
+			.then((result) => {
+				playSound(typeof result.data === "string" ? "error" : "check");
+				if (typeof result.data === "string") return toast.error("Something went wrong, please try to generate again.");
+				setPart(result.data);
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error("Something went wrong!");
+			})
+			.finally(() => setIsLoading(false));
+	};
 
-  const renderExercises = () => {
-    return part?.exercises.map((exercise) => {
-      switch (exercise.type) {
-        case "multipleChoice":
-          return (
-            <>
-              <h1>Exercise: Multiple Choice</h1>
-              <MultipleChoiceEdit
-                exercise={exercise}
-                key={exercise.id}
-                updateExercise={(data: any) =>
-                  updatePart((part?: ListeningPart) => {
-                    if (part) {
-                      const exercises = part.exercises.map((x) =>
-                        x.id === exercise.id ? { ...x, ...data } : x
-                      ) as Exercise[];
-                      const updatedPart = {
-                        ...part,
-                        exercises,
-                      } as ListeningPart;
-                      return updatedPart;
-                    }
+	const renderExercises = () => {
+		return part?.exercises.map((exercise) => {
+			switch (exercise.type) {
+				case "multipleChoice":
+					return (
+						<>
+							<h1>Exercise: Multiple Choice</h1>
+							<MultipleChoiceEdit
+								exercise={exercise}
+								key={exercise.id}
+								updateExercise={(data: any) =>
+									updatePart((part?: ListeningPart) => {
+										if (part) {
+											const exercises = part.exercises.map((x) => (x.id === exercise.id ? {...x, ...data} : x)) as Exercise[];
+											const updatedPart = {
+												...part,
+												exercises,
+											} as ListeningPart;
+											return updatedPart;
+										}
 
-                    return part;
-                  })
-                }
-              />
-            </>
-          );
-        // TODO: This might be broken as they all returns the same
-        case "writeBlanks":
-          return (
-            <>
-              <h1>Exercise: Write Blanks</h1>
-              <WriteBlanksEdit
-                exercise={exercise}
-                key={exercise.id}
-                updateExercise={(data: any) => {
-                  updatePart((part?: ListeningPart) => {
-                    if (part) {
-                      return {
-                        ...part,
-                        exercises: part.exercises.map((x) =>
-                          x.id === exercise.id ? { ...x, ...data } : x
-                        ),
-                      } as ListeningPart;
-                    }
+										return part;
+									})
+								}
+							/>
+						</>
+					);
+				// TODO: This might be broken as they all returns the same
+				case "writeBlanks":
+					return (
+						<>
+							<h1>Exercise: Write Blanks</h1>
+							<WriteBlanksEdit
+								exercise={exercise}
+								key={exercise.id}
+								updateExercise={(data: any) => {
+									updatePart((part?: ListeningPart) => {
+										if (part) {
+											return {
+												...part,
+												exercises: part.exercises.map((x) => (x.id === exercise.id ? {...x, ...data} : x)),
+											} as ListeningPart;
+										}
 
-                    return part;
-                  });
-                }}
-              />
-            </>
-          );
-        default:
-          return null;
-      }
-    });
-  };
+										return part;
+									});
+								}}
+							/>
+						</>
+					);
+				default:
+					return null;
+			}
+		});
+	};
 
-  const toggleType = (type: string) =>
-    setTypes((prev) =>
-      prev.includes(type)
-        ? [...prev.filter((x) => x !== type)]
-        : [...prev, type]
-    );
+	const toggleType = (type: string) => setTypes((prev) => (prev.includes(type) ? [...prev.filter((x) => x !== type)] : [...prev, type]));
 
-  return (
-    <Tab.Panel className="w-full bg-ielts-listening/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
-      <div className="flex flex-col gap-3">
-        <label className="font-normal text-base text-mti-gray-dim">
-          Exercises
-        </label>
-        <div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
-          {availableTypes.map((x) => (
-            <span
-              onClick={() => toggleType(x.type)}
-              key={x.type}
-              className={clsx(
-                "px-6 py-4 w-64 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-                "transition duration-300 ease-in-out",
-                !types.includes(x.type)
-                  ? "bg-white border-mti-gray-platinum"
-                  : "bg-ielts-listening/70 border-ielts-listening text-white"
-              )}
-            >
-              {x.label}
-            </span>
-          ))}
-        </div>
-      </div>
-      <div className="flex gap-4 items-end">
-        <Input
-          type="text"
-          placeholder="Grand Canyon..."
-          name="topic"
-          label="Topic"
-          onChange={setTopic}
-          roundness="xl"
-          defaultValue={topic}
-        />
-        <button
-          onClick={generate}
-          disabled={isLoading || types.length === 0}
-          data-tip="The passage is currently being generated"
-          className={clsx(
-            "bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px]",
-            "hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
-            "transition ease-in-out duration-300",
-            isLoading && "tooltip"
-          )}
-        >
-          {isLoading ? (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="text-white animate-spin" size={25} />
-            </div>
-          ) : (
-            "Generate"
-          )}
-        </button>
-      </div>
-      {isLoading && (
-        <div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
-          <span
-            className={clsx(
-              "loading loading-infinity w-32 text-ielts-listening"
-            )}
-          />
-          <span className={clsx("font-bold text-2xl text-ielts-listening")}>
-            Generating...
-          </span>
-        </div>
-      )}
-      {part && (
-        <>
-          <div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide">
-            <div className="flex gap-4">
-              {part.exercises.map((x) => (
-                <span
-                  className="rounded-xl bg-white border border-ielts-listening p-1 px-4"
-                  key={x.id}
-                >
-                  {x.type && convertCamelCaseToReadable(x.type)}
-                </span>
-              ))}
-            </div>
-            {typeof part.text === "string" && (
-              <span className="w-full h-96">
-                {part.text.replaceAll("\n\n", " ")}
-              </span>
-            )}
-            {typeof part.text !== "string" && (
-              <div className="w-full h-96 flex flex-col gap-2">
-                {part.text.conversation.map((x, index) => (
-                  <span key={index} className="flex gap-1">
-                    <span className="font-semibold">{x.name}:</span>
-                    {x.text.replaceAll("\n\n", " ")}
-                  </span>
-                ))}
-              </div>
-            )}
-          </div>
-          {renderExercises()}
-        </>
-      )}
-    </Tab.Panel>
-  );
+	return (
+		<Tab.Panel className="w-full bg-ielts-listening/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
+			<div className="flex flex-col gap-3">
+				<label className="font-normal text-base text-mti-gray-dim">Exercises</label>
+				<div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
+					{availableTypes.map((x) => (
+						<span
+							onClick={() => toggleType(x.type)}
+							key={x.type}
+							className={clsx(
+								"px-6 py-4 w-64 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
+								"transition duration-300 ease-in-out",
+								!types.includes(x.type)
+									? "bg-white border-mti-gray-platinum"
+									: "bg-ielts-listening/70 border-ielts-listening text-white",
+							)}>
+							{x.label}
+						</span>
+					))}
+				</div>
+			</div>
+			<div className="flex gap-4 items-end">
+				<Input type="text" placeholder="Grand Canyon..." name="topic" label="Topic" onChange={setTopic} roundness="xl" defaultValue={topic} />
+				<button
+					onClick={generate}
+					disabled={isLoading || types.length === 0}
+					data-tip="The passage is currently being generated"
+					className={clsx(
+						"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px]",
+						"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						isLoading && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Generate"
+					)}
+				</button>
+			</div>
+			{isLoading && (
+				<div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
+					<span className={clsx("loading loading-infinity w-32 text-ielts-listening")} />
+					<span className={clsx("font-bold text-2xl text-ielts-listening")}>Generating...</span>
+				</div>
+			)}
+			{part && (
+				<>
+					<div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide">
+						<div className="flex gap-4">
+							{part.exercises.map((x) => (
+								<span className="rounded-xl bg-white border border-ielts-listening p-1 px-4" key={x.id}>
+									{x.type && convertCamelCaseToReadable(x.type)}
+								</span>
+							))}
+						</div>
+						{typeof part.text === "string" && <span className="w-full h-96">{part.text.replaceAll("\n\n", " ")}</span>}
+						{typeof part.text !== "string" && (
+							<div className="w-full h-96 flex flex-col gap-2">
+								{part.text.conversation.map((x, index) => (
+									<span key={index} className="flex gap-1">
+										<span className="font-semibold">{x.name}:</span>
+										{x.text.replaceAll("\n\n", " ")}
+									</span>
+								))}
+							</div>
+						)}
+					</div>
+					{renderExercises()}
+				</>
+			)}
+		</Tab.Panel>
+	);
 };
 
 interface ListeningPart {
-  exercises: Exercise[];
-  text:
-    | {
-        conversation: {
-          gender: string;
-          name: string;
-          text: string;
-          voice: string;
-        }[];
-      }
-    | string;
+	exercises: Exercise[];
+	text:
+		| {
+				conversation: {
+					gender: string;
+					name: string;
+					text: string;
+					voice: string;
+				}[];
+		  }
+		| string;
 }
 
 const ListeningGeneration = () => {
-  const [part1, setPart1] = useState<ListeningPart>();
-  const [part2, setPart2] = useState<ListeningPart>();
-  const [part3, setPart3] = useState<ListeningPart>();
-  const [part4, setPart4] = useState<ListeningPart>();
-  const [minTimer, setMinTimer] = useState(30);
-  const [isLoading, setIsLoading] = useState(false);
-  const [resultingExam, setResultingExam] = useState<ListeningExam>();
-  const [difficulty, setDifficulty] = useState<Difficulty>(
-    sample(DIFFICULTIES)!
-  );
+	const [part1, setPart1] = useState<ListeningPart>();
+	const [part2, setPart2] = useState<ListeningPart>();
+	const [part3, setPart3] = useState<ListeningPart>();
+	const [part4, setPart4] = useState<ListeningPart>();
+	const [minTimer, setMinTimer] = useState(30);
+	const [isLoading, setIsLoading] = useState(false);
+	const [resultingExam, setResultingExam] = useState<ListeningExam>();
+	const [difficulty, setDifficulty] = useState<Difficulty>(sample(DIFFICULTIES)!);
 
-  useEffect(() => {
-    const part1Timer = part1 ? 5 : 0;
-    const part2Timer = part2 ? 8 : 0;
-    const part3Timer = part3 ? 8 : 0;
-    const part4Timer = part4 ? 9 : 0;
+	useEffect(() => {
+		const part1Timer = part1 ? 5 : 0;
+		const part2Timer = part2 ? 8 : 0;
+		const part3Timer = part3 ? 8 : 0;
+		const part4Timer = part4 ? 9 : 0;
 
-    const sum = part1Timer + part2Timer + part3Timer + part4Timer;
-    setMinTimer(sum > 0 ? sum : 5);
-  }, [part1, part2, part3, part4]);
+		const sum = part1Timer + part2Timer + part3Timer + part4Timer;
+		setMinTimer(sum > 0 ? sum : 5);
+	}, [part1, part2, part3, part4]);
 
-  const router = useRouter();
+	const router = useRouter();
 
-  const setExams = useExamStore((state) => state.setExams);
-  const setSelectedModules = useExamStore((state) => state.setSelectedModules);
+	const setExams = useExamStore((state) => state.setExams);
+	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
 
-  const submitExam = () => {
-    const parts = [part1, part2, part3, part4].filter((x) => !!x);
-    console.log({ parts });
-    if (parts.length === 0)
-      return toast.error("Please generate at least one section!");
+	const submitExam = () => {
+		const parts = [part1, part2, part3, part4].filter((x) => !!x);
+		console.log({parts});
+		if (parts.length === 0) return toast.error("Please generate at least one section!");
 
-    setIsLoading(true);
+		setIsLoading(true);
 
-    axios
-      .post(`/api/exam/listening/generate/listening`, {
-        parts,
-        minTimer,
-        difficulty,
-      })
-      .then((result) => {
-        playSound("sent");
-        console.log(`Generated Exam ID: ${result.data.id}`);
-        toast.success(
-          "This new exam has been generated successfully! Check the ID in our browser's console."
-        );
-        setResultingExam(result.data);
+		axios
+			.post(`/api/exam/listening/generate/listening`, {
+				id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
+				parts,
+				minTimer,
+				difficulty,
+			})
+			.then((result) => {
+				playSound("sent");
+				console.log(`Generated Exam ID: ${result.data.id}`);
+				toast.success(`Generated Exam ID: ${result.data.id}`);
+				setResultingExam(result.data);
 
-        setPart1(undefined);
-        setPart2(undefined);
-        setPart3(undefined);
-        setPart4(undefined);
-        setDifficulty(sample(DIFFICULTIES)!);
-      })
-      .catch((error) => {
-        console.log(error);
-        toast.error("Something went wrong!");
-      })
-      .finally(() => setIsLoading(false));
-  };
+				setPart1(undefined);
+				setPart2(undefined);
+				setPart3(undefined);
+				setPart4(undefined);
+				setDifficulty(sample(DIFFICULTIES)!);
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error("Something went wrong!");
+			})
+			.finally(() => setIsLoading(false));
+	};
 
-  const loadExam = async (examId: string) => {
-    const exam = await getExamById("listening", examId.trim());
-    if (!exam) {
-      toast.error(
-        "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
-        {
-          toastId: "invalid-exam-id",
-        }
-      );
+	const loadExam = async (examId: string) => {
+		const exam = await getExamById("listening", examId.trim());
+		if (!exam) {
+			toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
+				toastId: "invalid-exam-id",
+			});
 
-      return;
-    }
+			return;
+		}
 
-    setExams([exam]);
-    setSelectedModules(["listening"]);
+		setExams([exam]);
+		setSelectedModules(["listening"]);
 
-    router.push("/exercises");
-  };
+		router.push("/exercises");
+	};
 
-  return (
-    <>
-      <div className="flex gap-4 w-1/2">
-        <div className="flex flex-col gap-3">
-          <label className="font-normal text-base text-mti-gray-dim">
-            Timer
-          </label>
-          <Input
-            type="number"
-            name="minTimer"
-            onChange={(e) => setMinTimer(parseInt(e) < 15 ? 15 : parseInt(e))}
-            value={minTimer}
-            className="max-w-[300px]"
-          />
-        </div>
-        <div className="flex flex-col gap-3 w-full">
-          <label className="font-normal text-base text-mti-gray-dim">
-            Difficulty
-          </label>
-          <Select
-            options={DIFFICULTIES.map((x) => ({
-              value: x,
-              label: capitalize(x),
-            }))}
-            onChange={(value) =>
-              value ? setDifficulty(value.value as Difficulty) : null
-            }
-            value={{ value: difficulty, label: capitalize(difficulty) }}
-            disabled={!!part1 || !!part2 || !!part3 || !!part4}
-          />
-        </div>
-      </div>
-      <Tab.Group>
-        <Tab.List className="flex space-x-1 rounded-xl bg-ielts-listening/20 p-1">
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
-              )
-            }
-          >
-            Section 1 {part1 && <BsCheck />}
-          </Tab>
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
-              )
-            }
-          >
-            Section 2 {part2 && <BsCheck />}
-          </Tab>
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
-              )
-            }
-          >
-            Section 3 {part3 && <BsCheck />}
-          </Tab>
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening"
-              )
-            }
-          >
-            Section 4 {part4 && <BsCheck />}
-          </Tab>
-        </Tab.List>
-        <Tab.Panels>
-          {[
-            {
-              part: part1,
-              setPart: setPart1,
-              types: [
-                MULTIPLE_CHOICE,
-                WRITE_BLANKS_QUESTIONS,
-                WRITE_BLANKS_FILL,
-                WRITE_BLANKS_FORM,
-              ],
-            },
-            {
-              part: part2,
-              setPart: setPart2,
-              types: [MULTIPLE_CHOICE, WRITE_BLANKS_QUESTIONS],
-            },
-            {
-              part: part3,
-              setPart: setPart3,
-              types: [MULTIPLE_CHOICE_3, WRITE_BLANKS_QUESTIONS],
-            },
-            {
-              part: part4,
-              setPart: setPart4,
-              types: [
-                MULTIPLE_CHOICE,
-                WRITE_BLANKS_QUESTIONS,
-                WRITE_BLANKS_FILL,
-                WRITE_BLANKS_FORM,
-              ],
-            },
-          ].map(({ part, setPart, types }, index) => (
-            <PartTab
-              part={part}
-              difficulty={difficulty}
-              availableTypes={types}
-              index={index + 1}
-              key={index}
-              setPart={setPart}
-              updatePart={setPart}
-            />
-          ))}
-        </Tab.Panels>
-      </Tab.Group>
-      <div className="w-full flex justify-end gap-4">
-        {resultingExam && (
-          <button
-            disabled={isLoading}
-            onClick={() => loadExam(resultingExam.id)}
-            className={clsx(
-              "bg-white border border-ielts-listening text-ielts-listening w-full max-w-[200px] rounded-xl h-[70px] self-end",
-              "hover:bg-ielts-listening hover:text-white disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
-              "transition ease-in-out duration-300"
-            )}
-          >
-            Perform Exam
-          </button>
-        )}
-        <button
-          disabled={(!part1 && !part2 && !part3 && !part4) || isLoading}
-          data-tip="Please generate all three passages"
-          onClick={submitExam}
-          className={clsx(
-            "bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
-            "hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
-            "transition ease-in-out duration-300",
-            !part1 && !part2 && !part3 && !part4 && "tooltip"
-          )}
-        >
-          {isLoading ? (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="text-white animate-spin" size={25} />
-            </div>
-          ) : (
-            "Submit"
-          )}
-        </button>
-      </div>
-    </>
-  );
+	return (
+		<>
+			<div className="flex gap-4 w-1/2">
+				<div className="flex flex-col gap-3">
+					<label className="font-normal text-base text-mti-gray-dim">Timer</label>
+					<Input
+						type="number"
+						name="minTimer"
+						onChange={(e) => setMinTimer(parseInt(e) < 15 ? 15 : parseInt(e))}
+						value={minTimer}
+						className="max-w-[300px]"
+					/>
+				</div>
+				<div className="flex flex-col gap-3 w-full">
+					<label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
+					<Select
+						options={DIFFICULTIES.map((x) => ({
+							value: x,
+							label: capitalize(x),
+						}))}
+						onChange={(value) => (value ? setDifficulty(value.value as Difficulty) : null)}
+						value={{value: difficulty, label: capitalize(difficulty)}}
+						disabled={!!part1 || !!part2 || !!part3 || !!part4}
+					/>
+				</div>
+			</div>
+			<Tab.Group>
+				<Tab.List className="flex space-x-1 rounded-xl bg-ielts-listening/20 p-1">
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
+							)
+						}>
+						Section 1 {part1 && <BsCheck />}
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
+							)
+						}>
+						Section 2 {part2 && <BsCheck />}
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
+							)
+						}>
+						Section 3 {part3 && <BsCheck />}
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
+							)
+						}>
+						Section 4 {part4 && <BsCheck />}
+					</Tab>
+				</Tab.List>
+				<Tab.Panels>
+					{[
+						{
+							part: part1,
+							setPart: setPart1,
+							types: [MULTIPLE_CHOICE, WRITE_BLANKS_QUESTIONS, WRITE_BLANKS_FILL, WRITE_BLANKS_FORM],
+						},
+						{
+							part: part2,
+							setPart: setPart2,
+							types: [MULTIPLE_CHOICE, WRITE_BLANKS_QUESTIONS],
+						},
+						{
+							part: part3,
+							setPart: setPart3,
+							types: [MULTIPLE_CHOICE_3, WRITE_BLANKS_QUESTIONS],
+						},
+						{
+							part: part4,
+							setPart: setPart4,
+							types: [MULTIPLE_CHOICE, WRITE_BLANKS_QUESTIONS, WRITE_BLANKS_FILL, WRITE_BLANKS_FORM],
+						},
+					].map(({part, setPart, types}, index) => (
+						<PartTab
+							part={part}
+							difficulty={difficulty}
+							availableTypes={types}
+							index={index + 1}
+							key={index}
+							setPart={setPart}
+							updatePart={setPart}
+						/>
+					))}
+				</Tab.Panels>
+			</Tab.Group>
+			<div className="w-full flex justify-end gap-4">
+				{resultingExam && (
+					<button
+						disabled={isLoading}
+						onClick={() => loadExam(resultingExam.id)}
+						className={clsx(
+							"bg-white border border-ielts-listening text-ielts-listening w-full max-w-[200px] rounded-xl h-[70px] self-end",
+							"hover:bg-ielts-listening hover:text-white disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
+							"transition ease-in-out duration-300",
+						)}>
+						Perform Exam
+					</button>
+				)}
+				<button
+					disabled={(!part1 && !part2 && !part3 && !part4) || isLoading}
+					data-tip="Please generate all three passages"
+					onClick={submitExam}
+					className={clsx(
+						"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
+						"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						!part1 && !part2 && !part3 && !part4 && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Submit"
+					)}
+				</button>
+			</div>
+		</>
+	);
 };
 
 export default ListeningGeneration;
diff --git a/src/pages/(generation)/ReadingGeneration.tsx b/src/pages/(generation)/ReadingGeneration.tsx
index c5cb5256..de4a0caf 100644
--- a/src/pages/(generation)/ReadingGeneration.tsx
+++ b/src/pages/(generation)/ReadingGeneration.tsx
@@ -5,6 +5,7 @@ import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
 import {playSound} from "@/utils/sound";
 import {convertCamelCaseToReadable} from "@/utils/string";
+import {generate} from "random-words";
 import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
@@ -18,6 +19,7 @@ import FillBlanksEdit from "@/components/Generation/fill.blanks.edit";
 import TrueFalseEdit from "@/components/Generation/true.false.edit";
 import WriteBlanksEdit from "@/components/Generation/write.blanks.edit";
 import MatchSentencesEdit from "@/components/Generation/match.sentences.edit";
+import MultipleChoiceEdit from "@/components/Generation/multiple.choice.edit";
 
 const DIFFICULTIES: Difficulty[] = ["easy", "medium", "hard"];
 
@@ -118,6 +120,28 @@ const PartTab = ({
 							/>
 						</>
 					);
+				case "multipleChoice":
+					return (
+						<>
+							<h1>Exercise: True or False</h1>
+							<MultipleChoiceEdit
+								exercise={exercise}
+								key={exercise.id}
+								updateExercise={(data: any) => {
+									updatePart((part?: ReadingPart) => {
+										if (part) {
+											return {
+												...part,
+												exercises: part.exercises.map((x) => (x.id === exercise.id ? {...x, ...data} : x)),
+											} as ReadingPart;
+										}
+
+										return part;
+									});
+								}}
+							/>
+						</>
+					);
 				case "writeBlanks":
 					return (
 						<>
@@ -282,7 +306,7 @@ const ReadingGeneration = () => {
 			isDiagnostic: false,
 			minTimer,
 			module: "reading",
-			id: v4(),
+			id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
 			type: "academic",
 			variant: parts.length === 3 ? "full" : "partial",
 			difficulty,
@@ -293,7 +317,7 @@ const ReadingGeneration = () => {
 			.then((result) => {
 				playSound("sent");
 				console.log(`Generated Exam ID: ${result.data.id}`);
-				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
+				toast.success(`Generated Exam ID: ${result.data.id}`);
 				setResultingExam(result.data);
 
 				setPart1(undefined);
diff --git a/src/pages/(generation)/SpeakingGeneration.tsx b/src/pages/(generation)/SpeakingGeneration.tsx
index 1c8d4bfc..7b6b26ea 100644
--- a/src/pages/(generation)/SpeakingGeneration.tsx
+++ b/src/pages/(generation)/SpeakingGeneration.tsx
@@ -1,503 +1,414 @@
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
-import {
-  Difficulty,
-  Exercise,
-  InteractiveSpeakingExercise,
-  SpeakingExam,
-  SpeakingExercise,
-} from "@/interfaces/exam";
-import { AVATARS } from "@/resources/speakingAvatars";
+import {Difficulty, Exercise, InteractiveSpeakingExercise, SpeakingExam, SpeakingExercise} from "@/interfaces/exam";
+import {AVATARS} from "@/resources/speakingAvatars";
 import useExamStore from "@/stores/examStore";
-import { getExamById } from "@/utils/exams";
-import { playSound } from "@/utils/sound";
-import { convertCamelCaseToReadable } from "@/utils/string";
-import { Tab } from "@headlessui/react";
+import {getExamById} from "@/utils/exams";
+import {playSound} from "@/utils/sound";
+import {convertCamelCaseToReadable} from "@/utils/string";
+import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
-import { capitalize, sample, uniq } from "lodash";
+import {capitalize, sample, uniq} from "lodash";
 import moment from "moment";
-import { useRouter } from "next/router";
-import { useEffect, useState, Dispatch, SetStateAction } from "react";
-import { BsArrowRepeat, BsCheck } from "react-icons/bs";
-import { toast } from "react-toastify";
-import { v4 } from "uuid";
+import {useRouter} from "next/router";
+import {generate} from "random-words";
+import {useEffect, useState, Dispatch, SetStateAction} from "react";
+import {BsArrowRepeat, BsCheck} from "react-icons/bs";
+import {toast} from "react-toastify";
+import {v4} from "uuid";
 
 const DIFFICULTIES: Difficulty[] = ["easy", "medium", "hard"];
 
 const PartTab = ({
-  part,
-  index,
-  difficulty,
-  setPart,
-  updatePart,
+	part,
+	index,
+	difficulty,
+	setPart,
+	updatePart,
 }: {
-  part?: SpeakingPart;
-  difficulty: Difficulty;
-  index: number;
-  setPart: (part?: SpeakingPart) => void;
-  updatePart: Dispatch<SetStateAction<SpeakingPart | undefined>>;
+	part?: SpeakingPart;
+	difficulty: Difficulty;
+	index: number;
+	setPart: (part?: SpeakingPart) => void;
+	updatePart: Dispatch<SetStateAction<SpeakingPart | undefined>>;
 }) => {
-  const [gender, setGender] = useState<"male" | "female">("male");
-  const [isLoading, setIsLoading] = useState(false);
+	const [gender, setGender] = useState<"male" | "female">("male");
+	const [isLoading, setIsLoading] = useState(false);
 
-  const generate = () => {
-    setPart(undefined);
-    setIsLoading(true);
+	const generate = () => {
+		setPart(undefined);
+		setIsLoading(true);
 
-    const url = new URLSearchParams();
-    url.append("difficulty", difficulty);
+		const url = new URLSearchParams();
+		url.append("difficulty", difficulty);
 
-    axios
-      .get(
-        `/api/exam/speaking/generate/speaking_task_${index}?${url.toString()}`
-      )
-      .then((result) => {
-        playSound(typeof result.data === "string" ? "error" : "check");
-        if (typeof result.data === "string")
-          return toast.error(
-            "Something went wrong, please try to generate again."
-          );
-        console.log(result.data);
-        setPart(result.data);
-      })
-      .catch((error) => {
-        console.log(error);
-        toast.error("Something went wrong!");
-      })
-      .finally(() => setIsLoading(false));
-  };
+		axios
+			.get(`/api/exam/speaking/generate/speaking_task_${index}?${url.toString()}`)
+			.then((result) => {
+				playSound(typeof result.data === "string" ? "error" : "check");
+				if (typeof result.data === "string") return toast.error("Something went wrong, please try to generate again.");
+				console.log(result.data);
+				setPart(result.data);
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error("Something went wrong!");
+			})
+			.finally(() => setIsLoading(false));
+	};
 
-  const generateVideo = async () => {
-    if (!part)
-      return toast.error(
-        "Please generate the first part before generating the video!"
-      );
-    toast.info(
-      "This will take quite a while, please do not leave this page or close the tab/window."
-    );
+	const generateVideo = async () => {
+		if (!part) return toast.error("Please generate the first part before generating the video!");
+		toast.info("This will take quite a while, please do not leave this page or close the tab/window.");
 
-    const avatar = sample(AVATARS.filter((x) => x.gender === gender));
+		const avatar = sample(AVATARS.filter((x) => x.gender === gender));
 
-    setIsLoading(true);
-    const initialTime = moment();
+		setIsLoading(true);
+		const initialTime = moment();
 
-    axios
-      .post(`/api/exam/speaking/generate/speaking/generate_video_${index}`, {
-        ...part,
-        avatar: avatar?.id,
-      })
-      .then((result) => {
-        const isError =
-          typeof result.data === "string" ||
-          moment().diff(initialTime, "seconds") < 60;
+		axios
+			.post(`/api/exam/speaking/generate/speaking/generate_video_${index}`, {
+				...part,
+				avatar: avatar?.id,
+			})
+			.then((result) => {
+				const isError = typeof result.data === "string" || moment().diff(initialTime, "seconds") < 60;
 
-        playSound(isError ? "error" : "check");
-        console.log(result.data);
-        if (isError)
-          return toast.error(
-            "Something went wrong, please try to generate the video again."
-          );
-        setPart({
-          ...part,
-          result: { ...result.data, topic: part?.topic },
-          gender,
-          avatar,
-        });
-      })
-      .catch((e) => {
-        toast.error("Something went wrong!");
-        console.log(e);
-      })
-      .finally(() => setIsLoading(false));
-  };
+				playSound(isError ? "error" : "check");
+				console.log(result.data);
+				if (isError) return toast.error("Something went wrong, please try to generate the video again.");
+				setPart({
+					...part,
+					result: {...result.data, topic: part?.topic},
+					gender,
+					avatar,
+				});
+			})
+			.catch((e) => {
+				toast.error("Something went wrong!");
+				console.log(e);
+			})
+			.finally(() => setIsLoading(false));
+	};
 
-  return (
-    <Tab.Panel className="w-full bg-ielts-speaking/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
-      <div className="flex flex-col gap-3 w-full">
-        <label className="font-normal text-base text-mti-gray-dim">
-          Gender
-        </label>
-        <Select
-          options={[
-            { value: "male", label: "Male" },
-            { value: "female", label: "Female" },
-          ]}
-          value={{ value: gender, label: capitalize(gender) }}
-          onChange={(value) =>
-            value ? setGender(value.value as typeof gender) : null
-          }
-          disabled={isLoading}
-        />
-      </div>
-      <div className="flex gap-4 items-end">
-        <button
-          onClick={generate}
-          disabled={isLoading}
-          data-tip="The passage is currently being generated"
-          className={clsx(
-            "bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
-            "hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
-            "transition ease-in-out duration-300",
-            isLoading && "tooltip"
-          )}
-        >
-          {isLoading ? (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="text-white animate-spin" size={25} />
-            </div>
-          ) : (
-            "Generate"
-          )}
-        </button>
-        <button
-          onClick={generateVideo}
-          disabled={isLoading || !part}
-          data-tip="The passage is currently being generated"
-          className={clsx(
-            "bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
-            "hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
-            "transition ease-in-out duration-300",
-            isLoading && "tooltip"
-          )}
-        >
-          {isLoading ? (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="text-white animate-spin" size={25} />
-            </div>
-          ) : (
-            "Generate Video"
-          )}
-        </button>
-      </div>
-      {isLoading && (
-        <div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
-          <span
-            className={clsx(
-              "loading loading-infinity w-32 text-ielts-speaking"
-            )}
-          />
-          <span className={clsx("font-bold text-2xl text-ielts-speaking")}>
-            Generating...
-          </span>
-        </div>
-      )}
-      {part && !isLoading && (
-        <div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide h-96">
-          <h3 className="text-xl font-semibold">
-            {!!part.first_topic && !!part.second_topic
-              ? `${part.first_topic} & ${part.second_topic}`
-              : part.topic}
-          </h3>
-          {part.question && <span className="w-full">{part.question}</span>}
-          {part.questions && (
-            <div className="flex flex-col gap-1">
-              {part.questions.map((question, index) => (
-                <span className="w-full" key={index}>
-                  - {question}
-                </span>
-              ))}
-            </div>
-          )}
-          {part.prompts && (
-            <div className="flex flex-col gap-1">
-              <span className="font-medium">
-                You should talk about the following things:
-              </span>
-              {part.prompts.map((prompt, index) => (
-                <span className="w-full" key={index}>
-                  - {prompt}
-                </span>
-              ))}
-            </div>
-          )}
-          {part.result && (
-            <span className="font-bold mt-4">Video Generated: ✅</span>
-          )}
-          {part.avatar && part.gender && (
-            <span>
-              <b>Instructor:</b> {part.avatar.name} -{" "}
-              {capitalize(part.avatar.gender)}
-            </span>
-          )}
-          {part.questions?.map((question, index) => (
-            <Input
-              key={index}
-              type="text"
-              label="Question"
-              name="question"
-              required
-              value={question}
-              onChange={
-                (value) =>
-                  updatePart((part?: SpeakingPart) => {
-                    if (part) {
-                      return {
-                        ...part,
-                        questions: part.questions?.map((x, xIndex) =>
-                          xIndex === index ? value : x
-                        ),
-                      } as SpeakingPart;
-                    }
+	return (
+		<Tab.Panel className="w-full bg-ielts-speaking/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
+			<div className="flex flex-col gap-3 w-full">
+				<label className="font-normal text-base text-mti-gray-dim">Gender</label>
+				<Select
+					options={[
+						{value: "male", label: "Male"},
+						{value: "female", label: "Female"},
+					]}
+					value={{value: gender, label: capitalize(gender)}}
+					onChange={(value) => (value ? setGender(value.value as typeof gender) : null)}
+					disabled={isLoading}
+				/>
+			</div>
+			<div className="flex gap-4 items-end">
+				<button
+					onClick={generate}
+					disabled={isLoading}
+					data-tip="The passage is currently being generated"
+					className={clsx(
+						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
+						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						isLoading && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Generate"
+					)}
+				</button>
+				<button
+					onClick={generateVideo}
+					disabled={isLoading || !part}
+					data-tip="The passage is currently being generated"
+					className={clsx(
+						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
+						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						isLoading && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Generate Video"
+					)}
+				</button>
+			</div>
+			{isLoading && (
+				<div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
+					<span className={clsx("loading loading-infinity w-32 text-ielts-speaking")} />
+					<span className={clsx("font-bold text-2xl text-ielts-speaking")}>Generating...</span>
+				</div>
+			)}
+			{part && !isLoading && (
+				<div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide h-96">
+					<h3 className="text-xl font-semibold">
+						{!!part.first_topic && !!part.second_topic ? `${part.first_topic} & ${part.second_topic}` : part.topic}
+					</h3>
+					{part.question && <span className="w-full">{part.question}</span>}
+					{part.questions && (
+						<div className="flex flex-col gap-1">
+							{part.questions.map((question, index) => (
+								<span className="w-full" key={index}>
+									- {question}
+								</span>
+							))}
+						</div>
+					)}
+					{part.prompts && (
+						<div className="flex flex-col gap-1">
+							<span className="font-medium">You should talk about the following things:</span>
+							{part.prompts.map((prompt, index) => (
+								<span className="w-full" key={index}>
+									- {prompt}
+								</span>
+							))}
+						</div>
+					)}
+					{part.result && <span className="font-bold mt-4">Video Generated: ✅</span>}
+					{part.avatar && part.gender && (
+						<span>
+							<b>Instructor:</b> {part.avatar.name} - {capitalize(part.avatar.gender)}
+						</span>
+					)}
+					{part.questions?.map((question, index) => (
+						<Input
+							key={index}
+							type="text"
+							label="Question"
+							name="question"
+							required
+							value={question}
+							onChange={(value) =>
+								updatePart((part?: SpeakingPart) => {
+									if (part) {
+										return {
+											...part,
+											questions: part.questions?.map((x, xIndex) => (xIndex === index ? value : x)),
+										} as SpeakingPart;
+									}
 
-                    return part;
-                  })
-              }
-            />
-          ))}
-        </div>
-      )}
-    </Tab.Panel>
-  );
+									return part;
+								})
+							}
+						/>
+					))}
+				</div>
+			)}
+		</Tab.Panel>
+	);
 };
 
 interface SpeakingPart {
-  prompts?: string[];
-  question?: string;
-  questions?: string[];
-  topic: string;
-  first_topic?: string;
-  second_topic?: string;
-  result?: SpeakingExercise | InteractiveSpeakingExercise;
-  gender?: "male" | "female";
-  avatar?: (typeof AVATARS)[number];
+	prompts?: string[];
+	question?: string;
+	questions?: string[];
+	topic: string;
+	first_topic?: string;
+	second_topic?: string;
+	result?: SpeakingExercise | InteractiveSpeakingExercise;
+	gender?: "male" | "female";
+	avatar?: (typeof AVATARS)[number];
 }
 
 const SpeakingGeneration = () => {
-  const [part1, setPart1] = useState<SpeakingPart>();
-  const [part2, setPart2] = useState<SpeakingPart>();
-  const [part3, setPart3] = useState<SpeakingPart>();
-  const [minTimer, setMinTimer] = useState(14);
-  const [isLoading, setIsLoading] = useState(false);
-  const [resultingExam, setResultingExam] = useState<SpeakingExam>();
-  const [difficulty, setDifficulty] = useState<Difficulty>(
-    sample(DIFFICULTIES)!
-  );
+	const [part1, setPart1] = useState<SpeakingPart>();
+	const [part2, setPart2] = useState<SpeakingPart>();
+	const [part3, setPart3] = useState<SpeakingPart>();
+	const [minTimer, setMinTimer] = useState(14);
+	const [isLoading, setIsLoading] = useState(false);
+	const [resultingExam, setResultingExam] = useState<SpeakingExam>();
+	const [difficulty, setDifficulty] = useState<Difficulty>(sample(DIFFICULTIES)!);
 
-  useEffect(() => {
-    const parts = [part1, part2, part3].filter((x) => !!x);
-    setMinTimer(parts.length === 0 ? 5 : parts.length * 5);
-  }, [part1, part2, part3]);
+	useEffect(() => {
+		const parts = [part1, part2, part3].filter((x) => !!x);
+		setMinTimer(parts.length === 0 ? 5 : parts.length * 5);
+	}, [part1, part2, part3]);
 
-  const router = useRouter();
+	const router = useRouter();
 
-  const setExams = useExamStore((state) => state.setExams);
-  const setSelectedModules = useExamStore((state) => state.setSelectedModules);
+	const setExams = useExamStore((state) => state.setExams);
+	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
 
-  const submitExam = () => {
-    if (!part1?.result && !part2?.result && !part3?.result)
-      return toast.error("Please generate at least one task!");
+	const submitExam = () => {
+		if (!part1?.result && !part2?.result && !part3?.result) return toast.error("Please generate at least one task!");
 
-    setIsLoading(true);
+		setIsLoading(true);
 
-    const genders = [part1?.gender, part2?.gender, part3?.gender].filter(
-      (x) => !!x
-    );
+		const genders = [part1?.gender, part2?.gender, part3?.gender].filter((x) => !!x);
 
-    const exercises = [part1?.result, part2?.result, part3?.result]
-      .filter((x) => !!x)
-      .map((x) => ({
-        ...x,
-        first_title:
-          x?.type === "interactiveSpeaking" ? x.first_topic : undefined,
-        second_title:
-          x?.type === "interactiveSpeaking" ? x.second_topic : undefined,
-      }));
+		const exercises = [part1?.result, part2?.result, part3?.result]
+			.filter((x) => !!x)
+			.map((x) => ({
+				...x,
+				first_title: x?.type === "interactiveSpeaking" ? x.first_topic : undefined,
+				second_title: x?.type === "interactiveSpeaking" ? x.second_topic : undefined,
+			}));
 
-    const exam: SpeakingExam = {
-      id: v4(),
-      isDiagnostic: false,
-      exercises: exercises as (
-        | SpeakingExercise
-        | InteractiveSpeakingExercise
-      )[],
-      minTimer,
-      variant: minTimer >= 14 ? "full" : "partial",
-      module: "speaking",
-      instructorGender: genders.every((x) => x === "male")
-        ? "male"
-        : genders.every((x) => x === "female")
-        ? "female"
-        : "varied",
-    };
+		const exam: SpeakingExam = {
+			id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
+			isDiagnostic: false,
+			exercises: exercises as (SpeakingExercise | InteractiveSpeakingExercise)[],
+			minTimer,
+			variant: minTimer >= 14 ? "full" : "partial",
+			module: "speaking",
+			instructorGender: genders.every((x) => x === "male") ? "male" : genders.every((x) => x === "female") ? "female" : "varied",
+		};
 
-    axios
-      .post(`/api/exam/speaking`, exam)
-      .then((result) => {
-        playSound("sent");
-        console.log(`Generated Exam ID: ${result.data.id}`);
-        toast.success(
-          "This new exam has been generated successfully! Check the ID in our browser's console."
-        );
-        setResultingExam(result.data);
+		axios
+			.post(`/api/exam/speaking`, exam)
+			.then((result) => {
+				playSound("sent");
+				console.log(`Generated Exam ID: ${result.data.id}`);
+				toast.success(`Generated Exam ID: ${result.data.id}`);
+				setResultingExam(result.data);
 
-        setPart1(undefined);
-        setPart2(undefined);
-        setPart3(undefined);
-        setDifficulty(sample(DIFFICULTIES)!);
-        setMinTimer(14);
-      })
-      .catch((error) => {
-        console.log(error);
-        toast.error(
-          "Something went wrong while generating, please try again later."
-        );
-      })
-      .finally(() => setIsLoading(false));
-  };
+				setPart1(undefined);
+				setPart2(undefined);
+				setPart3(undefined);
+				setDifficulty(sample(DIFFICULTIES)!);
+				setMinTimer(14);
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error("Something went wrong while generating, please try again later.");
+			})
+			.finally(() => setIsLoading(false));
+	};
 
-  const loadExam = async (examId: string) => {
-    const exam = await getExamById("speaking", examId.trim());
-    if (!exam) {
-      toast.error(
-        "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
-        {
-          toastId: "invalid-exam-id",
-        }
-      );
+	const loadExam = async (examId: string) => {
+		const exam = await getExamById("speaking", examId.trim());
+		if (!exam) {
+			toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
+				toastId: "invalid-exam-id",
+			});
 
-      return;
-    }
+			return;
+		}
 
-    setExams([exam]);
-    setSelectedModules(["speaking"]);
+		setExams([exam]);
+		setSelectedModules(["speaking"]);
 
-    router.push("/exercises");
-  };
+		router.push("/exercises");
+	};
 
-  return (
-    <>
-      <div className="flex gap-4 w-1/2">
-        <div className="flex flex-col gap-3">
-          <label className="font-normal text-base text-mti-gray-dim">
-            Timer
-          </label>
-          <Input
-            type="number"
-            name="minTimer"
-            onChange={(e) => setMinTimer(parseInt(e) < 5 ? 5 : parseInt(e))}
-            value={minTimer}
-            className="max-w-[300px]"
-          />
-        </div>
-        <div className="flex flex-col gap-3 w-full">
-          <label className="font-normal text-base text-mti-gray-dim">
-            Difficulty
-          </label>
-          <Select
-            options={DIFFICULTIES.map((x) => ({
-              value: x,
-              label: capitalize(x),
-            }))}
-            onChange={(value) =>
-              value ? setDifficulty(value.value as Difficulty) : null
-            }
-            value={{ value: difficulty, label: capitalize(difficulty) }}
-            disabled={!!part1 || !!part2 || !!part3}
-          />
-        </div>
-      </div>
+	return (
+		<>
+			<div className="flex gap-4 w-1/2">
+				<div className="flex flex-col gap-3">
+					<label className="font-normal text-base text-mti-gray-dim">Timer</label>
+					<Input
+						type="number"
+						name="minTimer"
+						onChange={(e) => setMinTimer(parseInt(e) < 5 ? 5 : parseInt(e))}
+						value={minTimer}
+						className="max-w-[300px]"
+					/>
+				</div>
+				<div className="flex flex-col gap-3 w-full">
+					<label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
+					<Select
+						options={DIFFICULTIES.map((x) => ({
+							value: x,
+							label: capitalize(x),
+						}))}
+						onChange={(value) => (value ? setDifficulty(value.value as Difficulty) : null)}
+						value={{value: difficulty, label: capitalize(difficulty)}}
+						disabled={!!part1 || !!part2 || !!part3}
+					/>
+				</div>
+			</div>
 
-      <Tab.Group>
-        <Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking"
-              )
-            }
-          >
-            Exercise 1 {part1 && part1.result && <BsCheck />}
-          </Tab>
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking"
-              )
-            }
-          >
-            Exercise 2 {part2 && part2.result && <BsCheck />}
-          </Tab>
-          <Tab
-            className={({ selected }) =>
-              clsx(
-                "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
-                "ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-                "transition duration-300 ease-in-out",
-                selected
-                  ? "bg-white shadow"
-                  : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking"
-              )
-            }
-          >
-            Interactive {part3 && part3.result && <BsCheck />}
-          </Tab>
-        </Tab.List>
-        <Tab.Panels>
-          {[
-            { part: part1, setPart: setPart1 },
-            { part: part2, setPart: setPart2 },
-            { part: part3, setPart: setPart3 },
-          ].map(({ part, setPart }, index) => (
-            <PartTab
-              difficulty={difficulty}
-              part={part}
-              index={index + 1}
-              key={index}
-              setPart={setPart}
-              updatePart={setPart}
-            />
-          ))}
-        </Tab.Panels>
-      </Tab.Group>
-      <div className="w-full flex justify-end gap-4">
-        {resultingExam && (
-          <button
-            disabled={isLoading}
-            onClick={() => loadExam(resultingExam.id)}
-            className={clsx(
-              "bg-white border border-ielts-speaking text-ielts-speaking w-full max-w-[200px] rounded-xl h-[70px] self-end",
-              "hover:bg-ielts-speaking hover:text-white disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
-              "transition ease-in-out duration-300"
-            )}
-          >
-            Perform Exam
-          </button>
-        )}
-        <button
-          disabled={
-            (!part1?.result && !part2?.result && !part3?.result) || isLoading
-          }
-          data-tip="Please generate all three passages"
-          onClick={submitExam}
-          className={clsx(
-            "bg-ielts-speaking/70 border border-ielts-speaking text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
-            "hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
-            "transition ease-in-out duration-300",
-            !part1 && !part2 && !part3 && "tooltip"
-          )}
-        >
-          {isLoading ? (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="text-white animate-spin" size={25} />
-            </div>
-          ) : (
-            "Submit"
-          )}
-        </button>
-      </div>
-    </>
-  );
+			<Tab.Group>
+				<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+							)
+						}>
+						Exercise 1 {part1 && part1.result && <BsCheck />}
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+							)
+						}>
+						Exercise 2 {part2 && part2.result && <BsCheck />}
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70 flex gap-2 items-center justify-center",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
+								"transition duration-300 ease-in-out",
+								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+							)
+						}>
+						Interactive {part3 && part3.result && <BsCheck />}
+					</Tab>
+				</Tab.List>
+				<Tab.Panels>
+					{[
+						{part: part1, setPart: setPart1},
+						{part: part2, setPart: setPart2},
+						{part: part3, setPart: setPart3},
+					].map(({part, setPart}, index) => (
+						<PartTab difficulty={difficulty} part={part} index={index + 1} key={index} setPart={setPart} updatePart={setPart} />
+					))}
+				</Tab.Panels>
+			</Tab.Group>
+			<div className="w-full flex justify-end gap-4">
+				{resultingExam && (
+					<button
+						disabled={isLoading}
+						onClick={() => loadExam(resultingExam.id)}
+						className={clsx(
+							"bg-white border border-ielts-speaking text-ielts-speaking w-full max-w-[200px] rounded-xl h-[70px] self-end",
+							"hover:bg-ielts-speaking hover:text-white disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+							"transition ease-in-out duration-300",
+						)}>
+						Perform Exam
+					</button>
+				)}
+				<button
+					disabled={(!part1?.result && !part2?.result && !part3?.result) || isLoading}
+					data-tip="Please generate all three passages"
+					onClick={submitExam}
+					className={clsx(
+						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
+						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						!part1 && !part2 && !part3 && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Submit"
+					)}
+				</button>
+			</div>
+		</>
+	);
 };
 
 export default SpeakingGeneration;
diff --git a/src/pages/(generation)/WritingGeneration.tsx b/src/pages/(generation)/WritingGeneration.tsx
index 97aaf223..6555614a 100644
--- a/src/pages/(generation)/WritingGeneration.tsx
+++ b/src/pages/(generation)/WritingGeneration.tsx
@@ -9,6 +9,7 @@ import axios from "axios";
 import clsx from "clsx";
 import {capitalize, sample} from "lodash";
 import {useRouter} from "next/router";
+import {generate} from "random-words";
 import {useEffect, useState} from "react";
 import {BsArrowRepeat, BsCheck} from "react-icons/bs";
 import {toast} from "react-toastify";
@@ -151,7 +152,7 @@ const WritingGeneration = () => {
 			minTimer,
 			module: "writing",
 			exercises: [...(exercise1 ? [exercise1] : []), ...(exercise2 ? [exercise2] : [])],
-			id: v4(),
+			id: generate({minLength: 4, maxLength: 8, min: 3, max: 5, join: " ", formatter: capitalize}),
 			variant: exercise1 && exercise2 ? "full" : "partial",
 			difficulty,
 		};
@@ -160,6 +161,7 @@ const WritingGeneration = () => {
 			.post(`/api/exam/writing`, exam)
 			.then((result) => {
 				console.log(`Generated Exam ID: ${result.data.id}`);
+				toast.success(`Generated Exam ID: ${result.data.id}`);
 				playSound("sent");
 				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
 				setResultingExam(result.data);
diff --git a/src/pages/api/assignments/index.ts b/src/pages/api/assignments/index.ts
index 4d0cc11a..2d875357 100644
--- a/src/pages/api/assignments/index.ts
+++ b/src/pages/api/assignments/index.ts
@@ -102,6 +102,7 @@ const generateExams = async (
 
 async function POST(req: NextApiRequest, res: NextApiResponse) {
 	const {
+		examIDs,
 		selectedModules,
 		assignees,
 		// Generate multiple true would generate an unique exam for each user
@@ -111,6 +112,7 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		instructorGender,
 		...body
 	} = req.body as {
+		examIDs?: {id: string; module: Module}[];
 		selectedModules: Module[];
 		assignees: string[];
 		generateMultiple: Boolean;
@@ -121,7 +123,9 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 		instructorGender?: InstructorGender;
 	};
 
-	const exams: ExamWithUser[] = await generateExams(generateMultiple, selectedModules, assignees, variant, instructorGender);
+	const exams: ExamWithUser[] = !!examIDs
+		? examIDs.flatMap((e) => assignees.map((a) => ({...e, assignee: a})))
+		: await generateExams(generateMultiple, selectedModules, assignees, variant, instructorGender);
 
 	if (exams.length === 0) {
 		res.status(400).json({ok: false, error: "No exams found for the selected modules"});
diff --git a/src/pages/api/exam/[module]/index.ts b/src/pages/api/exam/[module]/index.ts
index e7ff0699..1c845cc7 100644
--- a/src/pages/api/exam/[module]/index.ts
+++ b/src/pages/api/exam/[module]/index.ts
@@ -47,7 +47,7 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 	}
 	const {module} = req.query as {module: string};
 
-	const exam = {...req.body, module: module};
+	const exam = {...req.body, module: module, createdBy: req.session.user.id, createdAt: new Date().toISOString()};
 	await setDoc(doc(db, module, req.body.id), exam);
 
 	res.status(200).json(exam);
diff --git a/src/pages/api/training/[id].ts b/src/pages/api/training/[id].ts
new file mode 100644
index 00000000..4532c366
--- /dev/null
+++ b/src/pages/api/training/[id].ts
@@ -0,0 +1,44 @@
+import { sessionOptions } from "@/lib/session";
+import {app} from "@/firebase";
+import { collection, doc, getDoc, getDocs, getFirestore, query } from "firebase/firestore";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { NextApiRequest, NextApiResponse } from "next";
+
+const db = getFirestore(app);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (!req.session.user) {
+        res.status(401).json({ ok: false });
+        return;
+    }
+
+    if (req.method === "GET") return get(req, res);
+}
+
+
+async function get(req: NextApiRequest, res: NextApiResponse) {
+    try {
+        const { id } = req.query;
+
+      if (typeof id !== 'string') {
+        return res.status(400).json({ message: 'Invalid ID' });
+      }
+
+      const docRef = doc(db, "training", id);
+      const docSnap = await getDoc(docRef);
+
+      if (docSnap.exists()) {
+        res.status(200).json({
+          id: docSnap.id,
+          ...docSnap.data(),
+        });
+      } else {
+        res.status(404).json({ message: 'Document not found' });
+      }
+    } catch (error) {
+        console.error('Error fetching data:', error);
+        res.status(500).json({ message: 'An unexpected error occurred' });
+    }
+}
diff --git a/src/pages/api/training/index.ts b/src/pages/api/training/index.ts
new file mode 100644
index 00000000..fe694e61
--- /dev/null
+++ b/src/pages/api/training/index.ts
@@ -0,0 +1,51 @@
+import { sessionOptions } from "@/lib/session";
+import axios from "axios";
+import { app } from "@/firebase";
+import { collection, doc, getDoc, getDocs, getFirestore, query } from "firebase/firestore";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { NextApiRequest, NextApiResponse } from "next";
+
+const db = getFirestore(app);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (!req.session.user) {
+        res.status(401).json({ ok: false });
+        return;
+    }
+
+    if (req.method === "GET") return get(req, res);
+    if (req.method === "POST") return post(req, res);
+}
+
+async function post(req: NextApiRequest, res: NextApiResponse) {
+    try {
+        const response = await axios.post(`${process.env.BACKEND_URL}/training_content`, req.body, {
+            headers: {
+                Authorization: `Bearer ${process.env.BACKEND_JWT}`,
+            },
+        });
+        res.status(response.status).json(response.data);
+    } catch (error) {
+        res.status(500).json({ message: 'An unexpected error occurred' });
+    }
+}
+
+async function get(req: NextApiRequest, res: NextApiResponse) {
+    try {
+        const q = query(collection(db, "training"));
+        const snapshot = await getDocs(q);
+
+        res.status(200).json(
+            snapshot.docs.map((doc) => ({
+                id: doc.id,
+                ...doc.data(),
+            }))
+        );
+    } catch (error) {
+        console.error('Error fetching data:', error);
+        res.status(500).json({ message: 'An unexpected error occurred' });
+    }
+}
+
diff --git a/src/pages/api/training/walkthrough/index.ts b/src/pages/api/training/walkthrough/index.ts
new file mode 100644
index 00000000..727df308
--- /dev/null
+++ b/src/pages/api/training/walkthrough/index.ts
@@ -0,0 +1,44 @@
+import { sessionOptions } from "@/lib/session";
+import { app } from "@/firebase";
+import { collection, doc, documentId, getDoc, getDocs, getFirestore, query, where } from "firebase/firestore";
+import { withIronSessionApiRoute } from "iron-session/next";
+import { NextApiRequest, NextApiResponse } from "next";
+
+const db = getFirestore(app);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+    if (!req.session.user) {
+        res.status(401).json({ ok: false });
+        return;
+    }
+    if (req.method === "GET") return get(req, res);
+}
+
+
+async function get(req: NextApiRequest, res: NextApiResponse) {
+    try {
+        const { ids } = req.query;
+
+        if (!ids || !Array.isArray(ids)) {
+            return res.status(400).json({ message: 'Invalid or missing ids!' });
+        }
+
+        const walkthroughCollection = collection(db, 'walkthrough');
+
+        const q = query(walkthroughCollection, where(documentId(), 'in', ids));
+
+        const querySnapshot = await getDocs(q);
+
+        const documents = querySnapshot.docs.map(doc => ({
+            id: doc.id,
+            ...doc.data()
+        }));
+
+        res.status(200).json(documents);
+    } catch (error) {
+        console.error('Error fetching data:', error);
+        res.status(500).json({ message: 'An unexpected error occurred' });
+    }
+}
diff --git a/src/pages/record.tsx b/src/pages/record.tsx
index 29f15b4d..e6239244 100644
--- a/src/pages/record.tsx
+++ b/src/pages/record.tsx
@@ -1,35 +1,30 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {withIronSessionSsr} from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
-import {Stat, User} from "@/interfaces/user";
-import {useEffect, useState} from "react";
+import { withIronSessionSsr } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
+import { Stat, User } from "@/interfaces/user";
+import { useEffect, useRef, useState } from "react";
 import useStats from "@/hooks/useStats";
-import {convertToUserSolutions, groupByDate} from "@/utils/stats";
+import { groupByDate } from "@/utils/stats";
 import moment from "moment";
 import useUsers from "@/hooks/useUsers";
 import useExamStore from "@/stores/examStore";
-import {Module} from "@/interfaces";
-import {ToastContainer} from "react-toastify";
-import {useRouter} from "next/router";
-import {uniqBy} from "lodash";
-import {getExamById} from "@/utils/exams";
-import {sortByModule} from "@/utils/moduleUtils";
+import { ToastContainer } from "react-toastify";
+import { useRouter } from "next/router";
 import Layout from "@/components/High/Layout";
 import clsx from "clsx";
-import {calculateBandScore} from "@/utils/score";
-import {BsBook, BsClipboard, BsClock, BsHeadphones, BsMegaphone, BsPen, BsPersonDash, BsPersonFillX, BsXCircle} from "react-icons/bs";
 import Select from "@/components/Low/Select";
 import useGroups from "@/hooks/useGroups";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import useAssignments from "@/hooks/useAssignments";
-import {uuidv4} from "@firebase/util";
-import {usePDFDownload} from "@/hooks/usePDFDownload";
+import { uuidv4 } from "@firebase/util";
+import { usePDFDownload } from "@/hooks/usePDFDownload";
 import useRecordStore from "@/stores/recordStore";
-import ai_usage from "@/utils/ai.detection";
+import useTrainingContentStore from "@/stores/trainingContentStore";
+import StatsGridItem from "@/components/StatGridItem";
 
 
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 	const user = req.session.user;
 
 	if (!user || !user.isVerified) {
@@ -51,7 +46,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	}
 
 	return {
-		props: {user: req.session.user},
+		props: { user: req.session.user },
 	};
 }, sessionOptions);
 
@@ -60,16 +55,16 @@ const defaultSelectableCorporate = {
 	label: "All",
 };
 
-export default function History({user}: {user: User}) {
-	const [statsUserId, setStatsUserId] = useRecordStore((state) => [state.selectedUser, state.setSelectedUser]);
+export default function History({ user }: { user: User }) {
+	const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore((state) => [state.selectedUser, state.setSelectedUser, state.training, state.setTraining]);
 	// const [statsUserId, setStatsUserId] = useState<string | undefined>(user.id);
-	const [groupedStats, setGroupedStats] = useState<{[key: string]: Stat[]}>();
+	const [groupedStats, setGroupedStats] = useState<{ [key: string]: Stat[] }>();
 	const [filter, setFilter] = useState<"months" | "weeks" | "days" | "assignments">();
-	const {assignments} = useAssignments({});
+	const { assignments } = useAssignments({});
 
-	const {users} = useUsers();
-	const {stats, isLoading: isStatsLoading} = useStats(statsUserId);
-	const {groups: allGroups} = useGroups();
+	const { users } = useUsers();
+	const { stats, isLoading: isStatsLoading } = useStats(statsUserId);
+	const { groups: allGroups } = useGroups();
 
 	const groups = allGroups.filter((x) => x.admin === user.id);
 
@@ -79,8 +74,8 @@ export default function History({user}: {user: User}) {
 	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
 	const setInactivity = useExamStore((state) => state.setInactivity);
 	const setTimeSpent = useExamStore((state) => state.setTimeSpent);
-	const router = useRouter();
 	const renderPdfIcon = usePDFDownload("stats");
+	const router = useRouter();
 
 	useEffect(() => {
 		if (stats && !isStatsLoading) {
@@ -109,22 +104,21 @@ export default function History({user}: {user: User}) {
 		setFilter((prev) => (prev === value ? undefined : value));
 	};
 
-	const filterStatsByDate = (stats: {[key: string]: Stat[]}) => {
+	const filterStatsByDate = (stats: { [key: string]: Stat[] }) => {
 		if (filter && filter !== "assignments") {
 			const filterDate = moment()
-				.subtract({[filter as string]: 1})
+				.subtract({ [filter as string]: 1 })
 				.format("x");
-			const filteredStats: {[key: string]: Stat[]} = {};
+			const filteredStats: { [key: string]: Stat[] } = {};
 
 			Object.keys(stats).forEach((timestamp) => {
 				if (timestamp >= filterDate) filteredStats[timestamp] = stats[timestamp];
 			});
-
 			return filteredStats;
 		}
 
 		if (filter && filter === "assignments") {
-			const filteredStats: {[key: string]: Stat[]} = {};
+			const filteredStats: { [key: string]: Stat[] } = {};
 
 			Object.keys(stats).forEach((timestamp) => {
 				if (stats[timestamp].map((s) => s.assignment === undefined).includes(false))
@@ -137,211 +131,62 @@ export default function History({user}: {user: User}) {
 		return stats;
 	};
 
-	const formatTimestamp = (timestamp: string) => {
-		const date = moment(parseInt(timestamp));
-		const formatter = "YYYY/MM/DD - HH:mm";
+	const MAX_TRAINING_EXAMS = 10;
+	const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>([]);
+	const setTrainingStats = useTrainingContentStore((state) => state.setStats);
 
-		return date.format(formatter);
-	};
+	useEffect(() => {
+		const handleRouteChange = (url: string) => {
+			setTraining(false)
+		}
+		router.events.on('routeChangeStart', handleRouteChange)
+		return () => {
+			router.events.off('routeChangeStart', handleRouteChange)
+		}
+	}, [router.events, setTraining])
 
-	const aggregateScoresByModule = (stats: Stat[]): {module: Module; total: number; missing: number; correct: number}[] => {
-		const scores: {
-			[key in Module]: {total: number; missing: number; correct: number};
-		} = {
-			reading: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			listening: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			writing: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			speaking: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-			level: {
-				total: 0,
-				correct: 0,
-				missing: 0,
-			},
-		};
+	const handleTrainingContentSubmission = () => {
+		if (groupedStats) {
+			const groupedStatsByDate = filterStatsByDate(groupedStats);
+			const allStats = Object.keys(groupedStatsByDate);
+			const selectedStats = selectedTrainingExams.reduce<Record<string, Stat[]>>((accumulator, moduleAndTimestamp) => {
+				const timestamp = moduleAndTimestamp.split("-")[1];
+				if (allStats.includes(timestamp) && !accumulator.hasOwnProperty(timestamp)) {
+					accumulator[timestamp] = groupedStatsByDate[timestamp];
+				}
+				return accumulator;
+			}, {});
+			setTrainingStats(Object.values(selectedStats).flat())
+			router.push("/training");
+		}
+	}
 
-		stats.forEach((x) => {
-			scores[x.module!] = {
-				total: scores[x.module!].total + x.score.total,
-				correct: scores[x.module!].correct + x.score.correct,
-				missing: scores[x.module!].missing + x.score.missing,
-			};
-		});
-
-		return Object.keys(scores)
-			.filter((x) => scores[x as Module].total > 0)
-			.map((x) => ({module: x as Module, ...scores[x as Module]}));
-	};
 
 	const customContent = (timestamp: string) => {
 		if (!groupedStats) return <></>;
 
 		const dateStats = groupedStats[timestamp];
-		const correct = dateStats.reduce((accumulator, current) => accumulator + current.score.correct, 0);
-		const total = dateStats.reduce((accumulator, current) => accumulator + current.score.total, 0);
-		const aggregatedScores = aggregateScoresByModule(dateStats).filter((x) => x.total > 0);
-		const assignmentID = dateStats.reduce((_, current) => current.assignment as any, "");
-		const assignment = assignments.find((a) => a.id === assignmentID);
-		const isDisabled = dateStats.some((x) => x.isDisabled);
-
-		const aiUsage = Math.round(ai_usage(dateStats) * 100);
-
-		const aggregatedLevels = aggregatedScores.map((x) => ({
-			module: x.module,
-			level: calculateBandScore(x.correct, x.total, x.module, user.focus),
-		}));
-
-		const {timeSpent, inactivity, session} = dateStats[0];
-
-		const selectExam = () => {
-			const examPromises = uniqBy(dateStats, "exam").map((stat) => {
-				console.log({stat});
-				return getExamById(stat.module, stat.exam);
-			});
-
-			if (isDisabled) return;
-
-			Promise.all(examPromises).then((exams) => {
-				if (exams.every((x) => !!x)) {
-					if (!!timeSpent) setTimeSpent(timeSpent);
-					if (!!inactivity) setInactivity(inactivity);
-
-					setUserSolutions(convertToUserSolutions(dateStats));
-					setShowSolutions(true);
-					setExams(exams.map((x) => x!).sort(sortByModule));
-					setSelectedModules(
-						exams
-							.map((x) => x!)
-							.sort(sortByModule)
-							.map((x) => x!.module),
-					);
-					router.push("/exercises");
-				}
-			});
-		};
-
-		const textColor = clsx(
-			correct / total >= 0.7 && "text-mti-purple",
-			correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
-			correct / total < 0.3 && "text-mti-rose",
-		);
-
-		const content = (
-			<>
-				<div className="w-full flex justify-between -md:items-center 2xl:items-center">
-					<div className="flex flex-col md:gap-1 -md:gap-2 2xl:gap-2">
-						<span className="font-medium">{formatTimestamp(timestamp)}</span>
-						<div className="flex items-center gap-2">
-							{!!timeSpent && (
-								<span className="text-sm flex gap-2 items-center tooltip" data-tip="Time Spent">
-									<BsClock /> {Math.floor(timeSpent / 60)} minutes
-								</span>
-							)}
-							{!!inactivity && (
-								<span className="text-sm flex gap-2 items-center tooltip" data-tip="Inactivity">
-									<BsXCircle /> {Math.floor(inactivity / 60)} minutes
-								</span>
-							)}
-						</div>
-					</div>
-					<div className="flex flex-col gap-2">
-						<div className="flex flex-row gap-2">
-							<span className={textColor}>
-								Level{" "}
-								{(aggregatedLevels.reduce((accumulator, current) => accumulator + current.level, 0) / aggregatedLevels.length).toFixed(1)}
-							</span>
-							{renderPdfIcon(session, textColor, textColor)}
-						</div>
-						{aiUsage >= 50 && user.type !== "student" && (
-							<div className={clsx(
-								"ml-auto border px-1 rounded w-fit mr-1",
-								{
-									'bg-orange-100 border-orange-400 text-orange-700': aiUsage < 80,
-									'bg-red-100 border-red-400 text-red-700': aiUsage >= 80,
-								}
-							)}>
-								<span className="text-xs">AI Usage</span>
-							</div>
-						)}
-					</div>
-				</div>
-
-				<div className="w-full flex flex-col gap-1">
-					<div className="grid grid-cols-4 gap-2 place-items-start w-full -md:mt-2">
-						{aggregatedLevels.map(({module, level}) => (
-							<div
-								key={module}
-								className={clsx(
-									"flex gap-2 items-center w-fit text-white -md:px-4 xl:px-4 md:px-2 py-2 rounded-xl",
-									module === "reading" && "bg-ielts-reading",
-									module === "listening" && "bg-ielts-listening",
-									module === "writing" && "bg-ielts-writing",
-									module === "speaking" && "bg-ielts-speaking",
-									module === "level" && "bg-ielts-level",
-								)}>
-								{module === "reading" && <BsBook className="w-4 h-4" />}
-								{module === "listening" && <BsHeadphones className="w-4 h-4" />}
-								{module === "writing" && <BsPen className="w-4 h-4" />}
-								{module === "speaking" && <BsMegaphone className="w-4 h-4" />}
-								{module === "level" && <BsClipboard className="w-4 h-4" />}
-								<span className="text-sm">{level.toFixed(1)}</span>
-							</div>
-						))}
-					</div>
-
-					{assignment && (
-						<span className="font-light text-sm">
-							Assignment: {assignment.name}, Teacher: {users.find((u) => u.id === assignment.assigner)?.name}
-						</span>
-					)}
-				</div>
-			</>
-		);
 
 		return (
-			<>
-				<div
-					key={uuidv4()}
-					className={clsx(
-						"flex flex-col justify-between gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden",
-						isDisabled && "grayscale tooltip",
-						correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
-						correct / total < 0.3 && "hover:border-mti-rose",
-					)}
-					onClick={selectExam}
-					data-tip="This exam is still being evaluated..."
-					role="button">
-					{content}
-				</div>
-				<div
-					key={uuidv4()}
-					className={clsx(
-						"flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:tooltip md:hidden",
-						correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
-						correct / total < 0.3 && "hover:border-mti-rose",
-					)}
-					data-tip="Your screen size is too small to view previous exams."
-					role="button">
-					{content}
-				</div>
-			</>
+			<StatsGridItem
+				key={uuidv4()}
+				stats={dateStats}
+				timestamp={timestamp}
+				user={user}
+				assignments={assignments}
+				users={users}
+				training={training}
+				selectedTrainingExams={selectedTrainingExams}
+				setSelectedTrainingExams={setSelectedTrainingExams}
+				maxTrainingExams={MAX_TRAINING_EXAMS}
+				setExams={setExams}
+				setShowSolutions={setShowSolutions}
+				setUserSolutions={setUserSolutions}
+				setSelectedModules={setSelectedModules}
+				setInactivity={setInactivity}
+				setTimeSpent={setTimeSpent}
+				renderPdfIcon={renderPdfIcon}
+			/>
 		);
 	};
 
@@ -395,13 +240,13 @@ export default function History({user}: {user: User}) {
 	const selectedUser = getSelectedUser();
 	const selectedUserSelectValue = selectedUser
 		? {
-				value: selectedUser.id,
-				label: `${selectedUser.name} - ${selectedUser.email}`,
-		  }
+			value: selectedUser.id,
+			label: `${selectedUser.name} - ${selectedUser.email}`,
+		}
 		: {
-				value: "",
-				label: "",
-		  };
+			value: "",
+			label: "",
+		};
 	return (
 		<>
 			<Head>
@@ -418,7 +263,7 @@ export default function History({user}: {user: User}) {
 				<Layout user={user}>
 					<div className="w-full flex -xl:flex-col -xl:gap-4 justify-between items-center">
 						<div className="xl:w-3/4">
-							{(user.type === "developer" || user.type === "admin") && (
+							{(user.type === "developer" || user.type === "admin") && !training && (
 								<>
 									<label className="font-normal text-base text-mti-gray-dim">Corporate</label>
 
@@ -427,7 +272,7 @@ export default function History({user}: {user: User}) {
 										value={selectableCorporates.find((x) => x.value === selectedCorporate)}
 										onChange={(value) => setSelectedCorporate(value?.value || "")}
 										styles={{
-											menuPortal: (base) => ({...base, zIndex: 9999}),
+											menuPortal: (base) => ({ ...base, zIndex: 9999 }),
 											option: (styles, state) => ({
 												...styles,
 												backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
@@ -442,9 +287,9 @@ export default function History({user}: {user: User}) {
 											label: `${x.name} - ${x.email}`,
 										}))}
 										value={selectedUserSelectValue}
-										onChange={(value) => setStatsUserId(value?.value)}
+										onChange={(value) => setStatsUserId(value?.value!)}
 										styles={{
-											menuPortal: (base) => ({...base, zIndex: 9999}),
+											menuPortal: (base) => ({ ...base, zIndex: 9999 }),
 											option: (styles, state) => ({
 												...styles,
 												backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
@@ -454,7 +299,7 @@ export default function History({user}: {user: User}) {
 									/>
 								</>
 							)}
-							{(user.type === "corporate" || user.type === "teacher") && groups.length > 0 && (
+							{(user.type === "corporate" || user.type === "teacher") && groups.length > 0 && !training && (
 								<>
 									<label className="font-normal text-base text-mti-gray-dim">User</label>
 
@@ -466,9 +311,9 @@ export default function History({user}: {user: User}) {
 												label: `${x.name} - ${x.email}`,
 											}))}
 										value={selectedUserSelectValue}
-										onChange={(value) => setStatsUserId(value?.value)}
+										onChange={(value) => setStatsUserId(value?.value!)}
 										styles={{
-											menuPortal: (base) => ({...base, zIndex: 9999}),
+											menuPortal: (base) => ({ ...base, zIndex: 9999 }),
 											option: (styles, state) => ({
 												...styles,
 												backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
@@ -478,6 +323,21 @@ export default function History({user}: {user: User}) {
 									/>
 								</>
 							)}
+							{(training && (
+								<div className="flex flex-row">
+									<div className="font-semibold text-2xl mr-4">Select up to 10 exercises
+										{`(${selectedTrainingExams.length}/${MAX_TRAINING_EXAMS})`}</div>
+									<button
+										className={clsx(
+											"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light ml-4 disabled:cursor-not-allowed",
+											"transition duration-300 ease-in-out",
+										)}
+										disabled={selectedTrainingExams.length == 0}
+										onClick={handleTrainingContentSubmission}>
+										Submit
+									</button>
+								</div>
+							))}
 						</div>
 						<div className="flex gap-4 w-full justify-center xl:justify-end">
 							<button
@@ -528,6 +388,11 @@ export default function History({user}: {user: User}) {
 					{groupedStats && Object.keys(groupedStats).length === 0 && !isStatsLoading && (
 						<span className="font-semibold ml-1">No record to display...</span>
 					)}
+					{isStatsLoading && (
+						<div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-12">
+							<span className="loading loading-infinity w-32 bg-mti-green-light" />
+						</div>
+					)}
 				</Layout>
 			)}
 		</>
diff --git a/src/pages/tickets.tsx b/src/pages/tickets.tsx
index ca06ff96..d2957f79 100644
--- a/src/pages/tickets.tsx
+++ b/src/pages/tickets.tsx
@@ -70,27 +70,33 @@ const SOURCE_OPTIONS = [
 
 type CustomStatus = TicketStatus | "all" | "pending";
 
-const STATUS_OPTIONS = [{
-	label: 'Pending',
-	value: 'pending',
-	filter: (x: Ticket) => x.status !== 'completed',
-}, {
-	label: 'All',
-	value: 'all',
-	filter: (x: Ticket) => true,
-}, {
-	label: 'Completed',
-	value: 'completed',
-	filter: (x: Ticket) => x.status === 'completed',
-}, {
-	label: 'In Progress',
-	value: 'in-progress',
-	filter: (x: Ticket) => x.status === 'in-progress',
-}, {
-	label: 'Submitted',
-	value: 'submitted',
-	filter: (x: Ticket) => x.status === 'submitted',
-}]
+const STATUS_OPTIONS = [
+	{
+		label: "Pending",
+		value: "pending",
+		filter: (x: Ticket) => x.status !== "completed",
+	},
+	{
+		label: "All",
+		value: "all",
+		filter: (x: Ticket) => true,
+	},
+	{
+		label: "Completed",
+		value: "completed",
+		filter: (x: Ticket) => x.status === "completed",
+	},
+	{
+		label: "In Progress",
+		value: "in-progress",
+		filter: (x: Ticket) => x.status === "in-progress",
+	},
+	{
+		label: "Submitted",
+		value: "submitted",
+		filter: (x: Ticket) => x.status === "submitted",
+	},
+];
 
 export default function Tickets() {
 	const [filteredTickets, setFilteredTickets] = useState<Ticket[]>([]);
@@ -101,7 +107,7 @@ export default function Tickets() {
 	const [dateSorting, setDateSorting] = useState<"asc" | "desc">("desc");
 
 	const [typeFilter, setTypeFilter] = useState<TicketType>();
-	const [statusFilter, setStatusFilter] = useState<CustomStatus>('pending');
+	const [statusFilter, setStatusFilter] = useState<CustomStatus>("pending");
 
 	const {user} = useUser({redirectTo: "/login"});
 	const {users} = useUsers();
@@ -116,7 +122,7 @@ export default function Tickets() {
 		if (user?.type === "agent") filters.push((x: Ticket) => x.assignedTo === user.id);
 		if (typeFilter) filters.push((x: Ticket) => x.type === typeFilter);
 		if (statusFilter) {
-			const filter = STATUS_OPTIONS.find(x => x.value === statusFilter)?.filter;
+			const filter = STATUS_OPTIONS.find((x) => x.value === statusFilter)?.filter;
 			if (filter) filters.push(filter);
 		}
 		if (assigneeFilter) filters.push((x: Ticket) => x.assignedTo === assigneeFilter);
@@ -242,9 +248,7 @@ export default function Tickets() {
 							<label className="text-mti-gray-dim text-base font-normal">Status</label>
 							<Select
 								options={STATUS_OPTIONS}
-								value={
-									STATUS_OPTIONS.find((x) => x.value === statusFilter)
-								}
+								value={STATUS_OPTIONS.find((x) => x.value === statusFilter)}
 								onChange={(value) => setStatusFilter((value?.value as TicketStatus) ?? undefined)}
 								isClearable
 								placeholder="Status..."
@@ -278,7 +282,7 @@ export default function Tickets() {
 								disabled={user.type === "agent"}
 								value={getAssigneeValue()}
 								onChange={(value) =>
-									value ? setAssigneeFilter(value.value === "me" ? user.id : value.value) : setAssigneeFilter(undefined)
+									value ? setAssigneeFilter(value.value === "me" ? user.id : value.value!) : setAssigneeFilter(undefined)
 								}
 								placeholder="Assignee..."
 								isClearable
diff --git a/src/pages/training/[id]/index.tsx b/src/pages/training/[id]/index.tsx
new file mode 100644
index 00000000..94226995
--- /dev/null
+++ b/src/pages/training/[id]/index.tsx
@@ -0,0 +1,357 @@
+import { useEffect, useState } from 'react';
+import { useRouter } from 'next/router';
+import axios from 'axios';
+import { Tab } from "@headlessui/react";
+import { AiOutlineFileSearch } from "react-icons/ai";
+import { MdOutlinePlaylistAddCheckCircle, MdOutlineSelfImprovement } from "react-icons/md";
+import { BsChatLeftDots } from "react-icons/bs";
+import Button from "@/components/Low/Button";
+import clsx from "clsx";
+import Exercise from "@/training/Exercise";
+import TrainingScore from "@/training/TrainingScore";
+import { ITrainingContent, ITrainingTip } from "@/training/TrainingInterfaces";
+import { Stat, User } from '@/interfaces/user';
+import Head from "next/head";
+import Layout from "@/components/High/Layout";
+import { ToastContainer } from 'react-toastify';
+import { withIronSessionSsr } from "iron-session/next";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { sessionOptions } from "@/lib/session";
+import qs from 'qs';
+import StatsGridItem from '@/components/StatGridItem';
+import useExamStore from "@/stores/examStore";
+import { usePDFDownload } from "@/hooks/usePDFDownload";
+import useAssignments from '@/hooks/useAssignments';
+import useUsers from '@/hooks/useUsers';
+import Dropdown from "@/components/Dropdown";
+import InfiniteCarousel from '@/components/InfiniteCarousel';
+import { LuExternalLink } from "react-icons/lu";
+import { uniqBy } from 'lodash';
+import { getExamById } from '@/utils/exams';
+import { convertToUserSolutions } from '@/utils/stats';
+import { sortByModule } from '@/utils/moduleUtils';
+
+export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
+    const user = req.session.user;
+
+    if (!user || !user.isVerified) {
+        return {
+            redirect: {
+                destination: "/login",
+                permanent: false,
+            },
+        };
+    }
+
+    if (shouldRedirectHome(user)) {
+        return {
+            redirect: {
+                destination: "/",
+                permanent: false,
+            },
+        };
+    }
+
+    return {
+        props: { user: req.session.user },
+    };
+}, sessionOptions);
+
+const TrainingContent: React.FC<{ user: User }> = ({ user }) => {
+    // Record stuff
+    const setExams = useExamStore((state) => state.setExams);
+    const setShowSolutions = useExamStore((state) => state.setShowSolutions);
+    const setUserSolutions = useExamStore((state) => state.setUserSolutions);
+    const setSelectedModules = useExamStore((state) => state.setSelectedModules);
+    const setInactivity = useExamStore((state) => state.setInactivity);
+    const setTimeSpent = useExamStore((state) => state.setTimeSpent);
+    const renderPdfIcon = usePDFDownload("stats");
+
+    const [trainingContent, setTrainingContent] = useState<ITrainingContent | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [trainingTips, setTrainingTips] = useState<ITrainingTip[]>([]);
+    const [currentTipIndex, setCurrentTipIndex] = useState(0);
+    const { assignments } = useAssignments({});
+    const { users } = useUsers();
+
+    const router = useRouter();
+    const { id } = router.query;
+
+    useEffect(() => {
+        const fetchTrainingContent = async () => {
+            if (!id || typeof id !== 'string') return;
+
+            try {
+                setLoading(true);
+                const response = await axios.get<ITrainingContent>(`/api/training/${id}`);
+                const trainingContent = response.data;
+
+                const withExamsStats = {
+                    ...trainingContent,
+                    exams: await Promise.all(trainingContent.exams.map(async (exam) => {
+                        const stats = await Promise.all(exam.stat_ids.map(async (statId) => {
+                            const statResponse = await axios.get<Stat>(`/api/stats/${statId}`);
+                            return statResponse.data;
+                        }));
+                        return { ...exam, stats };
+                    }))
+                };
+
+                const tips = await axios.get<ITrainingTip[]>('/api/training/walkthrough', {
+                    params: { ids: trainingContent.tip_ids },
+                    paramsSerializer: params => qs.stringify(params, { arrayFormat: 'repeat' })
+                });
+                setTrainingTips(tips.data);
+                setTrainingContent(withExamsStats);
+            } catch (error) {
+                router.push('/training');
+            } finally {
+                setLoading(false);
+            }
+        };
+
+        fetchTrainingContent();
+    }, [id]);
+
+    const handleNext = () => {
+        setCurrentTipIndex((prevIndex) => (prevIndex + 1));
+    };
+
+    const handlePrevious = () => {
+        setCurrentTipIndex((prevIndex) => (prevIndex - 1));
+    };
+
+    const goToExam = (examNumber: number) => {
+        const stats = trainingContent?.exams[examNumber].stats!;
+        const examPromises = uniqBy(stats, "exam").map((stat) => {
+            return getExamById(stat.module, stat.exam);
+        });
+
+        const { timeSpent, inactivity } = stats[0];
+
+        Promise.all(examPromises).then((exams) => {
+            if (exams.every((x) => !!x)) {
+                if (!!timeSpent) setTimeSpent(timeSpent);
+                if (!!inactivity) setInactivity(inactivity);
+                setUserSolutions(convertToUserSolutions(stats));
+                setShowSolutions(true);
+                setExams(exams.map((x) => x!).sort(sortByModule));
+                setSelectedModules(
+                    exams
+                        .map((x) => x!)
+                        .sort(sortByModule)
+                        .map((x) => x!.module),
+                );
+                router.push("/exercises");
+            }
+        });
+    }
+
+    return (
+        <>
+            <Head>
+                <title>Training | EnCoach</title>
+                <meta
+                    name="description"
+                    content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+                />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <link rel="icon" href="/favicon.ico" />
+            </Head>
+            <ToastContainer />
+
+            <Layout user={user}>
+                {loading ? (
+                    <div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-12">
+                        <span className="loading loading-infinity w-32 bg-mti-green-light" />
+                    </div>
+                ) : (trainingContent && (
+                    <div className="flex flex-col gap-8">
+                        <div className="flex flex-row items-center">
+                            <span className="bg-gray-200 text-gray-800 px-3 py-0.5 rounded-full font-semibold text-lg mr-2">{trainingContent.exams.length}</span>
+                            <span>Exams Selected</span>
+                        </div>
+                        <div className='h-[15vh] mb-4'>
+                            <InfiniteCarousel height="150px"
+                                overlay={
+                                    <LuExternalLink size={20} />
+                                }
+                                overlayFunc={goToExam}
+                                overlayClassName='bottom-6 right-5 cursor-pointer'
+                            >
+                                {trainingContent.exams.map((exam, examIndex) => (
+                                    <StatsGridItem
+                                        key={`exam-${examIndex}`}
+                                        width='380px'
+                                        height='150px'
+                                        examNumber={examIndex + 1}
+                                        stats={exam.stats || []}
+                                        timestamp={exam.date}
+                                        user={user}
+                                        assignments={assignments}
+                                        users={users}
+                                        setExams={setExams}
+                                        setShowSolutions={setShowSolutions}
+                                        setUserSolutions={setUserSolutions}
+                                        setSelectedModules={setSelectedModules}
+                                        setInactivity={setInactivity}
+                                        setTimeSpent={setTimeSpent}
+                                        renderPdfIcon={renderPdfIcon}
+                                    />
+                                ))}
+                            </InfiniteCarousel>
+                        </div>
+                        <div className='flex flex-col'>
+                            <div className='flex flex-row gap-10 -md:flex-col h-full'>
+                                <div className="flex flex-col rounded-3xl p-6 w-1/2 shadow-training-inset -md:w-full max-h-full">
+                                    <div className="flex flex-row items-center mb-6 gap-1">
+                                        <MdOutlinePlaylistAddCheckCircle color={"#40A1EA"} size={26} />
+                                        <h2 className={`text-xl font-semibold text-[#40A1EA]`}>General Evaluation</h2>
+                                    </div>
+                                    <TrainingScore
+                                        trainingContent={trainingContent}
+                                        gridView={false}
+                                    />
+                                    <div className="w-full h-px bg-[#D9D9D929] my-6"></div>
+                                    <div className="flex flex-row gap-2 items-center mb-6">
+                                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                            <mask id="mask0_112_168" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+                                                <rect width="24" height="24" fill="#D9D9D9" />
+                                            </mask>
+                                            <g mask="url(#mask0_112_168)">
+                                                <path d="M4 21C3.45 21 2.97917 20.8042 2.5875 20.4125C2.19583 20.0208 2 19.55 2 19V7H4V19H19V21H4ZM8 17C7.45 17 6.97917 16.8042 6.5875 16.4125C6.19583 16.0208 6 15.55 6 15V3H23V15C23 15.55 22.8042 16.0208 22.4125 16.4125C22.0208 16.8042 21.55 17 21 17H8ZM8 15H21V5H8V15ZM10 12H14V7H10V12ZM15 12H19V10H15V12ZM15 9H19V7H15V9Z" fill="#53B2F9" />
+                                            </g>
+                                        </svg>
+                                        <h3 className="text-xl font-semibold text-[#40A1EA]">Performance Breakdown by Exam:</h3>
+                                    </div>
+                                    <ul className='overflow-auto scrollbar-hide flex-grow'>
+                                        {trainingContent.exams.flatMap((exam, index) => (
+                                            <li key={index} className="flex flex-col mb-2 bg-[#22E1B30F] p-4 rounded-xl border">
+                                                <div className="flex flex-row font-semibold border-b-2 border-[#D9D9D929] text-[#22E1B3] mb-2">
+                                                    <div className='flex items-center border-r-2 border-[#D9D9D929] pr-2'>
+                                                        <span className='mr-1'>Exam</span>
+                                                        <span className="font-semibold bg-gray-200 text-gray-800 px-2 rounded-full text-sm">{index + 1}</span>
+                                                    </div>
+                                                    <span className="pl-2">{exam.score}%</span>
+                                                </div>
+                                                <div className="flex flex-row items-center gap-2">
+                                                    <BsChatLeftDots size={16} />
+                                                    <p className="text-sm">{exam.performance_comment}</p>
+                                                </div>
+                                            </li>
+                                        ))}
+                                    </ul>
+                                </div>
+                                <div className="flex flex-col rounded-3xl p-6 w-1/2 shadow-training-inset -md:w-full">
+                                    <div className='flex flex-col'>
+                                        <div className="flex flex-row items-center mb-4 gap-1">
+                                            <AiOutlineFileSearch color="#40A1EA" size={24} />
+                                            <h3 className="text-xl font-semibold text-[#40A1EA]">Identified Weak Areas</h3>
+                                        </div>
+                                        <Tab.Group>
+                                            <div className="flex flex-col gap-4">
+                                                <Tab.List>
+                                                    <div className="flex flex-row gap-6 overflow-x-auto pb-1 training-scrollbar">
+                                                        {trainingContent.weak_areas.map((x, index) => (
+                                                            <Tab
+                                                                key={index}
+                                                                className={({ selected }) =>
+                                                                    clsx(
+                                                                        'text-[#53B2F9] pb-2 border-b-2',
+                                                                        'focus:outline-none',
+                                                                        selected ? 'border-[#1B78BE]' : 'border-[#1B78BE0F]'
+                                                                    )
+                                                                }
+                                                            >
+                                                                {x.area}
+                                                            </Tab>
+                                                        ))}
+                                                    </div>
+                                                </Tab.List>
+                                                <Tab.Panels>
+                                                    {trainingContent.weak_areas.map((x, index) => (
+                                                        <Tab.Panel
+                                                            key={index}
+                                                            className="p-3 bg-[#FBFBFB] rounded-lg border border-[#0000000F]"
+                                                        >
+                                                            <p>{x.comment}</p>
+                                                        </Tab.Panel>
+                                                    ))}
+                                                </Tab.Panels>
+                                            </div>
+                                        </Tab.Group>
+                                    </div>
+                                    <div className="w-full h-px bg-[#D9D9D929] my-6"></div>
+                                    <div className="flex flex-row items-center mb-4 gap-1">
+                                        <MdOutlineSelfImprovement color={"#40A1EA"} size={24} />
+                                        <h2 className={`text-xl font-semibold text-[#40A1EA]`}>Subjects that Need Improvement</h2>
+                                    </div>
+
+                                    <div className="flex flex-grow bg-[#FBFBFB] border rounded-xl p-4">
+                                        <div className='flex flex-col'>
+                                            <div className="flex flex-row items-center gap-1 mb-4">
+                                                <div className="flex items-center justify-center w-[48px] h-[48px]">
+                                                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                                        <mask id="mask0_112_445" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+                                                            <rect width="24" height="24" fill="#D9D9D9" />
+                                                        </mask>
+                                                        <g mask="url(#mask0_112_445)">
+                                                            <path d="M6 17H11V15H6V17ZM16 17H18V15H16V17ZM6 13H11V11H6V13ZM16 13H18V7H16V13ZM6 9H11V7H6V9ZM4 21C3.45 21 2.97917 20.8042 2.5875 20.4125C2.19583 20.0208 2 19.55 2 19V5C2 4.45 2.19583 3.97917 2.5875 3.5875C2.97917 3.19583 3.45 3 4 3H20C20.55 3 21.0208 3.19583 21.4125 3.5875C21.8042 3.97917 22 4.45 22 5V19C22 19.55 21.8042 20.0208 21.4125 20.4125C21.0208 20.8042 20.55 21 20 21H4ZM4 19H20V5H4V19Z" fill="#1C1B1F" />
+                                                        </g>
+                                                    </svg>
+                                                </div>
+                                                <h3 className="text-lg font-semibold">Detailed Breakdown</h3>
+                                            </div>
+                                            <ul className="flex flex-col flex-grow space-y-4 pb-2 overflow-y-auto scrollbar-hide">
+                                                {trainingContent.exams.map((exam, index) => (
+                                                    <li key={index} className="border rounded-lg bg-white">
+                                                        <Dropdown title={
+                                                            <div className='flex flex-row items-center'>
+                                                                <span className="mr-1">Exam</span>
+                                                                <span className="font-semibold bg-gray-200 text-gray-800 px-2 rounded-full text-sm mt-0.5">{index + 1}</span>
+                                                            </div>
+                                                        } open={index == 0}>
+                                                            <span>{exam.detailed_summary}</span>
+                                                        </Dropdown>
+                                                    </li>
+                                                ))}
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div className="flex -md:hidden">
+                            <div className="rounded-3xl p-6 shadow-training-inset w-full">
+                                <div className="flex flex-col p-10">
+                                    <Exercise key={currentTipIndex} {...trainingTips[currentTipIndex]} />
+                                </div>
+                                <div className="self-end flex justify-between w-full gap-8  bottom-8 left-0 px-8">
+                                    <Button
+                                        color="purple"
+                                        variant="outline"
+                                        onClick={handlePrevious}
+                                        disabled={currentTipIndex == 0}
+                                        className="max-w-[200px] self-end w-full">
+                                        Previous
+                                    </Button>
+                                    <Button
+                                        color="purple"
+                                        disabled={currentTipIndex == (trainingTips.length - 1)}
+                                        onClick={handleNext}
+                                        className="max-w-[200px] self-end w-full">
+                                        Next
+                                    </Button>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                ))}
+            </Layout>
+        </>
+    );
+}
+
+export default TrainingContent;
+
diff --git a/src/pages/training/index.tsx b/src/pages/training/index.tsx
new file mode 100644
index 00000000..7b8084dd
--- /dev/null
+++ b/src/pages/training/index.tsx
@@ -0,0 +1,405 @@
+/* eslint-disable @next/next/no-img-element */
+import Head from "next/head";
+import { withIronSessionSsr } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
+import { Stat, User } from "@/interfaces/user";
+import { ToastContainer } from "react-toastify";
+import Layout from "@/components/High/Layout";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import { use, useEffect, useState } from "react";
+import clsx from "clsx";
+import { FaPlus } from "react-icons/fa";
+import useRecordStore from "@/stores/recordStore";
+import router from "next/router";
+import useTrainingContentStore from "@/stores/trainingContentStore";
+import axios from "axios";
+import Select from "@/components/Low/Select";
+import useUsers from "@/hooks/useUsers";
+import useGroups from "@/hooks/useGroups";
+import { ITrainingContent } from "@/training/TrainingInterfaces";
+import moment from "moment";
+import { uuidv4 } from "@firebase/util";
+import TrainingScore from "@/training/TrainingScore";
+import ModuleBadge from "@/components/ModuleBadge";
+
+export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
+    const user = req.session.user;
+
+    if (!user || !user.isVerified) {
+        return {
+            redirect: {
+                destination: "/login",
+                permanent: false,
+            },
+        };
+    }
+
+    if (shouldRedirectHome(user)) {
+        return {
+            redirect: {
+                destination: "/",
+                permanent: false,
+            },
+        };
+    }
+
+    return {
+        props: { user: req.session.user },
+    };
+}, sessionOptions);
+
+const defaultSelectableCorporate = {
+    value: "",
+    label: "All",
+};
+
+const Training: React.FC<{ user: User }> = ({ user }) => {
+    // Record stuff
+    const { users } = useUsers();
+    const [selectedCorporate, setSelectedCorporate] = useState<string>(defaultSelectableCorporate.value);
+    const [statsUserId, setStatsUserId, setRecordTraining] = useRecordStore((state) => [state.selectedUser, state.setSelectedUser, state.setTraining]);
+    const { groups: allGroups } = useGroups();
+    const groups = allGroups.filter((x) => x.admin === user.id);
+    const [filter, setFilter] = useState<"months" | "weeks" | "days">();
+
+    const toggleFilter = (value: "months" | "weeks" | "days") => {
+        setFilter((prev) => (prev === value ? undefined : value));
+    };
+
+    const [stats, setTrainingStats] = useTrainingContentStore((state) => [state.stats, state.setStats]);
+    const [trainingContent, setTrainingContent] = useState<ITrainingContent[]>([]);
+    const [isNewContentLoading, setIsNewContentLoading] = useState(stats.length != 0);
+    const [isLoading, setIsLoading] = useState<boolean>(true);
+    const [groupedByTrainingContent, setGroupedByTrainingContent] = useState<{ [key: string]: ITrainingContent }>();
+
+    useEffect(() => {
+        const handleRouteChange = (url: string) => {
+            setTrainingStats([])
+        }
+        router.events.on('routeChangeStart', handleRouteChange)
+        return () => {
+            router.events.off('routeChangeStart', handleRouteChange)
+        }
+    }, [router.events, setTrainingStats])
+
+    useEffect(() => {
+        const postStats = async () => {
+            try {
+                const response = await axios.post<{ id: string }>(`/api/training`, stats);
+                return response.data.id;
+            } catch (error) {
+                setIsNewContentLoading(false);
+            }
+        };
+
+        if (isNewContentLoading) {
+            postStats().then(id => {
+                setTrainingStats([]);
+                if (id) {
+                    router.push(`/training/${id}`)
+                }
+            });
+        }
+    }, [isNewContentLoading])
+
+    useEffect(() => {
+        const loadTrainingContent = async () => {
+            try {
+                const response = await axios.get<ITrainingContent[]>('/api/training');
+                setTrainingContent(response.data);
+                setIsLoading(false);
+            } catch (error) {
+                setTrainingContent([]);
+                setIsLoading(false);
+            }
+        };
+        loadTrainingContent();
+    }, []);
+
+    const handleNewTrainingContent = () => {
+        setRecordTraining(true);
+        router.push('/record')
+    }
+
+
+    const filterTrainingContentByDate = (trainingContent: { [key: string]: ITrainingContent }) => {
+        if (filter) {
+            const filterDate = moment()
+                .subtract({ [filter as string]: 1 })
+                .format("x");
+            const filteredTrainingContent: { [key: string]: ITrainingContent } = {};
+
+            Object.keys(trainingContent).forEach((timestamp) => {
+                if (timestamp >= filterDate) filteredTrainingContent[timestamp] = trainingContent[timestamp];
+            });
+            return filteredTrainingContent;
+        }
+        return trainingContent;
+    };
+
+    useEffect(() => {
+        if (trainingContent.length > 0) {
+            const grouped = trainingContent.reduce((acc, content) => {
+                acc[content.created_at] = content;
+                return acc;
+            }, {} as { [key: number]: ITrainingContent });
+
+            setGroupedByTrainingContent(grouped);
+        }
+    }, [trainingContent])
+
+
+    // Record Stuff
+    const selectableCorporates = [
+        defaultSelectableCorporate,
+        ...users
+            .filter((x) => x.type === "corporate")
+            .map((x) => ({
+                value: x.id,
+                label: `${x.name} - ${x.email}`,
+            })),
+    ];
+
+    const getUsersList = (): User[] => {
+        if (selectedCorporate) {
+            // get groups for that corporate
+            const selectedCorporateGroups = allGroups.filter((x) => x.admin === selectedCorporate);
+
+            // get the teacher ids for that group
+            const selectedCorporateGroupsParticipants = selectedCorporateGroups.flatMap((x) => x.participants);
+
+            //   // search for groups for these teachers
+            //   const teacherGroups = allGroups.filter((x) => {
+            //     return selectedCorporateGroupsParticipants.includes(x.admin);
+            //   });
+
+            //   const usersList = [
+            //     ...selectedCorporateGroupsParticipants,
+            //     ...teacherGroups.flatMap((x) => x.participants),
+            //   ];
+            const userListWithUsers = selectedCorporateGroupsParticipants.map((x) => users.find((y) => y.id === x)) as User[];
+            return userListWithUsers.filter((x) => x);
+        }
+
+        return users || [];
+    };
+
+    const corporateFilteredUserList = getUsersList();
+    const getSelectedUser = () => {
+        if (selectedCorporate) {
+            const userInCorporate = corporateFilteredUserList.find((x) => x.id === statsUserId);
+            return userInCorporate || corporateFilteredUserList[0];
+        }
+
+        return users.find((x) => x.id === statsUserId) || user;
+    };
+
+    const selectedUser = getSelectedUser();
+    const selectedUserSelectValue = selectedUser
+        ? {
+            value: selectedUser.id,
+            label: `${selectedUser.name} - ${selectedUser.email}`,
+        }
+        : {
+            value: "",
+            label: "",
+        };
+
+    const formatTimestamp = (timestamp: string) => {
+        const date = moment(parseInt(timestamp));
+        const formatter = "YYYY/MM/DD - HH:mm";
+
+        return date.format(formatter);
+    };
+
+    const selectTrainingContent = (trainingContent: ITrainingContent) => {
+        router.push(`/training/${trainingContent.id}`)
+    };
+
+
+    const trainingContentContainer = (timestamp: string) => {
+        if (!groupedByTrainingContent) return <></>;
+        const trainingContent: ITrainingContent = groupedByTrainingContent[timestamp];
+        const uniqueModules = [...new Set(trainingContent.exams.map(exam => exam.module))];
+
+        return (
+            <>
+                <div
+                    key={uuidv4()}
+                    className={clsx(
+                        "flex flex-col justify-between gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden"
+                    )}
+                    onClick={() => selectTrainingContent(trainingContent)}
+                    role="button">
+                    <div className="w-full flex justify-between -md:items-center 2xl:items-center">
+                        <div className="flex flex-col md:gap-1 -md:gap-2 2xl:gap-2">
+                            <span className="font-medium">{formatTimestamp(timestamp)}</span>
+                        </div>
+                        <div className="flex flex-col gap-2">
+                            <div className="w-full flex flex-row gap-1">
+                                {uniqueModules.map((module) => (
+                                    <ModuleBadge key={module} module={module} />
+                                ))}
+                            </div>
+                        </div>
+                    </div>
+                    <TrainingScore
+                        trainingContent={trainingContent}
+                        gridView={true}
+                    />
+                </div>
+            </>
+        );
+    };
+
+    return (
+        <>
+            <Head>
+                <title>Training | EnCoach</title>
+                <meta
+                    name="description"
+                    content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+                />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <link rel="icon" href="/favicon.ico" />
+            </Head>
+            <ToastContainer />
+
+            <Layout user={user}>
+                {(isNewContentLoading || isLoading ? (
+                    <div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-12">
+                        <span className="loading loading-infinity w-32 bg-mti-green-light" />
+                        {isNewContentLoading && (<span className="text-center text-2xl font-bold text-mti-green-light">
+                            Assessing your exams, please be patient...
+                        </span>)}
+                    </div>
+                ) : (
+                    <>
+                        <div className="w-full flex -xl:flex-col -xl:gap-4 justify-between items-center">
+                            <div className="xl:w-3/4">
+                                {(user.type === "developer" || user.type === "admin") && (
+                                    <>
+                                        <label className="font-normal text-base text-mti-gray-dim">Corporate</label>
+
+                                        <Select
+                                            options={selectableCorporates}
+                                            value={selectableCorporates.find((x) => x.value === selectedCorporate)}
+                                            onChange={(value) => setSelectedCorporate(value?.value || "")}
+                                            styles={{
+                                                menuPortal: (base) => ({ ...base, zIndex: 9999 }),
+                                                option: (styles, state) => ({
+                                                    ...styles,
+                                                    backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
+                                                    color: state.isFocused ? "black" : styles.color,
+                                                }),
+                                            }}></Select>
+                                        <label className="font-normal text-base text-mti-gray-dim">User</label>
+
+                                        <Select
+                                            options={corporateFilteredUserList.map((x) => ({
+                                                value: x.id,
+                                                label: `${x.name} - ${x.email}`,
+                                            }))}
+                                            value={selectedUserSelectValue}
+                                            onChange={(value) => setStatsUserId(value?.value!)}
+                                            styles={{
+                                                menuPortal: (base) => ({ ...base, zIndex: 9999 }),
+                                                option: (styles, state) => ({
+                                                    ...styles,
+                                                    backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
+                                                    color: state.isFocused ? "black" : styles.color,
+                                                }),
+                                            }}
+                                        />
+                                    </>
+                                )}
+                                {(user.type === "corporate" || user.type === "teacher") && groups.length > 0 && (
+                                    <>
+                                        <label className="font-normal text-base text-mti-gray-dim">User</label>
+
+                                        <Select
+                                            options={users
+                                                .filter((x) => groups.flatMap((y) => y.participants).includes(x.id))
+                                                .map((x) => ({
+                                                    value: x.id,
+                                                    label: `${x.name} - ${x.email}`,
+                                                }))}
+                                            value={selectedUserSelectValue}
+                                            onChange={(value) => setStatsUserId(value?.value!)}
+                                            styles={{
+                                                menuPortal: (base) => ({ ...base, zIndex: 9999 }),
+                                                option: (styles, state) => ({
+                                                    ...styles,
+                                                    backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
+                                                    color: state.isFocused ? "black" : styles.color,
+                                                }),
+                                            }}
+                                        />
+                                    </>
+                                )}
+                                {(user.type === "student" && (
+                                    <>
+                                        <div className="flex items-center">
+                                            <div className="font-semibold text-2xl">Generate New Training Material</div>
+                                            <button
+                                                className={clsx(
+                                                    "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light ml-4",
+                                                    "transition duration-300 ease-in-out",
+                                                )}
+                                                onClick={handleNewTrainingContent}>
+                                                <FaPlus />
+                                            </button>
+                                        </div>
+                                    </>
+                                ))}
+                            </div>
+                            <div className="flex gap-4 w-full justify-center xl:justify-end">
+                                <button
+                                    className={clsx(
+                                        "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+                                        "transition duration-300 ease-in-out",
+                                        filter === "months" && "!bg-mti-purple-light !text-white",
+                                    )}
+                                    onClick={() => toggleFilter("months")}>
+                                    Last month
+                                </button>
+                                <button
+                                    className={clsx(
+                                        "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+                                        "transition duration-300 ease-in-out",
+                                        filter === "weeks" && "!bg-mti-purple-light !text-white",
+                                    )}
+                                    onClick={() => toggleFilter("weeks")}>
+                                    Last week
+                                </button>
+                                <button
+                                    className={clsx(
+                                        "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+                                        "transition duration-300 ease-in-out",
+                                        filter === "days" && "!bg-mti-purple-light !text-white",
+                                    )}
+                                    onClick={() => toggleFilter("days")}>
+                                    Last day
+                                </button>
+                            </div>
+                        </div>
+                        {trainingContent.length == 0 && (
+                            <div className="flex flex-grow justify-center items-center">
+                                <span className="font-semibold ml-1">No training content to display...</span>
+                            </div>
+                        )}
+                        {groupedByTrainingContent && Object.keys(groupedByTrainingContent).length > 0 && (
+                            <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 2xl:grid-cols-3 w-full gap-4 xl:gap-6">
+                                {Object.keys(filterTrainingContentByDate(groupedByTrainingContent))
+                                    .sort((a, b) => parseInt(b) - parseInt(a))
+                                    .map(trainingContentContainer)}
+                            </div>
+                        )}
+                    </>
+                ))}
+            </Layout>
+        </>
+    );
+}
+
+export default Training;
diff --git a/src/stores/recordStore.ts b/src/stores/recordStore.ts
index ecd743e3..920d2205 100644
--- a/src/stores/recordStore.ts
+++ b/src/stores/recordStore.ts
@@ -3,16 +3,20 @@ import {create} from "zustand";
 
 export interface RecordState {
 	selectedUser?: string;
+	training: boolean;
 	setSelectedUser: (selectedUser: string | undefined) => void;
+	setTraining: (training: boolean) => void;
 }
 
 export const initialState = {
 	selectedUser: undefined,
+	training: false
 };
 
 const recordStore = create<RecordState>((set) => ({
 	...initialState,
     setSelectedUser: (selectedUser: string | undefined) => set(() => ({selectedUser})),
+	setTraining: (training: boolean) => set(() => ({training})),
 }));
 
 export default recordStore;
diff --git a/src/stores/trainingContentStore.ts b/src/stores/trainingContentStore.ts
new file mode 100644
index 00000000..bc0fbe68
--- /dev/null
+++ b/src/stores/trainingContentStore.ts
@@ -0,0 +1,18 @@
+import { Stat } from "@/interfaces/user";
+import {create} from "zustand";
+
+export interface TrainingContentState {
+	stats: Stat[];
+	setStats: (stats: Stat[]) => void;
+}
+
+export const initialState = {
+	stats: [],
+};
+
+const trainingContentStore = create<TrainingContentState>((set) => ({
+	...initialState,
+    setStats: (stats: Stat[]) => set(() => ({stats})),
+}));
+
+export default trainingContentStore;
\ No newline at end of file
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 427186bb..b20aaee2 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -2,6 +2,37 @@
 @tailwind components;
 @tailwind utilities;
 
+@layer utilities {
+	.scrollbar-hide {
+		-ms-overflow-style: none;
+		/* IE and Edge */
+		scrollbar-width: none;
+		/* Firefox */
+	}
+
+	.scrollbar-hide::-webkit-scrollbar {
+		display: none;
+		/* Chrome, Safari and Opera */
+	}
+}
+
+.training-scrollbar::-webkit-scrollbar {
+	@apply w-1.5;
+}
+
+.training-scrollbar::-webkit-scrollbar-track {
+	@apply bg-transparent;
+}
+
+.training-scrollbar::-webkit-scrollbar-thumb {
+	@apply bg-gray-400 hover:bg-gray-500 rounded-full transition-colors opacity-50 hover:opacity-75;
+}
+
+.training-scrollbar {
+	scrollbar-width: thin;
+	scrollbar-color: rgba(156, 163, 175, 0.5) transparent;
+}
+
 :root {
 	--max-width: 1100px;
 	--border-radius: 12px;
@@ -56,4 +87,4 @@ body {
 a {
 	color: inherit;
 	text-decoration: none;
-}
+}
\ No newline at end of file
diff --git a/tailwind.config.js b/tailwind.config.js
index 529cfc3c..4f71b300 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -8,6 +8,9 @@ module.exports = {
 	],
 	theme: {
 		extend: {
+			boxShadow: {
+				'training-inset': 'inset 0px 2px 18px 0px #00000029',
+			},
 			colors: {
 				mti: {
 					orange: {DEFAULT: "#FF6000", dark: "#cc4402", light: "#ff790a", ultralight: "#ffdaa5"},
@@ -62,5 +65,5 @@ module.exports = {
 			},
 		},
 	},
-	plugins: [require("daisyui"), require("tailwind-scrollbar-hide")],
+	plugins: [require("daisyui"), require("tailwind-scrollbar-hide"),],
 };
diff --git a/tsconfig.json b/tsconfig.json
index c1806359..1a4aee28 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,9 +21,8 @@
     "baseUrl": ".",
     "downlevelIteration": true,
     "paths": {
-      "@/*": [
-        "./src/*"
-      ]
+      "@/*": ["./src/*"],
+      "@/training/*": ["./src/components/TrainingContent/*"]
     }
   },
   "include": [
diff --git a/yarn.lock b/yarn.lock
index 0fc9bc5b..b8b27fd7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -183,7 +183,7 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/cache@^11.13.0", "@emotion/cache@^11.4.0":
+"@emotion/cache@^11.13.0":
   version "11.13.1"
   resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
   integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
@@ -194,16 +194,27 @@
     "@emotion/weak-memoize" "^0.4.0"
     stylis "4.2.0"
 
-"@emotion/hash@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
-  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+"@emotion/cache@^11.4.0":
+  version "11.13.1"
+  resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
+  integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
+  dependencies:
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/sheet" "^1.4.0"
+    "@emotion/utils" "^1.4.0"
+    "@emotion/weak-memoize" "^0.4.0"
+    stylis "4.2.0"
 
 "@emotion/hash@^0.9.2":
   version "0.9.2"
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz"
   integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
 
+"@emotion/hash@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
+  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+
 "@emotion/is-prop-valid@^0.8.2":
   version "0.8.8"
   resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
@@ -211,16 +222,16 @@
   dependencies:
     "@emotion/memoize" "0.7.4"
 
-"@emotion/memoize@0.7.4":
-  version "0.7.4"
-  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
-  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
-
 "@emotion/memoize@^0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz"
   integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
 
+"@emotion/memoize@0.7.4":
+  version "0.7.4"
+  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
+  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
+
 "@emotion/react@^11.8.1":
   version "11.13.0"
   resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz"
@@ -246,7 +257,7 @@
     "@emotion/utils" "0.11.3"
     csstype "^2.5.7"
 
-"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0":
+"@emotion/serialize@^1.2.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
   integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
@@ -257,56 +268,67 @@
     "@emotion/utils" "^1.4.0"
     csstype "^3.0.2"
 
-"@emotion/sheet@0.9.4":
-  version "0.9.4"
-  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz"
-  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
+"@emotion/serialize@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
+  integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
+  dependencies:
+    "@emotion/hash" "^0.9.2"
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/unitless" "^0.9.0"
+    "@emotion/utils" "^1.4.0"
+    csstype "^3.0.2"
 
 "@emotion/sheet@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz"
   integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
 
+"@emotion/sheet@0.9.4":
+  version "0.9.4"
+  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz"
+  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
+
 "@emotion/stylis@0.8.5":
   version "0.8.5"
   resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"
   integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
 
-"@emotion/unitless@0.7.5":
-  version "0.7.5"
-  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
-  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
-
 "@emotion/unitless@^0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz"
   integrity sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==
 
+"@emotion/unitless@0.7.5":
+  version "0.7.5"
+  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
+  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
+
 "@emotion/use-insertion-effect-with-fallbacks@^1.1.0":
   version "1.1.0"
   resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz"
   integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==
 
-"@emotion/utils@0.11.3":
-  version "0.11.3"
-  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz"
-  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
-
 "@emotion/utils@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz"
   integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==
 
-"@emotion/weak-memoize@0.2.5":
-  version "0.2.5"
-  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
-  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
+"@emotion/utils@0.11.3":
+  version "0.11.3"
+  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz"
+  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
 
 "@emotion/weak-memoize@^0.4.0":
   version "0.4.0"
   resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz"
   integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
 
+"@emotion/weak-memoize@0.2.5":
+  version "0.2.5"
+  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
+  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
+
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
   resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"
@@ -456,7 +478,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
+"@firebase/database-compat@^0.3.4", "@firebase/database-compat@0.3.4":
   version "0.3.4"
   resolved "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz"
   integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
@@ -468,7 +490,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
+"@firebase/database-types@^0.10.4", "@firebase/database-types@0.10.4":
   version "0.10.4"
   resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz"
   integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
@@ -689,6 +711,13 @@
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
+"@firebase/util@^1.9.7":
+  version "1.9.7"
+  resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.7.tgz"
+  integrity sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==
+  dependencies:
+    tslib "^2.1.0"
+
 "@firebase/util@1.9.3":
   version "1.9.3"
   resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz"
@@ -937,66 +966,6 @@
   resolved "https://registry.npmjs.org/@next/font/-/font-13.1.6.tgz"
   integrity sha512-AITjmeb1RgX1HKMCiA39ztx2mxeAyxl4ljv2UoSBUGAbFFMg8MO7YAvjHCgFhD39hL7YTbFjol04e/BPBH5RzQ==
 
-"@next/swc-android-arm-eabi@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.6.tgz#d766dfc10e27814d947b20f052067c239913dbcc"
-  integrity sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ==
-
-"@next/swc-android-arm64@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-13.1.6.tgz#f37a98d5f18927d8c9970d750d516ac779465176"
-  integrity sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw==
-
-"@next/swc-darwin-arm64@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.6.tgz#ec1b90fd9bf809d8b81004c5182e254dced4ad96"
-  integrity sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw==
-
-"@next/swc-darwin-x64@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.6.tgz#e869ac75d16995eee733a7d1550322d9051c1eb4"
-  integrity sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA==
-
-"@next/swc-freebsd-x64@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.6.tgz#84a7b2e423a2904afc2edca21c2f1ba6b53fa4c1"
-  integrity sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw==
-
-"@next/swc-linux-arm-gnueabihf@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.6.tgz#980eed1f655ff8a72187d8a6ef9e73ac39d20d23"
-  integrity sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw==
-
-"@next/swc-linux-arm64-gnu@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.6.tgz#87a71db21cded3f7c63d1d19079845c59813c53d"
-  integrity sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ==
-
-"@next/swc-linux-arm64-musl@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.6.tgz#c5aac8619331b9fd030603bbe2b36052011e11de"
-  integrity sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ==
-
-"@next/swc-linux-x64-gnu@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.6.tgz#9513d36d540bbfea575576746736054c31aacdea"
-  integrity sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q==
-
-"@next/swc-linux-x64-musl@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.6.tgz#d61fc6884899f5957251f4ce3f522e34a2c479b7"
-  integrity sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ==
-
-"@next/swc-win32-arm64-msvc@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.6.tgz#fac2077a8ae9768e31444c9ae90807e64117cda7"
-  integrity sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ==
-
-"@next/swc-win32-ia32-msvc@13.1.6":
-  version "13.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.6.tgz#498bc11c91b4c482a625bf4b978f98ae91111e46"
-  integrity sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w==
-
 "@next/swc-win32-x64-msvc@13.1.6":
   version "13.1.6"
   resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.6.tgz"
@@ -1010,7 +979,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -1288,12 +1257,57 @@
   resolved "https://registry.npmjs.org/@react-pdf/types/-/types-2.5.0.tgz"
   integrity sha512-XsVRkt0hQ60I4e3leAVt+aZR3KJCaJd179BfJHAv4F4x6Vq3yqkry8lcbUWKGKDw1j3/8sW4FsgGR41SFvsG9A==
 
+"@react-spring/animated@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.4.tgz"
+  integrity sha512-7As+8Pty2QlemJ9O5ecsuPKjmO0NKvmVkRR1n6mEotFgWar8FKuQt2xgxz3RTgxcccghpx1YdS1FCdElQNexmQ==
+  dependencies:
+    "@react-spring/shared" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
+
+"@react-spring/core@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.npmjs.org/@react-spring/core/-/core-9.7.4.tgz"
+  integrity sha512-GzjA44niEJBFUe9jN3zubRDDDP2E4tBlhNlSIkTChiNf9p4ZQlgXBg50qbXfSXHQPHak/ExYxwhipKVsQ/sUTw==
+  dependencies:
+    "@react-spring/animated" "~9.7.4"
+    "@react-spring/shared" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
+
+"@react-spring/rafz@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.4.tgz"
+  integrity sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA==
+
+"@react-spring/shared@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.4.tgz"
+  integrity sha512-bEPI7cQp94dOtCFSEYpxvLxj0+xQfB5r9Ru1h8OMycsIq7zFZon1G0sHrBLaLQIWeMCllc4tVDYRTLIRv70C8w==
+  dependencies:
+    "@react-spring/rafz" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
+
+"@react-spring/types@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.npmjs.org/@react-spring/types/-/types-9.7.4.tgz"
+  integrity sha512-iQVztO09ZVfsletMiY+DpT/JRiBntdsdJ4uqk3UJFhrhS8mIC9ZOZbmfGSRs/kdbNPQkVyzucceDicQ/3Mlj9g==
+
+"@react-spring/web@^9.7.4":
+  version "9.7.4"
+  resolved "https://registry.npmjs.org/@react-spring/web/-/web-9.7.4.tgz"
+  integrity sha512-UMvCZp7I5HCVIleSa4BwbNxynqvj+mJjG2m20VO2yPoi2pnCYANy58flvz9v/YcXTAvsmL655FV3pm5fbr6akA==
+  dependencies:
+    "@react-spring/animated" "~9.7.4"
+    "@react-spring/core" "~9.7.4"
+    "@react-spring/shared" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
+
 "@rushstack/eslint-patch@^1.1.3":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"
   integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
-"@swc/helpers@0.4.14", "@swc/helpers@^0.4.2":
+"@swc/helpers@^0.4.2", "@swc/helpers@0.4.14":
   version "0.4.14"
   resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz"
   integrity sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==
@@ -1501,7 +1515,7 @@
   resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
-"@types/node@*", "@types/node@18.13.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
+"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0", "@types/node@18.13.0":
   version "18.13.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"
   integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
@@ -1670,6 +1684,18 @@
     "@typescript-eslint/types" "5.51.0"
     eslint-visitor-keys "^3.3.0"
 
+"@use-gesture/core@10.3.1":
+  version "10.3.1"
+  resolved "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz"
+  integrity sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw==
+
+"@use-gesture/react@^10.3.1":
+  version "10.3.1"
+  resolved "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz"
+  integrity sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==
+  dependencies:
+    "@use-gesture/core" "10.3.1"
+
 "@wixc3/board-core@^2.2.0":
   version "2.2.0"
   resolved "https://registry.npmjs.org/@wixc3/board-core/-/board-core-2.2.0.tgz"
@@ -2149,7 +2175,7 @@ classnames@^2.2.6, classnames@^2.3.0, classnames@^2.5.1:
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
 
-client-only@0.0.1, client-only@^0.0.1:
+client-only@^0.0.1, client-only@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
@@ -2172,6 +2198,15 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
@@ -2196,16 +2231,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
 color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
 color-string@^1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -2398,13 +2433,6 @@ date-fns@^2.0.1, date-fns@^2.30.0:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2412,6 +2440,13 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
@@ -2581,7 +2616,7 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
+ecdsa-sig-formatter@^1.0.11, ecdsa-sig-formatter@1.0.11:
   version "1.0.11"
   resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
   integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
@@ -3294,11 +3329,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 function-bind@^1.1.1, function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
@@ -3386,7 +3416,7 @@ get-tsconfig@^4.2.0:
   resolved "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz"
   integrity sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -3400,29 +3430,12 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@7.1.6:
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.7, glob@^7.1.3:
-  version "7.1.7"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    is-glob "^4.0.1"
 
 glob@^10.4.2:
   version "10.4.5"
@@ -3436,6 +3449,18 @@ glob@^10.4.2:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
+glob@^7.1.3, glob@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^8.0.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
@@ -3447,6 +3472,18 @@ glob@^8.0.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+glob@7.1.6:
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
@@ -3740,7 +3777,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
+inherits@^2.0.3, inherits@~2.0.3, inherits@2:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4337,18 +4374,18 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lru-cache@6.0.0, lru-cache@^6.0.0:
+lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
+lru-cache@^6.0.0, lru-cache@6.0.0:
   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"
 
-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
 lru-memoizer@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.3.0.tgz"
@@ -4419,7 +4456,7 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -4504,7 +4541,7 @@ moment@^2.29.4:
   resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-ms@2.1.2, ms@^2.1.1:
+ms@^2.1.1, ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -4568,14 +4605,21 @@ node-addon-api@^5.0.0:
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz"
   integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
 
-node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7:
+node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@2.6.7:
   version "2.6.7"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.6.12, node-fetch@^2.6.9:
+node-fetch@^2.6.12:
+  version "2.7.0"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@^2.6.9:
   version "2.7.0"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -4931,15 +4975,6 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.14:
-  version "8.4.14"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"
-  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 postcss@^8, postcss@^8.0.9, postcss@^8.4.21:
   version "8.4.22"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz"
@@ -4949,6 +4984,15 @@ postcss@^8, postcss@^8.0.9, postcss@^8.4.21:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@8.4.14:
+  version "8.4.14"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"
+  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -4982,15 +5026,6 @@ promise-polyfill@^8.3.0:
   resolved "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz"
   integrity sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==
 
-prop-types@15.7.2:
-  version "15.7.2"
-  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
@@ -5000,6 +5035,15 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+prop-types@15.7.2:
+  version "15.7.2"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
+  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.8.1"
+
 proto3-json-serializer@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz"
@@ -5023,24 +5067,6 @@ protobufjs-cli@1.1.1:
     tmp "^0.2.1"
     uglify-js "^3.7.7"
 
-protobufjs@7.2.4:
-  version "7.2.4"
-  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"
-  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/node" ">=13.7.0"
-    long "^5.0.0"
-
 protobufjs@^6.11.3:
   version "6.11.3"
   resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"
@@ -5096,6 +5122,24 @@ protobufjs@^7.2.5:
     "@types/node" ">=13.7.0"
     long "^5.0.0"
 
+protobufjs@7.2.4:
+  version "7.2.4"
+  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"
+  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
 proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
@@ -5499,7 +5543,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -5682,7 +5726,30 @@ stream-shift@^1.0.2:
   resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz"
   integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5732,21 +5799,14 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    safe-buffer "~5.2.0"
+    ansi-regex "^5.0.1"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6123,7 +6183,7 @@ use-isomorphic-layout-effect@^1.1.2:
   resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz"
   integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
 
-use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
+use-sync-external-store@^1.2.0, use-sync-external-store@1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
@@ -6271,7 +6331,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -6289,6 +6349,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"
@@ -6341,6 +6410,11 @@ yargs-parser@^20.2.2:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
@@ -6371,6 +6445,19 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"