diff --git a/client/package-lock.json b/client/package-lock.json
index 10887b8a..7bdf4d31 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -31,9 +31,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz",
-      "integrity": "sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
+      "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
       "dev": true
     },
     "@babel/core": {
@@ -83,9 +83,9 @@
       }
     },
     "@babel/eslint-parser": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.5.tgz",
-      "integrity": "sha512-20BlOHuGf3UXS7z1QPyllM9Gz8SEgcp/UcKeUmdHIFZO6HF1n+3KaLpeyfwWvjY/Os/ynPX3k8qXE/nZ5dw/0g==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz",
+      "integrity": "sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ==",
       "dev": true,
       "requires": {
         "eslint-scope": "^5.1.1",
@@ -246,9 +246,9 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz",
-      "integrity": "sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.14.5"
@@ -443,9 +443,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz",
-      "integrity": "sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
+      "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
       "dev": true
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
@@ -460,9 +460,9 @@
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.5.tgz",
-      "integrity": "sha512-tbD/CG3l43FIXxmu4a7RBe4zH7MLJ+S/lFowPFO7HetS2hyOZ/0nnnznegDuzFzfkyQYTxqdTH/hKmuBngaDAA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz",
+      "integrity": "sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5",
@@ -552,12 +552,12 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.5.tgz",
-      "integrity": "sha512-VzMyY6PWNPPT3pxc5hi9LloKNr4SSrVCg7Yr6aZpW4Ym07r7KqSU/QXYwjXLVxqwSv0t/XSXkFoKBPUkZ8vb2A==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.14.5",
+        "@babel/compat-data": "^7.14.7",
         "@babel/helper-compilation-targets": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
@@ -842,9 +842,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.5.tgz",
-      "integrity": "sha512-wU9tYisEbRMxqDezKUqC9GleLycCRoUsai9ddlsq54r8QRLaeEhc+d+9DqCG+kV9W2GgQjTZESPTpn5bAFMDww==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -963,9 +963,9 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.5.tgz",
-      "integrity": "sha512-+Xe5+6MWFo311U8SchgeX5c1+lJM+eZDBZgD+tvXu9VVQPXwwVzeManMMjYX6xw2HczngfOSZjoFYKwdeB/Jvw==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz",
+      "integrity": "sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==",
       "dev": true,
       "requires": {
         "@babel/helper-create-regexp-features-plugin": "^7.14.5"
@@ -1166,17 +1166,17 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.5.tgz",
-      "integrity": "sha512-ci6TsS0bjrdPpWGnQ+m4f+JSSzDKlckqKIJJt9UZ/+g7Zz9k0N8lYU8IeLg/01o2h8LyNZDMLGgRLDTxpudLsA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz",
+      "integrity": "sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.14.5",
+        "@babel/compat-data": "^7.14.7",
         "@babel/helper-compilation-targets": "^7.14.5",
         "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/helper-validator-option": "^7.14.5",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
-        "@babel/plugin-proposal-async-generator-functions": "^7.14.5",
+        "@babel/plugin-proposal-async-generator-functions": "^7.14.7",
         "@babel/plugin-proposal-class-properties": "^7.14.5",
         "@babel/plugin-proposal-class-static-block": "^7.14.5",
         "@babel/plugin-proposal-dynamic-import": "^7.14.5",
@@ -1185,7 +1185,7 @@
         "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
         "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
         "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
         "@babel/plugin-proposal-optional-chaining": "^7.14.5",
         "@babel/plugin-proposal-private-methods": "^7.14.5",
@@ -1211,7 +1211,7 @@
         "@babel/plugin-transform-block-scoping": "^7.14.5",
         "@babel/plugin-transform-classes": "^7.14.5",
         "@babel/plugin-transform-computed-properties": "^7.14.5",
-        "@babel/plugin-transform-destructuring": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
         "@babel/plugin-transform-dotall-regex": "^7.14.5",
         "@babel/plugin-transform-duplicate-keys": "^7.14.5",
         "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
@@ -1223,7 +1223,7 @@
         "@babel/plugin-transform-modules-commonjs": "^7.14.5",
         "@babel/plugin-transform-modules-systemjs": "^7.14.5",
         "@babel/plugin-transform-modules-umd": "^7.14.5",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.7",
         "@babel/plugin-transform-new-target": "^7.14.5",
         "@babel/plugin-transform-object-super": "^7.14.5",
         "@babel/plugin-transform-parameters": "^7.14.5",
@@ -1231,7 +1231,7 @@
         "@babel/plugin-transform-regenerator": "^7.14.5",
         "@babel/plugin-transform-reserved-words": "^7.14.5",
         "@babel/plugin-transform-shorthand-properties": "^7.14.5",
-        "@babel/plugin-transform-spread": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
         "@babel/plugin-transform-sticky-regex": "^7.14.5",
         "@babel/plugin-transform-template-literals": "^7.14.5",
         "@babel/plugin-transform-typeof-symbol": "^7.14.5",
@@ -1242,7 +1242,7 @@
         "babel-plugin-polyfill-corejs2": "^0.2.2",
         "babel-plugin-polyfill-corejs3": "^0.2.2",
         "babel-plugin-polyfill-regenerator": "^0.2.2",
-        "core-js-compat": "^3.14.0",
+        "core-js-compat": "^3.15.0",
         "semver": "^6.3.0"
       },
       "dependencies": {
@@ -1302,19 +1302,19 @@
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
-      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz",
+      "integrity": "sha512-Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA==",
       "dev": true,
       "requires": {
-        "core-js-pure": "^3.14.0",
+        "core-js-pure": "^3.15.0",
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/standalone": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.6.tgz",
-      "integrity": "sha512-oAoSp82jhJFnXKybKTOj5QF04XxiDRyiiqrFToiU1udlBXuZoADlPmmnOcuqBrZxSNNUjzJIVK8vt838Qoqjxg==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.7.tgz",
+      "integrity": "sha512-7RlfMPR4604SbYpj5zvs2ZK587hVhixgU9Pd9Vs8lB8KYtT3U0apXSf0vZXhy8XRh549eUmJOHXhWKTO3ObzOQ==",
       "dev": true
     },
     "@babel/template": {
@@ -1329,9 +1329,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz",
-      "integrity": "sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
+      "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.5",
@@ -1339,7 +1339,7 @@
         "@babel/helper-function-name": "^7.14.5",
         "@babel/helper-hoist-variables": "^7.14.5",
         "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.5",
+        "@babel/parser": "^7.14.7",
         "@babel/types": "^7.14.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -1502,13 +1502,13 @@
       }
     },
     "@formatjs/cli": {
-      "version": "4.2.20",
-      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-4.2.20.tgz",
-      "integrity": "sha512-KPJZP/1QvjK3juuEuQ96ETB7uhP9SGxT0L1VoeYu464KvLk5LLVd05D09m4b3mrAztfQ1KImHndfGFlfKhzv+Q==",
+      "version": "4.2.21",
+      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-4.2.21.tgz",
+      "integrity": "sha512-6F5ih85ROyhPkXKTNmgHdQ/LemfRYXgyZtv5AOXQ47OIOOKSn0ZaTMC7cUvVS0cga0Rmg2OByaiyzIj5FV21Rw==",
       "dev": true,
       "requires": {
         "@formatjs/icu-messageformat-parser": "2.0.6",
-        "@formatjs/ts-transformer": "3.4.2",
+        "@formatjs/ts-transformer": "3.4.3",
         "@types/json-stable-stringify": "^1.0.32",
         "@types/lodash": "^4.14.150",
         "@types/node": "14",
@@ -1526,9 +1526,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.17.3",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-          "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+          "version": "14.17.4",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
+          "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
           "dev": true
         }
       }
@@ -1615,14 +1615,13 @@
       "dev": true
     },
     "@formatjs/ts-transformer": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.2.tgz",
-      "integrity": "sha512-mESlb/dMi8hEjiPvUyrHFlA41aJY0cR1BlS0rTKCrqdwjgM9xl8u6hxn4Z2xPEfBW1pw+bwbam8QsvduEEbgRQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.4.3.tgz",
+      "integrity": "sha512-CmsE+0rpGucWfK/cdVJ4oUfO7LbFJflGwJ6/U122wZhxRs59xcThUIRBBX7HU7Hx1BhtPa3LSW9QJc41D73tpQ==",
       "dev": true,
       "requires": {
         "@formatjs/icu-messageformat-parser": "2.0.6",
-        "tslib": "^2.1.0",
-        "typescript": "^4.0"
+        "tslib": "^2.1.0"
       }
     },
     "@gatsbyjs/reach-router": {
@@ -2032,15 +2031,15 @@
       }
     },
     "@jest/core": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.4.tgz",
