diff --git a/src/ui/component/app/view.jsx b/src/ui/component/app/view.jsx
index e387f8bc8..938099c58 100644
--- a/src/ui/component/app/view.jsx
+++ b/src/ui/component/app/view.jsx
@@ -51,7 +51,7 @@ function App(props: Props) {
   }, [userId]);
 
   return (
-    <div className="main-wrapper" ref={appRef} onContextMenu={e => openContextMenu(e)}>
+    <div className={MAIN_WRAPPER_CLASS} ref={appRef} onContextMenu={e => openContextMenu(e)}>
       <Header />
 
       <div className="main-wrapper__inner">
diff --git a/src/ui/component/uriIndicator/view.jsx b/src/ui/component/uriIndicator/view.jsx
index 56d643e13..4a929ce6a 100644
--- a/src/ui/component/uriIndicator/view.jsx
+++ b/src/ui/component/uriIndicator/view.jsx
@@ -63,7 +63,7 @@ class UriIndicator extends React.PureComponent<Props> {
 
       return (
         <Button className="button--uri-indicator" navigate={channelLink}>
-          <Tooltip label={'test' || <ClaimPreview uri={channelLink} type="small" />}>{inner}</Tooltip>
+          <Tooltip label={<ClaimPreview uri={channelLink} type="small" />}>{inner}</Tooltip>
         </Button>
       );
     } else {
diff --git a/src/ui/component/userEmail/view.jsx b/src/ui/component/userEmail/view.jsx
index 05b69ddfe..6d7781b23 100644
--- a/src/ui/component/userEmail/view.jsx
+++ b/src/ui/component/userEmail/view.jsx
@@ -5,7 +5,7 @@ import Button from 'component/button';
 import { FormField } from 'component/common/form';
 import UserEmailNew from 'component/userEmailNew';
 import UserEmailVerify from 'component/userEmailVerify';
-import cookie from 'cookie';
+import UserEmailResetButton from 'component/userEmailResetButton';
 
 type Props = {
   cancelButton: Node,
@@ -21,14 +21,6 @@ type Props = {
 
 function UserEmail(props: Props) {
   const { email, user, accessToken, fetchAccessToken } = props;
-  const buttonsProps = IS_WEB
-    ? {
-        onClick: () => {
-          document.cookie = cookie.serialize('auth_token', '');
-          window.location.reload();
-        },
-      }
-    : { href: 'https://lbry.com/faq/how-to-change-email' };
 
   let isVerified = false;
   if (user) {
@@ -71,7 +63,7 @@ function UserEmail(props: Props) {
                 </React.Fragment>
               }
               value={email}
-              inputButton={<Button button="inverse" label={__('Change')} {...buttonsProps} />}
+              inputButton={<UserEmailResetButton button="inverse" />}
             />
           )}
           <p className="help">
diff --git a/src/ui/component/userEmailResetButton/index.js b/src/ui/component/userEmailResetButton/index.js
new file mode 100644
index 000000000..7dea3e8eb
--- /dev/null
+++ b/src/ui/component/userEmailResetButton/index.js
@@ -0,0 +1,11 @@
+import { connect } from 'react-redux';
+import UserEmailResetButton from './view';
+
+const select = state => ({});
+
+const perform = dispatch => ({});
+
+export default connect(
+  select,
+  perform
+)(UserEmailResetButton);
diff --git a/src/ui/component/userEmailResetButton/view.jsx b/src/ui/component/userEmailResetButton/view.jsx
new file mode 100644
index 000000000..3842a847f
--- /dev/null
+++ b/src/ui/component/userEmailResetButton/view.jsx
@@ -0,0 +1,24 @@
+// @flow
+import React from 'react';
+import Button from 'component/button';
+import cookie from 'cookie';
+
+type Props = {
+  button: string,
+};
+
+function UserEmailResetButton(props: Props) {
+  const { button = 'link' } = props;
+  const buttonsProps = IS_WEB
+    ? {
+        onClick: () => {
+          document.cookie = cookie.serialize('auth_token', '');
+          window.location.reload();
+        },
+      }
+    : { href: 'https://lbry.com/faq/how-to-change-email' };
+
+  return <Button button={button} label={__('Change')} {...buttonsProps} />;
+}
+
+export default UserEmailResetButton;
diff --git a/src/ui/component/userEmailVerify/view.jsx b/src/ui/component/userEmailVerify/view.jsx
index 2d528200b..deae86b62 100644
--- a/src/ui/component/userEmailVerify/view.jsx
+++ b/src/ui/component/userEmailVerify/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
 import Button from 'component/button';
-import cookie from 'cookie';
+import UserEmailResetButton from 'component/userEmailResetButton';
 
 type Props = {
   email: string,
@@ -49,18 +49,6 @@ class UserEmailVerify extends React.PureComponent<Props> {
   render() {
     const { email } = this.props;
 
-    // Below is duplicated in UserEmail
-    // This should just be a UserEmailResetButton component
-    const buttonProps = IS_WEB
-      ? {
-          onClick: () => {
-            clearInterval(this.emailVerifyCheckInterval);
-            document.cookie = cookie.serialize('auth_token', '');
-            window.location.reload();
-          },
-        }
-      : { href: 'https://lbry.com/faq/how-to-change-email' };
-
     return (
       <React.Fragment>
         <header className="card__header">
@@ -80,7 +68,7 @@ class UserEmailVerify extends React.PureComponent<Props> {
               onClick={this.handleResendVerificationEmail}
             />
 
-            <Button button="link" label={__('Reset')} {...buttonProps} />
+            <UserEmailResetButton />
           </div>
 
           <p className="help">
diff --git a/src/ui/scss/component/_claim-list.scss b/src/ui/scss/component/_claim-list.scss
index 3d59ab22c..3e6e8ed7f 100644
--- a/src/ui/scss/component/_claim-list.scss
+++ b/src/ui/scss/component/_claim-list.scss
@@ -186,12 +186,3 @@
   margin-right: auto;
   padding-right: var(--spacing-medium);
 }
-
-.claim-preview-tags {
-  margin-left: 0;
-
-  // change this
-  .tag {
-    max-width: 10rem;
-  }
-}
diff --git a/src/ui/scss/component/_navigation.scss b/src/ui/scss/component/_navigation.scss
index 50bcc11a2..96c11292c 100644
--- a/src/ui/scss/component/_navigation.scss
+++ b/src/ui/scss/component/_navigation.scss
@@ -1,10 +1,3 @@
-.navigation-wrapper {
-  // width: var(--side-nav-width);
-  // left: calc(100% - var(--side-nav-width));
-  // height: 100%;
-  // position: absolute;
-}
-
 .navigation {
   width: var(--side-nav-width);
   font-size: 1.4rem;
diff --git a/src/ui/scss/component/_wunderbar.scss b/src/ui/scss/component/_wunderbar.scss
index 574e7ca31..e3266c463 100644
--- a/src/ui/scss/component/_wunderbar.scss
+++ b/src/ui/scss/component/_wunderbar.scss
@@ -72,7 +72,6 @@
   box-shadow: 0 1px 5px rgba($lbry-black, 0.15);
   min-width: 100%;
   overflow: hidden;
-  font-size: 14px;
 
   [data-mode='dark'] & {
     background-color: $lbry-gray-5;
diff --git a/src/ui/util/query-params.js b/src/ui/util/query-params.js
index e8c85ae92..e14b0282b 100644
--- a/src/ui/util/query-params.js
+++ b/src/ui/util/query-params.js
@@ -27,6 +27,7 @@ export function toQueryString(params) {
   return parts.join('&');
 }
 
+// https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter
 export function updateQueryParam(uri, key, value) {
   const re = new RegExp('([?&])' + key + '=.*?(&|$)', 'i');
   const separator = uri.indexOf('?') !== -1 ? '&' : '?';