diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js
index 2fe37ee7..6136aed6 100644
--- a/src/js/components/common/Header.js
+++ b/src/js/components/common/Header.js
@@ -47,7 +47,7 @@ const A = styled.a`
     }
 `;
 
-const Header = () => (
+const Header = (): React$Element<string> => (
     <Wrapper>
         <LayoutWrapper>
             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 163.7 41.9" width="100%" height="100%" preserveAspectRatio="xMinYMin meet">
diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js
index 550f65d6..10445424 100644
--- a/src/js/components/wallet/aside/CoinSelection.js
+++ b/src/js/components/wallet/aside/CoinSelection.js
@@ -1,54 +1,61 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { NavLink } from 'react-router-dom';
-import navigationConstants from '~/js/constants/navigation';
-
-class CoinSelection extends Component {
-    getBaseUrl() {
-        const { selectedDevice } = this.props.wallet;
-        let baseUrl = '';
-        if (selectedDevice && selectedDevice.features) {
-            baseUrl = `/device/${selectedDevice.features.device_id}`;
-            if (selectedDevice.instance) {
-                baseUrl += `:${selectedDevice.instance}`;
-            }
+/* @flow */
+
+
+import React from 'react';
+import { Link, NavLink } from 'react-router-dom';
+
+import type { Props } from './index';
+import type { TrezorDevice } from '~/flowtype';
+
+const CoinSelection = (props: Props): React$Element<string> => {
+    const { location } = props.router;
+    const { config } = props.localStorage;
+    const { selectedDevice } = props.wallet;
+
+    let baseUrl: string = '';
+    if (selectedDevice && selectedDevice.features) {
+        baseUrl = `/device/${selectedDevice.features.device_id}`;
+        if (selectedDevice.instance) {
+            baseUrl += `:${selectedDevice.instance}`;
         }
-        return baseUrl;
     }
 
-    render() {
-        const { config } = this.props.localStorage;
+    const walletCoins = config.coins.map((item) => {
+        const url = `${baseUrl}/network/${item.network}/account/0`;
+        const className = `coin ${item.network}`;
         return (
-            <section>
-                {config.coins.map(item => (
-                    <NavLink
-                        key={item.network}
-                        to={`${this.getBaseUrl()}/network/${item.network}/account/0`}
-                    >{ item.name }
-                    </NavLink>
-                ))}
-                <div className="coin-divider">
-                    Other coins <span>(You will be redirected)</span>
-                </div>
-                {navigationConstants.map(item => (
-                    <a
-                        key={item.coinName}
-                        rel="noopener noreferrer"
-                        target="_blank"
-                        href={item.url}
-                    >{item.coinName}
-                    </a>
-                ))}
-            </section>
+            <NavLink key={item.network} to={url} className={className}>
+                { item.name }
+            </NavLink>
         );
-    }
-}
+    });
 
-CoinSelection.propTypes = {
-    config: PropTypes.object,
-    wallet: PropTypes.object,
-    selectedDevice: PropTypes.object,
-    localStorage: PropTypes.object,
+    return (
+        <section>
+            { walletCoins }
+            <div className="coin-divider">
+                Other coins <span>(You will be redirected)</span>
+            </div>
+            <a href="https://wallet.trezor.io/#/coin/btc" className="coin btc external">
+                Bitcoin
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/ltc" className="coin ltc external">
+                Litecoin
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/bch" className="coin bch external">
+                Bitcoin Cash
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/btg" className="coin btg external">
+                Bitcoin Gold
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/dash" className="coin dash external">
+                Dash
+            </a>
+            <a href="https://wallet.trezor.io/#/coin/zec" className="coin zec external">
+                Zcash
+            </a>
+        </section>
+    );
 };
 
 export default CoinSelection;
\ No newline at end of file
diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js
index f14f5484..a02a2f62 100644
--- a/src/js/components/wallet/pages/DeviceSettings.js
+++ b/src/js/components/wallet/pages/DeviceSettings.js
@@ -6,7 +6,8 @@ import colors from '~/js/config/colors';
 import ICONS from '~/js/constants/icons';
 import { connect } from 'react-redux';
 
-const Section = styled.section``;
+const Section = styled.section`
+`;
 
 const P = styled.p`
     padding: 12px 0px 24px 0px;
@@ -27,7 +28,7 @@ const Row = styled.div`
     padding-bottom: 98px;
 `;
 
-const DeviceSettings = () => (
+export const DeviceSettings = () => (
     <Section>
         <Row>
             <Icon
diff --git a/src/js/constants/navigation.js b/src/js/constants/navigation.js
deleted file mode 100644
index 4dd85eb1..00000000
--- a/src/js/constants/navigation.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export default [
-    {
-        coinName: 'Bitcoin',
-        url: 'https://wallet.trezor.io/#/coin/btc',
-    },
-    {
-        coinName: 'Litecoin',
-        url: 'https://wallet.trezor.io/#/coin/ltc',
-    },
-    {
-        coinName: 'Bitcoin Cash',
-        url: 'https://wallet.trezor.io/#/coin/bch',
-    },
-    {
-        coinName: 'Bitcoin Gold',
-        url: 'https://wallet.trezor.io/#/coin/btg',
-    },
-    {
-        coinName: 'Dash',
-        url: 'https://wallet.trezor.io/#/coin/dash',
-    },
-    {
-        coinName: 'Zcash',
-        url: 'https://wallet.trezor.io/#/coin/zec',
-    },
-];
\ No newline at end of file
diff --git a/src/styles/history.less b/src/styles/history.less
index bdd03ceb..c340272e 100644
--- a/src/styles/history.less
+++ b/src/styles/history.less
@@ -8,6 +8,8 @@
 
     .history-transaction {
 
+        
+
         .amount, .time, .address {
             margin-left: 10px;
         }