-      "integrity": "sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.5.tgz",
+      "integrity": "sha512-g73//jF0VwsOIrWUC9Cqg03lU3QoAMFxVjsm6n6yNmwZcQPN/o8w+gLWODw5VfKNFZT38otXHWxc6b8eGDUpEA==",
       "dev": true,
       "requires": {
         "@jest/console": "^27.0.2",
-        "@jest/reporters": "^27.0.4",
+        "@jest/reporters": "^27.0.5",
         "@jest/test-result": "^27.0.2",
-        "@jest/transform": "^27.0.2",
+        "@jest/transform": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -2049,15 +2048,15 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-changed-files": "^27.0.2",
-        "jest-config": "^27.0.4",
-        "jest-haste-map": "^27.0.2",
+        "jest-config": "^27.0.5",
+        "jest-haste-map": "^27.0.5",
         "jest-message-util": "^27.0.2",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.4",
-        "jest-resolve-dependencies": "^27.0.4",
-        "jest-runner": "^27.0.4",
-        "jest-runtime": "^27.0.4",
-        "jest-snapshot": "^27.0.4",
+        "jest-resolve": "^27.0.5",
+        "jest-resolve-dependencies": "^27.0.5",
+        "jest-runner": "^27.0.5",
+        "jest-runtime": "^27.0.5",
+        "jest-snapshot": "^27.0.5",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "jest-watcher": "^27.0.2",
@@ -2102,12 +2101,12 @@
       }
     },
     "@jest/environment": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.3.tgz",
-      "integrity": "sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.5.tgz",
+      "integrity": "sha512-IAkJPOT7bqn0GiX5LPio6/e1YpcmLbrd8O5EFYpAOZ6V+9xJDsXjdgN2vgv9WOKIs/uA1kf5WeD96HhlBYO+FA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^27.0.3",
+        "@jest/fake-timers": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/node": "*",
         "jest-mock": "^27.0.3"
@@ -2138,9 +2137,9 @@
       }
     },
     "@jest/fake-timers": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.3.tgz",
-      "integrity": "sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.5.tgz",
+      "integrity": "sha512-d6Tyf7iDoKqeUdwUKrOBV/GvEZRF67m7lpuWI0+SCD9D3aaejiOQZxAOxwH2EH/W18gnfYaBPLi0VeTGBHtQBg==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.0.2",
@@ -2176,12 +2175,12 @@
       }
     },
     "@jest/globals": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.3.tgz",
-      "integrity": "sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.5.tgz",
+      "integrity": "sha512-qqKyjDXUaZwDuccpbMMKCCMBftvrbXzigtIsikAH/9ca+kaae8InP2MDf+Y/PdCSMuAsSpHS6q6M25irBBUh+Q==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.3",
+        "@jest/environment": "^27.0.5",
         "@jest/types": "^27.0.2",
         "expect": "^27.0.2"
       },
@@ -2211,15 +2210,15 @@
       }
     },
     "@jest/reporters": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.4.tgz",
-      "integrity": "sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.5.tgz",
+      "integrity": "sha512-4uNg5+0eIfRafnpgu3jCZws3NNcFzhu5JdRd1mKQ4/53+vkIqwB6vfZ4gn5BdGqOaLtYhlOsPaL5ATkKzyBrJw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^27.0.2",
         "@jest/test-result": "^27.0.2",
-        "@jest/transform": "^27.0.2",
+        "@jest/transform": "^27.0.5",
         "@jest/types": "^27.0.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
@@ -2231,15 +2230,15 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.0.2",
-        "jest-resolve": "^27.0.4",
+        "jest-haste-map": "^27.0.5",
+        "jest-resolve": "^27.0.5",
         "jest-util": "^27.0.2",
         "jest-worker": "^27.0.2",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^7.0.0"
+        "v8-to-istanbul": "^8.0.0"
       },
       "dependencies": {
         "@jest/types": {
@@ -2314,21 +2313,21 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz",
-      "integrity": "sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.5.tgz",
+      "integrity": "sha512-opztnGs+cXzZ5txFG2+omBaV5ge/0yuJNKbhE3DREMiXE0YxBuzyEa6pNv3kk2JuucIlH2Xvgmn9kEEHSNt/SA==",
       "dev": true,
       "requires": {
         "@jest/test-result": "^27.0.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.2",
-        "jest-runtime": "^27.0.4"
+        "jest-haste-map": "^27.0.5",
+        "jest-runtime": "^27.0.5"
       }
     },
     "@jest/transform": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.2.tgz",
-      "integrity": "sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.5.tgz",
+      "integrity": "sha512-lBD6OwKXSc6JJECBNk4mVxtSVuJSBsQrJ9WCBisfJs7EZuYq4K6vM9HmoB7hmPiLIDGeyaerw3feBV/bC4z8tg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
@@ -2338,7 +2337,7 @@
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.2",
+        "jest-haste-map": "^27.0.5",
         "jest-regex-util": "^27.0.1",
         "jest-util": "^27.0.2",
         "micromatch": "^4.0.4",
@@ -2391,9 +2390,9 @@
       "integrity": "sha1-zlblOfg1UrWNENZy6k1vya3HsjQ="
     },
     "@mapbox/mapbox-gl-style-spec": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.20.0.tgz",
-      "integrity": "sha512-66d9vIPuKDI5IKq/l6s+oTD2DIufo+ONyQ9TZ5muGPJ/scO7ZJ+aWOLUjV1RUsgRqgJCq3a4Ba8Z0fDOWRcxKQ==",
+      "version": "13.20.1",
+      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.20.1.tgz",
+      "integrity": "sha512-xVCJ3IbKoPwcPrxxtGAxUqHEVxXi1hnJtLIFqgkuZfnzj0KeRbk3dZlDr/KNo1/doJjIoFgPFUO/HMOT+wXGPA==",
       "requires": {
         "@mapbox/jsonlint-lines-primitives": "~2.0.2",
         "@mapbox/point-geometry": "^0.1.0",
@@ -2427,12 +2426,6 @@
       "integrity": "sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==",
       "dev": true
     },
-    "@mikaelkristiansson/domready": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@mikaelkristiansson/domready/-/domready-1.0.11.tgz",
-      "integrity": "sha512-nEBLOa0JgtqahmPrnJZ18epLiFBzxhdKgo4uhN3TaBFRmM30pEVrS9FAEV4tg92d8PTdU+dYQx2lnpPyFMgMcg==",
-      "dev": true
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2941,9 +2934,9 @@
       }
     },
     "@types/node": {
-      "version": "15.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-      "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==",
+      "version": "15.12.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.4.tgz",
+      "integrity": "sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==",
       "dev": true
     },
     "@types/node-fetch": {
@@ -3026,9 +3019,9 @@
       }
     },
     "@types/react-dom": {
-      "version": "17.0.7",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.7.tgz",
-      "integrity": "sha512-Wd5xvZRlccOrCTej8jZkoFZuZRKHzanDDv1xglI33oBNFMWrqOSzrvWFw7ngSiZjrpJAzPKFtX7JvuXpkNmQHA==",
+      "version": "17.0.8",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.8.tgz",
+      "integrity": "sha512-0ohAiJAx1DAUEcY9UopnfwCE9sSMDGnY/oXjWMax6g3RpzmTt2GMyMVAXcbn0mo8XAff0SbQJl2/SBU+hjSZ1A==",
       "dev": true,
       "requires": {
         "@types/react": "*"
@@ -3167,71 +3160,70 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz",
-      "integrity": "sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz",
+      "integrity": "sha512-KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.27.0",
-        "@typescript-eslint/scope-manager": "4.27.0",
+        "@typescript-eslint/experimental-utils": "4.28.0",
+        "@typescript-eslint/scope-manager": "4.28.0",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
-        "lodash": "^4.17.21",
         "regexpp": "^3.1.0",
         "semver": "^7.3.5",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz",
-      "integrity": "sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz",
+      "integrity": "sha512-9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.27.0",
-        "@typescript-eslint/types": "4.27.0",
-        "@typescript-eslint/typescript-estree": "4.27.0",
+        "@typescript-eslint/scope-manager": "4.28.0",
+        "@typescript-eslint/types": "4.28.0",
+        "@typescript-eslint/typescript-estree": "4.28.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.27.0.tgz",
-      "integrity": "sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.0.tgz",
+      "integrity": "sha512-7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.27.0",
-        "@typescript-eslint/types": "4.27.0",
-        "@typescript-eslint/typescript-estree": "4.27.0",
+        "@typescript-eslint/scope-manager": "4.28.0",
+        "@typescript-eslint/types": "4.28.0",
+        "@typescript-eslint/typescript-estree": "4.28.0",
         "debug": "^4.3.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz",
-      "integrity": "sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz",
+      "integrity": "sha512-eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.27.0",
-        "@typescript-eslint/visitor-keys": "4.27.0"
+        "@typescript-eslint/types": "4.28.0",
+        "@typescript-eslint/visitor-keys": "4.28.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.27.0.tgz",
-      "integrity": "sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.0.tgz",
+      "integrity": "sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz",
-      "integrity": "sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz",
+      "integrity": "sha512-m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.27.0",
-        "@typescript-eslint/visitor-keys": "4.27.0",
+        "@typescript-eslint/types": "4.28.0",
+        "@typescript-eslint/visitor-keys": "4.28.0",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -3240,50 +3232,51 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz",
-      "integrity": "sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==",
+      "version": "4.28.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz",
+      "integrity": "sha512-PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.27.0",
+        "@typescript-eslint/types": "4.28.0",
         "eslint-visitor-keys": "^2.0.0"
       }
     },
     "@vue/compiler-core": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.1.tgz",
