diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..a4f3d5ef8
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,4 @@
+# These owners will be the default owners for everything in the repo. Unless a
+# later match takes precedence, these owners will be requested for review when
+# someone opens a pull request.
+*       @yeatmanlab/roar-maintainers
diff --git a/.github/workflows/firebase-hosting-preview.yml b/.github/workflows/firebase-hosting-preview.yml
index 73d107a44..edadd87ad 100644
--- a/.github/workflows/firebase-hosting-preview.yml
+++ b/.github/workflows/firebase-hosting-preview.yml
@@ -44,10 +44,6 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      # Inject the App Check Debug Token into the .env file at build time
-      - name: Create .env file with App Check Debug Token
-        run: echo "VITE_APPCHECK_DEBUG_TOKEN=${{ secrets.VITE_APPCHECK_DEBUG_TOKEN }}" >> .env
-
       - name: Build project
         run: npm run build
 
diff --git a/.github/workflows/firebase-hosting-production.yml b/.github/workflows/firebase-hosting-production.yml
index 18c0f8183..6226cccb6 100644
--- a/.github/workflows/firebase-hosting-production.yml
+++ b/.github/workflows/firebase-hosting-production.yml
@@ -30,6 +30,7 @@ jobs:
       PARTICIPANT_USERNAME: ${{ secrets.PARTICIPANT_USERNAME}}
       PARTICIPANT_PASSWORD: ${{ secrets.PARTICIPANT_PASSWORD }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      VITE_APPCHECK_DEBUG_TOKEN: ${{ secrets.VITE_APPCHECK_DEBUG_TOKEN }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -88,6 +89,7 @@ jobs:
       PARTICIPANT_USERNAME: ${{ secrets.PARTICIPANT_USERNAME}}
       PARTICIPANT_PASSWORD: ${{ secrets.PARTICIPANT_PASSWORD }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      VITE_APPCHECK_DEBUG_TOKEN: ${{ secrets.VITE_APPCHECK_DEBUG_TOKEN }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -126,6 +128,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
+
       - name: 'vite production build'
         env:
           NODE_OPTIONS: '--max_old_space_size=8192'
diff --git a/.github/workflows/firebase-hosting-staging.yml b/.github/workflows/firebase-hosting-staging.yml
index 88ab7facb..b7e2b300e 100644
--- a/.github/workflows/firebase-hosting-staging.yml
+++ b/.github/workflows/firebase-hosting-staging.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
+
       - name: 'vite staging build'
         env:
           NODE_OPTIONS: '--max_old_space_size=8192'
diff --git a/firebase/admin/firestore.indexes.json b/firebase/admin/firestore.indexes.json
index 289ecbee9..60b0f6239 100644
--- a/firebase/admin/firestore.indexes.json
+++ b/firebase/admin/firestore.indexes.json
@@ -2998,6 +2998,10 @@
       "collectionGroup": "classes",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "schoolId",
           "order": "ASCENDING"
@@ -3012,6 +3016,10 @@
       "collectionGroup": "classes",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "schoolId",
           "order": "ASCENDING"
@@ -3022,10 +3030,70 @@
         }
       ]
     },
+    {
+      "collectionGroup": "classes",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "lastRoarSync",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "districts",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "families",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "groups",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3040,6 +3108,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3054,6 +3126,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3068,6 +3144,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3082,6 +3162,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3096,6 +3180,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3106,6 +3194,20 @@
         }
       ]
     },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "lastRoarSync",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "users",
       "queryScope": "COLLECTION",
@@ -3352,6 +3454,20 @@
         }
       ]
     },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districts.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "users",
       "queryScope": "COLLECTION",
diff --git a/package-lock.json b/package-lock.json
index 92522fc0b..0031d0673 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "roar-dashboard",
-  "version": "2.11.15",
+  "version": "2.11.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "roar-dashboard",
-      "version": "2.11.15",
+      "version": "2.11.18",
       "dependencies": {
         "@bdelab/roam-fluency": "1.11.26",
-        "@bdelab/roar-firekit": "^8.0.6",
+        "@bdelab/roar-firekit": "^8.0.8",
         "@bdelab/roar-letter": "1.11.5",
         "@bdelab/roar-multichoice": "^1.11.3",
         "@bdelab/roar-pa": "2.2.4",
@@ -17,9 +17,9 @@
         "@bdelab/roar-swr": "^1.12.1",
         "@bdelab/roar-utils": "^1.2.1",
         "@bdelab/roar-vocab": "^1.8.0",
-        "@bdelab/roav-crowding": "1.1.12",
-        "@bdelab/roav-mep": "^1.1.17",
-        "@bdelab/roav-ran": "^1.0.21",
+        "@bdelab/roav-crowding": "1.1.15",
+        "@bdelab/roav-mep": "^1.1.21",
+        "@bdelab/roav-ran": "^1.0.30",
         "@levante-framework/core-tasks": "^1.0.0-beta.18",
         "@sentry/browser": "^8.0.0",
         "@sentry/integrations": "^7.114.0",
@@ -1849,9 +1849,10 @@
       }
     },
     "node_modules/@bdelab/roar-firekit": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@bdelab/roar-firekit/-/roar-firekit-8.0.6.tgz",
-      "integrity": "sha512-dEOQyuzUMZ5F73+JVNrIWzOE+bZ8/wIWNMV/UhaWjh4nheHZo0UgdMziycLiVpCQYZaoX075eF4MW4r11cQtMA==",
+      "version": "8.0.8",
+      "resolved": "https://registry.npmjs.org/@bdelab/roar-firekit/-/roar-firekit-8.0.8.tgz",
+      "integrity": "sha512-L69a3uQff8OYHFUP9i036N1NGon3y2YR0SLYbHwtNyulkXemtZqNbPxvJPokdupOOAsuw+MRMUxPJPJrxX8ocQ==",
+      "license": "ISC",
       "dependencies": {
         "@bdelab/roar-firekit": "^4.1.1",
         "crc-32": "^1.2.2",
@@ -6500,9 +6501,9 @@
       }
     },
     "node_modules/@bdelab/roav-crowding": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@bdelab/roav-crowding/-/roav-crowding-1.1.12.tgz",
