Repository: thenewboston-developers/Website
Pull request #1857 (2021-06-12 20:20:40)

Remove webmap, optimize bundle, update team


Patch:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5623181..4ee44dd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -36,4 +36,4 @@ Add any other context about the problem here.
 **Account Number**
 Your account number where the reward coins for this bug bounty will be sent (pending review and approval).
 
-[How to Create an Account](https://thenewboston.com/account-manager/create-an-account)
+[How to Create an Account](https://thenewboston.com/wallet/create-an-account)
diff --git a/.gitignore b/.gitignore
index 87e957f..898bc06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ out/
 # VS Code
 .vs/
 .vscode/
+
+build/
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 269367f..9a36ce6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,25 +9,12 @@
       "version": "0.1.0",
       "dependencies": {
         "@reduxjs/toolkit": "^1.5.0",
-        "@testing-library/jest-dom": "^5.11.9",
-        "@testing-library/react": "^11.2.5",
-        "@testing-library/user-event": "^12.6.3",
         "@thenewboston/ui": "^0.1.9",
         "@thenewboston/utils": "^1.0.0",
-        "@types/jest": "^26.0.20",
-        "@types/node": "^12.0.0",
-        "@types/react": "^17.0.2",
-        "@types/react-dom": "^17.0.1",
-        "@types/react-helmet": "^6.1.0",
-        "@types/react-redux": "^7.1.11",
-        "@types/react-select": "^3.0.23",
-        "@types/react-syntax-highlighter": "^11.0.4",
-        "@types/yup": "^0.29.9",
         "axios": "^0.21.1",
         "clsx": "^1.1.1",
         "date-fns": "^2.16.1",
         "formik": "^2.2.2",
-        "leaflet": "^1.7.1",
         "lodash-es": "^4.17.15",
         "mdi-react": "^7.3.0",
         "normalize.css": "^8.0.1",
@@ -39,7 +26,6 @@
         "react-dom": "^17.0.1",
         "react-helmet-async": "^1.0.7",
         "react-image": "^4.0.3",
-        "react-leaflet": "^2.8.0",
         "react-player": "^2.9.0",
         "react-redux": "^7.2.2",
         "react-router-dom": "^5.2.0",
@@ -48,16 +34,27 @@
         "react-syntax-highlighter": "^15.3.0",
         "react-toastify": "^6.0.8",
         "sass": "^1.32.8",
-        "typescript": "^4.0.3",
         "yup": "^0.31.0"
       },
       "devDependencies": {
+        "@testing-library/jest-dom": "^5.11.9",
+        "@testing-library/react": "^11.2.5",
+        "@testing-library/user-event": "^12.6.3",
+        "@types/jest": "^26.0.20",
         "@types/leaflet": "^1.5.19",
         "@types/lodash-es": "^4.17.3",
+        "@types/node": "^12.0.0",
         "@types/qrcode": "^1.3.5",
+        "@types/react": "^17.0.2",
         "@types/react-copy-to-clipboard": "^4.3.0",
+        "@types/react-dom": "^17.0.1",
+        "@types/react-helmet": "^6.1.0",
         "@types/react-leaflet": "^2.5.2",
+        "@types/react-redux": "^7.1.11",
         "@types/react-router-dom": "^5.1.5",
+        "@types/react-select": "^3.0.23",
+        "@types/react-syntax-highlighter": "^11.0.4",
+        "@types/yup": "^0.29.9",
         "@typescript-eslint/eslint-plugin": "^4.4.0",
         "@typescript-eslint/parser": "^4.4.0",
         "eslint": "^7.10.0",
@@ -74,7 +71,8 @@
         "lint-staged": "^10.2.9",
         "prettier": "^2.1.2",
         "stylelint": "^13.8.0",
-        "stylelint-order": "^4.1.0"
+        "stylelint-order": "^4.1.0",
+        "typescript": "^4.0.3"
       },
       "engines": {
         "node": ">=12"
@@ -2585,6 +2583,7 @@
       "version": "7.29.6",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.29.6.tgz",
       "integrity": "sha512-vzTsAXa439ptdvav/4lsKRcGpAQX7b6wBIqia7+iNzqGJ5zjswApxA6jDAsexrc6ue9krWcbh8o+LYkBXW+GCQ==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -2603,6 +2602,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -2614,6 +2614,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
       "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -2626,6 +2627,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -2636,12 +2638,14 @@
     "node_modules/@testing-library/dom/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/@testing-library/dom/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2650,6 +2654,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -2661,6 +2666,7 @@
       "version": "5.11.9",
       "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.9.tgz",
       "integrity": "sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ==",
+      "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.9.2",
         "@types/testing-library__jest-dom": "^5.9.1",
@@ -2681,6 +2687,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -2692,6 +2699,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
       "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -2704,6 +2712,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -2714,12 +2723,14 @@
     "node_modules/@testing-library/jest-dom/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/@testing-library/jest-dom/node_modules/css": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
       "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+      "dev": true,
       "dependencies": {
         "inherits": "^2.0.4",
         "source-map": "^0.6.1",
@@ -2730,6 +2741,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2738,6 +2750,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
       "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0"
@@ -2747,6 +2760,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -2758,6 +2772,7 @@
       "version": "11.2.5",
       "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.5.tgz",
       "integrity": "sha512-yEx7oIa/UWLe2F2dqK0FtMF9sJWNXD+2PPtp39BvE0Kh9MJ9Kl0HrZAgEuhUJR+Lx8Di6Xz+rKwSdEPY2UV8ZQ==",
+      "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@testing-library/dom": "^7.28.1"
@@ -2770,6 +2785,7 @@
       "version": "12.6.3",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.6.3.tgz",
       "integrity": "sha512-PCmbUKofE4SXA7l8jphZAbvv5H3c4ix34xPZ/GNe99fASX//msJRgiMbHIBP+GwRfgVG9c7zmkODSPu2X2vNRw==",
+      "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5"
       },
@@ -2810,7 +2826,8 @@
     "node_modules/@types/aria-query": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
-      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg=="
+      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==",
+      "dev": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.1.12",
@@ -2904,6 +2921,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
       "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -2939,6 +2957,7 @@
       "version": "26.0.20",
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.20.tgz",
       "integrity": "sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==",
+      "dev": true,
       "dependencies": {
         "jest-diff": "^26.0.0",
         "pretty-format": "^26.0.0"
@@ -3021,7 +3040,8 @@
     "node_modules/@types/prop-types": {
       "version": "15.7.3",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
-      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==",
+      "dev": true
     },
     "node_modules/@types/q": {
       "version": "1.5.4",
@@ -3041,6 +3061,7 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.2.tgz",
       "integrity": "sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==",
+      "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -3059,6 +3080,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -3067,6 +3089,7 @@
       "version": "16.14.4",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.4.tgz",
       "integrity": "sha512-ETj7GbkPGjca/A4trkVeGvoIakmLV6ZtX3J8dcmOpzKzWVybbrOxanwaIPG71GZwImoMDY6Fq4wIe34lEqZ0FQ==",
+      "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -3076,6 +3099,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.0.tgz",
       "integrity": "sha512-PYRoU1XJFOzQ3BHvWL1T8iDNbRjdMDJMT5hFmZKGbsq09kbSqJy61uwEpTrbTNWDopVphUT34zUSVLK9pjsgYQ==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -3094,6 +3118,7 @@
       "version": "7.1.11",
       "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.11.tgz",
       "integrity": "sha512-OjaFlmqy0CRbYKBoaWF84dub3impqnLJUrz4u8PRjDzaa4n1A2cVmjMV81shwXyAD5x767efhA8STFGJz/r1Zg==",
+      "dev": true,
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -3126,6 +3151,7 @@
       "version": "3.0.23",
       "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.23.tgz",
       "integrity": "sha512-WrXjixjHlDfG4kSwasQZvZXD+hPamNTvJYWYb5TAt3hwhVg+4imNMPdUTDQhrGrCHIeKUc5h+syGCylnw30Suw==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*",
         "@types/react-dom": "*",
@@ -3136,6 +3162,7 @@
       "version": "11.0.5",
       "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
       "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -3144,6 +3171,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz",
       "integrity": "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==",
+      "dev": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -3175,6 +3203,7 @@
       "version": "5.9.5",
       "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz",
       "integrity": "sha512-ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ==",
+      "dev": true,
       "dependencies": {
         "@types/jest": "*"
       }
@@ -3239,7 +3268,8 @@
     "node_modules/@types/yup": {
       "version": "0.29.9",
       "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.9.tgz",
-      "integrity": "sha512-ZtjjlrHuHTYctHDz3c8XgInjj0v+Hahe32N/4cDa2banibf9w6aAgxwx0jZtBjKKzmGIU4NXhofEsBW1BbqrNg=="
+      "integrity": "sha512-ZtjjlrHuHTYctHDz3c8XgInjj0v+Hahe32N/4cDa2banibf9w6aAgxwx0jZtBjKKzmGIU4NXhofEsBW1BbqrNg==",
+      "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "4.8.1",
@@ -6148,7 +6178,8 @@
     "node_modules/css.escape": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s="
+      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "dev": true
     },
     "node_modules/cssdb": {
       "version": "4.4.0",
@@ -6764,7 +6795,8 @@
     "node_modules/dom-accessibility-api": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz",
-      "integrity": "sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ=="
+      "integrity": "sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==",
+      "dev": true
     },
     "node_modules/dom-converter": {
       "version": "0.2.0",
@@ -13586,11 +13618,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "node_modules/leaflet": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz",
-      "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
-    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -14275,6 +14302,7 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
       "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
+      "dev": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -14559,6 +14587,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -17714,17 +17743,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/react-leaflet": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-2.8.0.tgz",
-      "integrity": "sha512-Y7oHtNrrlRH8muDttXf+jZ2Ga/X7jneSGi1GN8uEdeCfLProTqgG2Zoa5TfloS3ZnY20v7w+DIenMG59beFsQw==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.1",
-        "fast-deep-equal": "^3.1.3",
-        "hoist-non-react-statics": "^3.3.2",
-        "warning": "^4.0.3"
-      }
-    },
     "node_modules/react-player": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-player/-/react-player-2.9.0.tgz",
@@ -18005,6 +18023,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
       "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
       "dependencies": {
         "indent-string": "^4.0.0",
         "strip-indent": "^3.0.0"
@@ -19922,6 +19941,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
       "dependencies": {
         "min-indent": "^1.0.0"
       },
@@ -21283,6 +21303,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz",
       "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -21763,14 +21784,6 @@
         "makeerror": "1.0.x"
       }
     },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -25550,6 +25563,7 @@
       "version": "7.29.6",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.29.6.tgz",
       "integrity": "sha512-vzTsAXa439ptdvav/4lsKRcGpAQX7b6wBIqia7+iNzqGJ5zjswApxA6jDAsexrc6ue9krWcbh8o+LYkBXW+GCQ==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -25565,6 +25579,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -25573,6 +25588,7 @@
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
           "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -25582,6 +25598,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -25589,17 +25606,20 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -25610,6 +25630,7 @@
       "version": "5.11.9",
       "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.9.tgz",
       "integrity": "sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ==",
+      "dev": true,
       "requires": {
         "@babel/runtime": "^7.9.2",
         "@types/testing-library__jest-dom": "^5.9.1",
@@ -25625,6 +25646,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -25633,6 +25655,7 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
           "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -25642,6 +25665,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -25649,12 +25673,14 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "css": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
           "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+          "dev": true,
           "requires": {
             "inherits": "^2.0.4",
             "source-map": "^0.6.1",
@@ -25664,12 +25690,14 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
         "source-map-resolve": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
           "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+          "dev": true,
           "requires": {
             "atob": "^2.1.2",
             "decode-uri-component": "^0.2.0"
@@ -25679,6 +25707,7 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -25689,6 +25718,7 @@
       "version": "11.2.5",
       "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.5.tgz",
       "integrity": "sha512-yEx7oIa/UWLe2F2dqK0FtMF9sJWNXD+2PPtp39BvE0Kh9MJ9Kl0HrZAgEuhUJR+Lx8Di6Xz+rKwSdEPY2UV8ZQ==",
+      "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@testing-library/dom": "^7.28.1"
@@ -25698,6 +25728,7 @@
       "version": "12.6.3",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.6.3.tgz",
       "integrity": "sha512-PCmbUKofE4SXA7l8jphZAbvv5H3c4ix34xPZ/GNe99fASX//msJRgiMbHIBP+GwRfgVG9c7zmkODSPu2X2vNRw==",
+      "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5"
       }
@@ -25725,7 +25756,8 @@
     "@types/aria-query": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
-      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg=="
+      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==",
+      "dev": true
     },
     "@types/babel__core": {
       "version": "7.1.12",
@@ -25819,6 +25851,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
       "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "dev": true,
       "requires": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -25854,6 +25887,7 @@
       "version": "26.0.20",
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.20.tgz",
       "integrity": "sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==",
+      "dev": true,
       "requires": {
         "jest-diff": "^26.0.0",
         "pretty-format": "^26.0.0"
@@ -25936,7 +25970,8 @@
     "@types/prop-types": {
       "version": "15.7.3",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
-      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==",
+      "dev": true
     },
     "@types/q": {
       "version": "1.5.4",
@@ -25956,6 +25991,7 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.2.tgz",
       "integrity": "sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==",
+      "dev": true,
       "requires": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -25974,6 +26010,7 @@
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.1.tgz",
       "integrity": "sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q==",
+      "dev": true,
       "requires": {
         "@types/react": "*"
       },
@@ -25982,6 +26019,7 @@
           "version": "16.14.4",
           "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.4.tgz",
           "integrity": "sha512-ETj7GbkPGjca/A4trkVeGvoIakmLV6ZtX3J8dcmOpzKzWVybbrOxanwaIPG71GZwImoMDY6Fq4wIe34lEqZ0FQ==",
+          "dev": true,
           "requires": {
             "@types/prop-types": "*",
             "csstype": "^3.0.2"
@@ -25993,6 +26031,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.0.tgz",
       "integrity": "sha512-PYRoU1XJFOzQ3BHvWL1T8iDNbRjdMDJMT5hFmZKGbsq09kbSqJy61uwEpTrbTNWDopVphUT34zUSVLK9pjsgYQ==",
+      "dev": true,
       "requires": {
         "@types/react": "*"
       }
@@ -26011,6 +26050,7 @@
       "version": "7.1.11",
       "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.11.tgz",
       "integrity": "sha512-OjaFlmqy0CRbYKBoaWF84dub3impqnLJUrz4u8PRjDzaa4n1A2cVmjMV81shwXyAD5x767efhA8STFGJz/r1Zg==",
+      "dev": true,
       "requires": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -26043,6 +26083,7 @@
       "version": "3.0.23",
       "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.23.tgz",
       "integrity": "sha512-WrXjixjHlDfG4kSwasQZvZXD+hPamNTvJYWYb5TAt3hwhVg+4imNMPdUTDQhrGrCHIeKUc5h+syGCylnw30Suw==",
+      "dev": true,
       "requires": {
         "@types/react": "*",
         "@types/react-dom": "*",
@@ -26053,6 +26094,7 @@
       "version": "11.0.5",
       "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
       "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
+      "dev": true,
       "requires": {
         "@types/react": "*"
       }
@@ -26061,6 +26103,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz",
       "integrity": "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==",
+      "dev": true,
       "requires": {
         "@types/react": "*"
       }
@@ -26092,6 +26135,7 @@
       "version": "5.9.5",
       "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz",
       "integrity": "sha512-ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ==",
+      "dev": true,
       "requires": {
         "@types/jest": "*"
       }
@@ -26155,7 +26199,8 @@
     "@types/yup": {
       "version": "0.29.9",
       "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.9.tgz",
-      "integrity": "sha512-ZtjjlrHuHTYctHDz3c8XgInjj0v+Hahe32N/4cDa2banibf9w6aAgxwx0jZtBjKKzmGIU4NXhofEsBW1BbqrNg=="
+      "integrity": "sha512-ZtjjlrHuHTYctHDz3c8XgInjj0v+Hahe32N/4cDa2banibf9w6aAgxwx0jZtBjKKzmGIU4NXhofEsBW1BbqrNg==",
+      "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
       "version": "4.8.1",
@@ -28616,7 +28661,8 @@
     "css.escape": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s="
+      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "dev": true
     },
     "cssdb": {
       "version": "4.4.0",
@@ -29118,7 +29164,8 @@
     "dom-accessibility-api": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz",
-      "integrity": "sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ=="
+      "integrity": "sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==",
+      "dev": true
     },
     "dom-converter": {
       "version": "0.2.0",
@@ -34544,11 +34591,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "leaflet": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz",
-      "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
-    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -35098,7 +35140,8 @@
     "lz-string": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
+      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
+      "dev": true
     },
     "magic-string": {
       "version": "0.25.7",
@@ -35339,7 +35382,8 @@
     "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true
     },
     "mini-create-react-context": {
       "version": "0.4.1",
@@ -37950,17 +37994,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "react-leaflet": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-2.8.0.tgz",
-      "integrity": "sha512-Y7oHtNrrlRH8muDttXf+jZ2Ga/X7jneSGi1GN8uEdeCfLProTqgG2Zoa5TfloS3ZnY20v7w+DIenMG59beFsQw==",
-      "requires": {
-        "@babel/runtime": "^7.12.1",
-        "fast-deep-equal": "^3.1.3",
-        "hoist-non-react-statics": "^3.3.2",
-        "warning": "^4.0.3"
-      }
-    },
     "react-player": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-player/-/react-player-2.9.0.tgz",
@@ -38208,6 +38241,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
       "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
       "requires": {
         "indent-string": "^4.0.0",
         "strip-indent": "^3.0.0"
@@ -39843,6 +39877,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
       "requires": {
         "min-indent": "^1.0.0"
       }
@@ -40929,7 +40964,8 @@
     "typescript": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz",
-      "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ=="
+      "integrity": "sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==",
+      "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
@@ -41340,14 +41376,6 @@
         "makeerror": "1.0.x"
       }
     },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
diff --git a/package.json b/package.json
index 5f7164a..6adb3da 100644
--- a/package.json
+++ b/package.json
@@ -2,27 +2,15 @@
   "name": "thenewboston-website",
   "version": "0.1.0",
   "private": true,
+  "sideEffects": false,
   "dependencies": {
     "@reduxjs/toolkit": "^1.5.0",
-    "@testing-library/jest-dom": "^5.11.9",
-    "@testing-library/react": "^11.2.5",
-    "@testing-library/user-event": "^12.6.3",
     "@thenewboston/ui": "^0.1.9",
     "@thenewboston/utils": "^1.0.0",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.1",
-    "@types/react-helmet": "^6.1.0",
-    "@types/react-redux": "^7.1.11",
-    "@types/react-select": "^3.0.23",
-    "@types/react-syntax-highlighter": "^11.0.4",
-    "@types/yup": "^0.29.9",
     "axios": "^0.21.1",
     "clsx": "^1.1.1",
     "date-fns": "^2.16.1",
     "formik": "^2.2.2",
-    "leaflet": "^1.7.1",
     "lodash-es": "^4.17.15",
     "mdi-react": "^7.3.0",
     "normalize.css": "^8.0.1",
@@ -34,7 +22,6 @@
     "react-dom": "^17.0.1",
     "react-helmet-async": "^1.0.7",
     "react-image": "^4.0.3",
-    "react-leaflet": "^2.8.0",
     "react-player": "^2.9.0",
     "react-redux": "^7.2.2",
     "react-router-dom": "^5.2.0",
@@ -43,7 +30,6 @@
     "react-syntax-highlighter": "^15.3.0",
     "react-toastify": "^6.0.8",
     "sass": "^1.32.8",
-    "typescript": "^4.0.3",
     "yup": "^0.31.0"
   },
   "scripts": {
@@ -71,12 +57,24 @@
     ]
   },
   "devDependencies": {
+    "@testing-library/jest-dom": "^5.11.9",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^12.6.3",
+    "@types/jest": "^26.0.20",
     "@types/leaflet": "^1.5.19",
     "@types/lodash-es": "^4.17.3",
+    "@types/node": "^12.0.0",
     "@types/qrcode": "^1.3.5",
+    "@types/react": "^17.0.2",
     "@types/react-copy-to-clipboard": "^4.3.0",
+    "@types/react-dom": "^17.0.1",
+    "@types/react-helmet": "^6.1.0",
     "@types/react-leaflet": "^2.5.2",
+    "@types/react-redux": "^7.1.11",
     "@types/react-router-dom": "^5.1.5",
+    "@types/react-select": "^3.0.23",
+    "@types/react-syntax-highlighter": "^11.0.4",
+    "@types/yup": "^0.29.9",
     "@typescript-eslint/eslint-plugin": "^4.4.0",
     "@typescript-eslint/parser": "^4.4.0",
     "eslint": "^7.10.0",
@@ -93,7 +91,8 @@
     "lint-staged": "^10.2.9",
     "prettier": "^2.1.2",
     "stylelint": "^13.8.0",
-    "stylelint-order": "^4.1.0"
+    "stylelint-order": "^4.1.0",
+    "typescript": "^4.0.3"
   },
   "engines": {
     "node": ">=12"
diff --git a/src/apis/webmap/index.ts b/src/apis/webmap/index.ts
deleted file mode 100644
index b29385e..0000000
--- a/src/apis/webmap/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import axios from 'axios';
-
-import * as apiEndpoints from 'constants/api-endpoints';
-
-export async function getAllNodes() {
-  return axios.all([axios.get(apiEndpoints.VALIDATOR_ENDPOINT), axios.get(apiEndpoints.BANK_ENDPOINT)]);
-}
-
-export async function getAllValidatorIps(validatorIps: any) {
-  return axios.post(apiEndpoints.IPAPI_ENDPOINT, validatorIps);
-}
diff --git a/src/assets/svgs/bank1.svg b/src/assets/svgs/bank1.svg
deleted file mode 100644
index fd867a4..0000000
--- a/src/assets/svgs/bank1.svg
+++ /dev/null
@@ -1,1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Capa_1" width="938.2" height="938.2" x="0" style="enable-background:new 0 0 938.2 938.2" y="0" version="1.1" viewBox="0 0 938.2 938.2" xml:space="preserve"><g><g><path d="M59.95,938.2H878.25c27.6,0,50-22.4,50-50v-8c0-27.6-22.4-50-50-50H826.95v-371H699.25v371h-68.4v-371h-127.6v371H434.85 v-371h-127.6v371h-68.4v-371h-127.6v371h-51.3c-27.6,0-50,22.4-50,50v8C9.95,915.8,32.35,938.2,59.95,938.2z"/><path d="M889.149,319.9l-389.1-309c-9-7.3-20-10.9-31-10.9c-11,0-22,3.6-31,10.8L48.15,319.7c-12,9.5-19,23.9-19,39.2v20.3 c0,27.6,22.4,50,50,50h32.1h127.6h68.4h127.6h68.401h127.6h68.4h127.6h31.5c27.799,0,50.299-22.7,50-50.6l-0.201-20.2 C907.85,343.4,900.95,329.2,889.149,319.9z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/svgs/validator.svg b/src/assets/svgs/validator.svg
deleted file mode 100644
index dc700e9..0000000
--- a/src/assets/svgs/validator.svg
+++ /dev/null
@@ -1,1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Capa_1" x="0" y="0" version="1.1" viewBox="0 0 489.327 489.327" xml:space="preserve" style="enable-background:new 0 0 489.327 489.327"><g><g><path d="M478.483,273.213l-9.2-12.6c-7.6-10.4-7.7-24.5-0.3-35.1l9-12.7c10.4-14.8,5.6-35.3-10.4-43.9l-13.7-7.4 c-11.4-6.1-17.6-18.8-15.5-31.5l2.6-15.4c3-17.8-10.3-34.3-28.4-35l-15.6-0.7c-12.9-0.5-24-9.3-27.6-21.7l-4.3-15 c-5-17.4-24.1-26.4-40.8-19.2l-14.3,6.2c-11.9,5.1-25.6,2.1-34.3-7.6l-10.4-11.6c-12.1-13.5-33.2-13.3-45.1,0.3l-10.2,11.8 c-8.5,9.7-22.2,13-34.1,8.1l-14.4-5.9c-16.7-6.9-35.7,2.4-40.5,19.9l-4.1,15c-3.3,12.6-14.2,21.5-27.1,22.2l-15.6,0.9 c-18.1,1-31.1,17.7-27.8,35.4l2.8,15.3c2.3,12.7-3.7,25.5-15,31.7l-13.6,7.6c-15.8,8.8-20.4,29.4-9.7,44l9.2,12.6 c7.6,10.4,7.7,24.5,0.3,35.1l-9,12.7c-10.4,14.8-5.6,35.3,10.4,43.9l13.7,7.4c11.4,6.1,17.6,18.8,15.5,31.5l-2.7,15.3 c-3,17.8,10.3,34.3,28.4,35l15.6,0.7c12.9,0.5,24,9.3,27.6,21.7l4.3,15c5,17.4,24.1,26.4,40.8,19.2l14.3-6.2 c11.9-5.1,25.6-2.1,34.3,7.5l10.4,11.6c12.1,13.5,33.2,13.3,45.1-0.3l10.2-11.8c8.5-9.7,22.2-13,34.1-8.1l14.4,5.9 c16.7,6.9,35.7-2.4,40.5-19.9l4.1-15c3.4-12.4,14.4-21.3,27.3-22.1l15.6-0.9c18.1-1,31.1-17.7,27.8-35.4l-2.8-15.3 c-2.3-12.7,3.7-25.5,15-31.7l13.6-7.6C484.583,308.513,489.083,287.813,478.483,273.213z M244.683,402.713 c-87.2,0-157.9-70.7-157.9-157.9s70.7-157.9,157.9-157.9s157.9,70.7,157.9,157.9S331.883,402.713,244.683,402.713z"/><path d="M224.483,249.013l-14-14.1c-8.3-8.4-21.9-8.4-30.3-0.1l0,0c-8.4,8.3-8.4,21.9-0.1,30.3l14,14.1l15.6,15.6 c8.1,8.2,21.3,8.2,29.5,0.1l15.6-15.5l54.4-54.1c8.4-8.3,8.4-21.9,0.1-30.3l0,0c-8.3-8.4-21.9-8.4-30.3-0.1L224.483,249.013z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/components/DocsMenuItems/index.tsx b/src/components/DocsMenuItems/index.tsx
index 68f9f6a..07dd8b2 100644
--- a/src/components/DocsMenuItems/index.tsx
+++ b/src/components/DocsMenuItems/index.tsx
@@ -4,34 +4,34 @@ import {NavLink} from 'react-router-dom';
 import {MenuGroup} from 'components';
 import {NavigationItem} from 'types/navigation';
 
-export const accountManagerNavigationData = [
+export const walletNavigationData = [
   {
     name: 'Get Started',
-    url: '/account-manager/get-started',
+    url: '/wallet/get-started',
   },
   {
     name: 'Create an Account',
-    url: '/account-manager/create-an-account',
+    url: '/wallet/create-an-account',
   },
   {
     name: 'Add Friends',
-    url: '/account-manager/add-friends',
+    url: '/wallet/add-friends',
   },
   {
     name: 'Send Coins',
-    url: '/account-manager/send-coins',
+    url: '/wallet/send-coins',
   },
   {
     name: 'Edit Nicknames',
-    url: '/account-manager/edit-nicknames',
+    url: '/wallet/edit-nicknames',
   },
   {
     name: 'Create a Bank',
-    url: '/account-manager/create-bank',
+    url: '/wallet/create-bank',
   },
   {
     name: 'Create a Validator',
-    url: '/account-manager/create-validator',
+    url: '/wallet/create-validator',
   },
 ];
 
@@ -293,8 +293,8 @@ const DocsMenuItems: FC = () => {
         {renderNavLinks(governanceNavigationData)}
       </MenuGroup>
 
-      <MenuGroup title="Account Manager" urlBase="account-manager">
-        {renderNavLinks(accountManagerNavigationData)}
+      <MenuGroup title="Wallet" urlBase="wallet">
+        {renderNavLinks(walletNavigationData)}
       </MenuGroup>
 
       <MenuGroup title="Deployment Guides" urlBase="deployment-guide">
diff --git a/src/components/FaqDropdownCard/index.tsx b/src/components/FaqDropdownCard/index.tsx
index 0f6543a..7fd2053 100644
--- a/src/components/FaqDropdownCard/index.tsx
+++ b/src/components/FaqDropdownCard/index.tsx
@@ -29,7 +29,7 @@ const FaqDropdownCard: FC<Props> = ({answer, className, id, question}) => {
       <div className="FaqDropdownCard__anchor" id={id} />
       <div className="FaqDropdownCard__dropdown-container">
         <div className="FaqDropdownCard__left-container">
-          <Link className="FaqDropdownCard__question" to={`${pathname}#${id}`}>
+          <Link className="FaqDropdownCard__question" to={`${pathname}#${id}`} onClick={toggleExpanded}>
             {question}
           </Link>
           <HashLink className="FaqDropdownCard__HashLink" id={id} />
diff --git a/src/containers/AccountManager/index.tsx b/src/containers/AccountManager/index.tsx
deleted file mode 100644
index 61d6518..0000000
--- a/src/containers/AccountManager/index.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, {FC, useMemo} from 'react';
-import {Redirect, useParams} from 'react-router-dom';
-
-import {DashboardLayout, DocsMenuItems, PageTitle, Pagination} from 'components';
-import {accountManagerNavigationData} from 'components/DocsMenuItems';
-import {PageData, PageDataObject} from 'types/page-data';
-
-import AccountManagerAddFriends from './AccountManagerAddFriends';
-import AccountManagerCreateAccount from './AccountManagerCreateAccount';
-import AccountManagerCreateBank from './AccountManagerCreateBank';
-import AccountManagerCreateValidator from './AccountManagerCreateValidator';
-import AccountManagerEditNicknames from './AccountManagerEditNicknames';
-import AccountManagerGetStarted from './AccountManagerGetStarted';
-import AccountManagerSendCoins from './AccountManagerSendCoins';
-
-const defaultPageData: PageData = {
-  content: <Redirect to="/account-manager/get-started" />,
-  name: '',
-};
-
-const pageData: PageDataObject = {
-  'add-friends': {
-    content: <AccountManagerAddFriends />,
-    name: 'Add Friends',
-  },
-  'create-an-account': {
-    content: <AccountManagerCreateAccount />,
-    name: 'Create an Account',
-  },
-  'create-bank': {
-    content: <AccountManagerCreateBank />,
-    name: 'Create a Bank',
-  },
-  'create-validator': {
-    content: <AccountManagerCreateValidator />,
-    name: 'Create a Validator',
-  },
-  'edit-nicknames': {
-    content: <AccountManagerEditNicknames />,
-    name: 'Edit Nicknames',
-  },
-  'get-started': {
-    content: <AccountManagerGetStarted />,
-    name: 'Get Started',
-  },
-  'send-coins': {
-    content: <AccountManagerSendCoins />,
-    name: 'Send Coins',
-  },
-};
-
-const getPageData = (chapter: string): PageData => {
-  return pageData[chapter] || defaultPageData;
-};
-
-const AccountManager: FC = () => {
-  const {chapter} = useParams<{chapter: string}>();
-  const {content, name} = useMemo(() => getPageData(chapter), [chapter]);
-
-  return (
-    <DashboardLayout menuItems={<DocsMenuItems />} pageName={name} sectionName="Account Manager">
-      <PageTitle ogDescription={`${name} | Account Manager`} title={name} />
-      {content}
-      <Pagination navigationData={accountManagerNavigationData} />
-    </DashboardLayout>
-  );
-};
-
-export default AccountManager;
diff --git a/src/containers/App.tsx b/src/containers/App.tsx
index 87b7d4e..72a2876 100644
--- a/src/containers/App.tsx
+++ b/src/containers/App.tsx
@@ -1,9 +1,10 @@
-import React, {FC} from 'react';
+import React, {FC, lazy} from 'react';
 import {BrowserRouter as Router, Redirect, Route, Switch} from 'react-router-dom';
 
 import {Layout} from 'components';
+import withSuspense from 'hoc/withSuspense';
 
-import AccountManager from './AccountManager';
+import Wallet from './Wallet';
 import Assets from './Assets';
 import BankApi from './BankApi';
 import ConfirmationValidatorApi from './ConfirmationValidatorApi';
@@ -20,7 +21,6 @@ import Openings from './Openings';
 import PrimaryValidatorApi from './PrimaryValidatorApi';
 import Profile from './Profile';
 import Progress from './Progress';
-import Projects from './Projects';
 import ProjectRulesAndGuide from './Projects/ProjectRulesAndGuide';
 import SignIn from './SignIn';
 import SignOut from './SignOut';
@@ -28,8 +28,12 @@ import Social from './Social';
 import StyleGuide from './StyleGuide';
 import Tasks from './Tasks';
 import Teams from './Teams';
-import Tutorials from './Tutorials';
-import WebMap from './Webmap';
+
+/**
+ * Lazy load pages that may contribute a lot to the bundle size
+ */
+const Projects = lazy(() => import('./Projects'));
+const Tutorials = lazy(() => import('./Tutorials'));
 
 interface GoogleAnalyticsWindow extends Window {
   ga: any;
@@ -77,7 +81,7 @@ const App: FC = () => {
           <Route exact path="/tasks/:repository" component={Tasks} />
           <Redirect exact path="/teams" to="/teams/All/Members" />
           <Route exact path="/teams/:team/:tab?/:resource?" component={Teams} />
-          <Route path="/account-manager/:chapter?" component={AccountManager} />
+          <Route path="/wallet/:chapter?" component={Wallet} />
           <Route path="/bank-api/:chapter?" component={BankApi} />
           <Route path="/confirmation-validator-api/:chapter?" component={ConfirmationValidatorApi} />
           <Route path="/deployment-guide/:chapter?" component={DeploymentGuide} />
@@ -86,15 +90,14 @@ const App: FC = () => {
           <Route path="/guide/:chapter?" component={Guide} />
           <Route path="/primary-validator-api/:chapter?" component={PrimaryValidatorApi} />
           <Route path="/progress" component={Progress} />
-          <Route path="/projects/:projectId?" component={Projects} />
+          <Route path="/projects/:projectId?" component={withSuspense(Projects)} />
           <Route path="/project-rules/:chapter" component={ProjectRulesAndGuide} />
           <Route exact path="/sign-in" component={SignIn} />
           <Route exact path="/sign-out" component={SignOut} />
           <Route path="/style-guide/:chapter?" component={StyleGuide} />
           <Redirect exact path="/tutorials" to="/tutorials/All" />
-          <Route exact path="/tutorials/:category/:playlistId?" component={Tutorials} />
+          <Route exact path="/tutorials/:category/:playlistId?" component={withSuspense(Tutorials)} />
           <Route path="/users/:userId" component={Profile} />
-          <Route path="/webmap" component={WebMap} />
           <Redirect to="/" />
         </Switch>
       </Layout>
diff --git a/src/containers/Download/index.tsx b/src/containers/Download/index.tsx
index b1e8942..431bf2b 100644
--- a/src/containers/Download/index.tsx
+++ b/src/containers/Download/index.tsx
@@ -102,7 +102,7 @@ const Download: FC = () => {
         </li>
         <li className="instruction-container__li">
           <span className="instruction-container__instruction">
-            Open the app. If you see an error because the Account Manager app is not from the App Store check out{' '}
+            Open the app. If you see an error because the Wallet app is not from the App Store check out{' '}
             <A href="https://support.apple.com/en-us/HT202491">these instructions</A> to allow the install.
           </span>
         </li>
@@ -193,7 +193,7 @@ const Download: FC = () => {
                   >
                     Release notes
                   </div>
-                  <Link to="/account-manager/get-started">How to use</Link>
+                  <Link to="/wallet/get-started">How to use</Link>
                 </div>
                 <div className="Download__cards-container">
                   {renderDownloadCard(Os.Windows)}
diff --git a/src/containers/Guide/GuideAccounts/index.tsx b/src/containers/Guide/GuideAccounts/index.tsx
index b8b34f7..02cbc16 100644
--- a/src/containers/Guide/GuideAccounts/index.tsx
+++ b/src/containers/Guide/GuideAccounts/index.tsx
@@ -10,8 +10,8 @@ const GuideAccounts: FC = () => {
     <DocContainer className="GuideAccounts" title="Accounts" lastUpdated="06 Mar 2021">
       <p>
         <strong>Accounts</strong> are anonymous digital identities on the network where coins can be sent to and from.{' '}
-        <strong>Account managers</strong> are software applications (such as mobile apps or desktop software) that
-        individuals use to create new accounts, manage existing accounts, and send coins.
+        <strong>Wallets</strong> are software applications (such as mobile apps or desktop software) that individuals
+        use to create new accounts, manage existing accounts, and send coins.
       </p>
       <p>
         When sending coins, users enter the amount they wish to send along with the account number of the recipient and
@@ -22,8 +22,8 @@ const GuideAccounts: FC = () => {
       <DocImage alt="accounts simple" maxWidth={600} src={AccountsSimple} />
 
       <p>
-        When users first download an account manager, it guides them through creating a <strong>key pair</strong>. A key
-        pair comprises two keys, a <strong>signing key</strong> and an <strong>account number</strong>.
+        When users first download a wallet, it guides them through creating a <strong>key pair</strong>. A key pair
+        comprises two keys, a <strong>signing key</strong> and an <strong>account number</strong>.
       </p>
 
       <DocImage alt="key pair" maxWidth={380} src={KeyPair} />
@@ -70,8 +70,8 @@ const GuideAccounts: FC = () => {
 
       <DocCallout type={CalloutType.important}>
         Users can have over one account, and they can create and manage several accounts (key pairs) through the same
-        account manager app. This can be thought of as an individual having multiple email addresses, yet managing all
-        of their email accounts from a single app.
+        wallet app. This can be thought of as an individual having multiple email addresses, yet managing all of their
+        email accounts from a single app.
       </DocCallout>
       <p>Terms "account" and "user account" are used interchangeably throughout this documentation.</p>
     </DocContainer>
diff --git a/src/containers/Home/GetStarted/GetStartedCard/GetStartedCard.scss b/src/containers/Home/GetStarted/GetStartedCard/GetStartedCard.scss
index ee15c07..29c74d5 100644
--- a/src/containers/Home/GetStarted/GetStartedCard/GetStartedCard.scss
+++ b/src/containers/Home/GetStarted/GetStartedCard/GetStartedCard.scss
@@ -11,6 +11,7 @@ $padding-768: 24px;
   max-width: $card-width-original;
   padding: $padding;
   position: relative;
+  width: 100%;
 
   &:hover {
     box-shadow: 0 7px 40px 0 #e9effd;
@@ -36,8 +37,9 @@ $padding-768: 24px;
   }
 
   &__button-container {
-    display: flex;
-    flex-direction: row-reverse;
+    bottom: 15px;
+    position: absolute;
+    right: 15px;
   }
 
   &__card-title {
diff --git a/src/containers/TopNav/TopNavMobileMenu/TopNavMobileMenu.scss b/src/containers/TopNav/TopNavMobileMenu/TopNavMobileMenu.scss
index d7390d3..1b7263c 100644
--- a/src/containers/TopNav/TopNavMobileMenu/TopNavMobileMenu.scss
+++ b/src/containers/TopNav/TopNavMobileMenu/TopNavMobileMenu.scss
@@ -121,7 +121,7 @@ $top-nav-height: 60px;
 
     @media (max-width: 768px) {
       animation: mobileSlideDown 0.3s forwards;
-      grid-template-rows: repeat(2, minmax(0, max-content));
+      display: block;
       height: fit-content;
       padding: 50px 36px 18px;
     }
diff --git a/src/containers/AccountManager/AccountManagerAddFriends/AddFriend.png b/src/containers/Wallet/WalletAddFriends/AddFriend.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerAddFriends/AddFriend.png
rename to src/containers/Wallet/WalletAddFriends/AddFriend.png
diff --git a/src/containers/AccountManager/AccountManagerAddFriends/FriendOverview.png b/src/containers/Wallet/WalletAddFriends/FriendOverview.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerAddFriends/FriendOverview.png
rename to src/containers/Wallet/WalletAddFriends/FriendOverview.png
diff --git a/src/containers/AccountManager/AccountManagerAddFriends/index.tsx b/src/containers/Wallet/WalletAddFriends/index.tsx
similarity index 75%
rename from src/containers/AccountManager/AccountManagerAddFriends/index.tsx
rename to src/containers/Wallet/WalletAddFriends/index.tsx
index af1ed93..644bb4e 100644
--- a/src/containers/AccountManager/AccountManagerAddFriends/index.tsx
+++ b/src/containers/Wallet/WalletAddFriends/index.tsx
@@ -5,13 +5,13 @@ import {DocContainer, DocImage, DocSubSection} from 'components';
 import AddFriend from './AddFriend.png';
 import FriendOverview from './FriendOverview.png';
 
-enum AccountManagerAddFriendsNav {
+enum WalletAddFriendsNav {
   friendOverview = 'friend-overview',
 }
 
-const AccountManagerAddFriends: FC = () => {
+const WalletAddFriends: FC = () => {
   return (
-    <DocContainer className="AccountManagerAddFriends" title="Add Friends" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletAddFriends" title="Add Friends" lastUpdated="07 Dec 2020">
       <p>
         To add friends, click the plus button to the right of "Friends" on the left side menu. After entering their
         nickname and account number, click "Add" to add them to your friends list.
@@ -19,7 +19,7 @@ const AccountManagerAddFriends: FC = () => {
 
       <DocImage alt="add friend" bordered maxWidth={1200} src={AddFriend} />
 
-      <DocSubSection id={AccountManagerAddFriendsNav.friendOverview} title="Friend Overview">
+      <DocSubSection id={WalletAddFriendsNav.friendOverview} title="Friend Overview">
         <p>
           After adding a friend, you will be taken to their account overview page where you can view their balance, look
           through their transaction history, and send them coins. You can also edit or remove friends by using the
@@ -32,4 +32,4 @@ const AccountManagerAddFriends: FC = () => {
   );
 };
 
-export default AccountManagerAddFriends;
+export default WalletAddFriends;
diff --git a/src/containers/AccountManager/AccountManagerCreateAccount/AccountOverview.png b/src/containers/Wallet/WalletCreateAccount/AccountOverview.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerCreateAccount/AccountOverview.png
rename to src/containers/Wallet/WalletCreateAccount/AccountOverview.png
diff --git a/src/containers/AccountManager/AccountManagerCreateAccount/CreateNewAccountModal.png b/src/containers/Wallet/WalletCreateAccount/CreateNewAccountModal.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerCreateAccount/CreateNewAccountModal.png
rename to src/containers/Wallet/WalletCreateAccount/CreateNewAccountModal.png
diff --git a/src/containers/AccountManager/AccountManagerCreateAccount/index.tsx b/src/containers/Wallet/WalletCreateAccount/index.tsx
similarity index 82%
rename from src/containers/AccountManager/AccountManagerCreateAccount/index.tsx
rename to src/containers/Wallet/WalletCreateAccount/index.tsx
index 279fd0c..2e1da11 100644
--- a/src/containers/AccountManager/AccountManagerCreateAccount/index.tsx
+++ b/src/containers/Wallet/WalletCreateAccount/index.tsx
@@ -5,13 +5,13 @@ import {DocContainer, DocImage, DocSubSection} from 'components';
 import AccountOverview from './AccountOverview.png';
 import CreateNewAccountModal from './CreateNewAccountModal.png';
 
-enum AccountManagerCreateAccountNav {
+enum WalletCreateAccountNav {
   accountOverview = 'account-overview',
 }
 
-const AccountManagerCreateAccount: FC = () => {
+const WalletCreateAccount: FC = () => {
   return (
-    <DocContainer className="AccountManagerCreateAccount" title="Create an Account" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletCreateAccount" title="Create an Account" lastUpdated="07 Dec 2020">
       <p>
         <strong>Accounts</strong> are anonymous digital identities on the network where coins may be sent to and from.
         To create an account, click the plus button to the right of "Accounts" on the left side menu. After filling out
@@ -20,7 +20,7 @@ const AccountManagerCreateAccount: FC = () => {
 
       <DocImage alt="create new account modal" bordered maxWidth={1200} src={CreateNewAccountModal} />
 
-      <DocSubSection id={AccountManagerCreateAccountNav.accountOverview} title="Account Overview">
+      <DocSubSection id={WalletCreateAccountNav.accountOverview} title="Account Overview">
         <p>
           After creating an account, you will be taken to your account overview page. Here you can see your balance,
           account number, and signing key. Your account number is what you will share with anyone who wishes to send you
@@ -39,4 +39,4 @@ const AccountManagerCreateAccount: FC = () => {
   );
 };
 
-export default AccountManagerCreateAccount;
+export default WalletCreateAccount;
diff --git a/src/containers/AccountManager/AccountManagerCreateBank/BankOverview.png b/src/containers/Wallet/WalletCreateBank/BankOverview.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerCreateBank/BankOverview.png
rename to src/containers/Wallet/WalletCreateBank/BankOverview.png
diff --git a/src/containers/AccountManager/AccountManagerCreateBank/CreateBank.png b/src/containers/Wallet/WalletCreateBank/CreateBank.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerCreateBank/CreateBank.png
rename to src/containers/Wallet/WalletCreateBank/CreateBank.png
diff --git a/src/containers/AccountManager/AccountManagerCreateBank/index.tsx b/src/containers/Wallet/WalletCreateBank/index.tsx
similarity index 79%
rename from src/containers/AccountManager/AccountManagerCreateBank/index.tsx
rename to src/containers/Wallet/WalletCreateBank/index.tsx
index 483a56d..c3484aa 100644
--- a/src/containers/AccountManager/AccountManagerCreateBank/index.tsx
+++ b/src/containers/Wallet/WalletCreateBank/index.tsx
@@ -5,13 +5,13 @@ import {DocContainer, DocImage, DocSubSection} from 'components';
 import BankOverview from './BankOverview.png';
 import CreateBank from './CreateBank.png';
 
-enum AccountManagerCreateBankNav {
+enum WalletCreateBankNav {
   bankOverview = 'bank-overview',
 }
 
-const AccountManagerCreateBank: FC = () => {
+const WalletCreateBank: FC = () => {
   return (
-    <DocContainer className="AccountManagerCreateBank" title="Create a Bank" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletCreateBank" title="Create a Bank" lastUpdated="07 Dec 2020">
       <p>
         <strong>Banks</strong> play a critical role regarding several aspects of the network. They act as the bond
         between end users and the network and have several responsibilities to each. To create a Bank, click the plus
@@ -21,7 +21,7 @@ const AccountManagerCreateBank: FC = () => {
 
       <DocImage alt="create bank modal" bordered maxWidth={1200} src={CreateBank} />
 
-      <DocSubSection id={AccountManagerCreateBankNav.bankOverview} title="Bank Overview">
+      <DocSubSection id={WalletCreateBankNav.bankOverview} title="Bank Overview">
         <p>
           After creating a bank, you will be taken to your bank overview page. Here you can see your Tx Fee (Transaction
           Fee), how many confirmation services your bank has, the network ID and bank account number and an overview of
@@ -34,4 +34,4 @@ const AccountManagerCreateBank: FC = () => {
   );
 };
 
-export default AccountManagerCreateBank;
+export default WalletCreateBank;
diff --git a/src/containers/AccountManager/AccountManagerCreateValidator/CreateValidator.png b/src/containers/Wallet/WalletCreateValidator/CreateValidator.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerCreateValidator/CreateValidator.png
rename to src/containers/Wallet/WalletCreateValidator/CreateValidator.png
diff --git a/src/containers/AccountManager/AccountManagerCreateValidator/ValidatorOverview.png b/src/containers/Wallet/WalletCreateValidator/ValidatorOverview.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerCreateValidator/ValidatorOverview.png
rename to src/containers/Wallet/WalletCreateValidator/ValidatorOverview.png
diff --git a/src/containers/AccountManager/AccountManagerCreateValidator/index.tsx b/src/containers/Wallet/WalletCreateValidator/index.tsx
similarity index 76%
rename from src/containers/AccountManager/AccountManagerCreateValidator/index.tsx
rename to src/containers/Wallet/WalletCreateValidator/index.tsx
index 3fe1b9a..44f5cf7 100644
--- a/src/containers/AccountManager/AccountManagerCreateValidator/index.tsx
+++ b/src/containers/Wallet/WalletCreateValidator/index.tsx
@@ -5,13 +5,13 @@ import {DocContainer, DocImage, DocSubSection} from 'components';
 import CreateValidator from './CreateValidator.png';
 import ValidatorOverview from './ValidatorOverview.png';
 
-enum AccountManagerCreateValidatorNav {
+enum WalletCreateValidatorNav {
   validatorOverview = 'validator-overview',
 }
 
-const AccountManagerCreateValidator: FC = () => {
+const WalletCreateValidator: FC = () => {
   return (
-    <DocContainer className="AccountManagerCreateValidator" title="Create a Validator" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletCreateValidator" title="Create a Validator" lastUpdated="07 Dec 2020">
       <p>
         <strong>Validator's</strong> purpose is most importantly to validate transactions. To create a Validator, click
         the plus button to the right of "Validators" on the left side menu. After choosing a protocol and filling out a
@@ -20,7 +20,7 @@ const AccountManagerCreateValidator: FC = () => {
 
       <DocImage alt="create Validator modal" bordered maxWidth={1200} src={CreateValidator} />
 
-      <DocSubSection id={AccountManagerCreateValidatorNav.validatorOverview} title="Validator Overview">
+      <DocSubSection id={WalletCreateValidatorNav.validatorOverview} title="Validator Overview">
         <p>
           After creating a Validator, you will be taken to your Validator overview page. Here you can see your Tx Fee
           (Transaction Fee), the Daily Rate, the Validator network ID and Validator account number and an overview of
@@ -33,4 +33,4 @@ const AccountManagerCreateValidator: FC = () => {
   );
 };
 
-export default AccountManagerCreateValidator;
+export default WalletCreateValidator;
diff --git a/src/containers/AccountManager/AccountManagerEditNicknames/DropdownMenu.png b/src/containers/Wallet/WalletEditNicknames/DropdownMenu.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerEditNicknames/DropdownMenu.png
rename to src/containers/Wallet/WalletEditNicknames/DropdownMenu.png
diff --git a/src/containers/AccountManager/AccountManagerEditNicknames/EditNicknameModal.png b/src/containers/Wallet/WalletEditNicknames/EditNicknameModal.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerEditNicknames/EditNicknameModal.png
rename to src/containers/Wallet/WalletEditNicknames/EditNicknameModal.png
diff --git a/src/containers/AccountManager/AccountManagerEditNicknames/EditNicknameResults.png b/src/containers/Wallet/WalletEditNicknames/EditNicknameResults.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerEditNicknames/EditNicknameResults.png
rename to src/containers/Wallet/WalletEditNicknames/EditNicknameResults.png
diff --git a/src/containers/AccountManager/AccountManagerEditNicknames/index.tsx b/src/containers/Wallet/WalletEditNicknames/index.tsx
similarity index 77%
rename from src/containers/AccountManager/AccountManagerEditNicknames/index.tsx
rename to src/containers/Wallet/WalletEditNicknames/index.tsx
index 42b398e..6818754 100644
--- a/src/containers/AccountManager/AccountManagerEditNicknames/index.tsx
+++ b/src/containers/Wallet/WalletEditNicknames/index.tsx
@@ -6,26 +6,26 @@ import DropdownMenu from './DropdownMenu.png';
 import EditNicknameModal from './EditNicknameModal.png';
 import EditNicknameResults from './EditNicknameResults.png';
 
-enum AccountManagerEditNicknamesNav {
+enum WalletEditNicknamesNav {
   editNicknameModal = 'edit-nickname-modal',
   editNicknameResults = 'edit-nickname-results',
 }
 
-const AccountManagerEditNicknames: FC = () => {
+const WalletEditNicknames: FC = () => {
   return (
-    <DocContainer className="AccountManagerEditNicknames" title="Edit Nicknames" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletEditNicknames" title="Edit Nicknames" lastUpdated="07 Dec 2020">
       <p>
         You can edit the nickname for any item that appears on your left menu (Validators, Banks, Accounts, and Friends)
         by clicking on the 3 dot menu on the top right of that page and selecting the "Edit Nickname" option.
       </p>
       <DocImage alt="dropdown modal" bordered maxWidth={1200} src={DropdownMenu} />
 
-      <DocSubSection id={AccountManagerEditNicknamesNav.editNicknameModal} title="Edit Nickname Form">
+      <DocSubSection id={WalletEditNicknamesNav.editNicknameModal} title="Edit Nickname Form">
         <p>After you have edited the nickname for that object, click the "Save" button to save the changes.</p>
         <DocImage alt="edit nickname modal" bordered maxWidth={1200} src={EditNicknameModal} />
       </DocSubSection>
 
-      <DocSubSection id={AccountManagerEditNicknamesNav.editNicknameResults} title="Edit Nickname Results">
+      <DocSubSection id={WalletEditNicknamesNav.editNicknameResults} title="Edit Nickname Results">
         <p>The updated nickname will then appear both on the left menu as well as in the top title area of the page.</p>
         <p>
           If you wish to remove a nickname completely and use the default label (IP Address or Account Number) you can
@@ -38,4 +38,4 @@ const AccountManagerEditNicknames: FC = () => {
   );
 };
 
-export default AccountManagerEditNicknames;
+export default WalletEditNicknames;
diff --git a/src/containers/AccountManager/AccountManagerGetStarted/ConnectToTheNetworkForm.png b/src/containers/Wallet/WalletGetStarted/ConnectToTheNetworkForm.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerGetStarted/ConnectToTheNetworkForm.png
rename to src/containers/Wallet/WalletGetStarted/ConnectToTheNetworkForm.png
diff --git a/src/containers/AccountManager/AccountManagerGetStarted/GetStarted.png b/src/containers/Wallet/WalletGetStarted/GetStarted.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerGetStarted/GetStarted.png
rename to src/containers/Wallet/WalletGetStarted/GetStarted.png
diff --git a/src/containers/AccountManager/AccountManagerGetStarted/index.tsx b/src/containers/Wallet/WalletGetStarted/index.tsx
similarity index 87%
rename from src/containers/AccountManager/AccountManagerGetStarted/index.tsx
rename to src/containers/Wallet/WalletGetStarted/index.tsx
index 72b25c2..3bcaf4e 100644
--- a/src/containers/AccountManager/AccountManagerGetStarted/index.tsx
+++ b/src/containers/Wallet/WalletGetStarted/index.tsx
@@ -5,9 +5,9 @@ import {DocContainer, DocImage} from 'components';
 import ConnectToTheNetworkForm from './ConnectToTheNetworkForm.png';
 import GetStarted from './GetStarted.png';
 
-const AccountManagerGetStarted: FC = () => {
+const WalletGetStarted: FC = () => {
   return (
-    <DocContainer className="AccountManagerGetStarted" title="Get Started" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletGetStarted" title="Get Started" lastUpdated="07 Dec 2020">
       <p>
         When the application is first started, it will attempt to automatically connect to the network. If successful
         you will be prompted to either create a new account or add an existing account. To create a new account, simply
@@ -29,4 +29,4 @@ const AccountManagerGetStarted: FC = () => {
   );
 };
 
-export default AccountManagerGetStarted;
+export default WalletGetStarted;
diff --git a/src/containers/AccountManager/AccountManagerSendCoins/SendCoinsModal.png b/src/containers/Wallet/WalletSendCoins/SendCoinsModal.png
similarity index 100%
rename from src/containers/AccountManager/AccountManagerSendCoins/SendCoinsModal.png
rename to src/containers/Wallet/WalletSendCoins/SendCoinsModal.png
diff --git a/src/containers/AccountManager/AccountManagerSendCoins/index.tsx b/src/containers/Wallet/WalletSendCoins/index.tsx
similarity index 81%
rename from src/containers/AccountManager/AccountManagerSendCoins/index.tsx
rename to src/containers/Wallet/WalletSendCoins/index.tsx
index 3de2a5b..e3ec2e7 100644
--- a/src/containers/AccountManager/AccountManagerSendCoins/index.tsx
+++ b/src/containers/Wallet/WalletSendCoins/index.tsx
@@ -4,9 +4,9 @@ import {DocContainer, DocImage} from 'components';
 
 import SendCoinsModal from './SendCoinsModal.png';
 
-const AccountManagerSendCoins: FC = () => {
+const WalletSendCoins: FC = () => {
   return (
-    <DocContainer className="AccountManagerSendCoins" title="Send Coins" lastUpdated="07 Dec 2020">
+    <DocContainer className="WalletSendCoins" title="Send Coins" lastUpdated="07 Dec 2020">
       <p>
         To send coins, first click on the "Send Coins" button at the top of any account page (yours or your friends). A
         form will appear asking from which one of your accounts you would like to send coins from as well as for the
@@ -20,4 +20,4 @@ const AccountManagerSendCoins: FC = () => {
   );
 };
 
-export default AccountManagerSendCoins;
+export default WalletSendCoins;
diff --git a/src/containers/Wallet/index.tsx b/src/containers/Wallet/index.tsx
new file mode 100644
index 0000000..04f111c
--- /dev/null
+++ b/src/containers/Wallet/index.tsx
@@ -0,0 +1,69 @@
+import React, {FC, useMemo} from 'react';
+import {Redirect, useParams} from 'react-router-dom';
+
+import {DashboardLayout, DocsMenuItems, PageTitle, Pagination} from 'components';
+import {walletNavigationData} from 'components/DocsMenuItems';
+import {PageData, PageDataObject} from 'types/page-data';
+
+import WalletAddFriends from './WalletAddFriends';
+import WalletCreateAccount from './WalletCreateAccount';
+import WalletCreateBank from './WalletCreateBank';
+import WalletCreateValidator from './WalletCreateValidator';
+import WalletEditNicknames from './WalletEditNicknames';
+import WalletGetStarted from './WalletGetStarted';
+import WalletSendCoins from './WalletSendCoins';
+
+const defaultPageData: PageData = {
+  content: <Redirect to="/wallet/get-started" />,
+  name: '',
+};
+
+const pageData: PageDataObject = {
+  'add-friends': {
+    content: <WalletAddFriends />,
+    name: 'Add Friends',
+  },
+  'create-an-account': {
+    content: <WalletCreateAccount />,
+    name: 'Create an Account',
+  },
+  'create-bank': {
+    content: <WalletCreateBank />,
+    name: 'Create a Bank',
+  },
+  'create-validator': {
+    content: <WalletCreateValidator />,
+    name: 'Create a Validator',
+  },
+  'edit-nicknames': {
+    content: <WalletEditNicknames />,
+    name: 'Edit Nicknames',
+  },
+  'get-started': {
+    content: <WalletGetStarted />,
+    name: 'Get Started',
+  },
+  'send-coins': {
+    content: <WalletSendCoins />,
+    name: 'Send Coins',
+  },
+};
+
+const getPageData = (chapter: string): PageData => {
+  return pageData[chapter] || defaultPageData;
+};
+
+const Wallet: FC = () => {
+  const {chapter} = useParams<{chapter: string}>();
+  const {content, name} = useMemo(() => getPageData(chapter), [chapter]);
+
+  return (
+    <DashboardLayout menuItems={<DocsMenuItems />} pageName={name} sectionName="Wallet">
+      <PageTitle ogDescription={`${name} | Wallet`} title={name} />
+      {content}
+      <Pagination navigationData={walletNavigationData} />
+    </DashboardLayout>
+  );
+};
+
+export default Wallet;
diff --git a/src/containers/Webmap/Webmap.scss b/src/containers/Webmap/Webmap.scss
deleted file mode 100644
index 9c67650..0000000
--- a/src/containers/Webmap/Webmap.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-@import '~leaflet/dist/leaflet.css';
-@import 'styles/z-index';
-
-$map-bottom-offset: 200px;
-
-.Map {
-  height: calc(100vh - #{$map-bottom-offset});
-  margin-top: 10px;
-  width: 100%;
-  z-index: $z-index-webmap;
-
-  &__Popup {
-    &-heading {
-      color: var(--color-primary);
-      margin-bottom: 12px;
-    }
-
-    &-info {
-      display: grid;
-      grid-column-gap: 4px;
-      grid-row-gap: 8px;
-      grid-template-columns: 100px auto;
-
-      &-label {
-        color: var(--color-gray-500);
-      }
-
-      &-value {
-        word-wrap: anywhere;
-      }
-    }
-  }
-}
diff --git a/src/containers/Webmap/index.tsx b/src/containers/Webmap/index.tsx
deleted file mode 100644
index 218977e..0000000
--- a/src/containers/Webmap/index.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, {FC, useEffect, useState} from 'react';
-import {Map, Marker, Popup, TileLayer} from 'react-leaflet';
-import {Icon} from 'leaflet';
-
-import bankSvg from 'assets/svgs/bank1.svg';
-import validatorSvg from 'assets/svgs/validator.svg';
-import * as api from 'apis/webmap';
-import {useWindowDimensions} from 'hooks';
-
-import './Webmap.scss';
-
-const bankIcon = new Icon({
-  iconSize: [20, 20],
-  iconUrl: bankSvg,
-});
-
-const validatorIcon = new Icon({
-  iconSize: [20, 20],
-  iconUrl: validatorSvg,
-});
-
-const Webmap: FC = () => {
-  const {clientWidth} = useWindowDimensions();
-
-  interface Node {
-    account_number: number;
-    city: string;
-    country: string;
-    default_transaction_fee: number;
-    lat: number;
-    lon: number;
-    org: string;
-    query: string;
-    root_account_file: string;
-  }
-
-  const [nodes, setNodes] = useState<Node[]>([]);
-
-  useEffect(() => {
-    async function fetchData() {
-      const nodeResponse = await api.getAllNodes();
-      const nodeResponses = nodeResponse[0].data.results.concat(nodeResponse[1].data.results);
-      const validatorIps = [];
-      for (let i = 0; i < nodeResponses.length; i += 1) {
-        const ipAddress = nodeResponses[i].ip_address;
-        validatorIps.push({query: ipAddress});
-      }
-      const resultBatch = await api.getAllValidatorIps(validatorIps);
-      const merged = nodeResponses.map((result: any, i: string | number) => ({
-        ...result,
-        ...resultBatch.data[i],
-      }));
-      setNodes(merged);
-    }
-    fetchData();
-  }, []);
-
-  const renderPopupContent = (node: Node) => (
-    <div className="Map__Popup">
-      <h2 className="Map__Popup-heading">{node.root_account_file ? 'Validator' : 'Bank'}</h2>
-      <div className="Map__Popup-info">
-        <div className="Map__Popup-info-label">IP Address</div>
-        <div className="Map__Popup-info-value">{node.query}</div>
-      </div>
-      <div className="Map__Popup-info">
-        <div className="Map__Popup-info-label">Account Number</div>
-        <div className="Map__Popup-info-value">{node.account_number}</div>
-      </div>
-      <div className="Map__Popup-info">
-        <div className="Map__Popup-info-label">Default Tx Fee</div>
-        <div className="Map__Popup-info-value">{node.default_transaction_fee}</div>
-      </div>
-      <div className="Map__Popup-info">
-        <div className="Map__Popup-info-label">City</div>
-        <div className="Map__Popup-info-value">{node.city}</div>
-      </div>
-      <div className="Map__Popup-info">
-        <div className="Map__Popup-info-label">Country</div>
-        <div className="Map__Popup-info-value">{node.country}</div>
-      </div>
-      <div className="Map__Popup-info">
-        <div className="Map__Popup-info-label">Provider</div>
-        <div className="Map__Popup-info-value">{node.org}</div>
-      </div>
-    </div>
-  );
-  return (
-    <Map
-      className="Map"
-      center={clientWidth > 450 ? [37, -30] : [45, -20]}
-      zoom={clientWidth > 450 ? 2.5 : 1}
-      minZoom={clientWidth > 450 ? 2.5 : 1}
-      maxBounds={[
-        [90, -180],
-        [-90, 180],
-      ]}
-    >
-      <TileLayer
-        attribution="Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ"
-        url="https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}"
-      />
-      {nodes.map((node) => (
-        <Marker
-          key={node.query}
-          position={[node.lat + Math.random() * (0.2 - 0.1) + 0.1, node.lon]}
-          icon={node.root_account_file ? validatorIcon : bankIcon}
-        >
-          {clientWidth > 450 && (
-            <Popup maxWidth={700} position={[node.lat + Math.random() * (0.2 - 0.1) + 0.1, node.lon]}>
-              {renderPopupContent(node)}
-            </Popup>
-          )}
-
-          {clientWidth < 450 && (
-            <Popup maxWidth={250} position={[node.lat + Math.random() * (0.2 - 0.1) + 0.1, node.lon]}>
-              {renderPopupContent(node)}
-            </Popup>
-          )}
-        </Marker>
-      ))}
-    </Map>
-  );
-};
-
-export default Webmap;
diff --git a/src/data/teams.json b/src/data/teams.json
index ff5d16c..95ca04c 100644
--- a/src/data/teams.json
+++ b/src/data/teams.json
@@ -170,8 +170,21 @@
     ],
     "contributors": [
       {
-        "title": "Product Manager",
+        "title": "Head of Community",
         "isLead": true,
+        "createdDate": "2020-07-08T02:14:59.307535Z",
+        "contributor": {
+          "contributorId": "1",
+          "discordUsername": "Bucky#2734",
+          "displayName": "Bucky Roberts",
+          "githubUsername": "buckyroberts",
+          "profileImage": "https://avatars2.githubusercontent.com/u/8547538?v=4"
+        },
+        "hourlyRate": 1000
+      },
+      {
+        "title": "Product Manager",
+        "isLead": false,
         "createdDate": "2021-03-02T02:14:59.307535Z",
         "contributor": {
           "contributorId": "7",
@@ -453,16 +466,16 @@
         "isLead": true,
         "createdDate": "2020-07-08T02:14:59.307535Z",
         "contributor": {
-          "contributorId": "1",
-          "discordUsername": "Bucky#2734",
-          "displayName": "Bucky Roberts",
-          "githubUsername": "buckyroberts",
-          "profileImage": "https://avatars2.githubusercontent.com/u/8547538?v=4"
+          "contributorId": "11",
+          "discordUsername": "MsChrishaph#0709",
+          "displayName": "Chrisha",
+          "githubUsername": "Chrisha1212",
+          "profileImage": "https://avatars.githubusercontent.com/u/72809444?s=460&u=e2138725222fb09a546d7d1e164cf64f5583648b&v=4"
         },
-        "hourlyRate": 1000
+        "hourlyRate": 800
       },
       {
-        "title": "Social Media Moderator",
+        "title": "Digital Marketing Specialist",
         "isLead": false,
         "createdDate": "2020-07-08T02:14:59.307535Z",
         "contributor": {
@@ -473,19 +486,6 @@
           "profileImage": "https://avatars2.githubusercontent.com/u/58598872?&v=4"
         },
         "hourlyRate": 800
-      },
-      {
-        "title": "Digital Marketing Specialist",
-        "isLead": false,
-        "createdDate": "2020-07-08T02:14:59.307535Z",
-        "contributor": {
-          "contributorId": "11",
-          "discordUsername": "MsChrishaph#0709",
-          "displayName": "Chrisha",
-          "githubUsername": "Chrisha1212",
-          "profileImage": "https://avatars.githubusercontent.com/u/72809444?s=460&u=e2138725222fb09a546d7d1e164cf64f5583648b&v=4"
-        },
-        "hourlyRate": 800
       }
     ],
     "responsibilities": [
diff --git a/src/hoc/withSuspense/index.tsx b/src/hoc/withSuspense/index.tsx
new file mode 100644
index 0000000..75d7ea0
--- /dev/null
+++ b/src/hoc/withSuspense/index.tsx
@@ -0,0 +1,16 @@
+/* eslint-disable react/jsx-props-no-spreading */
+
+import React, {ComponentType, Suspense} from 'react';
+
+import {Loader} from 'components';
+import './withSuspense.scss';
+
+export default function withSuspense<P>(WrappedComponent: ComponentType<P>) {
+  return (props: P) => {
+    return (
+      <Suspense fallback={<Loader className="WithSuspense__loader" />}>
+        <WrappedComponent {...props} />
+      </Suspense>
+    );
+  };
+}
diff --git a/src/hoc/withSuspense/withSuspense.scss b/src/hoc/withSuspense/withSuspense.scss
new file mode 100644
index 0000000..c7a5eb4
--- /dev/null
+++ b/src/hoc/withSuspense/withSuspense.scss
@@ -0,0 +1,5 @@
+.WithSuspense {
+  &__loader {
+    margin: 0 auto;
+  }
+}
diff --git a/src/types/faq.tsx b/src/types/faq.tsx
index aec7d40..28a1067 100644
--- a/src/types/faq.tsx
+++ b/src/types/faq.tsx
@@ -108,9 +108,9 @@ export const faqQuestionsAndAnswers: TopicQuestionAndAnswers[] = [
             </A>
           </span>
         ),
-        id: 'where-download-account-manager',
+        id: 'where-download-wallet',
         isTop: true,
-        question: 'Where can I download the Account Manager?',
+        question: 'Where can I download the Wallet?',
       },
       {
         answer:
@@ -206,22 +206,22 @@ export const faqQuestionsAndAnswers: TopicQuestionAndAnswers[] = [
       {
         answer: (
           <span>
-            <A newWindow={false} href="/account-manager/get-started">
+            <A newWindow={false} href="/wallet/get-started">
               Here
             </A>
           </span>
         ),
-        id: 'account-manager-guides',
-        question: 'Are there guides for using the Account Manager?',
+        id: 'wallet-guides',
+        question: 'Are there guides for using the Wallet?',
       },
       {
         answer: (
           <span>
-            <A newWindow={false} href="/account-manager/created-bank">
+            <A newWindow={false} href="/wallet/created-bank">
               Bank
             </A>
             ,{' '}
-            <A newWindow={false} href="/account-manager/created-validator">
+            <A newWindow={false} href="/wallet/created-validator">
               PV
             </A>
             .


Test patch:
diff --git a/src/components/DocsMenuItems/DocsMenuItems.test.tsx b/src/components/DocsMenuItems/DocsMenuItems.test.tsx
index da76c2e..52ff2c3 100644
--- a/src/components/DocsMenuItems/DocsMenuItems.test.tsx
+++ b/src/components/DocsMenuItems/DocsMenuItems.test.tsx
@@ -22,6 +22,6 @@ describe('DocsMenuItems component', () => {
     );
     const link = screen.getByText('Get Started');
     expect(link).toBeTruthy();
-    expect(link?.getAttribute('href')).toEqual('/account-manager/get-started');
+    expect(link?.getAttribute('href')).toEqual('/wallet/get-started');
   });
 });