-      "integrity": "sha512-Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz",
+      "integrity": "sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.12.0",
         "@babel/types": "^7.12.0",
-        "@vue/shared": "3.1.1",
+        "@vue/shared": "3.1.2",
         "estree-walker": "^2.0.1",
         "source-map": "^0.6.1"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz",
-      "integrity": "sha512-nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz",
+      "integrity": "sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==",
       "dev": true,
       "requires": {
-        "@vue/compiler-core": "3.1.1",
-        "@vue/shared": "3.1.1"
+        "@vue/compiler-core": "3.1.2",
+        "@vue/shared": "3.1.2"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.1.1.tgz",
-      "integrity": "sha512-lSgMsZaYHF+bAgryq5aUqpvyfhu52GJI2/4LoiJCE5uaxc6FCZfxfgqgw/d9ltiZghv+HiISFtmQVAVvlsk+/w==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.1.2.tgz",
+      "integrity": "sha512-SeG/2+DvwejQ7oAiSx8BrDh5qOdqCYHGClPiTvVIHTfSIHiS2JjMbCANdDCjHkTOh/O7WZzo2JhdKm98bRBxTw==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.13.9",
         "@babel/types": "^7.13.0",
-        "@vue/compiler-core": "3.1.1",
-        "@vue/compiler-dom": "3.1.1",
-        "@vue/compiler-ssr": "3.1.1",
-        "@vue/shared": "3.1.1",
+        "@types/estree": "^0.0.48",
+        "@vue/compiler-core": "3.1.2",
+        "@vue/compiler-dom": "3.1.2",
+        "@vue/compiler-ssr": "3.1.2",
+        "@vue/shared": "3.1.2",
         "consolidate": "^0.16.0",
         "estree-walker": "^2.0.1",
         "hash-sum": "^2.0.0",
@@ -3297,19 +3290,19 @@
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.1.1.tgz",
-      "integrity": "sha512-7H6krZtVt3h/YzfNp7eYK41hMDz8ZskiBy+Wby+EDRINX6BD9JQ5C8zyy2xAa7T6Iz2VrQzsaJ/Bb52lTPSS5A==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.1.2.tgz",
+      "integrity": "sha512-BwXo9LFk5OSWdMyZQ4bX1ELHX0Z/9F+ld/OaVnpUPzAZCHslBYLvyKUVDwv2C/lpLjRffpC2DOUEdl1+RP1aGg==",
       "dev": true,
       "requires": {
-        "@vue/compiler-dom": "3.1.1",
-        "@vue/shared": "3.1.1"
+        "@vue/compiler-dom": "3.1.2",
+        "@vue/shared": "3.1.2"
       }
     },
     "@vue/shared": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.1.tgz",
-      "integrity": "sha512-g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz",
+      "integrity": "sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==",
       "dev": true
     },
     "@webassemblyjs/ast": {
@@ -3989,9 +3982,9 @@
       "dev": true
     },
     "axe-core": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.2.tgz",
-      "integrity": "sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.3.tgz",
+      "integrity": "sha512-pXnVMfJKSIWU2Ml4JHP7pZEPIrgBO1Fd3WGx+fPBsS+KRGhE4vxooD8XBGWbQOIVSZsVK7pUDBBkCicNu80yzQ==",
       "dev": true
     },
     "axios": {
@@ -4010,12 +4003,12 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.2.tgz",
-      "integrity": "sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.5.tgz",
+      "integrity": "sha512-bTMAbpCX7ldtfbca2llYLeSFsDM257aspyAOpsdrdSrBqoLkWCy4HPYTXtXWaSLgFPjrJGACL65rzzr4RFGadw==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^27.0.2",
+        "@jest/transform": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.0.0",
@@ -4164,9 +4157,9 @@
       }
     },
     "babel-plugin-remove-graphql-queries": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-3.7.1.tgz",
-      "integrity": "sha512-9fANNkzCZJ0i65FXGnoeg/knDPC3riazCDyRrcH/2DVovxChAMSN2mqh/7eohJ8IrB/0e6cwLO4VirqanSk1Hw==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-3.8.0.tgz",
+      "integrity": "sha512-ArP55oowkMmMXxz1Q7OAsPUSt09gwRDzRtOi5cdrhhNsN7z4XOmy0n+ImYSyNxId0NL7wG2g2KT8wRdgmZ95Ig==",
       "dev": true
     },
     "babel-plugin-transform-react-remove-prop-types": {
@@ -4196,9 +4189,9 @@
       }
     },
     "babel-preset-gatsby": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-1.7.1.tgz",
-      "integrity": "sha512-p/Itb6isKOHwfSkhJZJNkQvgA5odSw1m3g4wikgruJyQnUr+cjroMkPd3LBXGKctaX9Zbtf9/mbPU6V/sm5hlQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-1.8.0.tgz",
+      "integrity": "sha512-TsVq/vjVl1LlX6CayhKMzGCx4ycRLl1ts1Cz9kcwdetvBVoGvvZ27t7BcT6ZXHMososJwq3dmHyYjuG338LIdw==",
       "dev": true,
       "requires": {
         "@babel/plugin-proposal-class-properties": "^7.14.0",
@@ -4214,8 +4207,8 @@
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "babel-plugin-macros": "^2.8.0",
         "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-        "gatsby-core-utils": "^2.7.1",
-        "gatsby-legacy-polyfills": "^1.7.0"
+        "gatsby-core-utils": "^2.8.0",
+        "gatsby-legacy-polyfills": "^1.8.0"
       }
     },
     "babel-preset-jest": {
@@ -4763,9 +4756,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001237",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz",
-      "integrity": "sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==",
+      "version": "1.0.30001239",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz",
+      "integrity": "sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==",
       "dev": true
     },
     "caseless": {
@@ -5341,9 +5334,9 @@
       "dev": true
     },
     "contentful-management": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/contentful-management/-/contentful-management-7.24.0.tgz",
-      "integrity": "sha512-Uo6SZ2q5PqrOSwFWX609/Dy1xfpwTJ0uOw4GuohIeo+MgJJqEwJcZ+K4H7/ie3QievZ1V7dm/f5AyyCalTCtgA==",
+      "version": "7.25.1",
+      "resolved": "https://registry.npmjs.org/contentful-management/-/contentful-management-7.25.1.tgz",
+      "integrity": "sha512-V8tcSHw3MwWKWHWMW+AZB6lP31hreos+v2gtayZczWXYRcfd+owt+qVjbkLZk1pL80ewSmc8Pl1A7rM/oB2ldw==",
       "dev": true,
       "requires": {
         "@types/json-patch": "0.0.30",
@@ -5390,9 +5383,9 @@
       "dev": true
     },
     "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
@@ -5440,15 +5433,15 @@
       }
     },
     "core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz",
+      "integrity": "sha512-h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg==",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.14.0.tgz",
-      "integrity": "sha512-R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz",
+      "integrity": "sha512-xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww==",
       "dev": true,
       "requires": {
         "browserslist": "^4.16.6",
@@ -5464,9 +5457,9 @@
       }
     },
     "core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz",
+      "integrity": "sha512-OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA==",
       "dev": true
     },
     "core-util-is": {
@@ -5508,9 +5501,9 @@
       }
     },
     "create-gatsby": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.7.1.tgz",
-      "integrity": "sha512-X330+JLFhnYDVTEs7nd5nQiaqWc9aq/gAY6V/jXo2ZwySZRW2XMAaL1ROLpkd5MwywTfykW0oJWRhLBwC17a7A==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.8.0.tgz",
+      "integrity": "sha512-AW3PZONTFfTMKmUfHbpwHebL8/QCbQ0qPwH9piNHen4/7EeZyaN7ZzeilKMUue4DEi9Om7VKlZtW+bKcVml3bg==",
       "dev": true
     },
     "create-require": {
@@ -5886,9 +5879,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.17.3",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-          "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+          "version": "14.17.4",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
+          "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
           "dev": true
         },
         "commander": {
@@ -5999,9 +5992,9 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.0.tgz",
+      "integrity": "sha512-MrQRs2gyD//7NeHi9TtsfClkf+cFAewDz+PZHR8ILKglLmBMyVX3ymQ+oeznE3tjrS7beTN+6JXb2C3JDHm7ug==",
       "dev": true
     },
     "decode-uri-component": {
@@ -6588,9 +6581,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.752",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz",
-      "integrity": "sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==",
+      "version": "1.3.755",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.755.tgz",
+      "integrity": "sha512-BJ1s/kuUuOeo1bF/EM2E4yqW9te0Hpof3wgwBx40AWJE18zsD1Tqo0kr7ijnOc+lRsrlrqKPauJAHqaxOItoUA==",
       "dev": true
     },
     "element-closest": {
@@ -6776,9 +6769,9 @@
       }
     },
     "es-module-lexer": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
-      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-f8kcHX1ArhllUtb/wVSyvygoKCznIjnxhLxy7TCvIiMdT7fL4ZDTIKaadMe6eLvOXg6Wk02UeoFgUoZ2EKZZUA==",
       "dev": true
     },
     "es-to-primitive": {
@@ -6929,9 +6922,9 @@
       }
     },
     "eslint": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz",
