diff --git a/package.json b/package.json
index f02aba86e..16044d5bd 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,7 @@
     "@babel/register": "^7.0.0",
     "@exponent/electron-cookies": "^2.0.0",
     "@hot-loader/react-dom": "^16.8",
-    "@lbry/color": "^1.0.2",
-    "@lbry/components": "^2.7.4",
+    "@lbry/components": "^2.8.0",
     "@reach/menu-button": "^0.1.18",
     "@reach/rect": "^0.2.1",
     "@reach/tabs": "^0.1.5",
diff --git a/src/ui/component/header/view.jsx b/src/ui/component/header/view.jsx
index e0bf15763..fefaa6400 100644
--- a/src/ui/component/header/view.jsx
+++ b/src/ui/component/header/view.jsx
@@ -24,7 +24,7 @@ type Props = {
   setClientSetting: (string, boolean | string) => void,
   hideBalance: boolean,
   email: ?string,
-  minimal: boolean,
+  authHeader: boolean,
   signOut: () => void,
 };
 
@@ -37,10 +37,12 @@ const Header = (props: Props) => {
     automaticDarkModeEnabled,
     hideBalance,
     email,
-    minimal,
+    authHeader,
     signOut,
   } = props;
   const authenticated = Boolean(email);
+  const homeButtonNavigationProps = authHeader ? { onClick: signOut } : { navigate: '/' };
+  const closeButtonNavigationProps = authHeader ? { onClick: signOut } : { onClick: () => history.goBack() };
 
   function handleThemeToggle() {
     if (automaticDarkModeEnabled) {
@@ -67,7 +69,7 @@ const Header = (props: Props) => {
   return (
     <header
       className={classnames('header', {
-        'header--minimal': minimal,
+        'header--minimal': authHeader,
         // @if TARGET='app'
         'header--mac': IS_MAC,
         // @endif
@@ -79,11 +81,11 @@ const Header = (props: Props) => {
             className="header__navigation-item header__navigation-item--lbry"
             label={__('LBRY')}
             icon={ICONS.LBRY}
-            navigate="/"
+            {...homeButtonNavigationProps}
           />
 
           {/* @if TARGET='app' */}
-          {!minimal && (
+          {!authHeader && (
             <div className="header__navigation-arrows">
               <Button
                 className="header__navigation-item header__navigation-item--back"
@@ -104,10 +106,10 @@ const Header = (props: Props) => {
           )}
           {/* @endif */}
 
-          {!minimal && <WunderBar />}
+          {!authHeader && <WunderBar />}
         </div>
 
-        {!minimal ? (
+        {!authHeader ? (
           <div className={classnames('header__menu', { 'header__menu--small': IS_WEB && !authenticated })}>
             {!IS_WEB || authenticated ? (
               <Fragment>
@@ -178,8 +180,11 @@ const Header = (props: Props) => {
           </div>
         ) : (
           <div className="header__menu">
+            {/* Add an empty span here so we can use the same style as above */}
+            {/* This pushes the close button to the right side */}
+            <span />
             <Tooltip label={__('Go Back')}>
-              <Button icon={ICONS.REMOVE} onClick={() => history.goBack()} />
+              <Button icon={ICONS.REMOVE} {...closeButtonNavigationProps} />
             </Tooltip>
           </div>
         )}
diff --git a/src/ui/component/page/view.jsx b/src/ui/component/page/view.jsx
index da65221a1..acb516843 100644
--- a/src/ui/component/page/view.jsx
+++ b/src/ui/component/page/view.jsx
@@ -10,20 +10,20 @@ type Props = {
   className: ?string,
   autoUpdateDownloaded: boolean,
   isUpgradeAvailable: boolean,
-  fullscreen: boolean,
+  authPage: boolean,
   authenticated: boolean,
 };
 
 function Page(props: Props) {
-  const { children, className, fullscreen = false, authenticated } = props;
+  const { children, className, authPage = false, authenticated } = props;
   const obscureSideBar = IS_WEB ? !authenticated : false;
 
   return (
     <Fragment>
-      <Header minimal={fullscreen} />
+      <Header authHeader={authPage} />
       <div className={classnames('main-wrapper__inner')}>
-        <main className={classnames('main', className, { 'main--full-width': fullscreen })}>{children}</main>
-        {!fullscreen && <SideBar obscureSideBar={obscureSideBar} />}
+        <main className={classnames('main', className, { 'main--full-width': authPage })}>{children}</main>
+        {!authPage && <SideBar obscureSideBar={obscureSideBar} />}
       </div>
     </Fragment>
   );
diff --git a/src/ui/component/syncPassword/index.js b/src/ui/component/syncPassword/index.js
index d65ccc231..4f969c492 100644
--- a/src/ui/component/syncPassword/index.js
+++ b/src/ui/component/syncPassword/index.js
@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import { doGetSync, selectGetSyncIsPending, selectUserEmail } from 'lbryinc';
 import { doSetClientSetting } from 'redux/actions/settings';
+import { doSignOut } from 'redux/actions/app';
 import SyncPassword from './view';
 
 const select = state => ({
@@ -11,6 +12,7 @@ const select = state => ({
 const perform = dispatch => ({
   getSync: password => dispatch(doGetSync(password)),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
+  signOut: () => dispatch(doSignOut()),
 });
 
 export default connect(
diff --git a/src/ui/component/syncPassword/view.jsx b/src/ui/component/syncPassword/view.jsx
index 42e16ed10..d664994b6 100644
--- a/src/ui/component/syncPassword/view.jsx
+++ b/src/ui/component/syncPassword/view.jsx
@@ -5,15 +5,17 @@ import Button from 'component/button';
 import Card from 'component/common/card';
 import { setSavedPassword } from 'util/saved-passwords';
 import usePersistedState from 'effects/use-persisted-state';
+import I18nMessage from 'component/i18nMessage';
 
 type Props = {
   getSync: (?string) => void,
   getSyncIsPending: boolean,
   email: string,
+  signOut: () => void,
 };
 
 function SyncPassword(props: Props) {
-  const { getSync, getSyncIsPending, email } = props;
+  const { getSync, getSyncIsPending, email, signOut } = props;
   const [password, setPassword] = React.useState('');
   const [rememberPassword, setRememberPassword] = usePersistedState(true);
 
@@ -25,7 +27,7 @@ function SyncPassword(props: Props) {
   return (
     <Form onSubmit={handleSubmit}>
       <Card
-        title={__('Enter Your LBRY Password')}
+        title={__('Enter Your Wallet Password')}
         subtitle={__(
           'You set your wallet password when you previously installed LBRY. This may have been on different device.'
         )}
@@ -46,7 +48,18 @@ function SyncPassword(props: Props) {
             />
             <div className="card__actions">
               <Button type="submit" button="primary" label={__('Continue')} disabled={getSyncIsPending} />
+              <Button button="link" label={__('Cancel')} onClick={signOut} />
             </div>
+            <p className="help">
+              <I18nMessage
+                tokens={{
+                  help: <Button button="link" label={__('Help Guide')} />,
+                  email: <Button button="link" label={'help@lbry.com'} href="mailto:help@lbry.com" />,
+                }}
+              >
+                If you are having issues, checkout our %help% or email us at %email%.
+              </I18nMessage>
+            </p>
           </div>
         }
       />
diff --git a/src/ui/component/transactionList/view.jsx b/src/ui/component/transactionList/view.jsx
index 4a65bcce4..147a5a265 100644
--- a/src/ui/component/transactionList/view.jsx
+++ b/src/ui/component/transactionList/view.jsx
@@ -45,6 +45,7 @@ function TransactionList(props: Props) {
         <h2 className="card__title--between">
           {title}
           <div className="card__actions--inline">
+            <RefreshTransactionButton />
             {/* @if TARGET='app' */}
             {!slim && (
               <FileExporter
@@ -57,7 +58,6 @@ function TransactionList(props: Props) {
               />
             )}
             {/* @endif */}
-            <RefreshTransactionButton />
             {!slim && (
               <FormField
                 type="select"
diff --git a/src/ui/component/userEmailNew/view.jsx b/src/ui/component/userEmailNew/view.jsx
index d3eeed056..a61992f15 100644
--- a/src/ui/component/userEmailNew/view.jsx
+++ b/src/ui/component/userEmailNew/view.jsx
@@ -2,7 +2,6 @@
 import React, { useState } from 'react';
 import { FormField, Form } from 'component/common/form';
 import Button from 'component/button';
-import { Lbryio } from 'lbryinc';
 import analytics from 'analytics';
 import { EMAIL_REGEX } from 'constants/email';
 import I18nMessage from 'component/i18nMessage';
@@ -26,20 +25,15 @@ function UserEmailNew(props: Props) {
     setSync(formSyncEnabled);
     addUserEmail(newEmail);
     analytics.emailProvidedEvent();
-
-    // @if TARGET='web'
-    Lbryio.call('user_tag', 'edit', { add: 'lbrytv' });
-    // @endif
   }
 
   return (
     <React.Fragment>
-      <h1 className="section__title--large">{__('Welcome To LBRY')}</h1>
+      <h1 className="section__title--large">{__('Sign In To LBRY')}</h1>
       <p className="section__subtitle">{__('Create a new account or sign in.')}</p>
       <Form onSubmit={handleSubmit} className="section__body">
         <FormField
           autoFocus
-          className="form-field--short"
           placeholder={__('hotstuff_96@hotmail.com')}
           type="email"
           name="sign_up_email"
@@ -59,19 +53,6 @@ function UserEmailNew(props: Props) {
                 <Button button="link" href="https://lbry.com/faq/account-sync" label={__('Learn More')} />
               </React.Fragment>
             }
-            helper={
-              <React.Fragment>
-                <I18nMessage
-                  tokens={{
-                    terms: (
-                      <Button button="link" href="https://www.lbry.com/termsofservice" label={__('Terms of Service')} />
-                    ),
-                  }}
-                >
-                  By continuing, I agree to the %terms% and confirm I am over the age of 13.
-                </I18nMessage>
-              </React.Fragment>
-            }
             checked={formSyncEnabled}
             onChange={() => setFormSyncEnabled(!formSyncEnabled)}
           />
@@ -79,6 +60,19 @@ function UserEmailNew(props: Props) {
         <div className="card__actions">
           <Button button="primary" type="submit" label={__('Continue')} disabled={!newEmail || !valid || isPending} />
         </div>
+        <p className="help">
+          <React.Fragment>
+            <I18nMessage
+              tokens={{
+                terms: (
+                  <Button button="link" href="https://www.lbry.com/termsofservice" label={__('Terms of Service')} />
+                ),
+              }}
+            >
+              By continuing, I agree to the %terms% and confirm I am over the age of 13.
+            </I18nMessage>
+          </React.Fragment>
+        </p>
       </Form>
     </React.Fragment>
   );
diff --git a/src/ui/component/userEmailVerify/index.js b/src/ui/component/userEmailVerify/index.js
index 4fdc00f92..170fc95c8 100644
--- a/src/ui/component/userEmailVerify/index.js
+++ b/src/ui/component/userEmailVerify/index.js
@@ -1,15 +1,26 @@
 import { connect } from 'react-redux';
-import { selectEmailToVerify, doUserResendVerificationEmail, doUserCheckEmailVerified, selectUser } from 'lbryinc';
+import {
+  selectEmailAlreadyExists,
+  selectEmailToVerify,
+  doUserResendVerificationEmail,
+  doUserCheckEmailVerified,
+  selectUser,
+  selectResendingVerificationEmail,
+} from 'lbryinc';
+import { doToast } from 'lbry-redux';
 import UserEmailVerify from './view';
 
 const select = state => ({
   email: selectEmailToVerify(state),
+  isReturningUser: selectEmailAlreadyExists(state),
   user: selectUser(state),
+  resendingEmail: selectResendingVerificationEmail(state),
 });
 
 const perform = dispatch => ({
   resendVerificationEmail: email => dispatch(doUserResendVerificationEmail(email)),
   checkEmailVerified: () => dispatch(doUserCheckEmailVerified()),
+  toast: message => dispatch(doToast({ message })),
 });
 
 export default connect(
diff --git a/src/ui/component/userEmailVerify/view.jsx b/src/ui/component/userEmailVerify/view.jsx
index f747ca59f..693a1a671 100644
--- a/src/ui/component/userEmailVerify/view.jsx
+++ b/src/ui/component/userEmailVerify/view.jsx
@@ -5,8 +5,11 @@ import UserSignOutButton from 'component/userSignOutButton';
 
 type Props = {
   email: string,
+  isReturningUser: boolean,
   resendVerificationEmail: string => void,
+  resendingEmail: boolean,
   checkEmailVerified: () => void,
+  toast: string => void,
   user: {
     has_verified_email: boolean,
   },
@@ -37,7 +40,9 @@ class UserEmailVerify extends React.PureComponent<Props> {
   }
 
   handleResendVerificationEmail() {
-    this.props.resendVerificationEmail(this.props.email);
+    const { email, resendVerificationEmail, toast } = this.props;
+    resendVerificationEmail(email);
+    toast(__('New email sent.'));
   }
 
   checkIfVerified() {
@@ -48,21 +53,25 @@ class UserEmailVerify extends React.PureComponent<Props> {
   emailVerifyCheckInterval: ?IntervalID;
 
   render() {
-    const { email } = this.props;
+    const { email, isReturningUser, resendingEmail } = this.props;
 
     return (
       <React.Fragment>
-        <h1 className="section__title--large">{__('Confirm Your Email')}</h1>
+        <h1 className="section__title--large">{isReturningUser ? __('Check Your Email') : __('Confirm Your Email')}</h1>
 
         <p className="section__subtitle">
-          {__('An email was sent to')} {email}. {__('Follow the link to sign in. This will update automatically.')}
+          {__('An email was sent to %email%. Follow the link to %verify_text%. This will update automatically.', {
+            email,
+            verify_text: isReturningUser ? __('sign in') : __('verify your email'),
+          })}
         </p>
 
         <div className="section__body section__actions">
           <Button
             button="primary"
-            label={__('Resend Verification Email')}
+            label={__('Resend Email')}
             onClick={this.handleResendVerificationEmail}
+            disabled={resendingEmail}
           />
           <UserSignOutButton label={__('Start Over')} />
         </div>
diff --git a/src/ui/page/signIn/view.jsx b/src/ui/page/signIn/view.jsx
index ddd37b536..ed8cf9848 100644
--- a/src/ui/page/signIn/view.jsx
+++ b/src/ui/page/signIn/view.jsx
@@ -5,7 +5,7 @@ import Page from 'component/page';
 
 export default function SignInPage() {
   return (
-    <Page fullscreen className="main--auth-page">
+    <Page authPage className="main--auth-page">
       <UserSignIn />
     </Page>
   );
diff --git a/src/ui/scss/component/_button.scss b/src/ui/scss/component/_button.scss
index 038412dfb..3aa6da394 100644
--- a/src/ui/scss/component/_button.scss
+++ b/src/ui/scss/component/_button.scss
@@ -21,6 +21,10 @@
     background-color: $lbry-teal-4;
   }
 
+  &:active {
+    background-color: $lbry-teal-3;
+  }
+
   &:disabled {
     opacity: 0.5;
   }
diff --git a/src/ui/scss/component/_form-field.scss b/src/ui/scss/component/_form-field.scss
index d0234d337..5d9f01ce2 100644
--- a/src/ui/scss/component/_form-field.scss
+++ b/src/ui/scss/component/_form-field.scss
@@ -65,10 +65,6 @@ checkbox-element input[type='checkbox'] + label {
 fieldset-section {
   margin: 0;
 
-  &:not(:first-of-type) {
-    margin-top: var(--spacing-small);
-  }
-
   input,
   select,
   textarea {
@@ -92,6 +88,13 @@ fieldset-section {
       color: $lbry-gray-3;
     }
   }
+
+  &:not(:first-of-type) {
+    checkbox-element,
+    radio-element {
+      margin-top: var(--spacing-small);
+    }
+  }
 }
 
 checkbox-element {
@@ -141,6 +144,8 @@ checkbox-toggle {
 }
 
 fieldset-group {
+  margin-top: var(--spacing-small);
+
   &.fieldset-group--smushed {
     justify-content: flex-start;
 
diff --git a/static/app-strings.json b/static/app-strings.json
index 7740c734a..a7c3d994b 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -740,7 +740,7 @@
   "Follow New Tags": "Follow New Tags",
   "Sign In": "Sign In",
   "Go Back": "Go Back",
-  "Welcome To LBRY": "Welcome To LBRY",
+  "Sign In To LBRY": "Sign In To LBRY",
   "Create a new account or sign in.": "Create a new account or sign in.",
   "hotstuff_96@hotmail.com": "hotstuff_96@hotmail.com",
   "Terms of Service": "Terms of Service",
diff --git a/yarn.lock b/yarn.lock
index 6502d9250..effc1dd09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -860,15 +860,10 @@
     prop-types "^15.6.2"
     scheduler "^0.15.0"
 
-"@lbry/color@^1.0.2":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@lbry/color/-/color-1.1.1.tgz#b80ec25fb515d436129332b20c767c5a7014ac09"
-  integrity sha512-BdxqWmm84WYOd1ZsPruJiGr7WBEophVfJKg7oywFOAMb0h6ERe4Idx1ceweMSvCOyPlR5GAhil9Gvk70SBFdxQ==
-
-"@lbry/components@^2.7.4":
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/@lbry/components/-/components-2.7.4.tgz#3a633725137ffcb1f081f71dbf5397d66bf444cd"
-  integrity sha512-X0QBpdlsPntmuC/COolx/rOmUxa5XeHDjdcpl79Db3Y3upkEYwwtvl+S/OkkPbdxouoJfZTB4QqQuGkNi1xGdw==
+"@lbry/components@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@lbry/components/-/components-2.8.0.tgz#960b013d89992ce32c20cd916267e3962a765487"
+  integrity sha512-WPapGe+8KFdc8A1URvxQ95IdsqmaUECSEREfbFT7ZKT117PUEJfS+ze+B+Hj7/iExibtCF5YIbsO3hrFc7jWZQ==
 
 "@mapbox/hast-util-table-cell-style@^0.1.3":
   version "0.1.3"