diff --git a/package-lock.json b/package-lock.json
index 9fbad65a3833d378bc12f6a3caeba8d3038d800a..758b16ee84e94b64dd939c8713c17823b86e3e20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -295,22 +295,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "semver": {
@@ -4149,16 +4168,24 @@
           }
         },
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "cacache": {
@@ -4201,13 +4228,12 @@
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
-          "dev": true
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
         },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -4241,6 +4267,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
         "fs-extra": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -4292,6 +4324,12 @@
           "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
           "dev": true
         },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+          "dev": true
+        },
         "p-map": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
@@ -4367,9 +4405,9 @@
           }
         },
         "vue-loader-v16": {
-          "version": "npm:vue-loader@16.3.3",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz",
-          "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==",
+          "version": "npm:vue-loader@16.5.0",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
+          "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -5089,26 +5127,38 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
           },
           "dependencies": {
             "caniuse-lite": {
-              "version": "1.0.30001223",
-              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-              "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
               "dev": true
             }
           }
         },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+          "dev": true
+        },
         "postcss": {
           "version": "7.0.36",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
@@ -6146,25 +6196,37 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
           },
           "dependencies": {
             "caniuse-lite": {
-              "version": "1.0.30001223",
-              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-              "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
               "dev": true
             }
           }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+          "dev": true
         }
       }
     },
@@ -7189,22 +7251,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "semver": {
@@ -8965,12 +9046,6 @@
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
       "dev": true
     },
-    "electron-to-chromium": {
-      "version": "1.3.727",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz",
-      "integrity": "sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==",
-      "dev": true
-    },
     "elegant-spinner": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
@@ -14333,12 +14408,6 @@
       "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
       "dev": true
     },
-    "node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
-      "dev": true
-    },
     "nopt": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -14783,6 +14852,18 @@
       "dev": true,
       "requires": {
         "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "url-parse": {
+          "version": "1.5.3",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+          "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+          "dev": true,
+          "requires": {
+            "querystringify": "^2.1.1",
+            "requires-port": "^1.0.0"
+          }
+        }
       }
     },
     "os-browserify": {
@@ -15223,22 +15304,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001244",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001244.tgz",
-          "integrity": "sha512-Wb4UFZPkPoJoKKVfELPWytRzpemjP/s0pe22NriANru1NoI+5bGNxzKtk7edYL8rmCWTfQO8eRiF0pn1Dqzx7Q==",
+          "integrity": "sha512-Wb4UFZPkPoJoKKVfELPWytRzpemjP/s0pe22NriANru1NoI+5bGNxzKtk7edYL8rmCWTfQO8eRiF0pn1Dqzx7Q=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "postcss": {
@@ -15601,22 +15701,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "postcss": {
@@ -15745,22 +15864,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "postcss": {
@@ -16205,22 +16343,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "postcss": {
@@ -16387,22 +16544,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "postcss": {
@@ -17708,9 +17884,9 @@
       },
       "dependencies": {
         "path-parse": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-          "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+          "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
           "dev": true
         }
       }
@@ -18425,6 +18601,16 @@
           "requires": {
             "websocket-driver": ">=0.5.1"
           }
+        },
+        "url-parse": {
+          "version": "1.5.3",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+          "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+          "dev": true,
+          "requires": {
+            "querystringify": "^2.1.1",
+            "requires-port": "^1.0.0"
+          }
         }
       }
     },
@@ -18894,22 +19080,41 @@
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.16.6",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "version": "4.16.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
+          "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001219",
+            "caniuse-lite": "^1.0.30001248",
             "colorette": "^1.2.2",
-            "electron-to-chromium": "^1.3.723",
+            "electron-to-chromium": "^1.3.793",
             "escalade": "^3.1.1",
-            "node-releases": "^1.1.71"
+            "node-releases": "^1.1.73"
+          },
+          "dependencies": {
+            "caniuse-lite": {
+              "version": "1.0.30001248",
+              "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz",
+              "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==",
+              "dev": true
+            }
           }
         },
         "caniuse-lite": {
           "version": "1.0.30001223",
           "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
-          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+          "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.795",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz",
+          "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.73",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+          "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
           "dev": true
         },
         "postcss": {
@@ -20461,16 +20666,6 @@
         "schema-utils": "^2.5.0"
       }
     },
-    "url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
-      "dev": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
diff --git a/package.json b/package.json
index cfd0ac9396b4d0493352247d8f33de902a164d92..8e225133e0abea78df28eb0b8a6923965ae8bed6 100644
--- a/package.json
+++ b/package.json
@@ -161,11 +161,13 @@
     "minimist": "^1.2.5",
     "node-notifier": "^9.0.0",
     "normalize-url": "^4.5.1",
+    "path-parse": "^1.0.7",
     "postcss": "^7.0.36",
     "serialize-javascript": "^3.1.0",
     "sockjs": "^0.3.21",
     "ssri": "^8.0.1",
     "trim-newlines": "^3.0.0",
+    "url-parse": "^1.5.3",
     "y18n": "^5.0.5",
     "yargs-parser": "^18.1.3",
     "ws": "^7.4.6"
diff --git a/public/static/docs/(U) Platform One_Party Bus Survival Guide (27 August 2020).pdf b/public/static/docs/(U) Platform One_Party Bus Survival Guide (27 August 2020).pdf
deleted file mode 100644
index 6d2e70f2e1cac876ef8d4cbf37a033ce8df5fa35..0000000000000000000000000000000000000000
Binary files a/public/static/docs/(U) Platform One_Party Bus Survival Guide (27 August 2020).pdf and /dev/null differ
diff --git a/src/api/http-common.js b/src/api/http-common.js
index 9fbbc9978361c4ffb64f4a5f39afa4deef9ed949..6766fbaa53307e448dd00ed006e3ac7be33fb553 100644
--- a/src/api/http-common.js
+++ b/src/api/http-common.js
@@ -8,5 +8,18 @@ export const createBaseHttp = () => {
 };
 
 export const HTTP = createBaseHttp();
-
-HTTP.interceptors.response.use((response) => response?.data?.result);
+HTTP.interceptors.response.use(
+  function (response) {
+    return response?.data?.result;
+  },
+  function (err) {
+    // If err.status does not exist a general networking error occurred.
+    // We'll assume that their keycloak session has expired, so refresh the
+    // page which will redirect them to login
+    if (!err.status) {
+      location.reload();
+    } else {
+      throw err;
+    }
+  }
+);
diff --git a/src/api/mock-http-common.js b/src/api/mock-http-common.js
deleted file mode 100644
index d4e4638132f621d505ae6de9f279db86b8d5035a..0000000000000000000000000000000000000000
--- a/src/api/mock-http-common.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import axios from "axios";
-
-// TODO: the goal is to be able to delete this file - this is only temporary
-// until the backend has the necessary REST endpoints and the frontend has
-// been updated to call them
-
-export const HTTP = axios.create({
-  baseURL: "/static/mock-data",
-});
diff --git a/src/api/services/admin.js b/src/api/services/admin.js
index 1e6d253f28d2774d34ce1b77fa36fccb5ba9bd4b..58f96c3f3de098dc2479e907671fef12b66272ff 100644
--- a/src/api/services/admin.js
+++ b/src/api/services/admin.js
@@ -2,6 +2,6 @@ import { HTTP } from "@/api/http-common";
 
 export default {
   async capacityMetrics(params) {
-    return await HTTP.get("/admin/capacity-metrics", { params });
+    return HTTP.get("/admin/capacity-metrics", { params });
   },
 };