-      "integrity": "sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz",
+      "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
@@ -8197,16 +8190,6 @@
         "trim-repeated": "^1.0.0"
       }
     },
-    "filenamify-url": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/filenamify-url/-/filenamify-url-2.1.2.tgz",
-      "integrity": "sha512-3rMbAr7vDNMOGsj1aMniQFl749QjgM+lMJ/77ZRSPTIgxvolZwoQbn8dXLs7xfd+hAdli+oTnSWZNkJJLWQFEQ==",
-      "dev": true,
-      "requires": {
-        "filenamify": "^4.3.0",
-        "humanize-url": "^2.1.1"
-      }
-    },
     "filesize": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
@@ -8639,9 +8622,9 @@
       "dev": true
     },
     "gatsby": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-3.7.2.tgz",
-      "integrity": "sha512-grweoXdoE/Y6f1/qj3wDJ5JVQvfEwz/EPqPF9IXE3fbHdItr6hFCfYW9TmQopSHMuCxzvNhoCgwtyUL6sobBgw==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-3.8.0.tgz",
+      "integrity": "sha512-6l1IOslajKT8Umz+qDIfu2Bv1ldAbLnsrMId6ExWvcoqNjOw2eSyGHkGjwnQIwl17A0UcA1wSTAw/Gsj480IxA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.0",
@@ -8653,7 +8636,6 @@
         "@babel/types": "^7.14.0",
         "@gatsbyjs/reach-router": "^1.3.6",
         "@gatsbyjs/webpack-hot-middleware": "^2.25.2",
-        "@mikaelkristiansson/domready": "^1.0.10",
         "@nodelib/fs.walk": "^1.2.4",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
         "@types/http-proxy": "^1.17.4",
@@ -8667,8 +8649,8 @@
         "babel-plugin-add-module-exports": "^1.0.4",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "babel-plugin-lodash": "^3.3.4",
-        "babel-plugin-remove-graphql-queries": "^3.7.1",
-        "babel-preset-gatsby": "^1.7.1",
+        "babel-plugin-remove-graphql-queries": "^3.8.0",
+        "babel-preset-gatsby": "^1.8.0",
         "better-opn": "^2.0.0",
         "bluebird": "^3.7.2",
         "body-parser": "^1.19.0",
@@ -8710,16 +8692,16 @@
         "find-cache-dir": "^3.3.1",
         "fs-exists-cached": "1.0.0",
         "fs-extra": "^8.1.0",
-        "gatsby-cli": "^3.7.1",
-        "gatsby-core-utils": "^2.7.1",
-        "gatsby-graphiql-explorer": "^1.7.1",
-        "gatsby-legacy-polyfills": "^1.7.0",
-        "gatsby-link": "^3.7.1",
-        "gatsby-plugin-page-creator": "^3.7.1",
-        "gatsby-plugin-typescript": "^3.7.1",
-        "gatsby-plugin-utils": "^1.7.1",
-        "gatsby-react-router-scroll": "^4.7.1",
-        "gatsby-telemetry": "^2.7.1",
+        "gatsby-cli": "^3.8.0",
+        "gatsby-core-utils": "^2.8.0",
+        "gatsby-graphiql-explorer": "^1.8.0",
+        "gatsby-legacy-polyfills": "^1.8.0",
+        "gatsby-link": "^3.8.0",
+        "gatsby-plugin-page-creator": "^3.8.0",
+        "gatsby-plugin-typescript": "^3.8.0",
+        "gatsby-plugin-utils": "^1.8.0",
+        "gatsby-react-router-scroll": "^4.8.0",
+        "gatsby-telemetry": "^2.8.0",
         "glob": "^7.1.6",
         "got": "8.3.2",
         "graphql": "^15.4.0",
@@ -8961,9 +8943,9 @@
       }
     },
     "gatsby-cli": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.7.1.tgz",
-      "integrity": "sha512-IWs7eU3tOad4qiglvokrZEL2yJPQsXjuzKW5slfXbhuj5pIc+o65f389HeOq20wHPh7ACHfZPMftvhtaPsO91g==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.8.0.tgz",
+      "integrity": "sha512-81rQNDgHgkXoFMiwluZGN0ETKonGn8tl1uxL3OpOx3aOfP1aPv5NBSOLX70O6vo9jXyg6oy0gPHGjhbQMdSyIw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.0",
@@ -8974,14 +8956,14 @@
         "common-tags": "^1.8.0",
         "configstore": "^5.0.1",
         "convert-hrtime": "^3.0.0",
-        "create-gatsby": "^1.7.1",
+        "create-gatsby": "^1.8.0",
         "envinfo": "^7.7.3",
         "execa": "^3.4.0",
         "fs-exists-cached": "^1.0.0",
         "fs-extra": "^8.1.0",
-        "gatsby-core-utils": "^2.7.1",
-        "gatsby-recipes": "^0.18.1",
-        "gatsby-telemetry": "^2.7.1",
+        "gatsby-core-utils": "^2.8.0",
+        "gatsby-recipes": "^0.19.0",
+        "gatsby-telemetry": "^2.8.0",
         "hosted-git-info": "^3.0.6",
         "is-valid-path": "^0.1.1",
         "joi": "^17.4.0",
@@ -9204,9 +9186,9 @@
       }
     },
     "gatsby-core-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.7.1.tgz",
-      "integrity": "sha512-ofiAzLMeLjkS9huo0JQRbNzOfwCCxzPg7mSXeEhZhHGfbXoqZ9ZufmlTTgSYLc5v6agoM4yi4rHqdMOXu4qXAw==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.8.0.tgz",
+      "integrity": "sha512-CadvILN4ZyYMYQAp+haxSgE/0k5zIu6y2WcqVSJaQLmmWq0o49Gv4CftVKOEXOtXaN0DEr9e4wWFVBRAYaRHGA==",
       "dev": true,
       "requires": {
         "ci-info": "2.0.0",
@@ -9254,18 +9236,18 @@
       }
     },
     "gatsby-graphiql-explorer": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-1.7.1.tgz",
-      "integrity": "sha512-m+41RTywPpUnMYwMAykgfocUGURp1wGrtoVqZiyCgLMW/erjU0NL61pwIidOInpuSL/61/3O9WAKiPwNTM95kQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-1.8.0.tgz",
+      "integrity": "sha512-PEMIKJdvPhJWChb0+ANwAzvFmmPXOKpo1kgi80O/J4OphVJN6059H9gUWGedIo2wwQ9db7wdguOvtYMMWsKeZQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.0"
       }
     },
     "gatsby-legacy-polyfills": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-1.7.0.tgz",
-      "integrity": "sha512-C4CKvFmdkSTBtJzYPSjHKQz2tRwVwMuQ7OBW8tY1K1FPn6Usl2gjQdw6G8Pf3juV1jlJrFaep/+0ZM/AV8KQuA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-1.8.0.tgz",
+      "integrity": "sha512-u/vlxcxR5Ny6btWGqKnC06spGZzIezUOPpuM36OmDtq6GjefS7EVkOd+tghZ1UUP7xCEIb+4xCLlOD83K/fOKg==",
       "dev": true,
       "requires": {
         "core-js-compat": "3.9.0"
@@ -9290,9 +9272,9 @@
       }
     },
     "gatsby-link": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-3.7.1.tgz",
-      "integrity": "sha512-5mPLepeP9SgG3zEY7/jjiXV3nYAgAZnIdE5ctlfh+Yc5Cfgc5jxhFT6vTuqcwPMTvCYRp/O8j+yPbP+Ec37ITA==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-3.8.0.tgz",
+      "integrity": "sha512-Ruso8cP++5egvpzx5y8HMJouA1ldkNsHMtHANYwZnSZ2Wd+OHfR+kWRRS+zPqqHbhRmMeecdTXRCth07vvzKEw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.0",
@@ -9301,16 +9283,16 @@
       }
     },
     "gatsby-page-utils": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-1.7.1.tgz",
-      "integrity": "sha512-PcElHifovBu7E/xC/724eYr6vTAKc0Uqf/ZFZWG5GB5td+MG2A5pGiUBGDmmxsIO7b4c8X5oW8Jtem9zKoOI8w==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-1.8.0.tgz",
+      "integrity": "sha512-5fa5JbrHPiVDrBtkjoZySdClTUfmYBGg5OSMF2d/mFXEh8NCjSQK8EmosHO4u7uwLYT/gnb+BwsoVkuXYt+hHQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.0",
         "bluebird": "^3.7.2",
         "chokidar": "^3.5.1",
         "fs-exists-cached": "^1.0.0",
-        "gatsby-core-utils": "^2.7.1",
+        "gatsby-core-utils": "^2.8.0",
         "glob": "^7.1.6",
         "lodash": "^4.17.21",
         "micromatch": "^4.0.2"
@@ -9331,18 +9313,18 @@
       }
     },
     "gatsby-plugin-page-creator": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-3.7.1.tgz",
-      "integrity": "sha512-3Lon4tWmsSwA8jWnTtsQ8JwgKm18Y92ImkQe6yb0kXf4ZE/MeAZDj5ISMdZZWrkwAtSFXLNkNeCuap6jU04DjQ==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-3.8.0.tgz",
+      "integrity": "sha512-6H+7+74f8rHay8V6EF80/ucDUREjaqCfrW5KSjAYxrc7uh8s5QNeumgNixQUAofnZQOCLTiyw1C3lOQnUVL4Xg==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.14.0",
         "@sindresorhus/slugify": "^1.1.2",
         "chokidar": "^3.5.1",
         "fs-exists-cached": "^1.0.0",
