diff --git a/package-lock.json b/package-lock.json
index 3ceec43584..4e7c83acbd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2970,9 +2970,9 @@
       "dev": true
     },
     "@hapi/hoek": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
-      "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
+      "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug=="
     },
     "@hapi/joi": {
       "version": "15.1.1",
@@ -3679,19 +3679,19 @@
       }
     },
     "@next/env": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-10.1.3.tgz",
-      "integrity": "sha512-q7z7NvmRs66lCQmVJtKjDxVtMTjSwP6ExVzaH46pbTH60MHgzEJ9H4jXrFLTihPmCIvpAv6Ai04jbS8dcg1ZMQ=="
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.0.tgz",
+      "integrity": "sha512-tsWBsn1Rb6hXRaHc/pWMCpZ4Ipkf3OCbZ54ef5ukgIyEvzzGdGFXQshPP2AF7yb+8yMpunWs7vOMZW3e8oPF6A=="
     },
     "@next/polyfill-module": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.1.3.tgz",
-      "integrity": "sha512-1DtUVcuoBJAn5IrxIZQjUG1KTPkiXMYloykPSkRxawimgvG9dRj2kscU+4KGNSFxHoxW9c68VRCb+7MDz5aGGw=="
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-10.2.0.tgz",
+      "integrity": "sha512-Nl3GexIUXsmuggkUqrRFyE/2k7UI44JaVzSywtXEyHzxpZm2a5bdMaWuC89pgLiFDDOqmbqyLAbtwm5lNxa7Eg=="
     },
     "@next/react-dev-overlay": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.1.3.tgz",
-      "integrity": "sha512-vIgUah3bR9+MKzwU1Ni5ONfYM0VdI42i7jZ+Ei1c0wjwkG9anVnDqhSQ3mVg62GP2nt7ExaaFyf9THbsw5KYXg==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-10.2.0.tgz",
+      "integrity": "sha512-PRIAoWog41hLN4iJ8dChKp4ysOX0Q8yiNQ/cwzyqEd3EjugkDV5OiKl3mumGKaApJaIra1MX6j1wgQRuLhuWMA==",
       "requires": {
         "@babel/code-frame": "7.12.11",
         "anser": "1.4.9",
@@ -3765,9 +3765,9 @@
       }
     },
     "@next/react-refresh-utils": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.1.3.tgz",
-      "integrity": "sha512-P4GJZuLKfD/o42JvGZ/xP4Hxg68vd3NeZxOLqIuQKFjjaYgC2IrO+lE5PTwGmRkytjfprJC+9j7Jss/xQAS6QA=="
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-10.2.0.tgz",
+      "integrity": "sha512-3I31K9B4hEQRl7yQ44Umyz+szHtuMJrNdwsgJGhoEnUCXSBRHp5wv5Zv8eDa2NewSbe53b2C0oOpivrzmdBakw=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.4",
@@ -4978,91 +4978,91 @@
       }
     },
     "@react-spring/animated": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.1.1.tgz",
