diff --git a/common/components/Header/components/TabsOptions.jsx b/common/components/Header/components/TabsOptions.jsx
index dbc2c279..1c684943 100644
--- a/common/components/Header/components/TabsOptions.jsx
+++ b/common/components/Header/components/TabsOptions.jsx
@@ -11,7 +11,8 @@ const tabs = [
         name: 'NAV_SendEther'
     },
     {
-        name: 'NAV_Swap'
+        name: 'NAV_Swap',
+        link: 'swap'
     },
     {
         name: 'NAV_Offline'
@@ -62,7 +63,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 = (window.location.pathname === object.link || window.location.pathname.substring(1) === object.link) ? 'active' : '';
                                         return (
                                             <li className={`nav-item ${activeOrNot}`}
                                                 key={i} onClick={this.tabClick(i)}>
diff --git a/common/containers/App/index.jsx b/common/containers/App/index.jsx
index 1a657da1..a018c1bf 100644
--- a/common/containers/App/index.jsx
+++ b/common/containers/App/index.jsx
@@ -41,9 +41,7 @@ class App extends Component {
             changeNode,
             nodeSelection
         } = this.props;
-
-        // let title = children.props.route.name;
-
+        
         let headerProps = {
             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>
         )
     }