-        "gatsby-core-utils": "^2.7.1",
-        "gatsby-page-utils": "^1.7.1",
-        "gatsby-telemetry": "^2.7.1",
+        "gatsby-core-utils": "^2.8.0",
+        "gatsby-page-utils": "^1.8.0",
+        "gatsby-telemetry": "^2.8.0",
         "globby": "^11.0.3",
         "lodash": "^4.17.21"
       }
@@ -9361,18 +9343,18 @@
       }
     },
     "gatsby-plugin-react-helmet": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-4.7.1.tgz",
-      "integrity": "sha512-lu+Fgs8pWfYvqKdaSgAkbeE9wgVTnAS8sKgykcqaEgK+STpmhFtzpuJqmhBK3wJwP7yK5BePK5Dte+aRbtkpJQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-4.8.0.tgz",
+      "integrity": "sha512-MzsWiJFGKIYhIPLLp5zb0hX8ppL5tWpEuAHDeqI4DJ6egsAvcXt65RrunZNnAdP26367LKuz+X0ZEla0II3lsQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.0"
       }
     },
     "gatsby-plugin-sass": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-4.7.1.tgz",
-      "integrity": "sha512-W3YIHAJzpkH94nSZu+MmL6UKxT3VoHCfxTfiOG+vF/c/VKhMwkyO+1cSMufRlxcTGWmP2pgFNA57a7ZoXQdCTw==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-4.8.0.tgz",
+      "integrity": "sha512-RxFks68zGy3OnAuQBzUcsW5k9B9DTRrZGJpl3Tkcbjq4fy87jmm/kovH0jFyBb/P/qafmwMfMHjV3tmYeks15Q==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.0",
@@ -9427,9 +9409,9 @@
       }
     },
     "gatsby-plugin-typescript": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-3.7.1.tgz",
-      "integrity": "sha512-zOuPrtjnvAPQa9AkjgipKYES6YR7WLr/Rru13zsQCubwr9UtkgyXlQB4bqYuyDEKy0F0HHGLU69WQKNYvP3PhA==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-3.8.0.tgz",
+      "integrity": "sha512-FmDA6DLcotzLHbRpxTJpamEcTh3xRdMNcD0i0RBVcsv3VCnsQHiQQ/1CEtxs4erk7SgvWd+q+ywQQjTkVugXyA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.14.0",
@@ -9438,31 +9420,31 @@
         "@babel/plugin-proposal-optional-chaining": "^7.14.0",
         "@babel/preset-typescript": "^7.14.0",
         "@babel/runtime": "^7.14.0",
-        "babel-plugin-remove-graphql-queries": "^3.7.1"
+        "babel-plugin-remove-graphql-queries": "^3.8.0"
       }
     },
     "gatsby-plugin-utils": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-utils/-/gatsby-plugin-utils-1.7.1.tgz",
-      "integrity": "sha512-mZ6qDwTBheCXeUa9KBdeHTtwWzX4AyzqXrl3EVj3bWQzNFSvUMC5QJfySo1UnWBjYLdCUpe45ZeDg/85q52Cgg==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-plugin-utils/-/gatsby-plugin-utils-1.8.0.tgz",
+      "integrity": "sha512-K/EiYx2kKd5BOuwWg86mrvrMh8u9hW40abFLZYH4zRAkthL+vYp/WeckVL/TibZ3jPUhhay9JGjXKR+Ot6BYDQ==",
       "dev": true,
       "requires": {
         "joi": "^17.2.1"
       }
     },
     "gatsby-react-router-scroll": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-4.7.1.tgz",
-      "integrity": "sha512-APdwZYk2WZ3Bf8EeovYXQh8KHHQ59WfcFhUNU0CJ/z1xwLatqkg4kDxmGWPydHx7DTOM6WbmmaL33L1n0ybEcw==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-4.8.0.tgz",
+      "integrity": "sha512-bKraD+ng3R8FZNEuOIshSmr6DKgholdqo94XHm9DeQVIsd0A/5PPJ+inzTb+vG04UTuFZo03cPZHf3eIGaDXVg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.0"
       }
     },
     "gatsby-recipes": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.18.1.tgz",
-      "integrity": "sha512-gjtCDu1qMtQkjmA5mrHw4orFxkoUPW9VnyVcLc8kcGAjJLR3MTKeECQL6p0SrKHgsbJTkOJ2BTvzU3R5jENBbg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.19.0.tgz",
+      "integrity": "sha512-yboFABHUNB9+1x/RA13yKU/P0/2K+SaenudC+THshxL4uiUHlbU029iXp6Di2zMfIhak8aZ7FyUrpCieey/0Rw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.14.0",
@@ -9488,8 +9470,8 @@
         "express": "^4.17.1",
         "express-graphql": "^0.9.0",
         "fs-extra": "^8.1.0",
-        "gatsby-core-utils": "^2.7.1",
-        "gatsby-telemetry": "^2.7.1",
+        "gatsby-core-utils": "^2.8.0",
+        "gatsby-telemetry": "^2.8.0",
         "glob": "^7.1.6",
         "graphql": "^15.4.0",
         "graphql-compose": "~7.25.0",
@@ -9631,9 +9613,9 @@
       }
     },
     "gatsby-telemetry": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.7.1.tgz",
-      "integrity": "sha512-nZgM5SYkS7AWE4NJ/HGrQkUBn7B1k8d6KuRVgv1HanHQxnKUBaWL/6ej/ZBYcvfRBWMCi2mX0QJYlSKVx45XOw==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.8.0.tgz",
+      "integrity": "sha512-MlV9Lbminhsz1MUiWJJvZ+8VVhIYBl2AsxJylckGoUp+skGfNq5d3pWSv+u/nU4zVP8T1HUWc1c7KSVq6ggrbw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.0",
@@ -9644,7 +9626,7 @@
         "boxen": "^4.2.0",
         "configstore": "^5.0.1",
         "fs-extra": "^8.1.0",
-        "gatsby-core-utils": "^2.7.1",
+        "gatsby-core-utils": "^2.8.0",
         "git-up": "^4.0.2",
         "is-docker": "^2.1.1",
         "lodash": "^4.17.21",
@@ -9764,15 +9746,15 @@
       }
     },
     "gh-pages": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.1.tgz",
-      "integrity": "sha512-/JLALwM9vTSohmaO9RZSWS+oCcVkV4pMyUwdQPZuxeJN5mVwz2kRbT6RigqDoqM8Rber2sv+WIMLP/9ZPfc7oA==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz",
+      "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==",
       "dev": true,
       "requires": {
         "async": "^2.6.1",
         "commander": "^2.18.0",
         "email-addresses": "^3.0.1",
-        "filenamify-url": "^2.1.1",
+        "filenamify": "^4.3.0",
         "find-cache-dir": "^3.3.1",
         "fs-extra": "^8.1.0",
         "globby": "^6.1.0"
@@ -10068,9 +10050,9 @@
       "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
     "graphql": {
-      "version": "15.5.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz",
-      "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==",
+      "version": "15.5.1",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.1.tgz",
+      "integrity": "sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw==",
       "dev": true
     },
     "graphql-compose": {
@@ -10700,23 +10682,6 @@
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true
     },
-    "humanize-url": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-2.1.1.tgz",
-      "integrity": "sha512-V4nxsPGNE7mPjr1qDp471YfW8nhBiTRWrG/4usZlpvFU8I7gsV7Jvrrzv/snbLm5dWO3dr1ennu2YqnhTWFmYA==",
-      "dev": true,
-      "requires": {
-        "normalize-url": "^4.5.1"
-      },
-      "dependencies": {
-        "normalize-url": {
-          "version": "4.5.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-          "dev": true
-        }
-      }
-    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -11684,14 +11649,14 @@
       "dev": true
     },
     "jest": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.4.tgz",
-      "integrity": "sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.5.tgz",
+      "integrity": "sha512-4NlVMS29gE+JOZvgmSAsz3eOjkSsHqjTajlIsah/4MVSmKvf3zFP/TvgcLoWe2UVHiE9KF741sReqhF0p4mqbQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^27.0.4",
+        "@jest/core": "^27.0.5",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.0.4"
+        "jest-cli": "^27.0.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -11727,19 +11692,19 @@
           }
         },
         "jest-cli": {
-          "version": "27.0.4",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.4.tgz",
-          "integrity": "sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ==",
+          "version": "27.0.5",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.5.tgz",
+          "integrity": "sha512-kZqY020QFOFQKVE2knFHirTBElw3/Q0kUbDc3nMfy/x+RQ7zUY89SUuzpHHJoSX1kX7Lq569ncvjNqU3Td/FCA==",
           "dev": true,
           "requires": {
-            "@jest/core": "^27.0.4",
+            "@jest/core": "^27.0.5",
             "@jest/test-result": "^27.0.2",
             "@jest/types": "^27.0.2",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
-            "jest-config": "^27.0.4",
+            "jest-config": "^27.0.5",
             "jest-util": "^27.0.2",
             "jest-validate": "^27.0.2",
             "prompts": "^2.0.1",
@@ -11822,12 +11787,12 @@
       }
     },
     "jest-circus": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.4.tgz",