-      "integrity": "sha512-u8Assg5uySwqyoeb1f7eBAUSl8sleJTewdfhVi1EtcM9ngU2Snhcp6snF8NGxvf4gZp5z7v+Dfx3KdB2V8NnXQ==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.1.2.tgz",
+      "integrity": "sha512-nKOGk+3aWbNp46V/CB1J2vR3GJI/Vork8N1WTI5mt+32QekrSsBn5/YFt4/iPaDGhLjukFxF0IjLs6hRLqSObw==",
       "requires": {
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@react-spring/core": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.1.1.tgz",
-      "integrity": "sha512-flHeLN56idxQ1YIpUYY1m3r2ZAM2xg7Zb/pHBFSCbnOKP7TtlhAAOfmrabERqaThmrqkFKiq9FjyF76d3OjE5g==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.1.2.tgz",
+      "integrity": "sha512-rgobYPCcLdDwbHBVqAmvtXhhX92G7MoPltJlzUge843yp1dNr47tkagFdCtw9NMGp6eHu/CE5byh/imlhLLAxw==",
       "requires": {
-        "@react-spring/animated": "~9.1.1",
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/animated": "~9.1.2",
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@react-spring/konva": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/konva/-/konva-9.1.1.tgz",
-      "integrity": "sha512-xD93j5gNYyNTspvtxZXIU91RIfAKdqHMCJ4m6pugFQyHpa3EYVFDIMkPx7l7sCngMH/9Ez5Irit7NDtp7rZ1Hw==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/konva/-/konva-9.1.2.tgz",
+      "integrity": "sha512-P60mhUHRYgPPhoTBQWzuzD3hfeCFWC0BQ7N0iHzpMTzDIrAvutyg+iAX59jSXo3yatrcx60NmlCsiG8tRxbw6w==",
       "requires": {
-        "@react-spring/animated": "~9.1.1",
-        "@react-spring/core": "~9.1.1",
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/animated": "~9.1.2",
+        "@react-spring/core": "~9.1.2",
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@react-spring/native": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/native/-/native-9.1.1.tgz",
-      "integrity": "sha512-eDBB4rSCmsuqyhc15VtEOQmEebvnMdg4Nh/OTyAvfDVNQTXm9H1LwZpKi1enxq2kUhpyZ8jX3kHzz3DPy0+Dag==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/native/-/native-9.1.2.tgz",
+      "integrity": "sha512-d7+tCoKAnDPSoVtpyFFm4BWQhn1h833ocdP0d2POZzKTcR1iQ8YI7EQ22iKGLvwH+0vjymde039CgYy31INqWQ==",
       "requires": {
-        "@react-spring/animated": "~9.1.1",
-        "@react-spring/core": "~9.1.1",
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/animated": "~9.1.2",
+        "@react-spring/core": "~9.1.2",
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@react-spring/shared": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.1.1.tgz",
-      "integrity": "sha512-GA9A9l5JxC50eDTDPu5IDUMhQ4MiBrXd3ZdlI6/wUCgAsZ1wPx77sxaccomxlUomRet0IUcXCEKcL1Flax7ZMQ==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.1.2.tgz",
+      "integrity": "sha512-sj/RrhFZAteCWAMk+W0t6Ku/skn/lbskCCs8B7ZnHNLMGPM+Zb3MOk+aVbX3T/D0iq/oTnKWyQYqrXDKiFcZ7g==",
       "requires": {
-        "@react-spring/types": "~9.1.1",
+        "@react-spring/types": "~9.1.2",
         "rafz": "^0.1.14"
       }
     },
     "@react-spring/three": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/three/-/three-9.1.1.tgz",
-      "integrity": "sha512-0CW41OHFkyx9laD/ZEkuHLXTq58c25ZFPTD+NyI2wHuhI1wyM0YGhlueNFXVpzkgpwj9dYnpdI7KxN7Cx0dnJg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/three/-/three-9.1.2.tgz",
+      "integrity": "sha512-d/v94ykmfJGLTJxJ+jxlTAJSfFdD+SSf+yvXReS81hc7+9VYeEwIHVIEKOzckYnPy/MEOSVhIVKF/9wdFIIo6g==",
       "requires": {
-        "@react-spring/animated": "~9.1.1",
-        "@react-spring/core": "~9.1.1",
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/animated": "~9.1.2",
+        "@react-spring/core": "~9.1.2",
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@react-spring/types": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.1.1.tgz",
-      "integrity": "sha512-GaesYowey+nmDw/yhZ5jErEH2UaDl4jxax8aQtW5h3OpNu/QS8swoEn/jxQgffLb0n6gjsER7QyIx/dmZIWlyw=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.1.2.tgz",
+      "integrity": "sha512-NZNImL0ymRFbss1cGKX2qSEeFdFoOgnIJZEW4Uczt+wm04J7g0Zuf23Hf8hM35JtxDr8QO5okp8BBtCM5FzzMg=="
     },
     "@react-spring/web": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.1.1.tgz",
-      "integrity": "sha512-py4c/Agqz9Unf+Apame29XYTLqHnKXSwJA6Q44jcNtHRFMuRjIpCyhS13C1ZI5PcJT0g9b8CvtMQFiShne8wNQ==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.1.2.tgz",
+      "integrity": "sha512-E5W9Hmi2bO6CPorCNV/2iv12ux9LxHJAbpXmrBPKWFRqZixysiHoNQKKPG0DmSvUU1uKkvCvMC4VoB6pj/2kxw==",
       "requires": {
-        "@react-spring/animated": "~9.1.1",
-        "@react-spring/core": "~9.1.1",
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/animated": "~9.1.2",
+        "@react-spring/core": "~9.1.2",
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@react-spring/zdog": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@react-spring/zdog/-/zdog-9.1.1.tgz",
-      "integrity": "sha512-v0bSWfc0HtfAH+ijdml+/h8pFtP+WtWkd8pDq1ncfA0V0ey+8/SILE6vd69jSIYq8Wr/Q/qIpMvPmM77YkT+Ag==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@react-spring/zdog/-/zdog-9.1.2.tgz",
+      "integrity": "sha512-t5RobDp12HGVh6XJ1BZ+dFdxRQ/goEapYvjH5eqQa1vC97bSqJGLiG+SM/E360DtDlh8GXAyGSesd2pXzBkpPg==",
       "requires": {
-        "@react-spring/animated": "~9.1.1",
-        "@react-spring/core": "~9.1.1",
-        "@react-spring/shared": "~9.1.1",
-        "@react-spring/types": "~9.1.1"
+        "@react-spring/animated": "~9.1.2",
+        "@react-spring/core": "~9.1.2",
+        "@react-spring/shared": "~9.1.2",
+        "@react-spring/types": "~9.1.2"
       }
     },
     "@rollup/plugin-node-resolve": {
@@ -5109,59 +5109,59 @@
       }
     },
     "@sentry/browser": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.2.5.tgz",
-      "integrity": "sha512-nlvaE+D7oaj4MxoY9ikw+krQDOjftnDYJQnOwOraXPk7KYM6YwmkakLuE+x/AkaH3FQVTQF330VAa9d6SWETlA==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.3.3.tgz",
+      "integrity": "sha512-M3l4xdpU4fTNERnuXZ46ceMa+bAMdUOaSYbmflYt5GSkBuYS/eC8nAaCj//4CMT4JMwT3oUKYI5k6wDIKgyKMQ==",
       "requires": {
-        "@sentry/core": "6.2.5",
-        "@sentry/types": "6.2.5",
-        "@sentry/utils": "6.2.5",
+        "@sentry/core": "6.3.3",
+        "@sentry/types": "6.3.3",
+        "@sentry/utils": "6.3.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/core": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.2.5.tgz",
-      "integrity": "sha512-I+AkgIFO6sDUoHQticP6I27TT3L+i6TUS03in3IEtpBcSeP2jyhlxI8l/wdA7gsBqUPdQ4GHOOaNgtFIcr8qag==",
-      "requires": {
-        "@sentry/hub": "6.2.5",
-        "@sentry/minimal": "6.2.5",
-        "@sentry/types": "6.2.5",
-        "@sentry/utils": "6.2.5",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.3.3.tgz",
+      "integrity": "sha512-wbmXmhWHpbFLmXf9DBUOp9H5Ao+T8Ztn5KXoxDwBnsYXtgVIzQfdpRbtcNtvJJ/UPZ3H3rRHQ8zQTb5Ni99xYQ==",
+      "requires": {
+        "@sentry/hub": "6.3.3",
+        "@sentry/minimal": "6.3.3",
+        "@sentry/types": "6.3.3",
+        "@sentry/utils": "6.3.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/hub": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.5.tgz",
-      "integrity": "sha512-YlEFdEhcfqpl2HC+/dWXBsBJEljyMzFS7LRRjCk8QANcOdp9PhwQjwebUB4/ulOBjHPP2WZk7fBBd/IKDasTUg==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.3.3.tgz",
+      "integrity": "sha512-vrJHrDKTCAL63dkNNll18Q1c7YjuIYYv5jY56RNUQpm+7sX4v+iw9giOI+iLbPKaGpEyraa17FeF/xO0SqIp9Q==",
       "requires": {
-        "@sentry/types": "6.2.5",
-        "@sentry/utils": "6.2.5",
+        "@sentry/types": "6.3.3",
+        "@sentry/utils": "6.3.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/minimal": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.5.tgz",
-      "integrity": "sha512-RKP4Qx3p7Cv0oX1cPKAkNVFYM7p2k1t32cNk1+rrVQS4hwlJ7Eg6m6fsqsO+85jd6Ne/FnyYsfo9cDD3ImTlWQ==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.3.3.tgz",
+      "integrity": "sha512-MKspEQ5hhTMrbeiNvkRGgm/NX2gM/Mni0vDJjuqQFi2Cd3RwA4ZVO6yRr6XzFPtTGgDsrXg75lQ8rma96Qs8/g==",
       "requires": {
-        "@sentry/hub": "6.2.5",
-        "@sentry/types": "6.2.5",
+        "@sentry/hub": "6.3.3",
+        "@sentry/types": "6.3.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/types": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz",
-      "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w=="
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.3.3.tgz",
+      "integrity": "sha512-UPHzhwqdjta7LCFfqNvJ5g79lRiXOxtgnIp7zlBkHU6yZs4fPnlBadljyi2gGFguN+C+XAukrbXUAq2mb+Mhdw=="
     },
     "@sentry/utils": {
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz",
-      "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.3.3.tgz",
+      "integrity": "sha512-Kz546LeF6Ff/FU53XUVaairMQYFc6sIHBvE5ReZmfDRpaR+qZnfIbWhfoIbSwyBbtF+T8/gcU7mcZpZQmM5jLw==",
       "requires": {
-        "@sentry/types": "6.2.5",
+        "@sentry/types": "6.3.3",
         "tslib": "^1.9.3"
       }
     },
@@ -6636,9 +6636,9 @@
       }
     },
     "@stripe/stripe-js": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.13.2.tgz",
-      "integrity": "sha512-fycUk7ECukNc31lD5apcrUgdRC1BfiIacs+CpacoCjOgo3ablolnWCvDQWMmVWtODYa8bBv2dlBla+Edc5OvZg=="
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.14.0.tgz",
+      "integrity": "sha512-Zw4EI+ph8RPxRpIX2uwKKDIbe7WM2OarasPjIPRulU1UCj8lRFqWWW/fTj79lZtnX3FNZkiTRM13UG1UZF7yjQ=="
     },
     "@stylelint/postcss-css-in-js": {
       "version": "0.37.2",
@@ -7025,10 +7025,13 @@
       "dev": true
     },
     "@types/classnames": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz",
-      "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==",
-      "dev": true
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==",
+      "dev": true,
+      "requires": {
+        "classnames": "*"
+      }
     },
     "@types/color-convert": {
       "version": "2.0.0",
@@ -7377,9 +7380,9 @@
       }
     },
     "@types/react": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.3.tgz",
-      "integrity": "sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==",
+      "version": "17.0.4",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.4.tgz",
+      "integrity": "sha512-onz2BqScSFMoTRdJUZUDD/7xrusM8hBA2Fktk2qgaTYPCgPvWnDEgkrOs8hhPUf2jfcIXkJ5yK6VfYormJS3Jw==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -12157,9 +12160,9 @@
       }
     },
     "core-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
-      "integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+      "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
       "dev": true
     },
     "core-js-compat": {
@@ -12732,50 +12735,26 @@
       "dev": true
     },
     "cssnano-preset-simple": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-simple/-/cssnano-preset-simple-1.2.2.tgz",