diff --git a/src/api/services/project.js b/src/api/services/project.js
index b141a86475eedef6a5fd508d54e3a0bc02639317..3ae023b1f9fa45fe62e37d669c3efe4632792c53 100644
--- a/src/api/services/project.js
+++ b/src/api/services/project.js
@@ -2,7 +2,7 @@ import { HTTP } from "@/api/http-common";
 
 export default {
   async getProjectsSummary() {
-    return await HTTP.get(
+    return HTTP.get(
       "/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user"
     );
   },
diff --git a/src/api/services/schedule.js b/src/api/services/schedule.js
index 0d21c6f52ef07fa1ac9c8dbe61c43faa58e9e4fb..d09b4ad0a5bee1f05a80d602357cf362d626dcf0 100644
--- a/src/api/services/schedule.js
+++ b/src/api/services/schedule.js
@@ -5,7 +5,7 @@ const defaultCertificateFileName = "certificate.pdf";
 export default {
   defaultCertificateFileName,
   async getScheduleForUser() {
-    return await HTTP.get("/courses/my-registrations");
+    return HTTP.get("/courses/my-registrations");
   },
   async downloadCertificate(courseId, userId) {
     const certificateHTTP = createBaseHttp();
diff --git a/src/api/services/status.js b/src/api/services/status.js
deleted file mode 100644
index 4f620b297db3e1dffee2cf369157f34956934030..0000000000000000000000000000000000000000
--- a/src/api/services/status.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import get from "lodash/get";
-import { HTTP } from "@/api/mock-http-common";
-
-export default {
-  async getStatusSummary() {
-    const response = await HTTP.get(`status.json`);
-    return get(response, "data.result");
-  },
-};
diff --git a/src/api/services/team.js b/src/api/services/team.js
index 369a92624859d9034a1aab4cddb41088275fdceb..6e6cf9d84d3949e8f129f4455e66598f5c6bb83d 100644
--- a/src/api/services/team.js
+++ b/src/api/services/team.js
@@ -9,13 +9,13 @@ const getTeamMemberBody = (users) => {
 
 export default {
   async getMyTeam() {
-    return await HTTP.get("/teams/my-teams");
+    return HTTP.get("/teams/my-teams");
   },
   async getTeams(params) {
-    return await HTTP.get("/teams", { params });
+    return HTTP.get("/teams", { params });
   },
   async getTeam(teamId) {
-    return await HTTP.get(`/teams/${teamId}`, {
+    return HTTP.get(`/teams/${teamId}`, {
       params: { members: true },
     });
   },
@@ -23,11 +23,11 @@ export default {
     await HTTP.delete("/teams", { params: { teamIds: `[${teamIds.join()}]` } });
   },
   async addTeam(team) {
-    return await HTTP.post("/teams", team);
+    return HTTP.post("/teams", team);
   },
   async addTeams(newTeams) {
-    for (let i = 0; i < newTeams.length; i++) {
-      await this.addTeam(newTeams[i]);
+    for (const newTeam of newTeams) {
+      await this.addTeam(newTeam);
     }
   },
 
diff --git a/src/api/services/training.js b/src/api/services/training.js
index 0ad84b9bb936f1f31e36aea59ea53a538b3373ea..6a2a7c063570053f814effcb7b6891ff4c2d2ea1 100644
--- a/src/api/services/training.js
+++ b/src/api/services/training.js
@@ -68,22 +68,18 @@ export default {
     window.open("/api/courses/export");
   },
   async getCourseRegistrationsById(courseId, params) {
-    const response = await HTTP.get(`/courses/${courseId}/registrations`, {
+    return HTTP.get(`/courses/${courseId}/registrations`, {
       params,
     });
-    return response;
   },
   async setUserAttendance(courseId, body) {
-    return await HTTP.put(
-      `/courses/${courseId}/registrations/attendance`,
-      body
-    );
+    return HTTP.put(`/courses/${courseId}/registrations/attendance`, body);
   },
   async setCourseRegistrationsByUserId(courseId, userId, body) {
-    return await HTTP.put(`/courses/${courseId}/registrations/${userId}`, body);
+    return HTTP.put(`/courses/${courseId}/registrations/${userId}`, body);
   },
   async removeCourseRegistrationsByUserId(courseId, userId) {
-    return await HTTP.delete(`/courses/${courseId}/registrations/${userId}`);
+    return HTTP.delete(`/courses/${courseId}/registrations/${userId}`);
   },
   async removeCourseRegistrationsByUsers(courseId, registrations) {
     for (const registration of registrations) {
diff --git a/src/api/services/user.js b/src/api/services/user.js
index 4e49bb8c265c540d0d4195440b595726e69c6c72..10926c4c791a0d4868aa0cc3dd65fbe7f969c793 100644
--- a/src/api/services/user.js
+++ b/src/api/services/user.js
@@ -2,10 +2,10 @@ import { HTTP } from "@/api/http-common";
 
 export default {
   async getUser() {
-    return await HTTP.get("/whoami");
+    return HTTP.get("/whoami");
   },
   async search(params) {
-    return await HTTP.get("/users", { params });
+    return HTTP.get("/users", { params });
   },
   async getUsersByPersonnelType(params) {
     return this.search(params);
diff --git a/src/components/AllCurriculumSchedule.vue b/src/components/AllCurriculumSchedule.vue
deleted file mode 100644
index eee9cfa41d30e8f4aefd71efc20e08deb3af2079..0000000000000000000000000000000000000000
--- a/src/components/AllCurriculumSchedule.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <v-container class="my-courses text-left px-2">
-    <v-skeleton-loader :loading="loading" type="paragraph@5" class="w-100">
-      <ErrorMessage v-if="error" v-bind:errorMessage="errorMessage" />
-      <v-card v-if="emptyString">
-        <v-card-title
-          >There currently are no current or upcoming courses.</v-card-title
-        >
-        <v-card-text
-          >Courses in progress or upcoming will appear here.</v-card-text
-        >
-      </v-card>
-      <v-container class="px-6" v-else>
-        <div
-          v-for="(item, index) in schedule"
-          :key="index"
-          :class="{ last: index == schedule.length - 1 }"
-        >
-          <div
-            v-if="inDateRange(item.startDate, item.endDate)"
-            class="dot dot-white"
-          ></div>
-          <div v-else class="dot dot-green"></div>
-          <div class="d-flex col-12 py-0 class-container">
-            <div
-              v-if="inDateRange(item.startDate, item.endDate)"
-              class="dot-border dot-border-white col-1 d-inline-block"
-            ></div>
-            <div
-              v-else
-              class="dot-border dot-border-green col-1 d-inline-block"
-            ></div>
-
-            <div
-              class="col-sm col-3 d-inline-block d-flex align-start class-name"
-            >
-              {{ item.name }}
-            </div>
-
-            <div class="col-sm col-4 d-inline-block resText">
-              {{ item.startDate }} - {{ item.endDate }}
-            </div>
-            <div class="col-sm col-4 d-inline-block resText">
-              <div v-if="inDateRange(item.startDate, item.endDate)">
-                In Progress
-              </div>
-              <div v-else>
-                {{ seatsRemaining(item.capacity, item.registeredCount) }}
-                remaining seats
-              </div>
-            </div>
-          </div>
-        </div>
-      </v-container>
-    </v-skeleton-loader>
-  </v-container>
-</template>
-
-<script>
-import TrainingService from "@/api/services/training";
-import moment from "moment";
-import { SET_ERROR_MESSAGE } from "@/store/mutation-types";
-import ErrorMessage from "@/components/APIErrorCard";
-export default {
-  components: {
-    ErrorMessage,
-  },
-  data: () => ({
-    loading: false,
-    schedule: [],
-    emptyString: false,
-    errorMessage: null,
-    error: false,
-  }),
-  async mounted() {
-    this.params = {
-      registeredCount: true,
-      dateFrom: `${moment().format("YYYY-MM-DD")}`,
-      dateTo: `${moment().add(6, "months").format("YYYY-MM-DD")}`,
-      sort: "startDate",
-    };
-    try {
-      this.loading = true;
-      const response = await TrainingService.getCourses(this.params);
-      this.schedule = response.courses;
-      if (this.schedule.length === 0) {
-        this.emptyString = true;
-      }
-    } catch (error) {
-      this.error = true;
-      this.$store.commit(SET_ERROR_MESSAGE, error);
-      this.errorMessage = error;
-    } finally {
-      this.loading = false;
-    }
-  },
-  methods: {
-    inDateRange(startDate, endDate) {
-      return moment().isBetween(startDate, endDate);
-    },
-    seatsRemaining(capacity, registered) {
-      return capacity - registered;
-    },
-  },
-};
-</script>
diff --git a/src/components/Dialogs/DialogComponents/UserSelectForCourse.vue b/src/components/Dialogs/DialogComponents/UserSelectForCourse.vue
index 1901aeda8f2eba32a6f91a17ea300f9ca761e3ae..41780053f861144e32c8b9c408762c7d3020b5c1 100644
--- a/src/components/Dialogs/DialogComponents/UserSelectForCourse.vue
+++ b/src/components/Dialogs/DialogComponents/UserSelectForCourse.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    This is a test
     <UserSelect
       :force-error="areNoAvailableSeats"
       :force-error-message="
@@ -37,12 +38,10 @@ export default {
       type: String,
       default: "Select Course",
     },
+    // needed in order for Add to Course button to become enabled
+    // parent components need to pass in their own updateCourseMembers
     updateCourseMembers: {
       type: Function,
-      default: () => {
-        // TODO: confirm this is even being triggered; looks like it's being passed as prop 'update-course-members'
-        return;
-      },
     },
     isCourseSelected: {
       type: Boolean,
diff --git a/src/components/InstructorCourses.vue b/src/components/InstructorCourses.vue
deleted file mode 100644
index d8d3750b39af12b58309aaf5f76d226f98baeaa2..0000000000000000000000000000000000000000
--- a/src/components/InstructorCourses.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <v-container class="curriculum-schedule text-left px-2">
-    <v-skeleton-loader :loading="loading" type="paragraph@5" class="w-100">
-      <ErrorMessage v-if="error" v-bind:errorMessage="errorMessage" />
-      <v-card v-if="emptyString">
-        <v-card-title
-          >There currently are no current or upcoming courses.</v-card-title
-        >
-        <v-card-text
-          >Courses in progress or upcoming will appear here.</v-card-text
-        >
-      </v-card>
-      <v-container class="px-6" v-else>
-        <div
-          v-for="(item, index) in schedule"
-          :key="index"
-          :class="{ last: index == schedule.length - 1 }"
-        >
-          <div
-            v-if="inDateRange(item.startDate, item.endDate)"
-            class="dot dot-white"
-          ></div>
-          <div v-else class="dot dot-green"></div>
-          <div class="d-flex col-12 py-0 class-container">
-            <div
-              v-if="inDateRange(item.startDate, item.endDate)"
-              class="dot-border dot-border-white col-1 d-inline-block"
-            ></div>
-            <div
-              v-else
-              class="dot-border dot-border-green col-1 d-inline-block"
-            ></div>
-
-            <div
-              class="col-sm col-3 d-inline-block d-flex align-start class-name"
-            >
-              {{ item.name }}
-            </div>
-
-            <div class="col-sm col-4 d-inline-block resText">
-              {{ item.startDate }} - {{ item.endDate }}
-            </div>
-            <div class="col-sm col-4 d-inline-block resText">
-              <div v-if="inDateRange(item.startDate, item.endDate)">
-                In Progress
-              </div>
-              <div v-else>
-                {{ seatsRemaining(item.capacity, item.registeredCount) }}
-                remaining seats
-              </div>
-            </div>
-          </div>
-        </div>
-      </v-container>
-    </v-skeleton-loader>
-  </v-container>
-</template>
-
-<script>
-import TrainingService from "@/api/services/training";
-import moment from "moment";
-import { SET_ERROR_MESSAGE } from "@/store/mutation-types";
-import ErrorMessage from "@/components/APIErrorCard";
-export default {
-  components: {
-    ErrorMessage,
-  },
-  data: () => ({
-    loading: false,
-    schedule: [],
-    emptyString: false,
-    errorMessage: null,
-    error: false,
-  }),
-  async mounted() {
-    this.params = {
-      registeredCount: true,
-      instructorOf: true,
-      dateFrom: `${moment().format("YYYY-MM-DD")}`,
-      dateTo: `${moment().add(6, "months").format("YYYY-MM-DD")}`,
-      sort: "startDate",
-    };
-    try {
-      this.loading = true;
-      const response = await TrainingService.getCourses(this.params);
-      this.schedule = response.courses;
-      if (this.schedule.length === 0) {
-        this.emptyString = true;
-      }
-    } catch (error) {
-      this.error = true;
-      this.$store.commit(SET_ERROR_MESSAGE, error);
-      this.errorMessage = error;
-    } finally {
-      this.loading = false;
-    }
-  },
-  methods: {
-    inDateRange(startDate, endDate) {
-      return moment().isBetween(startDate, endDate);
-    },
-    seatsRemaining(capacity, registered) {
-      return capacity - registered;
-    },
-  },
-};
-</script>
diff --git a/src/components/PersonnelTable.vue b/src/components/PersonnelTable.vue
index 64ba93e42def5edfda2502c86c7886868fa50b71..3f673dded6b9b7553b40f26f46ba0ee86992425b 100644
--- a/src/components/PersonnelTable.vue
+++ b/src/components/PersonnelTable.vue
@@ -394,14 +394,13 @@ export default {
     },
     personnelList() {
       const list = [...this.personnel.listItems];
-      const filteredList = list.filter(({ email, number, name }) => {
+      return list.filter(({ email, number, name }) => {
         return (
           includes(toLower(email), this.searchBy) ||
           includes(toLower(name), this.searchBy) ||
           includes(toLower(number), this.searchBy)
         );
       });
-      return filteredList;
     },
     permissionTypesDropdown() {
       return map(this.permissionTypes, (label) => {
diff --git a/src/components/ProjectsSummary.vue b/src/components/ProjectsSummary.vue
index e97f59a308f1e1f8330da9740b5bf0e728e7657e..ee0cbd1dee9a9c45c5c32a583abf1d51627685f8 100644
--- a/src/components/ProjectsSummary.vue
+++ b/src/components/ProjectsSummary.vue
@@ -230,9 +230,8 @@
 import { mapState, mapMutations } from "vuex";
 import ProjectService from "@/api/services/project";
 import GitLabIcon from "@/components/icons/GitLabIcon";
-import { SET_PROJECTS } from "@/store/mutation-types";
+import { SET_PROJECTS, SET_ERROR_MESSAGE } from "@/store/mutation-types";
 import ErrorMessage from "@/components/APIErrorCard";
-import { SET_ERROR_MESSAGE } from "@/store/mutation-types";
 
 export default {
   components: {
@@ -296,10 +295,9 @@ export default {
   },
   computed: {
     filteredProjects() {
-      const projects = this.detailed
+      return this.detailed
         ? this.projects
         : this.projects.filter((o) => o.favorite);
-      return projects;
     },
     ...mapState({
       projects: (state) => state.projects.list,
diff --git a/src/components/RemainingSeats.vue b/src/components/RemainingSeats.vue
deleted file mode 100644
index 0d4db556f2eb20c3844e4e50d8bd33b6e2dc9dfd..0000000000000000000000000000000000000000
--- a/src/components/RemainingSeats.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <v-container class="remaining-seats text-left px-2">
-    <v-skeleton-loader :loading="loading" type="paragraph@5" class="w-100">
-      <v-card v-if="emptyString">
-        <v-card-title>You currently don't have any classes! </v-card-title>
-        <v-card-text>Your scheduled classes will appear here.</v-card-text>
-      </v-card>
-      <v-container class="px-6" v-else>
-        <div
-          v-for="(item, index) in schedule"
-          :key="index"
-          class="flex-wrap text-left pb-3 row justify-content-center d-flex"
-        >
-          <div class="col-3 d-inline-block class-name">
-            {{ item.name }}
-          </div>
-          <div class="col-5 d-inline-block availability-bar">
-            <div class="pt-2">
-              <v-progress-linear
-                class="availability-bar"
-                rounded
-                background-color="white"
-                height="8px"
-                :value="(100 * item.registeredCount) / item.capacity"
-              ></v-progress-linear>
-            </div>
-          </div>
-          <div class="col-2 d-inline-block">
-            <div class="white-space-nowrap ml-5 mt-1 small-count">
-              {{ item.registeredCount }} / {{ item.capacity }}
-            </div>
-          </div>
-
-          <div class="col-1 d-inline-block gutter" />
-        </div>
-      </v-container>
-    </v-skeleton-loader>
-  </v-container>
-</template>
-
-<script>
-import TrainingService from "@/api/services/training";
-import moment from "moment";
-export default {
-  data: () => ({
-    loading: false,
-    schedule: [],
-    emptyString: false,
-  }),
-  async mounted() {
-    this.params = {
-      registeredCount: true,
-      dateFrom: `${moment().format("YYYY-MM-DD")}`,
-      dateTo: `${moment().add(6, "months").format("YYYY-MM-DD")}`,
-    };
-    try {
-      this.loading = true;
-      const response = await TrainingService.getCourses(this.params);
-      console.log(response);
-      this.schedule = response.courses;
-      if (this.schedule.length === 0) {
-        this.emptyString = true;
-      }
-    } catch (error) {
-      console.error(error);
-    } finally {
-      this.loading = false;
-    }
-  },
-};
-</script>
-
-<style lang="scss">
-.class-name {
-  color: #bdc931;
-}
-
-.small-count {
-  font-size: 10px;
-}
-</style>
diff --git a/src/components/SystemStatusSummary.vue b/src/components/SystemStatusSummary.vue
deleted file mode 100644
index e3ef76d82a1ea866ea243aa38f3a4e55b8bd8510..0000000000000000000000000000000000000000
--- a/src/components/SystemStatusSummary.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <v-container class="status-summary text-center px-8">
-    <ErrorMessage v-if="error" />
-    <div v-else>
-      <div class="support-row d-flex flex-wrap flex-sm-nowrap text-left pb-8">
-        <div class="pr-0 pr-sm-10 text-container pb-3 pb-md-0">
-          <div class="subhead">View Status History</div>
-          Any previous status reports or connection issues
-        </div>
-        <v-spacer class="d-none d-sm-flex" />
-        <v-btn color="secondary" target="_blank" class="mx-auto">
-          View History
-        </v-btn>
-      </div>
-
-      <div class="d-flex flex-column text-left">
-        <v-skeleton-loader :loading="loading" type="list-item-avatar@8">
-          <v-expansion-panels accordion multiple hover>
-            <v-expansion-panel
-              v-for="(system, index) in systemStatus.systems"
-              :key="index"
-            >
-              <v-expansion-panel-header expand-icon="mdi-chevron-right">
-                <div class="d-flex align-items-center">
-                  <v-icon class="icon mr-3">
-                    {{ getIconName(system.name) }}
-                  </v-icon>
-                  {{ system.name }}
-                  <v-spacer />
-                  <div class="mx-6">
-                    <v-tooltip top>
-                      <template v-slot:activator="{ on, attrs }">
-                        <span v-bind="attrs" v-on="on">
-                          <GitLabIcon
-                            class="status-icon mx-4"
-                            :status="getStatusMapping(system.status)"
-                          />
-                        </span>
-                      </template>
-                      <span> Latest Pipeline: {{ system.status }} </span>
-                    </v-tooltip>
-                  </div>
-                </div>
-              </v-expansion-panel-header>
-              <v-expansion-panel-content>
-                <div class="d-flex flex-wrap">
-                  <p v-if="system.description" class="system-description">
-                    {{ system.description }}
-                  </p>
-                  <v-spacer />
-                  <ExternalLink
-                    v-if="system.link"
-                    :href="system.link"
-                    class="mb-4"
-                  >
-                    {{ system.name }}
-                  </ExternalLink>
-                </div>
-                <p class="subhead">Current status</p>
-                <div class="px-4">
-                  <p>
-                    <strong class="text-capitalize" :class="system.status">
-                      {{ system.status }}
-                    </strong>
-                    since
-                    <v-tooltip right>
-                      <template v-slot:activator="{ on, attrs }">
-                        <span v-bind="attrs" v-on="on" class="text-no-wrap">
-                          {{ getIsoDateString(system.lastChange) }}
-                        </span>
-                      </template>
-                      <span>{{ getLocalDateString(system.lastChange) }}</span>
-                    </v-tooltip>
-                  </p>
-                  <p v-if="system.statusDetails">
-                    {{ system.statusDetails }}
-                  </p>
-                </div>
-              </v-expansion-panel-content>
-            </v-expansion-panel>
-          </v-expansion-panels>
-        </v-skeleton-loader>
-      </div>
-    </div>
-  </v-container>
-</template>
-<script>
-import StatusService from "@/api/services/status";
-import ExternalLink from "@/components/ExternalLink";
-import GitLabIcon from "@/components/icons/GitLabIcon";
-import { SET_ERROR_MESSAGE } from "@/store/mutation-types";
-import ErrorMessage from "@/components/APIErrorCard";
-
-export default {
-  components: {
-    ExternalLink,
-    GitLabIcon,
-    ErrorMessage,
-  },
-  data: () => ({
-    loading: false,
-    systemStatus: [],
-    error: false,
-  }),
-  async mounted() {
-    try {
-      this.loading = true;
-      this.systemStatus = await StatusService.getStatusSummary();
-      console.log("this.systemStatus", this.systemStatus);
-    } catch (error) {
-      this.error = true;
-      this.$store.commit(SET_ERROR_MESSAGE, error);
-      console.error(error);
-    } finally {
-      // TODO: remove fake wait
-      setTimeout(() => {
-        this.loading = false;
-      }, 2000);
-    }
-  },
-  methods: {
-    getIconName(systemName) {
-      const iconName = systemName.toLowerCase()?.replace(" ", "-");
-      if (this.$vuetify.icons.values[iconName]) {
-        return `$vuetify.icons.${iconName}`;
-      }
-      return null;
-    },
-    getLocalDateString(millis) {
-      return new Date(millis).toLocaleString();
-    },
-    getIsoDateString(millis) {
-      return new Date(millis).toISOString();
-    },
-    // map our status up/down/degraded to gitlab icon parlance
-    getStatusMapping(status) {
-      if (status === "down") {
-        return "failed";
-      } else if (status === "up") {
-        return "passed";
-      } else {
-        return "warning";
-      }
-    },
-  },
-};
-</script>
-<style lang="scss">
-.status-summary {
-  .support-row {
-    .v-btn {
-      max-width: 160px;
-      width: 160px;
-    }
-    & > * {
-      align-items: center;
-    }
-  }
-
-  .system-description,
-  .text-container {
-    min-width: 200px;
-  }
-
-  .degraded {
-    color: #fc9403;
-  }
-  .down {
-    color: #ff3738;
-  }
-  .up {
-    color: #56f000;
-  }
-}
-</style>
diff --git a/src/router/routes.js b/src/router/routes.js
index 89cf6c5b4eff722e16b85a8fcea35c5e6219c80f..008fc5843c7c786f079b4e7a65a228e7a040c563 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -2,11 +2,20 @@ import NotAuthorizedComponent from "@/components/NotAuthorizedComponent";
 import NotFoundComponent from "@/components/NotFoundComponent";
 import Permission from "@/config/user-permissions";
 
+const importHelper = (importFn) => {
+  return () => {
+    return importFn().catch((error) => {
+      console.error(error);
+      location.reload();
+    });
+  };
+};
+
 export default [
   {
     path: "/",
     name: "Launchboard",
-    component: () => import("@/views/Home.vue"),
+    component: importHelper(() => import("@/views/Home.vue")),
     meta: {
       title: "Platform One: Launchboard",
       bodyClass: "launchboard-page",
@@ -16,8 +25,9 @@ export default [
     path: "/projects",
     name: "Projects",
     // route level code-splitting
-    component: () =>
-      import(/* webpackChunkName: "projects" */ "@/views/Projects.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "projects" */ "@/views/Projects.vue")
+    ),
     meta: {
       title: "Platform One: My Projects",
       bodyClass: "projects-page",
@@ -27,7 +37,9 @@ export default [
     path: "/team",
     name: "Team",
     // route level code-splitting
-    component: () => import(/* webpackChunkName: "team" */ "@/views/Team.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "team" */ "@/views/Team.vue")
+    ),
     meta: {
       title: "Platform One: My Team",
       bodyClass: "team-page",
@@ -37,8 +49,9 @@ export default [
     path: "/resources",
     name: "Resources",
     // route level code-splitting
-    component: () =>
-      import(/* webpackChunkName: "resources" */ "@/views/Resources.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "resources" */ "@/views/Resources.vue")
+    ),
     meta: {
       title: "Platform One: Resources",
       bodyClass: "resources-page",
@@ -48,8 +61,9 @@ export default [
     path: "/help",
     name: "Help Center",
     // route level code-splitting
-    component: () =>
-      import(/* webpackChunkName: "help-center" */ "@/views/HelpCenter.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "help-center" */ "@/views/HelpCenter.vue")
+    ),
     meta: {
       title: "Platform One: Help Center",
       bodyClass: "help-page",
@@ -59,8 +73,9 @@ export default [
     path: "/settings",
     name: "Settings",
     // route level code-splitting
-    component: () =>
-      import(/* webpackChunkName: "settings" */ "@/views/Settings.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "settings" */ "@/views/Settings.vue")
+    ),
     meta: {
       title: "Platform One: Settings",
       bodyClass: "settings-page",
@@ -70,8 +85,9 @@ export default [
   {
     path: "/teams",
     name: "Teams",
-    component: () =>
-      import(/* webpackChunkName: "teams" */ "@/views/super-admin/Teams.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "teams" */ "@/views/super-admin/Teams.vue")
+    ),
     meta: {
       title: "Platform One: Teams",
       bodyClass: "teams-page",
@@ -81,7 +97,9 @@ export default [
   {
     path: "/teams/details/:teamId",
     name: "TeamDetails",
-    component: () => import(/* webpackChunkName: "team" */ "@/views/Team.vue"),
+    component: importHelper(() =>
+      import(/* webpackChunkName: "team" */ "@/views/Team.vue")
+    ),
     meta: {
       title: "Platform One: Team Details",
       bodyClass: "team-page",
@@ -90,10 +108,11 @@ export default [
   {
     path: "/training",
     name: "Courses",
-    component: () =>
+    component: importHelper(() =>
       import(
         /* webpackChunkName: "training" */ "@/views/super-admin/Training.vue"
-      ),
+      )
+    ),
     meta: {
       title: "Platform One: Training",
       bodyClass: "training-page",
@@ -103,10 +122,11 @@ export default [
   {
     path: "/training/details/:trainingId",
     name: "TrainingDetails",
-    component: () =>
+    component: importHelper(() =>
       import(
         /* webpackChunkName: "training-details" */ "@/views/TrainingDetails.vue"
-      ),
+      )
+    ),
     meta: {
       title: "Platform One: Training Details",
       bodyClass: "training-details-page",
@@ -116,10 +136,11 @@ export default [
   {
     path: "/personnel",
     name: "Personnel",
-    component: () =>
+    component: importHelper(() =>
       import(
         /* webpackChunkName: "personnel" */ "@/views/super-admin/Personnel.vue"
-      ),
+      )
+    ),
     meta: {
       title: "Platform One: Personnel",
       bodyClass: "personnel",
diff --git a/src/scss/custom.scss b/src/scss/custom.scss
index 6f57819b909f2e61c2f9aa6e51892069c5b7c79b..becabfe388d3669f624d1b79f733e6ecd74d837e 100644
--- a/src/scss/custom.scss
+++ b/src/scss/custom.scss
@@ -177,9 +177,31 @@ body {
     }
   }
   // custom styles for tables in mobile view
+  .theme--light .lb-mobile-enabled {
+    tr.v-data-table__expanded__content {
+      // background: #010e19;
+      color: #000000;
+      a {
+        &:not(.primary--text) {
+          color: #000000 !important;
+        }
+      }
+    }
+  }
+  .theme--dark .lb-mobile-enabled {
+    tr.v-data-table__expanded__content {
+      background: #010e19;
+      color: #ffffff;
+      a {
+        &:not(.primary--text) {
+          color: #ffffff !important;
+        }
+      }
+    }
+  }
   .lb-mobile-enabled {
     &.lb-mobile-no-checkbox {
-      ::v-deep .v-data-table__wrapper {
+      .v-data-table__wrapper {
         .v-data-table__mobile-table-row {
           > .v-data-table__mobile-row {
             &:nth-child(1) {
@@ -193,7 +215,7 @@ body {
         }
       }
     }
-    ::v-deep .v-data-table__wrapper {
+    .v-data-table__wrapper {
       .v-data-table__mobile-table-row {
         display: flex;
         > .v-data-table__mobile-row {
@@ -211,15 +233,10 @@ body {
       }
     }
     tr.v-data-table__expanded__content {
-      background: #010e19;
-      color: #ffffff;
       td {
         background-color: transparent !important;
       }
       a {
-        &:not(.primary--text) {
-          color: #ffffff !important;
-        }
         &.primary--text {
           color: var(--v-primary-base) !important;
         }
@@ -451,6 +468,9 @@ body {
         background-color: $table-row-even-bg-light;
       }
       table > tbody > tr {
+        .v-expansion-panel-header {
+          background-color: transparent;
+        }
         &:hover:not(.v-data-table__expanded__content):not(.v-data-table__empty-wrapper)
           td {
           background-color: darken($table-row-odd-bg-light, 15%) !important;
@@ -513,6 +533,16 @@ body {
   }
 
   .v-data-table {
+    tr.deleting {
+      opacity: 0.4;
+      pointer-events: none;
+    }
+    .v-skeleton-loader__table-row .v-skeleton-loader__table-cell,
+    .v-skeleton-loader__table-thead .v-skeleton-loader__heading {
+      &:nth-last-child(-n + 2) {
+        display: none;
+      }
+    }
     a:hover:not(.v-btn--icon) {
       text-decoration: underline;
     }
diff --git a/src/store/modules/error.js b/src/store/modules/error.js
index 77f4f1cf61e1a7f1496eca898b03579f4a364406..829ed50f358656b037f22aa9dda686d6a299488a 100644
--- a/src/store/modules/error.js
+++ b/src/store/modules/error.js
@@ -1,5 +1,4 @@
-import { SET_ERROR_MESSAGE } from "@/store/mutation-types";
-import { SET_ERROR_DIALOG } from "@/store/mutation-types";
+import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
 import { GET_ERROR_MESSAGE } from "@/store/getter-types";
 
 // initial state
diff --git a/src/views/Team.vue b/src/views/Team.vue
index e6a44f2976ab0f35cfcb16e383ebfc47a6cc16b0..c3fe4c7f00834c43705505652151eef975de7443 100644
--- a/src/views/Team.vue
+++ b/src/views/Team.vue
@@ -98,15 +98,27 @@
         <v-data-table
           v-else
           id="team-table"
-          :headers="headers"
+          :headers="header"
           :items="team.members"
           v-model="selectedMembers"
           :item-class="itemClass"
           show-select
+          :options.sync="options"
+          :disable-sort="onMobile"
+          :show-expand="onMobile"
+          :expanded.sync="expanded"
+          :hide-default-header="onMobile"
+          calculate-widths
           hide-default-footer
           :multi-sort="false"
-          mobile-breakpoint="800"
-          class="background-transparent position-relative v-table-header"
+          :mobile-breakpoint="mobileBreakpoint"
+          expand-icon="mdi-chevron-right"
+          class="
+            lb-mobile-enabled
+            background-transparent
+            position-relative
+            v-table-header
+          "
         >
           <template v-slot:top>
             <!--
@@ -234,6 +246,27 @@
               </v-btn>
             </div>
           </template>
+          <template v-slot:expanded-item="{ item }" v-if="onMobile">
+            <td class="text-start">
+              <div class="mt-2 ml-10 mt-5 pl-4">
+                <p>{{ item.role }}</p>
+              </div>
+              <div class="mt-2 ml-10 mt-5 pl-4">
+                <a :href="`mailto:${item.email}`">
+                  {{ item.email }}
+                </a>
+              </div>
+              <div class="mt-2 ml-10 mt-5 pl-4">
+                <a
+                  target="_blank"
+                  rel="noopener"
+                  :href="`https://chat.il2.dso.mil/platform-one/messages/@${item.username}`"
+                >
+                  @{{ item.username }}
+                </a>
+              </div>
+            </td>
+          </template>
         </v-data-table>
 
         <v-snackbar
@@ -287,6 +320,7 @@ import inputRules from "@/utils/inputRules";
 import Permission from "@/config/user-permissions";
 import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
 import BaseDialog from "@/components/Dialogs/BaseDialog";
+import { DEFAULT_TABLE_OPTIONS } from "@/config/table-constants";
 
 export default {
   components: {
@@ -327,6 +361,13 @@ export default {
       isAddingBusy: false,
       showAddToCourseDialog: false,
     },
+    mobileBreakpoint: 800,
+    options: DEFAULT_TABLE_OPTIONS,
+    expanded: [],
+    mobileHeaders: [
+      { text: "Name", value: "name", width: "200px" },
+      { text: "", value: "data-table-expand", align: "end" },
+    ],
     headers: [
       { text: "Name", value: "name", width: "200px" },
       { text: "Role", value: "role", width: "200px" },
@@ -521,16 +562,14 @@ export default {
       return !isDuplicate;
     },
     canEdit() {
-      // TODO: pull this from user info
-      return true;
+      return this.permission;
     },
     emailSelectedHref() {
       if (this.selectedMembers.length === 0) {
         return null;
       }
       const emails = this.selectedMembers.map((m) => m.email);
-      const v = `mailto:${emails.join(",")}`;
-      return v;
+      return `mailto:${emails.join(",")}`;
     },
     deletingMessage() {
       if (this.deletingMembers.length > 1) {
@@ -539,6 +578,12 @@ export default {
         return `${this.deletingMembers[0].name} removed from ${this.team.name}`;
       }
     },
+    onMobile() {
+      return this.$vuetify.breakpoint.width < this.mobileBreakpoint;
+    },
+    header() {
+      return this.onMobile ? this.mobileHeaders : this.headers;
+    },
   },
 };
 </script>
@@ -553,18 +598,5 @@ export default {
       margin-top: 1px;
     }
   }
-  tr.deleting {
-    &,
-    td.v-data-table__mobile-row {
-      opacity: 0.5;
-      pointer-events: none;
-    }
-  }
-  .v-skeleton-loader__table-row .v-skeleton-loader__table-cell,
-  .v-skeleton-loader__table-thead .v-skeleton-loader__heading {
-    &:nth-last-child(-n + 2) {
-      display: none;
-    }
-  }
 }
 </style>
diff --git a/src/views/super-admin/Personnel.vue b/src/views/super-admin/Personnel.vue
index e377e397d0d2052b5003e02559c20a6a024def2b..b95c90082342bc556ed65b7d8d73608dd25ed654 100644
--- a/src/views/super-admin/Personnel.vue
+++ b/src/views/super-admin/Personnel.vue
@@ -321,9 +321,4 @@ export default {
     }
   }
 }
-tr.v-data-table__expanded__content {
-  background: #002743 !important;
-  box-shadow: none;
-  color: white;
-}
 </style>
diff --git a/src/views/super-admin/Teams.vue b/src/views/super-admin/Teams.vue
index c2d8608827dffebdcbdc0557310d340adff76a4b..1723db631712d3e6e8d6b62de995c86e604ac320 100644
--- a/src/views/super-admin/Teams.vue
+++ b/src/views/super-admin/Teams.vue
@@ -8,18 +8,24 @@
       >
         <v-data-table
           id="teams-table"
-          :headers="headers"
+          :headers="header"
           :loading="fetchingData"
           :items="teams"
           v-model="selectedTeams"
           :item-class="itemClass"
           :options.sync="options"
+          :disable-sort="onMobile"
+          :show-expand="onMobile"
+          :hide-default-header="onMobile"
           :footer-props="footerProps"
           :server-items-length="total"
+          :expanded.sync="expanded"
+          calculate-widths
           show-select
-          mobile-breakpoint="800"
+          :mobile-breakpoint="mobileBreakpoint"
+          expand-icon="mdi-chevron-right"
           loading-text="Loading Teams ..."
-          class="background-transparent position-relative"
+          class="lb-mobile-enabled background-transparent position-relative"
           :hide-default-footer="teams.length === 0"
         >
           <template v-slot:top>
@@ -112,8 +118,27 @@
               {{ item.endDate }}
             </div>
           </template>
+          <template v-slot:expanded-item="{ item }" v-if="onMobile">
+            <td class="text-start">
+              <div class="row" v-for="lead in item.leads" :key="lead.name">
+                <a
+                  :href="`mailto:${lead.email}`"
+                  target="_blank"
+                  rel="noopener"
+                  class="lead-name col-12"
+                  >{{ lead.name }}</a
+                >
+                <a
+                  :href="`mailto:${lead.email}`"
+                  target="_blank"
+                  rel="noopener"
+                  class="lead-name col-12"
+                  >{{ lead.email }}</a
+                >
+              </div>
+            </td>
+          </template>
         </v-data-table>
-
         <div class="d-flex flex-wrap mt-5 mb-3">
           <v-tooltip top>
             <template v-slot:activator="{ on, attrs }">
@@ -236,6 +261,12 @@ export default {
       isAdding: false,
       isAddingBusy: false,
     },
+    mobileBreakpoint: 800,
+    expanded: [],
+    mobileHeaders: [
+      { text: "Name", value: "name", width: "200px" },
+      { text: "", value: "data-table-expand", align: "end" },
+    ],
     headers: [
       { text: "Team", value: "name", fixed: true, width: "200px" },
       { text: "POC", value: "poc", width: "200px" },
@@ -405,6 +436,12 @@ export default {
         return `${this.deletingTeams[0].name} removed`;
       }
     },
+    onMobile() {
+      return this.$vuetify.breakpoint.width < this.mobileBreakpoint;
+    },
+    header() {
+      return this.onMobile ? this.mobileHeaders : this.headers;
+    },
   },
 };
 </script>
diff --git a/src/views/super-admin/Training.vue b/src/views/super-admin/Training.vue
index 7132ee8ff2f71986a42c082b16f02c10de519ba0..09d5bb5b83a0df061f227ceccde02dce59b7c853 100644
--- a/src/views/super-admin/Training.vue
+++ b/src/views/super-admin/Training.vue
@@ -19,7 +19,7 @@
           :disable-sort="onMobile"
           calculate-widths
           loading-text="Loading Courses..."
-          class="background-transparent position-relative lb-mobile-enabled"
+          class="lb-mobile-enabled background-transparent position-relative"
           :show-expand="onMobile"
           :expanded.sync="expanded"
           :hide-default-footer="courses.length === 0"
@@ -634,16 +634,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 #training-table {
-  tr.deleting {
-    opacity: 0.4;
-    pointer-events: none;
-  }
-  .v-skeleton-loader__table-row .v-skeleton-loader__table-cell,
-  .v-skeleton-loader__table-thead .v-skeleton-loader__heading {
-    &:nth-last-child(-n + 2) {
-      display: none;
-    }
-  }
   .availability-bar {
     min-width: 120px;
     width: 120px;
diff --git a/tests/unit/api/services/status.spec.js b/tests/unit/api/services/status.spec.js
deleted file mode 100644
index 7ba665ef5665991ed4f9141c5a4023d38801eada..0000000000000000000000000000000000000000
--- a/tests/unit/api/services/status.spec.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import StatusService from "../../../../src/api/services/status";
-import { HTTP } from "@/api/mock-http-common";
-
-describe("services/status", () => {
-  describe("should call HTTP", () => {
-    test("getStatusSummary", async () => {
-      HTTP.get = jest.fn().mockResolvedValue({ test: "test" });
-      await StatusService.getStatusSummary();
-      expect(HTTP.get).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/tests/unit/components/AllCurriculumSchedule.spec.js b/tests/unit/components/AllCurriculumSchedule.spec.js
deleted file mode 100644
index 9d00d60455bcc74bf0440a8adc6e527701a126a6..0000000000000000000000000000000000000000
--- a/tests/unit/components/AllCurriculumSchedule.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import TrainingService from "@/api/services/training";
-import AllCurriculumSchedule from "@/components/AllCurriculumSchedule.vue";
-import flushPromises from "flush-promises";
-
-describe("AllCurriculumSchedule", () => {
-  it("should get schedule from api", async () => {
-    const mockSchedule = [{ name: "course1" }, { name: "course2" }];
-    TrainingService.getCourses = jest
-      .fn()
-      .mockResolvedValue({ courses: mockSchedule });
-
-    const wrapper = shallowMount(AllCurriculumSchedule);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.schedule).toEqual(mockSchedule);
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-
-  it("should set loading to false on error", async () => {
-    console.error = jest.fn(); // mock console.error when expecting error messages
-    TrainingService.getCourses = jest.fn().mockRejectedValue("mock error");
-
-    const wrapper = shallowMount(AllCurriculumSchedule);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-
-  it("should set emptyString to true", async () => {
-    TrainingService.getCourses = jest.fn().mockResolvedValue({ courses: [] });
-
-    const wrapper = shallowMount(AllCurriculumSchedule);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.schedule).toEqual([]);
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-});
diff --git a/tests/unit/components/CurriculumSchedule.spec.js b/tests/unit/components/CurriculumSchedule.spec.js
index 3cac505e8ec01e923dbed0ccce95698fd435309a..fcc48904e7487bab8f8c610786e30877e0886c72 100644
--- a/tests/unit/components/CurriculumSchedule.spec.js
+++ b/tests/unit/components/CurriculumSchedule.spec.js
@@ -3,6 +3,8 @@ import ScheduleService from "@/api/services/schedule";
 import CurriculumSchedule from "@/components/CurriculumSchedule.vue";
 import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
 import flushPromises from "flush-promises";
+import Vuetify from "vuetify";
+const vuetify = new Vuetify();
 
 describe("CurriculumSchedule", () => {
   const mockSchedule = [
@@ -16,7 +18,7 @@ describe("CurriculumSchedule", () => {
       .fn()
       .mockResolvedValue({ registrations: mockSchedule });
 
-    const wrapper = shallowMount(CurriculumSchedule);
+    const wrapper = shallowMount(CurriculumSchedule, { vuetify });
     expect(wrapper.vm.loading).toEqual(true);
     await flushPromises();
     expect(wrapper.vm.registrations).toEqual(mockSchedule);
@@ -27,7 +29,7 @@ describe("CurriculumSchedule", () => {
     console.error = jest.fn(); // mock console.error when expecting error messages
     ScheduleService.getScheduleForUser = jest.fn().mockRejectedValue(mockError);
 
-    const wrapper = shallowMount(CurriculumSchedule);
+    const wrapper = shallowMount(CurriculumSchedule, { vuetify });
     expect(wrapper.vm.loading).toEqual(true);
     await flushPromises();
     expect(wrapper.vm.loading).toEqual(false);
@@ -42,6 +44,7 @@ describe("CurriculumSchedule", () => {
       mocks: {
         $store: { commit: mockCommit },
       },
+      vuetify,
     });
     await flushPromises();
 
@@ -68,6 +71,7 @@ describe("CurriculumSchedule", () => {
           },
         },
       },
+      vuetify,
     });
     wrapper.vm.getCertificate(mockCourse);
     await flushPromises();
@@ -100,6 +104,7 @@ describe("CurriculumSchedule", () => {
           },
         },
       },
+      vuetify,
     });
     wrapper.vm.getCertificate(mockCourse);
     await flushPromises();
diff --git a/tests/unit/components/Dialogs/DialogComponents/UserSelectForCourse.spec.js b/tests/unit/components/Dialogs/DialogComponents/UserSelectForCourse.spec.js
index 22ca9da465201b9f1e66efd8ae60a9f6db09afd8..365eed1e3b1fee570550a681c7a6eeea082eb44b 100644
--- a/tests/unit/components/Dialogs/DialogComponents/UserSelectForCourse.spec.js
+++ b/tests/unit/components/Dialogs/DialogComponents/UserSelectForCourse.spec.js
@@ -66,7 +66,6 @@ describe("UserSelectForCourse", () => {
     });
 
     expect(wrapper.vm.selectedMembers).toEqual([]);
-    expect(typeof wrapper.vm.updateCourseMembers).toEqual("function");
   });
   it("test forceUserSelectHint remaining seats", async () => {
     const wrapper = shallowMount(UserSelectForCourse, {
diff --git a/tests/unit/components/InstructorCourses.spec.js b/tests/unit/components/InstructorCourses.spec.js
deleted file mode 100644
index 10d7f8c025c2514d0f99ff221f5df8ff4b7e0a7c..0000000000000000000000000000000000000000
--- a/tests/unit/components/InstructorCourses.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import TrainingService from "@/api/services/training";
-import InstructorCourses from "@/components/InstructorCourses.vue";
-import flushPromises from "flush-promises";
-
-describe("InstructorCourses", () => {
-  it("should get courses from api", async () => {
-    const mockSchedule = [{ name: "course1" }, { name: "course2" }];
-    TrainingService.getCourses = jest
-      .fn()
-      .mockResolvedValue({ courses: mockSchedule });
-
-    const wrapper = shallowMount(InstructorCourses);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.schedule).toEqual(mockSchedule);
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-
-  it("should set loading to false on error", async () => {
-    console.error = jest.fn(); // mock console.error when expecting error messages
-    TrainingService.getCourses = jest.fn().mockRejectedValue("mock error");
-
-    const wrapper = shallowMount(InstructorCourses);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-
-  it("should set emptyString to true", async () => {
-    TrainingService.getCourses = jest.fn().mockResolvedValue({ courses: [] });
-
-    const wrapper = shallowMount(InstructorCourses);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.schedule).toEqual([]);
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-});
diff --git a/tests/unit/components/RemainingSeats.spec.js b/tests/unit/components/RemainingSeats.spec.js
deleted file mode 100644
index 2f4628b617ae91fb3fc38e918a18d5b12c364bf8..0000000000000000000000000000000000000000
--- a/tests/unit/components/RemainingSeats.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import TrainingService from "@/api/services/training";
-import RemainingSeats from "@/components/RemainingSeats.vue";
-import flushPromises from "flush-promises";
-
-describe("RemainingSeats", () => {
-  it("should get schedule from api", async () => {
-    const mockSchedule = [{ name: "course1" }, { name: "course2" }];
-    TrainingService.getCourses = jest
-      .fn()
-      .mockResolvedValue({ courses: mockSchedule });
-
-    const wrapper = shallowMount(RemainingSeats);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.schedule).toEqual(mockSchedule);
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-
-  it("should set loading to false on error", async () => {
-    console.error = jest.fn(); // mock console.error when expecting error messages
-    TrainingService.getCourses = jest.fn().mockRejectedValue("mock error");
-
-    const wrapper = shallowMount(RemainingSeats);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-
-  it("should set emptyString to true", async () => {
-    TrainingService.getCourses = jest.fn().mockResolvedValue({ courses: [] });
-
-    const wrapper = shallowMount(RemainingSeats);
-    expect(wrapper.vm.loading).toEqual(true);
-    await flushPromises();
-    expect(wrapper.vm.schedule).toEqual([]);
-    expect(wrapper.vm.loading).toEqual(false);
-  });
-});
diff --git a/tests/unit/components/SystemStatusSummary.spec.js b/tests/unit/components/SystemStatusSummary.spec.js
deleted file mode 100644
index 013d59088fce2d9d7b1d143595ad7240f9d6c9f6..0000000000000000000000000000000000000000
--- a/tests/unit/components/SystemStatusSummary.spec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Vuex from "vuex";
-import Vuetify from "vuetify";
-import { shallowMount, createLocalVue } from "@vue/test-utils";
-import SystemStatusSummary from "@/components/SystemStatusSummary";
-
-const vuetify = new Vuetify();
-const localVue = createLocalVue();
-localVue.use(Vuex);
-
-test("SystemStatusSummary", () => {
-  // render the component
-  const wrapper = shallowMount(SystemStatusSummary, {
-    mocks: {
-      $store: {
-        state: {
-          error: {},
-        },
-      },
-    },
-    localVue,
-    vuetify,
-  });
-
-  // assert the component loads without error
-  expect(wrapper.find(".error").exists()).toBe(false);
-});
diff --git a/tests/unit/views/admin/LaunchboardAdmin.spec.js b/tests/unit/views/admin/LaunchboardAdmin.spec.js
deleted file mode 100644
index f948cbc9dd45a2dc4bdc8b63421e4b7b35f52c91..0000000000000000000000000000000000000000
--- a/tests/unit/views/admin/LaunchboardAdmin.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { shallowMount, createLocalVue } from "@vue/test-utils";
-import Vuex from "vuex";
-import LaunchboardSuperAdmin from "@/views/super-admin/LaunchboardSuperAdmin.vue";
-
-const localVue = createLocalVue();
-localVue.use(Vuex);
-
-describe("LaunchboardAdmin", () => {
-  it("should get user from store", async () => {
-    const wrapper = shallowMount(
-      LaunchboardSuperAdmin,
-      {
-        mocks: {
-          $store: {
-            state: {
-              error: {},
-              user: {
-                user: { name: "mock user" },
-              },
-              userPreferences: { userPreference: {} },
-            },
-            commit: jest.fn(),
-          },
-        },
-      },
-      localVue
-    );
-    console.log("store", wrapper.vm.$store);
-    expect(wrapper.vm.user.name).toEqual("mock user");
-  });
-});
diff --git a/tests/unit/views/super-admin/Teams.spec.js b/tests/unit/views/super-admin/Teams.spec.js
index 29e0955457f98546a74fa128864bcdc302a54638..c7859eb593a658d6f2357378b47749b91827c932 100644
--- a/tests/unit/views/super-admin/Teams.spec.js
+++ b/tests/unit/views/super-admin/Teams.spec.js
@@ -4,7 +4,8 @@ import TeamService from "@/api/services/team";
 import Vuex from "vuex";
 import { SET_ERROR_MESSAGE } from "@/store/mutation-types";
 import Vue from "vue";
-
+import Vuetify from "vuetify";
+const vuetify = new Vuetify();
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
@@ -16,20 +17,18 @@ describe("Teams", () => {
     TeamService.getTeams = jest
       .fn()
       .mockResolvedValue({ teams: [], meta: { total: 0 } });
-    const wrapper = shallowMount(
-      Teams,
-      {
-        mocks: {
-          $store: {
-            state: {
-              error: {},
-            },
-            commit: jest.fn(),
+    const wrapper = shallowMount(Teams, {
+      mocks: {
+        $store: {
+          state: {
+            error: {},
           },
+          commit: jest.fn(),
         },
       },
-      localVue
-    );
+      localVue,
+      vuetify,
+    });
     wrapper.vm.fetchDebounced();
     wrapper.vm.fetchDebounced();
     wrapper.vm.fetchDebounced();
@@ -55,20 +54,18 @@ describe("Teams", () => {
     console.error = jest.fn();
     TeamService.getTeams = jest.fn().mockRejectedValue("mock error");
 
-    const wrapper = shallowMount(
-      Teams,
-      {
-        mocks: {
-          $store: {
-            state: {
-              error: {},
-            },
-            commit: jest.fn(),
+    const wrapper = shallowMount(Teams, {
+      mocks: {
+        $store: {
+          state: {
+            error: {},
           },
+          commit: jest.fn(),
         },
       },
-      localVue
-    );
+      localVue,
+      vuetify,
+    });
     wrapper.vm.fetchData();
 
     // wait for debounce to trigger
@@ -87,20 +84,18 @@ describe("Teams", () => {
   it("should add team", async () => {
     TeamService.addTeam = jest.fn().mockResolvedValue({ id: 1 });
     TeamService.addMembers = jest.fn().mockResolvedValue();
-    const wrapper = shallowMount(
-      Teams,
-      {
-        mocks: {
-          $store: {
-            state: {
-              error: {},
-            },
-            commit: jest.fn(),
+    const wrapper = shallowMount(Teams, {
+      mocks: {
+        $store: {
+          state: {
+            error: {},
           },
+          commit: jest.fn(),
         },
       },
-      localVue
-    );
+      localVue,
+      vuetify,
+    });
     const mockTeam = { name: "mock team" };
     const mockTeamMember = [{ name: "mock member" }];
     await wrapper.vm.addTeam(mockTeam, mockTeamMember);
@@ -128,20 +123,18 @@ describe("Teams", () => {
   it("should remove selected teams", async () => {
     TeamService.deleteTeams = jest.fn().mockResolvedValue([1, 2]);
 
-    const wrapper = shallowMount(
-      Teams,
-      {
-        mocks: {
-          $store: {
-            state: {
-              error: {},
-            },
-            commit: jest.fn(),
+    const wrapper = shallowMount(Teams, {
+      mocks: {
+        $store: {
+          state: {
+            error: {},
           },
+          commit: jest.fn(),
         },
       },
-      localVue
-    );
+      localVue,
+      vuetify,
+    });
     const mockTeams = [
       { name: "mock team1", id: 1 },
       { name: "mock team2", id: 2 },
@@ -164,14 +157,14 @@ describe("Teams", () => {
     expect(wrapper.vm.selectedTeams).toHaveLength(0);
   });
   it("should compute css class for teams", async () => {
-    const wrapper = shallowMount(Teams);
+    const wrapper = shallowMount(Teams, { vuetify });
 
     expect(wrapper.vm.itemClass({})).toEqual([]);
     expect(wrapper.vm.itemClass({ isDeleting: true })).toEqual(["deleting"]);
   });
 
   it("should compute deletingMessage", async () => {
-    const wrapper = shallowMount(Teams);
+    const wrapper = shallowMount(Teams, { vuetify });
 
     wrapper.vm.deletingTeams = [{ name: "mock team 1" }];
     expect(wrapper.vm.deletingMessage).toEqual("mock team 1 removed");
@@ -184,20 +177,18 @@ describe("Teams", () => {
     expect(wrapper.vm.deletingMessage).toEqual("3 teams removed");
   });
   it("should undo delete", async () => {
-    const wrapper = shallowMount(
-      Teams,
-      {
-        mocks: {
-          $store: {
-            state: {
-              error: {},
-            },
-            commit: jest.fn(),
+    const wrapper = shallowMount(Teams, {
+      mocks: {
+        $store: {
+          state: {
+            error: {},
           },
+          commit: jest.fn(),
         },
       },
-      localVue
-    );
+      localVue,
+      vuetify,
+    });
 
     TeamService.addTeams = jest.fn().mockResolvedValue();
 
@@ -218,7 +209,7 @@ describe("Teams", () => {
   });
 
   it("should fetch on options change", async () => {
-    const wrapper = shallowMount(Teams);
+    const wrapper = shallowMount(Teams, { vuetify });
     wrapper.vm.fetchDebounced = jest.fn();
 
     wrapper.vm.filter.search = "mock search";