-      "integrity": "sha512-Eg2XuOHNnwiciN4LuIDnkrfjKFrJBezDeN+s1DI+ZKU8R5qEksWqhMrkectOrKrHCCVx5UaXlJvnmqEJHJRA6w==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@bdelab/roav-crowding/-/roav-crowding-1.1.15.tgz",
+      "integrity": "sha512-9AlO3aO5v+HUvVnKqJY81d82AkB7eDgi2w22V90g/pVBOV0PCueWN+6fIJVoJUY/T5Gq++AtRTJfXnooa+Zvug==",
       "dependencies": {
         "@bdelab/jscat": "^4.0.0",
         "@bdelab/roar-firekit": "^4.7.0",
@@ -6647,9 +6648,9 @@
       }
     },
     "node_modules/@bdelab/roav-mep": {
-      "version": "1.1.17",
-      "resolved": "https://registry.npmjs.org/@bdelab/roav-mep/-/roav-mep-1.1.17.tgz",
-      "integrity": "sha512-p/G1JvQ5Ppna26o5nJ0X2mPTYkl9qi/YUVbDYqKcvPTrxZnoWwlZoK+fgQ/zorBi9EIrg+A9u1/vUAdJL7y6qQ==",
+      "version": "1.1.22",
+      "resolved": "https://registry.npmjs.org/@bdelab/roav-mep/-/roav-mep-1.1.22.tgz",
+      "integrity": "sha512-igr+XtQ1Mdn01kKyrUGexLkakHMdz58HTRzC5ZzujDm2C0agzjKG3OOEQdy+ICmvtDL0v8xzlauNSgelSj93PA==",
       "dependencies": {
         "@bdelab/jscat": "^4.0.0",
         "@bdelab/roar-firekit": "^4.7.0",
@@ -6709,9 +6710,9 @@
       }
     },
     "node_modules/@bdelab/roav-ran": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/@bdelab/roav-ran/-/roav-ran-1.0.21.tgz",
-      "integrity": "sha512-aT8pUBgWXdDutE6xccaz2LRvNaDQ8VbAHrBsqwljysbOplyxIhFhzmsmvfAD1RTPRG3saUMlexTHiPHRZymVFQ==",
+      "version": "1.0.30",
+      "resolved": "https://registry.npmjs.org/@bdelab/roav-ran/-/roav-ran-1.0.30.tgz",
+      "integrity": "sha512-iltS7eUkKXW2pOKGODAVxtT3n5A7WxDY/QnKYiLDjODh9oHKkZcszsPGvc13OgslOmaYao9uxrshGcfHLzCEgQ==",
       "dependencies": {
         "@bdelab/jscat": "^1.0.5",
         "@bdelab/roar-firekit": "^4.7.0",
@@ -6721,9 +6722,13 @@
         "@jspsych/plugin-audio-keyboard-response": "^1.1.0",
         "@jspsych/plugin-call-function": "^1.1.2",
         "@jspsych/plugin-fullscreen": "^1.1.0",
+        "@mediapipe/face_mesh": "^0.4.1633559619",
+        "@rollup/plugin-url": "^8.0.2",
+        "@rollup/plugin-wasm": "^6.2.2",
         "@sentry/browser": "^7.111.0",
         "@sentry/integrations": "^7.111.0",
         "@sentry/wasm": "^7.111.0",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
         "@xenova/transformers": "^1.3.2",
         "dotenv": "^16.4.5",
         "fscreen": "^1.2.0",
@@ -6732,11 +6737,18 @@
         "i18next-browser-languagedetector": "^7.0.1",
         "jspsych": "^7.2.1",
         "lodash": "^4.17.21",
+        "ml-regression-polynomial": "^3.0.0",
+        "ndarray": "^1.0.19",
+        "ndarray-ops": "^1.2.2",
         "node-fetch": "^2.6.6",
+        "onnxjs": "^0.1.8",
+        "onnxruntime-web": "^1.17.1",
         "papaparse": "^5.4.1",
         "regenerator-runtime": "^0.13.9",
         "roarr": "^7.21.1",
-        "store2": "^2.13.2"
+        "store2": "^2.13.2",
+        "webpack": "^5.70.0",
+        "webpack-dev-server": "^4.7.4"
       }
     },
     "node_modules/@bdelab/roav-ran/node_modules/@bdelab/jscat": {
@@ -39051,9 +39063,9 @@
       }
     },
     "@bdelab/roar-firekit": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@bdelab/roar-firekit/-/roar-firekit-8.0.6.tgz",
-      "integrity": "sha512-dEOQyuzUMZ5F73+JVNrIWzOE+bZ8/wIWNMV/UhaWjh4nheHZo0UgdMziycLiVpCQYZaoX075eF4MW4r11cQtMA==",
+      "version": "8.0.8",
+      "resolved": "https://registry.npmjs.org/@bdelab/roar-firekit/-/roar-firekit-8.0.8.tgz",
+      "integrity": "sha512-L69a3uQff8OYHFUP9i036N1NGon3y2YR0SLYbHwtNyulkXemtZqNbPxvJPokdupOOAsuw+MRMUxPJPJrxX8ocQ==",
       "requires": {
         "@bdelab/roar-firekit": "^4.1.1",
         "crc-32": "^1.2.2",
@@ -42968,9 +42980,9 @@
       }
     },
     "@bdelab/roav-crowding": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@bdelab/roav-crowding/-/roav-crowding-1.1.12.tgz",