-      "integrity": "sha512-gtvrcRSGtP3hA/wS8mFVinFnQdEsEpm3v4I/s/KmNjpdWaThV/4E5EojAzFXxyT5OCSRPLlHR9iQexAqKHlhGQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-simple/-/cssnano-preset-simple-2.0.0.tgz",
+      "integrity": "sha512-HkufSLkaBJbKBFx/7aj5HmCK9Ni/JedRQm0mT2qBzMG/dEuJOLnMt2lK6K1rwOOyV4j9aSY+knbW9WoS7BYpzg==",
       "requires": {
-        "caniuse-lite": "^1.0.30001179",
-        "postcss": "^7.0.32"
+        "caniuse-lite": "^1.0.30001202"
       },
       "dependencies": {
         "caniuse-lite": {
-          "version": "1.0.30001207",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
-          "integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw=="
-        },
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
+          "version": "1.0.30001219",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz",
+          "integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ=="
         }
       }
     },
     "cssnano-simple": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cssnano-simple/-/cssnano-simple-1.2.2.tgz",
-      "integrity": "sha512-4slyYc1w4JhSbhVX5xi9G0aQ42JnRyPg+7l7cqoNyoIDzfWx40Rq3JQZnoAWDu60A4AvKVp9ln/YSUOdhDX68g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-simple/-/cssnano-simple-2.0.0.tgz",
+      "integrity": "sha512-0G3TXaFxlh/szPEG/o3VcmCwl0N3E60XNb9YZZijew5eIs6fLjJuOPxQd9yEBaX2p/YfJtt49i4vYi38iH6/6w==",
       "requires": {
-        "cssnano-preset-simple": "1.2.2",
-        "postcss": "^7.0.32"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        }
+        "cssnano-preset-simple": "^2.0.0"
       }
     },
     "csso": {
@@ -14093,9 +14072,9 @@
       }
     },
     "embla-carousel": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-4.4.0.tgz",
-      "integrity": "sha512-yyqopAhUcMeappOrcaX0J7A8Rp5LNanVN7IvDQFkuOe1R4ThNzBLvJtfiQjmk1HdP/P+45EEuUqBMH79wprnwA=="
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-4.5.0.tgz",
+      "integrity": "sha512-Y154DYESgzau+eIUH1hu4FNYRQmSFdzIr0dVE6Dhqv3IILCTLVcMmDosz5D0GpAd1jJDI1r0WbOBGBonA6wirw=="
     },
     "emittery": {
       "version": "0.7.2",
@@ -18276,14 +18255,6 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "requires": {
-        "isarray": "1.0.0"
-      }
-    },
     "isomorphic-unfetch": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
@@ -20108,15 +20079,6 @@
         "type-check": "~0.3.2"
       }
     },
-    "line-column": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz",
-      "integrity": "sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=",
-      "requires": {
-        "isarray": "^1.0.0",
-        "isobject": "^2.0.0"
-      }
-    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -21886,16 +21848,16 @@
       "dev": true
     },
     "next": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-10.1.3.tgz",
-      "integrity": "sha512-8Jf38F+s0YcXXkJGF5iUxOqSmbHrey0fX5Epc43L0uwDKmN2jK9vhc2ihCwXC1pmu8d2m/8wfTiXRJKGti55yw==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/next/-/next-10.2.0.tgz",
+      "integrity": "sha512-PKDKCSF7s82xudu3kQhOEaokxggpbLEWouEUtzP6OqV0YqKYHF+Ff+BFLycEem8ixtTM2M6ElN0VRJcskJfxPQ==",
       "requires": {
         "@babel/runtime": "7.12.5",
         "@hapi/accept": "5.0.1",
-        "@next/env": "10.1.3",
-        "@next/polyfill-module": "10.1.3",
-        "@next/react-dev-overlay": "10.1.3",
-        "@next/react-refresh-utils": "10.1.3",
+        "@next/env": "10.2.0",
+        "@next/polyfill-module": "10.2.0",
+        "@next/react-dev-overlay": "10.2.0",
+        "@next/react-refresh-utils": "10.2.0",
         "@opentelemetry/api": "0.14.0",
         "assert": "2.0.0",
         "ast-types": "0.13.2",
@@ -21907,7 +21869,7 @@
         "chokidar": "3.5.1",
         "constants-browserify": "1.0.0",
         "crypto-browserify": "3.12.0",
-        "cssnano-simple": "1.2.2",
+        "cssnano-simple": "2.0.0",
         "domain-browser": "4.19.0",
         "encoding": "0.1.13",
         "etag": "1.8.1",
@@ -21923,7 +21885,7 @@
         "p-limit": "3.1.0",
         "path-browserify": "1.0.1",
         "pnp-webpack-plugin": "1.6.4",
-        "postcss": "8.1.7",
+        "postcss": "8.2.13",
         "process": "0.11.10",
         "prop-types": "15.7.2",
         "querystring-es3": "0.2.1",
@@ -21955,9 +21917,9 @@
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001207",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
-          "integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw=="
+          "version": "1.0.30001219",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz",
+          "integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ=="
         },
         "has-flag": {
           "version": "4.0.0",
@@ -23862,14 +23824,20 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.1.7",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz",
-      "integrity": "sha512-llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ==",
+      "version": "8.2.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz",
+      "integrity": "sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==",
       "requires": {
-        "colorette": "^1.2.1",
-        "line-column": "^1.0.2",
-        "nanoid": "^3.1.16",
+        "colorette": "^1.2.2",
+        "nanoid": "^3.1.22",
         "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+        }
       }
     },
     "postcss-attribute-case-insensitive": {
@@ -26224,16 +26192,16 @@
       }
     },
     "react-spring": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-9.1.1.tgz",
-      "integrity": "sha512-gdRyLETB5183zCygEKXq5lNsNLSRXC8PZjEacB6CXC4gK7EErqsJBaC5vIHYc9/PMsi2XvUyTP17y8IhYHnKjg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-9.1.2.tgz",
+      "integrity": "sha512-xLmkierisElCQShCqAH3PpepjHhCyOK1wGSTdpvG7GGD+SbfG4Sac7wj6wrKTT5A5NUFM5OnVQUXZLe5HScIfA==",
       "requires": {
-        "@react-spring/core": "~9.1.1",
-        "@react-spring/konva": "~9.1.1",
-        "@react-spring/native": "~9.1.1",
-        "@react-spring/three": "~9.1.1",
-        "@react-spring/web": "~9.1.1",
-        "@react-spring/zdog": "~9.1.1"
+        "@react-spring/core": "~9.1.2",
+        "@react-spring/konva": "~9.1.2",
+        "@react-spring/native": "~9.1.2",
+        "@react-spring/three": "~9.1.2",
+        "@react-spring/web": "~9.1.2",
+        "@react-spring/zdog": "~9.1.2"
       }
     },
     "react-style-singleton": {
@@ -28775,15 +28743,15 @@
       }
     },
     "stylelint": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz",