-      "integrity": "sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.5.tgz",
+      "integrity": "sha512-p5rO90o1RTh8LPOG6l0Fc9qgp5YGv+8M5CFixhMh7gGHtGSobD1AxX9cjFZujILgY8t30QZ7WVvxlnuG31r8TA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.3",
+        "@jest/environment": "^27.0.5",
         "@jest/test-result": "^27.0.2",
         "@jest/types": "^27.0.2",
         "@types/node": "*",
@@ -11839,8 +11804,8 @@
         "jest-each": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-runtime": "^27.0.4",
-        "jest-snapshot": "^27.0.4",
+        "jest-runtime": "^27.0.5",
+        "jest-snapshot": "^27.0.5",
         "jest-util": "^27.0.2",
         "pretty-format": "^27.0.2",
         "slash": "^3.0.0",
@@ -11897,28 +11862,28 @@
       }
     },
     "jest-config": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.4.tgz",
-      "integrity": "sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.5.tgz",
+      "integrity": "sha512-zCUIXag7QIXKEVN4kUKbDBDi9Q53dV5o3eNhGqe+5zAbt1vLs4VE3ceWaYrOub0L4Y7E9pGfM84TX/0ARcE+Qw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.0.4",
+        "@jest/test-sequencer": "^27.0.5",
         "@jest/types": "^27.0.2",
-        "babel-jest": "^27.0.2",
+        "babel-jest": "^27.0.5",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
         "is-ci": "^3.0.0",
-        "jest-circus": "^27.0.4",
-        "jest-environment-jsdom": "^27.0.3",
-        "jest-environment-node": "^27.0.3",
+        "jest-circus": "^27.0.5",
+        "jest-environment-jsdom": "^27.0.5",
+        "jest-environment-node": "^27.0.5",
         "jest-get-type": "^27.0.1",
-        "jest-jasmine2": "^27.0.4",
+        "jest-jasmine2": "^27.0.5",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.4",
-        "jest-runner": "^27.0.4",
+        "jest-resolve": "^27.0.5",
+        "jest-runner": "^27.0.5",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "micromatch": "^4.0.4",
@@ -12076,13 +12041,13 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz",
-      "integrity": "sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.5.tgz",
+      "integrity": "sha512-ToWhViIoTl5738oRaajTMgYhdQL73UWPoV4GqHGk2DPhs+olv8OLq5KoQW8Yf+HtRao52XLqPWvl46dPI88PdA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.3",
-        "@jest/fake-timers": "^27.0.3",
+        "@jest/environment": "^27.0.5",
+        "@jest/fake-timers": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/node": "*",
         "jest-mock": "^27.0.3",
@@ -12115,13 +12080,13 @@
       }
     },
     "jest-environment-node": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.3.tgz",
-      "integrity": "sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.5.tgz",
+      "integrity": "sha512-47qqScV/WMVz5OKF5TWpAeQ1neZKqM3ySwNveEnLyd+yaE/KT6lSMx/0SOx60+ZUcVxPiESYS+Kt2JS9y4PpkQ==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.0.3",
-        "@jest/fake-timers": "^27.0.3",
+        "@jest/environment": "^27.0.5",
+        "@jest/fake-timers": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/node": "*",
         "jest-mock": "^27.0.3",
@@ -12159,9 +12124,9 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.2.tgz",
-      "integrity": "sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.5.tgz",
+      "integrity": "sha512-3LFryGSHxwPFHzKIs6W0BGA2xr6g1MvzSjR3h3D8K8Uqy4vbRm/grpGHzbPtIbOPLC6wFoViRrNEmd116QWSkw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.0.2",
@@ -12204,13 +12169,13 @@
       }
     },
     "jest-jasmine2": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz",
-      "integrity": "sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.5.tgz",
+      "integrity": "sha512-m3TojR19sFmTn79QoaGy1nOHBcLvtLso6Zh7u+gYxZWGcza4rRPVqwk1hciA5ZOWWZIJOukAcore8JRX992FaA==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.0.3",
+        "@jest/environment": "^27.0.5",
         "@jest/source-map": "^27.0.1",
         "@jest/test-result": "^27.0.2",
         "@jest/types": "^27.0.2",
@@ -12222,8 +12187,8 @@
         "jest-each": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-runtime": "^27.0.4",
-        "jest-snapshot": "^27.0.4",
+        "jest-runtime": "^27.0.5",
+        "jest-snapshot": "^27.0.5",
         "jest-util": "^27.0.2",
         "pretty-format": "^27.0.2",
         "throat": "^6.0.1"
@@ -12537,9 +12502,9 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.4.tgz",
-      "integrity": "sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.5.tgz",
+      "integrity": "sha512-Md65pngRh8cRuWVdWznXBB5eDt391OJpdBaJMxfjfuXCvOhM3qQBtLMCMTykhuUKiBMmy5BhqCW7AVOKmPrW+Q==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.0.2",
@@ -12578,14 +12543,14 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz",
-      "integrity": "sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.5.tgz",
+      "integrity": "sha512-xUj2dPoEEd59P+nuih4XwNa4nJ/zRd/g4rMvjHrZPEBWeWRq/aJnnM6mug+B+Nx+ILXGtfWHzQvh7TqNV/WbuA==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.0.2",
         "jest-regex-util": "^27.0.1",
-        "jest-snapshot": "^27.0.4"
+        "jest-snapshot": "^27.0.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -12613,15 +12578,15 @@
       }
     },
     "jest-runner": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.4.tgz",
-      "integrity": "sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.5.tgz",
+      "integrity": "sha512-HNhOtrhfKPArcECgBTcWOc+8OSL8GoFoa7RsHGnfZR1C1dFohxy9eLtpYBS+koybAHlJLZzNCx2Y/Ic3iEtJpQ==",
       "dev": true,
       "requires": {
         "@jest/console": "^27.0.2",
-        "@jest/environment": "^27.0.3",
+        "@jest/environment": "^27.0.5",
         "@jest/test-result": "^27.0.2",
-        "@jest/transform": "^27.0.2",
+        "@jest/transform": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -12629,13 +12594,13 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-docblock": "^27.0.1",
-        "jest-environment-jsdom": "^27.0.3",
-        "jest-environment-node": "^27.0.3",
-        "jest-haste-map": "^27.0.2",
+        "jest-environment-jsdom": "^27.0.5",
+        "jest-environment-node": "^27.0.5",
+        "jest-haste-map": "^27.0.5",
         "jest-leak-detector": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-resolve": "^27.0.4",
-        "jest-runtime": "^27.0.4",
+        "jest-resolve": "^27.0.5",
+        "jest-runtime": "^27.0.5",
         "jest-util": "^27.0.2",
         "jest-worker": "^27.0.2",
         "source-map-support": "^0.5.6",
@@ -12667,18 +12632,18 @@
       }
     },
     "jest-runtime": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.4.tgz",
-      "integrity": "sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.5.tgz",
+      "integrity": "sha512-V/w/+VasowPESbmhXn5AsBGPfb35T7jZPGZybYTHxZdP7Gwaa+A0EXE6rx30DshHKA98lVCODbCO8KZpEW3hiQ==",
       "dev": true,
       "requires": {
         "@jest/console": "^27.0.2",
-        "@jest/environment": "^27.0.3",
-        "@jest/fake-timers": "^27.0.3",
-        "@jest/globals": "^27.0.3",
+        "@jest/environment": "^27.0.5",
+        "@jest/fake-timers": "^27.0.5",
+        "@jest/globals": "^27.0.5",
         "@jest/source-map": "^27.0.1",
         "@jest/test-result": "^27.0.2",
-        "@jest/transform": "^27.0.2",
+        "@jest/transform": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/yargs": "^16.0.0",
         "chalk": "^4.0.0",
@@ -12687,12 +12652,12 @@
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.0.2",
+        "jest-haste-map": "^27.0.5",
         "jest-message-util": "^27.0.2",
         "jest-mock": "^27.0.3",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.4",
-        "jest-snapshot": "^27.0.4",
+        "jest-resolve": "^27.0.5",
+        "jest-snapshot": "^27.0.5",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "slash": "^3.0.0",
@@ -12741,9 +12706,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "27.0.4",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.4.tgz",
-      "integrity": "sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA==",
+      "version": "27.0.5",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.5.tgz",
+      "integrity": "sha512-H1yFYdgnL1vXvDqMrnDStH6yHFdMEuzYQYc71SnC/IJnuuhW6J16w8GWG1P+qGd3Ag3sQHjbRr0TcwEo/vGS+g==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.2",
@@ -12752,7 +12717,7 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.0.2",
+        "@jest/transform": "^27.0.5",
         "@jest/types": "^27.0.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.1.5",
@@ -12762,10 +12727,10 @@
         "graceful-fs": "^4.2.4",
         "jest-diff": "^27.0.2",
         "jest-get-type": "^27.0.1",
-        "jest-haste-map": "^27.0.2",
+        "jest-haste-map": "^27.0.5",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-resolve": "^27.0.4",
+        "jest-resolve": "^27.0.5",
         "jest-util": "^27.0.2",
         "natural-compare": "^1.4.0",
         "pretty-format": "^27.0.2",
@@ -14518,9 +14483,9 @@
       "dev": true
     },
     "node-object-hash": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.4.tgz",
