diff --git a/TODO b/TODO
index 9a8b20b..f1736dc 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,13 @@
+
 resume statistic dashboard with money values
+pagination
+pre-anchors
 
 Toaster
+buy/offer untrusted asset
+
+credit backstream from last timestamp
+ground
 
 - desktop app link and page
 
diff --git a/app/js/actions-creators/account.js b/app/js/actions-creators/account.js
index 6e0ec31..a691bdc 100644
--- a/app/js/actions-creators/account.js
+++ b/app/js/actions-creators/account.js
@@ -1,15 +1,48 @@
 import { push } from 'react-router-redux';
 import { StellarServer, StellarTools } from 'stellar-toolkit';
+import { Keypair } from 'stellar-sdk';
 
 import { AsyncActions } from '../helpers/asyncActions';
 import * as AccountActions from '../actions/account';
 import { ASYNC_FETCH_ACCOUNT, ASYNC_CREATE_TEST_ACCOUNT } from '../constants/asyncActions';
+import * as routes from '../constants/routes';
 
+import { getLocalAccounts } from '../helpers/storage';
+import { getAccounts, getCurrentAccount } from '../selectors/account';
 import { getNetwork } from '../selectors/stellarData';
 
 const { getAccount, switchNetwork: switchNetworkInstance, generateTestPair } = StellarServer;
 const { KeypairInstance } = StellarTools;
 