-      "integrity": "sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.0.tgz",
+      "integrity": "sha512-jvkM1iuH88vAvjdKPwPm6abiMP2/D/1chbfb+4GVONddOOskHuCXc0loyrLdxO1AwwH6jdnjYskkTKHQD7cXwQ==",
       "dev": true,
       "requires": {
         "@stylelint/postcss-css-in-js": "^0.37.2",
         "@stylelint/postcss-markdown": "^0.36.2",
         "autoprefixer": "^9.8.6",
-        "balanced-match": "^1.0.0",
+        "balanced-match": "^2.0.0",
         "chalk": "^4.1.0",
         "cosmiconfig": "^7.0.0",
         "debug": "^4.3.1",
@@ -28793,7 +28761,7 @@
         "file-entry-cache": "^6.0.1",
         "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.2",
+        "globby": "^11.0.3",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
         "ignore": "^5.1.8",
@@ -28801,10 +28769,10 @@
         "imurmurhash": "^0.1.4",
         "known-css-properties": "^0.21.0",
         "lodash": "^4.17.21",
-        "log-symbols": "^4.0.0",
+        "log-symbols": "^4.1.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
-        "micromatch": "^4.0.2",
+        "micromatch": "^4.0.4",
         "normalize-selector": "^0.2.0",
         "postcss": "^7.0.35",
         "postcss-html": "^0.36.0",
@@ -28814,7 +28782,7 @@
         "postcss-safe-parser": "^4.0.2",
         "postcss-sass": "^0.4.4",
         "postcss-scss": "^2.1.1",
-        "postcss-selector-parser": "^6.0.4",
+        "postcss-selector-parser": "^6.0.5",
         "postcss-syntax": "^0.36.2",
         "postcss-value-parser": "^4.1.0",
         "resolve-from": "^5.0.0",
@@ -28825,8 +28793,8 @@
         "style-search": "^0.1.0",
         "sugarss": "^2.0.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.0.7",
-        "v8-compile-cache": "^2.2.0",
+        "table": "^6.5.1",
+        "v8-compile-cache": "^2.3.0",
         "write-file-atomic": "^3.0.3"
       },
       "dependencies": {
@@ -28837,9 +28805,9 @@
           "dev": true
         },
         "ajv": {
-          "version": "8.0.5",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.0.5.tgz",
-          "integrity": "sha512-RkiLa/AeJx7+9OvniQ/qeWu0w74A8DiPPBclQ6ji3ZQkv5KamO+QGpqmi7O4JIw3rHGUXZ6CoP9tsAkn3gyazg==",
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+          "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -28869,6 +28837,12 @@
           "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
           "dev": true
         },
+        "balanced-match": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+          "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+          "dev": true
+        },
         "camelcase": {
           "version": "5.3.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -28887,9 +28861,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -28933,15 +28907,6 @@
             "ms": "2.1.2"
           }
         },
-        "dir-glob": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
-          "requires": {
-            "path-type": "^4.0.0"
-          }
-        },
         "emoji-regex": {
           "version": "8.0.0",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -29026,9 +28991,9 @@
           }
         },
         "map-obj": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.0.tgz",
-          "integrity": "sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+          "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
           "dev": true
         },
         "meow": {
@@ -29052,13 +29017,21 @@
           }
         },
         "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
+            "picomatch": "^2.2.3"
+          },
+          "dependencies": {
+            "picomatch": {
+              "version": "2.2.3",
+              "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+              "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+              "dev": true
+            }
           }
         },
         "ms": {
@@ -29153,6 +29126,16 @@
             }
           }
         },
+        "postcss-selector-parser": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
+          "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
         "read-pkg": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -29166,9 +29149,9 @@
           },
           "dependencies": {
             "hosted-git-info": {
-              "version": "2.8.8",
-              "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-              "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+              "version": "2.8.9",
+              "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+              "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
               "dev": true
             },
             "normalize-package-data": {
@@ -29283,20 +29266,18 @@
           }
         },
         "table": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/table/-/table-6.0.9.tgz",
-          "integrity": "sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+          "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
           "dev": true,
           "requires": {
             "ajv": "^8.0.1",
-            "is-boolean-object": "^1.1.0",
-            "is-number-object": "^1.0.4",
-            "is-string": "^1.0.5",
             "lodash.clonedeep": "^4.5.0",
             "lodash.flatten": "^4.4.0",
             "lodash.truncate": "^4.4.2",
             "slice-ansi": "^4.0.0",
-            "string-width": "^4.2.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "trim-newlines": {
@@ -29326,27 +29307,27 @@
       "dev": true
     },
     "stylelint-config-recess-order": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-2.3.0.tgz",
-      "integrity": "sha512-z1d1m///to9ikecxP0uM2ljAmogHL1A+A4MUXtYrJvZRFPfPeODebimmJacx4cRL/oltEo3I6HqtreyRrn4lBg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-2.4.0.tgz",
+      "integrity": "sha512-+X+cb7WgmfCt5yoG+Ewg+fpn79hosjj7ESQ7ODTtwaZQGzQT+jD6AWLAhULMqDb9v2GVDTO5fu1rY/BR9EaZJA==",
       "dev": true,
       "requires": {
         "stylelint-order": "4.1.x"
       }
     },
     "stylelint-config-recommended": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz",
-      "integrity": "sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz",
+      "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==",
       "dev": true
     },
     "stylelint-config-standard": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz",
-      "integrity": "sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==",
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz",
+      "integrity": "sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw==",
       "dev": true,
       "requires": {
-        "stylelint-config-recommended": "^4.0.0"
+        "stylelint-config-recommended": "^5.0.0"
       }
     },
     "stylelint-order": {
@@ -29437,6 +29418,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
       "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
       }