-      "integrity": "sha512-EeCg00r5yj3xVzrfFaq9jaeMWKxb0zkOyPC+m5AQrKIvhue7stoqSbhU0UHGQ9rWXC96Z+UtUVeTWOAgjjVhew==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.7.tgz",
+      "integrity": "sha512-ybV3ZKZZoHJPSelxgRY5LYRHQToMtxvJxNbkY8WtWCy5Z/t3V0gyy/6O6kGoh0PrzZIATxVVDG2q+eM6iZMjKQ==",
       "dev": true
     },
     "node-releases": {
@@ -14602,9 +14567,9 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz",
-      "integrity": "sha512-VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true
     },
     "npm-normalize-package-bin": {
@@ -15169,15 +15134,23 @@
       }
     },
     "parse-url": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-5.0.3.tgz",
-      "integrity": "sha512-nrLCVMJpqo12X8uUJT4GJPd5AFaTOrGx/QpJy3HNcVtq0AZSstVIsnxS5fqNPuoqMUs3MyfBoOP6Zvu2Arok5A==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-5.0.5.tgz",
+      "integrity": "sha512-AwfVhXaQrNNI6UPUJq/GJN2qoY0L9gPgxhh9VbDP0bfBAJWaC/Zh8hjQ58YKTi4AagOT70fpadkYSKPo+eFb1w==",
       "dev": true,
       "requires": {
         "is-ssh": "^1.3.0",
-        "normalize-url": "^6.0.1",
+        "normalize-url": "4.5.0",
         "parse-path": "^4.0.0",
         "protocols": "^1.4.0"
+      },
+      "dependencies": {
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+          "dev": true
+        }
       }
     },
     "parse5": {
@@ -15532,9 +15505,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.4.tgz",
-      "integrity": "sha512-/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA==",
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz",
+      "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==",
       "dev": true,
       "requires": {
         "colorette": "^1.2.2",
@@ -16075,9 +16048,9 @@
       "dev": true
     },
     "query-string": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.0.tgz",
-      "integrity": "sha512-Iy7moLybliR5ZgrK/1R3vjrXq03S13Vz4Rbm5Jg3EFq1LUmQppto0qtXz4vqZ386MSRjZgnTSZ9QC+NZOSd/XA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz",
+      "integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==",
       "requires": {
         "decode-uri-component": "^0.2.0",
         "filter-obj": "^1.1.0",
@@ -17236,9 +17209,9 @@
       "dev": true
     },
     "resolve-url-loader": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.3.tgz",
-      "integrity": "sha512-WbDSNFiKPPLem1ln+EVTE+bFUBdTTytfQZWbmghroaFNFaAVmGq0Saqw6F/306CwgPXsGwXVxbODE+3xAo/YbA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.4.tgz",
+      "integrity": "sha512-D3sQ04o0eeQEySLrcz4DsX3saHfsr8/N6tfhblxgZKXxMT2Louargg12oGNfoTRLV09GXhVUe5/qgA5vdgNigg==",
       "dev": true,
       "requires": {
         "adjust-sourcemap-loader": "3.0.0",
@@ -17247,7 +17220,7 @@
         "convert-source-map": "1.7.0",
         "es6-iterator": "2.0.3",
         "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
+        "postcss": "7.0.36",
         "rework": "1.0.1",
         "rework-visit": "1.0.0",
         "source-map": "0.6.1"
@@ -17299,6 +17272,15 @@
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
         },
+        "convert-source-map": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
         "emojis-list": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -17323,9 +17305,9 @@
           }
         },
         "postcss": {
-          "version": "7.0.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-          "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "dev": true,
           "requires": {
             "chalk": "^2.4.2",
@@ -18043,9 +18025,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.17.3",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-          "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+          "version": "14.17.4",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
+          "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
           "dev": true
         }
       }
@@ -19392,9 +19374,9 @@
       }
     },
     "typescript": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.3.tgz",
-      "integrity": "sha512-rUvLW0WtF7PF2b9yenwWUi9Da9euvDRhmH7BLyBG4DCFfOJ850LGNknmRpp8Z8kXNUPObdZQEfKOiHtXuQHHKA==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz",
+      "integrity": "sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==",
       "dev": true
     },
     "unbox-primitive": {
@@ -19875,9 +19857,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
-      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz",
+      "integrity": "sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -20037,9 +20019,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.39.0.tgz",
-      "integrity": "sha512-25CHmuDj+oOTyteI13sUqNlCnjCnySuhiKWE/cRYPQYeoQ3ijHgyWX27CiyUKLNGq27v8S0mrksyTreT/xo7pg==",
+      "version": "5.40.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz",
+      "integrity": "sha512-c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.0",
@@ -20051,7 +20033,7 @@
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.4.0",
+        "es-module-lexer": "^0.6.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
@@ -20062,7 +20044,7 @@
         "neo-async": "^2.6.2",
         "schema-utils": "^3.0.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.1",
+        "terser-webpack-plugin": "^5.1.3",
         "watchpack": "^2.2.0",
         "webpack-sources": "^2.3.0"
       },