+const PROD = process.env.NODE_ENV === 'production';
+
+export const resetAccount = () => (dispatch) => {
+  dispatch(push({ query: {} }));
+  dispatch(AccountActions.resetAccount());
+};
+
+export const switchNetwork = network => (dispatch, getState) => {
+  const currentNetwork = getNetwork(getState());
+  if (network === currentNetwork) return;
+
+  dispatch(resetAccount());
+
+  switchNetworkInstance(network);
+  dispatch(AccountActions.switchNetwork(network));
+};
+
+export const addAccount = keypair => (dispatch) => {
+  const newAccount = {
+    id: keypair.publicKey(),
+    keypair,
+  };
+
+  // TODO update existing : add seed, edit other fields ...
+  // TODO add network into account
+  dispatch(AccountActions.addAccount(newAccount));
+};
+
+// TODO handle invalid keys
 export const setAccount = keys => (dispatch, getState) => {
   dispatch(AsyncActions.startFetch(ASYNC_FETCH_ACCOUNT));
 
@@ -17,36 +50,75 @@ export const setAccount = keys => (dispatch, getState) => {
   const network = getNetwork(getState());
 
   return getAccount(keypair.publicKey())
-    .then((account) => {
-      dispatch(AsyncActions.successFetch(ASYNC_FETCH_ACCOUNT, account));
-      dispatch(AccountActions.setKeypair(keypair));
-
-      const putSecret = (keypair.canSign() && process.env.NODE_ENV === 'development');
-      const query = {
-        accountId: putSecret ? undefined : keypair.publicKey(),
-        secretSeed: putSecret ? keypair.secret() : undefined,
-        network,
+    .then((stellarAccount) => {
+      dispatch(AsyncActions.successFetch(ASYNC_FETCH_ACCOUNT, stellarAccount));
+      dispatch(resetAccount());
+      dispatch(addAccount(keypair));
+      dispatch(AccountActions.setCurrentAccountId(keypair.publicKey()));
+
+      const putSecret = (keypair.canSign() && !PROD);
+      const routeUpdate = {
+        pathname: routes.Account_G(keypair.publicKey()),
+        query: {
+          secretSeed: putSecret ? keypair.secret() : undefined,
+          network,
+        },
       };
-      dispatch(push({ query }));
+      dispatch(push(routeUpdate));
 
-      return account;
+      return stellarAccount;
     })
-    .catch(error => dispatch(AsyncActions.errorFetch(ASYNC_FETCH_ACCOUNT, error)));
+    .catch((error) => {
+      dispatch(AsyncActions.errorFetch(ASYNC_FETCH_ACCOUNT, error));
+      dispatch(push(routes.Root));
+      throw error;
+    });
 };
 
-export const resetAccount = () => (dispatch) => {
-  dispatch(push({ query: {} }));
-  dispatch(AccountActions.resetAccount());
+export const openAccountId = id => (dispatch, getState) => {
+  const state = getState();
+  const localAccounts = getAccounts(state);
+  const currentAccount = getCurrentAccount(state);
+
+  if (!id) return Promise.reject();
+  if (id === 'null') { // TODO store constant or direct call reset
+    return dispatch(resetAccount());
+  }
+  if (currentAccount && currentAccount.id === id)
+    return Promise.resolve();
+
+  const localAccount = localAccounts.find(a => (a.id === id));
+
+  let keypair = null;
+  if (localAccount) {
+    keypair = localAccount.keypair;
+  } else {
+    keypair = Keypair.fromPublicKey(id);
+  }
+  return dispatch(setAccount(keypair));
 };
 
-export const switchNetwork = network => (dispatch, getState) => {
-  const currentNetwork = getNetwork(getState());
-  if (network === currentNetwork) return;
+export const onPageLoad = nextState => (dispatch) => {
+  // Retrieve stored accounts
+  const localAccounts = getLocalAccounts();
+  dispatch(AccountActions.addAccounts(localAccounts));
 
-  dispatch(resetAccount());
+  const { location: { query } } = nextState;
+  if (query.network) {
+    dispatch(switchNetwork(query.network));
+  }
+};
 
-  switchNetworkInstance(network);
-  dispatch(AccountActions.switchNetwork(network));
+export const onChangeAccountRoute = nextState => (dispatch) => {
+  const { params: { id }, location: { action, query } } = nextState;
+  if(action === 'PUSH') return; // Disable self-sent actions
+
+  if (query.secretSeed) {
+    const keypair = Keypair.fromSecret(query.secretSeed);
+    dispatch(setAccount(keypair));
+  } else {
+    dispatch(openAccountId(id));
+  }
 };
 
 export const createTestAccount = () => (dispatch) => {
diff --git a/app/js/actions/account.js b/app/js/actions/account.js
index 63abee0..e92a237 100644
--- a/app/js/actions/account.js
+++ b/app/js/actions/account.js
@@ -1,8 +1,8 @@
 export const SWITCH_NETWORK = 'network:switch';
 
 export const RESET_ACCOUNT = 'account:reset';
-export const SET_KEYPAIR = 'keypair:set';
-
+export const ADD_ACCOUNT = 'account:add';
+export const SET_CURRENT_ACCOUNT_ID = 'account:set-id';
 
 export function resetAccount() {
   return {
@@ -10,10 +10,10 @@ export function resetAccount() {
   };
 }
 
-export function setKeypair(keypair) {
+export function setCurrentAccountId(id) {
   return {
-    type: SET_KEYPAIR,
-    keypair,
+    type: SET_CURRENT_ACCOUNT_ID,
+    id,
   };
 }
 
@@ -23,3 +23,15 @@ export function switchNetwork(network) {
     network,
   };
 }
+
+export function addAccount(account, accounts) {
+  return {
+    type: ADD_ACCOUNT,
+    account,
+    accounts,
+  };
+}
+
+export function addAccounts(accounts) {
+  return addAccount(null, accounts);
+}
diff --git a/app/js/bootstrap/router.js b/app/js/bootstrap/router.js
index 21e8543..3312f1b 100644
--- a/app/js/bootstrap/router.js
+++ b/app/js/bootstrap/router.js
@@ -1,35 +1,52 @@
-import React from 'react';
-import { Router, Route, Redirect, browserHistory } from 'react-router';
+import React, { PropTypes } from 'react';
+import { Router, Route, IndexRoute, Redirect, browserHistory } from 'react-router';
+import { connect } from 'react-redux';
 import { syncHistoryWithStore } from 'react-router-redux';
 
 import store from './store';
 
 import Layout from '../components/Layout';
+import Welcome from '../components/views/WelcomeView';
 import * as routes from '../constants/routes';
 
 import AppMode from '../elements/AppMode';
 // import NotFound from '../components/views/NotFound';
 import Desktop from '../components/views/Desktop';
-
-import * as AccountManager from '../helpers/AccountManager';
+import { onPageLoad as onPageLoadAction, onChangeAccountRoute as onChangeAccountRouteAction } from '../actions-creators/account';
 
 const history = syncHistoryWithStore(browserHistory, store);
 
-const RouterContainer = () =>
+const RouterContainer = ({ onPageLoad, onChangeAccountRoute }) =>
   <Router history={history}>
-    <Route component={Layout}>
+    <Route
+      component={Layout}
+      onEnter={onPageLoad}
+      path={routes.Root}
+    >
       <Route
-        path={routes.Root}
+        path={routes.Account}
+        onEnter={onChangeAccountRoute}
         component={AppMode}
-        onEnter={AccountManager.onPageLoad}
       />
+
       <Route
         path={routes.Desktop}
         component={Desktop}
       />
 
-      <Redirect from="*" to="/" />
+      <IndexRoute component={Welcome} />
+      <Redirect from="*" to={routes.Root} />
     </Route>
   </Router>;
 
-export default RouterContainer;
+RouterContainer.propTypes = {
+  onPageLoad: PropTypes.func.isRequired,
+  onChangeAccountRoute: PropTypes.func.isRequired,
+};
+
+const mapDispatchToProps = {
+  onPageLoad: onPageLoadAction,
+  onChangeAccountRoute: onChangeAccountRouteAction,
+};
+
+export default connect(null, mapDispatchToProps)(RouterContainer);
diff --git a/app/js/bootstrap/store.js b/app/js/bootstrap/store.js
index 8f39192..3eca652 100644
--- a/app/js/bootstrap/store.js
+++ b/app/js/bootstrap/store.js
@@ -6,8 +6,6 @@ import { browserHistory } from 'react-router';
 import { routerMiddleware } from 'react-router-redux';
 
 import reducers from '../reducers';
-import { setStore } from '../helpers/AccountManager';
-
 import stellarStreamerMiddleware from '../middlewares/StellarStreamer';
 import asyncActionsMiddleware from '../helpers/asyncActions/middleware';
 
@@ -26,6 +24,4 @@ const store = createStore(
   enhancer,
 );
 
-setStore(store);
-
 export default store;
diff --git a/app/js/components/views/WelcomeView.js b/app/js/components/views/WelcomeView.js
index 6456ae6..e3d4782 100644
--- a/app/js/components/views/WelcomeView.js
+++ b/app/js/components/views/WelcomeView.js
@@ -51,6 +51,8 @@ const styles = {
   },
 };
 
+// TODO reshow loader on account loading
+
 class WelcomeScreen extends Component {
   render() {
     return (
diff --git a/app/js/constants/routes.js b/app/js/constants/routes.js
index 676e50e..208f1fb 100644
--- a/app/js/constants/routes.js
+++ b/app/js/constants/routes.js
@@ -1,2 +1,5 @@
 export const Root = '/';
+export const Account = '/account/:id';
 export const Desktop = '/desktop';
+
+export const Account_G = id => Account.replace(':id', id);
diff --git a/app/js/elements/AppMode/component.js b/app/js/elements/AppMode/component.js
index 8387af8..c44bdc3 100644
--- a/app/js/elements/AppMode/component.js
+++ b/app/js/elements/AppMode/component.js
@@ -1,7 +1,6 @@
 import React, { PropTypes } from 'react';
 import { Dimmer, Loader } from 'semantic-ui-react';
 
-import Welcome from '../../components/views/WelcomeView';
 import PrivateView from '../../components/views/PrivateView';
 import PublicView from '../../components/views/PublicView';
 
@@ -15,9 +14,6 @@ function AppMode({ isAccountLoading, accountSet, canSign }) {
         accountSet &&
         (canSign ? <PrivateView /> : <PublicView />)
       }
-      {
-        !accountSet && <Welcome />
-      }
     </div>
   );
 }
diff --git a/app/js/elements/StellarContainers/AccountSelector/component.js b/app/js/elements/StellarContainers/AccountSelector/component.js
index e85d9c9..e12e917 100644
--- a/app/js/elements/StellarContainers/AccountSelector/component.js
+++ b/app/js/elements/StellarContainers/AccountSelector/component.js
@@ -24,26 +24,6 @@ class AccountSelector extends Component {
       showSeed: false,
       resolving: false,
     };
-    if (this.props.keypair) {
-      this.state.accountId = this.props.keypair.publicKey();
-      this.state.secretSeed = this.props.keypair.canSign() ? this.props.keypair.secret() : '';
-    }
-  }
-
-  componentWillReceiveProps(newProps) {
-    if (this.props.keypair !== newProps.keypair) {
-      if (newProps.keypair) {
-        this.setState({
-          accountId: newProps.keypair.publicKey(),
-          secretSeed: newProps.keypair.canSign() ? newProps.keypair.secret() : '',
-        });
-      } else {
-        this.setState({
-          accountId: '',
-          secretSeed: '',
-        });
-      }
-    }
   }
 
   componentDidMount() {
@@ -89,7 +69,8 @@ class AccountSelector extends Component {
   }
 
   newForm() {
-    const { values: { address } } = this.props;
+    const { values } = this.props;
+    const address = values.address || null;
 
     let buttonLabel = 'Invalid address';
     const buttonContent = 'Go';
@@ -172,7 +153,6 @@ AccountSelector.propTypes = {
   isAccountLoading: PropTypes.bool,
   isCreatingTestAccount: PropTypes.bool,
   error: PropTypes.object,
-  keypair: PropTypes.object,
   setAccount: PropTypes.func.isRequired,
   createTestAccount: PropTypes.func.isRequired,
   network: PropTypes.string.isRequired,
diff --git a/app/js/elements/StellarContainers/AccountSelector/container.js b/app/js/elements/StellarContainers/AccountSelector/container.js
index c99ba0b..a711512 100644
--- a/app/js/elements/StellarContainers/AccountSelector/container.js
+++ b/app/js/elements/StellarContainers/AccountSelector/container.js
@@ -8,7 +8,6 @@ import {
   isAccountLoading,
   isCreatingTestAccount,
   getAccountError,
-  getKeypair,
   canSign,
 } from '../../../selectors/account';
 import {
@@ -22,7 +21,6 @@ const mapStateToProps = state => ({
   isCreatingTestAccount: isCreatingTestAccount(state),
   canSign: canSign(state),
   error: getAccountError(state),
-  keypair: getKeypair(state),
   network: getNetwork(state),
 
   values: getFormValues(FORM_NAME)(state),
diff --git a/app/js/elements/StellarContainers/CurrentAccount/component.js b/app/js/elements/StellarContainers/CurrentAccount/component.js
index e038ad5..1bbff66 100644
--- a/app/js/elements/StellarContainers/CurrentAccount/component.js
+++ b/app/js/elements/StellarContainers/CurrentAccount/component.js
@@ -2,6 +2,8 @@ import React, { Component, PropTypes } from 'react';
 import { Table, Container, Button, Header } from 'semantic-ui-react';
 import Clipboard from 'clipboard';
 
+import * as routes from '../../../constants/routes';
+
 class CurrentAccount extends Component {
 
   constructor(props) {
@@ -17,16 +19,38 @@ class CurrentAccount extends Component {
   }
 
   openOnNewTab() {
-    let url = '/?';
-    url += `network=${this.props.network}`;
-    if (this.props.keypair.canSign()) {
-      url += `&secretSeed=${this.props.keypair.secret()}`;
-    } else {
-      url += `&accountId=${this.props.keypair.publicKey()}`;
-    }
+    let url = routes.Account_G(this.props.keypair.publicKey());
     window.open(url);
   }
 
+  renderSeedBtn() {
+    const { keypair } = this.props;
+    const canSign = keypair.canSign();
+
+    if(canSign) {
+      return (
+        this.state.showSeed ?
+          <Button
+            basic compact
+            size="medium"
+            icon="clipboard"
+            content="Hide seed"
+            color="olive"
+            onClick={() => this.setState({ showSeed: false })}
+          />
+          :
+          <Button
+            basic compact
+            size="medium"
+            icon="clipboard"
+            content="Show seed"
+            color="orange"
+            onClick={() => this.setState({ showSeed: true })}
+          />
+      );
+    }
+    return null;
+  }
 
   accountInfo() {
     if (!this.props.keypair) { return null; }
@@ -50,26 +74,7 @@ class CurrentAccount extends Component {
               <Header as="h3">Account addresses</Header>
             </Table.HeaderCell>
             <Table.HeaderCell textAlign="right">
-              {
-                canSign && (this.state.showSeed ?
-                  <Button
-                    basic compact
-                    size="medium"
-                    icon="clipboard"
-                    content="Hide seed"
-                    color="olive"
-                    onClick={() => this.setState({ showSeed: false })}
-                  />
-                  :
-                  <Button
-                    basic compact
-                    size="medium"
-                    icon="clipboard"
-                    content="Show seed"
-                    color="orange"
-                    onClick={() => this.setState({ showSeed: true })}
-                  />)
-              }
+              {this.renderSeedBtn()}
             </Table.HeaderCell>
           </Table.Row>
         </Table.Header>
diff --git a/app/js/elements/StellarContainers/CurrentAccount/container.js b/app/js/elements/StellarContainers/CurrentAccount/container.js
index 8cf978e..4d47b6b 100644
--- a/app/js/elements/StellarContainers/CurrentAccount/container.js
+++ b/app/js/elements/StellarContainers/CurrentAccount/container.js
@@ -3,15 +3,20 @@ import { connect } from 'react-redux';
 import CurrentAccount from './component';
 
 import {
-  getKeypair,
+  getCurrentAccount,
 } from '../../../selectors/account';
 import {
   getNetwork,
 } from '../../../selectors/stellarData';
 
-const mapStateToProps = (state, ownProps) => ({
-  keypair: ownProps.keypair || getKeypair(state),
-  network: getNetwork(state),
-});
+const mapStateToProps = (state, ownProps) => {
+  const currentAccount = getCurrentAccount(state);
+  const currentKeypair = currentAccount && currentAccount.keypair;
+  return {
+    keypair: ownProps.keypair || currentKeypair,
+    network: getNetwork(state),
+    // openExternal: true,
+  };
+};
 
 export default connect(mapStateToProps, null)(CurrentAccount);
diff --git a/app/js/elements/UiTools/AccountSwitcher/component.js b/app/js/elements/UiTools/AccountSwitcher/component.js
index f4ef833..b4ad25a 100644
--- a/app/js/elements/UiTools/AccountSwitcher/component.js
+++ b/app/js/elements/UiTools/AccountSwitcher/component.js
@@ -1,23 +1,54 @@
 import React, { PropTypes } from 'react';
-import { Button } from 'semantic-ui-react';
+import { Dropdown } from 'semantic-ui-react';
+
+import AccountId from '../../../components/stellar/AccountId';
 
 class AccountSwitcher extends React.Component {
   render() {
-    const { resetAccount } = this.props;
+    const { currentAccount, openAccountId, accounts } = this.props;
+
+    if (accounts.length === 0) {
+      return null;
+    }
+
+    let currentId = 'null';
+
+    const options = accounts.map(a => ({
+      value: a.id,
+      text: AccountId.getAccountIdText(a.keypair.publicKey()),
+    }));
+
+    if (currentAccount) {
+      currentId = currentAccount.id;
+      options.push({
+        value: 'null',
+        text: 'Close account',
+      });
+    } else {
+      options.unshift({
+        value: 'null',
+        text: 'No account selected',
+      });
+    }
 
     return (
-      <Button
-        primary compact
-        icon="user"
-        onClick={resetAccount}
-        content="Change account"
+      <Dropdown
+        selection
+        button
+        color="blue"
+        label="Select account"
+        options={options}
+        value={currentId}
+        onChange={(e, d) => openAccountId(d.value)}
       />
     );
   }
 }
 
 AccountSwitcher.propTypes = {
-  resetAccount: PropTypes.func.isRequired,
+  accounts: PropTypes.array.isRequired,
+  currentAccount: PropTypes.object,
+  openAccountId: PropTypes.func.isRequired,
 };
 
 export default AccountSwitcher;
diff --git a/app/js/elements/UiTools/AccountSwitcher/container.js b/app/js/elements/UiTools/AccountSwitcher/container.js
index c039f34..0a65702 100644
--- a/app/js/elements/UiTools/AccountSwitcher/container.js
+++ b/app/js/elements/UiTools/AccountSwitcher/container.js
@@ -1,10 +1,20 @@
 import { connect } from 'react-redux';
 
 import NetworkSwitcher from './component';
-import { resetAccount } from '../../../actions-creators/account';
+import { getAccounts, getCurrentAccount } from '../../../selectors/account';
+import { openAccountId } from '../../../actions-creators/account';
+
+const mapStateToProps = (state) => {
+  const accounts = getAccounts(state);
+  const currentAccount = getCurrentAccount(state);
+  return {
+    accounts,
+    currentAccount,
+  };
+};
 
 const mapDispatchToProps = {
-  resetAccount,
+  openAccountId,
 };
 
-export default connect(null, mapDispatchToProps)(NetworkSwitcher);
+export default connect(mapStateToProps, mapDispatchToProps)(NetworkSwitcher);
diff --git a/app/js/elements/UiTools/ChangeAccount/component.js b/app/js/elements/UiTools/ChangeAccount/component.js
new file mode 100644
index 0000000..f4ef833
--- /dev/null
+++ b/app/js/elements/UiTools/ChangeAccount/component.js
@@ -0,0 +1,23 @@
+import React, { PropTypes } from 'react';
+import { Button } from 'semantic-ui-react';
+
+class AccountSwitcher extends React.Component {
+  render() {
+    const { resetAccount } = this.props;
+
+    return (
+      <Button
+        primary compact
+        icon="user"
+        onClick={resetAccount}
+        content="Change account"
+      />
+    );
+  }
+}
+
+AccountSwitcher.propTypes = {
+  resetAccount: PropTypes.func.isRequired,
+};
+
+export default AccountSwitcher;
diff --git a/app/js/elements/UiTools/ChangeAccount/container.js b/app/js/elements/UiTools/ChangeAccount/container.js
new file mode 100644
index 0000000..c039f34
--- /dev/null
+++ b/app/js/elements/UiTools/ChangeAccount/container.js
@@ -0,0 +1,10 @@
+import { connect } from 'react-redux';
+
+import NetworkSwitcher from './component';
+import { resetAccount } from '../../../actions-creators/account';
+
+const mapDispatchToProps = {
+  resetAccount,
+};
+
+export default connect(null, mapDispatchToProps)(NetworkSwitcher);
diff --git a/app/js/elements/UiTools/ChangeAccount/index.js b/app/js/elements/UiTools/ChangeAccount/index.js
new file mode 100644
index 0000000..1c2fccb
--- /dev/null
+++ b/app/js/elements/UiTools/ChangeAccount/index.js
@@ -0,0 +1,3 @@
+import Container from './container';
+
+export default Container;
diff --git a/app/js/elements/UiTools/TopBar/TopBar.js b/app/js/elements/UiTools/TopBar/TopBar.js
index efcc19b..a058627 100644
--- a/app/js/elements/UiTools/TopBar/TopBar.js
+++ b/app/js/elements/UiTools/TopBar/TopBar.js
@@ -2,7 +2,7 @@ import React, { PropTypes } from 'react';
 import { Container, Menu, Button } from 'semantic-ui-react';
 
 import NetworkSwitcher from '../../../elements/UiTools/NetworkSwitcher';
-import AccountSwitcher from '../../../elements/UiTools/AccountSwitcher';
+import ChangeAccount from '../../../elements/UiTools/ChangeAccount';
 import KeypairGenerator from '../../../elements/UiTools/KeypairGenerator';
 
 import icon from '../../../../../content/assets/images/favicon-32x32.png';
@@ -11,7 +11,7 @@ function duplicateTab() {
   window.open(window.location.href);
 }
 
-const Layout = ({ keypair, goHome, keypairModalOpen, openKeypairModal, closeKeypairModal }) =>
+const TopBar = ({ goHome, keypairModalOpen, openKeypairModal, closeKeypairModal, currentAccount }) =>
   <Menu fixed="top" inverted>
     <Container>
       <Menu.Item>
@@ -27,9 +27,9 @@ const Layout = ({ keypair, goHome, keypairModalOpen, openKeypairModal, closeKeyp
         />
         <KeypairGenerator open={keypairModalOpen} close={closeKeypairModal} />
       </Menu.Item>
-      {keypair &&
+      { currentAccount &&
       <Menu.Item>
-        <AccountSwitcher />
+        <ChangeAccount />
       </Menu.Item>
       }
       <Menu.Item>
@@ -44,12 +44,12 @@ const Layout = ({ keypair, goHome, keypairModalOpen, openKeypairModal, closeKeyp
     </Container>
   </Menu>;
 
-Layout.propTypes = {
+TopBar.propTypes = {
   goHome: PropTypes.func.isRequired,
   openKeypairModal: PropTypes.func.isRequired,
   closeKeypairModal: PropTypes.func.isRequired,
-  keypair: PropTypes.object,
   keypairModalOpen: PropTypes.bool,
+  currentAccount: PropTypes.object,
 };
 
-export default Layout;
+export default TopBar;
diff --git a/app/js/elements/UiTools/TopBar/index.js b/app/js/elements/UiTools/TopBar/index.js
index ed1856d..133fad7 100644
--- a/app/js/elements/UiTools/TopBar/index.js
+++ b/app/js/elements/UiTools/TopBar/index.js
@@ -2,13 +2,13 @@ import { connect } from 'react-redux';
 import { push } from 'react-router-redux';
 
 import TopBar from './TopBar';
-import { getKeypair } from '../../../selectors/account';
 import { isModalKeypairOpen } from '../../../selectors/ui';
+import { getCurrentAccount } from '../../../selectors/account';
 import { openKeypairModal, closeKeypairModal } from '../../../actions/ui';
 
 const mapStateToProps = state => ({
-  keypair: getKeypair(state),
   keypairModalOpen: isModalKeypairOpen(state),
+  currentAccount: getCurrentAccount(state),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/js/helpers/AccountManager.js b/app/js/helpers/AccountManager.js
deleted file mode 100644
index b16ddd8..0000000
--- a/app/js/helpers/AccountManager.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { setAccount, switchNetwork } from '../actions-creators/account';
-
-let store = null;
-
-export const setStore = (newStore) => {
-  store = newStore;
-};
-
-export const onPageLoad = (nextState) => {
-  const { location: { query } } = nextState;
-  if (query.network) {
-    store.dispatch(switchNetwork(query.network));
-  }
-  if (!!query.accountId || !!query.secretSeed) {
-    store.dispatch(setAccount({ publicKey: query.accountId, secretSeed: query.secretSeed }));
-  }
-};
diff --git a/app/js/helpers/storage.js b/app/js/helpers/storage.js
new file mode 100644
index 0000000..c6fe9e2
--- /dev/null
+++ b/app/js/helpers/storage.js
@@ -0,0 +1,53 @@
+import { isArray } from 'lodash';
+
+import { StellarTools } from 'stellar-toolkit';
+
+export const ACCOUNTS_KEY = 'accounts';
+
+const deserializeAccount = account => ({
+  ...account,
+  keypair: StellarTools.KeypairInstance({
+    publicKey: account.keypair.publicKey,
+    //secretSeed: decrypt(account.keypair.secretSeed),
+  }),
+});
+
+const serializeAccount = account => ({
+  ...account,
+  keypair: {
+    publicKey: account.keypair.publicKey(),
+    //secretSeed: encrypt(account.keypair.secretSeed()),
+  },
+});
+
+export const getLocalAccounts = () => {
+  // Disable local storage
+  return [];
+  try {
+    const rawAccountsData = localStorage.getItem(ACCOUNTS_KEY);
+    const accountsData = JSON.parse(rawAccountsData);
+
+    if (!isArray(accountsData)) {
+      throw new Error();
+    }
+
+    return accountsData.map(deserializeAccount);
+  } catch (e) {
+    console.error('Invalid local user accounts data', e);
+    return [];
+  }
+};
+
+export const setLocalAccounts = (accounts) => {
+  // Disable local storage
+  return [];
+  try {
+    const serializedAccounts = accounts.map(serializeAccount);
+    const jsonAccounts = JSON.stringify(serializedAccounts);
+    localStorage.setItem(ACCOUNTS_KEY, jsonAccounts);
+    return accounts;
+  } catch (e) {
+    console.error('Error while saving account');
+    return [];
+  }
+};
diff --git a/app/js/middlewares/StellarStreamer.js b/app/js/middlewares/StellarStreamer.js
index dc9a706..26baee5 100644
--- a/app/js/middlewares/StellarStreamer.js
+++ b/app/js/middlewares/StellarStreamer.js
@@ -2,6 +2,7 @@ import { StellarStreamers } from 'stellar-toolkit';
 import * as actions from '../actions/account';
 import { getPaymentsStream, getEffectsStream, getOffersSuccess } from '../actions/stellar';
 import { newStream, killStreams } from '../helpers/monoStreamer';
+import { getAccounts } from '../selectors/account';
 import { AsyncActions } from '../helpers/asyncActions';
 import { ASYNC_FETCH_ACCOUNT } from '../constants/asyncActions';
 
@@ -18,9 +19,12 @@ const stellarStreamerMiddleware = store => next => (action) => {
       break;
     }
     // case 'aaaa:': {
-    case actions.SET_KEYPAIR: {
-      const { keypair } = action;
+    case actions.SET_CURRENT_ACCOUNT_ID: {
+      const { id } = action;
 
+      const state = store.getState();
+      const currentAccount = getAccounts(state).find(a => a.id === id);
+      const keypair = currentAccount.keypair;
       try {
         // Stream account
         newStream('account',
diff --git a/app/js/reducers/account.js b/app/js/reducers/account.js
index c4598ae..01eb82f 100644
--- a/app/js/reducers/account.js
+++ b/app/js/reducers/account.js
@@ -4,22 +4,50 @@ import { findIndex } from 'lodash';
 import * as types from '../actions/account';
 import { DELETE_TRUSTLINE } from '../actions/ui';
 import { editInArray, createReducer } from '../helpers/redux';
+import { setLocalAccounts } from '../helpers/storage';
 
 const initialState = {
-  keypair: null,
   error: null,
+  currentAccountId: null,
+  accounts: [],
 };
 
-function resetAccount() {
-  return initialState;
+function resetAccount(state) {
+  return {
+    ...state,
+    currentAccountId: null,
+  };
+}
+
+function setCurrentAccountId(state, action) {
+  const { id } = action;
+
+  return {
+    ...state,
+    currentAccountId: id,
+  };
 }
 
-function setKeypair(state, action) {
-  const { keypair } = action;
+function addAccount(state, action) {
+  const { account, accounts } = action;
+
+  let newAccounts = state.accounts.slice();
+  if (account) {
+    const localAccountIndex = newAccounts.findIndex(a => a.id === account.id);
+    if (localAccountIndex !== -1) {
+      newAccounts[localAccountIndex] = account;
+    } else {
+      newAccounts.push(account);
+    }
+  }
+  if (accounts) {
+    newAccounts = newAccounts.concat(accounts);
+  }
 
+  setLocalAccounts(newAccounts);
   return {
     ...state,
-    keypair,
+    accounts: newAccounts,
   };
 }
 
@@ -40,6 +68,7 @@ function deletingTrustline(state, action) {
 
 export default createReducer(initialState, {
   [types.RESET_ACCOUNT]: resetAccount,
-  [types.SET_KEYPAIR]: setKeypair,
+  [types.SET_CURRENT_ACCOUNT_ID]: setCurrentAccountId,
+  [types.ADD_ACCOUNT]: addAccount,
   [DELETE_TRUSTLINE]: deletingTrustline,
 });
diff --git a/app/js/selectors/account.js b/app/js/selectors/account.js
index 8bf011b..1feac58 100644
--- a/app/js/selectors/account.js
+++ b/app/js/selectors/account.js
@@ -11,13 +11,20 @@ export const isAccountLoading = asyncSelectorObject(ASYNC_FETCH_ACCOUNT).isLoadi
 
 export const isCreatingTestAccount = asyncSelectorObject(ASYNC_CREATE_TEST_ACCOUNT).isLoading;
 
-export const getKeypair = selectProperty([ACCOUNT_STATE_KEY, 'keypair'], null);
+export const getAccounts = selectProperty([ACCOUNT_STATE_KEY, 'accounts'], []);
+export const getCurrentAccountId = selectProperty([ACCOUNT_STATE_KEY, 'currentAccountId'], null);
+
+export const getCurrentAccount = createSelector(
+  getAccounts,
+  getCurrentAccountId,
+  (accounts, id) => accounts.find(a => a.id === id),
+);
 
 export const getAuthData = createSelector(
-  getKeypair,
+  getCurrentAccount,
   getAccount,
-  (keypair, sourceAccount) => ({
-    keypair,
+  (localAccount, sourceAccount) => ({
+    keypair: localAccount && localAccount.keypair,
     sourceAccount,
   }),
 );
@@ -28,9 +35,13 @@ export const getBalances = createSelector(
 
 export const canSign = createSelector(
   getAuthData,
-  getKeypair,
-  (authData, keypair) => (
-    !!authData && !!authData.keypair && !!keypair.canSign() && !!authData.sourceAccount
+  getCurrentAccount,
+  (authData, localAccount) => (
+    !!authData &&
+    !!authData.keypair &&
+    !!localAccount &&
+    localAccount.keypair.canSign() &&
+    !!authData.sourceAccount
   ),
 );
 export const accountSet = createSelector(
@@ -40,3 +51,4 @@ export const accountSet = createSelector(
     !!authData && !!authData.keypair && !!account
   ),
 );
+
diff --git a/content/index.html b/content/index.html
index 9d891ed..4bdba03 100644
--- a/content/index.html
+++ b/content/index.html
@@ -7,9 +7,9 @@
   <meta name="description" content="Stellar Portal is a wep app for viewing and managing accounts on Stellar Network. Purely front, no backend." />
   <title>Stellar Portal</title>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link rel="stylesheet" href="assets/styles/semantic.min.css" />
-  <link rel="icon" type="image/png" href="assets/images/favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="assets/images/favicon-16x16.png" sizes="16x16" />
+  <link rel="stylesheet" href="/assets/styles/semantic.min.css" />
+  <link rel="icon" type="image/png" href="/assets/images/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="/assets/images/favicon-16x16.png" sizes="16x16" />
 </head>
 <body>
   <div id="app"></div>
diff --git a/webpack.config.js b/webpack.config.js
index 16867fc..deba5ac 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,7 +19,8 @@ const buildDir = config.buildPath;
 module.exports = createConfig([
   setOutput({
     filename: '[name].[hash].js',
-    path: buildDir()
+    path: buildDir(),
+    publicPath: '/',
   }),
   babel(),
   cssModules(),