diff --git a/common/components/Header/components/TabsOptions.jsx b/common/components/Header/components/TabsOptions.jsx
index dbc2c279..dada34d9 100644
--- a/common/components/Header/components/TabsOptions.jsx
+++ b/common/components/Header/components/TabsOptions.jsx
@@ -1,6 +1,7 @@
 import React, {Component} from 'react';
 import {Link} from 'react-router';
 import translate from 'translations';
+import PropTypes from 'prop-types';
 
 const tabs = [
     {
@@ -11,7 +12,8 @@ const tabs = [
         name: 'NAV_SendEther'
     },
     {
-        name: 'NAV_Swap'
+        name: 'NAV_Swap',
+        link: 'swap'
     },
     {
         name: 'NAV_Offline'
@@ -39,6 +41,10 @@ export default class TabsOptions extends Component {
         }
     }
 
+    static propTypes = {
+        location: PropTypes.object
+    };
+
     tabClick() {
     }
 
@@ -49,6 +55,7 @@ export default class TabsOptions extends Component {
     }
 
     render() {
+        const {location} = this.props;
         return (
             <div>
                 <nav role='navigation' aria-label='main navigation' className='container nav-container overflowing'>
@@ -62,7 +69,7 @@ export default class TabsOptions extends Component {
                             {
                                 tabs.map((object, i) => {
                                         // if the window pathname is the same or similar to the tab objects name, set the active toggle
-                                        const activeOrNot = (window.location.pathname === object.name || window.location.pathname.substring(1) === object.name) ? 'active' : '';
+                                        const activeOrNot = (location.pathname === object.link || location.pathname.substring(1) === object.link) ? 'active' : '';
                                         return (
                                             <li className={`nav-item ${activeOrNot}`}
                                                 key={i} onClick={this.tabClick(i)}>
diff --git a/common/components/Header/index.jsx b/common/components/Header/index.jsx
index f7674c2c..4d8417da 100644
--- a/common/components/Header/index.jsx
+++ b/common/components/Header/index.jsx
@@ -8,6 +8,8 @@ import { languages, nodeList } from '../../config/data';
 
 export default class Header extends Component {
     static propTypes = {
+        location: PropTypes.object,
+
         // Language DropDown
         changeLanguage: PropTypes.func,
         languageSelection: PropTypes.object,
@@ -76,7 +78,7 @@ export default class Header extends Component {
                     </section>
                 </section>
 
-                <TabsOptions {...{}} />
+                <TabsOptions {...this.props} />
 
             </div>
         );
diff --git a/common/containers/App/index.jsx b/common/containers/App/index.jsx
index 1a657da1..80146f2e 100644
--- a/common/containers/App/index.jsx
+++ b/common/containers/App/index.jsx
@@ -42,9 +42,8 @@ class App extends Component {
             nodeSelection
         } = this.props;
 
-        // let title = children.props.route.name;
-
         let headerProps = {
+            location,
             changeLanguage,
             languageSelection,
 
diff --git a/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordInputComponent.jsx b/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordInputComponent.jsx
index 6c7ca791..2e23001e 100644
--- a/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordInputComponent.jsx
+++ b/common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordInputComponent.jsx
@@ -33,14 +33,6 @@ export default class GenerateWalletPasswordInputComponent extends Component {
                             className="input-group-addon eye"/>
                     </div>
                 </div>
-
-                {/*TODO - if we want descriptive errors we could re-enable this*/}
-                {/*{this.props.meta.touched && this.props.meta.error &&*/}
-                {/*<div>*/}
-                    {/*<p className="error">{this.props.meta.error}</p>*/}
-                {/*</div>*/}
-                {/*}*/}
-
             </div>
         )
     }