@@ -21026,9 +21008,9 @@
       }
     },
     "yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
     },
     "yauzl": {
diff --git a/client/src/components/map.module.scss b/client/src/components/map.module.scss
index afd75306..28d643f3 100644
--- a/client/src/components/map.module.scss
+++ b/client/src/components/map.module.scss
@@ -2,4 +2,84 @@
   height: 676px;
   margin-bottom: 29px;
   max-width: revert;
+  margin-top: 50px;
+}
+
+.popupContainer {
+  position: absolute;
+  background-color: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
+  padding: 15px;
+  border-radius: 10px;
+  border: 1px solid #cccccc;
+  bottom: 12px;
+  left: -50px;
+  min-width: 280px;
+}
+
+.popupContainer:after,
+.popupContainer:before {
+  top: 100%;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+
+.popupContainer:after {
+  border-top-color: white;
+  border-width: 10px;
+  left: 48px;
+  margin-left: -10px;
+}
+
+.popupContainer:before {
+  border-top-color: #cccccc;
+  border-width: 11px;
+  left: 48px;
+  margin-left: -11px;
+}
+
+.popupCloser {
+  text-decoration: none;
+  position: absolute;
+  top: 2px;
+  right: 8px;
+}
+
+.popupCloser:after {
+  content: "✖";
+}
+
+.popupContent {
+  max-height: 300px;
+  overflow: scroll;
+}
+
+.popupHeaderTable {
+  border-collapse: collapse;
+  border-spacing: 0;
+  font: normal 12px;
+  border: none;
+}
+
+.popupHeaderTable tbody td:first {
+  font-weight: bold;
+}
+
+.zoomWarning {
+  background-color: #953a10;
+  height: 8%;
+  width: 66%;
+  margin: auto;
+  color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.zoomWarning > img {
+  filter: invert(100%);
 }
diff --git a/client/src/components/map.module.scss.d.ts b/client/src/components/map.module.scss.d.ts
index caca97b5..831c54b6 100644
--- a/client/src/components/map.module.scss.d.ts
+++ b/client/src/components/map.module.scss.d.ts
@@ -1,6 +1,12 @@
 declare namespace MapModuleScssNamespace {
   export interface IMapModuleScss {
     mapContainer: string;
+    popupContainer: string;
+    popupCloser: string;
+    popupContent: string;
+    popupHeaderTable: string;
+    zoomWarning:string;
+    mapWrapperContainer:string;
   }
 }
 
diff --git a/client/src/components/map.tsx b/client/src/components/map.tsx
index 6b6d6eaa..33916f99 100644
--- a/client/src/components/map.tsx
+++ b/client/src/components/map.tsx
@@ -1,17 +1,18 @@
 import React, {useState, useEffect, useRef} from 'react';
 import Map from 'ol/Map';
 import View from 'ol/View';
-import Feature from 'ol/Feature';
+import Feature, {FeatureLike} from 'ol/Feature';
 import Geometry from 'ol/geom/Geometry';
 import VectorLayer from 'ol/layer/Vector';
 import VectorSource from 'ol/source/Vector';
 import {fromLonLat} from 'ol/proj';
 import * as styles from './map.module.scss';
 import olms from 'ol-mapbox-style';
+import Overlay from 'ol/Overlay';
+// import {Table} from '@trussworks/react-uswds';
 
-interface IMapWrapperProps {
-  features: Feature<Geometry>[],
-};
+// @ts-ignore
+import zoomIcon from '/node_modules/uswds/dist/img/usa-icons/zoom_in.svg';
 
 const mapConfig = {
   'version': 8,
@@ -20,17 +21,27 @@ const mapConfig = {
     'carto-light': {
       'type': 'raster',
       'tiles': [
-        'https://a.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png',
-        'https://b.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png',
-        'https://c.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png',
-        'https://d.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png',
+        'https://a.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png',
+        'https://b.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png',
+        'https://c.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png',
+        'https://d.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png',
       ],
     },
     'custom': {
-      'projection': 'EPSG:3857',
       'type': 'vector',
       'tiles': [
-        'https://gis.data.census.gov/arcgis/rest/services/Hosted/VT_2019_150_00_PY_D1/VectorTileServer/tile/{z}/{y}/{x}.mvt',
+        'http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/0624_demo/{z}/{x}/{y}.pbf',
+        // For local development, use:
+        // 'http://localhost:8080/data/tl_2010_bg_with_data/{z}/{x}/{y}.pbf',
+      ],
+    },
+    'labels': {
+      'type': 'raster',
+      'tiles': [
+        'https://cartodb-basemaps-a.global.ssl.fastly.net/light_only_labels/{z}/{x}/{y}@2x.png',
+        'https://cartodb-basemaps-b.global.ssl.fastly.net/light_only_labels/{z}/{x}/{y}@2x.png',
+        'https://cartodb-basemaps-c.global.ssl.fastly.net/light_only_labels/{z}/{x}/{y}@2x.png',
+        'https://cartodb-basemaps-d.global.ssl.fastly.net/light_only_labels/{z}/{x}/{y}@2x.png',
       ],
     },
   },
@@ -44,33 +55,71 @@ const mapConfig = {
     },
     {
       'id': 'blocks',
-      'type': 'line',
+      'type': 'fill',
       'source': 'custom',
-      'source-layer': 'BlockGroup',
+      'source-layer': 'blocks',
       'minzoom': 0,
       'layout': {
         'line-cap': 'round',
         'line-join': 'round',
       },
-
+      // 01=AL, 30=MT, 34=NJ, 35=NM, 36=NY
+      'filter': ['in', 'STATEFP10', '01', '30', '34', '35', '36'],
       'paint': {
-        'line-opacity': 0.6,
-        'line-color': 'red',
-        'line-width': 1,
+        'fill-color': [
+          'interpolate',
+          ['linear'],
+          ['to-number', [
+            'get',
+            'Score C (percentile)',
+          ]],
+          0.0,
+          'white',
+          1,
+          'blue',
+        ],
+        'fill-opacity': 0.75,
       },
     },
+    {
+      'id': 'labels-only',
+      'type': 'raster',
+      'source': 'labels',
+      'minzoom': 0,
+      'maxzoom': 22,
+    },
   ],
 };
 
+interface IMapWrapperProps {
+  features: Feature<Geometry>[],
+};
 
 // The below adapted from
 // https://taylor.callsen.me/using-openlayers-with-react-functional-components/
 const MapWrapper = ({features}: IMapWrapperProps) => {
   const [map, setMap] = useState<Map>();
   const [featuresLayer, setFeaturesLayer] = useState<VectorLayer>();
+  const [currentOverlay, setCurrentOverlay] = useState<Overlay>();
+  const [selectedFeature, setSelectedFeature] = useState<FeatureLike>();
+  const [currentZoom, setCurrentZoom] = useState<number>(0);
 
   const mapElement = useRef() as
-        React.MutableRefObject<HTMLInputElement>;
+    React.MutableRefObject<HTMLInputElement>;
+
+  // create state ref that can be accessed in OpenLayers onclick callback function
+  //  https://stackoverflow.com/a/60643670
+  const mapRef = useRef() as React.MutableRefObject<Map>;
+  if (map) {
+    mapRef.current = map;
+  }
+
+  const popupContainer = React.useRef<HTMLDivElement>(null);
+  const popupCloser = React.useRef<HTMLAnchorElement>(null);
+  const popupContent = React.useRef<HTMLDivElement>(null);
+
+  const overlayRef = useRef() as React.MutableRefObject<Overlay>;
+  overlayRef.current = currentOverlay!;
 
   useEffect( () => {
     // create and add initial vector source layer, to be replaced layer
@@ -78,6 +127,24 @@ const MapWrapper = ({features}: IMapWrapperProps) => {
       source: new VectorSource(),
     });
 
+    if (!popupCloser || !popupContainer) {
+      return;
+    }
+
+    popupCloser.current!.onclick = function() {
+      overlay.setPosition(undefined);
+      popupCloser.current!.blur();
+      return false;
+    };
+
+    const overlay = new Overlay({
+      // Using the non-null assertion operator as we check for null above
+      element: popupContainer.current!,
+      autoPan: true,
+      autoPanAnimation: {
+        duration: 250,
+      },
+    });
     const initialMap = new Map({
       target: mapElement.current,
       view: new View({
@@ -85,9 +152,15 @@ const MapWrapper = ({features}: IMapWrapperProps) => {
         zoom: 4,
       }),
       controls: [],
+      overlays: [overlay],
     });
+    const currentZoom = Math.floor(initialMap.getView().getZoom());
 
+    initialMap.on('moveend', handleMoveEnd);
+    initialMap.on('click', handleMapClick);
     setMap(initialMap);
+    setCurrentZoom(currentZoom);
+    setCurrentOverlay(overlay);
     setFeaturesLayer(initialFeaturesLayer);
     olms(initialMap, mapConfig);
   }, []);
@@ -112,8 +185,116 @@ const MapWrapper = ({features}: IMapWrapperProps) => {
     }
   }, [features]);
 
+  const handleMapClick = (event: { pixel: any; }) => {
+    const clickedCoord = mapRef.current.getCoordinateFromPixel(event.pixel);
+
+    mapRef.current.forEachFeatureAtPixel(event.pixel, (feature) => {
+      setSelectedFeature(feature);
+      return true;
+    });
+
+    overlayRef.current.setPosition(clickedCoord);
+  };
+
+  const handleMoveEnd = () => {
+    const newZoom = Math.floor(mapRef.current.getView().getZoom()!);
+    if (currentZoom != newZoom) {
+      setCurrentZoom(newZoom);
+    }
+  };
+
+  const readablePercent = (percent: number) => {
+    return `${(percent * 100).toFixed(2)}%`;
+  };
+
+  let properties;
+  if (selectedFeature) {
+    properties = selectedFeature.getProperties();
+  }
+
+  const getCategorization = (percentile: number) => {
+    let categorization = '';
+    if (percentile >= 0.75 ) {
+      categorization = 'Prioritized';
+    } else if (0.60 <= percentile && percentile < 0.75) {
+      categorization = 'Threshold';
+    } else {
+      categorization = 'Non-prioritized';
+    }
+    return categorization;
+  };
+
+  const getTitleContent = (properties: { [key: string]: any; }) => {
+    const blockGroup = properties['GEOID10'];
+    const score = properties['Score C (percentile)'];
+    return (
+      <table className={styles.popupHeaderTable}>
+        <tbody>
+          <tr>
+            <td><strong>Census Block Group:</strong></td>
+            <td>{blockGroup}</td>
+          </tr>
+          <tr>
+            <td><strong>Just Progress Categorization:</strong></td>
+            <td>{getCategorization(score)}</td>
+          </tr>
+          <tr>
+            <td><strong>Cumulative Index Score:</strong></td>
+            <td>{readablePercent(score)}</td>
+          </tr>
+        </tbody>
+      </table>
+    );
+  };
+
+  // const propertyTest = (propertyName:string) => {
+  //   // Filter out properties in all caps
+  //   return !propertyName.match(/^[A-Z0-9]+$/);
+  // };
+
   return (
-    <div ref={mapElement} className={styles.mapContainer}></div>
+    <div className={styles.mapWrapperContainer}>
+      <div ref={mapElement} className={styles.mapContainer} />
+
+      <div ref={popupContainer} className={styles.popupContainer}>
+        <a href="#" ref={popupCloser} className={styles.popupCloser}></a>
+        <div ref={popupContent} className={styles.popupContent}>
+          {(selectedFeature && properties) ?
+              <div>
+                {getTitleContent(properties)}
+                {/* <Table bordered={false}>
+                  <thead>
+                    <tr>
+                      <th scope="col">Indicator</th>
+                      <th scope="col">Percentile(0-100)</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {
+                      Object.keys(properties).map((key, index) => (
+                        (propertyTest(key)) &&
+                        <tr key={key} >
+                          <td>{key}</td>
+                          <td>{properties[key]}</td>
+                        </tr>
+                      ))
+                    }
+                  </tbody>
+                </Table> */}
+              </div> :
+              ''}
+        </div>
+      </div>
+
+      { currentZoom < 5 ?
+      <div className={styles.zoomWarning}>
+        <img
+          src={zoomIcon} alt={'zoom icon'}/>
+          Zoom in to the state or regional level to see prioritized communities on the map.
+      </div> :
+      ''
+      }
+    </div>
   );
 };
 
diff --git a/client/src/pages/cejst.tsx b/client/src/pages/cejst.tsx
index 6885a1fb..da424012 100644
--- a/client/src/pages/cejst.tsx
+++ b/client/src/pages/cejst.tsx
@@ -13,7 +13,6 @@ interface IMapPageProps {
 }
 
 const CEJSTPage = ({location}: IMapPageProps) => {
-
   // We temporarily removed MapControls, which would enable you to `setFeatures` also, for now
   //   We will bring back later when we have interactive controls.
   const [features] = useState<Feature<Geometry>[]>([]);