diff --git a/docusaurus.config.js b/docusaurus.config.js
index cecb0b97d..2a4387f48 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -66,11 +66,7 @@ module.exports = {
           blogSidebarCount: 0,
         },
         theme: {
-          customCss: [
-            require.resolve('./src/css/font.css'),
-            require.resolve('./src/css/types.css'),
-            require.resolve('./src/css/custom.css'),
-          ],
+          customCss: [require.resolve('./src/css/custom.css')],
         },
       },
     ],
diff --git a/package.json b/package.json
index 8fbff6b7f..e08ba6c54 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.4.3",
     "@tsconfig/docusaurus": "^1.0.6",
+    "@types/js-cookie": "^3.0.6",
     "@typescript-eslint/eslint-plugin": "^4",
     "@typescript-eslint/parser": "^4",
     "autoprefixer": "^10.4.20",
diff --git a/src/components/base/Button/index.tsx b/src/components/base/Button/index.tsx
index dd65605cd..213c618bf 100644
--- a/src/components/base/Button/index.tsx
+++ b/src/components/base/Button/index.tsx
@@ -43,6 +43,7 @@ type ButtonBaseProps = {
   onClick?: () => void
   ariaLabel?: string
   role?: string
+  type?: 'button' | 'submit' | 'reset'
 }
 
 export const ButtonBase: FC<PropsWithChildren<ButtonBaseProps>> = ({
@@ -51,9 +52,10 @@ export const ButtonBase: FC<PropsWithChildren<ButtonBaseProps>> = ({
   children,
   ariaLabel,
   role,
+  type = 'button',
 }) => {
   return (
-    <button onClick={onClick} className={className} aria-label={ariaLabel} role={role}>
+    <button onClick={onClick} className={className} aria-label={ariaLabel} role={role} type={type}>
       {children}
     </button>
   )
diff --git a/src/css/custom.css b/src/css/custom.css
index 1a3307c57..07c844b12 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -6,18 +6,19 @@
  */
 
 /* You can override the default Infima variables here. */
-@import './infma-overrides.css';
+@import './infima-overrides.css';
 
 @import 'tailwindcss/base';
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';
 
-:root {
-  .site-max-width {
-    max-width: 1440px;
-  }
+@import './font.css';
+@import './types.css';
 
-  .default-grid {
-    @apply grid grid-cols-4 gap-gap-large sm:grid-cols-8;
-  }
+.site-max-width {
+  max-width: 1440px;
+}
+
+.default-grid {
+  @apply grid grid-cols-4 gap-gap-large sm:grid-cols-8;
 }
diff --git a/src/css/infma-overrides.css b/src/css/infima-overrides.css
similarity index 69%
rename from src/css/infma-overrides.css
rename to src/css/infima-overrides.css
index 7bf3f79f1..c2f86f093 100644
--- a/src/css/infma-overrides.css
+++ b/src/css/infima-overrides.css
@@ -1,3 +1,29 @@
+button,
+a {
+  all: initial;
+}
+
+button:hover,
+a:hover {
+  text-decoration: none;
+  color: inherit;
+  cursor: pointer;
+}
+
+ul {
+  all: initial;
+  display: block;
+  list-style-type: none;
+}
+
+* {
+  font-weight: unset;
+  border-style: solid;
+  border-width: 0;
+  border-color: unset;
+  font-style: unset;
+}
+
 /* Box sizing rules */
 *,
 *::before,
@@ -76,51 +102,3 @@ select {
     scroll-behavior: auto !important;
   }
 }
-
-button {
-  text-rendering: unset;
-  color: unset;
-  letter-spacing: unset;
-  word-spacing: unset;
-  line-height: unset;
-  text-transform: unset;
-  text-indent: unset;
-  text-shadow: unset;
-  display: unset;
-  text-align: unset;
-  align-items: unset;
-  cursor: pointer;
-  box-sizing: unset;
-  background-color: unset;
-  margin: unset;
-  padding-block: unset;
-  padding-inline: unset;
-  border-width: unset;
-  border-style: unset;
-  border-color: unset;
-  border-image: unset;
-}
-
-ul {
-  display: block;
-  list-style-type: none;
-  margin-block-start: unset;
-  margin-block-end: unset;
-  margin-inline-start: unset;
-  margin-inline-end: unset;
-  padding-inline-start: unset;
-  unicode-bidi: unset;
-}
-
-a:hover {
-  text-decoration: none;
-}
-
-* {
-  font-weight: unset;
-  font-style: unset;
-  border-style: solid;
-  border-width: 0;
-  border-color: unset;
-  font-style: normal;
-}
diff --git a/src/theme/Navbar.tsx b/src/theme/Navbar.tsx
index 4f7aa8c5a..0a6ec905b 100644
--- a/src/theme/Navbar.tsx
+++ b/src/theme/Navbar.tsx
@@ -8,7 +8,7 @@ const Navbar: FC = () => {
   return (
     <nav className="Navbar fixed left-0 right-0 z-nav flex w-screen justify-center bg-light-surface-1 dark:border-dark-surface-3 dark:bg-dark-surface-1">
       <div className="w-full h-nav-h flex flex-row justify-between items-center px-4 py-[1.15625rem] sm:px-[0.9375rem] sm:py-3">
-        <a className="flex flex-row items-center" href="/" target="_self">
+        <a className="flex flex-row items-center" href="/" target="_self" aria-label="Uniswap Documentation Home">
           <MiniUnicon className="w-8 h-8 mr-3" />
           <p className="Navbar__logo-text body-1 text-light-accent-1 dark:text-dark-accent-1 mb-0">Uniswap Docs</p>
         </a>
@@ -26,10 +26,12 @@ const Navbar: FC = () => {
         <div className="hidden md:flex flex-row items-center">
           <ThemeSwitch />
           <a
-            className="button-label-4 text-light-accent-1 dark:text-dark-accent-1 py-2 px-3 bg-light-accent-2 dark:bg-dark-accent-2 rounded-small ml-2"
+            className="button-label-4 py-2 px-3 bg-light-accent-2 dark:bg-dark-accent-2 rounded-small ml-2"
             href="https://docs.google.com/forms/d/e/1FAIpQLSdjSkZam8KiatL9XACRVxCHjDJjaPGbls77PCXDKFn4JwykXg/viewform"
+            target="_blank"
+            rel="noreferrer"
           >
-            Submit Feedback
+            <span className="text-light-accent-1 dark:text-dark-accent-1">Submit Feedback</span>
           </a>
         </div>
       </div>
diff --git a/yarn.lock b/yarn.lock
index e6c7bd6e2..5c47bb09a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2261,6 +2261,11 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
+"@types/js-cookie@^3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-3.0.6.tgz#a04ca19e877687bd449f5ad37d33b104b71fdf95"
+  integrity sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==
+
 "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"