@@ -31021,9 +31003,9 @@
       }
     },
     "validator": {
-      "version": "13.5.2",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.5.2.tgz",
-      "integrity": "sha512-mD45p0rvHVBlY2Zuy3F3ESIe1h5X58GPfAtslBjY7EtTqGquZTj+VX/J4RnHWN8FKq0C9WRVt1oWAcytWRuYLQ=="
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz",
+      "integrity": "sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg=="
     },
     "vary": {
       "version": "1.1.2",
diff --git a/package.json b/package.json
index 6adb7a4927..92863a6169 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "3.23.0",
+  "version": "3.23.1",
   "description": "codebase of Matters' website",
   "sideEffects": false,
   "author": "Matters <hi@matters.news>",
@@ -45,9 +45,9 @@
     "@reach/alert": "^0.15.0",
     "@reach/dialog": "^0.15.0",
     "@reach/visually-hidden": "^0.15.0",
-    "@sentry/browser": "^6.2.5",
+    "@sentry/browser": "^6.3.3",
     "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.13.2",
+    "@stripe/stripe-js": "^1.14.0",
     "@tippyjs/react": "^4.2.5",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-cache-persist": "^0.1.1",
@@ -61,7 +61,7 @@
     "autosize": "^4.0.2",
     "classnames": "^2.3.1",
     "date-fns": "^2.21.1",
-    "embla-carousel": "^4.4.0",
+    "embla-carousel": "^4.5.0",
     "express": "^4.17.1",
     "fastest-levenshtein": "^1.0.12",
     "fingerprintjs2": "^2.1.4",
@@ -72,7 +72,7 @@
     "isomorphic-unfetch": "^3.1.0",
     "jump.js": "^1.0.2",
     "lodash": "^4.17.21",
-    "next": "^10.1.3",
+    "next": "^10.2.0",
     "next-with-apollo": "^5.1.1",
     "nprogress": "^0.2.0",
     "number-precision": "^1.5.0",
@@ -85,13 +85,13 @@
     "react-dom": "^17.0.2",
     "react-focus-lock": "^2.5.0",
     "react-remove-scroll": "^2.4.1",
-    "react-spring": "^9.1.1",
+    "react-spring": "^9.1.2",
     "react-use-gesture": "^9.1.3",
     "react-virtualized": "^9.22.3",
     "react-waypoint": "^9.0.3",
     "subscriptions-transport-ws": "^0.9.18",
     "use-debounce": "^6.0.1",
-    "validator": "^13.5.2"
+    "validator": "^13.6.0"
   },
   "devDependencies": {
     "@apollo/react-testing": "^3.1.3",
@@ -104,7 +104,7 @@
     "@svgr/webpack": "^5.5.0",
     "@testing-library/react": "^11.2.6",
     "@types/autosize": "^3.0.7",
-    "@types/classnames": "^2.2.11",
+    "@types/classnames": "^2.3.1",
     "@types/express": "^4.17.9",
     "@types/fingerprintjs2": "^2.0.0",
     "@types/grecaptcha": "^3.0.1",
@@ -113,7 +113,7 @@
     "@types/lodash": "^4.14.168",
     "@types/nprogress": "0.2.0",
     "@types/pulltorefreshjs": "^0.1.4",
-    "@types/react": "^17.0.3",
+    "@types/react": "^17.0.4",
     "@types/react-beautiful-dnd": "^13.0.0",
     "@types/react-copy-to-clipboard": "^5.0.0",
     "@types/react-dom": "^17.0.3",
@@ -129,7 +129,7 @@
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-polyfill": "^6.26.0",
     "chromedriver": "^90.0.0",
-    "core-js": "^3.10.1",
+    "core-js": "^3.11.1",
     "cucumber": "^6.0.5",
     "cucumber-pretty": "^6.0.0",
     "cz-conventional-changelog": "^3.3.0",
@@ -153,10 +153,10 @@
     "prettier": "^2.2.1",
     "react-is": "^17.0.2",
     "styled-jsx-plugin-postcss": "^3.0.2",
-    "stylelint": "^13.12.0",
+    "stylelint": "^13.13.0",
     "stylelint-config-prettier": "^8.0.2",
-    "stylelint-config-recess-order": "^2.3.0",
-    "stylelint-config-standard": "^21.0.0",
+    "stylelint-config-recess-order": "^2.4.0",
+    "stylelint-config-standard": "^22.0.0",
     "stylelint-prettier": "^1.2.0",
     "ts-jest": "^26.5.5",
     "ts-node": "^9.1.1",
diff --git a/src/common/enums/errorCode.ts b/src/common/enums/errorCode.ts
index 1aa9a36e21..2a177caa3a 100644
--- a/src/common/enums/errorCode.ts
+++ b/src/common/enums/errorCode.ts
@@ -38,6 +38,8 @@ export const ERROR_CODES = {
 
   // Article
   NOT_ENOUGH_MAT: 'NOT_ENOUGH_MAT',
+  ARTICLE_REVISION_CONTENT_INVALID: 'ARTICLE_REVISION_CONTENT_INVALID',
+  ARTICLE_REVISION_REACH_LIMIT: 'ARTICLE_REVISION_REACH_LIMIT',
 
   // User
   USER_EMAIL_INVALID: 'USER_EMAIL_INVALID',
diff --git a/src/common/enums/index.ts b/src/common/enums/index.ts
index f8297e6ed4..ec0ad79205 100644
--- a/src/common/enums/index.ts
+++ b/src/common/enums/index.ts
@@ -44,3 +44,6 @@ export const VERIFICATION_CODE_TYPES = {
 
 export const COOKIE_TOKEN_NAME = '__token'
 export const COOKIE_USER_GROUP = '__user_group'
+
+export const MAX_ARTICLE_REVISION_COUNT = 2
+export const MAX_ARTICLE_REVISION_DIFF = 50
diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
index b02d113087..71f1bb013d 100644
--- a/src/common/enums/text.ts
+++ b/src/common/enums/text.ts
@@ -24,6 +24,8 @@ export const TEXT = {
     appreciationsSent: '我讚賞的',
     archived: '隱藏',
     ARTICLE_NOT_FOUND: '作品不存在',
+    ARTICLE_REVISION_CONTENT_INVALID: '作品正文編輯距離超出上限',
+    ARTICLE_REVISION_REACH_LIMIT: '作品修訂次數超出上限',
     article: '作品',
     articleArchived: '該作品已從站內隱藏',
     articleBanned: '作品因違反社區約章被隱藏',
@@ -345,6 +347,8 @@ export const TEXT = {
     appreciationsSent: '我赞赏的',
     archived: '隐藏',
     ARTICLE_NOT_FOUND: '作品不存在',
+    ARTICLE_REVISION_CONTENT_INVALID: '作品正文编辑距离超出上限',
+    ARTICLE_REVISION_REACH_LIMIT: '作品修订次数超出上限',
     article: '作品',
     articleArchived: '该作品已从站内隐藏',
     articleBanned: '作品因违反社区约章被隐藏',
@@ -666,6 +670,8 @@ export const TEXT = {
     appreciationsSent: 'Appreciation Given',
     archived: 'Archived',
     ARTICLE_NOT_FOUND: 'Article not found',
+    ARTICLE_REVISION_CONTENT_INVALID: 'Article revision content is invalid',
+    ARTICLE_REVISION_REACH_LIMIT: 'Article revision count reach limit',
     article: 'Article',
     articleArchived: 'The article has been archived from Matters',
     articleBanned: 'The article has been archived due to violation of terms',
diff --git a/src/components/ArticleDigest/Feed/AccessLabel.tsx b/src/components/ArticleDigest/Feed/AccessLabel.tsx
index b6a2b49e17..140f8ff15a 100644
--- a/src/components/ArticleDigest/Feed/AccessLabel.tsx
+++ b/src/components/ArticleDigest/Feed/AccessLabel.tsx
@@ -1,11 +1,6 @@
 import gql from 'graphql-tag'
 
-import {
-  IconLimitedFree16,
-  IconPaywall16,
-  TextIcon,
-  Translate,
-} from '~/components'
+import { IconPaywall16, TextIcon, Translate } from '~/components'
 
 import Label from './Label'
 
@@ -29,7 +24,6 @@ const fragments = {
 
 const AccessLabel = ({ article }: AccessLabelProps) => {
   const isPublic = article.access.type === ArticleAccessType.public
-  const isLimitedFree = article.access.type === ArticleAccessType.limitedFree
   const isPaywalled = article.access.type === ArticleAccessType.paywall
 
   if (isPublic) {
@@ -38,19 +32,7 @@ const AccessLabel = ({ article }: AccessLabelProps) => {
 
   return (
     <Label>
-      <TextIcon
-        icon={
-          isLimitedFree ? (
-            <IconLimitedFree16 size="sm" />
-          ) : (
-            <IconPaywall16 size="sm" />
-          )
-        }
-        size="xs"
-      >
-        {isLimitedFree && (
-          <Translate zh_hant="限免" zh_hans="限免" en="Limited Free" />
-        )}
+      <TextIcon icon={<IconPaywall16 size="sm" />} size="xs">
         {isPaywalled && (
           <Translate zh_hant="上鎖" zh_hans="上锁" en="Paywalled" />
         )}
diff --git a/src/components/Dialogs/ReviseArticleDialog/index.tsx b/src/components/Dialogs/ReviseArticleDialog/index.tsx
index 8fdb488d8b..2afca77f6c 100644
--- a/src/components/Dialogs/ReviseArticleDialog/index.tsx
+++ b/src/components/Dialogs/ReviseArticleDialog/index.tsx
@@ -4,10 +4,10 @@ import styles from './styles.css'
 
 interface Props {
   children?: ({ open }: { open: () => void }) => React.ReactNode
-  count: number
+  countLeft: number
 }
 
-export const ReviseArticleDialog = ({ children, count }: Props) => {
+export const ReviseArticleDialog = ({ children, countLeft }: Props) => {
   const { show, open, close } = useDialogSwitch(true)
 
   return (
@@ -44,7 +44,7 @@ export const ReviseArticleDialog = ({ children, count }: Props) => {
           <p>
             <b>
               <Translate zh_hant="你還可以修訂" zh_hans="你还可以修订" />
-              <span className="count"> {count} </span>
+              <span className="count"> {countLeft} </span>
               <Translate zh_hant="版" zh_hans="版" />
             </b>
           </p>
diff --git a/src/components/Editor/ToggleAccess/index.tsx b/src/components/Editor/ToggleAccess/index.tsx
index 1a380646bf..5caf0b09ed 100644
--- a/src/components/Editor/ToggleAccess/index.tsx
+++ b/src/components/Editor/ToggleAccess/index.tsx
@@ -77,9 +77,9 @@ const ToggleAccess: React.FC<ToggleAccessProps> = ({
 
             <p className="description">
               <Translate
-                zh_hant="前 24 小時限免，上鎖後無法轉公開"
-                zh_hans="前 24 小时限免，上锁后无法转公开"
-                en="Limited free for 24 hours, can't be undone"
+                zh_hant="未訂閱者無法閱讀摘要外的正文"
+                zh_hans="未订阅者无法阅读摘要外的正文"
+                en="Member-only content"
               />
             </p>
           </section>
diff --git a/src/components/Icon/IconLimitedFree16.tsx b/src/components/Icon/IconLimitedFree16.tsx
deleted file mode 100644
index 3b4b62c03c..0000000000
--- a/src/components/Icon/IconLimitedFree16.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReactComponent as Icon } from '@/public/static/icons/16px/limited-free.svg'
-
-import { withIcon } from './withIcon'
-
-export const IconLimitedFree16 = withIcon(Icon)
diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx
index d7a0e7c419..61133cb529 100644
--- a/src/components/Icon/index.tsx
+++ b/src/components/Icon/index.tsx
@@ -66,7 +66,6 @@ export * from './IconImage24'
 export * from './IconInfo16'
 export * from './IconIPFS24'
 export * from './IconLeft32'
-export * from './IconLimitedFree16'
 export * from './IconLogo'
 export * from './IconLogoGraph'
 export * from './IconLogout24'
diff --git a/src/components/Notice/ArticleNotice/CircleNewArticle.tsx b/src/components/Notice/ArticleNotice/CircleNewArticle.tsx
index 957745e917..65226c55bb 100644
--- a/src/components/Notice/ArticleNotice/CircleNewArticle.tsx
+++ b/src/components/Notice/ArticleNotice/CircleNewArticle.tsx
@@ -28,8 +28,8 @@ const CircleNewArticle = ({ notice }: { notice: NoticeType }) => {
         <NoticeHead
           subtitle={
             <Translate
-              zh_hant="新作品已經加入圍爐。該作品 24 小時限免，你可以前往閱讀啦。"
-              zh_hans="新作品已经加入围炉。该作品 24 小时限免，你可以前往阅读啦。"
+              zh_hant="新作品已經加入圍爐，馬上前往閱讀吧！"
+              zh_hans="新作品已经加入围炉，马上前往阅读吧！"
             />
           }
         >
diff --git a/src/stories/mocks/index.ts b/src/stories/mocks/index.ts
index 4a9430c21f..0bb24f9354 100644
--- a/src/stories/mocks/index.ts
+++ b/src/stories/mocks/index.ts
@@ -97,7 +97,7 @@ export const MOCK_ARTILCE = {
   subscribed: false,
   access: {
     __typename: 'ArticleAccess' as any,
-    type: 'limitedFree' as any,
+    type: 'paywall' as any,
     circle: MOCK_CIRCLE,
   },
 }
diff --git a/src/views/ArticleDetail/EditMode/ConfirmExitDialog/index.tsx b/src/views/ArticleDetail/EditMode/ConfirmExitDialog/index.tsx
new file mode 100644
index 0000000000..13a02c53fe
--- /dev/null
+++ b/src/views/ArticleDetail/EditMode/ConfirmExitDialog/index.tsx
@@ -0,0 +1,62 @@
+import { Dialog, Translate, useDialogSwitch } from '~/components'
+
+interface ConfirmExitDialogProps {
+  onExit: () => any
+  children: ({ open }: { open: () => void }) => React.ReactNode
+}
+
+const ConfirmExitDialog = ({ onExit, children }: ConfirmExitDialogProps) => {
+  const { show, open, close } = useDialogSwitch(true)
+
+  return (
+    <>
+      {children({ open })}
+
+      <Dialog isOpen={show} onDismiss={close} size="sm">
+        <Dialog.Header
+          title={<Translate zh_hant="修訂須知" zh_hans="修订须知" />}
+          close={close}
+          mode="inner"
+        />
+
+        <Dialog.Message>
+          <p>
+            <Translate
+              zh_hant="跳出該頁，本次操作不會保存"
+              zh_hans="跳出该页，本次操作不会保存"
+              en="You will lost your changes if you leave this page"
+            />
+          </p>
+        </Dialog.Message>
+
+        <Dialog.Footer>
+          <Dialog.Footer.Button
+            bgColor="red"
+            onClick={() => {
+              onExit()
+              close()
+            }}
+          >
+            <Translate id="confirm" />
+          </Dialog.Footer.Button>
+
+          <Dialog.Footer.Button
+            bgColor="grey-lighter"
+            textColor="black"
+            onClick={close}
+          >
+            <Translate id="cancel" />
+          </Dialog.Footer.Button>
+        </Dialog.Footer>
+      </Dialog>
+    </>
+  )
+}
+
+const LazyConfirmExitDialog = (props: ConfirmExitDialogProps) => (
+  <Dialog.Lazy mounted={<ConfirmExitDialog {...props} />}>
+    {({ open }) => <>{props.children({ open })}</>}
+  </Dialog.Lazy>
+)
+
+export default LazyConfirmExitDialog
diff --git a/src/views/ArticleDetail/EditMode/Header/index.tsx b/src/views/ArticleDetail/EditMode/Header/index.tsx
index 91a87c2d82..1db4635123 100644
--- a/src/views/ArticleDetail/EditMode/Header/index.tsx
+++ b/src/views/ArticleDetail/EditMode/Header/index.tsx
@@ -12,7 +12,7 @@ import {
 import { fragments as EditorFragments } from '~/components/Editor/fragments'
 import articleFragments from '~/components/GQL/fragments/article'
 
-import { ADD_TOAST } from '~/common/enums'
+import { ADD_TOAST, MAX_ARTICLE_REVISION_DIFF } from '~/common/enums'
 import { measureDiffs } from '~/common/utils'
 
 import styles from './styles.css'
@@ -34,7 +34,7 @@ interface EditModeHeaderProps {
   circle?: DigestRichCirclePublic | null
   accessType?: ArticleAccessType
 
-  count?: number
+  countLeft: number
 
   isPending?: boolean
   isSameHash?: boolean
@@ -104,7 +104,7 @@ const EditModeHeader = ({
   circle,
   accessType,
 
-  count = 3,
+  countLeft,
 
   isPending,
   isSameHash,
@@ -117,10 +117,10 @@ const EditModeHeader = ({
   const diff = measureDiffs(initText || '', currText || '') || 0
   const diffCount = `${diff}`.padStart(2, '0')
 
-  const isReachDiffLimit = diff > 50
+  const isReachDiffLimit = diff > MAX_ARTICLE_REVISION_DIFF
   const isRevised = diff > 0
-  const isUnderLimit = count > 0 && count <= 3
-  const isOverLimit = count <= 0
+  const isUnderLimit = countLeft > 0
+  const isOverLimit = countLeft <= 0
 
   const onSave = async () => {
     try {
@@ -132,10 +132,7 @@ const EditModeHeader = ({
           tags: tags.map((tag) => tag.content),
           collection: collection.map(({ id: articleId }) => articleId),
           circle: circle ? circle.id : null,
-          accessType:
-            accessType === ArticleAccessType.limitedFree
-              ? ArticleAccessType.paywall
-              : accessType,
+          accessType,
           ...(isRevised ? { content } : {}),
           first: null,
         },
@@ -183,15 +180,15 @@ const EditModeHeader = ({
             {isUnderLimit && (
               <>
                 <Translate
-                  zh_hant="正文剩餘"
-                  zh_hans="正文剩余"
-                  en="content has"
-                />{' '}
-                {count}{' '}
+                  zh_hant="正文及作品管理剩 "
+                  zh_hans="正文及作品管理剩 "
+                  en="content and article management has "
+                />
+                {countLeft}
                 <Translate
-                  zh_hant="版修訂"
-                  zh_hans="版修订"
-                  en="republish left"
+                  zh_hant=" 版修訂"
+                  zh_hans=" 次修订"
+                  en=" republish left"
                 />
                 <span className={diffCountClasses}>
                   &nbsp;{diffCount}/50&nbsp;&nbsp;&nbsp;
@@ -200,20 +197,11 @@ const EditModeHeader = ({
             )}
             {isOverLimit && (
               <Translate
-                zh_hant="正文修訂次數已達上限"
-                zh_hans="正文修订次数已达上限"
+                zh_hant="正文及作品管理修訂次數已達上限"
+                zh_hans="正文及作品管理修订次数已达上限"
                 en="You have reached the limit of republish"
               />
             )}
-            {isUnderLimit && (
-              <span className="notice">
-                <Translate
-                  zh_hant="離開本頁將丟失全部編輯"
-                  zh_hans="离开本页将丢失全部编辑"
-                  en="you will lost your changes if you leave this page"
-                />
-              </span>
-            )}
           </>
         )}
       </p>
diff --git a/src/views/ArticleDetail/EditMode/index.tsx b/src/views/ArticleDetail/EditMode/index.tsx
index 74fb293146..41fb4c7a66 100644
--- a/src/views/ArticleDetail/EditMode/index.tsx
+++ b/src/views/ArticleDetail/EditMode/index.tsx
@@ -15,9 +15,9 @@ import BottomBar from '~/components/Editor/BottomBar'
 import Sidebar from '~/components/Editor/Sidebar'
 import { QueryError, useImperativeQuery } from '~/components/GQL'
 
-import { ENTITY_TYPE } from '~/common/enums'
+import { ENTITY_TYPE, MAX_ARTICLE_REVISION_COUNT } from '~/common/enums'
 
-import styles from '../styles.css'
+import ConfirmExitDialog from './ConfirmExitDialog'
 import { EDIT_MODE_ARTICLE, EDIT_MODE_ARTICLE_ASSETS } from './gql'
 import EditModeHeader from './Header'
 import PublishState from './PublishState'
@@ -42,8 +42,6 @@ const Editor = dynamic(() => import('~/components/Editor/Article'), {
   loading: Spinner,
 })
 
-const MAX_REVISION_COUNT = 2
-
 const EditMode: React.FC<EditModeProps> = ({ article, onCancel, onSaved }) => {
   const isLargeUp = useResponsive('lg-up')
 
@@ -71,9 +69,8 @@ const EditMode: React.FC<EditModeProps> = ({ article, onCancel, onSaved }) => {
   )
 
   // access
-  const isPrevPublic = article.access.type === ArticleAccessType.public
   const ownCircles = data?.article?.author.ownCircles
-  const hasCircles = ownCircles && ownCircles.length >= 1
+  const hasOwnCircle = ownCircles && ownCircles.length >= 1
   const editAccess = (addToCircle: boolean, paywalled: boolean) => {
     if (!ownCircles) {
       return
@@ -132,11 +129,13 @@ const EditMode: React.FC<EditModeProps> = ({ article, onCancel, onSaved }) => {
 
   const drafts = data?.article?.drafts
   const draft = drafts && drafts[0]
-  const count = MAX_REVISION_COUNT - (data?.article?.revisionCount || 0)
+  const countLeft =
+    MAX_ARTICLE_REVISION_COUNT - (data?.article?.revisionCount || 0)
   const isSameHash = draft?.mediaHash === article.mediaHash
   const isPending = draft?.publishState === 'pending'
   const isEditDisabled = !isSameHash || isPending
-  const isReviseDisabled = isEditDisabled || count <= 0
+  const isOverLimit = countLeft <= 0
+  const isReviseDisabled = isEditDisabled || isOverLimit
 
   if (!draft) {
     return (
@@ -147,112 +146,119 @@ const EditMode: React.FC<EditModeProps> = ({ article, onCancel, onSaved }) => {
   }
 
   return (
-    <Layout.Main
-      aside={
-        <>
-          <Sidebar.Cover
-            cover={cover?.path}
-            assets={assets}
-            entityId={article.id}
-            entityType={ENTITY_TYPE.article}
-            onEdit={editCover}
-            refetchAssets={refetchAssets}
-            disabled={isEditDisabled}
-          />
+    <>
+      <ConfirmExitDialog onExit={onCancel}>
+        {({ open: openConfirmExitDialog }) => (
+          <Layout.Main
+            aside={
+              <>
+                <Sidebar.Cover
+                  cover={cover?.path}
+                  assets={assets}
+                  entityId={article.id}
+                  entityType={ENTITY_TYPE.article}
+                  onEdit={editCover}
+                  refetchAssets={refetchAssets}
+                  disabled={isEditDisabled}
+                />
 
-          <Sidebar.Tags
-            tags={tags}
-            onEdit={editTags}
-            disabled={isEditDisabled}
-          />
+                <Sidebar.Tags
+                  tags={tags}
+                  onEdit={editTags}
+                  disabled={isEditDisabled}
+                />
 
-          <Sidebar.Collection
-            articles={collection}
-            onEdit={editCollection}
-            disabled={isEditDisabled}
-          />
+                <Sidebar.Collection
+                  articles={collection}
+                  onEdit={editCollection}
+                  disabled={isEditDisabled}
+                />
 
-          {hasCircles && (
-            <Sidebar.Management
-              circle={circle}
-              accessType={accessType}
-              editAccess={editAccess}
-              canToggleCircle={isPrevPublic}
-              canTogglePaywall={isPrevPublic}
-              saving={false}
+                {hasOwnCircle && (
+                  <Sidebar.Management
+                    circle={circle}
+                    accessType={accessType}
+                    editAccess={editAccess}
+                    canToggleCircle={!isReviseDisabled}
+                    canTogglePaywall={!isReviseDisabled}
+                    saving={false}
+                  />
+                )}
+              </>
+            }
+            inEditor
+          >
+            <Layout.Header
+              left={
+                <Layout.Header.BackButton
+                  onClick={isOverLimit ? onCancel : openConfirmExitDialog}
+                  disabled={isPending}
+                />
+              }
+              right={
+                <EditModeHeader
+                  article={article}
+                  cover={cover}
+                  editData={editData}
+                  tags={tags}
+                  collection={collection}
+                  circle={circle}
+                  accessType={accessType}
+                  countLeft={countLeft}
+                  isSameHash={isSameHash}
+                  onSaved={onSaved}
+                />
+              }
             />
-          )}
-        </>
-      }
-      inEditor
-    >
-      <Layout.Header
-        left={
-          <Layout.Header.BackButton onClick={onCancel} disabled={isPending} />
-        }
-        right={
-          <EditModeHeader
-            article={article}
-            cover={cover}
-            editData={editData}
-            tags={tags}
-            collection={collection}
-            circle={circle}
-            accessType={accessType}
-            count={count}
-            isSameHash={isSameHash}
-            onSaved={onSaved}
-          />
-        }
-      />
-
-      <PublishState
-        article={article}
-        draft={draft}
-        isSameHash={isSameHash}
-        cancel={onCancel}
-      />
 
-      <Layout.Spacing>
-        <Editor
-          draft={draft}
-          isReviseMode={!isReviseDisabled}
-          isSummaryReadOnly
-          isTitleReadOnly
-          update={async (update) => setEditData(update)}
-          upload={async () => ({ id: '', path: '' })}
-        />
-      </Layout.Spacing>
+            <PublishState
+              article={article}
+              draft={draft}
+              isSameHash={isSameHash}
+              cancel={onCancel}
+            />
 
-      {!isLargeUp && (
-        <BottomBar
-          disabled={isEditDisabled}
-          // cover
-          cover={cover?.path}
-          assets={assets}
-          editCover={editCover}
-          refetchAssets={refetchAssets}
-          entityId={article.id}
-          entityType={ENTITY_TYPE.article}
-          // tags
-          tags={tags}
-          editTags={editTags}
-          // collection
-          collection={collection}
-          editCollection={editCollection}
-          // circle
-          circle={circle}
-          accessType={accessType}
-          editAccess={hasCircles ? editAccess : undefined}
-          canToggleCircle={isPrevPublic}
-          canTogglePaywall={isPrevPublic}
-        />
-      )}
+            <Layout.Spacing>
+              <Editor
+                draft={draft}
+                isReviseMode={!isReviseDisabled}
+                isSummaryReadOnly
+                isTitleReadOnly
+                update={async (update) => setEditData(update)}
+                upload={async () => ({ id: '', path: '' })}
+              />
+            </Layout.Spacing>
 
-      {!isReviseDisabled && <ReviseArticleDialog count={count} />}
+            {!isLargeUp && (
+              <BottomBar
+                disabled={isEditDisabled}
+                // cover
+                cover={cover?.path}
+                assets={assets}
+                editCover={editCover}
+                refetchAssets={refetchAssets}
+                entityId={article.id}
+                entityType={ENTITY_TYPE.article}
+                // tags
+                tags={tags}
+                editTags={editTags}
+                // collection
+                collection={collection}
+                editCollection={editCollection}
+                // circle
+                circle={circle}
+                accessType={accessType}
+                editAccess={hasOwnCircle ? editAccess : undefined}
+                canToggleCircle={!isReviseDisabled}
+                canTogglePaywall={!isReviseDisabled}
+              />
+            )}
+          </Layout.Main>
+        )}
+      </ConfirmExitDialog>
 
-      <style jsx>{styles}</style>
-    </Layout.Main>
+      {!isReviseDisabled && <ReviseArticleDialog countLeft={countLeft} />}
+    </>
   )
 }
 
diff --git a/src/views/ArticleDetail/index.tsx b/src/views/ArticleDetail/index.tsx
index 2f149462a6..3ac37fda38 100644
--- a/src/views/ArticleDetail/index.tsx
+++ b/src/views/ArticleDetail/index.tsx
@@ -107,7 +107,6 @@ const ArticleDetail = () => {
     isAuthor ||
     !circle ||
     circle.isMember ||
-    article?.access.type === ArticleAccessType.limitedFree ||
     article?.access.type === ArticleAccessType.public
   )
   const summary = article?.summary
diff --git a/src/views/Circle/Profile/AddCircleArticle/Dialog/Content.tsx b/src/views/Circle/Profile/AddCircleArticle/Dialog/Content.tsx
index 94585967ce..48bd0491c3 100644
--- a/src/views/Circle/Profile/AddCircleArticle/Dialog/Content.tsx
+++ b/src/views/Circle/Profile/AddCircleArticle/Dialog/Content.tsx
@@ -27,32 +27,25 @@ const Content: React.FC<ContentProps> = ({
 
       <Dialog.Message align="left" type="info">
         <section className="switch">
-          <p>
-            <Translate zh_hant="上鎖" zh_hans="上锁" en="Paywalled" />
-          </p>
-
-          <Switch
-            checked={paywalled}
-            onChange={() => setPaywalled(!paywalled)}
-          />
-        </section>
+          <header>
+            <h4>
+              <Translate zh_hant="上鎖" zh_hans="上锁" en="Paywalled" />
+            </h4>
 
-        <ul>
-          <li>
-            <Translate
-              zh_hant="上鎖作品 24 小時內限免，過後僅圍爐成員可閱讀"
-              zh_hans="上锁作品 24 小时内限免，过后仅围炉成员可阅读"
-              en="Paywalled article will be free to read for 24 hours, then circle members only."
+            <Switch
+              checked={paywalled}
+              onChange={() => setPaywalled(!paywalled)}
             />
-          </li>
-          <li>
+          </header>
+
+          <p className="description">
             <Translate
-              zh_hant="作品上鎖後，不支持撤銷或移出圍爐"
-              zh_hans="作品上锁后，不支持撤销或移出围炉"
-              en="You can't undo changes on paywalled article"
+              zh_hant="未訂閱者無法閱讀摘要外的正文"
+              zh_hans="未订阅者无法阅读摘要外的正文"
+              en="Member-only content"
             />
-          </li>
-        </ul>
+          </p>
+        </section>
 
         <style jsx>{styles}</style>
       </Dialog.Message>
diff --git a/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx b/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx
index 2ecda7250d..9c2832e467 100644
--- a/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx
+++ b/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx
@@ -1,4 +1,3 @@
-import { useMutation } from '@apollo/react-hooks'
 import dynamic from 'next/dynamic'
 import { useContext, useState } from 'react'
 
@@ -7,6 +6,7 @@ import {
   LanguageContext,
   Spinner,
   useDialogSwitch,
+  useMutation,
   ViewerContext,
 } from '~/components'
 import {
diff --git a/src/views/Circle/Profile/AddCircleArticle/Dialog/styles.css b/src/views/Circle/Profile/AddCircleArticle/Dialog/styles.css
index 1f1369ebf3..edadb171a3 100644
--- a/src/views/Circle/Profile/AddCircleArticle/Dialog/styles.css
+++ b/src/views/Circle/Profile/AddCircleArticle/Dialog/styles.css
@@ -1,14 +1,23 @@
 .switch {
-  @mixin flex-center-space-between;
   @mixin border-top-grey;
   @mixin border-bottom-grey;
 
   padding: var(--spacing-base);
   margin: 0 calc(var(--spacing-base) * -1) var(--spacing-loose);
 
-  & p {
+  & header {
+    @mixin flex-center-space-between;
+  }
+
+  & h4 {
     font-size: var(--font-size-md);
     font-weight: var(--font-weight-medium);
     line-height: 1;
   }
+
+  & .description {
+    margin-top: var(--spacing-xx-tight);
+    font-size: var(--font-size-sm-s);
+    color: var(--color-grey-darker);
+  }
 }
diff --git a/src/views/Home/CircleBanner/index.tsx b/src/views/Home/CircleBanner/index.tsx
index e76e7cc87b..faad7d817b 100644
--- a/src/views/Home/CircleBanner/index.tsx
+++ b/src/views/Home/CircleBanner/index.tsx
@@ -31,7 +31,7 @@ const CircleBanner = () => {
     { variables: { id: 'local' } }
   )
   const ownCirclesCount = viewer?.ownCircles?.length || 0
-  const hasCircle = ownCirclesCount > 0
+  const hasOwnCircle = ownCirclesCount > 0
 
   // determine whether banner should be shown or not
   const storedCircleBanner = storage.get(STORAGE_KEY_CIRCLE_BANNER)
@@ -51,7 +51,7 @@ const CircleBanner = () => {
     })
   }
 
-  if (!enabled || hasCircle) {
+  if (!enabled || hasOwnCircle) {
     return null
   }
 
diff --git a/src/views/Me/DraftDetail/BottomBar.tsx b/src/views/Me/DraftDetail/BottomBar.tsx
index 6da8b3a1c4..ca9bb64cd1 100644
--- a/src/views/Me/DraftDetail/BottomBar.tsx
+++ b/src/views/Me/DraftDetail/BottomBar.tsx
@@ -31,6 +31,7 @@ const EditDraftBottomBar = ({ draft, ownCircles }: BottomBarProps) => {
     draft,
     ownCircles && ownCircles[0]
   )
+  const hasOwnCircle = ownCircles && ownCircles.length >= 1
   const tags = (draft.tags || []).map(toDigestTagPlaceholder)
   const isPending = draft.publishState === 'pending'
   const isPublished = draft.publishState === 'published'
@@ -55,7 +56,7 @@ const EditDraftBottomBar = ({ draft, ownCircles }: BottomBarProps) => {
       // circle
       circle={draft?.access.circle}
       accessType={draft.access.type}
-      editAccess={editAccess}
+      editAccess={hasOwnCircle ? editAccess : undefined}
       canToggleCircle
       canTogglePaywall
     />
diff --git a/src/views/Me/DraftDetail/Sidebar.tsx b/src/views/Me/DraftDetail/Sidebar.tsx
index fa72b70b35..1ef7170381 100644
--- a/src/views/Me/DraftDetail/Sidebar.tsx
+++ b/src/views/Me/DraftDetail/Sidebar.tsx
@@ -70,8 +70,9 @@ const EditDraftCircle = ({ draft, ownCircles }: SidebarProps) => {
     draft,
     ownCircles && ownCircles[0]
   )
+  const hasOwnCircle = ownCircles && ownCircles.length >= 1
 
-  if (!ownCircles) {
+  if (!hasOwnCircle) {
     return null
   }