-      "integrity": "sha512-Eg2XuOHNnwiciN4LuIDnkrfjKFrJBezDeN+s1DI+ZKU8R5qEksWqhMrkectOrKrHCCVx5UaXlJvnmqEJHJRA6w==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@bdelab/roav-crowding/-/roav-crowding-1.1.15.tgz",
+      "integrity": "sha512-9AlO3aO5v+HUvVnKqJY81d82AkB7eDgi2w22V90g/pVBOV0PCueWN+6fIJVoJUY/T5Gq++AtRTJfXnooa+Zvug==",
       "requires": {
         "@bdelab/jscat": "^4.0.0",
         "@bdelab/roar-firekit": "^4.7.0",
@@ -43096,9 +43108,9 @@
       }
     },
     "@bdelab/roav-mep": {
-      "version": "1.1.17",
-      "resolved": "https://registry.npmjs.org/@bdelab/roav-mep/-/roav-mep-1.1.17.tgz",
-      "integrity": "sha512-p/G1JvQ5Ppna26o5nJ0X2mPTYkl9qi/YUVbDYqKcvPTrxZnoWwlZoK+fgQ/zorBi9EIrg+A9u1/vUAdJL7y6qQ==",
+      "version": "1.1.22",
+      "resolved": "https://registry.npmjs.org/@bdelab/roav-mep/-/roav-mep-1.1.22.tgz",
+      "integrity": "sha512-igr+XtQ1Mdn01kKyrUGexLkakHMdz58HTRzC5ZzujDm2C0agzjKG3OOEQdy+ICmvtDL0v8xzlauNSgelSj93PA==",
       "requires": {
         "@bdelab/jscat": "^4.0.0",
         "@bdelab/roar-firekit": "^4.7.0",
@@ -43160,9 +43172,9 @@
       }
     },
     "@bdelab/roav-ran": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/@bdelab/roav-ran/-/roav-ran-1.0.21.tgz",
