diff --git a/package-lock.json b/package-lock.json
index 2852be41..cbbe1bab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
 				"react-dom": "^17.0.2",
 				"react-redux": "^7.2.5",
 				"react-responsive": "^8.2.0",
-				"react-router-dom": "^5.3.0",
+				"react-router-dom": "^6.14.1",
 				"redux": "^4.1.1"
 			},
 			"devDependencies": {
@@ -8757,6 +8757,14 @@
 			"integrity": "sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==",
 			"peer": true
 		},
+		"node_modules/@remix-run/router": {
+			"version": "1.7.1",
+			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz",
+			"integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==",
+			"engines": {
+				"node": ">=14"
+			}
+		},
 		"node_modules/@rollup/plugin-babel": {
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -16768,19 +16776,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/history": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-			"integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
-			"dependencies": {
-				"@babel/runtime": "^7.1.2",
-				"loose-envify": "^1.2.0",
-				"resolve-pathname": "^3.0.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0",
-				"value-equal": "^1.0.1"
-			}
-		},
 		"node_modules/hoist-non-react-statics": {
 			"version": "3.3.2",
 			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -21718,19 +21713,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/mini-create-react-context": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
-			"integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.1",
-				"tiny-warning": "^1.0.3"
-			},
-			"peerDependencies": {
-				"prop-types": "^15.0.0",
-				"react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
-			}
-		},
 		"node_modules/mini-css-extract-plugin": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
@@ -23370,19 +23352,6 @@
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
-		"node_modules/path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-			"dependencies": {
-				"isarray": "0.0.1"
-			}
-		},
-		"node_modules/path-to-regexp/node_modules/isarray": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -25584,47 +25553,35 @@
 			}
 		},
 		"node_modules/react-router": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.3.tgz",
-			"integrity": "sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==",
-			"dependencies": {
-				"@babel/runtime": "^7.12.13",
-				"history": "^4.9.0",
-				"hoist-non-react-statics": "^3.1.0",
-				"loose-envify": "^1.3.1",
-				"mini-create-react-context": "^0.4.0",
-				"path-to-regexp": "^1.7.0",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.6.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+			"version": "6.14.1",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz",
+			"integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==",
+			"dependencies": {
+				"@remix-run/router": "1.7.1"
+			},
+			"engines": {
+				"node": ">=14"
 			},
 			"peerDependencies": {
-				"react": ">=15"
+				"react": ">=16.8"
 			}
 		},
 		"node_modules/react-router-dom": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.3.tgz",
-			"integrity": "sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==",
+			"version": "6.14.1",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz",
+			"integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==",
 			"dependencies": {
-				"@babel/runtime": "^7.12.13",
-				"history": "^4.9.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.6.2",
-				"react-router": "5.3.3",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"@remix-run/router": "1.7.1",
+				"react-router": "6.14.1"
+			},
+			"engines": {
+				"node": ">=14"
 			},
 			"peerDependencies": {
-				"react": ">=15"
+				"react": ">=16.8",
+				"react-dom": ">=16.8"
 			}
 		},
-		"node_modules/react-router/node_modules/react-is": {
-			"version": "16.13.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-		},
 		"node_modules/react-scripts": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
@@ -26267,11 +26224,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/resolve-pathname": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-			"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
-		},
 		"node_modules/resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -28172,11 +28124,6 @@
 			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
 			"dev": true
 		},
-		"node_modules/tiny-invariant": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
-			"integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
-		},
 		"node_modules/tiny-warning": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
@@ -28821,11 +28768,6 @@
 				"node": ">= 0.10"
 			}
 		},
-		"node_modules/value-equal": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-			"integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
-		},
 		"node_modules/vary": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -37046,6 +36988,11 @@
 			"integrity": "sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==",
 			"peer": true
 		},
+		"@remix-run/router": {
+			"version": "1.7.1",
+			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz",
+			"integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ=="
+		},
 		"@rollup/plugin-babel": {
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -43152,19 +43099,6 @@
 				}
 			}
 		},
-		"history": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
-			"integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
-			"requires": {
-				"@babel/runtime": "^7.1.2",
-				"loose-envify": "^1.2.0",
-				"resolve-pathname": "^3.0.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0",
-				"value-equal": "^1.0.1"
-			}
-		},
 		"hoist-non-react-statics": {
 			"version": "3.3.2",
 			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -47135,15 +47069,6 @@
 			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
 			"dev": true
 		},
-		"mini-create-react-context": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
-			"integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
-			"requires": {
-				"@babel/runtime": "^7.12.1",
-				"tiny-warning": "^1.0.3"
-			}
-		},
 		"mini-css-extract-plugin": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
@@ -48402,21 +48327,6 @@
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
-		"path-to-regexp": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-			"requires": {
-				"isarray": "0.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-				}
-			}
-		},
 		"path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -49861,41 +49771,20 @@
 			}
 		},
 		"react-router": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.3.tgz",
-			"integrity": "sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==",
-			"requires": {
-				"@babel/runtime": "^7.12.13",
-				"history": "^4.9.0",
-				"hoist-non-react-statics": "^3.1.0",
-				"loose-envify": "^1.3.1",
-				"mini-create-react-context": "^0.4.0",
-				"path-to-regexp": "^1.7.0",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.6.0",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "16.13.1",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-					"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-				}
+			"version": "6.14.1",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz",
+			"integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==",
+			"requires": {
+				"@remix-run/router": "1.7.1"
 			}
 		},
 		"react-router-dom": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.3.tgz",
-			"integrity": "sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==",
+			"version": "6.14.1",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz",
+			"integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==",
 			"requires": {
-				"@babel/runtime": "^7.12.13",
-				"history": "^4.9.0",
-				"loose-envify": "^1.3.1",
-				"prop-types": "^15.6.2",
-				"react-router": "5.3.3",
-				"tiny-invariant": "^1.0.2",
-				"tiny-warning": "^1.0.0"
+				"@remix-run/router": "1.7.1",
+				"react-router": "6.14.1"
 			}
 		},
 		"react-scripts": {
@@ -50363,11 +50252,6 @@
 			"integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
 			"peer": true
 		},
-		"resolve-pathname": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
-			"integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
-		},
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -51840,11 +51724,6 @@
 			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
 			"dev": true
 		},
-		"tiny-invariant": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.2.0.tgz",
-			"integrity": "sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg=="
-		},
 		"tiny-warning": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
@@ -52345,11 +52224,6 @@
 			"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
 			"dev": true
 		},
-		"value-equal": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
-			"integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
-		},
 		"vary": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/package.json b/package.json
index 08516ef6..43a8a2e6 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 		"react-dom": "^17.0.2",
 		"react-redux": "^7.2.5",
 		"react-responsive": "^8.2.0",
-		"react-router-dom": "^5.3.0",
+		"react-router-dom": "^6.14.1",
 		"redux": "^4.1.1"
 	},
 	"devDependencies": {