diff --git a/packages/light-react/src/App/App.js b/packages/light-react/src/App/App.js
index 5715372c5ae9ecf66e2a0ff9a21bede2f0f4080c..e9c33fcd0e7efdea812ffec667a1a0834cad2856 100644
--- a/packages/light-react/src/App/App.js
+++ b/packages/light-react/src/App/App.js
@@ -65,11 +65,8 @@ class App extends Component {
         <Switch>
           {/* We redirect to Onboarding if necessary, or by default to our
         homepage which is Tokens */}
-          <Redirect
-            exact
-            from='/'
-            to={isOnboarding ? '/onboarding' : '/tokens'}
-          />
+          <Redirect exact from='/' to='/tokens' />
+          {isOnboarding && <Redirect exact from='/tokens' to='/onboarding' />}
           <Route path='/accounts' component={Accounts} />
           <Route path='/onboarding' component={Onboarding} />
           <Route path='/send' component={Send} />
diff --git a/packages/light-react/src/Health/Health.js b/packages/light-react/src/Health/Health.js
index e7fd591ba0ffdfba92797a1237f28a04a95b0c23..0c8f403a71de7e61fd8bf24ab87eda54bbed9d31 100644
--- a/packages/light-react/src/Health/Health.js
+++ b/packages/light-react/src/Health/Health.js
@@ -66,7 +66,9 @@ class Health extends Component {
         return 'Running...';
       case STATUS.SYNCING:
         return `Syncing...${
-          payload && payload.percentage ? ` (${payload.percentage}%)` : ''
+          payload && payload.percentage && payload.percentage.gt(0)
+            ? ` (${payload.percentage.toFixed(0)}%)`
+            : ''
         }`;
       default:
         return JSON.stringify(payload); // Just in case payload is an object
diff --git a/packages/light-react/src/Onboarding/Onboarding.js b/packages/light-react/src/Onboarding/Onboarding.js
index 40b8d2cc7d5a29eda888d60b0b0d246c4a5258bf..b5f74c8a4b5433571c11650af19ce91d5ab50f29 100644
--- a/packages/light-react/src/Onboarding/Onboarding.js
+++ b/packages/light-react/src/Onboarding/Onboarding.js
@@ -13,8 +13,9 @@ import Health from '../Health';
 @observer
 class Onboarding extends Component {
   handleFirstRun = () => {
-    // Not first run anymore after clicking Start
+    // Not first run anymore after clicking Accept
     this.props.onboardingStore.setIsFirstRun(false);
+    this.props.history.push('/');
   };
 
   render () {
@@ -26,7 +27,7 @@ class Onboarding extends Component {
         This is the onboarding page.<br />
         {hasAccounts ? (
           <Link onClick={this.handleFirstRun} to='/'>
-            Start
+            Accept terms of use
           </Link>
         ) : (
           <Link to='/accounts/new'>Create account</Link>
diff --git a/packages/light-react/src/Overlay/Overlay.js b/packages/light-react/src/Overlay/Overlay.js
index 8c29214aa1eb1b88a354f202a64aec74e39bfb99..3a2d935b0bedc10deebb78b40c1d0ffebf18bfd4 100644
--- a/packages/light-react/src/Overlay/Overlay.js
+++ b/packages/light-react/src/Overlay/Overlay.js
@@ -80,7 +80,9 @@ class Overlays extends Component {
         and Time" -> Uncheck and recheck "Set date and time automatically"`;
       case STATUS.SYNCING:
       case STATUS.DOWNLOADING:
-        return payload && payload.percentage ? `${payload.percentage}%` : '';
+        return payload && payload.percentage && payload.percentage.gt(0)
+          ? `${payload.percentage.toFixed(0)}%`
+          : '';
       case STATUS.NOINTERNET:
         return 'Please check that you are connected to the internet';
       default:
diff --git a/packages/light-react/src/Send/TxForm/TxForm.js b/packages/light-react/src/Send/TxForm/TxForm.js
index ef3325aa8f4808311a48b6889babdfafdd4b87f5..932dfb3605f51e1e408d5f665db567ff4c41e70b 100644
--- a/packages/light-react/src/Send/TxForm/TxForm.js
+++ b/packages/light-react/src/Send/TxForm/TxForm.js
@@ -4,7 +4,6 @@
 // SPDX-License-Identifier: MIT
 
 import React, { Component } from 'react';
-import { fromWei, toWei } from '@parity/api/lib/util/wei';
 import { FormField, Header } from 'light-ui';
 import { inject, observer } from 'mobx-react';
 import { Link } from 'react-router-dom';
@@ -49,7 +48,7 @@ class Send extends Component {
 
   render () {
     const {
-      sendStore: { estimated, token, tx }
+      sendStore: { token, tx }
     } = this.props;
 
     return (
@@ -116,19 +115,14 @@ class Send extends Component {
                             min={MIN_GAS_PRICE}
                             onChange={this.handleChangeGasPrice}
                             required
-                            step={0.1}
+                            step={0.5}
                             type='range'
                             value={tx.gasPrice}
                           />
                           <nav className='range-nav'>
                             <span className='range-nav_label'>Cheap</span>
                             <span className='range-nav_value'>
-                              {fromWei(
-                                toWei(tx.gasPrice, 'shannon').mul(
-                                  estimated.toString()
-                                )
-                              ).toFixed(6)}{' '}
-                              ETH
+                              {tx.gasPrice} Gwei
                             </span>
                             <span className='range-nav_label'>Fast</span>
                           </nav>
diff --git a/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js b/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js
index 562c0533922de01ddfbca026e9defb2541c9d1d4..0e0f431f2358df77d0fb7c599554124e615ba12e 100644
--- a/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js
+++ b/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js
@@ -32,7 +32,7 @@ class NewTokenItem extends Component {
 
     return (
       <li key={token.address}>
-        <TokenCard balance={null} token={token}>
+        <TokenCard balance={null} showBalance={false} token={token}>
           <div className='token_buttons'>
             {tokens[token.address] ? (
               <button
diff --git a/packages/light-react/src/Settings/Settings.js b/packages/light-react/src/Settings/Settings.js
index fc7375df96a03178ed2754e274057ab36e9c389c..b4389e3575860dad9279ef0dc575f94aeb8ec0ef 100644
--- a/packages/light-react/src/Settings/Settings.js
+++ b/packages/light-react/src/Settings/Settings.js
@@ -15,7 +15,7 @@ import Health from '../Health';
 import NewTokenItem from './NewTokenItem';
 
 @light({
-  chainName: chainName$
+  chainName: () => chainName$({ withoutLoading: true })
 })
 @inject('tokensStore')
 @observer
@@ -73,7 +73,8 @@ class Settings extends Component {
     try {
       db = await import(`../assets/tokens/${this.props.chainName}.json`);
     } catch (e) {
-      db = await import(`../assets/tokens/foundation.json`);
+      this.setState({ db: [], dbMap: {} });
+      return;
     }
 
     // We create a address=>token mapping here
diff --git a/packages/light-react/src/stores/healthStore.js b/packages/light-react/src/stores/healthStore.js
index 77fb338bf840610f750fbd44387a49cf12a95e40..2a26bf4886c4fcaadfc674c08c4a363fcf038c76 100644
--- a/packages/light-react/src/stores/healthStore.js
+++ b/packages/light-react/src/stores/healthStore.js
@@ -69,9 +69,11 @@ class HealthStore {
     // Check if we're syncing
     if (this.syncing) {
       const { currentBlock, highestBlock, startingBlock } = this.syncing;
-      const percentage = Math.round(
-        ((currentBlock - startingBlock) * 100) / (highestBlock - startingBlock)
-      );
+      const percentage = currentBlock
+        .minus(startingBlock)
+        .mul(100)
+        .div(highestBlock.minus(startingBlock));
+
       return {
         status: STATUS.SYNCING,
         payload: { currentBlock, highestBlock, percentage, startingBlock }
diff --git a/packages/light-react/src/stores/sendStore.js b/packages/light-react/src/stores/sendStore.js
index abb1b4e274cb0592bc79d522cfdad282ae6f9b82..9ec560f66a1f075db4721f6e3d3e3bb941c61572 100644
--- a/packages/light-react/src/stores/sendStore.js
+++ b/packages/light-react/src/stores/sendStore.js
@@ -119,7 +119,7 @@ class SendStore {
    */
   send = () => {
     if (!this.isTxValid) {
-      console.error('Transaction is invalid.');
+      console.error('Transaction is invalid.', this.tx);
       return;
     }
 
diff --git a/packages/light-ui/src/TokenCard/TokenCard.js b/packages/light-ui/src/TokenCard/TokenCard.js
index efc7fb9a86295da64cd5a3112242125c43d2487b..1af15ee5d15f904d52dd8aa2be8001309923e2e0 100644
--- a/packages/light-ui/src/TokenCard/TokenCard.js
+++ b/packages/light-ui/src/TokenCard/TokenCard.js
@@ -9,7 +9,14 @@ import PropTypes from 'prop-types';
 import Card from '../Card';
 import Placeholder from '../Placeholder';
 
-const TokenCard = ({ balance, children, decimals, token, ...otherProps }) => (
+const TokenCard = ({
+  balance,
+  children,
+  decimals,
+  showBalance,
+  token,
+  ...otherProps
+}) => (
   <Card {...otherProps}>
     <div className='token'>
       <div className='token_icon'>
@@ -25,9 +32,9 @@ const TokenCard = ({ balance, children, decimals, token, ...otherProps }) => (
       <div className='token_balance'>
         {Number.isFinite(balance) ? (
           <span>{balance.toFixed(decimals)} </span>
-        ) : balance === null ? null : (
+        ) : showBalance ? (
           <Placeholder height={20} width={50} />
-        )}
+        ) : null}
         <span className='token_symbol'>{token.symbol}</span>
       </div>
       {children}
@@ -36,7 +43,8 @@ const TokenCard = ({ balance, children, decimals, token, ...otherProps }) => (
 );
 
 TokenCard.defaultProps = {
-  decimals: 2
+  decimals: 2,
+  showBalance: true
 };
 
 TokenCard.propTypes = {