-      "integrity": "sha512-aT8pUBgWXdDutE6xccaz2LRvNaDQ8VbAHrBsqwljysbOplyxIhFhzmsmvfAD1RTPRG3saUMlexTHiPHRZymVFQ==",
+      "version": "1.0.30",
+      "resolved": "https://registry.npmjs.org/@bdelab/roav-ran/-/roav-ran-1.0.30.tgz",
+      "integrity": "sha512-iltS7eUkKXW2pOKGODAVxtT3n5A7WxDY/QnKYiLDjODh9oHKkZcszsPGvc13OgslOmaYao9uxrshGcfHLzCEgQ==",
       "requires": {
         "@bdelab/jscat": "^1.0.5",
         "@bdelab/roar-firekit": "^4.7.0",
@@ -43172,9 +43184,13 @@
         "@jspsych/plugin-audio-keyboard-response": "^1.1.0",
         "@jspsych/plugin-call-function": "^1.1.2",
         "@jspsych/plugin-fullscreen": "^1.1.0",
+        "@mediapipe/face_mesh": "^0.4.1633559619",
+        "@rollup/plugin-url": "^8.0.2",
+        "@rollup/plugin-wasm": "^6.2.2",
         "@sentry/browser": "^7.111.0",
         "@sentry/integrations": "^7.111.0",
         "@sentry/wasm": "^7.111.0",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
         "@xenova/transformers": "^1.3.2",
         "dotenv": "^16.4.5",
         "fscreen": "^1.2.0",
@@ -43183,11 +43199,18 @@
         "i18next-browser-languagedetector": "^7.0.1",
         "jspsych": "^7.2.1",
         "lodash": "^4.17.21",
+        "ml-regression-polynomial": "^3.0.0",
+        "ndarray": "^1.0.19",
+        "ndarray-ops": "^1.2.2",
         "node-fetch": "^2.6.6",
+        "onnxjs": "^0.1.8",
+        "onnxruntime-web": "^1.17.1",
         "papaparse": "^5.4.1",
         "regenerator-runtime": "^0.13.9",
         "roarr": "^7.21.1",
-        "store2": "^2.13.2"
+        "store2": "^2.13.2",
+        "webpack": "^5.70.0",
+        "webpack-dev-server": "^4.7.4"
       },
       "dependencies": {
         "@bdelab/jscat": {
diff --git a/package.json b/package.json
index 3f1a47f70..e81006abe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "roar-dashboard",
   "private": true,
-  "version": "2.11.15",
+  "version": "2.11.18",
   "type": "module",
   "scripts": {
     "build": "export VITE_FIREBASE_DATA_SOURCE=live && vite build",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@bdelab/roam-fluency": "1.11.26",
-    "@bdelab/roar-firekit": "^8.0.6",
+    "@bdelab/roar-firekit": "^8.0.8",
     "@bdelab/roar-letter": "1.11.5",
     "@bdelab/roar-multichoice": "^1.11.3",
     "@bdelab/roar-pa": "2.2.4",
@@ -40,9 +40,9 @@
     "@bdelab/roar-swr": "^1.12.1",
     "@bdelab/roar-utils": "^1.2.1",
     "@bdelab/roar-vocab": "^1.8.0",
-    "@bdelab/roav-crowding": "1.1.12",
-    "@bdelab/roav-mep": "^1.1.17",
-    "@bdelab/roav-ran": "^1.0.21",
+    "@bdelab/roav-crowding": "1.1.15",
+    "@bdelab/roav-mep": "^1.1.21",
+    "@bdelab/roav-ran": "^1.0.30",
     "@levante-framework/core-tasks": "^1.0.0-beta.18",
     "@sentry/browser": "^8.0.0",
     "@sentry/integrations": "^7.114.0",
diff --git a/src/components/CardAdministration.vue b/src/components/CardAdministration.vue
index fb2df96ca..51cedd077 100644
--- a/src/components/CardAdministration.vue
+++ b/src/components/CardAdministration.vue
@@ -396,7 +396,7 @@ const fetchTreeOrgs = async () => {
   treeTableOrgs.push(...dsgfOrgs.filter((node) => node.data.orgType === 'group'));
   treeTableOrgs.push(...dsgfOrgs.filter((node) => node.data.orgType === 'family'));
 
-  treeTableOrgs.forEach((node) => {
+  (treeTableOrgs ?? []).forEach((node) => {
     // Sort the schools by existance of stats then alphabetically
     if (node.children) {
       node.children.sort((a, b) => {
@@ -499,8 +499,8 @@ const onExpand = async (node) => {
     });
 
     // Sort the classes by existance of stats then alphabetically
-    newNodes.forEach((districtNode) => {
-      districtNode.children.forEach((schoolNode) => {
+    (newNodes ?? []).forEach((districtNode) => {
+      (districtNode?.children ?? []).forEach((schoolNode) => {
         if (schoolNode.children) {
           schoolNode.children.sort((a, b) => {
             if (!a.data.stats) return 1;
diff --git a/src/components/EditOrgsForm.vue b/src/components/EditOrgsForm.vue
new file mode 100644
index 000000000..86888062a
--- /dev/null
+++ b/src/components/EditOrgsForm.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="flex flex-column gap-3">
+    <div class="form-container">
+      <div class="form-field w-full">
+        <label :class="{ 'font-light uppercase text-sm': !editMode }">Name</label>
+        <div v-if="!editMode" :class="{ 'text-xl': !editMode }">{{ serverOrgData.name ?? 'None' }}</div>
+        <PvInputText v-else v-model="localOrgData.name" />
+      </div>
+      <div class="form-field w-full">
+        <label :class="{ 'font-light uppercase text-sm': !editMode }">Abbreviation</label>
+        <div v-if="!editMode" :class="{ 'text-xl': !editMode }">{{ serverOrgData.abbreviation ?? 'None' }}</div>
+        <PvInputText v-else v-model="localOrgData.abbreviation" />
+      </div>
+    </div>
+    <div class="form-field">
+      <label :class="{ 'font-light uppercase text-sm': !editMode }">Address</label>
+      <div class="p-inputgroup">
+        <span class="p-inputgroup-addon">
+          <i class="pi pi-map"></i>
+        </span>
+        <GMapAutocomplete
+          :placeholder="localOrgData.address?.formattedAddress ?? 'Enter an address'"
+          :options="{
+            fields: ['address_components', 'formatted_address', 'place_id', 'url'],
+          }"
+          class="p-inputtext p-component w-full"
+          data-cy="input-address"
+          @place_changed="setAddress"
+        >
+        </GMapAutocomplete>
+      </div>
+    </div>
+    <div v-if="orgType === 'districts'" class="form-field">
+      <label :class="{ 'font-light uppercase text-sm': !editMode }">NCES ID</label>
+      <div v-if="!editMode" :class="{ 'text-xl': !editMode }">{{ serverOrgData.ncesId ?? 'None' }}</div>
+      <PvInputText v-else v-model="localOrgData.ncesId" />
+    </div>
+    <div class="form-field">
+      <label :class="{ 'font-light uppercase text-sm': !editMode }">Tags</label>
+      <PvChips v-model="localOrgData.tags" />
+    </div>
+    <div>
+      <PvCheckbox v-model="localOrgData.testData" binary />
+      <label class="ml-1">Test Data</label>
+    </div>
+    <div>
+      <PvCheckbox v-model="localOrgData.demoData" binary />
+      <label class="ml-1">Demo Data</label>
+    </div>
+  </div>
+</template>
+<script setup>
+import { ref, defineProps, onMounted, watch } from 'vue';
+import { useAuthStore } from '@/store/auth';
+import { storeToRefs } from 'pinia';
+import { fetchDocById } from '@/helpers/query/utils';
+import { useQuery } from '@tanstack/vue-query';
+import PvChips from 'primevue/chips';
+import _isEmpty from 'lodash/isEmpty';
+const props = defineProps({
+  orgType: { type: String, required: true },
+  orgId: { type: String, required: true },
+  editMode: { type: Boolean, default: true },
+});
+
+// +------------+
+// | Initialize |
+// +------------+
+const initialized = ref(false);
+const authStore = useAuthStore();
+const { roarfirekit } = storeToRefs(authStore);
+
+const emit = defineEmits(['modalClosed', 'update:orgData']);
+
+// +----------------------------+
+// | Query for existing orgData |
+// +----------------------------+
+const { data: serverOrgData } = useQuery({
+  queryKey: ['org', props.orgType, props.orgId],
+  queryFn: () => fetchDocById(props.orgType, props.orgId),
+  keepPreviousData: true,
+  enabled: initialized,
+  staleTime: 5 * 60 * 1000, // 5 minutes
+});
+
+// +-------------+
+// | Local State |
+// +-------------+
+const localOrgData = ref({
+  name: null,
+  abbreviation: null,
+  address: null,
+  ncesId: null,
+  tags: [],
+  testData: false,
+  demoData: false,
+});
+
+const setupOrgData = (orgData) => {
+  let org = {
+    name: orgData?.name ?? '',
+    abbreviation: orgData?.abbreviation ?? '',
+    address: orgData?.address ?? '',
+    ncesId: orgData?.ncesId ?? '',
+    tags: orgData?.tags ?? [],
+    testData: orgData?.testData ?? false,
+    demoData: orgData?.demoData ?? false,
+  };
+  localOrgData.value = org;
+};
+
+const setAddress = (place) => {
+  localOrgData.value.address = {
+    addressComponents: place.address_components || [],
+    formattedAddress: place.formatted_address,
+    googlePlacesId: place.place_id,
+    googleMapsUrl: place.url,
+  };
+};
+
+watch(
+  () => serverOrgData,
+  (orgData) => {
+    if (!_isEmpty(orgData)) {
+      setupOrgData(orgData.value);
+    }
+  },
+  { deep: true, immediate: false },
+);
+
+// +--------------------+
+// | Initialize firekit |
+// +--------------------+
+let unsubscribe;
+const init = () => {
+  if (unsubscribe) unsubscribe();
+  initialized.value = true;
+};
+
+unsubscribe = authStore.$subscribe(async (mutation, state) => {
+  if (state.roarfirekit?.restConfig) init();
+});
+
+onMounted(() => {
+  if (roarfirekit.value?.restConfig) init();
+  if (!_isEmpty(serverOrgData.value)) setupOrgData(serverOrgData.value);
+});
+
+// +---------------------+
+// | Handle update event |
+// +---------------------+
+watch(
+  () => localOrgData,
+  (orgData) => {
+    emit('update:orgData', orgData.value);
+  },
+  { deep: true, immediate: false },
+);
+</script>
+<style>
+.form-container {
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
+  width: 100%;
+}
+.form-column {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  width: 100%;
+}
+.form-field {
+  display: flex;
+  flex-direction: column;
+}
+/* Styles for PvChips */
+.p-chips > ul {
+  width: 100%;
+}
+
+.p-chips-token {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 0 auto;
+  background: var(--primary-color);
+  padding: 0.25rem;
+  border-radius: 0.35rem;
+  color: white;
+  margin: 0.05rem;
+}
+
+.p-chips-token-icon,
+g {
+  margin-left: 0.5rem;
+  color: white;
+}
+
+/*
+  Puts the google places autocomplete dropdown results above modal.
+  Modal: 1101, Google places autocomplete: 1150
+*/
+.pac-container {
+  z-index: 1150 !important;
+}
+</style>
diff --git a/src/components/ListOrgs.vue b/src/components/ListOrgs.vue
index a80f42660..decea127e 100644
--- a/src/components/ListOrgs.vue
+++ b/src/components/ListOrgs.vue
@@ -61,6 +61,7 @@
             @export-all="exportAll"
             @selected-org-id="showCode"
             @export-org-users="(orgId) => exportOrgUsers(orgId)"
+            @edit-button="onEditButtonClick($event)"
           />
           <AppSpinner v-else />
         </PvTabPanel>
@@ -112,6 +113,35 @@
       </PvDialog>
     </section>
   </main>
+  <RoarModal
+    title="Edit Organization"
+    subtitle="Modify or add organization information"
+    :is-enabled="isEditModalEnabled"
+    @modal-closed="closeEditModal"
+  >
+    <EditOrgsForm :org-id="currentEditOrgId" :org-type="activeOrgType" @update:org-data="localOrgData = $event" />
+    <template #footer>
+      <div>
+        <div class="flex gap-2">
+          <PvButton
+            tabindex="0"
+            class="border-none border-round bg-white text-primary p-2 hover:surface-200"
+            text
+            label="Cancel"
+            outlined
+            @click="closeEditModal"
+          ></PvButton>
+          <PvButton
+            tabindex="0"
+            class="border-none border-round bg-primary text-white p-2 hover:surface-400"
+            label="Save"
+            @click="updateOrgData"
+            ><i v-if="isSubmitting" class="pi pi-spinner pi-spin"></i
+          ></PvButton>
+        </div>
+      </div>
+    </template>
+  </RoarModal>
 </template>
 <script setup>
 import { orgFetcher, orgFetchAll, orgPageFetcher } from '@/helpers/query/orgs';
@@ -123,6 +153,9 @@ import { storeToRefs } from 'pinia';
 import { useQuery } from '@tanstack/vue-query';
 import { useAuthStore } from '@/store/auth';
 import { useToast } from 'primevue/usetoast';
+import { TOAST_SEVERITIES, TOAST_DEFAULT_LIFE_DURATION } from '@/constants/toasts.js';
+import EditOrgsForm from './EditOrgsForm.vue';
+import RoarModal from './modals/RoarModal.vue';
 import _get from 'lodash/get';
 import _head from 'lodash/head';
 import _kebabCase from 'lodash/kebabCase';
@@ -136,6 +169,10 @@ const orderBy = ref(orderByDefault);
 let activationCode = ref(null);
 const isDialogVisible = ref(false);
 const toast = useToast();
+const isEditModalEnabled = ref(false);
+const currentEditOrgId = ref(null);
+const localOrgData = ref(null);
+const isSubmitting = ref(false);
 
 const districtPlaceholder = computed(() => {
   if (isLoadingDistricts.value) {
@@ -215,18 +252,18 @@ function copyToClipboard(text) {
     .writeText(text)
     .then(function () {
       toast.add({
-        severity: 'success',
+        severity: TOAST_SEVERITIES.SUCCESS,
         summary: 'Hoorah!',
         detail: 'Your code has been successfully copied to clipboard!',
-        life: 3000,
+        life: TOAST_DEFAULT_LIFE_DURATION,
       });
     })
     .catch(function () {
       toast.add({
-        severity: 'error',
+        severity: TOAST_SEVERITIES.ERROR,
         summary: 'Error!',
         detail: 'Your code has not been copied to clipboard! \n Please try again',
-        life: 3000,
+        life: TOAST_DEFAULT_LIFE_DURATION,
       });
     });
 }
@@ -380,6 +417,7 @@ const tableColumns = computed(() => {
 
   columns.push(
     {
+      header: 'Users',
       link: true,
       routeName: 'ListUsers',
       routeTooltip: 'View users',
@@ -387,6 +425,13 @@ const tableColumns = computed(() => {
       routeIcon: 'pi pi-user',
       sort: false,
     },
+    {
+      header: 'Edit',
+      button: true,
+      eventName: 'edit-button',
+      buttonIcon: 'pi pi-pencil',
+      sort: false,
+    },
     {
       header: 'SignUp Code',
       buttonLabel: 'Invite Users',
@@ -431,10 +476,53 @@ const showCode = async (selectedOrg) => {
   }
 };
 
+const onEditButtonClick = (event) => {
+  isEditModalEnabled.value = true;
+  currentEditOrgId.value = _get(event, 'id', null);
+};
+
+const closeEditModal = () => {
+  isEditModalEnabled.value = false;
+  currentEditOrgId.value = null;
+};
+
 const closeDialog = () => {
   isDialogVisible.value = false;
 };
 
+const updateOrgData = async () => {
+  isSubmitting.value = true;
+  await roarfirekit.value
+    .createOrg(
+      activeOrgType.value,
+      localOrgData.value,
+      _get(localOrgData.value, 'testData', false),
+      _get(localOrgData.value, 'demoData', false),
+      currentEditOrgId.value,
+    )
+    .then(() => {
+      closeEditModal();
+      toast.add({
+        severity: TOAST_SEVERITIES.SUCCESS,
+        summary: 'Updated',
+        detail: 'Organization data updated successfully!',
+        life: TOAST_DEFAULT_LIFE_DURATION,
+      });
+    })
+    .catch((error) => {
+      toast.add({
+        severity: TOAST_SEVERITIES.ERROR,
+        summary: 'Unexpected error',
+        detail: `Unexpected error occurred: ${error.message}`,
+        life: TOAST_DEFAULT_LIFE_DURATION,
+      });
+      Sentry.captureException(error);
+    })
+    .finally(() => {
+      isSubmitting.value = false;
+    });
+};
+
 let unsubscribe;
 const initTable = () => {
   if (unsubscribe) unsubscribe();
diff --git a/src/components/ListUsers.vue b/src/components/ListUsers.vue
index f5fad91bd..98f4b20ea 100644
--- a/src/components/ListUsers.vue
+++ b/src/components/ListUsers.vue
@@ -222,6 +222,12 @@ const columns = ref([
     dataType: 'string',
     sort: false,
   },
+  {
+    field: 'archived',
+    header: 'Archived',
+    dataType: 'boolean',
+    sort: false,
+  },
   {
     header: 'Edit',
     button: true,
diff --git a/src/components/RoarDataTable.vue b/src/components/RoarDataTable.vue
index 9eccecd67..77b5bf8a7 100644
--- a/src/components/RoarDataTable.vue
+++ b/src/components/RoarDataTable.vue
@@ -117,7 +117,7 @@
               >
                 <template #header>
                   <div class="flex flex-row">
-                    <div>Foundational</div>
+                    <div>Foundational Reading Skills</div>
                     <div class="ml-2">
                       <PvButton class="p-0 border-none border-circle bg-primary" @click="toggle($event, 'primary')"
                         ><i v-tooltip.top="'Learn more'" class="pi pi-info-circle text-white p-1 border-circle"></i
@@ -191,7 +191,7 @@
               >
                 <template #header>
                   <div class="flex flex-row">
-                    <div>Math<br />(In Development)</div>
+                    <div>Mathematics<br />(In Development)</div>
                     <div class="mt-1 ml-2">
                       <PvButton class="p-0 border-none border-circle bg-primary" @click="toggle($event, 'math')"
                         ><i v-tooltip.top="'Learn more'" class="pi pi-info-circle text-white p-1 border-circle"></i
@@ -241,7 +241,10 @@
                 :frozen="col.pinned"
                 :style="col.style"
                 align-frozen="left"
-                header-style="background:var(--primary-color); color:white; padding-top:0; margin-top:0; padding-bottom:0; margin-bottom:0; border:0; margin-left:0"
+                :header-style="
+                  col.headerStyle ||
+                  `background:var(--primary-color); color:white; padding-top:0; margin-top:0; padding-bottom:0; margin-bottom:0; border:0; margin-left:0`
+                "
               >
                 <template #header>
                   <div
@@ -379,7 +382,7 @@
           </PvColumnGroup>
           <PvOverlayPanel ref="op" append-to="body" class="overflow-y-scroll" style="width: 60vh; max-height: 30vh">
             <template v-if="selectedColumn === 'primary'">
-              <h3 class="font-bold">Foundational</h3>
+              <h3 class="font-bold">Foundational Reading Skills</h3>
               <div>
                 <h4 class="font-bold">Word</h4>
                 Word indicates which students are in need of support in word-level decoding and automaticity. Word has
@@ -408,7 +411,7 @@
               </div>
             </template>
             <template v-if="selectedColumn === 'spanishmath'">
-              <h3 class="font-bold">Spanish Math</h3>
+              <h3 class="font-bold">Spanish Mathematics</h3>
               <div>
                 Spanish-language mathematics assessments provide additional insight into areas such as arithmetic
                 fluency, calculation ability, and mathematical procedures based on common core standards <br />
@@ -428,7 +431,7 @@
               </div>
             </template>
             <template v-else-if="selectedColumn === 'math'">
-              <h3 class="font-bold">Math</h3>
+              <h3 class="font-bold">Mathematics</h3>
               <div>
                 Mathematics assessments provide additional insight into areas such as arithmetic fluency, calculation
                 ability, and mathematical procedures based on common core standards<br />
@@ -837,6 +840,8 @@ const roamTasks = [
   'scores.fluency-calf.numCorrect',
   'scores.roam-alpaca.percentCorrect',
   'scores.egma-math.percentCorrect',
+  'scores.fluency-calf.percentile',
+  'scores.fluency-arf.percentile',
 ];
 
 const roavTasks = [
diff --git a/src/components/auth/SignIn.vue b/src/components/auth/SignIn.vue
index f1f70cc0f..e07ac7c29 100644
--- a/src/components/auth/SignIn.vue
+++ b/src/components/auth/SignIn.vue
@@ -256,7 +256,7 @@ function closeForgotPasswordModal() {
 }
 function sendResetEmail() {
   console.log('Submitting forgot password with email', forgotEmail.value);
-  // roarfirekit.value.forgotPassword(forgotEmail.value);
+  roarfirekit.value.sendPasswordResetEmail(forgotEmail.value);
   closeForgotPasswordModal();
 }
 
diff --git a/src/config/firebaseRoar.js b/src/config/firebaseRoar.js
index 4e9ad435d..4773334b6 100644
--- a/src/config/firebaseRoar.js
+++ b/src/config/firebaseRoar.js
@@ -9,17 +9,14 @@ const useSandbox = import.meta.env.VITE_FIREBASE_DATA_SOURCE === 'sandbox';
 const isStaging = import.meta.env.VITE_STAGING_BUILD === 'true';
 
 function setDebugToken(config) {
-  // If the NODE_ENV = test, use the debug token from the Cypress config (NODE_ENV is set to test in the Cypress test GitHub action)
-  // Otherwise, use the VITE_APPCHECK_DEBUG_TOKEN environment variable (set as a local environment variable in the .env file and in the GitHub action for preview builds)
-  // If neither are set, create a new debug token which will be inactive until it is set in the Firebase App Check console
-  const debugToken =
-    import.meta.env.NODE_ENV === 'test'
-      ? Cypress.env('appCheckDebugToken')
-      : import.meta.env.VITE_APPCHECK_DEBUG_TOKEN || (self.FIREBASE_APPCHECK_DEBUG_TOKEN = true);
-
-  if (debugToken) {
-    config.debugToken = debugToken;
-  }
+  // For Cypress tests, use the debug token from the Cypress config. If running on localhost, use the VITE_APPCHECK_DEBUG_TOKEN
+  // environment variable (set as a local environment variable in the .env file). If neither are set, create a new debug token which will be inactive until it is set in the
+  // Firebase App Check console
+  config.debugToken = window.Cypress
+    ? Cypress.env('appCheckDebugToken')
+    : window.location.hostname === 'localhost'
+    ? import.meta.env.VITE_APPCHECK_DEBUG_TOKEN || (self.FIREBASE_APPCHECK_DEBUG_TOKEN = true)
+    : undefined;
 }
 
 if (isEmulated) {
diff --git a/src/constants/toasts.js b/src/constants/toasts.js
new file mode 100644
index 000000000..1425c0d5c
--- /dev/null
+++ b/src/constants/toasts.js
@@ -0,0 +1,6 @@
+export const TOAST_SEVERITIES = Object.freeze({
+  SUCCESS: 'success',
+  ERROR: 'error',
+});
+
+export const TOAST_DEFAULT_LIFE_DURATION = 3000;
diff --git a/src/helpers/query/assignments.js b/src/helpers/query/assignments.js
index 594ef72aa..5db6a2877 100644
--- a/src/helpers/query/assignments.js
+++ b/src/helpers/query/assignments.js
@@ -176,97 +176,6 @@ export const getAssignmentsRequestBody = ({
   return requestBody;
 };
 
-export const getUsersByAssignmentIdRequestBody = ({
-  adminId,
-  orgType,
-  orgId,
-  filter,
-  aggregationQuery,
-  pageLimit,
-  page,
-  paginate = true,
-  select = userSelectFields,
-}) => {
-  const requestBody = {
-    structuredQuery: {},
-  };
-
-  if (!aggregationQuery) {
-    if (paginate) {
-      requestBody.structuredQuery.limit = pageLimit;
-      requestBody.structuredQuery.offset = page * pageLimit;
-    }
-
-    if (select.length > 0) {
-      requestBody.structuredQuery.select = {
-        fields: select.map((field) => ({ fieldPath: field })),
-      };
-    }
-  }
-
-  requestBody.structuredQuery.from = [
-    {
-      collectionId: 'users',
-      allDescendants: false,
-    },
-  ];
-
-  requestBody.structuredQuery.where = {
-    compositeFilter: {
-      op: 'AND',
-      filters: [
-        {
-          fieldFilter: {
-            field: { fieldPath: `${pluralizeFirestoreCollection(orgType)}.current` },
-            op: 'ARRAY_CONTAINS',
-            value: { stringValue: orgId },
-          },
-        },
-        {
-          fieldFilter: {
-            field: { fieldPath: 'assignments.assigned' },
-            op: 'ARRAY_CONTAINS_ANY',
-            value: { arrayValue: { values: [{ stringValue: adminId }] } },
-          },
-        },
-        {
-          fieldFilter: {
-            field: { fieldPath: 'archived' },
-            op: 'EQUAL',
-            value: { booleanValue: false },
-          },
-        },
-      ],
-    },
-  };
-
-  if (filter) {
-    requestBody.structuredQuery.where.compositeFilter.filters.push({
-      fieldFilter: {
-        field: { fieldPath: filter[0].field },
-        op: 'EQUAL',
-        value: { stringValue: filter[0].value },
-      },
-    });
-  }
-
-  if (aggregationQuery) {
-    return {
-      structuredAggregationQuery: {
-        ...requestBody,
-        aggregations: [
-          {
-            alias: 'count',
-            count: {},
-          },
-        ],
-      },
-    };
-  }
-
-  return requestBody;
-};
-
 export const getFilteredScoresRequestBody = ({
   adminId,
   orgId,
diff --git a/src/helpers/query/users.js b/src/helpers/query/users.js
index 53da1e74f..1e7e8fb0e 100644
--- a/src/helpers/query/users.js
+++ b/src/helpers/query/users.js
@@ -10,6 +10,7 @@ export const getUsersRequestBody = ({
   paginate = true,
   select = ['name'],
   orderBy,
+  restrictToActiveUsers = false,
 }) => {
   const requestBody = {
     structuredQuery: {},
@@ -39,18 +40,20 @@ export const getUsersRequestBody = ({
   requestBody.structuredQuery.where = {
     compositeFilter: {
       op: 'AND',
-      filters: [
-        {
-          fieldFilter: {
-            field: { fieldPath: 'archived' },
-            op: 'EQUAL',
-            value: { booleanValue: false },
-          },
-        },
-      ],
+      filters: [],
     },
   };
 
+  if (restrictToActiveUsers) {
+    requestBody.structuredQuery.where.compositeFilter.filters.push({
+      fieldFilter: {
+        field: { fieldPath: 'archived' },
+        op: 'EQUAL',
+        value: { booleanValue: false },
+      },
+    });
+  }
+
   if (userIds.length > 0) {
     requestBody.structuredQuery.where.compositeFilter.filters.push({
       fieldFilter: {
@@ -96,21 +99,7 @@ export const getUsersRequestBody = ({
   return requestBody;
 };
 
-export const usersPageFetcher = async (userIds, pageLimit, page) => {
-  const axiosInstance = getAxiosInstance();
-  const requestBody = getUsersRequestBody({
-    userIds,
-    aggregationQuery: false,
-    pageLimit: pageLimit.value,
-    page: page.value,
-    paginate: true,
-  });
-
-  console.log(`Fetching page ${page.value} for ${userIds}`);
-  return axiosInstance.post(':runQuery', requestBody).then(({ data }) => mapFields(data));
-};
-
-export const fetchUsersByOrg = async (orgType, orgId, pageLimit, page, orderBy) => {
+export const fetchUsersByOrg = async (orgType, orgId, pageLimit, page, orderBy, restrictToActiveUsers = false) => {
   const axiosInstance = getAxiosInstance();
   const requestBody = getUsersRequestBody({
     orgType,
@@ -119,15 +108,16 @@ export const fetchUsersByOrg = async (orgType, orgId, pageLimit, page, orderBy)
     pageLimit: pageLimit.value,
     page: page.value,
     paginate: true,
-    select: ['username', 'name', 'studentData', 'userType'],
+    select: ['username', 'name', 'studentData', 'userType', 'archived'],
     orderBy: orderBy.value,
+    restrictToActiveUsers: restrictToActiveUsers,
   });
 
   console.log(`Fetching users page ${page.value} for ${orgType} ${orgId}`);
   return axiosInstance.post(':runQuery', requestBody).then(({ data }) => mapFields(data));
 };
 
-export const countUsersByOrg = async (orgType, orgId, orderBy) => {
+export const countUsersByOrg = async (orgType, orgId, orderBy, restrictToActiveUsers = false) => {
   const axiosInstance = getAxiosInstance();
   const requestBody = getUsersRequestBody({
     orgType,
@@ -135,6 +125,7 @@ export const countUsersByOrg = async (orgType, orgId, orderBy) => {
     aggregationQuery: true,
     paginate: false,
     orderBy: orderBy.value,
+    restrictToActiveUsers: restrictToActiveUsers,
   });
 
   return axiosInstance.post(':runAggregationQuery', requestBody).then(({ data }) => {
diff --git a/src/pages/ScoreReport.vue b/src/pages/ScoreReport.vue
index 348209ce9..a6360a71c 100644
--- a/src/pages/ScoreReport.vue
+++ b/src/pages/ScoreReport.vue
@@ -1142,11 +1142,20 @@ const scoreReportColumns = computed(() => {
       dataType: 'text',
       sort: true,
       filter: true,
+      headerStyle: authStore.isUserSuperAdmin
+        ? `background:var(--primary-color); color:white; padding-top:0; margin-top:0; padding-bottom:0; margin-bottom:0; border:0; margin-left:0 `
+        : `background:var(--primary-color); color:white; padding-top:0; margin-top:0; padding-bottom:0; margin-bottom:0; border:0; margin-left:0; border-right-width:2px; border-right-style:solid; border-right-color:#ffffff;`,
     });
   }
 
   if (authStore.isUserSuperAdmin) {
-    tableColumns.push({ field: 'user.assessmentPid', header: 'PID', dataType: 'text', sort: false });
+    tableColumns.push({
+      field: 'user.assessmentPid',
+      header: 'PID',
+      dataType: 'text',
+      sort: false,
+      headerStyle: `background:var(--primary-color); color:white; padding-top:0; margin-top:0; padding-bottom:0; margin-bottom:0; border:0; margin-left:0; border-right-width:2px; border-right-style:solid; border-right-color:#ffffff;`,
+    });
   }
 
   const sortedTasks = allTasks.value.toSorted((p1, p2) => {
diff --git a/src/pages/SignIn.vue b/src/pages/SignIn.vue
index ae4baa395..ed4d78f6c 100644
--- a/src/pages/SignIn.vue
+++ b/src/pages/SignIn.vue
@@ -213,7 +213,7 @@ const modalPassword = ref('');
 
 const authWithClever = () => {
   console.log('---> authWithClever');
-  authStore.signInWithCleverRedirect();
+  authStore.signInWithCleverPopup();
   spinner.value = true;
   // }
 };
@@ -225,7 +225,6 @@ const authWithClassLink = () => {
     spinner.value = true;
   } else {
     authStore.signInWithClassLinkRedirect();
-    // authStore.signInWithCleverPopup();
     spinner.value = true;
   }
 };