diff --git a/app/components/Account/AccountAssetCreate.jsx b/app/components/Account/AccountAssetCreate.jsx
index a697b3f93a..ab1ac6cfe7 100644
--- a/app/components/Account/AccountAssetCreate.jsx
+++ b/app/components/Account/AccountAssetCreate.jsx
@@ -16,12 +16,13 @@ import assetUtils from "common/asset_utils";
 import {Tabs, Tab} from "../Utility/Tabs";
 import AmountSelector from "../Utility/AmountSelector";
 import assetConstants from "chain/asset_constants";
-import { estimateFee } from "common/trxHelper";
+import {estimateFee} from "common/trxHelper";
 
-let GRAPHENE_MAX_SHARE_SUPPLY = new big(assetConstants.GRAPHENE_MAX_SHARE_SUPPLY);
+let GRAPHENE_MAX_SHARE_SUPPLY = new big(
+    assetConstants.GRAPHENE_MAX_SHARE_SUPPLY
+);
 
 class BitAssetOptions extends React.Component {
-
     static propTypes = {
         backingAsset: ChainTypes.ChainAsset.isRequired,
         isUpdate: React.PropTypes.bool
@@ -48,17 +49,29 @@ class BitAssetOptions extends React.Component {
 
     _onFoundBackingAsset(asset) {
         if (asset) {
-            if (asset.get("id") === "1.3.0" || (asset.get("bitasset_data_id") && !asset.getIn(["bitasset", "is_prediction_market"]))) {
-                if (asset.get("precision") !== parseInt(this.props.assetPrecision, 10)) {
+            if (
+                asset.get("id") === "1.3.0" ||
+                (asset.get("bitasset_data_id") &&
+                    !asset.getIn(["bitasset", "is_prediction_market"]))
+            ) {
+                if (
+                    asset.get("precision") !==
+                    parseInt(this.props.assetPrecision, 10)
+                ) {
                     this.setState({
-                        error: counterpart.translate("account.user_issued_assets.error_precision", {asset: this.props.assetSymbol})
+                        error: counterpart.translate(
+                            "account.user_issued_assets.error_precision",
+                            {asset: this.props.assetSymbol}
+                        )
                     });
                 } else {
                     this.props.onUpdate("short_backing_asset", asset.get("id"));
                 }
             } else {
                 this.setState({
-                    error: counterpart.translate("account.user_issued_assets.error_invalid")
+                    error: counterpart.translate(
+                        "account.user_issued_assets.error_invalid"
+                    )
                 });
             }
         }
@@ -70,24 +83,70 @@ class BitAssetOptions extends React.Component {
 
         return (
             <div className="small-12 grid-content">
-                <label><Translate content="account.user_issued_assets.feed_lifetime_sec" />
-                    <input type="number" value={bitasset_opts.feed_lifetime_sec / 60} onChange={this.props.onUpdate.bind(this, "feed_lifetime_sec")}/>
+                <label>
+                    <Translate content="account.user_issued_assets.feed_lifetime_sec" />
+                    <input
+                        type="number"
+                        value={bitasset_opts.feed_lifetime_sec / 60}
+                        onChange={this.props.onUpdate.bind(
+                            this,
+                            "feed_lifetime_sec"
+                        )}
+                    />
                 </label>
 
-                <label><Translate content="account.user_issued_assets.minimum_feeds" />
-                    <input type="number" value={bitasset_opts.minimum_feeds} onChange={this.props.onUpdate.bind(this, "minimum_feeds")}/>
+                <label>
+                    <Translate content="account.user_issued_assets.minimum_feeds" />
+                    <input
+                        type="number"
+                        value={bitasset_opts.minimum_feeds}
+                        onChange={this.props.onUpdate.bind(
+                            this,
+                            "minimum_feeds"
+                        )}
+                    />
                 </label>
 
-                <label><Translate content="account.user_issued_assets.force_settlement_delay_sec" />
-                    <input type="number" value={bitasset_opts.force_settlement_delay_sec / 60} onChange={this.props.onUpdate.bind(this, "force_settlement_delay_sec")}/>
+                <label>
+                    <Translate content="account.user_issued_assets.force_settlement_delay_sec" />
+                    <input
+                        type="number"
+                        value={bitasset_opts.force_settlement_delay_sec / 60}
+                        onChange={this.props.onUpdate.bind(
+                            this,
+                            "force_settlement_delay_sec"
+                        )}
+                    />
                 </label>
 
-                <label><Translate content="account.user_issued_assets.force_settlement_offset_percent" />
-                    <input type="number" value={bitasset_opts.force_settlement_offset_percent / assetConstants.GRAPHENE_1_PERCENT} onChange={this.props.onUpdate.bind(this, "force_settlement_offset_percent")}/>
+                <label>
+                    <Translate content="account.user_issued_assets.force_settlement_offset_percent" />
+                    <input
+                        type="number"
+                        value={
+                            bitasset_opts.force_settlement_offset_percent /
+                            assetConstants.GRAPHENE_1_PERCENT
+                        }
+                        onChange={this.props.onUpdate.bind(
+                            this,
+                            "force_settlement_offset_percent"
+                        )}
+                    />
                 </label>
 
-                <label><Translate content="account.user_issued_assets.maximum_force_settlement_volume" />
-                    <input type="number" value={bitasset_opts.maximum_force_settlement_volume / assetConstants.GRAPHENE_1_PERCENT} onChange={this.props.onUpdate.bind(this, "maximum_force_settlement_volume")}/>
+                <label>
+                    <Translate content="account.user_issued_assets.maximum_force_settlement_volume" />
+                    <input
+                        type="number"
+                        value={
+                            bitasset_opts.maximum_force_settlement_volume /
+                            assetConstants.GRAPHENE_1_PERCENT
+                        }
+                        onChange={this.props.onUpdate.bind(
+                            this,
+                            "maximum_force_settlement_volume"
+                        )}
+                    />
                 </label>
 
                 <div className="grid-block no-margin small-12">
@@ -100,7 +159,9 @@ class BitAssetOptions extends React.Component {
                         style={{width: "100%", paddingRight: "10px"}}
                         onFound={this._onFoundBackingAsset.bind(this)}
                     />
-                    {error ? <div className="content-block has-error">{error}</div> : null}
+                    {error ? (
+                        <div className="content-block has-error">{error}</div>
+                    ) : null}
                 </div>
             </div>
         );
@@ -109,7 +170,6 @@ class BitAssetOptions extends React.Component {
 BitAssetOptions = BindToChainState(BitAssetOptions);
 
 class AccountAssetCreate extends React.Component {
-
     static propTypes = {
         core: ChainTypes.ChainAsset.isRequired,
         globalObject: ChainTypes.ChainObject.isRequired
@@ -118,7 +178,7 @@ class AccountAssetCreate extends React.Component {
     static defaultProps = {
         globalObject: "2.0.0",
         core: "1.3.0"
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -130,9 +190,13 @@ class AccountAssetCreate extends React.Component {
         // let asset = props.asset.toJS();
         let isBitAsset = false;
         let precision = utils.get_asset_precision(4);
-        let corePrecision = utils.get_asset_precision(props.core.get("precision"));
+        let corePrecision = utils.get_asset_precision(
+            props.core.get("precision")
+        );
 
-        let {flagBooleans, permissionBooleans} = this._getPermissions({isBitAsset});
+        let {flagBooleans, permissionBooleans} = this._getPermissions({
+            isBitAsset
+        });
 
         // let flags = assetUtils.getFlags(flagBooleans);
         // let permissions = assetUtils.getPermissions(permissionBooleans, isBitAsset);
@@ -141,7 +205,6 @@ class AccountAssetCreate extends React.Component {
         let coreRateBaseAssetName = ChainStore.getAsset("1.3.0").get("symbol");
 
         return {
-
             update: {
                 symbol: "",
                 precision: 4,
@@ -169,12 +232,14 @@ class AccountAssetCreate extends React.Component {
                 }
             },
             bitasset_opts: {
-                "feed_lifetime_sec" : 60 * 60 * 24,
-                "minimum_feeds" : 7,
-                "force_settlement_delay_sec" : 60 * 60 * 24,
-                "force_settlement_offset_percent" : 1 * assetConstants.GRAPHENE_1_PERCENT,
-                "maximum_force_settlement_volume" : 20 * assetConstants.GRAPHENE_1_PERCENT,
-                "short_backing_asset" : "1.3.0"
+                feed_lifetime_sec: 60 * 60 * 24,
+                minimum_feeds: 7,
+                force_settlement_delay_sec: 60 * 60 * 24,
+                force_settlement_offset_percent:
+                    1 * assetConstants.GRAPHENE_1_PERCENT,
+                maximum_force_settlement_volume:
+                    20 * assetConstants.GRAPHENE_1_PERCENT,
+                short_backing_asset: "1.3.0"
             },
             marketInput: ""
         };
@@ -182,44 +247,74 @@ class AccountAssetCreate extends React.Component {
 
     _getPermissions(state) {
         let flagBooleans = assetUtils.getFlagBooleans(0, state.isBitAsset);
-        let permissionBooleans = assetUtils.getFlagBooleans("all", state.isBitAsset);
+        let permissionBooleans = assetUtils.getFlagBooleans(
+            "all",
+            state.isBitAsset
+        );
 
         return {
             flagBooleans,
             permissionBooleans
-        }
+        };
     }
 
     _createAsset(e) {
         e.preventDefault();
-        let {update, flagBooleans, permissionBooleans, core_exchange_rate,
-            isBitAsset, is_prediction_market, bitasset_opts} = this.state;
+        let {
+            update,
+            flagBooleans,
+            permissionBooleans,
+            core_exchange_rate,
+            isBitAsset,
+            is_prediction_market,
+            bitasset_opts
+        } = this.state;
 
         let {account} = this.props;
 
         let flags = assetUtils.getFlags(flagBooleans, isBitAsset);
-        let permissions = assetUtils.getPermissions(permissionBooleans, isBitAsset);
+        let permissions = assetUtils.getPermissions(
+            permissionBooleans,
+            isBitAsset
+        );
 
         if (this.state.marketInput !== update.description.market) {
             update.description.market = "";
         }
         let description = JSON.stringify(update.description);
 
-        AssetActions.createAsset(account.get("id"), update, flags, permissions, core_exchange_rate, isBitAsset, is_prediction_market, bitasset_opts, description).then(result => {
-            console.log("... AssetActions.createAsset(account_id, update)", account.get("id"),  update, flags, permissions)
+        AssetActions.createAsset(
+            account.get("id"),
+            update,
+            flags,
+            permissions,
+            core_exchange_rate,
+            isBitAsset,
+            is_prediction_market,
+            bitasset_opts,
+            description
+        ).then(result => {
+            console.log(
+                "... AssetActions.createAsset(account_id, update)",
+                account.get("id"),
+                update,
+                flags,
+                permissions
+            );
         });
     }
 
     _hasChanged() {
-        return !utils.are_equal_shallow(this.state, this.resetState(this.props));
+        return !utils.are_equal_shallow(
+            this.state,
+            this.resetState(this.props)
+        );
     }
 
     _reset(e) {
         e.preventDefault();
 
-        this.setState(
-            this.resetState(this.props)
-        );
+        this.setState(this.resetState(this.props));
     }
 
     _forcePositive(number) {
@@ -272,15 +367,23 @@ class AccountAssetCreate extends React.Component {
         switch (value) {
             case "force_settlement_offset_percent":
             case "maximum_force_settlement_volume":
-                bitasset_opts[value] = parseFloat(e.target.value) * assetConstants.GRAPHENE_1_PERCENT;
+                bitasset_opts[value] =
+                    parseFloat(e.target.value) *
+                    assetConstants.GRAPHENE_1_PERCENT;
                 break;
             case "minimum_feeds":
                 bitasset_opts[value] = parseInt(e.target.value, 10);
                 break;
             case "feed_lifetime_sec":
             case "force_settlement_delay_sec":
-                console.log(e.target.value, parseInt(parseFloat(e.target.value) * 60, 10));
-                bitasset_opts[value] = parseInt(parseFloat(e.target.value) * 60, 10);
+                console.log(
+                    e.target.value,
+                    parseInt(parseFloat(e.target.value) * 60, 10)
+                );
+                bitasset_opts[value] = parseInt(
+                    parseFloat(e.target.value) * 60,
+                    10
+                );
                 break;
 
             case "short_backing_asset":
@@ -310,11 +413,19 @@ class AccountAssetCreate extends React.Component {
                 break;
 
             case "max_market_fee":
-                if ((new big(inputValue)).times(precision).gt(GRAPHENE_MAX_SHARE_SUPPLY)) {
-                    errors.max_market_fee = "The number you tried to enter is too large";
+                if (
+                    new big(inputValue)
+                        .times(precision)
+                        .gt(GRAPHENE_MAX_SHARE_SUPPLY)
+                ) {
+                    errors.max_market_fee =
+                        "The number you tried to enter is too large";
                     return this.setState({errors});
                 }
-                target.value = utils.limitByPrecision(target.value, this.state.update.precision);
+                target.value = utils.limitByPrecision(
+                    target.value,
+                    this.state.update.precision
+                );
                 update[value] = target.value;
                 break;
 
@@ -329,21 +440,27 @@ class AccountAssetCreate extends React.Component {
                 const regexp_numeral = new RegExp(/[[:digit:]]/);
 
                 // Ensure input is valid
-                if(!regexp_numeral.test(target.value)) {
+                if (!regexp_numeral.test(target.value)) {
                     target.value = target.value.replace(/[^0-9.]/g, "");
                 }
 
                 // Catch initial decimal input
-                if(target.value.charAt(0) == ".") {
+                if (target.value.charAt(0) == ".") {
                     target.value = "0.";
                 }
 
                 // Catch double decimal and remove if invalid
-                if(target.value.charAt(target.value.length) != target.value.search(".")) {
+                if (
+                    target.value.charAt(target.value.length) !=
+                    target.value.search(".")
+                ) {
                     target.value.substr(1);
                 }
 
-                target.value = utils.limitByPrecision(target.value, this.state.update.precision);
+                target.value = utils.limitByPrecision(
+                    target.value,
+                    this.state.update.precision
+                );
                 update[value] = target.value;
 
                 // if ((new big(target.value)).times(Math.pow(10, precision).gt(GRAPHENE_MAX_SHARE_SUPPLY)) {
@@ -359,7 +476,7 @@ class AccountAssetCreate extends React.Component {
                 // Enforce uppercase
                 const symbol = target.value.toUpperCase();
                 // Enforce characters
-                let regexp = new RegExp("^[\.A-Z]+$");
+                let regexp = new RegExp("^[.A-Z]+$");
                 if (symbol !== "" && !regexp.test(symbol)) {
                     break;
                 }
@@ -374,8 +491,9 @@ class AccountAssetCreate extends React.Component {
 
         if (updateState) {
             this.setState({update: update}, () => {
-                if(shouldRestoreCursor) {
-                    const selectionStart = caret - (inputValue.length - update[value].length);
+                if (shouldRestoreCursor) {
+                    const selectionStart =
+                        caret - (inputValue.length - update[value].length);
                     target.setSelectionRange(selectionStart, selectionStart);
                 }
             });
@@ -383,7 +501,7 @@ class AccountAssetCreate extends React.Component {
         }
     }
 
-    _validateEditFields( new_state ) {
+    _validateEditFields(new_state) {
         let errors = {
             max_supply: null
         };
@@ -391,16 +509,29 @@ class AccountAssetCreate extends React.Component {
         errors.symbol = ChainValidation.is_valid_symbol_error(new_state.symbol);
         let existingAsset = ChainStore.getAsset(new_state.symbol);
         if (existingAsset) {
-            errors.symbol = counterpart.translate("account.user_issued_assets.exists");
+            errors.symbol = counterpart.translate(
+                "account.user_issued_assets.exists"
+            );
         }
 
         try {
-            errors.max_supply = new_state.max_supply <= 0 ? counterpart.translate("account.user_issued_assets.max_positive") :
-                (new big(new_state.max_supply)).times(Math.pow(10, new_state.precision)).gt(GRAPHENE_MAX_SHARE_SUPPLY) ? counterpart.translate("account.user_issued_assets.too_large") :
-                null;
-        } catch(err) {
+            errors.max_supply =
+                new_state.max_supply <= 0
+                    ? counterpart.translate(
+                          "account.user_issued_assets.max_positive"
+                      )
+                    : new big(new_state.max_supply)
+                          .times(Math.pow(10, new_state.precision))
+                          .gt(GRAPHENE_MAX_SHARE_SUPPLY)
+                        ? counterpart.translate(
+                              "account.user_issued_assets.too_large"
+                          )
+                        : null;
+        } catch (err) {
             console.log("err:", err);
-            errors.max_supply = counterpart.translate("account.user_issued_assets.too_large");
+            errors.max_supply = counterpart.translate(
+                "account.user_issued_assets.too_large"
+            );
         }
 
         let isValid = !errors.symbol && !errors.max_supply;
@@ -425,7 +556,6 @@ class AccountAssetCreate extends React.Component {
     }
 
     _onInputCoreAsset(type, asset) {
-
         if (type === "quote") {
             this.setState({
                 quoteAssetInput: asset
@@ -454,7 +584,6 @@ class AccountAssetCreate extends React.Component {
     }
 
     _onInputMarket(asset) {
-
         this.setState({
             marketInput: asset
         });
@@ -469,13 +598,22 @@ class AccountAssetCreate extends React.Component {
     _onCoreRateChange(type, e) {
         let amount, asset;
         if (type === "quote") {
-            amount = utils.limitByPrecision(e.target.value, this.state.update.precision);
+            amount = utils.limitByPrecision(
+                e.target.value,
+                this.state.update.precision
+            );
             asset = null;
         } else {
             if (!e || !("amount" in e)) {
                 return;
             }
-            amount = e.amount == "" ? "0" : utils.limitByPrecision(e.amount.toString().replace(/,/g, ""), this.props.core.get("precision"));
+            amount =
+                e.amount == ""
+                    ? "0"
+                    : utils.limitByPrecision(
+                          e.amount.toString().replace(/,/g, ""),
+                          this.props.core.get("precision")
+                      );
             asset = e.asset.get("id");
         }
 
@@ -494,7 +632,9 @@ class AccountAssetCreate extends React.Component {
             this.state.is_prediction_market = false;
         }
 
-        let {flagBooleans, permissionBooleans} = this._getPermissions(this.state);
+        let {flagBooleans, permissionBooleans} = this._getPermissions(
+            this.state
+        );
         this.state.flagBooleans = flagBooleans;
         this.state.permissionBooleans = permissionBooleans;
 
@@ -510,38 +650,86 @@ class AccountAssetCreate extends React.Component {
 
     render() {
         let {globalObject, core} = this.props;
-        let {errors, isValid, update, flagBooleans, permissionBooleans,
-            core_exchange_rate, is_prediction_market, isBitAsset, bitasset_opts} = this.state;
+        let {
+            errors,
+            isValid,
+            update,
+            flagBooleans,
+            permissionBooleans,
+            core_exchange_rate,
+            is_prediction_market,
+            isBitAsset,
+            bitasset_opts
+        } = this.state;
 
         // Estimate the asset creation fee from the symbol character length
-        let symbolLength = update.symbol.length, createFee = "N/A";
-
-        if(symbolLength === 3) {
-            createFee = <FormattedAsset amount={estimateFee("asset_create", ["symbol3"], globalObject)} asset={"1.3.0"} />;
-        }
-        else if(symbolLength === 4) {
-            createFee = <FormattedAsset amount={estimateFee("asset_create", ["symbol4"], globalObject)} asset={"1.3.0"} />;
-        }
-        else if(symbolLength > 4) {
-            createFee = <FormattedAsset amount={estimateFee("asset_create", ["long_symbol"], globalObject)} asset={"1.3.0"} />;
+        let symbolLength = update.symbol.length,
+            createFee = "N/A";
+
+        if (symbolLength === 3) {
+            createFee = (
+                <FormattedAsset
+                    amount={estimateFee(
+                        "asset_create",
+                        ["symbol3"],
+                        globalObject
+                    )}
+                    asset={"1.3.0"}
+                />
+            );
+        } else if (symbolLength === 4) {
+            createFee = (
+                <FormattedAsset
+                    amount={estimateFee(
+                        "asset_create",
+                        ["symbol4"],
+                        globalObject
+                    )}
+                    asset={"1.3.0"}
+                />
+            );
+        } else if (symbolLength > 4) {
+            createFee = (
+                <FormattedAsset
+                    amount={estimateFee(
+                        "asset_create",
+                        ["long_symbol"],
+                        globalObject
+                    )}
+                    asset={"1.3.0"}
+                />
+            );
         }
 
         // Loop over flags
         let flags = [];
-        let getFlag = (key, onClick, isChecked)=>{
-            return <table key={"table_" + key} className="table">
-                <tbody>
-                    <tr>
-                        <td style={{border: "none", width: "80%"}}><Translate content={`account.user_issued_assets.${key}`} />:</td>
-                        <td style={{border: "none"}}>
-                            <div className="switch" style={{marginBottom: "10px"}} onClick={onClick}>
-                                <input type="checkbox" checked={isChecked} />
-                                <label />
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>;
+        let getFlag = (key, onClick, isChecked) => {
+            return (
+                <table key={"table_" + key} className="table">
+                    <tbody>
+                        <tr>
+                            <td style={{border: "none", width: "80%"}}>
+                                <Translate
+                                    content={`account.user_issued_assets.${key}`}
+                                />:
+                            </td>
+                            <td style={{border: "none"}}>
+                                <div
+                                    className="switch"
+                                    style={{marginBottom: "10px"}}
+                                    onClick={onClick}
+                                >
+                                    <input
+                                        type="checkbox"
+                                        checked={isChecked}
+                                    />
+                                    <label />
+                                </div>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            );
         };
         for (let key in permissionBooleans) {
             if (permissionBooleans[key] && key !== "charge_market_fee") {
@@ -559,7 +747,9 @@ class AccountAssetCreate extends React.Component {
             getFlag(
                 "visible",
                 this._onUpdateDescription.bind(this, "visible"),
-                update.description.visible ? false : (update.description.visible === false ? true : false)
+                update.description.visible
+                    ? false
+                    : update.description.visible === false ? true : false
             )
         );
 
@@ -570,10 +760,25 @@ class AccountAssetCreate extends React.Component {
                 <table key={"table_" + key} className="table">
                     <tbody>
                         <tr>
-                            <td style={{border: "none", width: "80%"}}><Translate content={`account.user_issued_assets.${key}`} />:</td>
+                            <td style={{border: "none", width: "80%"}}>
+                                <Translate
+                                    content={`account.user_issued_assets.${key}`}
+                                />:
+                            </td>
                             <td style={{border: "none"}}>
-                                <div className="switch" style={{marginBottom: "10px"}} onClick={this._onPermissionChange.bind(this, key)}>
-                                    <input type="checkbox" checked={permissionBooleans[key]} onChange={() => {}}/>
+                                <div
+                                    className="switch"
+                                    style={{marginBottom: "10px"}}
+                                    onClick={this._onPermissionChange.bind(
+                                        this,
+                                        key
+                                    )}
+                                >
+                                    <input
+                                        type="checkbox"
+                                        checked={permissionBooleans[key]}
+                                        onChange={() => {}}
+                                    />
                                     <label />
                                 </div>
                             </td>
@@ -585,10 +790,17 @@ class AccountAssetCreate extends React.Component {
 
         const confirmButtons = (
             <div>
-                <button className="button" onClick={this._reset.bind(this)} value={counterpart.translate("account.perm.reset")}>
+                <button
+                    className="button"
+                    onClick={this._reset.bind(this)}
+                    value={counterpart.translate("account.perm.reset")}
+                >
                     <Translate content="account.perm.reset" />
                 </button>
-                <button className={classnames("button", {disabled: !isValid})} onClick={this._createAsset.bind(this)}>
+                <button
+                    className={classnames("button", {disabled: !isValid})}
+                    onClick={this._createAsset.bind(this)}
+                >
                     <Translate content="header.create_asset" />
                 </button>
             </div>
@@ -599,7 +811,9 @@ class AccountAssetCreate extends React.Component {
                 <div className="content-block small-12">
                     <div className="tabs-container generic-bordered-box">
                         <div className="tabs-header">
-                            <h3><Translate content="header.create_asset" /></h3>
+                            <h3>
+                                <Translate content="header.create_asset" />
+                            </h3>
                         </div>
 
                         <Tabs
@@ -610,35 +824,95 @@ class AccountAssetCreate extends React.Component {
                             segmented={false}
                             actionButtons={confirmButtons}
                         >
-
                             <Tab title="account.user_issued_assets.primary">
                                 <div className="small-12 grid-content">
-                                    <label><Translate content="account.user_issued_assets.symbol" />
-                                        <input type="text" value={update.symbol} onChange={this._onUpdateInput.bind(this, "symbol")}/>
+                                    <label>
+                                        <Translate content="account.user_issued_assets.symbol" />
+                                        <input
+                                            type="text"
+                                            value={update.symbol}
+                                            onChange={this._onUpdateInput.bind(
+                                                this,
+                                                "symbol"
+                                            )}
+                                        />
                                     </label>
-                                    { errors.symbol ? <p className="grid-content has-error">{errors.symbol}</p> : null}
-
+                                    {errors.symbol ? (
+                                        <p className="grid-content has-error">
+                                            {errors.symbol}
+                                        </p>
+                                    ) : null}
 
-                                    <label><Translate content="account.user_issued_assets.max_supply" /> {update.symbol ? <span>({update.symbol})</span> : null}
-                                        <input type="text" value={update.max_supply} onChange={this._onUpdateInput.bind(this, "max_supply")} />
+                                    <label>
+                                        <Translate content="account.user_issued_assets.max_supply" />{" "}
+                                        {update.symbol ? (
+                                            <span>({update.symbol})</span>
+                                        ) : null}
+                                        <input
+                                            type="text"
+                                            value={update.max_supply}
+                                            onChange={this._onUpdateInput.bind(
+                                                this,
+                                                "max_supply"
+                                            )}
+                                        />
                                     </label>
-                                    { errors.max_supply ? <p className="grid-content has-error">{errors.max_supply}</p> : null}
+                                    {errors.max_supply ? (
+                                        <p className="grid-content has-error">
+                                            {errors.max_supply}
+                                        </p>
+                                    ) : null}
 
                                     <label>
                                         <Translate content="account.user_issued_assets.decimals" />
-                                        <input min="0" max="8" step="1" type="range" value={update.precision} onChange={this._onUpdateInput.bind(this, "precision")} />
+                                        <input
+                                            min="0"
+                                            max="8"
+                                            step="1"
+                                            type="range"
+                                            value={update.precision}
+                                            onChange={this._onUpdateInput.bind(
+                                                this,
+                                                "precision"
+                                            )}
+                                        />
                                     </label>
                                     <p>{update.precision}</p>
 
-                                    <div style={{marginBottom: 10}} className="txtlabel cancel"><Translate content="account.user_issued_assets.precision_warning" /></div>
+                                    <div
+                                        style={{marginBottom: 10}}
+                                        className="txtlabel cancel"
+                                    >
+                                        <Translate content="account.user_issued_assets.precision_warning" />
+                                    </div>
 
-                                    <table className="table" style={{width: "inherit"}}>
+                                    <table
+                                        className="table"
+                                        style={{width: "inherit"}}
+                                    >
                                         <tbody>
                                             <tr>
-                                                <td style={{border: "none"}}><Translate content={"account.user_issued_assets.mpa"} />:</td>
                                                 <td style={{border: "none"}}>
-                                                    <div className="switch" style={{marginBottom: "10px"}} onClick={this._onToggleBitAsset.bind(this)}>
-                                                        <input type="checkbox" checked={isBitAsset} />
+                                                    <Translate
+                                                        content={
+                                                            "account.user_issued_assets.mpa"
+                                                        }
+                                                    />:
+                                                </td>
+                                                <td style={{border: "none"}}>
+                                                    <div
+                                                        className="switch"
+                                                        style={{
+                                                            marginBottom: "10px"
+                                                        }}
+                                                        onClick={this._onToggleBitAsset.bind(
+                                                            this
+                                                        )}
+                                                    >
+                                                        <input
+                                                            type="checkbox"
+                                                            checked={isBitAsset}
+                                                        />
                                                         <label />
                                                     </div>
                                                 </td>
@@ -647,129 +921,278 @@ class AccountAssetCreate extends React.Component {
                                     </table>
 
                                     {isBitAsset ? (
-                                    <table className="table" style={{width: "inherit"}}>
-                                        <tbody>
-                                            <tr>
-                                                <td style={{border: "none"}}><Translate content={"account.user_issued_assets.pm"} />:</td>
-                                                <td style={{border: "none"}}>
-                                                    <div className="switch" style={{marginBottom: "10px"}} onClick={this._onTogglePM.bind(this)}>
-                                                        <input type="checkbox" checked={is_prediction_market} />
-                                                        <label />
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>) : null}
+                                        <table
+                                            className="table"
+                                            style={{width: "inherit"}}
+                                        >
+                                            <tbody>
+                                                <tr>
+                                                    <td
+                                                        style={{border: "none"}}
+                                                    >
+                                                        <Translate
+                                                            content={
+                                                                "account.user_issued_assets.pm"
+                                                            }
+                                                        />:
+                                                    </td>
+                                                    <td
+                                                        style={{border: "none"}}
+                                                    >
+                                                        <div
+                                                            className="switch"
+                                                            style={{
+                                                                marginBottom:
+                                                                    "10px"
+                                                            }}
+                                                            onClick={this._onTogglePM.bind(
+                                                                this
+                                                            )}
+                                                        >
+                                                            <input
+                                                                type="checkbox"
+                                                                checked={
+                                                                    is_prediction_market
+                                                                }
+                                                            />
+                                                            <label />
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    ) : null}
 
                                     {/* CER */}
-                                    <Translate component="h3" content="account.user_issued_assets.core_exchange_rate" />
+                                    <Translate
+                                        component="h3"
+                                        content="account.user_issued_assets.core_exchange_rate"
+                                    />
 
                                     <label>
                                         <div className="grid-block no-margin">
-                                            {errors.quote_asset ? <p className="grid-content has-error">{errors.quote_asset}</p> : null}
-                                            {errors.base_asset ? <p className="grid-content has-error">{errors.base_asset}</p> : null}
+                                            {errors.quote_asset ? (
+                                                <p className="grid-content has-error">
+                                                    {errors.quote_asset}
+                                                </p>
+                                            ) : null}
+                                            {errors.base_asset ? (
+                                                <p className="grid-content has-error">
+                                                    {errors.base_asset}
+                                                </p>
+                                            ) : null}
                                             <div className="grid-block no-margin small-12 medium-6">
-                                                <div className="amount-selector" style={{width: "100%", paddingRight: "10px"}}>
-                                                    <Translate component="label" content="account.user_issued_assets.quote"/>
+                                                <div
+                                                    className="amount-selector"
+                                                    style={{
+                                                        width: "100%",
+                                                        paddingRight: "10px"
+                                                    }}
+                                                >
+                                                    <Translate
+                                                        component="label"
+                                                        content="account.user_issued_assets.quote"
+                                                    />
                                                     <div className="inline-label">
                                                         <input
                                                             type="text"
                                                             placeholder="0.0"
-                                                            onChange={this._onCoreRateChange.bind(this, "quote")}
-                                                            value={core_exchange_rate.quote.amount}
+                                                            onChange={this._onCoreRateChange.bind(
+                                                                this,
+                                                                "quote"
+                                                            )}
+                                                            value={
+                                                                core_exchange_rate
+                                                                    .quote
+                                                                    .amount
+                                                            }
                                                         />
                                                     </div>
                                                 </div>
-
                                             </div>
                                             <div className="grid-block no-margin small-12 medium-6">
                                                 <AmountSelector
                                                     label="account.user_issued_assets.base"
-                                                    amount={core_exchange_rate.base.amount}
-                                                    onChange={this._onCoreRateChange.bind(this, "base")}
-                                                    asset={core_exchange_rate.base.asset_id}
-                                                    assets={[core_exchange_rate.base.asset_id]}
+                                                    amount={
+                                                        core_exchange_rate.base
+                                                            .amount
+                                                    }
+                                                    onChange={this._onCoreRateChange.bind(
+                                                        this,
+                                                        "base"
+                                                    )}
+                                                    asset={
+                                                        core_exchange_rate.base
+                                                            .asset_id
+                                                    }
+                                                    assets={[
+                                                        core_exchange_rate.base
+                                                            .asset_id
+                                                    ]}
                                                     placeholder="0.0"
                                                     tabIndex={1}
-                                                    style={{width: "100%", paddingLeft: "10px"}}
+                                                    style={{
+                                                        width: "100%",
+                                                        paddingLeft: "10px"
+                                                    }}
                                                 />
                                             </div>
                                         </div>
                                         <div>
                                             <h5>
                                                 <Translate content="exchange.price" />
-                                                <span>: {utils.format_number(utils.get_asset_price(
-                                                    core_exchange_rate.quote.amount * utils.get_asset_precision(update.precision),
-                                                    {precision: update.precision},
-                                                    core_exchange_rate.base.amount * utils.get_asset_precision(core),
-                                                    core
-                                                ), 2 + (parseInt(update.precision, 10) || 8))}</span>
-                                                <span> {update.symbol}/{core.get("symbol")}</span>
+                                                <span>
+                                                    :{" "}
+                                                    {utils.format_number(
+                                                        utils.get_asset_price(
+                                                            core_exchange_rate
+                                                                .quote.amount *
+                                                                utils.get_asset_precision(
+                                                                    update.precision
+                                                                ),
+                                                            {
+                                                                precision:
+                                                                    update.precision
+                                                            },
+                                                            core_exchange_rate
+                                                                .base.amount *
+                                                                utils.get_asset_precision(
+                                                                    core
+                                                                ),
+                                                            core
+                                                        ),
+                                                        2 +
+                                                            (parseInt(
+                                                                update.precision,
+                                                                10
+                                                            ) || 8)
+                                                    )}
+                                                </span>
+                                                <span>
+                                                    {" "}
+                                                    {update.symbol}/{core.get(
+                                                        "symbol"
+                                                    )}
+                                                </span>
                                             </h5>
                                         </div>
                                     </label>
                                     <div>
-                                        <Translate content="account.user_issued_assets.cer_warning_1" component="label" className="has-error"/>
-                                        <Translate content="account.user_issued_assets.cer_warning_2" component="p" />
+                                        <Translate
+                                            content="account.user_issued_assets.cer_warning_1"
+                                            component="label"
+                                            className="has-error"
+                                        />
+                                        <Translate
+                                            content="account.user_issued_assets.cer_warning_2"
+                                            component="p"
+                                        />
                                     </div>
-                                    {<p><Translate content="account.user_issued_assets.approx_fee" />: {createFee}</p>}
+                                    {
+                                        <p>
+                                            <Translate content="account.user_issued_assets.approx_fee" />:{" "}
+                                            {createFee}
+                                        </p>
+                                    }
                                 </div>
                             </Tab>
 
                             <Tab title="account.user_issued_assets.description">
                                 <div className="small-12 grid-content">
-                                    <Translate component="label" content="account.user_issued_assets.description" />
+                                    <Translate
+                                        component="label"
+                                        content="account.user_issued_assets.description"
+                                    />
                                     <label>
                                         <textarea
                                             style={{height: "7rem"}}
                                             rows="1"
                                             value={update.description.main}
-                                            onChange={this._onUpdateDescription.bind(this, "main")}
+                                            onChange={this._onUpdateDescription.bind(
+                                                this,
+                                                "main"
+                                            )}
                                         />
                                     </label>
 
-                                    <Translate component="label" content="account.user_issued_assets.short" />
+                                    <Translate
+                                        component="label"
+                                        content="account.user_issued_assets.short"
+                                    />
                                     <label>
                                         <input
                                             type="text"
                                             rows="1"
-                                            value={update.description.short_name}
-                                            onChange={this._onUpdateDescription.bind(this, "short_name")}
+                                            value={
+                                                update.description.short_name
+                                            }
+                                            onChange={this._onUpdateDescription.bind(
+                                                this,
+                                                "short_name"
+                                            )}
                                         />
                                     </label>
 
-                                    <Translate component="label" content="account.user_issued_assets.market" />
-                                        <AssetSelector
-                                            label="account.user_issued_assets.name"
-                                            onChange={this._onInputMarket.bind(this)}
-                                            asset={this.state.marketInput}
-                                            assetInput={this.state.marketInput}
-                                            style={{width: "100%", paddingRight: "10px"}}
-                                            onFound={this._onFoundMarketAsset.bind(this)}
-                                        />
+                                    <Translate
+                                        component="label"
+                                        content="account.user_issued_assets.market"
+                                    />
+                                    <AssetSelector
+                                        label="account.user_issued_assets.name"
+                                        onChange={this._onInputMarket.bind(
+                                            this
+                                        )}
+                                        asset={this.state.marketInput}
+                                        assetInput={this.state.marketInput}
+                                        style={{
+                                            width: "100%",
+                                            paddingRight: "10px"
+                                        }}
+                                        onFound={this._onFoundMarketAsset.bind(
+                                            this
+                                        )}
+                                    />
 
                                     {is_prediction_market ? (
-                                    <div>
-                                        <Translate component="h3" content="account.user_issued_assets.condition" />
-                                        <label>
-                                            <input
-                                                type="text"
-                                                rows="1"
-                                                value={update.description.condition}
-                                                onChange={this._onUpdateDescription.bind(this, "condition")}
-                                            />
-                                        </label>
-
-                                        <Translate component="h3" content="account.user_issued_assets.expiry" />
-                                        <label>
-                                            <input
-                                                type="date"
-                                                value={update.description.expiry}
-                                                onChange={this._onUpdateDescription.bind(this, "expiry")}
+                                        <div>
+                                            <Translate
+                                                component="h3"
+                                                content="account.user_issued_assets.condition"
                                             />
-                                        </label>
-                                    </div>) : null}
+                                            <label>
+                                                <input
+                                                    type="text"
+                                                    rows="1"
+                                                    value={
+                                                        update.description
+                                                            .condition
+                                                    }
+                                                    onChange={this._onUpdateDescription.bind(
+                                                        this,
+                                                        "condition"
+                                                    )}
+                                                />
+                                            </label>
 
+                                            <Translate
+                                                component="h3"
+                                                content="account.user_issued_assets.expiry"
+                                            />
+                                            <label>
+                                                <input
+                                                    type="date"
+                                                    value={
+                                                        update.description
+                                                            .expiry
+                                                    }
+                                                    onChange={this._onUpdateDescription.bind(
+                                                        this,
+                                                        "expiry"
+                                                    )}
+                                                />
+                                            </label>
+                                        </div>
+                                    ) : null}
                                 </div>
                             </Tab>
 
@@ -777,20 +1200,27 @@ class AccountAssetCreate extends React.Component {
                                 <Tab title="account.user_issued_assets.bitasset_opts">
                                     <BitAssetOptions
                                         bitasset_opts={bitasset_opts}
-                                        onUpdate={this.onChangeBitAssetOpts.bind(this)}
-                                        backingAsset={bitasset_opts.short_backing_asset}
+                                        onUpdate={this.onChangeBitAssetOpts.bind(
+                                            this
+                                        )}
+                                        backingAsset={
+                                            bitasset_opts.short_backing_asset
+                                        }
                                         assetPrecision={update.precision}
                                         assetSymbol={update.symbol}
                                     />
-                                </Tab>) : null}
+                                </Tab>
+                            ) : null}
 
                             <Tab title="account.permissions">
                                 <div className="small-12 grid-content">
                                     <div style={{maxWidth: 800}}>
-                                    <HelpContent
-                                        path = {"components/AccountAssetCreate"}
-                                        section="permissions"
-                                    />
+                                        <HelpContent
+                                            path={
+                                                "components/AccountAssetCreate"
+                                            }
+                                            section="permissions"
+                                        />
                                     </div>
                                     {permissions}
                                 </div>
@@ -800,39 +1230,103 @@ class AccountAssetCreate extends React.Component {
                                 <div className="small-12 grid-content">
                                     <div style={{maxWidth: 800}}>
                                         <HelpContent
-                                            path = {"components/AccountAssetCreate"}
+                                            path={
+                                                "components/AccountAssetCreate"
+                                            }
                                             section="flags"
                                         />
                                     </div>
                                     {permissionBooleans["charge_market_fee"] ? (
                                         <div>
-                                            <Translate component="h3" content="account.user_issued_assets.market_fee" />
+                                            <Translate
+                                                component="h3"
+                                                content="account.user_issued_assets.market_fee"
+                                            />
                                             <table className="table">
                                                 <tbody>
                                                     <tr>
-                                                        <td style={{border: "none", width: "80%"}}><Translate content="account.user_issued_assets.charge_market_fee" />:</td>
-                                                        <td style={{border: "none"}}>
-                                                            <div className="switch" style={{marginBottom: "10px"}} onClick={this._onFlagChange.bind(this, "charge_market_fee")}>
-                                                                <input type="checkbox" checked={flagBooleans.charge_market_fee} />
+                                                        <td
+                                                            style={{
+                                                                border: "none",
+                                                                width: "80%"
+                                                            }}
+                                                        >
+                                                            <Translate content="account.user_issued_assets.charge_market_fee" />:
+                                                        </td>
+                                                        <td
+                                                            style={{
+                                                                border: "none"
+                                                            }}
+                                                        >
+                                                            <div
+                                                                className="switch"
+                                                                style={{
+                                                                    marginBottom:
+                                                                        "10px"
+                                                                }}
+                                                                onClick={this._onFlagChange.bind(
+                                                                    this,
+                                                                    "charge_market_fee"
+                                                                )}
+                                                            >
+                                                                <input
+                                                                    type="checkbox"
+                                                                    checked={
+                                                                        flagBooleans.charge_market_fee
+                                                                    }
+                                                                />
                                                                 <label />
                                                             </div>
                                                         </td>
                                                     </tr>
                                                 </tbody>
                                             </table>
-                                            <div className={cnames({disabled: !flagBooleans.charge_market_fee})}>
-                                            <label><Translate content="account.user_issued_assets.market_fee" /> (%)
-                                                <input type="number" value={update.market_fee_percent} onChange={this._onUpdateInput.bind(this, "market_fee_percent")}/>
-                                            </label>
-
-                                            <label><Translate content="account.user_issued_assets.max_market_fee" /> ({update.symbol})
-                                                <input type="number" value={update.max_market_fee} onChange={this._onUpdateInput.bind(this, "max_market_fee")}/>
-                                            </label>
-                                            { errors.max_market_fee ? <p className="grid-content has-error">{errors.max_market_fee}</p> : null}
+                                            <div
+                                                className={cnames({
+                                                    disabled: !flagBooleans.charge_market_fee
+                                                })}
+                                            >
+                                                <label>
+                                                    <Translate content="account.user_issued_assets.market_fee" />{" "}
+                                                    (%)
+                                                    <input
+                                                        type="number"
+                                                        value={
+                                                            update.market_fee_percent
+                                                        }
+                                                        onChange={this._onUpdateInput.bind(
+                                                            this,
+                                                            "market_fee_percent"
+                                                        )}
+                                                    />
+                                                </label>
+
+                                                <label>
+                                                    <Translate content="account.user_issued_assets.max_market_fee" />{" "}
+                                                    ({update.symbol})
+                                                    <input
+                                                        type="number"
+                                                        value={
+                                                            update.max_market_fee
+                                                        }
+                                                        onChange={this._onUpdateInput.bind(
+                                                            this,
+                                                            "max_market_fee"
+                                                        )}
+                                                    />
+                                                </label>
+                                                {errors.max_market_fee ? (
+                                                    <p className="grid-content has-error">
+                                                        {errors.max_market_fee}
+                                                    </p>
+                                                ) : null}
                                             </div>
-                                        </div>) : null}
+                                        </div>
+                                    ) : null}
 
-                                    <h3><Translate content="account.user_issued_assets.flags" /></h3>
+                                    <h3>
+                                        <Translate content="account.user_issued_assets.flags" />
+                                    </h3>
                                     {flags}
                                 </div>
                             </Tab>
@@ -842,7 +1336,6 @@ class AccountAssetCreate extends React.Component {
             </div>
         );
     }
-
 }
 
 AccountAssetCreate = BindToChainState(AccountAssetCreate);
diff --git a/app/components/Account/AccountAssetUpdate.jsx b/app/components/Account/AccountAssetUpdate.jsx
index a554febf41..d1e913cd0d 100644
--- a/app/components/Account/AccountAssetUpdate.jsx
+++ b/app/components/Account/AccountAssetUpdate.jsx
@@ -161,13 +161,13 @@ class AccountAssetUpdate extends React.Component {
             ]),
             feedProducers: isBitAsset
                 ? props.asset.getIn(["bitasset", "feeds"], []).map(a => {
-                    return a.first();
-                })
+                      return a.first();
+                  })
                 : null,
             originalFeedProducers: isBitAsset
                 ? props.asset.getIn(["bitasset", "feeds"], []).map(a => {
-                    return a.first();
-                })
+                      return a.first();
+                  })
                 : null
         };
     }
@@ -178,14 +178,21 @@ class AccountAssetUpdate extends React.Component {
         let p = this.resetState(this.props);
         return (
             JSON.stringify(s.update) !== JSON.stringify(p.update) ||
-            JSON.stringify(s.core_exchange_rate) !== JSON.stringify(p.core_exchange_rate) ||
-            (s.new_issuer_account_id !== null && s.new_issuer_account_id !== s.issuer) ||
+            JSON.stringify(s.core_exchange_rate) !==
+                JSON.stringify(p.core_exchange_rate) ||
+            (s.new_issuer_account_id !== null &&
+                s.new_issuer_account_id !== s.issuer) ||
             JSON.stringify(s.flagBooleans) !== JSON.stringify(p.flagBooleans) ||
-            JSON.stringify(s.permissionBooleans) !== JSON.stringify(p.permissionBooleans) ||
-            JSON.stringify(s.whitelist_authorities) !== JSON.stringify(p.whitelist_authorities) ||
-            JSON.stringify(s.blacklist_authorities) !== JSON.stringify(p.blacklist_authorities) ||
-            JSON.stringify(s.whitelist_markets) !== JSON.stringify(p.whitelist_markets) ||
-            JSON.stringify(s.blacklist_markets) !== JSON.stringify(p.blacklist_markets)
+            JSON.stringify(s.permissionBooleans) !==
+                JSON.stringify(p.permissionBooleans) ||
+            JSON.stringify(s.whitelist_authorities) !==
+                JSON.stringify(p.whitelist_authorities) ||
+            JSON.stringify(s.blacklist_authorities) !==
+                JSON.stringify(p.blacklist_authorities) ||
+            JSON.stringify(s.whitelist_markets) !==
+                JSON.stringify(p.whitelist_markets) ||
+            JSON.stringify(s.blacklist_markets) !==
+                JSON.stringify(p.blacklist_markets)
         );
     }
 
@@ -194,55 +201,74 @@ class AccountAssetUpdate extends React.Component {
         let tabsChanged = this.tabsChanged();
         return tabsChanged[tabId] ? tabsChanged[tabId] : false;
     }
-    
+
     tabsChanged() {
         let s = this.state;
         let p = this.resetState(this.props);
 
         let tabUpdateIndex = [];
 
-        if(
+        if (
             s.update.max_supply !== p.update.max_supply ||
-            s.core_exchange_rate.base.amount !== p.core_exchange_rate.base.amount ||
-            s.core_exchange_rate.quote.amount !== p.core_exchange_rate.quote.amount
-        ) tabUpdateIndex["0"] = true;
-
-        if(
-            JSON.stringify(s.whitelist_authorities) !== JSON.stringify(p.whitelist_authorities) ||
-            JSON.stringify(s.blacklist_authorities) !== JSON.stringify(p.blacklist_authorities) ||
-            JSON.stringify(s.whitelist_markets) !== JSON.stringify(p.whitelist_markets) ||
-            JSON.stringify(s.blacklist_markets) !== JSON.stringify(p.blacklist_markets)
-        ) tabUpdateIndex["1"] = true;
-
-        if(
+            s.core_exchange_rate.base.amount !==
+                p.core_exchange_rate.base.amount ||
+            s.core_exchange_rate.quote.amount !==
+                p.core_exchange_rate.quote.amount
+        )
+            tabUpdateIndex["0"] = true;
+
+        if (
+            JSON.stringify(s.whitelist_authorities) !==
+                JSON.stringify(p.whitelist_authorities) ||
+            JSON.stringify(s.blacklist_authorities) !==
+                JSON.stringify(p.blacklist_authorities) ||
+            JSON.stringify(s.whitelist_markets) !==
+                JSON.stringify(p.whitelist_markets) ||
+            JSON.stringify(s.blacklist_markets) !==
+                JSON.stringify(p.blacklist_markets)
+        )
+            tabUpdateIndex["1"] = true;
+
+        if (
             s.update.description.main !== p.update.description.main ||
-            s.update.description.short_name !== p.update.description.short_name ||
+            s.update.description.short_name !==
+                p.update.description.short_name ||
             s.update.description.market !== p.update.description.market
-        ) tabUpdateIndex["2"] = true;
+        )
+            tabUpdateIndex["2"] = true;
 
-        if(
-            JSON.stringify(s.bitasset_opts) !== JSON.stringify(p.original_bitasset_opts)
-        ) tabUpdateIndex["3"] = true;
+        if (
+            JSON.stringify(s.bitasset_opts) !==
+            JSON.stringify(p.original_bitasset_opts)
+        )
+            tabUpdateIndex["3"] = true;
+
+        if (
+            s.new_issuer_account_id !== null &&
+            s.new_issuer_account_id !== s.issuer
+        )
+            tabUpdateIndex["4"] = true;
 
-        if(
-            s.new_issuer_account_id !== null && s.new_issuer_account_id !== s.issuer
-        ) tabUpdateIndex["4"] = true;
+        if (
+            JSON.stringify(s.permissionBooleans) !==
+            JSON.stringify(p.permissionBooleans)
+        )
+            tabUpdateIndex["5"] = true;
 
-        if(
-            JSON.stringify(s.permissionBooleans) !== JSON.stringify(p.permissionBooleans)
-        ) tabUpdateIndex["5"] = true;
-        
-        if(
+        if (
             JSON.stringify(s.flagBooleans) !== JSON.stringify(p.flagBooleans) ||
             s.update.market_fee_percent !== p.update.market_fee_percent ||
             s.update.max_market_fee !== p.update.max_market_fee
-        ) tabUpdateIndex["6"] = true;
+        )
+            tabUpdateIndex["6"] = true;
 
         // Tab 7 == Fee Pool
 
-        if(
-            JSON.stringify(s.feedProducers) !== JSON.stringify(p.originalFeedProducers)
-        ) tabUpdateIndex["8"] = true;
+        if (
+            JSON.stringify(s.feedProducers) !==
+            JSON.stringify(p.originalFeedProducers)
+        )
+            tabUpdateIndex["8"] = true;
 
         return tabUpdateIndex;
     }
@@ -272,7 +298,7 @@ class AccountAssetUpdate extends React.Component {
 
         // Close confirm_modal if it's open
         this.refs.confirm_modal.onClose();
-        
+
         let {
             update,
             issuer,
@@ -847,7 +873,9 @@ class AccountAssetUpdate extends React.Component {
         }
 
         let tabsChangedCount = 0;
-        this.tabsChanged().forEach(function() { tabsChangedCount++; });
+        this.tabsChanged().forEach(function() {
+            tabsChangedCount++;
+        });
 
         let confirmButtons = (
             <div>
@@ -856,14 +884,17 @@ class AccountAssetUpdate extends React.Component {
                         disabled: !isValid || !this.pageChanged()
                     })}
                     style={{width: "9rem"}}
-                    onClick={tabsChangedCount > 1 ? this._openConfirm.bind(this) : this._updateAsset.bind(this)}
+                    onClick={
+                        tabsChangedCount > 1
+                            ? this._openConfirm.bind(this)
+                            : this._updateAsset.bind(this)
+                    }
                 >
-                    {tabsChangedCount > 1 ?
+                    {tabsChangedCount > 1 ? (
                         <Translate content="account.perm.save_all" />
-                        :
-                        <Translate content="account.perm.save" />    
-                    }
-                    
+                    ) : (
+                        <Translate content="account.perm.save" />
+                    )}
                 </button>
                 <button
                     className={classnames("button primary hollow", {
@@ -954,7 +985,10 @@ class AccountAssetUpdate extends React.Component {
                                 this.setState({activeTab: i});
                             }}
                         >
-                            <Tab title="account.user_issued_assets.primary" updatedTab={this.tabChanged(0)}>
+                            <Tab
+                                title="account.user_issued_assets.primary"
+                                updatedTab={this.tabChanged(0)}
+                            >
                                 <div className="small-12 large-8 large-offset-2 grid-content">
                                     <label>
                                         <Translate content="account.user_issued_assets.precision" />
@@ -1151,7 +1185,10 @@ class AccountAssetUpdate extends React.Component {
                                 </div>
                             </Tab>
 
-                            <Tab title="account.whitelist.title" updatedTab={this.tabChanged(1)}>
+                            <Tab
+                                title="account.whitelist.title"
+                                updatedTab={this.tabChanged(1)}
+                            >
                                 <AssetWhitelist
                                     whiteListEnabled={
                                         flagBooleans["white_list"]
@@ -1189,7 +1226,10 @@ class AccountAssetUpdate extends React.Component {
                                 </AssetWhitelist>
                             </Tab>
 
-                            <Tab title="account.user_issued_assets.description" updatedTab={this.tabChanged(2)}>
+                            <Tab
+                                title="account.user_issued_assets.description"
+                                updatedTab={this.tabChanged(2)}
+                            >
                                 <div className="small-12 large-8 large-offset-2 grid-content">
                                     <label>
                                         <textarea
@@ -1295,7 +1335,10 @@ class AccountAssetUpdate extends React.Component {
                             </Tab>
 
                             {isBitAsset ? (
-                                <Tab title="account.user_issued_assets.bitasset_opts"  updatedTab={this.tabChanged(3)}>
+                                <Tab
+                                    title="account.user_issued_assets.bitasset_opts"
+                                    updatedTab={this.tabChanged(3)}
+                                >
                                     <div className="small-12 large-8 large-offset-2 grid-content">
                                         <BitAssetOptions
                                             bitasset_opts={bitasset_opts}
@@ -1320,7 +1363,10 @@ class AccountAssetUpdate extends React.Component {
                                 </Tab>
                             ) : null}
 
-                            <Tab title="account.user_issued_assets.update_owner" updatedTab={this.tabChanged(4)}>
+                            <Tab
+                                title="account.user_issued_assets.update_owner"
+                                updatedTab={this.tabChanged(4)}
+                            >
                                 <div className="small-12 large-8 large-offset-2 grid-content">
                                     <div style={{paddingBottom: "1rem"}}>
                                         <AccountSelector
@@ -1357,7 +1403,10 @@ class AccountAssetUpdate extends React.Component {
                                 </div>
                             </Tab>
 
-                            <Tab title="account.permissions" updatedTab={this.tabChanged(5)}>
+                            <Tab
+                                title="account.permissions"
+                                updatedTab={this.tabChanged(5)}
+                            >
                                 <div className="small-12 large-8 large-offset-2 grid-content">
                                     <HelpContent
                                         path={"components/AccountAssetCreate"}
@@ -1376,7 +1425,10 @@ class AccountAssetUpdate extends React.Component {
                                 </div>
                             </Tab>
 
-                            <Tab title="account.user_issued_assets.flags" updatedTab={this.tabChanged(6)}>
+                            <Tab
+                                title="account.user_issued_assets.flags"
+                                updatedTab={this.tabChanged(6)}
+                            >
                                 <div className="small-12 large-8 large-offset-2 grid-content">
                                     <HelpContent
                                         path={"components/AccountAssetCreate"}
@@ -1631,7 +1683,10 @@ class AccountAssetUpdate extends React.Component {
                             </Tab>
 
                             {isBitAsset ? (
-                                <Tab title="account.user_issued_assets.feed_producers" updatedTab={this.tabChanged(8)}>
+                                <Tab
+                                    title="account.user_issued_assets.feed_producers"
+                                    updatedTab={this.tabChanged(8)}
+                                >
                                     <AssetFeedProducers
                                         asset={this.props.asset}
                                         account={this.props.account}
@@ -1660,18 +1715,16 @@ class AccountAssetUpdate extends React.Component {
                     </div>
                 </div>
                 {/* Confirmation Modal on Multiple Changes */}
-                <ConfirmModal 
-                    modalId="asset_update_modal" 
-                    ref="confirm_modal" 
-                    tabsChanged={this.tabsChanged()} 
+                <ConfirmModal
+                    modalId="asset_update_modal"
+                    ref="confirm_modal"
+                    tabsChanged={this.tabsChanged()}
                     _cancelConfirm={this._cancelConfirm.bind(this)}
                     _updateAsset={this._updateAsset.bind(this)}
                     {...this.props}
-                    />
+                />
             </div>
         );
-
-
     }
 }
 AccountAssetUpdate = BindToChainState(AccountAssetUpdate);
@@ -1686,7 +1739,7 @@ AccountAssetUpdate = AssetWrapper(AccountAssetUpdate, {
 class ConfirmModal extends React.Component {
     constructor() {
         super();
-        this.state = { open: false };
+        this.state = {open: false};
     }
 
     show() {
@@ -1696,51 +1749,85 @@ class ConfirmModal extends React.Component {
     }
 
     onClose() {
-        this.setState({ open: false });
+        this.setState({open: false});
     }
 
     render() {
         let {tabsChanged} = this.props;
 
         return !this.state.open ? null : (
-            <BaseModal 
+            <BaseModal
                 id={this.props.modalId}
                 overlay={true}
                 modalHeader="account.confirm_asset_modal.header"
                 noLoggo
             >
-                <Translate content="account.confirm_asset_modal.are_you_sure" component="div" style={{paddingBottom: "1rem"}} />
+                <Translate
+                    content="account.confirm_asset_modal.are_you_sure"
+                    component="div"
+                    style={{paddingBottom: "1rem"}}
+                />
                 <div>
-                    
                     <ul>
-                        {tabsChanged["0"] ? <li><Translate content="account.user_issued_assets.primary" /></li> : null}
-                        {tabsChanged["1"] ? <li><Translate content="account.whitelist.title" /></li> : null}
-                        {tabsChanged["2"] ? <li><Translate content="account.user_issued_assets.description" /></li> : null}
-                        {tabsChanged["3"] ? <li><Translate content="account.user_issued_assets.bitasset_opts" /></li> : null}
-                        {tabsChanged["4"] ? <li><Translate content="account.user_issued_assets.update_owner" /></li> : null}
-                        {tabsChanged["5"] ? <li><Translate content="account.permissions" /></li> : null}
-                        {tabsChanged["6"] ? <li><Translate content="account.user_issued_assets.flags" /></li> : null}
+                        {tabsChanged["0"] ? (
+                            <li>
+                                <Translate content="account.user_issued_assets.primary" />
+                            </li>
+                        ) : null}
+                        {tabsChanged["1"] ? (
+                            <li>
+                                <Translate content="account.whitelist.title" />
+                            </li>
+                        ) : null}
+                        {tabsChanged["2"] ? (
+                            <li>
+                                <Translate content="account.user_issued_assets.description" />
+                            </li>
+                        ) : null}
+                        {tabsChanged["3"] ? (
+                            <li>
+                                <Translate content="account.user_issued_assets.bitasset_opts" />
+                            </li>
+                        ) : null}
+                        {tabsChanged["4"] ? (
+                            <li>
+                                <Translate content="account.user_issued_assets.update_owner" />
+                            </li>
+                        ) : null}
+                        {tabsChanged["5"] ? (
+                            <li>
+                                <Translate content="account.permissions" />
+                            </li>
+                        ) : null}
+                        {tabsChanged["6"] ? (
+                            <li>
+                                <Translate content="account.user_issued_assets.flags" />
+                            </li>
+                        ) : null}
 
                         {/* NEEDS CHECKING */}
-                        {tabsChanged["8"] ? <li><Translate content="account.user_issued_assets.feed_producers" /></li> : null} 
+                        {tabsChanged["8"] ? (
+                            <li>
+                                <Translate content="account.user_issued_assets.feed_producers" />
+                            </li>
+                        ) : null}
                     </ul>
                 </div>
                 <div>
-                    <button 
+                    <button
                         className="button primary"
-                        onClick={this.props._updateAsset.bind(this)} >
+                        onClick={this.props._updateAsset.bind(this)}
+                    >
                         <Translate content="global.confirm" />
                     </button>
-                    <button 
+                    <button
                         className="button primary hollow"
-                        onClick={this.props._cancelConfirm.bind(this)} >
+                        onClick={this.props._cancelConfirm.bind(this)}
+                    >
                         <Translate content="global.cancel" />
                     </button>
-
-                    
                 </div>
             </BaseModal>
-
         );
     }
 }
diff --git a/app/components/Account/AccountBalance.jsx b/app/components/Account/AccountBalance.jsx
index 3d2c46b25b..5daa6d4410 100644
--- a/app/components/Account/AccountBalance.jsx
+++ b/app/components/Account/AccountBalance.jsx
@@ -11,22 +11,35 @@ import BalanceComponent from "../Utility/BalanceComponent";
  */
 
 class AccountBalance extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired,
         asset: ChainTypes.ChainAsset.isRequired
-    }
+    };
 
     static defaultProps = {
         autosubscribe: false
-    }
+    };
 
     render() {
         let asset_id = this.props.asset.get("id");
-        let balance_id = this.props.account.getIn( ["balances", asset_id] );
+        let balance_id = this.props.account.getIn(["balances", asset_id]);
 
-        if( balance_id ) return <BalanceComponent balance={balance_id} replace={this.props.replace} />;
-        else return <span>0&nbsp;<AssetName name={this.props.asset.get("symbol")} replace={this.props.replace} /></span>;
+        if (balance_id)
+            return (
+                <BalanceComponent
+                    balance={balance_id}
+                    replace={this.props.replace}
+                />
+            );
+        else
+            return (
+                <span>
+                    0&nbsp;<AssetName
+                        name={this.props.asset.get("symbol")}
+                        replace={this.props.replace}
+                    />
+                </span>
+            );
     }
 }
 
diff --git a/app/components/Account/AccountDepositWithdraw.jsx b/app/components/Account/AccountDepositWithdraw.jsx
index 15969fed22..8b6b43ade2 100644
--- a/app/components/Account/AccountDepositWithdraw.jsx
+++ b/app/components/Account/AccountDepositWithdraw.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import accountUtils from "common/account_utils";
 import utils from "common/utils";
 import Translate from "react-translate-component";
@@ -13,8 +13,8 @@ import HelpContent from "../Utility/HelpContent";
 import AccountStore from "stores/AccountStore";
 import SettingsStore from "stores/SettingsStore";
 import SettingsActions from "actions/SettingsActions";
-import { Apis } from "bitsharesjs-ws";
-import { settingsAPIs, rudexAPIs } from "api/apiConfig";
+import {Apis} from "bitsharesjs-ws";
+import {settingsAPIs, rudexAPIs} from "api/apiConfig";
 import BitKapital from "../DepositWithdraw/BitKapital";
 import RuDexGateway from "../DepositWithdraw/rudex/RuDexGateway";
 import GatewayStore from "stores/GatewayStore";
@@ -24,7 +24,6 @@ import GdexGateway from "../DepositWithdraw/gdex/GdexGateway";
 import WinexGateway from "../DepositWithdraw/winex/WinexGateway";
 
 class AccountDepositWithdraw extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired,
         contained: React.PropTypes.bool
@@ -49,8 +48,14 @@ class AccountDepositWithdraw extends React.Component {
         return (
             nextProps.account !== this.props.account ||
             nextProps.servicesDown !== this.props.servicesDown ||
-            !utils.are_equal_shallow(nextProps.blockTradesBackedCoins, this.props.blockTradesBackedCoins) ||
-            !utils.are_equal_shallow(nextProps.openLedgerBackedCoins, this.props.openLedgerBackedCoins) ||
+            !utils.are_equal_shallow(
+                nextProps.blockTradesBackedCoins,
+                this.props.blockTradesBackedCoins
+            ) ||
+            !utils.are_equal_shallow(
+                nextProps.openLedgerBackedCoins,
+                this.props.openLedgerBackedCoins
+            ) ||
             nextState.olService !== this.state.olService ||
             nextState.rudexService !== this.state.rudexService ||
             nextState.btService !== this.state.btService ||
@@ -117,43 +122,79 @@ class AccountDepositWithdraw extends React.Component {
     renderServices(openLedgerGatewayCoins, rudexGatewayCoins) {
         //let services = ["Openledger (OPEN.X)", "BlockTrades (TRADE.X)", "Transwiser", "BitKapital"];
         let serList = [];
-        let { account } = this.props;
-        let { olService, btService, rudexService } = this.state;
+        let {account} = this.props;
+        let {olService, btService, rudexService} = this.state;
 
         serList.push({
             name: "Openledger (OPEN.X)",
             template: (
                 <div className="content-block">
-                        {/* <div className="float-right">
+                    {/* <div className="float-right">
                             <a href="https://www.ccedk.com/" target="__blank" rel="noopener noreferrer"><Translate content="gateway.website" /></a>
                         </div> */}
-                        <div className="service-selector" style={{marginBottom:"2rem"}}>
-                            <ul className="button-group segmented no-margin">
-                                <li onClick={this.toggleOLService.bind(this, "gateway")} className={olService === "gateway" ? "is-active" : ""}><a><Translate content="gateway.gateway" /></a></li>
-                                <li onClick={this.toggleOLService.bind(this, "fiat")} className={olService === "fiat" ? "is-active" : ""}><a>Fiat</a></li>
-                            </ul>
-                        </div>
+                    <div
+                        className="service-selector"
+                        style={{marginBottom: "2rem"}}
+                    >
+                        <ul className="button-group segmented no-margin">
+                            <li
+                                onClick={this.toggleOLService.bind(
+                                    this,
+                                    "gateway"
+                                )}
+                                className={
+                                    olService === "gateway" ? "is-active" : ""
+                                }
+                            >
+                                <a>
+                                    <Translate content="gateway.gateway" />
+                                </a>
+                            </li>
+                            <li
+                                onClick={this.toggleOLService.bind(
+                                    this,
+                                    "fiat"
+                                )}
+                                className={
+                                    olService === "fiat" ? "is-active" : ""
+                                }
+                            >
+                                <a>Fiat</a>
+                            </li>
+                        </ul>
+                    </div>
 
-                        {olService === "gateway" && openLedgerGatewayCoins.length ?
+                    {olService === "gateway" &&
+                    openLedgerGatewayCoins.length ? (
                         <BlockTradesGateway
                             account={account}
                             coins={openLedgerGatewayCoins}
                             provider="openledger"
-                        /> : null}
+                        />
+                    ) : null}
 
-                        {olService === "fiat" ?
+                    {olService === "fiat" ? (
                         <div>
-                            <div style={{paddingBottom: 15}}><Translate component="h5" content="gateway.fiat_text" unsafe /></div>
+                            <div style={{paddingBottom: 15}}>
+                                <Translate
+                                    component="h5"
+                                    content="gateway.fiat_text"
+                                    unsafe
+                                />
+                            </div>
 
                             <OpenLedgerFiatDepositWithdrawal
                                 rpc_url={settingsAPIs.RPC_URL}
                                 account={account}
-                                issuer_account="openledger-fiat" />
+                                issuer_account="openledger-fiat"
+                            />
                             <OpenLedgerFiatTransactionHistory
                                 rpc_url={settingsAPIs.RPC_URL}
-                                account={account} />
-                        </div> : null}
-                    </div>
+                                account={account}
+                            />
+                        </div>
+                    ) : null}
+                </div>
             )
         });
 
@@ -161,23 +202,52 @@ class AccountDepositWithdraw extends React.Component {
             name: "RuDEX (RUDEX.X)",
             template: (
                 <div className="content-block">
-                    <div className="service-selector" style={{marginBottom:"2rem"}}>
+                    <div
+                        className="service-selector"
+                        style={{marginBottom: "2rem"}}
+                    >
                         <ul className="button-group segmented no-margin">
-                            <li onClick={this.toggleRuDEXService.bind(this, "gateway")}
-                                className={rudexService === "gateway" ? "is-active" : ""}><a><Translate
-                                content="gateway.gateway"/></a></li>
-                            <li onClick={this.toggleRuDEXService.bind(this, "fiat")}
-                                className={rudexService === "fiat" ? "is-active" : ""}><a>Fiat</a></li>
+                            <li
+                                onClick={this.toggleRuDEXService.bind(
+                                    this,
+                                    "gateway"
+                                )}
+                                className={
+                                    rudexService === "gateway"
+                                        ? "is-active"
+                                        : ""
+                                }
+                            >
+                                <a>
+                                    <Translate content="gateway.gateway" />
+                                </a>
+                            </li>
+                            <li
+                                onClick={this.toggleRuDEXService.bind(
+                                    this,
+                                    "fiat"
+                                )}
+                                className={
+                                    rudexService === "fiat" ? "is-active" : ""
+                                }
+                            >
+                                <a>Fiat</a>
+                            </li>
                         </ul>
                     </div>
 
-                    {rudexService === "gateway" && rudexGatewayCoins.length ?
-                        <RuDexGateway account={account} coins={rudexGatewayCoins}/> : null}
+                    {rudexService === "gateway" && rudexGatewayCoins.length ? (
+                        <RuDexGateway
+                            account={account}
+                            coins={rudexGatewayCoins}
+                        />
+                    ) : null}
 
-                    {rudexService === "fiat" ?
+                    {rudexService === "fiat" ? (
                         <div>
                             <Translate content="gateway.rudex.coming_soon" />
-                        </div> : null}
+                        </div>
+                    ) : null}
                 </div>
             )
         });
@@ -186,45 +256,67 @@ class AccountDepositWithdraw extends React.Component {
             name: "BlockTrades",
             template: (
                 <div>
-                        <div className="content-block">
-                            {/* <div className="float-right"><a href="https://blocktrades.us" target="__blank" rel="noopener noreferrer"><Translate content="gateway.website" /></a></div> */}
-
-                            <div className="service-selector" style={{marginBottom:"2rem"}}>
-                                <ul className="button-group segmented no-margin">
-                                    <li onClick={this.toggleBTService.bind(this, "bridge")} className={btService === "bridge" ? "is-active" : ""}><a><Translate content="gateway.bridge" /></a></li>
-                                </ul>
-                            </div>
+                    <div className="content-block">
+                        {/* <div className="float-right"><a href="https://blocktrades.us" target="__blank" rel="noopener noreferrer"><Translate content="gateway.website" /></a></div> */}
 
-                            <BlockTradesBridgeDepositRequest
-                                gateway="blocktrades"
-                                issuer_account="blocktrades"
-                                account={account}
-                                initial_deposit_input_coin_type="btc"
-                                initial_deposit_output_coin_type="bts"
-                                initial_deposit_estimated_input_amount="1.0"
-                                initial_withdraw_input_coin_type="bts"
-                                initial_withdraw_output_coin_type="btc"
-                                initial_withdraw_estimated_input_amount="100000"
-                                initial_conversion_input_coin_type="bts"
-                                initial_conversion_output_coin_type="bitbtc"
-                                initial_conversion_estimated_input_amount="1000"
-                            />
-                        </div>
-                        <div className="content-block">
+                        <div
+                            className="service-selector"
+                            style={{marginBottom: "2rem"}}
+                        >
+                            <ul className="button-group segmented no-margin">
+                                <li
+                                    onClick={this.toggleBTService.bind(
+                                        this,
+                                        "bridge"
+                                    )}
+                                    className={
+                                        btService === "bridge"
+                                            ? "is-active"
+                                            : ""
+                                    }
+                                >
+                                    <a>
+                                        <Translate content="gateway.bridge" />
+                                    </a>
+                                </li>
+                            </ul>
                         </div>
-                    </div>)
+
+                        <BlockTradesBridgeDepositRequest
+                            gateway="blocktrades"
+                            issuer_account="blocktrades"
+                            account={account}
+                            initial_deposit_input_coin_type="btc"
+                            initial_deposit_output_coin_type="bts"
+                            initial_deposit_estimated_input_amount="1.0"
+                            initial_withdraw_input_coin_type="bts"
+                            initial_withdraw_output_coin_type="btc"
+                            initial_withdraw_estimated_input_amount="100000"
+                            initial_conversion_input_coin_type="bts"
+                            initial_conversion_output_coin_type="bitbtc"
+                            initial_conversion_estimated_input_amount="1000"
+                        />
+                    </div>
+                    <div className="content-block" />
+                </div>
+            )
         });
 
         serList.push({
             name: "BitKapital",
-            template: (<BitKapital viewSettings={this.props.viewSettings} account={account}/>)
+            template: (
+                <BitKapital
+                    viewSettings={this.props.viewSettings}
+                    account={account}
+                />
+            )
         });
 
         serList.push({
             name: "GDEX",
             template: (
                 <div>
-                    <GdexGateway account={account} provider={"gdex"}/>
+                    <GdexGateway account={account} provider={"gdex"} />
                 </div>
             )
         });
@@ -233,122 +325,175 @@ class AccountDepositWithdraw extends React.Component {
             name: "Winex",
             template: (
                 <div>
-
-                    <WinexGateway
-                        account={account}
-                        provider="Winex"/>
+                    <WinexGateway account={account} provider="Winex" />
                 </div>
             )
         });
 
-
         return serList;
     }
 
     render() {
-        let { account, servicesDown } = this.props;
-        let { activeService } = this.state;
-
-        let openLedgerGatewayCoins = this.props.openLedgerBackedCoins.map(coin => {
-            return coin;
-        })
-        .sort((a, b) => {
-            if (a.symbol < b.symbol)
-                return -1;
-            if (a.symbol > b.symbol)
-                return 1;
-            return 0;
-        });
-
-        let rudexGatewayCoins = this.props.rudexBackedCoins.map(coin => {
-            return coin;
-        })
-        .sort((a, b) => {
-            if (a.symbol < b.symbol)
-                return -1;
-            if (a.symbol > b.symbol)
-                return 1;
-            return 0;
-        });
-
-        let services = this.renderServices(openLedgerGatewayCoins, rudexGatewayCoins);
+        let {account, servicesDown} = this.props;
+        let {activeService} = this.state;
+
+        let openLedgerGatewayCoins = this.props.openLedgerBackedCoins
+            .map(coin => {
+                return coin;
+            })
+            .sort((a, b) => {
+                if (a.symbol < b.symbol) return -1;
+                if (a.symbol > b.symbol) return 1;
+                return 0;
+            });
+
+        let rudexGatewayCoins = this.props.rudexBackedCoins
+            .map(coin => {
+                return coin;
+            })
+            .sort((a, b) => {
+                if (a.symbol < b.symbol) return -1;
+                if (a.symbol > b.symbol) return 1;
+                return 0;
+            });
+
+        let services = this.renderServices(
+            openLedgerGatewayCoins,
+            rudexGatewayCoins
+        );
 
         let options = services.map((services_obj, index) => {
-            return <option key={index} value={index}>{services_obj.name}</option>;
+            return (
+                <option key={index} value={index}>
+                    {services_obj.name}
+                </option>
+            );
         });
 
-        const serviceNames = ["Winex","GDEX", "OPEN", "RUDEX", "TRADE", "BITKAPITAL"];
+        const serviceNames = [
+            "Winex",
+            "GDEX",
+            "OPEN",
+            "RUDEX",
+            "TRADE",
+            "BITKAPITAL"
+        ];
         const currentServiceName = serviceNames[activeService];
         const currentServiceDown = servicesDown.get(currentServiceName);
 
         return (
-            <div className={this.props.contained ? "grid-content" : "grid-container"}>
-                <div className={this.props.contained ? "" : "grid-content"} style={{paddingTop: "2rem"}}>
-
+            <div
+                className={
+                    this.props.contained ? "grid-content" : "grid-container"
+                }
+            >
+                <div
+                    className={this.props.contained ? "" : "grid-content"}
+                    style={{paddingTop: "2rem"}}
+                >
                     <Translate content="gateway.title" component="h2" />
                     <div className="grid-block vertical medium-horizontal no-margin no-padding">
                         <div className="medium-6 show-for-medium">
-                            <HelpContent path="components/DepositWithdraw" section="deposit-short"/>
+                            <HelpContent
+                                path="components/DepositWithdraw"
+                                section="deposit-short"
+                            />
                         </div>
                         <div className="medium-5 medium-offset-1">
-                            <HelpContent account={account.get("name")} path="components/DepositWithdraw" section="receive"/>
+                            <HelpContent
+                                account={account.get("name")}
+                                path="components/DepositWithdraw"
+                                section="receive"
+                            />
                         </div>
                     </div>
                     <div>
                         <div className="grid-block vertical medium-horizontal no-margin no-padding">
                             <div className="medium-6 small-order-2 medium-order-1">
-                                <Translate component="label" className="left-label" content="gateway.service" />
-                                <select onChange={this.onSetService.bind(this)} className="bts-select" value={activeService} >
+                                <Translate
+                                    component="label"
+                                    className="left-label"
+                                    content="gateway.service"
+                                />
+                                <select
+                                    onChange={this.onSetService.bind(this)}
+                                    className="bts-select"
+                                    value={activeService}
+                                >
                                     {options}
                                 </select>
-                                {
-                                  currentServiceDown ?
-                                  <Translate style={{color: "red", marginBottom: "1em", display: "block"}} content={`gateway.unavailable_${currentServiceName}`} />
-                                  : null
-                                }
+                                {currentServiceDown ? (
+                                    <Translate
+                                        style={{
+                                            color: "red",
+                                            marginBottom: "1em",
+                                            display: "block"
+                                        }}
+                                        content={`gateway.unavailable_${currentServiceName}`}
+                                    />
+                                ) : null}
                             </div>
-                            <div className="medium-5 medium-offset-1 small-order-1 medium-order-2" style={{paddingBottom: 20}}>
-                                <Translate component="label" className="left-label" content="gateway.your_account" />
+                            <div
+                                className="medium-5 medium-offset-1 small-order-1 medium-order-2"
+                                style={{paddingBottom: 20}}
+                            >
+                                <Translate
+                                    component="label"
+                                    className="left-label"
+                                    content="gateway.your_account"
+                                />
                                 <div className="inline-label">
                                     <AccountImage
                                         size={{height: 40, width: 40}}
-                                        account={account.get("name")} custom_image={null}
+                                        account={account.get("name")}
+                                        custom_image={null}
                                     />
-                                    <input type="text"
-                                           value={account.get("name")}
-                                           placeholder={null}
-                                           disabled
-                                           onChange={() => {}}
-                                           onKeyDown={() => {}}
-                                           tabIndex={1}
+                                    <input
+                                        type="text"
+                                        value={account.get("name")}
+                                        placeholder={null}
+                                        disabled
+                                        onChange={() => {}}
+                                        onKeyDown={() => {}}
+                                        tabIndex={1}
                                     />
                                 </div>
                             </div>
                         </div>
                     </div>
 
-                    <div className="grid-content no-padding" style={{paddingTop: 15}}>
-                    {currentServiceDown ? null : activeService && services[activeService] ? services[activeService].template : services[0].template}
+                    <div
+                        className="grid-content no-padding"
+                        style={{paddingTop: 15}}
+                    >
+                        {currentServiceDown
+                            ? null
+                            : activeService && services[activeService]
+                                ? services[activeService].template
+                                : services[0].template}
                     </div>
                 </div>
             </div>
         );
     }
-};
+}
 AccountDepositWithdraw = BindToChainState(AccountDepositWithdraw);
 
 class DepositStoreWrapper extends React.Component {
-
     componentWillMount() {
-        if (Apis.instance().chain_id.substr(0, 8) === "4018d784") { // Only fetch this when on BTS main net
+        if (Apis.instance().chain_id.substr(0, 8) === "4018d784") {
+            // Only fetch this when on BTS main net
             GatewayActions.fetchCoins.defer(); // Openledger
-            GatewayActions.fetchCoinsSimple.defer({backer: "RUDEX", url:rudexAPIs.BASE+rudexAPIs.COINS_LIST}); // RuDEX
+            GatewayActions.fetchCoinsSimple.defer({
+                backer: "RUDEX",
+                url: rudexAPIs.BASE + rudexAPIs.COINS_LIST
+            }); // RuDEX
             GatewayActions.fetchCoins.defer({backer: "TRADE"}); // Blocktrades
         }
     }
 
     render() {
-        return <AccountDepositWithdraw {...this.props}/>;
+        return <AccountDepositWithdraw {...this.props} />;
     }
 }
 
@@ -360,9 +505,18 @@ export default connect(DepositStoreWrapper, {
         return {
             account: AccountStore.getState().currentAccount,
             viewSettings: SettingsStore.getState().viewSettings,
-            openLedgerBackedCoins: GatewayStore.getState().backedCoins.get("OPEN", []),
-            rudexBackedCoins: GatewayStore.getState().backedCoins.get("RUDEX", []),
-            blockTradesBackedCoins: GatewayStore.getState().backedCoins.get("TRADE", []),
+            openLedgerBackedCoins: GatewayStore.getState().backedCoins.get(
+                "OPEN",
+                []
+            ),
+            rudexBackedCoins: GatewayStore.getState().backedCoins.get(
+                "RUDEX",
+                []
+            ),
+            blockTradesBackedCoins: GatewayStore.getState().backedCoins.get(
+                "TRADE",
+                []
+            ),
             servicesDown: GatewayStore.getState().down || {}
         };
     }
diff --git a/app/components/Account/AccountImage.jsx b/app/components/Account/AccountImage.jsx
index b772be293a..b657e52740 100644
--- a/app/components/Account/AccountImage.jsx
+++ b/app/components/Account/AccountImage.jsx
@@ -6,9 +6,11 @@ class AccountImage extends Component {
     render() {
         let {account, image, style} = this.props;
         let {height, width} = this.props.size;
-        let custom_image = image ?
-            <img src={image} height={height + "px"} width={width + "px"}/> :
-            <Identicon id={account} account={account} size={this.props.size}/>;
+        let custom_image = image ? (
+            <img src={image} height={height + "px"} width={width + "px"} />
+        ) : (
+            <Identicon id={account} account={account} size={this.props.size} />
+        );
 
         return (
             <div style={style} className="account-image">
diff --git a/app/components/Account/AccountInfo.jsx b/app/components/Account/AccountInfo.jsx
index f5ce77550a..b2d7eafe9c 100644
--- a/app/components/Account/AccountInfo.jsx
+++ b/app/components/Account/AccountInfo.jsx
@@ -6,20 +6,19 @@ import Translate from "react-translate-component";
 import QRCode from "qrcode.react";
 
 class AccountInfo extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired,
         title: React.PropTypes.string,
         image_size: React.PropTypes.object.isRequired,
         my_account: React.PropTypes.bool
-    }
+    };
 
     static defaultProps = {
         title: null,
         image_size: {height: 120, width: 120},
         showQR: false,
         titleClass: "account-title"
-    }
+    };
 
     constructor() {
         super();
@@ -32,30 +31,59 @@ class AccountInfo extends React.Component {
     render() {
         let {account, image_size} = this.props;
 
-        let isLTM = account.get("lifetime_referrer_name") === account.get("name");
+        let isLTM =
+            account.get("lifetime_referrer_name") === account.get("name");
 
-        let QR = <div className="account-image"><QRCode size={image_size.width} value={account.get("name")}/></div>;
+        let QR = (
+            <div className="account-image">
+                <QRCode size={image_size.width} value={account.get("name")} />
+            </div>
+        );
 
-        let qrState = !this.state.hover ? this.props.showQR : !this.props.showQR;
+        let qrState = !this.state.hover
+            ? this.props.showQR
+            : !this.props.showQR;
 
         return (
-            <div style={{maxWidth: image_size.width}} className={"account-info" + (this.props.my_account ? " my-account" : "")}>
+            <div
+                style={{maxWidth: image_size.width}}
+                className={
+                    "account-info" +
+                    (this.props.my_account ? " my-account" : "")
+                }
+            >
                 {this.props.title ? <h4>{this.props.title}</h4> : null}
                 <div
-                    onMouseEnter={() => {this.setState({hover: true});}}
-                    onMouseLeave={() => {this.setState({hover: false});}}
+                    onMouseEnter={() => {
+                        this.setState({hover: true});
+                    }}
+                    onMouseLeave={() => {
+                        this.setState({hover: false});
+                    }}
                     className="clickable"
                     onClick={() => {
                         this.setState({hover: false});
                         this.props.toggleQR(!this.props.showQR);
                     }}
                 >
-                    {qrState ?
-                        QR :
-                        <AccountImage size={image_size} account={account.get("name")} custom_image={null}/>}
+                    {qrState ? (
+                        QR
+                    ) : (
+                        <AccountImage
+                            size={image_size}
+                            account={account.get("name")}
+                            custom_image={null}
+                        />
+                    )}
                 </div>
-                <p><Translate content="account.deposit_address" />!</p>
-                <p className={this.props.titleClass}><span className={isLTM ? "lifetime" : ""}>{account.get("name")}</span></p>
+                <p>
+                    <Translate content="account.deposit_address" />!
+                </p>
+                <p className={this.props.titleClass}>
+                    <span className={isLTM ? "lifetime" : ""}>
+                        {account.get("name")}
+                    </span>
+                </p>
                 {/* <div className="secondary">
                     <span className="subheader">#{display_id}</span>
                     {this.props.my_account ? <span className="my-account-label"><Translate content="account.mine" /></span> : null}
diff --git a/app/components/Account/AccountLeftPanel.jsx b/app/components/Account/AccountLeftPanel.jsx
index 50c01c671e..826ffc0f65 100644
--- a/app/components/Account/AccountLeftPanel.jsx
+++ b/app/components/Account/AccountLeftPanel.jsx
@@ -8,10 +8,9 @@ import AccountActions from "actions/AccountActions";
 import SettingsActions from "actions/SettingsActions";
 
 class AccountLeftPanel extends React.Component {
-
     static propTypes = {
         account: React.PropTypes.object.isRequired,
-        linkedAccounts: PropTypes.object,
+        linkedAccounts: PropTypes.object
     };
 
     constructor(props) {
@@ -81,23 +80,37 @@ class AccountLeftPanel extends React.Component {
         let account_name = account.get("name");
         let linkBtn = null;
 
-        linkBtn = isMyAccount ? null : linkedAccounts.has(account_name) ?
-        <span className="button block-button" onClick={this.onUnlinkAccount.bind(this)}><Translate
-            content="account.unfollow"/>
-        </span> :
-        <span className="button block-button" onClick={this.onLinkAccount.bind(this)}>
-            <Translate content="account.follow"/>
-        </span>;
+        linkBtn = isMyAccount ? null : linkedAccounts.has(account_name) ? (
+            <span
+                className="button block-button"
+                onClick={this.onUnlinkAccount.bind(this)}
+            >
+                <Translate content="account.unfollow" />
+            </span>
+        ) : (
+            <span
+                className="button block-button"
+                onClick={this.onLinkAccount.bind(this)}
+            >
+                <Translate content="account.follow" />
+            </span>
+        );
 
-        let caret = this.state.showAdvanced ? <span>&#9660;</span> : <span>&#9650;</span>;
+        let caret = this.state.showAdvanced ? (
+            <span>&#9660;</span>
+        ) : (
+            <span>&#9650;</span>
+        );
 
         const imageSize = {height: 150, width: 150};
 
         return (
             <div className="grid-block vertical account-left-panel no-padding no-overflow">
                 <div className="grid-block">
-                    <div className="grid-content no-padding" style={{overflowX: "hidden"}}>
-
+                    <div
+                        className="grid-content no-padding"
+                        style={{overflowX: "hidden"}}
+                    >
                         <div className="regular-padding">
                             <AccountInfo
                                 account={account.get("id")}
@@ -107,18 +120,63 @@ class AccountLeftPanel extends React.Component {
                                 toggleQR={this._toggleQR.bind(this)}
                                 titleClass={this.state.titleClass}
                             />
-                            <div className="grid-container no-margin" style={{paddingTop: 20, maxWidth: imageSize.width}}>
-                                <div onClick={this._depositClick.bind(this)} style={{paddingBottom: 15}}><Translate className="button block-button no-margin" content="account.deposit"/></div>
-                                <div style={{paddingBottom: 15}}><Link to={`/transfer/?to=${account_name}`}><Translate className="button block-button no-margin" content="account.pay"/></Link></div>
-                                { linkBtn }
+                            <div
+                                className="grid-container no-margin"
+                                style={{
+                                    paddingTop: 20,
+                                    maxWidth: imageSize.width
+                                }}
+                            >
+                                <div
+                                    onClick={this._depositClick.bind(this)}
+                                    style={{paddingBottom: 15}}
+                                >
+                                    <Translate
+                                        className="button block-button no-margin"
+                                        content="account.deposit"
+                                    />
+                                </div>
+                                <div style={{paddingBottom: 15}}>
+                                    <Link to={`/transfer/?to=${account_name}`}>
+                                        <Translate
+                                            className="button block-button no-margin"
+                                            content="account.pay"
+                                        />
+                                    </Link>
+                                </div>
+                                {linkBtn}
                             </div>
                         </div>
                         <section className="block-list">
-                            <ul className="account-left-menu" style={{marginBottom: 0}}>
-                                <li><Link to={`/account/${account_name}/dashboard/`} activeClassName="active"><Translate content="header.dashboard"/></Link></li>
-                                <li><Link to={`/account/${account_name}/member-stats/`} activeClassName="active"><Translate content="account.member.stats"/></Link></li>
+                            <ul
+                                className="account-left-menu"
+                                style={{marginBottom: 0}}
+                            >
+                                <li>
+                                    <Link
+                                        to={`/account/${account_name}/dashboard/`}
+                                        activeClassName="active"
+                                    >
+                                        <Translate content="header.dashboard" />
+                                    </Link>
+                                </li>
+                                <li>
+                                    <Link
+                                        to={`/account/${account_name}/member-stats/`}
+                                        activeClassName="active"
+                                    >
+                                        <Translate content="account.member.stats" />
+                                    </Link>
+                                </li>
                                 {/* <li><Link to={`/account/${account_name}/orders/`} activeClassName="active"><Translate content="account.open_orders"/></Link></li> */}
-                                <li><Link to={`/account/${account_name}/voting/`} activeClassName="active"><Translate content="account.voting"/></Link></li>
+                                <li>
+                                    <Link
+                                        to={`/account/${account_name}/voting/`}
+                                        activeClassName="active"
+                                    >
+                                        <Translate content="account.voting" />
+                                    </Link>
+                                </li>
 
                                 {/* <li className="menu-subheader" >
                                 <span className="button outline small">
@@ -126,43 +184,90 @@ class AccountLeftPanel extends React.Component {
 
                             </span>
                         </li> */}
-                    </ul>
-                </section>
-
-                {/* Advanced features*/}
-                <div style={{paddingBottom: 10, paddingTop: 20}}>
-                    <div className="grid-container no-margin advanced-toggle">
-                        <a
-                            onClick={this._toggleAdvanced.bind(this)}
-                            className="button outline small block-button"
-                            style={{
-                                border: "none",
-                                textAlign: "left",
-                                paddingLeft: "1.75rem"
-                            }}
-                            >
-                                <Translate content="account.user_issued_assets.advanced" />
-                                <span>  {caret}</span>
-                            </a>
-                        </div>
-                    </div>
-                    <section className="block-list">
-                        {this.state.showAdvanced ? (<ul className="account-left-menu">
-                            <li><Link to={`/account/${account_name}/assets/`} activeClassName="active"><Translate content="account.user_issued_assets.issued_assets"/></Link></li>
-                            <li><Link to={`/account/${account_name}/permissions/`} activeClassName="active"><Translate content="account.permissions"/></Link></li>
-                            <li><Link to={`/account/${account_name}/whitelist/`} activeClassName="active"><Translate content="account.whitelist.title"/></Link></li>
-                            {isMyAccount ? <li><Link to={`/account/${account_name}/vesting/`} activeClassName="active"><Translate content="account.vesting.title"/></Link></li> : null}
-                            <li><Link to={`/account/${account_name}/signedmessages/`} activeClassName="active"><Translate content="account.signedmessages.menuitem"/></Link></li>
-                        </ul>) : null}
-                    </section>
-
-                    {isMyAccount ?
-                        <div className="regular-padding">
-                            <div className="button block-button create-account-button">
-                                <Link to={`/create-account/${this.props.passwordLogin ? "password" : "wallet"}`}><Translate content="account.create_new" /></Link>
+                            </ul>
+                        </section>
+
+                        {/* Advanced features*/}
+                        <div style={{paddingBottom: 10, paddingTop: 20}}>
+                            <div className="grid-container no-margin advanced-toggle">
+                                <a
+                                    onClick={this._toggleAdvanced.bind(this)}
+                                    className="button outline small block-button"
+                                    style={{
+                                        border: "none",
+                                        textAlign: "left",
+                                        paddingLeft: "1.75rem"
+                                    }}
+                                >
+                                    <Translate content="account.user_issued_assets.advanced" />
+                                    <span> {caret}</span>
+                                </a>
                             </div>
                         </div>
-                        : null}
+                        <section className="block-list">
+                            {this.state.showAdvanced ? (
+                                <ul className="account-left-menu">
+                                    <li>
+                                        <Link
+                                            to={`/account/${account_name}/assets/`}
+                                            activeClassName="active"
+                                        >
+                                            <Translate content="account.user_issued_assets.issued_assets" />
+                                        </Link>
+                                    </li>
+                                    <li>
+                                        <Link
+                                            to={`/account/${account_name}/permissions/`}
+                                            activeClassName="active"
+                                        >
+                                            <Translate content="account.permissions" />
+                                        </Link>
+                                    </li>
+                                    <li>
+                                        <Link
+                                            to={`/account/${account_name}/whitelist/`}
+                                            activeClassName="active"
+                                        >
+                                            <Translate content="account.whitelist.title" />
+                                        </Link>
+                                    </li>
+                                    {isMyAccount ? (
+                                        <li>
+                                            <Link
+                                                to={`/account/${account_name}/vesting/`}
+                                                activeClassName="active"
+                                            >
+                                                <Translate content="account.vesting.title" />
+                                            </Link>
+                                        </li>
+                                    ) : null}
+                                    <li>
+                                        <Link
+                                            to={`/account/${account_name}/signedmessages/`}
+                                            activeClassName="active"
+                                        >
+                                            <Translate content="account.signedmessages.menuitem" />
+                                        </Link>
+                                    </li>
+                                </ul>
+                            ) : null}
+                        </section>
+
+                        {isMyAccount ? (
+                            <div className="regular-padding">
+                                <div className="button block-button create-account-button">
+                                    <Link
+                                        to={`/create-account/${
+                                            this.props.passwordLogin
+                                                ? "password"
+                                                : "wallet"
+                                        }`}
+                                    >
+                                        <Translate content="account.create_new" />
+                                    </Link>
+                                </div>
+                            </div>
+                        ) : null}
                     </div>
                 </div>
             </div>
diff --git a/app/components/Account/AccountMembership.jsx b/app/components/Account/AccountMembership.jsx
index 99336108a9..be2af612d1 100644
--- a/app/components/Account/AccountMembership.jsx
+++ b/app/components/Account/AccountMembership.jsx
@@ -27,7 +27,9 @@ class FeeHelp extends React.Component {
                 {...this.props}
                 path="components/AccountMembership"
                 section="fee-division"
-                nextMaintenanceTime={{time: dprops.get("next_maintenance_time")}}
+                nextMaintenanceTime={{
+                    time: dprops.get("next_maintenance_time")
+                }}
             />
         );
     }
@@ -35,7 +37,6 @@ class FeeHelp extends React.Component {
 FeeHelp = BindToChainState(FeeHelp);
 
 class AccountMembership extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired,
         gprops: ChainTypes.ChainObject.isRequired,
@@ -56,108 +57,220 @@ class AccountMembership extends React.Component {
     }
 
     render() {
-
         let {gprops, core_asset} = this.props;
 
         let account = this.props.account.toJS();
 
-        let ltr = ChainStore.getAccount( account.lifetime_referrer, false );
-        if( ltr ) account.lifetime_referrer_name = ltr.get("name");
-        let ref = ChainStore.getAccount( account.referrer, false );
-        if( ref ) account.referrer_name = ref.get("name");
-        let reg = ChainStore.getAccount( account.registrar, false );
-        if( reg ) account.registrar_name = reg.get("name");
+        let ltr = ChainStore.getAccount(account.lifetime_referrer, false);
+        if (ltr) account.lifetime_referrer_name = ltr.get("name");
+        let ref = ChainStore.getAccount(account.referrer, false);
+        if (ref) account.referrer_name = ref.get("name");
+        let reg = ChainStore.getAccount(account.registrar, false);
+        if (reg) account.registrar_name = reg.get("name");
 
         let account_name = account.name;
 
-        let network_fee  = account.network_fee_percentage/100;
-        let lifetime_fee = account.lifetime_referrer_fee_percentage/100;
+        let network_fee = account.network_fee_percentage / 100;
+        let lifetime_fee = account.lifetime_referrer_fee_percentage / 100;
         let referrer_total_fee = 100 - network_fee - lifetime_fee;
-        let referrer_fee  = referrer_total_fee * account.referrer_rewards_percentage/10000;
+        let referrer_fee =
+            referrer_total_fee * account.referrer_rewards_percentage / 10000;
         let registrar_fee = 100 - referrer_fee - lifetime_fee - network_fee;
 
-        let lifetime_cost = gprops.getIn(["parameters", "current_fees", "parameters", 8, 1, "membership_lifetime_fee"]) * gprops.getIn(["parameters", "current_fees", "scale"]) / 10000;
+        let lifetime_cost =
+            gprops.getIn([
+                "parameters",
+                "current_fees",
+                "parameters",
+                8,
+                1,
+                "membership_lifetime_fee"
+            ]) *
+            gprops.getIn(["parameters", "current_fees", "scale"]) /
+            10000;
 
-        let member_status = ChainStore.getAccountMemberStatus(this.props.account);
+        let member_status = ChainStore.getAccountMemberStatus(
+            this.props.account
+        );
         let membership = "account.member." + member_status;
         let expiration = null;
-        if( member_status === "annual" )
-            expiration = (<span>(<Translate content="account.member.expires"/> <TimeAgo time={account.membership_expiration_date} />)</span>);
+        if (member_status === "annual")
+            expiration = (
+                <span>
+                    (<Translate content="account.member.expires" />{" "}
+                    <TimeAgo time={account.membership_expiration_date} />)
+                </span>
+            );
         let expiration_date = account.membership_expiration_date;
-        if( expiration_date === "1969-12-31T23:59:59" )
+        if (expiration_date === "1969-12-31T23:59:59")
             expiration_date = "Never";
-        else if( expiration_date === "1970-01-01T00:00:00" )
+        else if (expiration_date === "1970-01-01T00:00:00")
             expiration_date = "N/A";
 
         return (
             <div className="grid-content app-tables no-padding" ref="appTables">
                 <div className="content-block small-12">
                     <div className="tabs-container generic-bordered-box">
-                        <Tabs segmented={false} setting="membershipTab" className="account-tabs" tabsClass="account-overview bordered-header content-block" contentClass="padding">
+                        <Tabs
+                            segmented={false}
+                            setting="membershipTab"
+                            className="account-tabs"
+                            tabsClass="account-overview bordered-header content-block"
+                            contentClass="padding"
+                        >
                             <Tab title="account.member.membership">
-
-                                <h3><Translate content={membership}/> {expiration}</h3>
-                                { member_status=== "lifetime" ? null : (
-                                <div>
-                                    <div className="large-6 medium-8">
-                                        <HelpContent path="components/AccountMembership" section="lifetime" feesCashback={100 - network_fee} price={{amount: lifetime_cost, asset: core_asset}}/>
-                                        <div className="button no-margin" onClick={this.upgradeAccount.bind(this, account.id, true)}>
-                                            <Translate content="account.member.upgrade_lifetime"/>
-                                        </div> &nbsp; &nbsp;
-                                        {true || member_status === "annual" ? null :
-                                        <div className="button" onClick={this.upgradeAccount.bind(this, account.id, false)}>
-                                            <Translate content="account.member.subscribe"/>
-                                        </div>}
+                                <h3>
+                                    <Translate content={membership} />{" "}
+                                    {expiration}
+                                </h3>
+                                {member_status === "lifetime" ? null : (
+                                    <div>
+                                        <div className="large-6 medium-8">
+                                            <HelpContent
+                                                path="components/AccountMembership"
+                                                section="lifetime"
+                                                feesCashback={100 - network_fee}
+                                                price={{
+                                                    amount: lifetime_cost,
+                                                    asset: core_asset
+                                                }}
+                                            />
+                                            <div
+                                                className="button no-margin"
+                                                onClick={this.upgradeAccount.bind(
+                                                    this,
+                                                    account.id,
+                                                    true
+                                                )}
+                                            >
+                                                <Translate content="account.member.upgrade_lifetime" />
+                                            </div>{" "}
+                                            &nbsp; &nbsp;
+                                            {true ||
+                                            member_status ===
+                                                "annual" ? null : (
+                                                <div
+                                                    className="button"
+                                                    onClick={this.upgradeAccount.bind(
+                                                        this,
+                                                        account.id,
+                                                        false
+                                                    )}
+                                                >
+                                                    <Translate content="account.member.subscribe" />
+                                                </div>
+                                            )}
                                         </div>
-                                    <br/><hr/>
-                                </div>
+                                        <br />
+                                        <hr />
+                                    </div>
                                 )}
 
                                 <div className="content-block no-margin">
                                     <div className="no-margin grid-block vertical large-horizontal">
                                         <div className="no-margin grid-block large-5">
                                             <div className="grid-content">
-                                                {member_status=== "lifetime" ? (
-                                                <div>
-                                                    <h4><Translate content="account.member.referral_link"/></h4>
-                                                    <Translate content="account.member.referral_text"/>:
-                                                    <h5>{`https://wallet.bitshares.org/?r=${account.name}`}</h5>
-                                                </div>) : null}
-                                                <h4><Translate content="account.member.fee_allocation"/></h4>
+                                                {member_status ===
+                                                "lifetime" ? (
+                                                    <div>
+                                                        <h4>
+                                                            <Translate content="account.member.referral_link" />
+                                                        </h4>
+                                                        <Translate content="account.member.referral_text" />:
+                                                        <h5
+                                                        >{`https://wallet.bitshares.org/?r=${
+                                                            account.name
+                                                        }`}</h5>
+                                                    </div>
+                                                ) : null}
+                                                <h4>
+                                                    <Translate content="account.member.fee_allocation" />
+                                                </h4>
                                                 <table className="table key-value-table">
                                                     <tbody>
                                                         <tr>
-                                                            <td><Translate content="account.member.network_percentage"/></td>
-                                                            <td>{network_fee}%</td>
+                                                            <td>
+                                                                <Translate content="account.member.network_percentage" />
+                                                            </td>
+                                                            <td>
+                                                                {network_fee}%
+                                                            </td>
                                                         </tr>
                                                         <tr>
-                                                            <td><Translate content="account.member.lifetime_referrer"/>  &nbsp;
-                                                            (<Link to={`account/${account.lifetime_referrer_name}/overview`}>{account.lifetime_referrer_name}</Link>)
+                                                            <td>
+                                                                <Translate content="account.member.lifetime_referrer" />{" "}
+                                                                &nbsp; (<Link
+                                                                    to={`account/${
+                                                                        account.lifetime_referrer_name
+                                                                    }/overview`}
+                                                                >
+                                                                    {
+                                                                        account.lifetime_referrer_name
+                                                                    }
+                                                                </Link>)
+                                                            </td>
+                                                            <td>
+                                                                {lifetime_fee}%
                                                             </td>
-                                                            <td>{lifetime_fee}%</td>
                                                         </tr>
                                                         <tr>
-                                                            <td><Translate content="account.member.registrar"/>  &nbsp;
-                                                            (<Link to={`account/${account.registrar_name}/overview`}>{account.registrar_name}</Link>)
+                                                            <td>
+                                                                <Translate content="account.member.registrar" />{" "}
+                                                                &nbsp; (<Link
+                                                                    to={`account/${
+                                                                        account.registrar_name
+                                                                    }/overview`}
+                                                                >
+                                                                    {
+                                                                        account.registrar_name
+                                                                    }
+                                                                </Link>)
+                                                            </td>
+                                                            <td>
+                                                                {registrar_fee}%
                                                             </td>
-                                                            <td>{registrar_fee}%</td>
                                                         </tr>
                                                         <tr>
-                                                            <td><Translate content="account.member.referrer"/>  &nbsp;
-                                                            (<Link to={`account/${account.referrer_name}/overview`}>{account.referrer_name }</Link>)
+                                                            <td>
+                                                                <Translate content="account.member.referrer" />{" "}
+                                                                &nbsp; (<Link
+                                                                    to={`account/${
+                                                                        account.referrer_name
+                                                                    }/overview`}
+                                                                >
+                                                                    {
+                                                                        account.referrer_name
+                                                                    }
+                                                                </Link>)
+                                                            </td>
+                                                            <td>
+                                                                {referrer_fee}%
                                                             </td>
-                                                            <td>{referrer_fee}%</td>
                                                         </tr>
                                                         <tr>
-                                                            <td><Translate content="account.member.membership_expiration"/> </td>
-                                                            <td>{expiration_date}</td>
+                                                            <td>
+                                                                <Translate content="account.member.membership_expiration" />{" "}
+                                                            </td>
+                                                            <td>
+                                                                {
+                                                                    expiration_date
+                                                                }
+                                                            </td>
                                                         </tr>
                                                     </tbody>
                                                 </table>
 
-                                                <h4 style={{paddingTop: "1rem"}}><Translate content="account.member.fees_cashback"/></h4>
+                                                <h4
+                                                    style={{paddingTop: "1rem"}}
+                                                >
+                                                    <Translate content="account.member.fees_cashback" />
+                                                </h4>
                                                 <table className="table key-value-table">
-                                                    <Statistics stat_object={account.statistics}/>
+                                                    <Statistics
+                                                        stat_object={
+                                                            account.statistics
+                                                        }
+                                                    />
                                                 </table>
                                             </div>
                                         </div>
@@ -169,10 +282,31 @@ class AccountMembership extends React.Component {
                                                     referrerFee={referrer_fee}
                                                     registrarFee={registrar_fee}
                                                     lifetimeFee={lifetime_fee}
-                                                    referrerTotalFee={referrer_total_fee}
-                                                    maintenanceInterval={gprops.getIn(["parameters", "maintenance_interval"])}
-                                                    vestingThreshold={{amount: gprops.getIn(["parameters", "cashback_vesting_threshold"]) , asset: core_asset}}
-                                                    vestingPeriod={gprops.getIn(["parameters", "cashback_vesting_period_seconds"]) /60/60/24}
+                                                    referrerTotalFee={
+                                                        referrer_total_fee
+                                                    }
+                                                    maintenanceInterval={gprops.getIn(
+                                                        [
+                                                            "parameters",
+                                                            "maintenance_interval"
+                                                        ]
+                                                    )}
+                                                    vestingThreshold={{
+                                                        amount: gprops.getIn([
+                                                            "parameters",
+                                                            "cashback_vesting_threshold"
+                                                        ]),
+                                                        asset: core_asset
+                                                    }}
+                                                    vestingPeriod={
+                                                        gprops.getIn([
+                                                            "parameters",
+                                                            "cashback_vesting_period_seconds"
+                                                        ]) /
+                                                        60 /
+                                                        60 /
+                                                        24
+                                                    }
                                                 />
                                             </div>
                                         </div>
diff --git a/app/components/Account/AccountPermissionsList.jsx b/app/components/Account/AccountPermissionsList.jsx
index b102c1c3a4..09730d246d 100644
--- a/app/components/Account/AccountPermissionsList.jsx
+++ b/app/components/Account/AccountPermissionsList.jsx
@@ -43,16 +43,24 @@ class AccountPermissionRow extends React.Component {
         if (this.props.account) {
             name = this.props.account.get("name");
             item_id = this.props.account.get("id");
-            name_or_key = <Link to={`/account/${name}/permissions`}>{name}</Link>;
+            name_or_key = (
+                <Link to={`/account/${name}/permissions`}>{name}</Link>
+            );
         } else if (pubKey) {
             name = item_id = pubKey;
-            name_or_key = <PrivateKeyView pubkey={pubKey}>{pubKey}</PrivateKeyView>
+            name_or_key = (
+                <PrivateKeyView pubkey={pubKey}>{pubKey}</PrivateKeyView>
+            );
             suffix = "_keys";
             has_private = keys.has(pubKey);
         } else if (this.props.address) {
             pubKey = this._lookUpPubKeyForAddress(this.props.address);
             item_id = this.props.address;
-            name_or_key = !pubKey ? this.props.address : <PrivateKeyView pubkey={pubKey}>{pubKey}</PrivateKeyView>;
+            name_or_key = !pubKey ? (
+                this.props.address
+            ) : (
+                <PrivateKeyView pubkey={pubKey}>{pubKey}</PrivateKeyView>
+            );
             suffix = "_addresses";
             has_private = keys.has(pubKey);
         }
@@ -60,21 +68,34 @@ class AccountPermissionRow extends React.Component {
         return (
             <tr key={name}>
                 <td>
-                { this.props.account ?
-                    <AccountImage size={{height: 30, width: 30}} account={name}/>
-                : pubKey ? (
-                    <div className="account-image">
-                        <PrivateKeyView pubkey={pubKey}>
-                            <Icon name="key" size="4x"/>
-                        </PrivateKeyView>
-                    </div>)
-                : null}
+                    {this.props.account ? (
+                        <AccountImage
+                            size={{height: 30, width: 30}}
+                            account={name}
+                        />
+                    ) : pubKey ? (
+                        <div className="account-image">
+                            <PrivateKeyView pubkey={pubKey}>
+                                <Icon name="key" size="4x" />
+                            </PrivateKeyView>
+                        </div>
+                    ) : null}
+                </td>
+                <td className={(has_private ? "my-key" : "") + " pub-key"}>
+                    {name_or_key}
                 </td>
-                <td className={(has_private ? "my-key" : "") + " pub-key"}>{name_or_key}</td>
                 <td>{this.props.weights[item_id]}</td>
                 <td>
-                    <button className="button" onClick={this.props.onRemoveItem.bind(this, item_id, suffix)}>
-                        <Translate content="account.votes.remove_witness"/></button>
+                    <button
+                        className="button"
+                        onClick={this.props.onRemoveItem.bind(
+                            this,
+                            item_id,
+                            suffix
+                        )}
+                    >
+                        <Translate content="account.votes.remove_witness" />
+                    </button>
                 </td>
             </tr>
         );
@@ -82,7 +103,6 @@ class AccountPermissionRow extends React.Component {
 }
 
 class AccountPermissionsList extends React.Component {
-
     static propTypes = {
         accounts: ChainTypes.ChainObjectsList,
         onAddItem: React.PropTypes.func.isRequired,
@@ -101,7 +121,7 @@ class AccountPermissionsList extends React.Component {
             item_name_input: "",
             weight_input: "",
             error: null
-        }
+        };
         this.onItemChange = this.onItemChange.bind(this);
         this.onItemAccountChange = this.onItemAccountChange.bind(this);
         this.onAddItem = this.onAddItem.bind(this);
@@ -113,10 +133,10 @@ class AccountPermissionsList extends React.Component {
 
     onItemAccountChange(selected_item) {
         this.setState({selected_item, error: null});
-        if(selected_item && this.props.validateAccount) {
+        if (selected_item && this.props.validateAccount) {
             let res = this.props.validateAccount(selected_item);
-            if(res === null) return;
-            if(typeof(res) === "string") this.setState({error: res});
+            if (res === null) return;
+            if (typeof res === "string") this.setState({error: res});
             else res.then(error => this.setState({error: error}));
         }
     }
@@ -127,7 +147,7 @@ class AccountPermissionsList extends React.Component {
     }
 
     onAddItem(item) {
-        if(!item) return;
+        if (!item) return;
         let next_state = {
             selected_item: null,
             item_name_input: "",
@@ -135,42 +155,77 @@ class AccountPermissionsList extends React.Component {
             error: null
         };
         this.setState(next_state);
-        let item_value = typeof(item) === "string" ? item : item.get("id");
+        let item_value = typeof item === "string" ? item : item.get("id");
         this.props.onAddItem(item_value, this.state.weight_input);
     }
 
     onWeightKeyDown(event) {
-        if (event.keyCode === 13 && this.state.weight_input && this.state.selected_item)
+        if (
+            event.keyCode === 13 &&
+            this.state.weight_input &&
+            this.state.selected_item
+        )
             this.onAddItem(this.state.selected_item);
     }
 
     render() {
-        var key = 0
-        let account_rows = this.props.accounts.filter(i => {
-            if (!i) return false;
-            //if (this.state.item_name_input) return i.get("name").indexOf(this.state.item_name_input) !== -1;
-            return true;
-        }).sort((a,b) =>{
-                 if( a.get("name") > b.get("name") ) return 1;
-                 else if( a.get("name") < b.get("name") ) return -1;
-                 return 0;
-                 })
-           .map(i => {
-            return (<AccountPermissionRow key={key++} account={i} weights={this.props.weights} onRemoveItem={this.props.onRemoveItem}/>)
-           });
+        var key = 0;
+        let account_rows = this.props.accounts
+            .filter(i => {
+                if (!i) return false;
+                //if (this.state.item_name_input) return i.get("name").indexOf(this.state.item_name_input) !== -1;
+                return true;
+            })
+            .sort((a, b) => {
+                if (a.get("name") > b.get("name")) return 1;
+                else if (a.get("name") < b.get("name")) return -1;
+                return 0;
+            })
+            .map(i => {
+                return (
+                    <AccountPermissionRow
+                        key={key++}
+                        account={i}
+                        weights={this.props.weights}
+                        onRemoveItem={this.props.onRemoveItem}
+                    />
+                );
+            });
 
         let key_rows = this.props.keys.map(k => {
-            return (<AccountPermissionRow key={key++} pubkey={k} weights={this.props.weights} onRemoveItem={this.props.onRemoveItem}/>)
+            return (
+                <AccountPermissionRow
+                    key={key++}
+                    pubkey={k}
+                    weights={this.props.weights}
+                    onRemoveItem={this.props.onRemoveItem}
+                />
+            );
         });
 
         let address_rows = this.props.addresses.map(k => {
-            return (<AccountPermissionRow key={key++} address={k} weights={this.props.weights} onRemoveItem={this.props.onRemoveItem}/>)
+            return (
+                <AccountPermissionRow
+                    key={key++}
+                    address={k}
+                    weights={this.props.weights}
+                    onRemoveItem={this.props.onRemoveItem}
+                />
+            );
         });
 
         let error = this.state.error;
-        if(!error && this.state.selected_item && this.props.accounts.indexOf(this.state.selected_item) !== -1)
+        if (
+            !error &&
+            this.state.selected_item &&
+            this.props.accounts.indexOf(this.state.selected_item) !== -1
+        )
             error = counterpart.translate("account.perm.warning3");
-        if(!error && this.state.item_name_input && this.props.keys.indexOf(this.state.item_name_input) !== -1)
+        if (
+            !error &&
+            this.state.item_name_input &&
+            this.props.keys.indexOf(this.state.item_name_input) !== -1
+        )
             error = counterpart.translate("account.perm.warning4");
 
         let cw = ["10%", "70%", "30%", "10%"];
@@ -192,12 +247,15 @@ class AccountPermissionsList extends React.Component {
                     disableActionButton={!this.state.weight_input}
                     allowUppercase={true}
                 >
-                    <input value={this.state.weight_input}
+                    <input
+                        value={this.state.weight_input}
                         onChange={this.onWeightChanged.bind(this)}
                         className="weight-input"
                         type="number"
                         autoComplete="off"
-                        placeholder={counterpart.translate("account.perm.weight")}
+                        placeholder={counterpart.translate(
+                            "account.perm.weight"
+                        )}
                         onKeyDown={this.onWeightKeyDown.bind(this)}
                         tabIndex={this.props.tabIndex + 1}
                     />
@@ -206,24 +264,29 @@ class AccountPermissionsList extends React.Component {
                 <div style={{paddingTop: "2rem"}}>
                     <table className="table">
                         <thead>
-                        <tr>
-                            <th style={{width: cw[0]}}></th>
-                            <th style={{width: cw[1]}}><Translate content="account.perm.acct_or_key" /></th>
-                            <th style={{width: cw[2]}}><Translate content="account.perm.weight" /></th>
-                            <th style={{width: cw[3]}}><Translate content="account.perm.action" /></th>
-                        </tr>
+                            <tr>
+                                <th style={{width: cw[0]}} />
+                                <th style={{width: cw[1]}}>
+                                    <Translate content="account.perm.acct_or_key" />
+                                </th>
+                                <th style={{width: cw[2]}}>
+                                    <Translate content="account.perm.weight" />
+                                </th>
+                                <th style={{width: cw[3]}}>
+                                    <Translate content="account.perm.action" />
+                                </th>
+                            </tr>
                         </thead>
                         <tbody>
-                        {account_rows}
-                        {key_rows}
-                        {address_rows}
+                            {account_rows}
+                            {key_rows}
+                            {address_rows}
                         </tbody>
                     </table>
                 </div>
             </div>
         );
     }
-
 }
 
 export default BindToChainState(AccountPermissionsList, {keep_updating: true});
diff --git a/app/components/Account/AccountPermissionsMigrate.jsx b/app/components/Account/AccountPermissionsMigrate.jsx
index 43730bfe65..f11c337d46 100644
--- a/app/components/Account/AccountPermissionsMigrate.jsx
+++ b/app/components/Account/AccountPermissionsMigrate.jsx
@@ -3,30 +3,38 @@ import PasswordInput from "./../Forms/PasswordInput";
 import WalletDb from "stores/WalletDb";
 import Translate from "react-translate-component";
 import counterpart from "counterpart";
-import { key } from "bitsharesjs/es";
+import {key} from "bitsharesjs/es";
 
 export default class AccountPermissionsMigrate extends React.Component {
-
     constructor() {
         super();
         this.state = {
-            validPassword : false,
+            validPassword: false,
             pass: null,
-            generatedPassword: "P" + key.get_random_key().toWif().toString()
+            generatedPassword:
+                "P" +
+                key
+                    .get_random_key()
+                    .toWif()
+                    .toString()
         };
     }
 
-    onSubmit() {
-
-    }
+    onSubmit() {}
 
     onPasswordChange(e) {
         let {valid} = e;
         let name = this.props.account.get("name");
 
-        const active = !valid ? null : WalletDb.generateKeyFromPassword(name, "active", e.value).pubKey;
-        const owner = !valid ? null : WalletDb.generateKeyFromPassword(name, "owner", e.value).pubKey;
-        const memo = !valid ? null : WalletDb.generateKeyFromPassword(name, "active", e.value).pubKey;
+        const active = !valid
+            ? null
+            : WalletDb.generateKeyFromPassword(name, "active", e.value).pubKey;
+        const owner = !valid
+            ? null
+            : WalletDb.generateKeyFromPassword(name, "owner", e.value).pubKey;
+        const memo = !valid
+            ? null
+            : WalletDb.generateKeyFromPassword(name, "active", e.value).pubKey;
         this.setState({validPassword: e.valid, pass: e.value});
         this.props.onSetPasswordKeys({active, owner, memo});
     }
@@ -44,84 +52,161 @@ export default class AccountPermissionsMigrate extends React.Component {
 
     _onUseKey(role, remove = false) {
         if (remove) {
-            this.props[role === "active" ? "onRemoveActive" : "onRemoveOwner"](this.props[role], "_keys");
+            this.props[role === "active" ? "onRemoveActive" : "onRemoveOwner"](
+                this.props[role],
+                "_keys"
+            );
         } else if (this.props[role]) {
             const weights = {
-                active: this.props.account.getIn(["active", "weight_threshold"]),
+                active: this.props.account.getIn([
+                    "active",
+                    "weight_threshold"
+                ]),
                 owner: this.props.account.getIn(["owner", "weight_threshold"])
             };
-            console.log("key", this.props[role], "weights", weights, "weight of role:", weights[role]);
-            this.props[role === "active" ? "onAddActive" : role === "owner" ? "onAddOwner" : "onSetMemo"](this.props[role], weights[role]);
+            console.log(
+                "key",
+                this.props[role],
+                "weights",
+                weights,
+                "weight of role:",
+                weights[role]
+            );
+            this.props[
+                role === "active"
+                    ? "onAddActive"
+                    : role === "owner" ? "onAddOwner" : "onSetMemo"
+            ](this.props[role], weights[role]);
         }
     }
 
     render() {
-        let activeInUse = this.checkKeyUse(this.props.active && this.props.active, "active");
-        let ownerInUse = this.checkKeyUse(this.props.owner && this.props.owner, "owner");
-        let memoInUse = this.checkKeyUse(this.props.memo && this.props.memo, "memo");
+        let activeInUse = this.checkKeyUse(
+            this.props.active && this.props.active,
+            "active"
+        );
+        let ownerInUse = this.checkKeyUse(
+            this.props.owner && this.props.owner,
+            "owner"
+        );
+        let memoInUse = this.checkKeyUse(
+            this.props.memo && this.props.memo,
+            "memo"
+        );
 
         let useText = counterpart.translate("account.perm.use_text");
         let removeText = counterpart.translate("account.perm.remove_text");
 
         return (
-                <div>
-                    <p style={{maxWidth: "800px"}}><Translate content="account.perm.password_model_1" /></p>
-
-                    <p style={{maxWidth: "800px"}}><Translate content="wallet.password_model_1" /></p>
-                    <p style={{maxWidth: "800px"}}><Translate unsafe content="wallet.password_model_2" /></p>
-
-                    <div className="divider" />
-
-                    <form
-                        style={{maxWidth: "40rem"}}
-                        onSubmit={this.onSubmit.bind(this)}
-                        noValidate
+            <div>
+                <p style={{maxWidth: "800px"}}>
+                    <Translate content="account.perm.password_model_1" />
+                </p>
+
+                <p style={{maxWidth: "800px"}}>
+                    <Translate content="wallet.password_model_1" />
+                </p>
+                <p style={{maxWidth: "800px"}}>
+                    <Translate unsafe content="wallet.password_model_2" />
+                </p>
+
+                <div className="divider" />
+
+                <form
+                    style={{maxWidth: "40rem"}}
+                    onSubmit={this.onSubmit.bind(this)}
+                    noValidate
+                >
+                    <label className="left-label">
+                        <Translate content="wallet.generated" />
+                    </label>
+                    <p>{this.state.generatedPassword}</p>
+
+                    <p style={{fontWeight: "bold"}}>
+                        <Translate content="account.perm.password_model_2" />
+                    </p>
+
+                    <PasswordInput
+                        ref="password"
+                        confirmation={true}
+                        onChange={this.onPasswordChange.bind(this)}
+                        noLabel
+                        passwordLength={12}
+                        checkStrength
+                    />
+                </form>
+
+                <table className="table">
+                    <tbody>
+                        <tr className={activeInUse ? "in-use" : ""}>
+                            <td>
+                                <Translate content="account.perm.new_active" />:
+                            </td>
+                            <td>{this.props.active}</td>
+                            <td className="text-right">
+                                <div
+                                    className="button"
+                                    onClick={this._onUseKey.bind(
+                                        this,
+                                        "active",
+                                        activeInUse
+                                    )}
+                                >
+                                    {activeInUse ? removeText : useText}
+                                </div>
+                            </td>
+                        </tr>
+                        <tr className={ownerInUse ? "in-use" : ""}>
+                            <td>
+                                <Translate content="account.perm.new_owner" />:
+                            </td>
+                            <td>{this.props.owner}</td>
+                            <td className="text-right">
+                                <div
+                                    className="button"
+                                    onClick={this._onUseKey.bind(
+                                        this,
+                                        "owner",
+                                        ownerInUse
+                                    )}
+                                >
+                                    {ownerInUse ? removeText : useText}
+                                </div>
+                            </td>
+                        </tr>
+                        <tr className={memoInUse ? "in-use" : ""}>
+                            <td>
+                                <Translate content="account.perm.new_memo" />:
+                            </td>
+                            <td>{this.props.memo}</td>
+                            <td className="text-right">
+                                <div
+                                    className="button"
+                                    style={{
+                                        visibility: memoInUse ? "hidden" : ""
+                                    }}
+                                    onClick={this._onUseKey.bind(
+                                        this,
+                                        "memo",
+                                        memoInUse
+                                    )}
+                                >
+                                    {useText}
+                                </div>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                {memoInUse ? (
+                    <p
+                        style={{maxWidth: "800px", paddingTop: 10}}
+                        className="has-error"
                     >
-                        <label className="left-label">
-                            <Translate content="wallet.generated" />
-                        </label>
-                        <p>{this.state.generatedPassword}</p>
-                        
-                        <p style={{fontWeight: "bold"}}><Translate content="account.perm.password_model_2" /></p>
-
-                        <PasswordInput
-                            ref="password"
-                            confirmation={true}
-                            onChange={this.onPasswordChange.bind(this)}
-                            noLabel
-                            passwordLength={12}
-                            checkStrength
-                        />
-                    </form>
-
-                    <table className="table">
-                        <tbody>
-                            <tr className={activeInUse ? "in-use" : ""}>
-                                <td><Translate content="account.perm.new_active" />:</td>
-                                <td>{this.props.active}</td>
-                                <td className="text-right">
-                                    <div className="button" onClick={this._onUseKey.bind(this, "active", activeInUse)}>{activeInUse ? removeText : useText}</div>
-                                </td>
-                            </tr>
-                            <tr className={ownerInUse ? "in-use" : ""}>
-                                <td><Translate content="account.perm.new_owner" />:</td>
-                                <td>{this.props.owner}</td>
-                                <td className="text-right"><div className="button" onClick={this._onUseKey.bind(this, "owner", ownerInUse)}>{ownerInUse ? removeText : useText}</div></td>
-                            </tr>
-                            <tr className={memoInUse ? "in-use" : ""}>
-                                <td><Translate content="account.perm.new_memo" />:</td>
-                                <td>{this.props.memo}</td>
-                                <td className="text-right">
-                                    <div className="button" style={{visibility: memoInUse ? "hidden" : ""}} onClick={this._onUseKey.bind(this, "memo", memoInUse)}>{useText}</div>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-
-                    {memoInUse ? <p style={{maxWidth: "800px", paddingTop: 10}} className="has-error"><Translate content="account.perm.memo_warning" /></p> : null}
-
-
-                </div>
+                        <Translate content="account.perm.memo_warning" />
+                    </p>
+                ) : null}
+            </div>
         );
     }
 }
diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx
index a7af1a4cc2..f29c5de5e7 100644
--- a/app/components/Account/AccountSelector.jsx
+++ b/app/components/Account/AccountSelector.jsx
@@ -24,7 +24,6 @@ import cnames from "classnames";
  */
 
 class AccountSelector extends React.Component {
-
     static propTypes = {
         label: React.PropTypes.string, // a translation key for the label
         error: React.PropTypes.element, // the error message override
@@ -50,26 +49,30 @@ class AccountSelector extends React.Component {
     }
 
     getError() {
-
         let scamMessage = accountUtils.isKnownScammer(this.props.accountName);
 
         let error = this.props.error;
-        if (!error && this.props.accountName && !this.getNameType(this.props.accountName))
+        if (
+            !error &&
+            this.props.accountName &&
+            !this.getNameType(this.props.accountName)
+        )
             error = counterpart.translate("account.errors.invalid");
 
         return scamMessage || error;
     }
 
     getNameType(value) {
-        if(!value) return null;
-        if(value[0] === "#" && utils.is_object_id("1.2." + value.substring(1))) return "id";
-        if(ChainValidation.is_account_name(value, true)) return "name";
-        if(this.props.allowPubKey && PublicKey.fromPublicKeyString(value)) return "pubkey";
+        if (!value) return null;
+        if (value[0] === "#" && utils.is_object_id("1.2." + value.substring(1)))
+            return "id";
+        if (ChainValidation.is_account_name(value, true)) return "name";
+        if (this.props.allowPubKey && PublicKey.fromPublicKeyString(value))
+            return "pubkey";
         return null;
     }
 
     onInputChanged(event) {
-
         let value = null;
         if (typeof event === "string") {
             value = event;
@@ -81,10 +84,13 @@ class AccountSelector extends React.Component {
             value = value.toLowerCase();
         }
         // If regex matches ^.*#/account/account-name/.*$, parse out account-name
-        let newValue = value.replace("#", "").match(/(?:\/account\/)(.*)(?:\/overview)/);
+        let newValue = value
+            .replace("#", "")
+            .match(/(?:\/account\/)(.*)(?:\/overview)/);
         if (newValue) value = newValue[1];
 
-        if (this.props.onChange && value !== this.props.accountName) this.props.onChange(value);
+        if (this.props.onChange && value !== this.props.accountName)
+            this.props.onChange(value);
     }
 
     onKeyDown(event) {
@@ -92,12 +98,16 @@ class AccountSelector extends React.Component {
     }
 
     componentDidMount() {
-        if(this.props.onAccountChanged && this.props.account)
+        if (this.props.onAccountChanged && this.props.account)
             this.props.onAccountChanged(this.props.account);
     }
 
     componentWillReceiveProps(newProps) {
-        if((this.props.onAccountChanged && newProps.account) && newProps.account !== this.props.account)
+        if (
+            this.props.onAccountChanged &&
+            newProps.account &&
+            newProps.account !== this.props.account
+        )
             this.props.onAccountChanged(newProps.account);
     }
 
@@ -113,9 +123,12 @@ class AccountSelector extends React.Component {
 
     onAction(e) {
         e.preventDefault();
-        if(this.props.onAction && !this.getError() && !this.props.disableActionButton) {
-            if (this.props.account)
-                this.props.onAction(this.props.account);
+        if (
+            this.props.onAction &&
+            !this.getError() &&
+            !this.props.disableActionButton
+        ) {
+            if (this.props.account) this.props.onAction(this.props.account);
             else if (this.getNameType(this.props.accountName) === "pubkey")
                 this.props.onAction(this.props.accountName);
         }
@@ -129,114 +142,246 @@ class AccountSelector extends React.Component {
         if (this.props.allowPubKey) {
             if (type === "pubkey") lookup_display = "Public Key";
         } else if (this.props.account) {
-            if(type === "name") lookup_display = "#" + this.props.account.get("id").substring(4);
-            else if (type === "id") lookup_display = this.props.account.get("name");
-        } else if (!error && this.props.accountName) error = counterpart.translate("account.errors.unknown");
+            if (type === "name")
+                lookup_display =
+                    "#" + this.props.account.get("id").substring(4);
+            else if (type === "id")
+                lookup_display = this.props.account.get("name");
+        } else if (!error && this.props.accountName)
+            error = counterpart.translate("account.errors.unknown");
 
         let member_status = null;
-        let isKnownScammer = accountUtils.isKnownScammer(this.props.accountName);
+        let isKnownScammer = accountUtils.isKnownScammer(
+            this.props.accountName
+        );
         if (this.props.account && !isKnownScammer)
-            member_status = counterpart.translate("account.member." + ChainStore.getAccountMemberStatus(this.props.account));
-        else if(this.props.account && isKnownScammer) {
-            member_status = counterpart.translate("account.member.suspected_scammer");
+            member_status = counterpart.translate(
+                "account.member." +
+                    ChainStore.getAccountMemberStatus(this.props.account)
+            );
+        else if (this.props.account && isKnownScammer) {
+            member_status = counterpart.translate(
+                "account.member.suspected_scammer"
+            );
         }
 
-        let action_class = classnames("button", {"disabled" : !(this.props.account || type === "pubkey") || error || this.props.disableActionButton});
+        let action_class = classnames("button", {
+            disabled:
+                !(this.props.account || type === "pubkey") ||
+                error ||
+                this.props.disableActionButton
+        });
 
         let typeAheadAccounts = [];
 
         let isGreenAccount = false;
-        let lookup_name = this.props.account ? this.props.account.get("name"):"";
+        let lookup_name = this.props.account
+            ? this.props.account.get("name")
+            : "";
 
         if (this.props.typeahead) {
-            this.props.typeahead.map(function(account){
-                typeAheadAccounts.push({id:account,label:account});
+            this.props.typeahead.map(function(account) {
+                typeAheadAccounts.push({id: account, label: account});
             });
 
             isGreenAccount = this.props.typeahead.indexOf(lookup_name) !== -1;
         }
 
-        let typeaheadHasAccount = !!this.props.account ? typeAheadAccounts.reduce((boolean, a) => {
-            return boolean || a.label === this.props.account.get("name");
-        }, false) : false;
+        let typeaheadHasAccount = !!this.props.account
+            ? typeAheadAccounts.reduce((boolean, a) => {
+                  return boolean || a.label === this.props.account.get("name");
+              }, false)
+            : false;
         if (!!this.props.account && !typeaheadHasAccount) {
-            typeAheadAccounts.push({id: this.props.account.get("name"), label: this.props.account.get("name")});
+            typeAheadAccounts.push({
+                id: this.props.account.get("name"),
+                label: this.props.account.get("name")
+            });
         }
 
-        let linked_status = !this.props.accountName ? null : (linkedAccounts.has(this.props.accountName)) ?
-            <span className="tooltip" data-place="top" data-tip={counterpart.translate("tooltip.follow_user")} onClick={this.onUnLinkAccount.bind(this)}><Icon className={""+(isGreenAccount? " green":"")} style={{position:"absolute",top:"-0.15em",right:".2em"}} name="user" /></span>
-            : <span className="tooltip" data-place="top" data-tip={counterpart.translate("tooltip.follow_user_add")} onClick={this.onLinkAccount.bind(this)}><Icon style={{position:"absolute",top:"-0.05em",right:".2em"}} name="plus-circle" /></span>;
+        let linked_status = !this.props.accountName ? null : linkedAccounts.has(
+            this.props.accountName
+        ) ? (
+            <span
+                className="tooltip"
+                data-place="top"
+                data-tip={counterpart.translate("tooltip.follow_user")}
+                onClick={this.onUnLinkAccount.bind(this)}
+            >
+                <Icon
+                    className={"" + (isGreenAccount ? " green" : "")}
+                    style={{
+                        position: "absolute",
+                        top: "-0.15em",
+                        right: ".2em"
+                    }}
+                    name="user"
+                />
+            </span>
+        ) : (
+            <span
+                className="tooltip"
+                data-place="top"
+                data-tip={counterpart.translate("tooltip.follow_user_add")}
+                onClick={this.onLinkAccount.bind(this)}
+            >
+                <Icon
+                    style={{
+                        position: "absolute",
+                        top: "-0.05em",
+                        right: ".2em"
+                    }}
+                    name="plus-circle"
+                />
+            </span>
+        );
 
         return (
             <div className="account-selector" style={this.props.style}>
                 <div className="content-area">
                     {this.props.label ? (
-                    <div className={"header-area" + (this.props.hideImage ? " no-margin" : "")}>
-                        {error && !lookup_display ?
-                            <label className="right-label negative"><span>Unknown Account</span></label> :
-                            <label className={cnames("right-label", isGreenAccount ? "positive" : null, isKnownScammer ? "negative" : null)}>
-                                <span className="tooltip" data-place="top" data-tip={isKnownScammer}>{member_status}</span>&nbsp;
-                                <span style={{marginRight:"1.5em"}}>{lookup_display}</span>
-                                &nbsp;{linked_status}
-                            </label>
-                        }
-                        <Translate className="left-label" component="label" content={this.props.label}/>
-                    </div>) : null}
+                        <div
+                            className={
+                                "header-area" +
+                                (this.props.hideImage ? " no-margin" : "")
+                            }
+                        >
+                            {error && !lookup_display ? (
+                                <label className="right-label negative">
+                                    <span>Unknown Account</span>
+                                </label>
+                            ) : (
+                                <label
+                                    className={cnames(
+                                        "right-label",
+                                        isGreenAccount ? "positive" : null,
+                                        isKnownScammer ? "negative" : null
+                                    )}
+                                >
+                                    <span
+                                        className="tooltip"
+                                        data-place="top"
+                                        data-tip={isKnownScammer}
+                                    >
+                                        {member_status}
+                                    </span>&nbsp;
+                                    <span style={{marginRight: "1.5em"}}>
+                                        {lookup_display}
+                                    </span>
+                                    &nbsp;{linked_status}
+                                </label>
+                            )}
+                            <Translate
+                                className="left-label"
+                                component="label"
+                                content={this.props.label}
+                            />
+                        </div>
+                    ) : null}
                     <div className="input-area">
                         <div className="inline-label input-wrapper">
-                            {type === "pubkey" ? <div className="account-image"><Icon name="key" size="4x"/></div> :
-                            this.props.hideImage ? null : <AccountImage size={{height: this.props.size || 80, width: this.props.size || 80}}
-                                account={this.props.account ? this.props.account.get("name") : null} custom_image={null}/>}
-                                {(typeof this.props.typeahead !== "undefined")?
-                                 <TypeAhead items={typeAheadAccounts}
-                                    style={{textTransform: "lowercase", fontVariant: "initial"}}
+                            {type === "pubkey" ? (
+                                <div className="account-image">
+                                    <Icon name="key" size="4x" />
+                                </div>
+                            ) : this.props.hideImage ? null : (
+                                <AccountImage
+                                    size={{
+                                        height: this.props.size || 80,
+                                        width: this.props.size || 80
+                                    }}
+                                    account={
+                                        this.props.account
+                                            ? this.props.account.get("name")
+                                            : null
+                                    }
+                                    custom_image={null}
+                                />
+                            )}
+                            {typeof this.props.typeahead !== "undefined" ? (
+                                <TypeAhead
+                                    items={typeAheadAccounts}
+                                    style={{
+                                        textTransform: "lowercase",
+                                        fontVariant: "initial"
+                                    }}
                                     name="username"
                                     id="username"
                                     defaultValue={this.props.accountName || ""}
-                                    placeholder={this.props.placeholder || counterpart.translate("account.name")}
+                                    placeholder={
+                                        this.props.placeholder ||
+                                        counterpart.translate("account.name")
+                                    }
                                     ref="user_input"
                                     onSelect={this.onInputChanged.bind(this)}
                                     onChange={this.onInputChanged.bind(this)}
                                     onKeyDown={this.onKeyDown.bind(this)}
                                     tabIndex={this.props.tabIndex}
-                                    inputProps={{placeholder: "Search for an account"}}
+                                    inputProps={{
+                                        placeholder: "Search for an account"
+                                    }}
                                 />
-                            :<input style={{textTransform: "lowercase", fontVariant: "initial"}}
+                            ) : (
+                                <input
+                                    style={{
+                                        textTransform: "lowercase",
+                                        fontVariant: "initial"
+                                    }}
                                     name="username"
                                     id="username"
                                     type="text"
                                     value={this.props.accountName || ""}
-                                    placeholder={this.props.placeholder || counterpart.translate("account.name")}
+                                    placeholder={
+                                        this.props.placeholder ||
+                                        counterpart.translate("account.name")
+                                    }
                                     ref="user_input"
                                     onChange={this.onInputChanged.bind(this)}
                                     onKeyDown={this.onKeyDown.bind(this)}
                                     tabIndex={this.props.tabIndex}
-                                />}
-                                {this.props.dropDownContent ? <div className="form-label select floating-dropdown">
+                                />
+                            )}
+                            {this.props.dropDownContent ? (
+                                <div className="form-label select floating-dropdown">
                                     <FloatingDropdown
                                         entries={this.props.dropDownContent}
-                                        values={this.props.dropDownContent.reduce((map, a) => {if (a) map[a] = a; return map;}, {})}
-                                        singleEntry={this.props.dropDownContent[0]}
+                                        values={this.props.dropDownContent.reduce(
+                                            (map, a) => {
+                                                if (a) map[a] = a;
+                                                return map;
+                                            },
+                                            {}
+                                        )}
+                                        singleEntry={
+                                            this.props.dropDownContent[0]
+                                        }
                                         value={this.props.dropDownValue || ""}
                                         onChange={this.props.onDropdownSelect}
                                     />
-                                </div> : null}
-                                { this.props.children }
-                                { this.props.onAction ? (
-                                    <button className={action_class}
-                                        onClick={this.onAction.bind(this)}>
-                                        <Translate content={this.props.action_label}/></button>
-                                    ) : null }
                                 </div>
-                            </div>
+                            ) : null}
+                            {this.props.children}
+                            {this.props.onAction ? (
+                                <button
+                                    className={action_class}
+                                    onClick={this.onAction.bind(this)}
+                                >
+                                    <Translate
+                                        content={this.props.action_label}
+                                    />
+                                </button>
+                            ) : null}
+                        </div>
+                    </div>
 
-                            {error ? <div className="error-area">
-                                <span>{error}</span>
-                            </div> : null}
+                    {error ? (
+                        <div className="error-area">
+                            <span>{error}</span>
                         </div>
+                    ) : null}
+                </div>
             </div>
         );
-
     }
 }
 
diff --git a/app/components/Account/AccountSignedMessages.jsx b/app/components/Account/AccountSignedMessages.jsx
index 4289db18c8..324654c378 100644
--- a/app/components/Account/AccountSignedMessages.jsx
+++ b/app/components/Account/AccountSignedMessages.jsx
@@ -18,9 +18,8 @@ import SignedMessage from "../Account/SignedMessage";
  *    @author Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
  */
 class AccountSignedMessages extends React.Component {
-
     static propTypes = {
-        account: ChainTypes.ChainAccount.isRequired,
+        account: ChainTypes.ChainAccount.isRequired
     };
 
     constructor(props) {
@@ -39,8 +38,6 @@ class AccountSignedMessages extends React.Component {
         };
     }
 
-
-
     /**
      * Event when user pushes sign button. Memo message and meta will be signed and displayed
      * in the bottom textarea
@@ -54,23 +51,33 @@ class AccountSignedMessages extends React.Component {
             // validate keys are still the same. Better: make public memokey field uneditable
             let storedKey = this.props.account.get("options").get("memo_key");
             if (this.state.tabsm_memo_key !== storedKey) {
-                throw Error(counterpart.translate("account.signedmessages.keymismatch"));
+                throw Error(
+                    counterpart.translate("account.signedmessages.keymismatch")
+                );
             }
 
             // there should be a message entered
             if (this.state.tabsm_message_text) {
-                this._tabSMPopMessage(counterpart.translate("account.signedmessages.signing"), 0);
-                SignedMessageAction.signMessage(this.props.account, this.state.tabsm_message_text).then((res) => {
-                    this.setState({
-                        tabsm_message_signed: res,
-                        tabsm_popup: "" // clear loading message
-                    });
-                }).catch((err) => {
-                    this._tabSMPopMessage(err.message);
-                    this.setState({
-                        tabsm_message_signed: null
+                this._tabSMPopMessage(
+                    counterpart.translate("account.signedmessages.signing"),
+                    0
+                );
+                SignedMessageAction.signMessage(
+                    this.props.account,
+                    this.state.tabsm_message_text
+                )
+                    .then(res => {
+                        this.setState({
+                            tabsm_message_signed: res,
+                            tabsm_popup: "" // clear loading message
+                        });
+                    })
+                    .catch(err => {
+                        this._tabSMPopMessage(err.message);
+                        this.setState({
+                            tabsm_message_signed: null
+                        });
                     });
-                });
             }
         } catch (err) {
             this._tabSMPopMessage(err.message);
@@ -80,25 +87,39 @@ class AccountSignedMessages extends React.Component {
         }
     }
 
-    _tabSMHandleChange(event) { // event for textarea
+    _tabSMHandleChange(event) {
+        // event for textarea
         this.setState({tabsm_message_text: event.target.value});
     }
 
-    _tabSMHandleChangeKey(value) { // event for textfield of public key
+    _tabSMHandleChangeKey(value) {
+        // event for textfield of public key
         this.setState({tabsm_memo_key: value});
     }
 
-    _tabSMCopyToClipBoard(event) { // event when user clicks into the signed message textarea
+    _tabSMCopyToClipBoard(event) {
+        // event when user clicks into the signed message textarea
         if (event.target.value !== "") {
             event.target.focus();
             event.target.select();
 
             try {
                 var successful = document.execCommand("copy");
-                this._tabSMPopMessage(successful ? counterpart.translate("account.signedmessages.copysuccessful") :
-                    counterpart.translate("account.signedmessages.copyunsuccessful"));
+                this._tabSMPopMessage(
+                    successful
+                        ? counterpart.translate(
+                              "account.signedmessages.copysuccessful"
+                          )
+                        : counterpart.translate(
+                              "account.signedmessages.copyunsuccessful"
+                          )
+                );
             } catch (err) {
-                this._tabSMPopMessage(counterpart.translate("account.signedmessages.copyunsuccessful"));
+                this._tabSMPopMessage(
+                    counterpart.translate(
+                        "account.signedmessages.copyunsuccessful"
+                    )
+                );
             }
         }
     }
@@ -109,18 +130,17 @@ class AccountSignedMessages extends React.Component {
      * @param message
      * @param timeout
      */
-    _tabSMPopMessage(message, timeout=3000) {
+    _tabSMPopMessage(message, timeout = 3000) {
         this.setState({
             tabsm_popup: message
         });
 
         if (message !== "" && timeout > 0) {
-            setTimeout(
-                () => {
-                    this.setState({
-                        tabsm_popup: ""
-                    });
-                }, timeout);
+            setTimeout(() => {
+                this.setState({
+                    tabsm_popup: ""
+                });
+            }, timeout);
         }
     }
 
@@ -136,16 +156,22 @@ class AccountSignedMessages extends React.Component {
         // reset to unverified state
         this.setState({
             tabvm_message_signed_and_verified: null,
-            tabvm_verified: false,
+            tabvm_verified: false
         });
 
         // attempt verifying
-        if(this.state.tabvm_message_signed) {
-            this._tabVMPopMessage(counterpart.translate("account.signedmessages.verifying"), 0);
+        if (this.state.tabvm_message_signed) {
+            this._tabVMPopMessage(
+                counterpart.translate("account.signedmessages.verifying"),
+                0
+            );
 
-            setTimeout(() => { // do not block gui
+            setTimeout(() => {
+                // do not block gui
                 try {
-                    let message_signed_and_verified = SignedMessageAction.verifyMemo(this.state.tabvm_message_signed);
+                    let message_signed_and_verified = SignedMessageAction.verifyMemo(
+                        this.state.tabvm_message_signed
+                    );
                     this.setState({
                         tabvm_message_signed_and_verified: message_signed_and_verified,
                         tabvm_verified: true,
@@ -160,14 +186,14 @@ class AccountSignedMessages extends React.Component {
                 }
             }, 0);
         }
-
     }
 
-    _tabVMHandleChange(event) { // onchange event of the input textarea
+    _tabVMHandleChange(event) {
+        // onchange event of the input textarea
         this.setState({
             tabvm_message_signed: event.target.value,
             tabvm_verified: false,
-            tabvm_message_signed_and_verified: null,
+            tabvm_message_signed_and_verified: null
         });
         if (this.state.tabvm_flag_verifyonchange) {
             this._tabVMAction(event);
@@ -180,22 +206,22 @@ class AccountSignedMessages extends React.Component {
      * @param message
      * @param timeout
      */
-    _tabVMPopMessage(message, timeout=3000) {
+    _tabVMPopMessage(message, timeout = 3000) {
         this.setState({
             tabvm_popup: message
         });
 
         if (message !== "" && timeout > 0) {
-            setTimeout(
-                () => {
-                    this.setState({
-                        tabvm_popup: ""
-                    });
-                }, timeout);
+            setTimeout(() => {
+                this.setState({
+                    tabvm_popup: ""
+                });
+            }, timeout);
         }
     }
 
-    _tabVMToggleVerifyOnChange() { // event when the user enables / disables verifying while typing
+    _tabVMToggleVerifyOnChange() {
+        // event when the user enables / disables verifying while typing
         this.setState({
             tabvm_flag_verifyonchange: !this.state.tabvm_flag_verifyonchange
         });
@@ -213,11 +239,15 @@ class AccountSignedMessages extends React.Component {
                             contentClass="grid-content shrink small-vertical medium-horizontal padding"
                             segmented={false}
                         >
-
                             <Tab title="account.signedmessages.signmessage">
-                                <div className="grid-content" style={{overflowX: "hidden"}}>
+                                <div
+                                    className="grid-content"
+                                    style={{overflowX: "hidden"}}
+                                >
                                     <div className="content-block no-margin">
-                                        <h3><Translate content="account.signedmessages.signmessage"/></h3>
+                                        <h3>
+                                            <Translate content="account.signedmessages.signmessage" />
+                                        </h3>
                                     </div>
                                     <PubKeyInput
                                         ref="memo_key"
@@ -225,64 +255,160 @@ class AccountSignedMessages extends React.Component {
                                         label="account.perm.memo_public_key"
                                         placeholder="Public Key"
                                         tabIndex={7}
-                                        onChange={this._tabSMHandleChangeKey.bind(this)}
+                                        onChange={this._tabSMHandleChangeKey.bind(
+                                            this
+                                        )}
                                         disableActionButton={true}
                                     />
-                                    <br/>
-                                    <textarea rows="10" value={this.state.tabsm_message_text} onChange={this._tabSMHandleChange.bind(this)} placeholder={counterpart.translate("account.signedmessages.entermessage")} />
+                                    <br />
+                                    <textarea
+                                        rows="10"
+                                        value={this.state.tabsm_message_text}
+                                        onChange={this._tabSMHandleChange.bind(
+                                            this
+                                        )}
+                                        placeholder={counterpart.translate(
+                                            "account.signedmessages.entermessage"
+                                        )}
+                                    />
                                     <span>
-                                        <button className="button" onClick={this._tabSMSignAction.bind(this)}>
-                                            <Translate content="account.signedmessages.sign"/>
+                                        <button
+                                            className="button"
+                                            onClick={this._tabSMSignAction.bind(
+                                                this
+                                            )}
+                                        >
+                                            <Translate content="account.signedmessages.sign" />
                                         </button>
-                                        <text style={{color: "gray"}}>{this.state.tabsm_popup}</text>
+                                        <text style={{color: "gray"}}>
+                                            {this.state.tabsm_popup}
+                                        </text>
                                     </span>
-                                    <br/>
-                                    <br/>
-                                    <textarea rows="14"
-                                              value={this.state.tabsm_message_signed}
-                                              style={{editable: false}}
-                                              placeholder={counterpart.translate("account.signedmessages.automaticcreation")}
-                                              onClick={this._tabSMCopyToClipBoard.bind(this)}  />
+                                    <br />
+                                    <br />
+                                    <textarea
+                                        rows="14"
+                                        value={this.state.tabsm_message_signed}
+                                        style={{editable: false}}
+                                        placeholder={counterpart.translate(
+                                            "account.signedmessages.automaticcreation"
+                                        )}
+                                        onClick={this._tabSMCopyToClipBoard.bind(
+                                            this
+                                        )}
+                                    />
                                 </div>
                             </Tab>
 
                             <Tab title="account.signedmessages.verifymessage">
-                                <div className="grid-content" style={{overflowX: "hidden"}}>
+                                <div
+                                    className="grid-content"
+                                    style={{overflowX: "hidden"}}
+                                >
                                     <div className="content-block no-margin">
-                                        <h3><Translate content="account.signedmessages.verifymessage"/></h3>
-                                        <div style={{float: "right", marginTop: "0.1em", marginBottom: "0.5em"}}>
-                                            <table><tr><td><label><Translate content="account.signedmessages.verifyonchange"/></label></td><td>
-                                                <div className="switch" onClick={this._tabVMToggleVerifyOnChange.bind(this)}>
-                                                    <input type="checkbox" checked={this.state.tabvm_flag_verifyonchange} value={counterpart.translate("account.signedmessages.verifyonchange")} />
-                                                    <label />
-                                                </div></td></tr></table>
+                                        <h3>
+                                            <Translate content="account.signedmessages.verifymessage" />
+                                        </h3>
+                                        <div
+                                            style={{
+                                                float: "right",
+                                                marginTop: "0.1em",
+                                                marginBottom: "0.5em"
+                                            }}
+                                        >
+                                            <table>
+                                                <tr>
+                                                    <td>
+                                                        <label>
+                                                            <Translate content="account.signedmessages.verifyonchange" />
+                                                        </label>
+                                                    </td>
+                                                    <td>
+                                                        <div
+                                                            className="switch"
+                                                            onClick={this._tabVMToggleVerifyOnChange.bind(
+                                                                this
+                                                            )}
+                                                        >
+                                                            <input
+                                                                type="checkbox"
+                                                                checked={
+                                                                    this.state
+                                                                        .tabvm_flag_verifyonchange
+                                                                }
+                                                                value={counterpart.translate(
+                                                                    "account.signedmessages.verifyonchange"
+                                                                )}
+                                                            />
+                                                            <label />
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            </table>
                                         </div>
                                     </div>
-                                    <textarea rows="10" value={this.state.tabvm_message_signed} onChange={this._tabVMHandleChange.bind(this)} placeholder={counterpart.translate("account.signedmessages.entermessage")} />
+                                    <textarea
+                                        rows="10"
+                                        value={this.state.tabvm_message_signed}
+                                        onChange={this._tabVMHandleChange.bind(
+                                            this
+                                        )}
+                                        placeholder={counterpart.translate(
+                                            "account.signedmessages.entermessage"
+                                        )}
+                                    />
                                     <span>
-                                        <button className="button" onClick={this._tabVMAction.bind(this)}>
-                                            <Translate content="account.signedmessages.verify"/>
+                                        <button
+                                            className="button"
+                                            onClick={this._tabVMAction.bind(
+                                                this
+                                            )}
+                                        >
+                                            <Translate content="account.signedmessages.verify" />
                                         </button>
-                                        <text style={{color: "gray"}}>{this.state.tabvm_popup}</text>
-                                        {this.state.tabvm_verified !== null &&
-                                        <div style={{float: "right"}}>
-                                            Message is:
-                                            <div
-                                                style={{backgroundColor: this.state.tabvm_verified ? "green" : "red"}}>
-                                                <label>{this.state.tabvm_verified ? "verified" : "not verified"}</label>
+                                        <text style={{color: "gray"}}>
+                                            {this.state.tabvm_popup}
+                                        </text>
+                                        {this.state.tabvm_verified !== null && (
+                                            <div style={{float: "right"}}>
+                                                Message is:
+                                                <div
+                                                    style={{
+                                                        backgroundColor: this
+                                                            .state
+                                                            .tabvm_verified
+                                                            ? "green"
+                                                            : "red"
+                                                    }}
+                                                >
+                                                    <label>
+                                                        {this.state
+                                                            .tabvm_verified
+                                                            ? "verified"
+                                                            : "not verified"}
+                                                    </label>
+                                                </div>
                                             </div>
-                                        </div>
-                                        }
-                                        {((this.state.tabvm_verified && this.state.tabvm_message_signed_and_verified !== null) || this.state.tabvm_flag_verifyonchange) &&
-                                        <div>
-                                            <br />
-                                            <SignedMessage message={this.state.tabvm_message_signed}/>
-                                        </div>
-                                        }
+                                        )}
+                                        {((this.state.tabvm_verified &&
+                                            this.state
+                                                .tabvm_message_signed_and_verified !==
+                                                null) ||
+                                            this.state
+                                                .tabvm_flag_verifyonchange) && (
+                                            <div>
+                                                <br />
+                                                <SignedMessage
+                                                    message={
+                                                        this.state
+                                                            .tabvm_message_signed
+                                                    }
+                                                />
+                                            </div>
+                                        )}
                                     </span>
                                 </div>
                             </Tab>
-
                         </Tabs>
                     </div>
                 </div>
diff --git a/app/components/Account/AccountTreemap.jsx b/app/components/Account/AccountTreemap.jsx
index 44fd7a1042..8144960d81 100644
--- a/app/components/Account/AccountTreemap.jsx
+++ b/app/components/Account/AccountTreemap.jsx
@@ -15,7 +15,6 @@ Treemap(ReactHighcharts.Highcharts);
 Heatmap(ReactHighcharts.Highcharts);
 
 class AccountTreemap extends React.Component {
-
     static propTypes = {
         assets: ChainTypes.ChainAssetsList,
         preferredAsset: ChainTypes.ChainAsset.isRequired
@@ -24,7 +23,7 @@ class AccountTreemap extends React.Component {
     static defaultProps = {
         assets: [],
         preferredAsset: "1.3.0"
-    }
+    };
 
     // shouldComponentUpdate(nextProps) {
     //     return (
@@ -34,15 +33,23 @@ class AccountTreemap extends React.Component {
     // }
 
     render() {
-        let {balanceObjects, core_asset, marketStats, preferredAsset} = this.props;
+        let {
+            balanceObjects,
+            core_asset,
+            marketStats,
+            preferredAsset
+        } = this.props;
 
         let accountBalances = null;
 
         if (balanceObjects && balanceObjects.length > 0) {
             let totalValue = 0;
-            accountBalances = balanceObjects.forEach((balance) => {
+            accountBalances = balanceObjects.forEach(balance => {
                 if (!balance) return;
-                let balanceObject = typeof(balance) == "string" ? ChainStore.getObject(balance) : balance;
+                let balanceObject =
+                    typeof balance == "string"
+                        ? ChainStore.getObject(balance)
+                        : balance;
                 let asset_type = balanceObject.get("asset_type");
                 let asset = ChainStore.getAsset(asset_type);
                 if (!asset || !preferredAsset) return;
@@ -57,49 +64,68 @@ class AccountTreemap extends React.Component {
                 );
 
                 if (!eqValue) return;
-                const precision = utils.get_asset_precision(preferredAsset.get("precision"));
-                totalValue += (eqValue / precision);
-            });
-
-            accountBalances = balanceObjects.map((balance, index) => {
-                if (!balance) return null;
-                let balanceObject = typeof(balance) == "string" ? ChainStore.getObject(balance) : balance;
-                let asset_type = balanceObject.get("asset_type");
-                let asset = ChainStore.getAsset(asset_type);
-                if (!asset) return null;
-                let amount = Number(balanceObject.get("balance"));
-
-                const eqValue = MarketUtils.convertValue(
-                    amount,
-                    preferredAsset,
-                    asset,
-                    true,
-                    marketStats,
-                    core_asset
+                const precision = utils.get_asset_precision(
+                    preferredAsset.get("precision")
                 );
+                totalValue += eqValue / precision;
+            });
 
-                if (!eqValue) { return null; }
+            accountBalances = balanceObjects
+                .map((balance, index) => {
+                    if (!balance) return null;
+                    let balanceObject =
+                        typeof balance == "string"
+                            ? ChainStore.getObject(balance)
+                            : balance;
+                    let asset_type = balanceObject.get("asset_type");
+                    let asset = ChainStore.getAsset(asset_type);
+                    if (!asset) return null;
+                    let amount = Number(balanceObject.get("balance"));
+
+                    const eqValue = MarketUtils.convertValue(
+                        amount,
+                        preferredAsset,
+                        asset,
+                        true,
+                        marketStats,
+                        core_asset
+                    );
+
+                    if (!eqValue) {
+                        return null;
+                    }
 
-                const precision = utils.get_asset_precision(preferredAsset.get("precision"));
-                const finalValue = eqValue / precision;
-                const percent = (finalValue / totalValue * 100);
+                    const precision = utils.get_asset_precision(
+                        preferredAsset.get("precision")
+                    );
+                    const finalValue = eqValue / precision;
+                    const percent = finalValue / totalValue * 100;
 
-                /*
+                    /*
                 * Filter out assets that make up a small percentage of
                 * the total value of the account
                 */
-                if (percent < 0.5) return null;
-
-                return finalValue >= 1 ? {
-                    name: `${asset.get("symbol")} (${totalValue === 0 ? 0 : percent.toFixed(2)}%)`,
-                    value: finalValue,
-                    color: ReactHighcharts.Highcharts.getOptions().colors[index]
-                } : null;
-
-            }).filter(n => !!n);
+                    if (percent < 0.5) return null;
+
+                    return finalValue >= 1
+                        ? {
+                              name: `${asset.get("symbol")} (${
+                                  totalValue === 0 ? 0 : percent.toFixed(2)
+                              }%)`,
+                              value: finalValue,
+                              color: ReactHighcharts.Highcharts.getOptions()
+                                  .colors[index]
+                          }
+                        : null;
+                })
+                .filter(n => !!n);
         }
 
-        if (accountBalances && accountBalances.length === 1 && accountBalances[0].value === 0) {
+        if (
+            accountBalances &&
+            accountBalances.length === 1 &&
+            accountBalances[0].value === 0
+        ) {
             accountBalances = null;
         }
 
@@ -127,31 +153,42 @@ class AccountTreemap extends React.Component {
                     animation: false,
                     tooltip: {
                         pointFormatter: function() {
-                            return `<b>${this.name}</b>: ${ReactHighcharts.Highcharts.numberFormat(this.value, 0)} ${preferredAsset.get("symbol")}`;
+                            return `<b>${
+                                this.name
+                            }</b>: ${ReactHighcharts.Highcharts.numberFormat(
+                                this.value,
+                                0
+                            )} ${preferredAsset.get("symbol")}`;
                         }
                     }
                 }
             },
-            series: [{
-                type: "treemap",
-                levels: [{
-                    level: 1,
-                    layoutAlgorithm: "sliceAndDice",
-                    dataLabels: {
-                        enabled: true,
-                        align: "center",
-                        verticalAlign: "middle",
-                    }
-                }],
-                data: accountBalances
-            }],
+            series: [
+                {
+                    type: "treemap",
+                    levels: [
+                        {
+                            level: 1,
+                            layoutAlgorithm: "sliceAndDice",
+                            dataLabels: {
+                                enabled: true,
+                                align: "center",
+                                verticalAlign: "middle"
+                            }
+                        }
+                    ],
+                    data: accountBalances
+                }
+            ],
             title: {
                 text: null
             }
         };
 
         return (
-            <div className="account-treemap"><ReactHighcharts config={config}/></div>
+            <div className="account-treemap">
+                <ReactHighcharts config={config} />
+            </div>
         );
     }
 }
@@ -167,38 +204,43 @@ class AccountTreemapBalanceWrapper extends React.Component {
     static defaultProps = {
         balanceObjects: [],
         core_asset: "1.3.0"
-    }
+    };
 
     render() {
         let assets = this.props.balanceObjects.filter(a => !!a).map(a => {
             return a.get("asset_type");
         });
-        return <AccountTreemap preferredAsset={this.props.settings.get("unit", "1.3.0")} assets={assets} {...this.props} />;
+        return (
+            <AccountTreemap
+                preferredAsset={this.props.settings.get("unit", "1.3.0")}
+                assets={assets}
+                {...this.props}
+            />
+        );
     }
 }
 
 AccountTreemapBalanceWrapper = BindToChainState(AccountTreemapBalanceWrapper);
 
 export default class AccountTreemapWrapper extends React.Component {
-
     render() {
         return (
-          <AltContainer
-            stores={[SettingsStore, MarketsStore]}
-            inject={{
-                marketStats: () => {
-                    return MarketsStore.getState().allMarketStats;
-                },
-                settings: () => {
-                    return SettingsStore.getState().settings;
-                }
-            }}
-          >
-            <AccountTreemapBalanceWrapper
-                {...this.props}
-                ref={this.props.refCallback}
-            />
-          </AltContainer>
+            <AltContainer
+                stores={[SettingsStore, MarketsStore]}
+                inject={{
+                    marketStats: () => {
+                        return MarketsStore.getState().allMarketStats;
+                    },
+                    settings: () => {
+                        return SettingsStore.getState().settings;
+                    }
+                }}
+            >
+                <AccountTreemapBalanceWrapper
+                    {...this.props}
+                    ref={this.props.refCallback}
+                />
+            </AltContainer>
         );
     }
 }
diff --git a/app/components/Account/AccountVesting.jsx b/app/components/Account/AccountVesting.jsx
index 7ac921a6d8..4c08147205 100644
--- a/app/components/Account/AccountVesting.jsx
+++ b/app/components/Account/AccountVesting.jsx
@@ -8,11 +8,15 @@ import {Apis} from "bitsharesjs-ws";
 import {Tabs, Tab} from "../Utility/Tabs";
 
 class VestingBalance extends React.Component {
-
     _onClaim(claimAll, e) {
         e.preventDefault();
-        WalletActions.claimVestingBalance(this.props.account.id, this.props.vb, claimAll).then(() => {
-            typeof this.props.handleChanged == 'function' && this.props.handleChanged();
+        WalletActions.claimVestingBalance(
+            this.props.account.id,
+            this.props.vb,
+            claimAll
+        ).then(() => {
+            typeof this.props.handleChanged == "function" &&
+                this.props.handleChanged();
         });
     }
 
@@ -22,14 +26,19 @@ class VestingBalance extends React.Component {
             return null;
         }
 
-        let cvbAsset, vestingPeriod, earned, secondsPerDay = 60 * 60 * 24,
-            availablePercent, balance;
+        let cvbAsset,
+            vestingPeriod,
+            earned,
+            secondsPerDay = 60 * 60 * 24,
+            availablePercent,
+            balance;
         if (vb) {
             balance = vb.balance.amount;
             cvbAsset = ChainStore.getAsset(vb.balance.asset_id);
             earned = vb.policy[1].coin_seconds_earned;
             vestingPeriod = vb.policy[1].vesting_seconds;
-            availablePercent = vestingPeriod === 0 ? 1 : earned / (vestingPeriod * balance);
+            availablePercent =
+                vestingPeriod === 0 ? 1 : earned / (vestingPeriod * balance);
         }
 
         if (!cvbAsset) {
@@ -42,41 +51,96 @@ class VestingBalance extends React.Component {
 
         return (
             <div>
-                <Translate component="h5" content="account.vesting.balance_number" id={vb.id}/>
+                <Translate
+                    component="h5"
+                    content="account.vesting.balance_number"
+                    id={vb.id}
+                />
 
                 <table className="table key-value-table">
                     <tbody>
-                    <tr>
-                        <td><Translate content="account.member.cashback"/></td>
-                        <td><FormattedAsset amount={vb.balance.amount} asset={vb.balance.asset_id}/></td>
-                    </tr>
-                    <tr>
-                        <td><Translate content="account.member.earned"/></td>
-                        <td>{utils.format_number(utils.get_asset_amount(earned / secondsPerDay, cvbAsset), 0)}
-                            &nbsp;<Translate content="account.member.coindays"/></td>
-                    </tr>
-                    <tr>
-                        <td><Translate content="account.member.required"/></td>
-                        <td>{utils.format_number(utils.get_asset_amount(vb.balance.amount * vestingPeriod / secondsPerDay, cvbAsset), 0)}
-                            &nbsp;<Translate content="account.member.coindays"/></td>
-                    </tr>
-                    <tr>
-                        <td><Translate content="account.member.remaining"/></td>
-                        <td>{utils.format_number(vestingPeriod * (1 - availablePercent) / secondsPerDay || 0, 2)}
-                            &nbsp;days
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><Translate content="account.member.available"/></td>
-                        <td>{utils.format_number(availablePercent * 100, 2)}% / <FormattedAsset
-                            amount={availablePercent * vb.balance.amount} asset={cvbAsset.get("id")}/></td>
-                    </tr>
-                    <tr>
-                        <td colSpan="2" style={{textAlign: "right"}}>
-                            <button onClick={this._onClaim.bind(this, false)} className="button">
-                                <Translate content="account.member.claim"/></button>
-                        </td>
-                    </tr>
+                        <tr>
+                            <td>
+                                <Translate content="account.member.cashback" />
+                            </td>
+                            <td>
+                                <FormattedAsset
+                                    amount={vb.balance.amount}
+                                    asset={vb.balance.asset_id}
+                                />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <Translate content="account.member.earned" />
+                            </td>
+                            <td>
+                                {utils.format_number(
+                                    utils.get_asset_amount(
+                                        earned / secondsPerDay,
+                                        cvbAsset
+                                    ),
+                                    0
+                                )}
+                                &nbsp;<Translate content="account.member.coindays" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <Translate content="account.member.required" />
+                            </td>
+                            <td>
+                                {utils.format_number(
+                                    utils.get_asset_amount(
+                                        vb.balance.amount *
+                                            vestingPeriod /
+                                            secondsPerDay,
+                                        cvbAsset
+                                    ),
+                                    0
+                                )}
+                                &nbsp;<Translate content="account.member.coindays" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <Translate content="account.member.remaining" />
+                            </td>
+                            <td>
+                                {utils.format_number(
+                                    vestingPeriod *
+                                        (1 - availablePercent) /
+                                        secondsPerDay || 0,
+                                    2
+                                )}
+                                &nbsp;days
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <Translate content="account.member.available" />
+                            </td>
+                            <td>
+                                {utils.format_number(availablePercent * 100, 2)}%
+                                /{" "}
+                                <FormattedAsset
+                                    amount={
+                                        availablePercent * vb.balance.amount
+                                    }
+                                    asset={cvbAsset.get("id")}
+                                />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colSpan="2" style={{textAlign: "right"}}>
+                                <button
+                                    onClick={this._onClaim.bind(this, false)}
+                                    className="button"
+                                >
+                                    <Translate content="account.member.claim" />
+                                </button>
+                            </td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -108,49 +172,81 @@ class AccountVesting extends React.Component {
 
     retrieveVestingBalances(accountId) {
         accountId = accountId || this.props.account.get("id");
-        Apis.instance().db_api().exec("get_vesting_balances", [
-            accountId
-        ]).then(vbs => {
-            this.setState({vbs});
-        }).catch(err => {
-            console.log("error:", err);
-        });
+        Apis.instance()
+            .db_api()
+            .exec("get_vesting_balances", [accountId])
+            .then(vbs => {
+                this.setState({vbs});
+            })
+            .catch(err => {
+                console.log("error:", err);
+            });
     }
 
     render() {
         let {vbs} = this.state;
-        if (!vbs || !this.props.account || !this.props.account.get("vesting_balances")) {
+        if (
+            !vbs ||
+            !this.props.account ||
+            !this.props.account.get("vesting_balances")
+        ) {
             return null;
         }
 
         let account = this.props.account.toJS();
 
-        let balances = vbs.map(vb => {
-            if (vb.balance.amount) {
-                return <VestingBalance key={vb.id} vb={vb} account={account}
-                                       handleChanged={this.retrieveVestingBalances.bind(this)}/>;
-            }
-        }).filter(a => {
-            return !!a;
-        });
+        let balances = vbs
+            .map(vb => {
+                if (vb.balance.amount) {
+                    return (
+                        <VestingBalance
+                            key={vb.id}
+                            vb={vb}
+                            account={account}
+                            handleChanged={this.retrieveVestingBalances.bind(
+                                this
+                            )}
+                        />
+                    );
+                }
+            })
+            .filter(a => {
+                return !!a;
+            });
 
         return (
             <div className="grid-content app-tables no-padding" ref="appTables">
                 <div className="content-block small-12">
                     <div className="tabs-container generic-bordered-box">
-                        <Tabs segmented={false} setting="vestingTab" className="account-tabs" tabsClass="account-overview bordered-header content-block" contentClass="padding">
+                        <Tabs
+                            segmented={false}
+                            setting="vestingTab"
+                            className="account-tabs"
+                            tabsClass="account-overview bordered-header content-block"
+                            contentClass="padding"
+                        >
                             <Tab title="account.vesting.title">
-                                <Translate content="account.vesting.explain" component="p" />
+                                <Translate
+                                    content="account.vesting.explain"
+                                    component="p"
+                                />
 
                                 {!balances.length ? (
                                     <h4 style={{paddingTop: "1rem"}}>
-                                        <Translate content={"account.vesting.no_balances"}/>
-                                    </h4>) : balances}
+                                        <Translate
+                                            content={
+                                                "account.vesting.no_balances"
+                                            }
+                                        />
+                                    </h4>
+                                ) : (
+                                    balances
+                                )}
                             </Tab>
                         </Tabs>
                     </div>
                 </div>
-            </div>    
+            </div>
         );
     }
 }
diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx
index 1a42656839..832f99f646 100644
--- a/app/components/Account/AccountVoting.jsx
+++ b/app/components/Account/AccountVoting.jsx
@@ -20,7 +20,6 @@ import FormattedAsset from "../Utility/FormattedAsset";
 import SettingsStore from "stores/SettingsStore";
 
 class AccountVoting extends React.Component {
-
     static propTypes = {
         initialBudget: ChainTypes.ChainObject.isRequired,
         globalObject: ChainTypes.ChainObject.isRequired,
@@ -36,8 +35,8 @@ class AccountVoting extends React.Component {
         const proxyId = props.proxy.get("id");
         const proxyName = props.proxy.get("name");
         this.state = {
-            proxy_account_id: proxyId === "1.2.5" ? "": proxyId,//"1.2.16",
-            prev_proxy_account_id: proxyId === "1.2.5" ? "": proxyId,
+            proxy_account_id: proxyId === "1.2.5" ? "" : proxyId, //"1.2.16",
+            prev_proxy_account_id: proxyId === "1.2.5" ? "" : proxyId,
             current_proxy_input: proxyId === "1.2.5" ? "" : proxyName,
             witnesses: null,
             committee: null,
@@ -69,7 +68,7 @@ class AccountVoting extends React.Component {
         if (np.account !== this.props.account) {
             const proxyId = np.proxy.get("id");
             let newState = {
-                proxy_account_id: proxyId === "1.2.5" ? "": proxyId
+                proxy_account_id: proxyId === "1.2.5" ? "" : proxyId
             };
             this.setState({prev_proxy_account_id: newState.proxy_account_id});
             this.updateAccountData(np, newState);
@@ -84,23 +83,28 @@ class AccountVoting extends React.Component {
         let proxyOptions = proxy ? proxy.get("options") : null;
         // let proxy_account_id = proxy ? proxy.get("id") : "1.2.5";
         let current_proxy_input = proxy ? proxy.get("name") : "";
-        if (proxy_account_id === "1.2.5" ) {
+        if (proxy_account_id === "1.2.5") {
             proxy_account_id = "";
             current_proxy_input = "";
         }
 
         let votes = options.get("votes");
         let vote_ids = votes.toArray();
-        let vids = Immutable.Set( vote_ids );
+        let vids = Immutable.Set(vote_ids);
         // ChainStore.getObjectsByVoteIds(vote_ids);
 
-        let proxyPromise = null, proxy_vids = Immutable.Set([]);
+        let proxyPromise = null,
+            proxy_vids = Immutable.Set([]);
         const hasProxy = proxy_account_id !== "1.2.5";
         if (hasProxy && proxyOptions) {
             let proxy_votes = proxyOptions.get("votes");
             let proxy_vote_ids = proxy_votes.toArray();
-            proxy_vids = Immutable.Set( proxy_vote_ids );
-            proxyPromise = FetchChainObjects(ChainStore.getObjectByVoteID, proxy_vote_ids, 5000);
+            proxy_vids = Immutable.Set(proxy_vote_ids);
+            proxyPromise = FetchChainObjects(
+                ChainStore.getObjectByVoteID,
+                proxy_vote_ids,
+                5000
+            );
         }
 
         Promise.all([
@@ -112,14 +116,14 @@ class AccountVoting extends React.Component {
                 let witnesses = new Immutable.List();
                 let committee = new Immutable.List();
                 let workers = new Immutable.Set();
-                objects.forEach( obj => {
+                objects.forEach(obj => {
                     let account_id = obj.get("committee_member_account");
                     if (account_id) {
                         committee = committee.push(account_id);
-                    } else if( account_id = obj.get( "worker_account" ) ) {
-                       // console.log( "worker: ", obj );
-                   //     workers = workers.add(obj.get("id"));
-                    } else if( account_id = obj.get("witness_account") ) {
+                    } else if ((account_id = obj.get("worker_account"))) {
+                        // console.log( "worker: ", obj );
+                        //     workers = workers.add(obj.get("id"));
+                    } else if ((account_id = obj.get("witness_account"))) {
                         witnesses = witnesses.push(account_id);
                     }
                 });
@@ -128,7 +132,11 @@ class AccountVoting extends React.Component {
             }
 
             let {witnesses, committee, workers} = sortVoteObjects(vote_objs);
-            let {witnesses: proxy_witnesses, committee: proxy_committee, workers: proxy_workers} = sortVoteObjects(proxy_vote_objs || []);
+            let {
+                witnesses: proxy_witnesses,
+                committee: proxy_committee,
+                workers: proxy_workers
+            } = sortVoteObjects(proxy_vote_objs || []);
             let state = {
                 proxy_account_id,
                 current_proxy_input,
@@ -143,17 +151,19 @@ class AccountVoting extends React.Component {
                 prev_witnesses: witnesses,
                 prev_committee: committee,
                 prev_workers: workers,
-                prev_vote_ids : vids
+                prev_vote_ids: vids
             };
             this.setState(state);
         });
     }
 
     isChanged(s = this.state) {
-        return s.proxy_account_id !== s.prev_proxy_account_id ||
-               s.witnesses !== s.prev_witnesses ||
-               s.committee !== s.prev_committee ||
-               !Immutable.is(s.vote_ids, s.prev_vote_ids);
+        return (
+            s.proxy_account_id !== s.prev_proxy_account_id ||
+            s.witnesses !== s.prev_witnesses ||
+            s.committee !== s.prev_committee ||
+            !Immutable.is(s.vote_ids, s.prev_vote_ids)
+        );
     }
 
     _getVoteObjects(type = "witnesses", vote_ids) {
@@ -162,7 +172,9 @@ class AccountVoting extends React.Component {
         let lastIdx;
         if (!vote_ids) {
             vote_ids = [];
-            let active = this.props.globalObject.get(isWitness ? "active_witnesses" : "active_committee_members");
+            let active = this.props.globalObject.get(
+                isWitness ? "active_witnesses" : "active_committee_members"
+            );
             const lastActive = active.last() || `1.${isWitness ? "6" : "5"}.1`;
             lastIdx = parseInt(lastActive.split(".")[2], 10);
             for (var i = 1; i <= lastIdx + 10; i++) {
@@ -171,17 +183,32 @@ class AccountVoting extends React.Component {
         } else {
             lastIdx = parseInt(vote_ids[vote_ids.length - 1].split(".")[2], 10);
         }
-        FetchChainObjects(ChainStore.getObject, vote_ids, 5000, {}).then(vote_objs => {
-            this.state[`all_${type}`] = current.concat(Immutable.List(vote_objs.filter(a => !!a).map(a => a.get(isWitness ? "witness_account" : "committee_member_account"))));
-            if (!!vote_objs[vote_objs.length - 1]) { // there are more valid vote objs, fetch more
-                vote_ids = [];
-                for (var i = lastIdx + 11; i <= lastIdx + 20; i++) {
-                    vote_ids.push(`1.${isWitness ? "6" : "5"}.${i}`);
+        FetchChainObjects(ChainStore.getObject, vote_ids, 5000, {}).then(
+            vote_objs => {
+                this.state[`all_${type}`] = current.concat(
+                    Immutable.List(
+                        vote_objs
+                            .filter(a => !!a)
+                            .map(a =>
+                                a.get(
+                                    isWitness
+                                        ? "witness_account"
+                                        : "committee_member_account"
+                                )
+                            )
+                    )
+                );
+                if (!!vote_objs[vote_objs.length - 1]) {
+                    // there are more valid vote objs, fetch more
+                    vote_ids = [];
+                    for (var i = lastIdx + 11; i <= lastIdx + 20; i++) {
+                        vote_ids.push(`1.${isWitness ? "6" : "5"}.${i}`);
+                    }
+                    return this._getVoteObjects(type, vote_ids);
                 }
-                return this._getVoteObjects(type, vote_ids);
+                this.forceUpdate();
             }
-            this.forceUpdate();
-        });
+        );
     }
 
     onPublish() {
@@ -198,7 +225,10 @@ class AccountVoting extends React.Component {
         // Set fee asset
         updateObject.fee = {
             amount: 0,
-            asset_id: accountUtils.getFinalFeeAsset(updated_account.id, "account_update")
+            asset_id: accountUtils.getFinalFeeAsset(
+                updated_account.id,
+                "account_update"
+            )
         };
 
         // Remove votes for expired workers
@@ -224,62 +254,86 @@ class AccountVoting extends React.Component {
             }
         });
 
-
         // Submit votes
-        FetchChainObjects(ChainStore.getWitnessById, this.state.witnesses.toArray(), 4000).then( res => {
-            let witnesses_vote_ids = res.map(o => o.get("vote_id"));
-            return Promise.all([Promise.resolve(witnesses_vote_ids), FetchChainObjects(ChainStore.getCommitteeMemberById, this.state.committee.toArray(), 4000)]);
-        }).then( res => {
-            updateObject.new_options.votes = res[0]
-                .concat(res[1].map(o => o.get("vote_id")))
-                .concat(vote_ids.filter( id => {
-                    return id.split(":")[0] === "2";
-                }).toArray())
-                .sort((a, b) => {
-                    let a_split = a.split(":");
-                    let b_split = b.split(":");
-
-                    return parseInt(a_split[1], 10) - parseInt(b_split[1], 10);
-                });
-            ApplicationApi.updateAccount(updateObject);
-        });
+        FetchChainObjects(
+            ChainStore.getWitnessById,
+            this.state.witnesses.toArray(),
+            4000
+        )
+            .then(res => {
+                let witnesses_vote_ids = res.map(o => o.get("vote_id"));
+                return Promise.all([
+                    Promise.resolve(witnesses_vote_ids),
+                    FetchChainObjects(
+                        ChainStore.getCommitteeMemberById,
+                        this.state.committee.toArray(),
+                        4000
+                    )
+                ]);
+            })
+            .then(res => {
+                updateObject.new_options.votes = res[0]
+                    .concat(res[1].map(o => o.get("vote_id")))
+                    .concat(
+                        vote_ids
+                            .filter(id => {
+                                return id.split(":")[0] === "2";
+                            })
+                            .toArray()
+                    )
+                    .sort((a, b) => {
+                        let a_split = a.split(":");
+                        let b_split = b.split(":");
+
+                        return (
+                            parseInt(a_split[1], 10) - parseInt(b_split[1], 10)
+                        );
+                    });
+                ApplicationApi.updateAccount(updateObject);
+            });
     }
 
     onReset() {
         let s = this.state;
-        if (this.refs.voting_proxy && this.refs.voting_proxy.refs.bound_component) this.refs.voting_proxy.refs.bound_component.onResetProxy();
-        this.setState({
-            proxy_account_id: s.prev_proxy_account_id,
-            current_proxy_input: s.prev_proxy_input,
-            witnesses: s.prev_witnesses,
-            committee: s.prev_committee,
-            workers: s.prev_workers,
-            vote_ids: s.prev_vote_ids
-        }, () => {
-            this.updateAccountData(this.props);
-        });
+        if (
+            this.refs.voting_proxy &&
+            this.refs.voting_proxy.refs.bound_component
+        )
+            this.refs.voting_proxy.refs.bound_component.onResetProxy();
+        this.setState(
+            {
+                proxy_account_id: s.prev_proxy_account_id,
+                current_proxy_input: s.prev_proxy_input,
+                witnesses: s.prev_witnesses,
+                committee: s.prev_committee,
+                workers: s.prev_workers,
+                vote_ids: s.prev_vote_ids
+            },
+            () => {
+                this.updateAccountData(this.props);
+            }
+        );
     }
 
-    onAddItem(collection, item_id){
+    onAddItem(collection, item_id) {
         let state = {};
         state[collection] = this.state[collection].push(item_id);
         this.setState(state);
     }
 
-    onRemoveItem(collection, item_id){
+    onRemoveItem(collection, item_id) {
         let state = {};
         state[collection] = this.state[collection].filter(i => i !== item_id);
         this.setState(state);
     }
 
-    onChangeVotes( addVotes, removeVotes) {
+    onChangeVotes(addVotes, removeVotes) {
         let state = {};
         state.vote_ids = this.state.vote_ids;
         if (addVotes.length) {
             addVotes.forEach(vote => {
                 state.vote_ids = state.vote_ids.add(vote);
             });
-
         }
         if (removeVotes) {
             removeVotes.forEach(vote => {
@@ -291,14 +345,22 @@ class AccountVoting extends React.Component {
     }
 
     validateAccount(collection, account) {
-        if(!account) return null;
-        if(collection === "witnesses") {
-            return FetchChainObjects(ChainStore.getWitnessById, [account.get("id")], 3000).then(res => {
+        if (!account) return null;
+        if (collection === "witnesses") {
+            return FetchChainObjects(
+                ChainStore.getWitnessById,
+                [account.get("id")],
+                3000
+            ).then(res => {
                 return res[0] ? null : "Not a witness";
             });
         }
-        if(collection === "committee") {
-            return FetchChainObjects(ChainStore.getCommitteeMemberById, [account.get("id")], 3000).then(res => {
+        if (collection === "committee") {
+            return FetchChainObjects(
+                ChainStore.getCommitteeMemberById,
+                [account.get("id")],
+                3000
+            ).then(res => {
                 return res[0] ? null : "Not a committee member";
             });
         }
@@ -307,7 +369,11 @@ class AccountVoting extends React.Component {
 
     onProxyChange(current_proxy_input) {
         let proxyAccount = ChainStore.getAccount(current_proxy_input);
-        if (!proxyAccount || proxyAccount && proxyAccount.get("id") !== this.state.proxy_account_id) {
+        if (
+            !proxyAccount ||
+            (proxyAccount &&
+                proxyAccount.get("id") !== this.state.proxy_account_id)
+        ) {
             this.setState({
                 proxy_account_id: "",
                 proxy_witnesses: Immutable.Set(),
@@ -319,11 +385,14 @@ class AccountVoting extends React.Component {
     }
 
     onProxyAccountFound(proxy_account) {
-        this.setState({
-            proxy_account_id: proxy_account ? proxy_account.get("id") : ""
-        }, () => {
-            this.updateAccountData(this.props);
-        });
+        this.setState(
+            {
+                proxy_account_id: proxy_account ? proxy_account.get("id") : ""
+            },
+            () => {
+                this.updateAccountData(this.props);
+            }
+        );
     }
 
     onClearProxy() {
@@ -333,7 +402,10 @@ class AccountVoting extends React.Component {
     }
 
     _getTotalVotes(worker) {
-        return parseInt(worker.get("total_votes_for"), 10) - parseInt(worker.get("total_votes_against"), 10);
+        return (
+            parseInt(worker.get("total_votes_for"), 10) -
+            parseInt(worker.get("total_votes_against"), 10)
+        );
     }
 
     getBudgetObject() {
@@ -351,27 +423,50 @@ class AccountVoting extends React.Component {
             /* Use the last valid budget object to estimate the current budget object id.
             ** Budget objects are created once per hour
             */
-            let currentID = idIndex + Math.floor((now - new Date(timestamp).getTime()) / 1000 / 60 / 60) - 1;
+            let currentID =
+                idIndex +
+                Math.floor(
+                    (now - new Date(timestamp).getTime()) / 1000 / 60 / 60
+                ) -
+                1;
             if (idIndex >= currentID) return;
             let newID = "2.13." + Math.max(idIndex, currentID);
             let newIDInt = parseInt(newID.split(".")[2], 10);
-            FetchChainObjects(ChainStore.getObject, [newID], undefined, {}).then(res => {
+            FetchChainObjects(
+                ChainStore.getObject,
+                [newID],
+                undefined,
+                {}
+            ).then(res => {
                 let [lbo] = res;
-                if (lbo === null) { // The object does not exist, the id was too high
-                    this.setState({lastBudgetObject: `2.13.${newIDInt -1}`}, this.getBudgetObject);
+                if (lbo === null) {
+                    // The object does not exist, the id was too high
+                    this.setState(
+                        {lastBudgetObject: `2.13.${newIDInt - 1}`},
+                        this.getBudgetObject
+                    );
                 } else {
                     SettingsStore.setLastBudgetObject(newID);
 
                     this.setState({lastBudgetObject: newID});
                 }
             });
-        }
-        else { // The object does not exist, decrement the ID
-            let newID = `2.13.${idIndex -1}`;
-            FetchChainObjects(ChainStore.getObject, [newID], undefined, {}).then(res => {
+        } else {
+            // The object does not exist, decrement the ID
+            let newID = `2.13.${idIndex - 1}`;
+            FetchChainObjects(
+                ChainStore.getObject,
+                [newID],
+                undefined,
+                {}
+            ).then(res => {
                 let [lbo] = res;
-                if (lbo === null) { // The object does not exist, the id was too high
-                    this.setState({lastBudgetObject: `2.13.${idIndex -2}`}, this.getBudgetObject);
+                if (lbo === null) {
+                    // The object does not exist, the id was too high
+                    this.setState(
+                        {lastBudgetObject: `2.13.${idIndex - 2}`},
+                        this.getBudgetObject
+                    );
                 } else {
                     SettingsStore.setLastBudgetObject(newID);
                     this.setState({lastBudgetObject: newID});
@@ -390,7 +485,7 @@ class AccountVoting extends React.Component {
                 break;
             }
             workerArray.push(worker);
-        };
+        }
 
         return workerArray;
     }
@@ -405,7 +500,9 @@ class AccountVoting extends React.Component {
         let {workerTableIndex} = this.state;
         let preferredUnit = this.props.settings.get("unit") || "1.3.0";
         let hasProxy = !!this.state.proxy_account_id; // this.props.account.getIn(["options", "voting_account"]) !== "1.2.5";
-        let publish_buttons_class = cnames("button", {disabled : !this.isChanged()});
+        let publish_buttons_class = cnames("button", {
+            disabled: !this.isChanged()
+        });
         let {globalObject} = this.props;
         let budgetObject;
         if (this.state.lastBudgetObject) {
@@ -414,11 +511,22 @@ class AccountVoting extends React.Component {
 
         let totalBudget = 0;
         // let unusedBudget = 0;
-        let workerBudget = globalObject ? parseInt(globalObject.getIn(["parameters", "worker_budget_per_day"]), 10) : 0;
+        let workerBudget = globalObject
+            ? parseInt(
+                  globalObject.getIn(["parameters", "worker_budget_per_day"]),
+                  10
+              )
+            : 0;
 
         if (budgetObject) {
-            workerBudget = Math.min(24 * budgetObject.getIn(["record", "worker_budget"]), workerBudget);
-            totalBudget = Math.min(24 * budgetObject.getIn(["record", "worker_budget"]), workerBudget);
+            workerBudget = Math.min(
+                24 * budgetObject.getIn(["record", "worker_budget"]),
+                workerBudget
+            );
+            totalBudget = Math.min(
+                24 * budgetObject.getIn(["record", "worker_budget"]),
+                workerBudget
+            );
         }
 
         let now = new Date();
@@ -426,123 +534,138 @@ class AccountVoting extends React.Component {
 
         let voteThreshold = 0;
         let workers = workerArray
-        .filter(a => {
-            if (!a) {
-                return false;
-            }
-
-            return (
-                new Date(a.get("work_end_date") + "Z") > now &&
-                new Date(a.get("work_begin_date") + "Z") <= now
-            );
+            .filter(a => {
+                if (!a) {
+                    return false;
+                }
 
-        })
-        .sort((a, b) => {
-            return this._getTotalVotes(b) - this._getTotalVotes(a);
-        })
-        .map((worker, index) => {
-            let dailyPay = parseInt(worker.get("daily_pay"), 10);
-            workerBudget = workerBudget - dailyPay;
-            let votes = worker.get("total_votes_for") - worker.get("total_votes_against");
-            if (workerBudget <= 0 && !voteThreshold) {
-                voteThreshold = votes;
-            }
+                return (
+                    new Date(a.get("work_end_date") + "Z") > now &&
+                    new Date(a.get("work_begin_date") + "Z") <= now
+                );
+            })
+            .sort((a, b) => {
+                return this._getTotalVotes(b) - this._getTotalVotes(a);
+            })
+            .map((worker, index) => {
+                let dailyPay = parseInt(worker.get("daily_pay"), 10);
+                workerBudget = workerBudget - dailyPay;
+                let votes =
+                    worker.get("total_votes_for") -
+                    worker.get("total_votes_against");
+                if (workerBudget <= 0 && !voteThreshold) {
+                    voteThreshold = votes;
+                }
 
-            if (voteThreshold && votes < voteThreshold) return null;
-
-            return (
-                <WorkerApproval
-                    preferredUnit={preferredUnit}
-                    rest={workerBudget + dailyPay}
-                    rank={index + 1}
-                    key={worker.get("id")}
-                    worker={worker.get("id")}
-                    vote_ids={this.state[hasProxy ? "proxy_vote_ids" : "vote_ids"]}
-                    onChangeVotes={this.onChangeVotes.bind(this)}
-                    proxy={hasProxy}
-                    voteThreshold={voteThreshold}
-                />
-            );
-        }).filter(a => !!a);
+                if (voteThreshold && votes < voteThreshold) return null;
+
+                return (
+                    <WorkerApproval
+                        preferredUnit={preferredUnit}
+                        rest={workerBudget + dailyPay}
+                        rank={index + 1}
+                        key={worker.get("id")}
+                        worker={worker.get("id")}
+                        vote_ids={
+                            this.state[hasProxy ? "proxy_vote_ids" : "vote_ids"]
+                        }
+                        onChangeVotes={this.onChangeVotes.bind(this)}
+                        proxy={hasProxy}
+                        voteThreshold={voteThreshold}
+                    />
+                );
+            })
+            .filter(a => !!a);
 
         // unusedBudget = Math.max(0, workerBudget);
 
         let newWorkers = workerArray
-        .filter(a => {
-            if (!a) {
-                return false;
-            }
-
-            let votes = a.get("total_votes_for") - a.get("total_votes_against");
-            return (
-                (new Date(a.get("work_end_date")+ "Z") > now &&
-                votes < voteThreshold) ||
-                new Date(a.get("work_begin_date")+ "Z") > now
-            );
+            .filter(a => {
+                if (!a) {
+                    return false;
+                }
 
-        })
-        .sort((a, b) => {
-            return this._getTotalVotes(b) - this._getTotalVotes(a);
-        })
-        .map((worker, index) => {
-            // let dailyPay = parseInt(worker.get("daily_pay"), 10);
-            // workerBudget = workerBudget - dailyPay;
-
-            return (
-                <WorkerApproval
-                    preferredUnit={preferredUnit}
-                    rest={0}
-                    rank={index + 1}
-                    key={worker.get("id")}
-                    worker={worker.get("id")}
-                    vote_ids={this.state[hasProxy ? "proxy_vote_ids" : "vote_ids"]}
-                    onChangeVotes={this.onChangeVotes.bind(this)}
-                    proxy={hasProxy}
-                    voteThreshold={voteThreshold}
-                />
-            );
-        });
+                let votes =
+                    a.get("total_votes_for") - a.get("total_votes_against");
+                return (
+                    (new Date(a.get("work_end_date") + "Z") > now &&
+                        votes < voteThreshold) ||
+                    new Date(a.get("work_begin_date") + "Z") > now
+                );
+            })
+            .sort((a, b) => {
+                return this._getTotalVotes(b) - this._getTotalVotes(a);
+            })
+            .map((worker, index) => {
+                // let dailyPay = parseInt(worker.get("daily_pay"), 10);
+                // workerBudget = workerBudget - dailyPay;
+
+                return (
+                    <WorkerApproval
+                        preferredUnit={preferredUnit}
+                        rest={0}
+                        rank={index + 1}
+                        key={worker.get("id")}
+                        worker={worker.get("id")}
+                        vote_ids={
+                            this.state[hasProxy ? "proxy_vote_ids" : "vote_ids"]
+                        }
+                        onChangeVotes={this.onChangeVotes.bind(this)}
+                        proxy={hasProxy}
+                        voteThreshold={voteThreshold}
+                    />
+                );
+            });
 
         let expiredWorkers = workerArray
-        .filter(a => {
-            if (!a) {
-                return false;
-            }
-
-            return (
-                new Date(a.get("work_end_date")) <= now
-            );
+            .filter(a => {
+                if (!a) {
+                    return false;
+                }
 
-        })
-        .sort((a, b) => {
-            return this._getTotalVotes(b) - this._getTotalVotes(a);
-        })
-        .map((worker, index) => {
-            // let dailyPay = parseInt(worker.get("daily_pay"), 10);
-            // workerBudget = workerBudget - dailyPay;
-
-            return (
-                <WorkerApproval
-                    preferredUnit={preferredUnit}
-                    rest={0}
-                    rank={index + 1}
-                    key={worker.get("id")}
-                    worker={worker.get("id")}
-                    vote_ids={this.state[hasProxy ? "proxy_vote_ids" : "vote_ids"]}
-                    onChangeVotes={this.onChangeVotes.bind(this)}
-                    proxy={hasProxy}
-                    voteThreshold={voteThreshold}
-                />
-            );
-        });
+                return new Date(a.get("work_end_date")) <= now;
+            })
+            .sort((a, b) => {
+                return this._getTotalVotes(b) - this._getTotalVotes(a);
+            })
+            .map((worker, index) => {
+                // let dailyPay = parseInt(worker.get("daily_pay"), 10);
+                // workerBudget = workerBudget - dailyPay;
+
+                return (
+                    <WorkerApproval
+                        preferredUnit={preferredUnit}
+                        rest={0}
+                        rank={index + 1}
+                        key={worker.get("id")}
+                        worker={worker.get("id")}
+                        vote_ids={
+                            this.state[hasProxy ? "proxy_vote_ids" : "vote_ids"]
+                        }
+                        onChangeVotes={this.onChangeVotes.bind(this)}
+                        proxy={hasProxy}
+                        voteThreshold={voteThreshold}
+                    />
+                );
+            });
 
         let actionButtons = (
             <span>
-                <button className={cnames(publish_buttons_class, {success: this.isChanged()})} onClick={this.onPublish} tabIndex={4}>
-                    <Translate content="account.votes.publish"/>
+                <button
+                    className={cnames(publish_buttons_class, {
+                        success: this.isChanged()
+                    })}
+                    onClick={this.onPublish}
+                    tabIndex={4}
+                >
+                    <Translate content="account.votes.publish" />
                 </button>
-                <button className={"button " + publish_buttons_class} onClick={this.onReset} tabIndex={8}>
-                    <Translate content="account.perm.reset"/>
+                <button
+                    className={"button " + publish_buttons_class}
+                    onClick={this.onReset}
+                    tabIndex={8}
+                >
+                    <Translate content="account.perm.reset" />
                 </button>
             </span>
         );
@@ -557,15 +680,45 @@ class AccountVoting extends React.Component {
                 onAccountChanged={this.onProxyAccountFound}
                 tabIndex={1}
                 placeholder="Proxy not set"
-        >
-            <span style={{paddingLeft: 5, position: "relative", top: -1, display: (hasProxy ? "" : "none")}}><Icon name="locked" size="1x" /></span>
-            <span style={{paddingLeft: 5, position: "relative", top: 9, display: (!hasProxy ? "" : "none")}}><Link to="/help/voting"><Icon name="question-circle" size="1x" /></Link></span>
-        </AccountSelector>);
+            >
+                <span
+                    style={{
+                        paddingLeft: 5,
+                        position: "relative",
+                        top: -1,
+                        display: hasProxy ? "" : "none"
+                    }}
+                >
+                    <Icon name="locked" size="1x" />
+                </span>
+                <span
+                    style={{
+                        paddingLeft: 5,
+                        position: "relative",
+                        top: 9,
+                        display: !hasProxy ? "" : "none"
+                    }}
+                >
+                    <Link to="/help/voting">
+                        <Icon name="question-circle" size="1x" />
+                    </Link>
+                </span>
+            </AccountSelector>
+        );
 
         const showExpired = workerTableIndex === 2;
 
         const saveText = (
-            <div className="inline-block" style={{float: "right", visibility: this.isChanged() ? "visible": "hidden", color: "red", padding: "0.85rem", fontSize: "0.9rem"}}>
+            <div
+                className="inline-block"
+                style={{
+                    float: "right",
+                    visibility: this.isChanged() ? "visible" : "hidden",
+                    color: "red",
+                    padding: "0.85rem",
+                    fontSize: "0.9rem"
+                }}
+            >
                 <Translate content="account.votes.save_finish" />
             </div>
         );
@@ -574,7 +727,6 @@ class AccountVoting extends React.Component {
             <div className="grid-content app-tables no-padding" ref="appTables">
                 <div className="content-block small-12">
                     <div className="tabs-container generic-bordered-box">
-
                         <Tabs
                             setting="votingTab"
                             className="account-tabs"
@@ -588,20 +740,44 @@ class AccountVoting extends React.Component {
                                     <div className="header-selector">
                                         {/* <Link to="/help/voting/witness"><Icon name="question-circle" /></Link> */}
                                         {proxyInput}
-                                        <div style={{float: "right", marginTop: "-2.5rem"}}>{actionButtons}</div>
+                                        <div
+                                            style={{
+                                                float: "right",
+                                                marginTop: "-2.5rem"
+                                            }}
+                                        >
+                                            {actionButtons}
+                                        </div>
                                     </div>
-                                    
+
                                     <VotingAccountsList
                                         type="witness"
                                         label="account.votes.add_witness_label"
                                         items={this.state.all_witnesses}
-                                        validateAccount={this.validateAccount.bind(this, "witnesses")}
-                                        onAddItem={this.onAddItem.bind(this, "witnesses")}
-                                        onRemoveItem={this.onRemoveItem.bind(this, "witnesses")}
+                                        validateAccount={this.validateAccount.bind(
+                                            this,
+                                            "witnesses"
+                                        )}
+                                        onAddItem={this.onAddItem.bind(
+                                            this,
+                                            "witnesses"
+                                        )}
+                                        onRemoveItem={this.onRemoveItem.bind(
+                                            this,
+                                            "witnesses"
+                                        )}
                                         tabIndex={hasProxy ? -1 : 2}
-                                        supported={this.state[hasProxy ? "proxy_witnesses" : "witnesses"]}
+                                        supported={
+                                            this.state[
+                                                hasProxy
+                                                    ? "proxy_witnesses"
+                                                    : "witnesses"
+                                            ]
+                                        }
                                         withSelector={false}
-                                        active={globalObject.get("active_witnesses")}
+                                        active={globalObject.get(
+                                            "active_witnesses"
+                                        )}
                                         proxy={this.state.proxy_account_id}
                                     />
                                 </div>
@@ -612,54 +788,118 @@ class AccountVoting extends React.Component {
                                     <div className="header-selector">
                                         {/* <Link to="/help/voting/committee"><Icon name="question-circle" /></Link> */}
                                         {proxyInput}
-                                        <div style={{float: "right", marginTop: "-2.5rem"}}>{actionButtons}</div>
+                                        <div
+                                            style={{
+                                                float: "right",
+                                                marginTop: "-2.5rem"
+                                            }}
+                                        >
+                                            {actionButtons}
+                                        </div>
                                     </div>
                                     <VotingAccountsList
                                         type="committee"
                                         label="account.votes.add_committee_label"
                                         items={this.state.all_committee}
-                                        validateAccount={this.validateAccount.bind(this, "committee")}
-                                        onAddItem={this.onAddItem.bind(this, "committee")}
-                                        onRemoveItem={this.onRemoveItem.bind(this, "committee")}
+                                        validateAccount={this.validateAccount.bind(
+                                            this,
+                                            "committee"
+                                        )}
+                                        onAddItem={this.onAddItem.bind(
+                                            this,
+                                            "committee"
+                                        )}
+                                        onRemoveItem={this.onRemoveItem.bind(
+                                            this,
+                                            "committee"
+                                        )}
                                         tabIndex={hasProxy ? -1 : 3}
-                                        supported={this.state[hasProxy ? "proxy_committee" : "committee"]}
+                                        supported={
+                                            this.state[
+                                                hasProxy
+                                                    ? "proxy_committee"
+                                                    : "committee"
+                                            ]
+                                        }
                                         withSelector={false}
-                                        active={globalObject.get("active_committee_members")}
+                                        active={globalObject.get(
+                                            "active_committee_members"
+                                        )}
                                         proxy={this.state.proxy_account_id}
                                     />
                                 </div>
                             </Tab>
 
                             <Tab title="account.votes.workers_short">
-
                                 <div className="header-selector">
                                     <div style={{float: "right"}}>
                                         <Link to="/create-worker">
-                                            <div className="button"><Translate content="account.votes.create_worker" /></div>
+                                            <div className="button">
+                                                <Translate content="account.votes.create_worker" />
+                                            </div>
                                         </Link>
                                     </div>
                                     <div className="selector">
                                         {/* <Link to="/help/voting/worker"><Icon name="question-circle" /></Link> */}
-                                        <div style={{paddingLeft: 10}} className={cnames("inline-block", {inactive: workerTableIndex !== 0})} onClick={this._setWorkerTableIndex.bind(this, 0)}>
-                                            {counterpart.translate("account.votes.new", {count: newWorkers.length})}
+                                        <div
+                                            style={{paddingLeft: 10}}
+                                            className={cnames("inline-block", {
+                                                inactive: workerTableIndex !== 0
+                                            })}
+                                            onClick={this._setWorkerTableIndex.bind(
+                                                this,
+                                                0
+                                            )}
+                                        >
+                                            {counterpart.translate(
+                                                "account.votes.new",
+                                                {count: newWorkers.length}
+                                            )}
                                         </div>
-                                        <div className={cnames("inline-block", {inactive: workerTableIndex !== 1})} onClick={this._setWorkerTableIndex.bind(this, 1)}>
-                                            {counterpart.translate("account.votes.active", {count: workers.length})}
+                                        <div
+                                            className={cnames("inline-block", {
+                                                inactive: workerTableIndex !== 1
+                                            })}
+                                            onClick={this._setWorkerTableIndex.bind(
+                                                this,
+                                                1
+                                            )}
+                                        >
+                                            {counterpart.translate(
+                                                "account.votes.active",
+                                                {count: workers.length}
+                                            )}
                                         </div>
 
-                                        {expiredWorkers.length ? <div className={cnames("inline-block", {inactive: !showExpired})} onClick={!showExpired ? this._setWorkerTableIndex.bind(this, 2) : () => {}}>
-                                            <Translate content="account.votes.expired" />
-                                        </div> : null}
+                                        {expiredWorkers.length ? (
+                                            <div
+                                                className={cnames(
+                                                    "inline-block",
+                                                    {inactive: !showExpired}
+                                                )}
+                                                onClick={
+                                                    !showExpired
+                                                        ? this._setWorkerTableIndex.bind(
+                                                              this,
+                                                              2
+                                                          )
+                                                        : () => {}
+                                                }
+                                            >
+                                                <Translate content="account.votes.expired" />
+                                            </div>
+                                        ) : null}
                                     </div>
                                     <div style={{marginTop: "2rem"}}>
                                         {proxyInput}
-                                        <div style={{float: "right", marginTop: "-2.5rem"}}>
-                                            
+                                        <div
+                                            style={{
+                                                float: "right",
+                                                marginTop: "-2.5rem"
+                                            }}
+                                        >
                                             {actionButtons}
                                         </div>
-                                        
-                                            
-                                        
                                     </div>
                                 </div>
 
@@ -682,77 +922,171 @@ class AccountVoting extends React.Component {
                                 </div>)} */}
 
                                 <table className="table dashboard-table table-hover">
-
-                                    {workerTableIndex === 2 ? null :
-                                    workerTableIndex === 0 ?
+                                    {workerTableIndex ===
+                                    2 ? null : workerTableIndex === 0 ? (
+                                        <thead>
+                                            <tr>
+                                                <th />
+                                                <th
+                                                    colSpan="3"
+                                                    style={{textAlign: "left"}}
+                                                >
+                                                    <Translate content="account.votes.threshold" />
+                                                </th>
+                                                <th
+                                                    style={{textAlign: "right"}}
+                                                >
+                                                    <FormattedAsset
+                                                        decimalOffset={5}
+                                                        hide_asset
+                                                        amount={voteThreshold}
+                                                        asset="1.3.0"
+                                                    />
+                                                </th>
+                                                <th colSpan="3" />
+                                            </tr>
+                                            <tr>
+                                                <th
+                                                    style={{
+                                                        border: "none",
+                                                        backgroundColor:
+                                                            "transparent"
+                                                    }}
+                                                />
+                                            </tr>
+                                        </thead>
+                                    ) : (
+                                        <thead>
+                                            <tr>
+                                                <th />
+                                                <th
+                                                    colSpan="4"
+                                                    style={{textAlign: "left"}}
+                                                >
+                                                    <Translate content="account.votes.total_budget" />{" "}
+                                                    (<AssetName
+                                                        name={preferredUnit}
+                                                    />)
+                                                </th>
+                                                <th
+                                                    colSpan="2"
+                                                    className="hide-column-small"
+                                                />
+                                                <th
+                                                    style={{textAlign: "right"}}
+                                                >
+                                                    {globalObject ? (
+                                                        <EquivalentValueComponent
+                                                            hide_asset
+                                                            fromAsset="1.3.0"
+                                                            toAsset={
+                                                                preferredUnit
+                                                            }
+                                                            amount={totalBudget}
+                                                        />
+                                                    ) : null}
+                                                </th>
+                                                <th className="hide-column-small" />
+                                            </tr>
+                                            <tr>
+                                                <th
+                                                    style={{
+                                                        border: "none",
+                                                        backgroundColor:
+                                                            "transparent"
+                                                    }}
+                                                />
+                                            </tr>
+                                        </thead>
+                                    )}
                                     <thead>
                                         <tr>
-                                            <th></th>
-                                            <th colSpan="3" style={{textAlign: "left"}}>
-                                                <Translate content="account.votes.threshold" />
+                                            {workerTableIndex === 2 ? null : (
+                                                <th
+                                                    style={{textAlign: "right"}}
+                                                >
+                                                    <Translate content="account.votes.line" />
+                                                </th>
+                                            )}
+                                            <th style={{textAlign: "center"}}>
+                                                <Translate content="account.user_issued_assets.id" />
                                             </th>
-                                            <th style={{textAlign: "right"}}>
-                                                <FormattedAsset decimalOffset={5} hide_asset amount={voteThreshold} asset="1.3.0" />
-                                            </th>
-                                            <th colSpan="3"></th>
-                                        </tr>
-                                        <tr >
-                                            <th style={{border: "none", backgroundColor: "transparent"}}></th>
-                                        </tr>
-                                    </thead> :
-                                    <thead>
-                                        <tr>
-                                            <th></th>
-                                            <th colSpan="4" style={{textAlign: "left"}}><Translate content="account.votes.total_budget" /> (<AssetName name={preferredUnit} />)</th>
-                                            <th colSpan="2" className="hide-column-small"></th>
-                                            <th style={{textAlign: "right"}}>
-                                                {globalObject ? <EquivalentValueComponent hide_asset fromAsset="1.3.0" toAsset={preferredUnit} amount={totalBudget}/> : null}
+                                            <th style={{textAlign: "left"}}>
+                                                <Translate content="account.user_issued_assets.description" />
                                             </th>
-                                            <th className="hide-column-small"></th>
-                                        </tr>
-                                        <tr >
-                                            <th style={{border: "none", backgroundColor: "transparent"}}></th>
-                                        </tr>
-                                    </thead>}
-                                    <thead>
-                                        <tr>
-                                            {workerTableIndex === 2 ? null : <th style={{textAlign: "right"}}><Translate content="account.votes.line" /></th>}
-                                            <th style={{textAlign: "center"}}><Translate content="account.user_issued_assets.id" /></th>
-                                            <th style={{textAlign: "left"}}><Translate content="account.user_issued_assets.description" /></th>
-                                            <th style={{textAlign: "right"}} className="hide-column-small">
+                                            <th
+                                                style={{textAlign: "right"}}
+                                                className="hide-column-small"
+                                            >
                                                 <Translate content="account.votes.total_votes" />
                                             </th>
-                                            {workerTableIndex === 0 ?
-                                            <th style={{textAlign: "right"}}>
-                                                <Translate content="account.votes.missing" />
-                                            </th> : null}
-                                            <th><Translate content="explorer.workers.period" /></th>
-                                            {workerTableIndex === 2 || workerTableIndex === 0 ? null :
-                                            <th style={{textAlign: "right"}} className="hide-column-small">
-                                                <Translate content="account.votes.funding" />
-                                            </th>}
-                                            <th style={{textAlign: "right"}} className="hide-column-small">
+                                            {workerTableIndex === 0 ? (
+                                                <th
+                                                    style={{textAlign: "right"}}
+                                                >
+                                                    <Translate content="account.votes.missing" />
+                                                </th>
+                                            ) : null}
+                                            <th>
+                                                <Translate content="explorer.workers.period" />
+                                            </th>
+                                            {workerTableIndex === 2 ||
+                                            workerTableIndex === 0 ? null : (
+                                                <th
+                                                    style={{textAlign: "right"}}
+                                                    className="hide-column-small"
+                                                >
+                                                    <Translate content="account.votes.funding" />
+                                                </th>
+                                            )}
+                                            <th
+                                                style={{textAlign: "right"}}
+                                                className="hide-column-small"
+                                            >
                                                 <Translate content="account.votes.daily_pay" />
-                                                <div style={{paddingTop: 5, fontSize: "0.8rem"}}>
-                                                    (<AssetName name={preferredUnit} />)
+                                                <div
+                                                    style={{
+                                                        paddingTop: 5,
+                                                        fontSize: "0.8rem"
+                                                    }}
+                                                >
+                                                    (<AssetName
+                                                        name={preferredUnit}
+                                                    />)
                                                 </div>
                                             </th>
-                                            {workerTableIndex === 2 || workerTableIndex === 0 ? null :
-                                            <th style={{textAlign: "right"}}>
-                                                <Translate content="explorer.witnesses.budget" />
-                                                <div style={{paddingTop: 5, fontSize: "0.8rem"}}>
-                                                    (<AssetName name={preferredUnit} />)
-                                                </div>
-                                            </th>}
-
-                                            <th><Translate content="account.votes.toggle" /></th>
+                                            {workerTableIndex === 2 ||
+                                            workerTableIndex === 0 ? null : (
+                                                <th
+                                                    style={{textAlign: "right"}}
+                                                >
+                                                    <Translate content="explorer.witnesses.budget" />
+                                                    <div
+                                                        style={{
+                                                            paddingTop: 5,
+                                                            fontSize: "0.8rem"
+                                                        }}
+                                                    >
+                                                        (<AssetName
+                                                            name={preferredUnit}
+                                                        />)
+                                                    </div>
+                                                </th>
+                                            )}
+
+                                            <th>
+                                                <Translate content="account.votes.toggle" />
+                                            </th>
                                         </tr>
                                     </thead>
 
                                     <tbody>
-                                        {workerTableIndex === 0 ? newWorkers : workerTableIndex === 1 ? workers : expiredWorkers}
+                                        {workerTableIndex === 0
+                                            ? newWorkers
+                                            : workerTableIndex === 1
+                                                ? workers
+                                                : expiredWorkers}
                                     </tbody>
-
                                 </table>
                             </Tab>
                         </Tabs>
@@ -764,8 +1098,13 @@ class AccountVoting extends React.Component {
 }
 AccountVoting = BindToChainState(AccountVoting);
 
-const BudgetObjectWrapper = (props) => {
-    return <AccountVoting {...props} initialBudget={SettingsStore.getLastBudgetObject()} />;
+const BudgetObjectWrapper = props => {
+    return (
+        <AccountVoting
+            {...props}
+            initialBudget={SettingsStore.getLastBudgetObject()}
+        />
+    );
 };
 
 export default BudgetObjectWrapper;
diff --git a/app/components/Account/AccountVotingProxy.jsx b/app/components/Account/AccountVotingProxy.jsx
index 5fdf22bdd3..a31ca33b62 100644
--- a/app/components/Account/AccountVotingProxy.jsx
+++ b/app/components/Account/AccountVotingProxy.jsx
@@ -9,7 +9,6 @@ import LinkToAccountById from "../Utility/LinkToAccountById";
 import {List} from "immutable";
 
 class AccountVotingProxy extends React.Component {
-
     static propTypes = {
         existingProxy: ChainTypes.ChainAccount.isRequired,
         account: React.PropTypes.object.isRequired,
@@ -18,12 +17,21 @@ class AccountVotingProxy extends React.Component {
     };
 
     static defaultProps = {
-        knownProxies: List(
-            [
-                "xeroc", "baozi", "bitcrab", "laomao", "bitshares-munich-wallet", "abit", "dahu",
-                "bts1988", "harvey", "fav", "jonnybitcoin", "bitsharesblocks", "customminer"
-            ]
-        ),
+        knownProxies: List([
+            "xeroc",
+            "baozi",
+            "bitcrab",
+            "laomao",
+            "bitshares-munich-wallet",
+            "abit",
+            "dahu",
+            "bts1988",
+            "harvey",
+            "fav",
+            "jonnybitcoin",
+            "bitsharesblocks",
+            "customminer"
+        ]),
         existingProxy: "1.2.5", // proxy-to-self
         autosubscribe: false
     };
@@ -32,9 +40,12 @@ class AccountVotingProxy extends React.Component {
         router: React.PropTypes.object.isRequired
     };
 
-    constructor(props){
+    constructor(props) {
         super(props);
-        const defaultInput = props.existingProxy.get("id") === "1.2.5" ? "" : props.existingProxy.get("name");
+        const defaultInput =
+            props.existingProxy.get("id") === "1.2.5"
+                ? ""
+                : props.existingProxy.get("name");
 
         this.state = {
             current_proxy_input: defaultInput,
@@ -45,9 +56,11 @@ class AccountVotingProxy extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        if(!this.state.current_proxy_input) {
+        if (!this.state.current_proxy_input) {
             this.setState({
-                current_proxy_input: nextProps.proxyAccount ? nextProps.proxyAccount.get("name") : ""
+                current_proxy_input: nextProps.proxyAccount
+                    ? nextProps.proxyAccount.get("name")
+                    : ""
             });
         }
     }
@@ -62,21 +75,30 @@ class AccountVotingProxy extends React.Component {
     /*
     * Ensure that state is cleared when new proxy props are passed down
     */
-    componentWillUpdate(nextProps){
+    componentWillUpdate(nextProps) {
         let newProxy = nextProps.existingProxy.get("name");
         let oldProxy = this.props.existingProxy.get("name");
 
-        if(newProxy !== oldProxy){
-            if(newProxy === "proxy-to-self"){
-              this.setState({current_proxy_input: "", new_proxy_account: null});
+        if (newProxy !== oldProxy) {
+            if (newProxy === "proxy-to-self") {
+                this.setState({
+                    current_proxy_input: "",
+                    new_proxy_account: null
+                });
             } else {
-                this.setState({current_proxy_input: newProxy, new_proxy_account: null});
+                this.setState({
+                    current_proxy_input: newProxy,
+                    new_proxy_account: null
+                });
             }
         }
     }
 
     onResetProxy() {
-        const defaultInput = this.props.existingProxy.get("id") === "1.2.5" ? "" : this.props.existingProxy.get("name");
+        const defaultInput =
+            this.props.existingProxy.get("id") === "1.2.5"
+                ? ""
+                : this.props.existingProxy.get("name");
         this.setState({
             current_proxy_input: defaultInput,
             new_proxy_account: null
@@ -100,7 +122,10 @@ class AccountVotingProxy extends React.Component {
         //console.log("-- AccountVotingProxy.onProxyAccountChange -->", new_proxy_account);
 
         this.setState({new_proxy_account}, () => {
-            if(new_proxy_account && this.props.account.get("id") === new_proxy_account.get("id")) {
+            if (
+                new_proxy_account &&
+                this.props.account.get("id") === new_proxy_account.get("id")
+            ) {
                 // this.props.onProxyAccountChanged(null);
             } else {
                 this.props.onProxyAccountChanged(new_proxy_account);
@@ -119,77 +144,118 @@ class AccountVotingProxy extends React.Component {
     //     });
     // }
 
-    render(){
+    render() {
         let {knownProxies, existingProxy} = this.props;
-        const isDisabled = existingProxy && existingProxy.get("name") === this.state.current_proxy_input;
+        const isDisabled =
+            existingProxy &&
+            existingProxy.get("name") === this.state.current_proxy_input;
         // console.log("-- AccountVotingProxy.render -->", this.props.account);
         let error = null;
-        if(this.state.new_proxy_account && this.props.account.get("id") === this.state.new_proxy_account.get("id")) {
+        if (
+            this.state.new_proxy_account &&
+            this.props.account.get("id") ===
+                this.state.new_proxy_account.get("id")
+        ) {
             error = "cannot proxy to yourself";
         }
 
-        let currentProxyName = this.props.proxyAccount && this.props.proxyAccount.get("name");
+        let currentProxyName =
+            this.props.proxyAccount && this.props.proxyAccount.get("name");
 
         let proxies = knownProxies
-        .filter(a => {
-            if (!a) return false;
-            return (
-                a.get("name") !== this.props.account.get("name") &&
-                a.get("name") !== currentProxyName
-            );
-        })
-        .sort((a, b) => {
-            return (a.get("name") > b.get("name") ? 1 : a.get("name") < b.get("name") ? -1 : 0);
-        })
-        .map(proxy => {
-            return (
-                <tr key={proxy.get("id")}>
-                    <td>
-                        <AccountImage
-                            size={{height: 30, width: 30}}
-                            account={proxy.get("name")}
-                            custom_image={null}
-                        />
-                    </td>
-                    <td><Link to={`/account/${proxy.get("name")}`}>{proxy.get("name")}</Link></td>
-                    <td className="text-right"><button className="button" onClick={this.onProxyChange.bind(this, proxy.get("name"))}>Set</button></td>
-                </tr>
-            );
-        });
+            .filter(a => {
+                if (!a) return false;
+                return (
+                    a.get("name") !== this.props.account.get("name") &&
+                    a.get("name") !== currentProxyName
+                );
+            })
+            .sort((a, b) => {
+                return a.get("name") > b.get("name")
+                    ? 1
+                    : a.get("name") < b.get("name") ? -1 : 0;
+            })
+            .map(proxy => {
+                return (
+                    <tr key={proxy.get("id")}>
+                        <td>
+                            <AccountImage
+                                size={{height: 30, width: 30}}
+                                account={proxy.get("name")}
+                                custom_image={null}
+                            />
+                        </td>
+                        <td>
+                            <Link to={`/account/${proxy.get("name")}`}>
+                                {proxy.get("name")}
+                            </Link>
+                        </td>
+                        <td className="text-right">
+                            <button
+                                className="button"
+                                onClick={this.onProxyChange.bind(
+                                    this,
+                                    proxy.get("name")
+                                )}
+                            >
+                                Set
+                            </button>
+                        </td>
+                    </tr>
+                );
+            });
 
         return (
             <div className="content-block" style={{maxWidth: "600px"}}>
-                {isDisabled ? null :<Translate component="h3" content="account.votes.proxy_short" />}
-                {isDisabled ? <div>
-                    <p>
-                        <Translate content="account.votes.proxy_current" />:
-                        &nbsp;<Link to={`account/${existingProxy.get("name")}`}>{existingProxy.get("name")}</Link>
-                    </p>
+                {isDisabled ? null : (
+                    <Translate
+                        component="h3"
+                        content="account.votes.proxy_short"
+                    />
+                )}
+                {isDisabled ? (
                     <div>
-                        <button className={"button outline"} onClick={this.clearProxy.bind(this)} tabIndex={8}>
-                            <Translate content="account.votes.clear_proxy"/>
-                        </button>
+                        <p>
+                            <Translate content="account.votes.proxy_current" />:
+                            &nbsp;<Link
+                                to={`account/${existingProxy.get("name")}`}
+                            >
+                                {existingProxy.get("name")}
+                            </Link>
+                        </p>
+                        <div>
+                            <button
+                                className={"button outline"}
+                                onClick={this.clearProxy.bind(this)}
+                                tabIndex={8}
+                            >
+                                <Translate content="account.votes.clear_proxy" />
+                            </button>
+                        </div>
                     </div>
-                </div> :
-                <AccountSelector
-                     label="account.votes.proxy"
-                     error={error}
-                     account={this.state.current_proxy_input}
-                     accountName={this.state.current_proxy_input}
-                     onChange={this.onProxyChange}
-                     onAccountChanged={this.onProxyAccountChange}
-                     tabIndex={1}
-                     size={60}
-                />}
+                ) : (
+                    <AccountSelector
+                        label="account.votes.proxy"
+                        error={error}
+                        account={this.state.current_proxy_input}
+                        accountName={this.state.current_proxy_input}
+                        onChange={this.onProxyChange}
+                        onAccountChanged={this.onProxyAccountChange}
+                        tabIndex={1}
+                        size={60}
+                    />
+                )}
                 {!isDisabled && knownProxies.length ? (
-                <div style={{paddingTop: 20}}>
-                    <Translate component="h5" content="account.votes.proxy_known" />
-                    <table className="table">
-                        <tbody>
-                            {proxies}
-                        </tbody>
-                    </table>
-                </div>) : null}
+                    <div style={{paddingTop: 20}}>
+                        <Translate
+                            component="h5"
+                            content="account.votes.proxy_known"
+                        />
+                        <table className="table">
+                            <tbody>{proxies}</tbody>
+                        </table>
+                    </div>
+                ) : null}
                 {this.props.children}
             </div>
         );
diff --git a/app/components/Account/AccountWhitelist.jsx b/app/components/Account/AccountWhitelist.jsx
index ad40bd63ed..684b0aa12c 100644
--- a/app/components/Account/AccountWhitelist.jsx
+++ b/app/components/Account/AccountWhitelist.jsx
@@ -11,7 +11,6 @@ import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb.js";
 
 class AccountRow extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired
     };
@@ -27,8 +26,19 @@ class AccountRow extends React.Component {
             <tr>
                 <td>{this.props.index}</td>
                 <td>{account.get("id")}</td>
-                <td><LinkToAccountById account={account.get("id")} /></td>
-                {onRemove ? <td><button onClick={onRemove.bind(this, account.get("id"))} className="button outline">Remove</button></td> : null}
+                <td>
+                    <LinkToAccountById account={account.get("id")} />
+                </td>
+                {onRemove ? (
+                    <td>
+                        <button
+                            onClick={onRemove.bind(this, account.get("id"))}
+                            className="button outline"
+                        >
+                            Remove
+                        </button>
+                    </td>
+                ) : null}
             </tr>
         );
     }
@@ -36,19 +46,18 @@ class AccountRow extends React.Component {
 AccountRow = BindToChainState(AccountRow);
 
 class AccountList extends React.Component {
-
     _onRemove(listing, account, e) {
         if (account) {
             let currentState = this.props.getCurrentState(account);
             let tr = WalletApi.new_transaction();
             tr.add_type_operation("account_whitelist", {
-                "fee": {
-                    "amount": 0,
-                    "asset_id": "1.3.0"
+                fee: {
+                    amount: 0,
+                    asset_id: "1.3.0"
                 },
-                "authorizing_account": this.props.account.get("id"),
-                "account_to_list": account,
-                "new_listing": currentState - constants.account_listing[listing]
+                authorizing_account: this.props.account.get("id"),
+                account_to_list: account,
+                new_listing: currentState - constants.account_listing[listing]
             });
             WalletDb.process_transaction(tr, null, true);
         }
@@ -57,27 +66,42 @@ class AccountList extends React.Component {
     render() {
         let {removeButton, white, list} = this.props;
 
-        let rows = list.map((account, index) => {
-            return (
-                <AccountRow
-                    key={account}
-                    onRemove={removeButton ? this._onRemove.bind(this, white ? "white_listed" : "black_listed") : null}
-                    account={account}
-                    index={index + 1}
-                />
-            )
-        }).toArray();
+        let rows = list
+            .map((account, index) => {
+                return (
+                    <AccountRow
+                        key={account}
+                        onRemove={
+                            removeButton
+                                ? this._onRemove.bind(
+                                      this,
+                                      white ? "white_listed" : "black_listed"
+                                  )
+                                : null
+                        }
+                        account={account}
+                        index={index + 1}
+                    />
+                );
+            })
+            .toArray();
 
         let showHeaders = true;
         if (!rows.length) {
             showHeaders = false;
             rows.push(
                 <tr key="empty">
-                    <td style={{padding: "1rem 0"}} colSpan={removeButton ? 4 : 3}>
-                        <Translate content={this.props.emptyText} account={this.props.account.get("name")}/>
+                    <td
+                        style={{padding: "1rem 0"}}
+                        colSpan={removeButton ? 4 : 3}
+                    >
+                        <Translate
+                            content={this.props.emptyText}
+                            account={this.props.account.get("name")}
+                        />
                     </td>
                 </tr>
-            )
+            );
         }
 
         return (
@@ -86,21 +110,23 @@ class AccountList extends React.Component {
                     <thead>
                         <tr>
                             <th>#</th>
-                            <th><Translate content="account.id" /></th>
-                            <th><Translate content="account.name" /></th>
-                            {removeButton ? <th></th> : null}
+                            <th>
+                                <Translate content="account.id" />
+                            </th>
+                            <th>
+                                <Translate content="account.name" />
+                            </th>
+                            {removeButton ? <th /> : null}
                         </tr>
-                    </thead>) : null}
-                <tbody>
-                    {rows}
-                </tbody>
+                    </thead>
+                ) : null}
+                <tbody>{rows}</tbody>
             </table>
         );
     }
 }
 
 class AccountWhitelist extends React.Component {
-
     constructor() {
         super();
 
@@ -136,13 +162,13 @@ class AccountWhitelist extends React.Component {
         if (accountToList) {
             let tr = WalletApi.new_transaction();
             tr.add_type_operation("account_whitelist", {
-                "fee": {
-                    "amount": 0,
-                    "asset_id": "1.3.0"
+                fee: {
+                    amount: 0,
+                    asset_id: "1.3.0"
                 },
-                "authorizing_account": account.get("id"),
-                "account_to_list": accountToList,
-                "new_listing": currentState + constants.account_listing[listing]
+                authorizing_account: account.get("id"),
+                account_to_list: accountToList,
+                new_listing: currentState + constants.account_listing[listing]
             });
             WalletDb.process_transaction(tr, null, true);
         }
@@ -176,31 +202,53 @@ class AccountWhitelist extends React.Component {
                             className="account-tabs"
                             tabsClass="account-overview no-padding bordered-header content-block"
                             setting="whitelistTab"
-                            contentClass="grid-content shrink small-vertical medium-horizontal no-padding" 
+                            contentClass="grid-content shrink small-vertical medium-horizontal no-padding"
                             segmented={false}
                         >
                             <Tab title="account.whitelist.title">
-                                <div style={{paddingBottom: "1rem"}} className="small-12">
+                                <div
+                                    style={{paddingBottom: "1rem"}}
+                                    className="small-12"
+                                >
                                     <div>
                                         <AccountList
                                             emptyText="account.whitelist.empty"
                                             account={account}
-                                            getCurrentState={this._getCurrentState.bind(this)}
-                                            list={account.get("whitelisted_accounts") || Immutable.List()}
+                                            getCurrentState={this._getCurrentState.bind(
+                                                this
+                                            )}
+                                            list={
+                                                account.get(
+                                                    "whitelisted_accounts"
+                                                ) || Immutable.List()
+                                            }
                                             removeButton
                                             white={true}
                                         />
                                     </div>
-                                    {!account.get("whitelisted_accounts") ? <p className="has-error">Please note, whitelisting is not working yet due to unresolved backend issue.</p> : null}
+                                    {!account.get("whitelisted_accounts") ? (
+                                        <p className="has-error">
+                                            Please note, whitelisting is not
+                                            working yet due to unresolved
+                                            backend issue.
+                                        </p>
+                                    ) : null}
                                     <div style={{padding: "2rem 0"}}>
                                         <AccountSelector
                                             label={"account.whitelist.add"}
                                             accountName={accountName}
-                                            onAccountChanged={this._onAccountFound.bind(this)}
-                                            onChange={this._onAccountChanged.bind(this)}
+                                            onAccountChanged={this._onAccountFound.bind(
+                                                this
+                                            )}
+                                            onChange={this._onAccountChanged.bind(
+                                                this
+                                            )}
                                             account={accountName}
                                             tabIndex={2}
-                                            onAction={this._onAdd.bind(this, "white_listed")}
+                                            onAction={this._onAdd.bind(
+                                                this,
+                                                "white_listed"
+                                            )}
                                             action_label="account.perm.confirm_add"
                                             white={false}
                                         />
@@ -209,25 +257,41 @@ class AccountWhitelist extends React.Component {
                             </Tab>
 
                             <Tab title="account.whitelist.black">
-                                <div style={{paddingBottom: "1rem"}} className="small-12">
+                                <div
+                                    style={{paddingBottom: "1rem"}}
+                                    className="small-12"
+                                >
                                     <div>
                                         <AccountList
                                             emptyText="account.whitelist.empty_black"
                                             account={account}
-                                            getCurrentState={this._getCurrentState.bind(this)}
-                                            list={account.get("blacklisted_accounts")}
+                                            getCurrentState={this._getCurrentState.bind(
+                                                this
+                                            )}
+                                            list={account.get(
+                                                "blacklisted_accounts"
+                                            )}
                                             removeButton
                                         />
                                     </div>
                                     <div style={{padding: "2rem 1rem"}}>
                                         <AccountSelector
-                                            label={"account.whitelist.add_black"}
+                                            label={
+                                                "account.whitelist.add_black"
+                                            }
                                             accountName={accountName}
-                                            onAccountChanged={this._onAccountFound.bind(this)}
-                                            onChange={this._onAccountChanged.bind(this)}
+                                            onAccountChanged={this._onAccountFound.bind(
+                                                this
+                                            )}
+                                            onChange={this._onAccountChanged.bind(
+                                                this
+                                            )}
                                             account={accountName}
                                             tabIndex={2}
-                                            onAction={this._onAdd.bind(this, "black_listed")}
+                                            onAction={this._onAdd.bind(
+                                                this,
+                                                "black_listed"
+                                            )}
                                             action_label="account.perm.confirm_add"
                                         />
                                     </div>
@@ -235,37 +299,44 @@ class AccountWhitelist extends React.Component {
                             </Tab>
 
                             <Tab title="account.whitelist.white_by">
-                                <div style={{paddingBottom: "1rem"}} className="small-12">
+                                <div
+                                    style={{paddingBottom: "1rem"}}
+                                    className="small-12"
+                                >
                                     <div>
                                         <AccountList
                                             emptyText="account.whitelist.empty_white_by"
                                             account={account}
-                                            list={account.get("whitelisting_accounts")}
+                                            list={account.get(
+                                                "whitelisting_accounts"
+                                            )}
                                         />
                                     </div>
                                 </div>
                             </Tab>
 
                             <Tab title="account.whitelist.black_by">
-                                <div style={{paddingBottom: "1rem"}} className="small-12">
+                                <div
+                                    style={{paddingBottom: "1rem"}}
+                                    className="small-12"
+                                >
                                     <div>
                                         <AccountList
                                             emptyText="account.whitelist.empty_black_by"
                                             account={account}
-                                            list={account.get("blacklisting_accounts")}
+                                            list={account.get(
+                                                "blacklisting_accounts"
+                                            )}
                                         />
                                     </div>
                                 </div>
                             </Tab>
-
-
                         </Tabs>
                     </div>
                 </div>
             </div>
-        )
+        );
     }
-
 }
 
 export default AccountWhitelist;
diff --git a/app/components/Account/AssetFeedProducers.jsx b/app/components/Account/AssetFeedProducers.jsx
index 9ced938d91..c323e2b22a 100644
--- a/app/components/Account/AssetFeedProducers.jsx
+++ b/app/components/Account/AssetFeedProducers.jsx
@@ -6,12 +6,11 @@ import Translate from "react-translate-component";
 import Icon from "../Icon/Icon";
 
 export default class AccountFeedProducers extends React.Component {
-
     constructor(props) {
         super(props);
 
         this.state = {
-            producer_name: null,
+            producer_name: null
         };
     }
 
@@ -33,8 +32,15 @@ export default class AccountFeedProducers extends React.Component {
         if (witnessFed || committeeFed) {
             return (
                 <div className="grid-content small-12 large-8 large-offset-2">
-                    <Translate component="p" content="account.user_issued_assets.feed_not_allowed_1" className="has-error"></Translate>
-                    <Translate component="p" content="account.user_issued_assets.feed_not_allowed_2"></Translate>
+                    <Translate
+                        component="p"
+                        content="account.user_issued_assets.feed_not_allowed_1"
+                        className="has-error"
+                    />
+                    <Translate
+                        component="p"
+                        content="account.user_issued_assets.feed_not_allowed_2"
+                    />
                 </div>
             );
         }
@@ -44,19 +50,37 @@ export default class AccountFeedProducers extends React.Component {
                 <table className="table dashboard-table table-hover">
                     <thead>
                         <tr>
-                            <th></th>
-                            <th style={{textAlign: "left"}}><Translate content="explorer.account.title" /></th>
-                            <th><Translate content="account.perm.remove_text" /></th>
+                            <th />
+                            <th style={{textAlign: "left"}}>
+                                <Translate content="explorer.account.title" />
+                            </th>
+                            <th>
+                                <Translate content="account.perm.remove_text" />
+                            </th>
                         </tr>
                     </thead>
                     <tbody>
                         {this.props.producers.map((a, i) => {
                             return (
                                 <tr key={a}>
-                                    <td style={{textAlign: "left"}}>#{i + 1}</td>
-                                    <td style={{textAlign: "left"}}><LinkToAccountById account={a} /></td>
-                                    <td className="clickable" onClick={this.props.onChangeList.bind(this, "remove", a)}>
-                                        <Icon name="cross-circle" className="icon-14px" />
+                                    <td style={{textAlign: "left"}}>
+                                        #{i + 1}
+                                    </td>
+                                    <td style={{textAlign: "left"}}>
+                                        <LinkToAccountById account={a} />
+                                    </td>
+                                    <td
+                                        className="clickable"
+                                        onClick={this.props.onChangeList.bind(
+                                            this,
+                                            "remove",
+                                            a
+                                        )}
+                                    >
+                                        <Icon
+                                            name="cross-circle"
+                                            className="icon-14px"
+                                        />
                                     </td>
                                 </tr>
                             );
@@ -73,9 +97,13 @@ export default class AccountFeedProducers extends React.Component {
                         error={null}
                         tabIndex={1}
                         action_label="account.perm.confirm_add"
-                        onAction={this.props.onChangeList.bind(this, "add", this.state.new_producer_id)}
-                     />
-                 </div>
+                        onAction={this.props.onChangeList.bind(
+                            this,
+                            "add",
+                            this.state.new_producer_id
+                        )}
+                    />
+                </div>
             </div>
         );
     }
diff --git a/app/components/Account/AssetWhitelist.jsx b/app/components/Account/AssetWhitelist.jsx
index 77700e63e7..c041b1683e 100644
--- a/app/components/Account/AssetWhitelist.jsx
+++ b/app/components/Account/AssetWhitelist.jsx
@@ -6,12 +6,11 @@ import AccountSelector from "../Account/AccountSelector";
 import AssetSelector from "../Utility/AssetSelector";
 import cnames from "classnames";
 import Translate from "react-translate-component";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import SettingsStore from "stores/SettingsStore";
 import SettingsActions from "actions/SettingsActions";
 
 class AssetWhitelist extends React.Component {
-
     constructor(props) {
         super();
 
@@ -33,24 +32,49 @@ class AssetWhitelist extends React.Component {
         const {listType} = this.state;
 
         if (!this.props.whiteListEnabled)
-            return <div><Translate className="txtlabel cancel" component="p" content="explorer.asset.whitelist.enable_flag" /></div>;
+            return (
+                <div>
+                    <Translate
+                        className="txtlabel cancel"
+                        component="p"
+                        content="explorer.asset.whitelist.enable_flag"
+                    />
+                </div>
+            );
 
         return (
             <div>
                 <table className="table dashboard-table table-hover">
                     <thead>
                         <tr>
-                            <th><Translate content="explorer.account.title" /></th>
-                            <th><Translate content="account.perm.remove_text" /></th>
+                            <th>
+                                <Translate content="explorer.account.title" />
+                            </th>
+                            <th>
+                                <Translate content="account.perm.remove_text" />
+                            </th>
                         </tr>
                     </thead>
                     <tbody>
                         {this.props[listType].map(a => {
                             return (
                                 <tr key={a}>
-                                    <td><LinkToAccountById account={a} /></td>
-                                    <td className="clickable" onClick={this.props.onChangeList.bind(this, listType, "remove", a)}>
-                                        <Icon name="cross-circle" className="icon-14px" />
+                                    <td>
+                                        <LinkToAccountById account={a} />
+                                    </td>
+                                    <td
+                                        className="clickable"
+                                        onClick={this.props.onChangeList.bind(
+                                            this,
+                                            listType,
+                                            "remove",
+                                            a
+                                        )}
+                                    >
+                                        <Icon
+                                            name="cross-circle"
+                                            className="icon-14px"
+                                        />
                                     </td>
                                 </tr>
                             );
@@ -62,15 +86,26 @@ class AssetWhitelist extends React.Component {
                         label={`account.whitelist.${listType}`}
                         accountName={this.props.authority_name}
                         account={this.props.authority_name}
-                        onChange={this.props.onAccountNameChanged.bind(this, "authority_name")}
-                        onAccountChanged={this.props.onAccountChanged.bind(this, "new_authority_id")}
+                        onChange={this.props.onAccountNameChanged.bind(
+                            this,
+                            "authority_name"
+                        )}
+                        onAccountChanged={this.props.onAccountChanged.bind(
+                            this,
+                            "new_authority_id"
+                        )}
                         error={null}
                         tabIndex={1}
                         action_label="account.perm.confirm_add"
-                        onAction={this.props.onChangeList.bind(this, listType, "add", this.props.new_authority_id)}
-                     />
-                 </div>
-             </div>
+                        onAction={this.props.onChangeList.bind(
+                            this,
+                            listType,
+                            "add",
+                            this.props.new_authority_id
+                        )}
+                    />
+                </div>
+            </div>
         );
     }
 
@@ -94,17 +129,34 @@ class AssetWhitelist extends React.Component {
                 <table className="table dashboard-table table-hover">
                     <thead>
                         <tr>
-                            <th><Translate content="explorer.asset.title" /></th>
-                            <th><Translate content="account.perm.remove_text" /></th>
+                            <th>
+                                <Translate content="explorer.asset.title" />
+                            </th>
+                            <th>
+                                <Translate content="account.perm.remove_text" />
+                            </th>
                         </tr>
                     </thead>
                     <tbody>
                         {this.props[listType].map(a => {
                             return (
                                 <tr key={a}>
-                                    <td><LinkToAssetById asset={a} /></td>
-                                    <td className="clickable" onClick={this.props.onChangeList.bind(this, listType, "remove", a)}>
-                                        <Icon name="cross-circle" className="icon-14px" />
+                                    <td>
+                                        <LinkToAssetById asset={a} />
+                                    </td>
+                                    <td
+                                        className="clickable"
+                                        onClick={this.props.onChangeList.bind(
+                                            this,
+                                            listType,
+                                            "remove",
+                                            a
+                                        )}
+                                    >
+                                        <Icon
+                                            name="cross-circle"
+                                            className="icon-14px"
+                                        />
                                     </td>
                                 </tr>
                             );
@@ -121,7 +173,12 @@ class AssetWhitelist extends React.Component {
                         style={{width: "100%"}}
                         onFound={this._onAssetFound.bind(this)}
                         action_label="account.perm.confirm_add"
-                        onAction={this.props.onChangeList.bind(this, listType, "add", this.state.asset_id)}
+                        onAction={this.props.onChangeList.bind(
+                            this,
+                            listType,
+                            "add",
+                            this.state.asset_id
+                        )}
                     />
                 </div>
             </div>
@@ -145,18 +202,34 @@ class AssetWhitelist extends React.Component {
         return (
             <div className="small-12 large-8 large-offset-2 grid-content">
                 <div>
-                    <div className="header-selector" style={{paddingBottom: "2rem"}}>
+                    <div
+                        className="header-selector"
+                        style={{paddingBottom: "2rem"}}
+                    >
                         <div className="selector">
                             {this.state.listTypes.map((type, index) => {
                                 return (
-                                    <div key={type} className={cnames("inline-block", {inactive: activeIndex !== index})} onClick={this._onSwitchType.bind(this, type)}>
-                                        <Translate content={`explorer.asset.whitelist.${type}`} />
+                                    <div
+                                        key={type}
+                                        className={cnames("inline-block", {
+                                            inactive: activeIndex !== index
+                                        })}
+                                        onClick={this._onSwitchType.bind(
+                                            this,
+                                            type
+                                        )}
+                                    >
+                                        <Translate
+                                            content={`explorer.asset.whitelist.${type}`}
+                                        />
                                     </div>
                                 );
                             })}
                         </div>
                     </div>
-                    {accountTable ? this.renderAccountTables() : this.renderMarketTable()}
+                    {accountTable
+                        ? this.renderAccountTables()
+                        : this.renderMarketTable()}
                     {this.props.children}
                 </div>
             </div>
diff --git a/app/components/Account/Connections.jsx b/app/components/Account/Connections.jsx
index 5961a5438d..a485ecb690 100644
--- a/app/components/Account/Connections.jsx
+++ b/app/components/Account/Connections.jsx
@@ -3,32 +3,62 @@ import {Link} from "react-router/es";
 import Translate from "react-translate-component";
 
 class Connections extends React.Component {
-
     render() {
         let {organizations, blackList, isMyAccount} = this.props;
-        let knownBy = organizations ? organizations.map((account, i) => {
-            if (i< 5) {
-                return <li key={account}>X: <Link to={`/account/${account}/overview/`}>{account}</Link></li>;
-            }
-        }) : null;
+        let knownBy = organizations
+            ? organizations.map((account, i) => {
+                  if (i < 5) {
+                      return (
+                          <li key={account}>
+                              X:{" "}
+                              <Link to={`/account/${account}/overview/`}>
+                                  {account}
+                              </Link>
+                          </li>
+                      );
+                  }
+              })
+            : null;
 
-        let unwanted = blackList ? blackList.map((account, i) => {
-            if (i< 5) {
-                return <li key={account}>X: <Link to={`/account/${account}/overview/`}>{account}</Link></li>;
-            }
-        }) : null;
+        let unwanted = blackList
+            ? blackList.map((account, i) => {
+                  if (i < 5) {
+                      return (
+                          <li key={account}>
+                              X:{" "}
+                              <Link to={`/account/${account}/overview/`}>
+                                  {account}
+                              </Link>
+                          </li>
+                      );
+                  }
+              })
+            : null;
 
         return (
             <div>
-              <h5><Translate component="span" content="account.connections.known" /></h5>
-              <ul style={{listStyle: "none", marginLeft: "0.25rem"}}>
-                {knownBy}
-              </ul>
-              <hr/>
-              <h5 className="inline-block"><Translate component="span" content="account.connections.black" /></h5> {isMyAccount ? <button className="hollow button tiny">Claim</button> : null}
-              <ul style={{listStyle: "none", marginLeft: "0.25rem"}}>
-                {unwanted}
-              </ul>
+                <h5>
+                    <Translate
+                        component="span"
+                        content="account.connections.known"
+                    />
+                </h5>
+                <ul style={{listStyle: "none", marginLeft: "0.25rem"}}>
+                    {knownBy}
+                </ul>
+                <hr />
+                <h5 className="inline-block">
+                    <Translate
+                        component="span"
+                        content="account.connections.black"
+                    />
+                </h5>{" "}
+                {isMyAccount ? (
+                    <button className="hollow button tiny">Claim</button>
+                ) : null}
+                <ul style={{listStyle: "none", marginLeft: "0.25rem"}}>
+                    {unwanted}
+                </ul>
             </div>
         );
     }
diff --git a/app/components/Account/CreateAccount.jsx b/app/components/Account/CreateAccount.jsx
index 7e20339e5b..66a08dca00 100644
--- a/app/components/Account/CreateAccount.jsx
+++ b/app/components/Account/CreateAccount.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import classNames from "classnames";
 import AccountActions from "actions/AccountActions";
 import AccountStore from "stores/AccountStore";
@@ -68,8 +68,8 @@ class CreateAccount extends React.Component {
 
     onAccountNameChange(e) {
         const state = {};
-        if(e.valid !== undefined) state.validAccountName = e.valid;
-        if(e.value !== undefined) state.accountName = e.value;
+        if (e.valid !== undefined) state.validAccountName = e.valid;
+        if (e.value !== undefined) state.accountName = e.value;
         if (!this.state.show_identicon) state.show_identicon = true;
         this.setState(state);
     }
@@ -79,11 +79,16 @@ class CreateAccount extends React.Component {
     }
 
     onFinishConfirm(confirm_store_state) {
-        if(confirm_store_state.included && confirm_store_state.broadcasted_transaction) {
+        if (
+            confirm_store_state.included &&
+            confirm_store_state.broadcasted_transaction
+        ) {
             TransactionConfirmStore.unlisten(this.onFinishConfirm);
             TransactionConfirmStore.reset();
 
-            FetchChain("getAccount", this.state.accountName, undefined, {[this.state.accountName]: true}).then(() => {
+            FetchChain("getAccount", this.state.accountName, undefined, {
+                [this.state.accountName]: true
+            }).then(() => {
                 console.log("onFinishConfirm");
                 this.props.router.push("/wallet/backup/create?newAccount=true");
             });
@@ -96,36 +101,51 @@ class CreateAccount extends React.Component {
         WalletUnlockActions.unlock().then(() => {
             this.setState({loading: true});
 
-            AccountActions.createAccount(name, this.state.registrar_account, referralAccount || this.state.registrar_account, 0, refcode).then(() => {
-                // User registering his own account
-                if(this.state.registrar_account) {
-                    FetchChain("getAccount", name, undefined, {[name]: true}).then(() => {
-                        this.setState({
-                            step: 2,
-                            loading: false
+            AccountActions.createAccount(
+                name,
+                this.state.registrar_account,
+                referralAccount || this.state.registrar_account,
+                0,
+                refcode
+            )
+                .then(() => {
+                    // User registering his own account
+                    if (this.state.registrar_account) {
+                        FetchChain("getAccount", name, undefined, {
+                            [name]: true
+                        }).then(() => {
+                            this.setState({
+                                step: 2,
+                                loading: false
+                            });
                         });
-                    });
-                    TransactionConfirmStore.listen(this.onFinishConfirm);
-                } else { // Account registered by the faucet
-                    FetchChain("getAccount", name, undefined, {[name]: true}).then(() => {
-                        this.setState({
-                            step: 2,
-                            loading: false
+                        TransactionConfirmStore.listen(this.onFinishConfirm);
+                    } else {
+                        // Account registered by the faucet
+                        FetchChain("getAccount", name, undefined, {
+                            [name]: true
+                        }).then(() => {
+                            this.setState({
+                                step: 2,
+                                loading: false
+                            });
                         });
+                    }
+                })
+                .catch(error => {
+                    console.log("ERROR AccountActions.createAccount", error);
+                    let error_msg =
+                        error.base && error.base.length && error.base.length > 0
+                            ? error.base[0]
+                            : "unknown error";
+                    if (error.remote_ip) error_msg = error.remote_ip[0];
+                    notify.addNotification({
+                        message: `Failed to create account: ${name} - ${error_msg}`,
+                        level: "error",
+                        autoDismiss: 10
                     });
-
-                }
-            }).catch(error => {
-                console.log("ERROR AccountActions.createAccount", error);
-                let error_msg = error.base && error.base.length && error.base.length > 0 ? error.base[0] : "unknown error";
-                if (error.remote_ip) error_msg = error.remote_ip[0];
-                notify.addNotification({
-                    message: `Failed to create account: ${name} - ${error_msg}`,
-                    level: "error",
-                    autoDismiss: 10
+                    this.setState({loading: false});
                 });
-                this.setState({loading: false});
-            });
         });
     }
 
@@ -133,16 +153,20 @@ class CreateAccount extends React.Component {
         return WalletActions.setWallet(
             "default", //wallet name
             password
-        ).then(()=> {
-            console.log("Congratulations, your wallet was successfully created.");
-        }).catch(err => {
-            console.log("CreateWallet failed:", err);
-            notify.addNotification({
-                message: `Failed to create wallet: ${err}`,
-                level: "error",
-                autoDismiss: 10
+        )
+            .then(() => {
+                console.log(
+                    "Congratulations, your wallet was successfully created."
+                );
             })
-        });
+            .catch(err => {
+                console.log("CreateWallet failed:", err);
+                notify.addNotification({
+                    message: `Failed to create wallet: ${err}`,
+                    level: "error",
+                    autoDismiss: 10
+                });
+            });
     }
 
     onSubmit(e) {
@@ -153,7 +177,9 @@ class CreateAccount extends React.Component {
             this.createAccount(account_name);
         } else {
             let password = this.refs.password.value();
-            this.createWallet(password).then(() => this.createAccount(account_name));
+            this.createWallet(password).then(() =>
+                this.createAccount(account_name)
+            );
         }
     }
 
@@ -167,7 +193,6 @@ class CreateAccount extends React.Component {
     // }
 
     _renderAccountCreateForm() {
-
         let {registrar_account} = this.state;
 
         let my_accounts = AccountStore.getMyAccounts();
@@ -175,14 +200,18 @@ class CreateAccount extends React.Component {
         let hasWallet = WalletDb.getWallet();
         let valid = this.isValid();
         let isLTM = false;
-        let registrar = registrar_account ? ChainStore.getAccount(registrar_account) : null;
+        let registrar = registrar_account
+            ? ChainStore.getAccount(registrar_account)
+            : null;
         if (registrar) {
-            if( registrar.get( "lifetime_referrer" ) == registrar.get( "id" ) ) {
+            if (registrar.get("lifetime_referrer") == registrar.get("id")) {
                 isLTM = true;
             }
         }
 
-        let buttonClass = classNames("submit-button button no-margin", {disabled: (!valid || (registrar_account && !isLTM))});
+        let buttonClass = classNames("submit-button button no-margin", {
+            disabled: !valid || (registrar_account && !isLTM)
+        });
 
         return (
             <form
@@ -190,9 +219,25 @@ class CreateAccount extends React.Component {
                 onSubmit={this.onSubmit.bind(this)}
                 noValidate
             >
-                <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}>{firstAccount ? <Translate content="wallet.create_w_a" />  : <Translate content="wallet.create_a" />}</p>
+                <p
+                    style={{
+                        fontWeight: "normal",
+                        fontFamily: "Roboto-Medium, arial, sans-serif",
+                        fontStyle: "normal"
+                    }}
+                >
+                    {firstAccount ? (
+                        <Translate content="wallet.create_w_a" />
+                    ) : (
+                        <Translate content="wallet.create_a" />
+                    )}
+                </p>
                 <AccountNameInput
-                    ref={(ref) => {if (ref) {this.accountNameInput = ref.refs.nameInput;}}}
+                    ref={ref => {
+                        if (ref) {
+                            this.accountNameInput = ref.refs.nameInput;
+                        }
+                    }}
                     cheapNameOnly={!!firstAccount}
                     onChange={this.onAccountNameChange.bind(this)}
                     accountShouldNotExist={true}
@@ -201,35 +246,47 @@ class CreateAccount extends React.Component {
                 />
 
                 {/* Only ask for password if a wallet already exists */}
-                {hasWallet ?
-                    null :
-                        <PasswordInput
-                            ref="password"
-                            confirmation={true}
-                            onChange={this.onPasswordChange.bind(this)}
-                            noLabel
-                            checkStrength
-                        />
-                }
+                {hasWallet ? null : (
+                    <PasswordInput
+                        ref="password"
+                        confirmation={true}
+                        onChange={this.onPasswordChange.bind(this)}
+                        noLabel
+                        checkStrength
+                    />
+                )}
 
                 {/* If this is not the first account, show dropdown for fee payment account */}
-                {
-                firstAccount ? null : (
+                {firstAccount ? null : (
                     <div className="full-width-content form-group no-overflow">
-                        <label><Translate content="account.pay_from" /></label>
+                        <label>
+                            <Translate content="account.pay_from" />
+                        </label>
                         <AccountSelect
                             account_names={my_accounts}
                             onChange={this.onRegistrarAccountChange.bind(this)}
-
                         />
-                        {(registrar_account && !isLTM) ? <div style={{textAlign: "left"}} className="facolor-error"><Translate content="wallet.must_be_ltm" /></div> : null}
-                    </div>)
-                }
+                        {registrar_account && !isLTM ? (
+                            <div
+                                style={{textAlign: "left"}}
+                                className="facolor-error"
+                            >
+                                <Translate content="wallet.must_be_ltm" />
+                            </div>
+                        ) : null}
+                    </div>
+                )}
 
                 <div className="divider" />
 
                 {/* Submit button */}
-                {this.state.loading ?  <LoadingIndicator type="three-bounce"/> : <button style={{width: "100%"}} className={buttonClass}><Translate content="account.create_account" /></button>}
+                {this.state.loading ? (
+                    <LoadingIndicator type="three-bounce" />
+                ) : (
+                    <button style={{width: "100%"}} className={buttonClass}>
+                        <Translate content="account.create_account" />
+                    </button>
+                )}
 
                 {/* Backup restore option */}
                 <div style={{paddingTop: 40}}>
@@ -247,11 +304,19 @@ class CreateAccount extends React.Component {
                 </div>
 
                 {/* Skip to step 3 */}
-                {(!hasWallet || firstAccount ) ? null :<div style={{paddingTop: 20}}>
-                    <label>
-                        <a onClick={() => {this.setState({step: 3});}}><Translate content="wallet.go_get_started" /></a>
-                    </label>
-                </div>}
+                {!hasWallet || firstAccount ? null : (
+                    <div style={{paddingTop: 20}}>
+                        <label>
+                            <a
+                                onClick={() => {
+                                    this.setState({step: 3});
+                                }}
+                            >
+                                <Translate content="wallet.go_get_started" />
+                            </a>
+                        </label>
+                    </div>
+                )}
             </form>
         );
     }
@@ -262,16 +327,44 @@ class CreateAccount extends React.Component {
         let firstAccount = my_accounts.length === 0;
 
         return (
-            <div className="confirm-checks" >
-                <h4 style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal", paddingBottom: 15, marginTop: 0}}><Translate content="wallet.wallet_browser" /></h4>
-
-                <p>{!hasWallet ? <Translate content="wallet.has_wallet" /> : null}</p>
-
-                <Translate style={{textAlign: "left"}} component="p" content="wallet.create_account_text" />
+            <div className="confirm-checks">
+                <h4
+                    style={{
+                        fontWeight: "normal",
+                        fontFamily: "Roboto-Medium, arial, sans-serif",
+                        fontStyle: "normal",
+                        paddingBottom: 15,
+                        marginTop: 0
+                    }}
+                >
+                    <Translate content="wallet.wallet_browser" />
+                </h4>
+
+                <p>
+                    {!hasWallet ? (
+                        <Translate content="wallet.has_wallet" />
+                    ) : null}
+                </p>
+
+                <Translate
+                    style={{textAlign: "left"}}
+                    component="p"
+                    content="wallet.create_account_text"
+                />
 
-                {firstAccount ?
-                    <Translate style={{textAlign: "left"}} component="p" content="wallet.first_account_paid" /> :
-                    <Translate style={{textAlign: "left"}} component="p" content="wallet.not_first_account" />}
+                {firstAccount ? (
+                    <Translate
+                        style={{textAlign: "left"}}
+                        component="p"
+                        content="wallet.first_account_paid"
+                    />
+                ) : (
+                    <Translate
+                        style={{textAlign: "left"}}
+                        component="p"
+                        content="wallet.not_first_account"
+                    />
+                )}
 
                 {/* {this.state.hide_refcode ? null :
                     <div>
@@ -286,9 +379,11 @@ class CreateAccount extends React.Component {
     _renderBackup() {
         return (
             <div className="backup-submit">
-                <p><Translate unsafe content="wallet.wallet_crucial" /></p>
+                <p>
+                    <Translate unsafe content="wallet.wallet_crucial" />
+                </p>
                 <div className="divider" />
-                <BackupCreate noText downloadCb={this._onBackupDownload}/>
+                <BackupCreate noText downloadCb={this._onBackupDownload} />
             </div>
         );
     }
@@ -297,69 +392,123 @@ class CreateAccount extends React.Component {
         this.setState({
             step: 3
         });
-    }
+    };
 
     _renderBackupText() {
         return (
             <div>
-                <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}><Translate content="footer.backup" /></p>
-                <p><Translate content="wallet.wallet_move" unsafe /></p>
-                <p className="txtlabel warning"><Translate unsafe content="wallet.wallet_lose_warning" /></p>
+                <p
+                    style={{
+                        fontWeight: "normal",
+                        fontFamily: "Roboto-Medium, arial, sans-serif",
+                        fontStyle: "normal"
+                    }}
+                >
+                    <Translate content="footer.backup" />
+                </p>
+                <p>
+                    <Translate content="wallet.wallet_move" unsafe />
+                </p>
+                <p className="txtlabel warning">
+                    <Translate unsafe content="wallet.wallet_lose_warning" />
+                </p>
             </div>
         );
     }
 
     _renderGetStarted() {
-
         return (
             <div>
                 <table className="table">
                     <tbody>
-
                         <tr>
-                            <td><Translate content="wallet.tips_dashboard" />:</td>
-                            <td><Link to="/dashboard"><Translate content="header.dashboard" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_dashboard" />:
+                            </td>
+                            <td>
+                                <Link to="/dashboard">
+                                    <Translate content="header.dashboard" />
+                                </Link>
+                            </td>
                         </tr>
 
                         <tr>
-                            <td><Translate content="wallet.tips_account" />:</td>
-                            <td><Link to={`/account/${this.state.accountName}/overview`} ><Translate content="wallet.link_account" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_account" />:
+                            </td>
+                            <td>
+                                <Link
+                                    to={`/account/${
+                                        this.state.accountName
+                                    }/overview`}
+                                >
+                                    <Translate content="wallet.link_account" />
+                                </Link>
+                            </td>
                         </tr>
 
                         <tr>
-                            <td><Translate content="wallet.tips_deposit" />:</td>
-                            <td><Link to="/deposit-withdraw"><Translate content="wallet.link_deposit" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_deposit" />:
+                            </td>
+                            <td>
+                                <Link to="/deposit-withdraw">
+                                    <Translate content="wallet.link_deposit" />
+                                </Link>
+                            </td>
                         </tr>
 
-
-
                         <tr>
-                            <td><Translate content="wallet.tips_transfer" />:</td>
-                            <td><Link to="/transfer"><Translate content="wallet.link_transfer" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_transfer" />:
+                            </td>
+                            <td>
+                                <Link to="/transfer">
+                                    <Translate content="wallet.link_transfer" />
+                                </Link>
+                            </td>
                         </tr>
 
                         <tr>
-                            <td><Translate content="wallet.tips_settings" />:</td>
-                            <td><Link to="/settings"><Translate content="header.settings" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_settings" />:
+                            </td>
+                            <td>
+                                <Link to="/settings">
+                                    <Translate content="header.settings" />
+                                </Link>
+                            </td>
                         </tr>
                     </tbody>
-
                 </table>
             </div>
         );
     }
 
     _renderGetStartedText() {
-
         return (
             <div>
-                <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}><Translate content="wallet.congrat" /></p>
-
-                <p><Translate content="wallet.tips_explore" /></p>
-
-                <p><Translate content="wallet.tips_header" /></p>
-
-                <p className="txtlabel warning"><Translate content="wallet.tips_login" /></p>
+                <p
+                    style={{
+                        fontWeight: "normal",
+                        fontFamily: "Roboto-Medium, arial, sans-serif",
+                        fontStyle: "normal"
+                    }}
+                >
+                    <Translate content="wallet.congrat" />
+                </p>
+
+                <p>
+                    <Translate content="wallet.tips_explore" />
+                </p>
+
+                <p>
+                    <Translate content="wallet.tips_header" />
+                </p>
+
+                <p className="txtlabel warning">
+                    <Translate content="wallet.tips_login" />
+                </p>
             </div>
         );
     }
@@ -369,23 +518,38 @@ class CreateAccount extends React.Component {
 
         return (
             <div className="sub-content">
-
-                    <div style={{maxWidth: "95vw"}}>
-                        {step !== 1 ? <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}>
+                <div style={{maxWidth: "95vw"}}>
+                    {step !== 1 ? (
+                        <p
+                            style={{
+                                fontWeight: "normal",
+                                fontFamily: "Roboto-Medium, arial, sans-serif",
+                                fontStyle: "normal"
+                            }}
+                        >
                             <Translate content={"wallet.step_" + step} />
-                        </p> : null}
-
-                        {step === 1 ? this._renderAccountCreateForm() : step === 2 ? this._renderBackup() :
-                            this._renderGetStarted()
-                        }
-                    </div>
+                        </p>
+                    ) : null}
+
+                    {step === 1
+                        ? this._renderAccountCreateForm()
+                        : step === 2
+                            ? this._renderBackup()
+                            : this._renderGetStarted()}
+                </div>
 
-                    <div style={{maxWidth: "95vw", paddingTop: "2rem"}}>
-                        {step === 1 ? this._renderAccountCreateText() : step === 2 ? this._renderBackupText() :
-                            this._renderGetStartedText()
-                        }
-                    </div>
-                    <Link to="/"><button className="button primary hollow"><Translate content="wallet.back" /></button></Link>
+                <div style={{maxWidth: "95vw", paddingTop: "2rem"}}>
+                    {step === 1
+                        ? this._renderAccountCreateText()
+                        : step === 2
+                            ? this._renderBackupText()
+                            : this._renderGetStartedText()}
+                </div>
+                <Link to="/">
+                    <button className="button primary hollow">
+                        <Translate content="wallet.back" />
+                    </button>
+                </Link>
             </div>
         );
     }
diff --git a/app/components/Account/CreateAccountPassword.jsx b/app/components/Account/CreateAccountPassword.jsx
index 4b8c69aef6..9b853d219b 100644
--- a/app/components/Account/CreateAccountPassword.jsx
+++ b/app/components/Account/CreateAccountPassword.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import classNames from "classnames";
 import AccountActions from "actions/AccountActions";
 import AccountStore from "stores/AccountStore";
@@ -37,7 +37,10 @@ class CreateAccountPassword extends React.Component {
             show_identicon: false,
             step: 1,
             showPass: false,
-            generatedPassword: ("P" + key.get_random_key().toWif()).substr(0, 45),
+            generatedPassword: ("P" + key.get_random_key().toWif()).substr(
+                0,
+                45
+            ),
             confirm_password: "",
             understand_1: false,
             understand_2: false,
@@ -79,28 +82,32 @@ class CreateAccountPassword extends React.Component {
 
     onAccountNameChange(e) {
         const state = {};
-        if(e.valid !== undefined) state.validAccountName = e.valid;
-        if(e.value !== undefined) state.accountName = e.value;
+        if (e.valid !== undefined) state.validAccountName = e.valid;
+        if (e.value !== undefined) state.accountName = e.value;
         if (!this.state.show_identicon) state.show_identicon = true;
         this.setState(state);
     }
 
     onFinishConfirm(confirm_store_state) {
-        if(confirm_store_state.included && confirm_store_state.broadcasted_transaction) {
+        if (
+            confirm_store_state.included &&
+            confirm_store_state.broadcasted_transaction
+        ) {
             TransactionConfirmStore.unlisten(this.onFinishConfirm);
             TransactionConfirmStore.reset();
 
-            FetchChain("getAccount", this.state.accountName, undefined, {[this.state.accountName]: true}).then(() => {
+            FetchChain("getAccount", this.state.accountName, undefined, {
+                [this.state.accountName]: true
+            }).then(() => {
                 this.props.router.push("/wallet/backup/create?newAccount=true");
             });
         }
     }
 
     _unlockAccount(name, password) {
-
         SettingsActions.changeSetting({
-                setting: "passwordLogin",
-                value: true
+            setting: "passwordLogin",
+            value: true
         });
 
         WalletDb.validatePassword(password, true, name);
@@ -112,38 +119,54 @@ class CreateAccountPassword extends React.Component {
         let referralAccount = AccountStore.getState().referralAccount;
         this.setState({loading: true});
 
-        AccountActions.createAccountWithPassword(name, password, this.state.registrar_account, referralAccount || this.state.registrar_account, 0, refcode).then(() => {
-            AccountActions.setPasswordAccount(name);
-            // User registering his own account
-            if(this.state.registrar_account) {
-                FetchChain("getAccount", name, undefined, {[name]: true}).then(() => {
-                    this.setState({
-                        step: 2,
-                        loading: false
+        AccountActions.createAccountWithPassword(
+            name,
+            password,
+            this.state.registrar_account,
+            referralAccount || this.state.registrar_account,
+            0,
+            refcode
+        )
+            .then(() => {
+                AccountActions.setPasswordAccount(name);
+                // User registering his own account
+                if (this.state.registrar_account) {
+                    FetchChain("getAccount", name, undefined, {
+                        [name]: true
+                    }).then(() => {
+                        this.setState({
+                            step: 2,
+                            loading: false
+                        });
+                        this._unlockAccount(name, password);
                     });
-                    this._unlockAccount(name, password);
-                });
-                TransactionConfirmStore.listen(this.onFinishConfirm);
-            } else { // Account registered by the faucet
-                FetchChain("getAccount", name, undefined, {[name]: true}).then(() => {
-                    this.setState({
-                        step: 2
+                    TransactionConfirmStore.listen(this.onFinishConfirm);
+                } else {
+                    // Account registered by the faucet
+                    FetchChain("getAccount", name, undefined, {
+                        [name]: true
+                    }).then(() => {
+                        this.setState({
+                            step: 2
+                        });
+                        this._unlockAccount(name, password);
                     });
-                    this._unlockAccount(name, password);
+                }
+            })
+            .catch(error => {
+                console.log("ERROR AccountActions.createAccount", error);
+                let error_msg =
+                    error.base && error.base.length && error.base.length > 0
+                        ? error.base[0]
+                        : "unknown error";
+                if (error.remote_ip) error_msg = error.remote_ip[0];
+                notify.addNotification({
+                    message: `Failed to create account: ${name} - ${error_msg}`,
+                    level: "error",
+                    autoDismiss: 10
                 });
-
-            }
-        }).catch(error => {
-            console.log("ERROR AccountActions.createAccount", error);
-            let error_msg = error.base && error.base.length && error.base.length > 0 ? error.base[0] : "unknown error";
-            if (error.remote_ip) error_msg = error.remote_ip[0];
-            notify.addNotification({
-                message: `Failed to create account: ${name} - ${error_msg}`,
-                level: "error",
-                autoDismiss: 10
+                this.setState({loading: false});
             });
-            this.setState({loading: false});
-        });
     }
 
     onSubmit(e) {
@@ -168,27 +191,36 @@ class CreateAccountPassword extends React.Component {
 
     _onInput(value, e) {
         this.setState({
-            [value]: value === "confirm_password" ? e.target.value : !this.state[value],
-            validPassword: value === "confirm_password" ? e.target.value === this.state.generatedPassword : this.state.validPassword
+            [value]:
+                value === "confirm_password"
+                    ? e.target.value
+                    : !this.state[value],
+            validPassword:
+                value === "confirm_password"
+                    ? e.target.value === this.state.generatedPassword
+                    : this.state.validPassword
         });
     }
 
     _renderAccountCreateForm() {
-
         let {registrar_account} = this.state;
 
         let my_accounts = AccountStore.getMyAccounts();
         let firstAccount = my_accounts.length === 0;
         let valid = this.isValid();
         let isLTM = false;
-        let registrar = registrar_account ? ChainStore.getAccount(registrar_account) : null;
+        let registrar = registrar_account
+            ? ChainStore.getAccount(registrar_account)
+            : null;
         if (registrar) {
-            if( registrar.get( "lifetime_referrer" ) == registrar.get( "id" ) ) {
+            if (registrar.get("lifetime_referrer") == registrar.get("id")) {
                 isLTM = true;
             }
         }
 
-        let buttonClass = classNames("submit-button button no-margin", {disabled: (!valid || (registrar_account && !isLTM))});
+        let buttonClass = classNames("submit-button button no-margin", {
+            disabled: !valid || (registrar_account && !isLTM)
+        });
 
         return (
             <div style={{textAlign: "left"}}>
@@ -198,76 +230,191 @@ class CreateAccountPassword extends React.Component {
                     noValidate
                 >
                     <AccountNameInput
-                        ref={(ref) => {if (ref) {this.accountNameInput = ref.refs.nameInput;}}}
+                        ref={ref => {
+                            if (ref) {
+                                this.accountNameInput = ref.refs.nameInput;
+                            }
+                        }}
                         cheapNameOnly={!!firstAccount}
                         onChange={this.onAccountNameChange.bind(this)}
                         accountShouldNotExist={true}
-                        placeholder={counterpart.translate("wallet.account_public")}
+                        placeholder={counterpart.translate(
+                            "wallet.account_public"
+                        )}
                         noLabel
                     />
 
-                <section className="form-group">
-                    <label className="left-label"><Translate content="wallet.generated" />&nbsp;&nbsp;<span className="tooltip" data-html={true} data-tip={counterpart.translate("tooltip.generate")}><Icon name="question-circle" /></span></label>
-                    <div style={{paddingBottom: "0.5rem"}}>
-                        <span className="inline-label">
-                            <input style={{maxWidth: "calc(30rem - 48px)", fontSize: "80%"}} disabled value={this.state.generatedPassword} type="text" className="input-button"/>
-                            <CopyButton
-                                text={this.state.generatedPassword}
-                                tip="tooltip.copy_password"
-                                dataPlace="top"
+                    <section className="form-group">
+                        <label className="left-label">
+                            <Translate content="wallet.generated" />&nbsp;&nbsp;<span
+                                className="tooltip"
+                                data-html={true}
+                                data-tip={counterpart.translate(
+                                    "tooltip.generate"
+                                )}
+                            >
+                                <Icon name="question-circle" />
+                            </span>
+                        </label>
+                        <div style={{paddingBottom: "0.5rem"}}>
+                            <span className="inline-label">
+                                <input
+                                    style={{
+                                        maxWidth: "calc(30rem - 48px)",
+                                        fontSize: "80%"
+                                    }}
+                                    disabled
+                                    value={this.state.generatedPassword}
+                                    type="text"
+                                    className="input-button"
+                                />
+                                <CopyButton
+                                    text={this.state.generatedPassword}
+                                    tip="tooltip.copy_password"
+                                    dataPlace="top"
+                                />
+                            </span>
+                        </div>
+                    </section>
+
+                    <section>
+                        <label className="left-label">
+                            <Translate content="wallet.confirm_password" />
+                        </label>
+                        <input
+                            type="password"
+                            name="password"
+                            id="password"
+                            value={this.state.confirm_password}
+                            onChange={this._onInput.bind(
+                                this,
+                                "confirm_password"
+                            )}
+                        />
+                        {this.state.confirm_password &&
+                        this.state.confirm_password !==
+                            this.state.generatedPassword ? (
+                            <div className="has-error">
+                                <Translate content="wallet.confirm_error" />
+                            </div>
+                        ) : null}
+                    </section>
+
+                    <br />
+
+                    <div
+                        className="confirm-checks"
+                        onClick={this._onInput.bind(this, "understand_3")}
+                    >
+                        <label
+                            htmlFor="checkbox-1"
+                            style={{position: "relative"}}
+                        >
+                            <input
+                                type="checkbox"
+                                id="checkbox-1"
+                                onChange={() => {}}
+                                checked={this.state.understand_3}
+                                style={{
+                                    position: "absolute",
+                                    top: "-5px",
+                                    left: "0"
+                                }}
+                            />
+                            <div style={{paddingLeft: "30px"}}>
+                                <Translate content="wallet.understand_3" />
+                            </div>
+                        </label>
+                    </div>
+                    <br />
+                    <div
+                        className="confirm-checks"
+                        onClick={this._onInput.bind(this, "understand_1")}
+                    >
+                        <label
+                            htmlFor="checkbox-2"
+                            style={{position: "relative"}}
+                        >
+                            <input
+                                type="checkbox"
+                                id="checkbox-2"
+                                onChange={() => {}}
+                                checked={this.state.understand_1}
+                                style={{
+                                    position: "absolute",
+                                    top: "-5px",
+                                    left: "0"
+                                }}
                             />
-                        </span>
+                            <div style={{paddingLeft: "30px"}}>
+                                <Translate content="wallet.understand_1" />
+                            </div>
+                        </label>
                     </div>
-                </section>
-
-                <section>
-                    <label className="left-label"><Translate content="wallet.confirm_password" /></label>
-                    <input type="password" name="password" id="password" value={this.state.confirm_password} onChange={this._onInput.bind(this, "confirm_password")}/>
-                    {this.state.confirm_password && this.state.confirm_password !== this.state.generatedPassword ?
-                    <div className="has-error"><Translate content="wallet.confirm_error" /></div> : null}
-                </section>
-
-            <br />
-
-            <div className="confirm-checks" onClick={this._onInput.bind(this, "understand_3")}>
-                <label htmlFor="checkbox-1" style={{position: "relative"}}>
-                    <input type="checkbox" id="checkbox-1" onChange={() => {}} checked={this.state.understand_3} style={{position: "absolute", top: "-5px", left: "0"}}/>
-                    <div style={{paddingLeft: "30px"}}><Translate content="wallet.understand_3" /></div>
-                </label>
-            </div>
-            <br />
-            <div className="confirm-checks" onClick={this._onInput.bind(this, "understand_1")}>
-                <label htmlFor="checkbox-2" style={{position: "relative"}}>
-                    <input type="checkbox" id="checkbox-2" onChange={() => {}} checked={this.state.understand_1} style={{position: "absolute", top: "-5px", left: "0"}}/>
-                    <div style={{paddingLeft: "30px"}}><Translate content="wallet.understand_1" /></div>
-                </label>
-            </div>
-            <br />
-
-            <div className="confirm-checks" style={{paddingBottom: "1.5rem"}} onClick={this._onInput.bind(this, "understand_2")}>
-                <label htmlFor="checkbox-3" style={{position: "relative"}}>
-                    <input type="checkbox" id="checkbox-3" onChange={() => {}} checked={this.state.understand_2} style={{position: "absolute", top: "-5px", left: "0"}}/>
-                    <div style={{paddingLeft: "30px"}}><Translate content="wallet.understand_2" /></div>
-                </label>
-            </div>
-                {/* If this is not the first account, show dropdown for fee payment account */}
-                {
-                firstAccount ? null : (
-                    <div className="full-width-content form-group no-overflow" style={{paddingTop: 30}}>
-                        <label><Translate content="account.pay_from" /></label>
-                        <AccountSelect
-                            account_names={my_accounts}
-                            onChange={this.onRegistrarAccountChange.bind(this)}
-                        />
-                        {(registrar_account && !isLTM) ? <div style={{textAlign: "left"}} className="facolor-error"><Translate content="wallet.must_be_ltm" /></div> : null}
-                    </div>)
-                }
-
-                {/* Submit button */}
-                {this.state.loading ?  <LoadingIndicator type="three-bounce"/> : <button style={{width: "100%"}} className={buttonClass}><Translate content="account.create_account" /></button>}
-
-                {/* Backup restore option */}
-                {/* <div style={{paddingTop: 40}}>
+                    <br />
+
+                    <div
+                        className="confirm-checks"
+                        style={{paddingBottom: "1.5rem"}}
+                        onClick={this._onInput.bind(this, "understand_2")}
+                    >
+                        <label
+                            htmlFor="checkbox-3"
+                            style={{position: "relative"}}
+                        >
+                            <input
+                                type="checkbox"
+                                id="checkbox-3"
+                                onChange={() => {}}
+                                checked={this.state.understand_2}
+                                style={{
+                                    position: "absolute",
+                                    top: "-5px",
+                                    left: "0"
+                                }}
+                            />
+                            <div style={{paddingLeft: "30px"}}>
+                                <Translate content="wallet.understand_2" />
+                            </div>
+                        </label>
+                    </div>
+                    {/* If this is not the first account, show dropdown for fee payment account */}
+                    {firstAccount ? null : (
+                        <div
+                            className="full-width-content form-group no-overflow"
+                            style={{paddingTop: 30}}
+                        >
+                            <label>
+                                <Translate content="account.pay_from" />
+                            </label>
+                            <AccountSelect
+                                account_names={my_accounts}
+                                onChange={this.onRegistrarAccountChange.bind(
+                                    this
+                                )}
+                            />
+                            {registrar_account && !isLTM ? (
+                                <div
+                                    style={{textAlign: "left"}}
+                                    className="facolor-error"
+                                >
+                                    <Translate content="wallet.must_be_ltm" />
+                                </div>
+                            ) : null}
+                        </div>
+                    )}
+
+                    {/* Submit button */}
+                    {this.state.loading ? (
+                        <LoadingIndicator type="three-bounce" />
+                    ) : (
+                        <button style={{width: "100%"}} className={buttonClass}>
+                            <Translate content="account.create_account" />
+                        </button>
+                    )}
+
+                    {/* Backup restore option */}
+                    {/* <div style={{paddingTop: 40}}>
                     <label>
                         <Link to="/existing-account">
                             <Translate content="wallet.restore" />
@@ -281,13 +428,13 @@ class CreateAccountPassword extends React.Component {
                     </label>
                 </div> */}
 
-                {/* Skip to step 3 */}
-                {/* {(!hasWallet || firstAccount ) ? null :<div style={{paddingTop: 20}}>
+                    {/* Skip to step 3 */}
+                    {/* {(!hasWallet || firstAccount ) ? null :<div style={{paddingTop: 20}}>
                     <label>
                         <a onClick={() => {this.setState({step: 3});}}><Translate content="wallet.go_get_started" /></a>
                     </label>
                 </div>} */}
-            </form>
+                </form>
                 {/* <br />
                 <p>
                     <Translate content="wallet.bts_rules" unsafe />
@@ -302,15 +449,37 @@ class CreateAccountPassword extends React.Component {
 
         return (
             <div>
-                <h4 style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal", paddingBottom: 15}}><Translate content="wallet.wallet_password" /></h4>
-
-                <Translate style={{textAlign: "left"}} unsafe component="p" content="wallet.create_account_password_text" />
-
-                <Translate style={{textAlign: "left"}} component="p" content="wallet.create_account_text" />
-
-                {firstAccount ?
-                    null :
-                    <Translate style={{textAlign: "left"}} component="p" content="wallet.not_first_account" />}
+                <h4
+                    style={{
+                        fontWeight: "normal",
+                        fontFamily: "Roboto-Medium, arial, sans-serif",
+                        fontStyle: "normal",
+                        paddingBottom: 15
+                    }}
+                >
+                    <Translate content="wallet.wallet_password" />
+                </h4>
+
+                <Translate
+                    style={{textAlign: "left"}}
+                    unsafe
+                    component="p"
+                    content="wallet.create_account_password_text"
+                />
+
+                <Translate
+                    style={{textAlign: "left"}}
+                    component="p"
+                    content="wallet.create_account_text"
+                />
+
+                {firstAccount ? null : (
+                    <Translate
+                        style={{textAlign: "left"}}
+                        component="p"
+                        content="wallet.not_first_account"
+                    />
+                )}
             </div>
         );
     }
@@ -318,77 +487,150 @@ class CreateAccountPassword extends React.Component {
     _renderBackup() {
         return (
             <div className="backup-submit">
-                <p><Translate unsafe content="wallet.password_crucial" /></p>
+                <p>
+                    <Translate unsafe content="wallet.password_crucial" />
+                </p>
 
                 <div>
-
-                    {!this.state.showPass ?
-                        <div onClick={() => {this.setState({showPass: true});}} className="button"><Translate content="wallet.password_show" /></div> :
+                    {!this.state.showPass ? (
+                        <div
+                            onClick={() => {
+                                this.setState({showPass: true});
+                            }}
+                            className="button"
+                        >
+                            <Translate content="wallet.password_show" />
+                        </div>
+                    ) : (
                         <div>
-                            <h5><Translate content="settings.password" />:</h5>
-                            <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal", textAlign: "center"}}>{this.state.generatedPassword}</p>
+                            <h5>
+                                <Translate content="settings.password" />:
+                            </h5>
+                            <p
+                                style={{
+                                    fontWeight: "normal",
+                                    fontFamily:
+                                        "Roboto-Medium, arial, sans-serif",
+                                    fontStyle: "normal",
+                                    textAlign: "center"
+                                }}
+                            >
+                                {this.state.generatedPassword}
+                            </p>
                         </div>
-                    }
+                    )}
                 </div>
                 <div className="divider" />
-                <p className="txtlabel warning"><Translate unsafe content="wallet.password_lose_warning" /></p>
-
-                <div style={{width: "100%"}} onClick={() => {this.context.router.push("/dashboard");;}} className="button"><Translate content="wallet.ok_done" /></div>
+                <p className="txtlabel warning">
+                    <Translate unsafe content="wallet.password_lose_warning" />
+                </p>
+
+                <div
+                    style={{width: "100%"}}
+                    onClick={() => {
+                        this.context.router.push("/dashboard");
+                    }}
+                    className="button"
+                >
+                    <Translate content="wallet.ok_done" />
+                </div>
             </div>
         );
     }
 
     _renderGetStarted() {
-
         return (
             <div>
                 <table className="table">
                     <tbody>
-
                         <tr>
-                            <td><Translate content="wallet.tips_dashboard" />:</td>
-                            <td><Link to="/dashboard"><Translate content="header.dashboard" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_dashboard" />:
+                            </td>
+                            <td>
+                                <Link to="/dashboard">
+                                    <Translate content="header.dashboard" />
+                                </Link>
+                            </td>
                         </tr>
 
                         <tr>
-                            <td><Translate content="wallet.tips_account" />:</td>
-                            <td><Link to={`/account/${this.state.accountName}/overview`} ><Translate content="wallet.link_account" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_account" />:
+                            </td>
+                            <td>
+                                <Link
+                                    to={`/account/${
+                                        this.state.accountName
+                                    }/overview`}
+                                >
+                                    <Translate content="wallet.link_account" />
+                                </Link>
+                            </td>
                         </tr>
 
                         <tr>
-                            <td><Translate content="wallet.tips_deposit" />:</td>
-                            <td><Link to="/deposit-withdraw"><Translate content="wallet.link_deposit" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_deposit" />:
+                            </td>
+                            <td>
+                                <Link to="/deposit-withdraw">
+                                    <Translate content="wallet.link_deposit" />
+                                </Link>
+                            </td>
                         </tr>
 
-
-
                         <tr>
-                            <td><Translate content="wallet.tips_transfer" />:</td>
-                            <td><Link to="/transfer"><Translate content="wallet.link_transfer" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_transfer" />:
+                            </td>
+                            <td>
+                                <Link to="/transfer">
+                                    <Translate content="wallet.link_transfer" />
+                                </Link>
+                            </td>
                         </tr>
 
                         <tr>
-                            <td><Translate content="wallet.tips_settings" />:</td>
-                            <td><Link to="/settings"><Translate content="header.settings" /></Link></td>
+                            <td>
+                                <Translate content="wallet.tips_settings" />:
+                            </td>
+                            <td>
+                                <Link to="/settings">
+                                    <Translate content="header.settings" />
+                                </Link>
+                            </td>
                         </tr>
                     </tbody>
-
                 </table>
             </div>
         );
     }
 
     _renderGetStartedText() {
-
         return (
             <div>
-                <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}><Translate content="wallet.congrat" /></p>
+                <p
+                    style={{
+                        fontWeight: "normal",
+                        fontFamily: "Roboto-Medium, arial, sans-serif",
+                        fontStyle: "normal"
+                    }}
+                >
+                    <Translate content="wallet.congrat" />
+                </p>
 
-                <p><Translate content="wallet.tips_explore_pass" /></p>
+                <p>
+                    <Translate content="wallet.tips_explore_pass" />
+                </p>
 
-                <p><Translate content="wallet.tips_header" /></p>
+                <p>
+                    <Translate content="wallet.tips_header" />
+                </p>
 
-                <p className="txtlabel warning"><Translate content="wallet.tips_login" /></p>
+                <p className="txtlabel warning">
+                    <Translate content="wallet.tips_login" />
+                </p>
             </div>
         );
     }
@@ -400,21 +642,27 @@ class CreateAccountPassword extends React.Component {
         return (
             <div className="sub-content">
                 <div>
-                        {step === 2 ? <p style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}>
+                    {step === 2 ? (
+                        <p
+                            style={{
+                                fontWeight: "normal",
+                                fontFamily: "Roboto-Medium, arial, sans-serif",
+                                fontStyle: "normal"
+                            }}
+                        >
                             <Translate content={"wallet.step_" + step} />
-                        </p> : null}
-
-                        {step === 3 ? this._renderGetStartedText() : null}
-
-                        {step === 1 ? (
-                            <div>
-                                {this._renderAccountCreateForm()}
-                            </div>
-                        ) : step === 2 ? this._renderBackup() :
-                                this._renderGetStarted()
-                        }
-
-
+                        </p>
+                    ) : null}
+
+                    {step === 3 ? this._renderGetStartedText() : null}
+
+                    {step === 1 ? (
+                        <div>{this._renderAccountCreateForm()}</div>
+                    ) : step === 2 ? (
+                        this._renderBackup()
+                    ) : (
+                        this._renderGetStarted()
+                    )}
                 </div>
             </div>
         );
diff --git a/app/components/Account/CreateWorker.jsx b/app/components/Account/CreateWorker.jsx
index e25bd6cea1..e27b5e1ccd 100644
--- a/app/components/Account/CreateWorker.jsx
+++ b/app/components/Account/CreateWorker.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import ApplicationApi from "api/ApplicationApi";
 import AccountStore from "stores/AccountStore";
 import utils from "common/utils";
@@ -7,7 +7,6 @@ import notify from "actions/NotificationActions";
 import Translate from "react-translate-component";
 
 class CreateWorker extends React.Component {
-
     constructor() {
         super();
 
@@ -29,9 +28,17 @@ class CreateWorker extends React.Component {
     }
 
     onSubmit() {
-        ApplicationApi.createWorker(this.state, this.props.currentAccount).catch(error => {
+        ApplicationApi.createWorker(
+            this.state,
+            this.props.currentAccount
+        ).catch(error => {
             console.log("error", error);
-            let error_msg = error.message && error.message.length && error.message.length > 0 ? error.message.split("stack")[0] : "unknown error";
+            let error_msg =
+                error.message &&
+                error.message.length &&
+                error.message.length > 0
+                    ? error.message.split("stack")[0]
+                    : "unknown error";
 
             notify.addNotification({
                 message: `Failed to create worker: ${error_msg}`,
@@ -42,64 +49,141 @@ class CreateWorker extends React.Component {
     }
 
     render() {
-
         console.log("state:", this.state);
-        return <div className="grid-block" style={{paddingTop: 20}}>
-            <div className="grid-content large-9 large-offset-3 small-12">
-                <Translate content="explorer.workers.create" component="h3" />
-                <form style={{maxWidth: 800}}>
-                    <Translate content="explorer.workers.create_text_1" component="p" />
-                    <Translate content="explorer.workers.create_text_2" component="p" />
+        return (
+            <div className="grid-block" style={{paddingTop: 20}}>
+                <div className="grid-content large-9 large-offset-3 small-12">
+                    <Translate
+                        content="explorer.workers.create"
+                        component="h3"
+                    />
+                    <form style={{maxWidth: 800}}>
+                        <Translate
+                            content="explorer.workers.create_text_1"
+                            component="p"
+                        />
+                        <Translate
+                            content="explorer.workers.create_text_2"
+                            component="p"
+                        />
 
-                    <label>
-                        <Translate content="explorer.workers.title" />
-                        <input onChange={(e) => {this.setState({title: e.target.value});}} type="text"></input>
-                    </label>
-                    <Translate content="explorer.workers.name_text" component="p" />
-                    <div style={{width: "50%", paddingRight: "2.5%", display: "inline-block"}}>
                         <label>
-                            <Translate content="account.votes.start" />
-                            <input  onChange={(e) => {this.setState({start: new Date(e.target.value)});}} type="date"></input>
+                            <Translate content="explorer.workers.title" />
+                            <input
+                                onChange={e => {
+                                    this.setState({title: e.target.value});
+                                }}
+                                type="text"
+                            />
                         </label>
-                    </div>
-                    <div style={{width: "50%", paddingLeft: "2.5%", display: "inline-block"}}>
+                        <Translate
+                            content="explorer.workers.name_text"
+                            component="p"
+                        />
+                        <div
+                            style={{
+                                width: "50%",
+                                paddingRight: "2.5%",
+                                display: "inline-block"
+                            }}
+                        >
+                            <label>
+                                <Translate content="account.votes.start" />
+                                <input
+                                    onChange={e => {
+                                        this.setState({
+                                            start: new Date(e.target.value)
+                                        });
+                                    }}
+                                    type="date"
+                                />
+                            </label>
+                        </div>
+                        <div
+                            style={{
+                                width: "50%",
+                                paddingLeft: "2.5%",
+                                display: "inline-block"
+                            }}
+                        >
+                            <label>
+                                <Translate content="account.votes.end" />
+                                <input
+                                    onChange={e => {
+                                        this.setState({
+                                            end: new Date(e.target.value)
+                                        });
+                                    }}
+                                    type="date"
+                                />
+                            </label>
+                        </div>
+                        <Translate
+                            content="explorer.workers.date_text"
+                            component="p"
+                        />
+
                         <label>
-                            <Translate content="account.votes.end" />
-                            <input onChange={(e) => {this.setState({end: new Date(e.target.value)});}} type="date"></input>
+                            <Translate content="explorer.workers.daily_pay" />
+                            <input
+                                onChange={e => {
+                                    this.setState({pay: e.target.value});
+                                }}
+                                type="number"
+                            />
                         </label>
-                    </div>
-                    <Translate content="explorer.workers.date_text" component="p" />
-
-                    <label>
-                        <Translate content="explorer.workers.daily_pay" />
-                        <input onChange={(e) => {this.setState({pay: e.target.value});}} type="number"></input>
-                    </label>
-                    <Translate content="explorer.workers.pay_text" component="p" />
-
-
-                    <label>
-                        <Translate content="explorer.workers.website" />
-                        <input onChange={(e) => {this.setState({url: e.target.value});}} type="text"></input>
-                    </label>
-                    <Translate content="explorer.workers.url_text" component="p" />
-
-                    <label>
-                        <Translate content="explorer.workers.vesting_pay" />
-                        <input defaultValue={this.state.vesting} onChange={(e) => {this.setState({vesting: parseInt(e.target.value)});}} type="number"></input>
-                    </label>
-                    <Translate content="explorer.workers.vesting_text" component="p" />
+                        <Translate
+                            content="explorer.workers.pay_text"
+                            component="p"
+                        />
 
+                        <label>
+                            <Translate content="explorer.workers.website" />
+                            <input
+                                onChange={e => {
+                                    this.setState({url: e.target.value});
+                                }}
+                                type="text"
+                            />
+                        </label>
+                        <Translate
+                            content="explorer.workers.url_text"
+                            component="p"
+                        />
 
-                    <div className="button-group" onClick={this.onSubmit.bind(this)}>
-                        <div className="button" type="submit">Publish</div>
-                    </div>
-                </form>
+                        <label>
+                            <Translate content="explorer.workers.vesting_pay" />
+                            <input
+                                defaultValue={this.state.vesting}
+                                onChange={e => {
+                                    this.setState({
+                                        vesting: parseInt(e.target.value)
+                                    });
+                                }}
+                                type="number"
+                            />
+                        </label>
+                        <Translate
+                            content="explorer.workers.vesting_text"
+                            component="p"
+                        />
+
+                        <div
+                            className="button-group"
+                            onClick={this.onSubmit.bind(this)}
+                        >
+                            <div className="button" type="submit">
+                                Publish
+                            </div>
+                        </div>
+                    </form>
+                </div>
             </div>
-        </div>;
+        );
     }
 }
 
-export default CreateWorker = connect(CreateWorker, {
+export default (CreateWorker = connect(CreateWorker, {
     listenTo() {
         return [AccountStore];
     },
@@ -108,4 +192,4 @@ export default CreateWorker = connect(CreateWorker, {
             currentAccount: AccountStore.getState().currentAccount
         };
     }
-});
+}));
diff --git a/app/components/Account/Identicon.jsx b/app/components/Account/Identicon.jsx
index c0452c9797..43c4d482d7 100644
--- a/app/components/Account/Identicon.jsx
+++ b/app/components/Account/Identicon.jsx
@@ -6,51 +6,62 @@ import jdenticon from "jdenticon";
 var canvas_id_count = 0;
 
 class Identicon extends Component {
-
     constructor(props) {
         super(props);
-        this.canvas_id = "identicon_" + (this.props.account||"") + (++canvas_id_count);
+        this.canvas_id =
+            "identicon_" + (this.props.account || "") + ++canvas_id_count;
+    }
+
+    shouldComponentUpdate(nextProps) {
+        return (
+            nextProps.size.height !== this.props.size.height ||
+            nextProps.size.width !== this.props.size.width ||
+            nextProps.account !== this.props.account
+        );
+    }
+
+    render() {
+        let {account} = this.props;
+        let {height, width} = this.props.size;
+        let hash = account ? sha256(account) : null;
+        return (
+            <canvas
+                id={this.canvas_id}
+                ref="canvas"
+                style={{height: height, width: width}}
+                width={width * 2}
+                height={height * 2}
+                data-jdenticon-hash={hash}
+            />
+        );
     }
 
-  shouldComponentUpdate(nextProps) {
-      return nextProps.size.height !== this.props.size.height || nextProps.size.width !== this.props.size.width || nextProps.account !== this.props.account;
-  }
-
-  render() {
-      let {account} = this.props;
-      let {height, width} = this.props.size;
-      let hash = account ? sha256(account) : null;
-      return (
-           <canvas id={this.canvas_id} ref="canvas" style={{height: height, width: width}} width={width * 2} height={height * 2} data-jdenticon-hash={hash} />
-      );
-  }
-
-  repaint() {
-      if(this.props.account) jdenticon.updateById(this.canvas_id);
-      else {
-          let ctx = this.refs.canvas.getContext('2d');
-          ctx.fillStyle = "rgba(100, 100, 100, 0.5)";
-          let size = ctx.canvas.width;
-          ctx.clearRect(0, 0, size, size);
-          ctx.fillRect(0, 0, size, size);
-          ctx.clearRect(0+1, 0+1, size-2, size-2);
-          ctx.font = `${size}px sans-serif`;
-          ctx.fillText("?", size/4, size - size/6);
-      }
-  }
-
-  componentDidMount() {
-      this.repaint();
-  }
-
-  componentDidUpdate() {
-      this.repaint();
-  }
+    repaint() {
+        if (this.props.account) jdenticon.updateById(this.canvas_id);
+        else {
+            let ctx = this.refs.canvas.getContext("2d");
+            ctx.fillStyle = "rgba(100, 100, 100, 0.5)";
+            let size = ctx.canvas.width;
+            ctx.clearRect(0, 0, size, size);
+            ctx.fillRect(0, 0, size, size);
+            ctx.clearRect(0 + 1, 0 + 1, size - 2, size - 2);
+            ctx.font = `${size}px sans-serif`;
+            ctx.fillText("?", size / 4, size - size / 6);
+        }
+    }
+
+    componentDidMount() {
+        this.repaint();
+    }
+
+    componentDidUpdate() {
+        this.repaint();
+    }
 }
 
 Identicon.propTypes = {
-  size: PropTypes.object.isRequired,
-  account: PropTypes.string
+    size: PropTypes.object.isRequired,
+    account: PropTypes.string
 };
 
 export default Identicon;
diff --git a/app/components/Account/NestedApprovalState.jsx b/app/components/Account/NestedApprovalState.jsx
index e11f0ce3f5..6cfa5f1a41 100644
--- a/app/components/Account/NestedApprovalState.jsx
+++ b/app/components/Account/NestedApprovalState.jsx
@@ -9,7 +9,6 @@ import {cloneDeep} from "lodash";
 import {ChainStore} from "bitsharesjs/es";
 
 class AccountPermissionTree extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired,
         accounts: ChainTypes.ChainAccountsList,
@@ -21,7 +20,13 @@ class AccountPermissionTree extends React.Component {
     };
 
     render() {
-        let {account, available, availableKeys, permission, threshold} = this.props;
+        let {
+            account,
+            available,
+            availableKeys,
+            permission,
+            threshold
+        } = this.props;
 
         let isOK = permission.isAvailable(available);
         let isNested = permission.isNested();
@@ -29,36 +34,75 @@ class AccountPermissionTree extends React.Component {
 
         let status = [];
 
-        let notNestedWeight = (threshold && threshold > 10) ?
-            utils.get_percentage(permission.weight, this.props.threshold) :
-            permission.weight;
-
-        let nestedWeight = (permission && permission.threshold > 10) ?
-            `${utils.get_percentage(permission.getStatus(available, availableKeys), permission.threshold)} / 100%` :
-            `${permission.getStatus(available, availableKeys)} / ${permission.threshold}`;
+        let notNestedWeight =
+            threshold && threshold > 10
+                ? utils.get_percentage(permission.weight, this.props.threshold)
+                : permission.weight;
+
+        let nestedWeight =
+            permission && permission.threshold > 10
+                ? `${utils.get_percentage(
+                      permission.getStatus(available, availableKeys),
+                      permission.threshold
+                  )} / 100%`
+                : `${permission.getStatus(available, availableKeys)} / ${
+                      permission.threshold
+                  }`;
 
         // if (!account || typeof account === "string") return null;
 
         status.push(
-            <div key={account.get("id")} style={{textAlign: "left", width: "100%", clear: "both", paddingBottom: 5}}>
+            <div
+                key={account.get("id")}
+                style={{
+                    textAlign: "left",
+                    width: "100%",
+                    clear: "both",
+                    paddingBottom: 5
+                }}
+            >
                 <div
                     className="inline-block"
                     style={{
                         paddingLeft: `${5 * this.props.indent}%`
                     }}
                 >
-                    <LinkToAccountById subpage="permissions" account={account.get("id")} />
-                    {!isNested && notNestedWeight ? `${notNestedWeight && notNestedWeight.length === 2 ? `\u00A0\u00A0` : ""}(${notNestedWeight}) ` : null}
+                    <LinkToAccountById
+                        subpage="permissions"
+                        account={account.get("id")}
+                    />
+                    {!isNested && notNestedWeight
+                        ? `${
+                              notNestedWeight && notNestedWeight.length === 2
+                                  ? `\u00A0\u00A0`
+                                  : ""
+                          }(${notNestedWeight}) `
+                        : null}
                 </div>
-                <div className="float-right" style={{paddingLeft: 20, marginRight: 10}}>
+                <div
+                    className="float-right"
+                    style={{paddingLeft: 20, marginRight: 10}}
+                >
                     {!isNested && !isMultiSig ? (
-                    <span>
-                        {isOK ? <Icon name="checkmark-circle" size="1x" className="success"/> :
-                                <Icon name="cross-circle" size="1x" className="error"/>}
-                    </span>) : (
-                    <span className={isOK ? "success-text" : ""}>
-                        {nestedWeight}
-                    </span>
+                        <span>
+                            {isOK ? (
+                                <Icon
+                                    name="checkmark-circle"
+                                    size="1x"
+                                    className="success"
+                                />
+                            ) : (
+                                <Icon
+                                    name="cross-circle"
+                                    size="1x"
+                                    className="error"
+                                />
+                            )}
+                        </span>
+                    ) : (
+                        <span className={isOK ? "success-text" : ""}>
+                            {nestedWeight}
+                        </span>
                     )}
                 </div>
             </div>
@@ -100,7 +144,6 @@ class AccountPermissionTree extends React.Component {
 const BoundAccountPermissionTree = BindToChainState(AccountPermissionTree);
 
 class KeyPermissionBranch extends React.Component {
-
     static propTypes = {
         indent: React.PropTypes.number.isRequired
     };
@@ -116,19 +159,39 @@ class KeyPermissionBranch extends React.Component {
 
         let status = [];
         status.push(
-            <div key={permission.id} style={{textAlign: "left", width: "100%", paddingBottom: 5}}>
+            <div
+                key={permission.id}
+                style={{textAlign: "left", width: "100%", paddingBottom: 5}}
+            >
                 <div
                     className="inline-block"
                     style={{
                         paddingLeft: `${5 * this.props.indent}%`
                     }}
                 >
-                    <span>{permission.id.substr(0, 20 - 4 * this.props.indent)}... ({permission.weight})</span>
+                    <span>
+                        {permission.id.substr(0, 20 - 4 * this.props.indent)}...
+                        ({permission.weight})
+                    </span>
                 </div>
-                <div className="float-right" style={{paddingLeft: 20, marginRight: 10}}>
+                <div
+                    className="float-right"
+                    style={{paddingLeft: 20, marginRight: 10}}
+                >
                     <span>
-                        {isOK ? <Icon name="checkmark-circle" size="1x" className="success"/> :
-                                <Icon name="cross-circle" size="1x" className="error"/>}
+                        {isOK ? (
+                            <Icon
+                                name="checkmark-circle"
+                                size="1x"
+                                className="success"
+                            />
+                        ) : (
+                            <Icon
+                                name="cross-circle"
+                                size="1x"
+                                className="error"
+                            />
+                        )}
                     </span>
                 </div>
             </div>
@@ -139,7 +202,6 @@ class KeyPermissionBranch extends React.Component {
 }
 
 class SecondLevel extends React.Component {
-
     render() {
         let {requiredPermissions, available, availableKeys} = this.props;
 
@@ -158,16 +220,11 @@ class SecondLevel extends React.Component {
             );
         });
 
-        return (
-            <div>
-                {status}
-            </div>
-        );
+        return <div>{status}</div>;
     }
 }
 
 class FirstLevel extends React.Component {
-
     static propTypes = {
         required: ChainTypes.ChainAccountsList,
         available: ChainTypes.ChainAccountsList
@@ -247,7 +304,6 @@ class FirstLevel extends React.Component {
 FirstLevel = BindToChainState(FirstLevel, {keep_updating: true});
 
 class ProposalWrapper extends React.Component {
-
     static propTypes = {
         proposal: ChainTypes.ChainObject.isRequired,
         type: React.PropTypes.string.isRequired
diff --git a/app/components/Account/Proposals.jsx b/app/components/Account/Proposals.jsx
index d84d1d4cb6..b778e29166 100644
--- a/app/components/Account/Proposals.jsx
+++ b/app/components/Account/Proposals.jsx
@@ -11,7 +11,6 @@ import {ChainStore} from "bitsharesjs/es";
 import counterpart from "counterpart";
 
 class Proposals extends Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired
     };
@@ -23,10 +22,15 @@ class Proposals extends Component {
     }
 
     _canApprove(proposal, id) {
-
-        if (proposal.required_active_approvals.indexOf(id) !== -1 && proposal.available_active_approvals.indexOf(id) === -1) {
+        if (
+            proposal.required_active_approvals.indexOf(id) !== -1 &&
+            proposal.available_active_approvals.indexOf(id) === -1
+        ) {
             return true;
-        } else if (proposal.required_owner_approvals.indexOf(id) !== -1 && proposal.available_owner_approvals.indexOf(id) === -1) {
+        } else if (
+            proposal.required_owner_approvals.indexOf(id) !== -1 &&
+            proposal.available_owner_approvals.indexOf(id) === -1
+        ) {
             return true;
         } else {
             return false;
@@ -34,60 +38,76 @@ class Proposals extends Component {
     }
 
     _canReject(proposal) {
-        return (proposal.available_active_approvals.length || proposal.available_owner_approvals.length);
+        return (
+            proposal.available_active_approvals.length ||
+            proposal.available_owner_approvals.length
+        );
     }
 
     render() {
         let {account} = this.props;
-        if( ! account ) return null;
+        if (!account) return null;
 
         let proposals = [];
 
-        if( account.get("proposals").size ) {
-            account.get("proposals").forEach( proposal_id => {
-                var proposal = ChainStore.getObject( proposal_id )
-                if( proposal ) {
-                    var proposed_transaction = proposal.get("proposed_transaction")
-                    var operations = proposed_transaction.get("operations")
+        if (account.get("proposals").size) {
+            account.get("proposals").forEach(proposal_id => {
+                var proposal = ChainStore.getObject(proposal_id);
+                if (proposal) {
+                    var proposed_transaction = proposal.get(
+                        "proposed_transaction"
+                    );
+                    var operations = proposed_transaction.get("operations");
                     proposals.push({operations, account, proposal});
                 }
-            })
+            });
         }
 
         let proposalRows = proposals
             .sort((a, b) => {
-                return utils.sortID(a.proposal.get("id"), b.proposal.get("id"), true);
+                return utils.sortID(
+                    a.proposal.get("id"),
+                    b.proposal.get("id"),
+                    true
+                );
             })
             .map(proposal => {
                 let isScam = false;
-                let text = proposal.operations.map( (o, index) => {
-                    if (o.getIn([1, "to"]) === "1.2.153124") isScam = true;
-                    return <ProposedOperation
-                            key={proposal.proposal.get("id") + "_" + index}
-                            expiration={proposal.proposal.get("expiration_time")}
-                            index={index}
-                            op={o.toJS()}
-                            inverted={false}
-                            hideFee={false}
-                            hideOpLabel={true}
-                            hideDate={true}
-                            proposal={true}
-                            id={proposal.proposal.get("id")}
-                        />;
-                }).toArray();
+                let text = proposal.operations
+                    .map((o, index) => {
+                        if (o.getIn([1, "to"]) === "1.2.153124") isScam = true;
+                        return (
+                            <ProposedOperation
+                                key={proposal.proposal.get("id") + "_" + index}
+                                expiration={proposal.proposal.get(
+                                    "expiration_time"
+                                )}
+                                index={index}
+                                op={o.toJS()}
+                                inverted={false}
+                                hideFee={false}
+                                hideOpLabel={true}
+                                hideDate={true}
+                                proposal={true}
+                                id={proposal.proposal.get("id")}
+                            />
+                        );
+                    })
+                    .toArray();
 
                 // let canApprove = this._canApprove(proposal.proposal.toJS(), proposal.account.get("id"));
                 let canReject = this._canReject(proposal.proposal.toJS());
 
                 let proposalId = proposal.proposal.get("id");
 
-                let type = proposal.proposal.get("required_active_approvals").size ? "active" : "owner";
+                let type = proposal.proposal.get("required_active_approvals")
+                    .size
+                    ? "active"
+                    : "owner";
 
                 return (
                     <tr key={proposalId}>
-                        <td>
-                            {text}
-                        </td>
+                        <td>{text}</td>
                         <td>
                             <NestedApprovalState
                                 proposal={proposal.proposal.get("id")}
@@ -96,29 +116,48 @@ class Proposals extends Component {
                         </td>
 
                         <td>
-                            {canReject ?
-                                (
-                                    <button
-                                    onClick={this._onApproveModal.bind(this, proposalId, "reject")}
+                            {canReject ? (
+                                <button
+                                    onClick={this._onApproveModal.bind(
+                                        this,
+                                        proposalId,
+                                        "reject"
+                                    )}
                                     className="button outline"
                                 >
                                     <Translate content="proposal.reject" />
                                 </button>
-
-                                ) : null}
-                                <ProposalApproveModal
-                                    ref={proposalId + "_" + "reject"}
-                                    modalId={proposalId + "_" + "reject"}
-                                    account={proposal.account.get("id")}
-                                    proposal={proposalId}
-                                    action="reject"
-                                />
-                            {isScam ? <div data-tip={counterpart.translate("tooltip.propose_scam")} className=" tooltip has-error">SCAM</div> : <button
-                                onClick={this._onApproveModal.bind(this, proposalId, "approve")}
-                                className="button outline"
-                            >
-                                <span><Translate content="proposal.approve" /></span>
-                            </button>}
+                            ) : null}
+                            <ProposalApproveModal
+                                ref={proposalId + "_" + "reject"}
+                                modalId={proposalId + "_" + "reject"}
+                                account={proposal.account.get("id")}
+                                proposal={proposalId}
+                                action="reject"
+                            />
+                            {isScam ? (
+                                <div
+                                    data-tip={counterpart.translate(
+                                        "tooltip.propose_scam"
+                                    )}
+                                    className=" tooltip has-error"
+                                >
+                                    SCAM
+                                </div>
+                            ) : (
+                                <button
+                                    onClick={this._onApproveModal.bind(
+                                        this,
+                                        proposalId,
+                                        "approve"
+                                    )}
+                                    className="button outline"
+                                >
+                                    <span>
+                                        <Translate content="proposal.approve" />
+                                    </span>
+                                </button>
+                            )}
                             <ProposalApproveModal
                                 ref={proposalId + "_" + "approve"}
                                 modalId={proposalId + "_" + "approve"}
@@ -134,15 +173,19 @@ class Proposals extends Component {
         return (
             <table className={"table compact " + this.props.className}>
                 <thead>
-                <tr>
-                    <th><Translate content="account.votes.info" /></th>
-                    <th><Translate content="proposal.status" /></th>
-                    <th><Translate content="proposal.action" /></th>
-                </tr>
+                    <tr>
+                        <th>
+                            <Translate content="account.votes.info" />
+                        </th>
+                        <th>
+                            <Translate content="proposal.status" />
+                        </th>
+                        <th>
+                            <Translate content="proposal.action" />
+                        </th>
+                    </tr>
                 </thead>
-                <tbody>
-                    { proposalRows }
-                </tbody>
+                <tbody>{proposalRows}</tbody>
             </table>
         );
     }
diff --git a/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx
index b873b18a19..c47c66f60b 100644
--- a/app/components/Account/RecentTransactions.jsx
+++ b/app/components/Account/RecentTransactions.jsx
@@ -29,7 +29,6 @@ function textContent(n) {
 }
 
 class RecentTransactions extends React.Component {
-
     static propTypes = {
         accountsList: ChainTypes.ChainAccountsList.isRequired,
         compactView: React.PropTypes.bool,
@@ -62,9 +61,7 @@ class RecentTransactions extends React.Component {
             ps.initialize(t);
 
             this._setHeaderHeight();
-
         }
-
     }
 
     _setHeaderHeight() {
@@ -78,23 +75,42 @@ class RecentTransactions extends React.Component {
     }
 
     shouldComponentUpdate(nextProps, nextState) {
-        if(!utils.are_equal_shallow(this.props.accountsList, nextProps.accountsList)) return true;
-        if(this.props.maxHeight !== nextProps.maxHeight) return true;
-        if(this.state.headerHeight !== nextState.headerHeight) return true;
-        if(this.state.filter !== nextState.filter) return true;
+        if (
+            !utils.are_equal_shallow(
+                this.props.accountsList,
+                nextProps.accountsList
+            )
+        )
+            return true;
+        if (this.props.maxHeight !== nextProps.maxHeight) return true;
+        if (this.state.headerHeight !== nextState.headerHeight) return true;
+        if (this.state.filter !== nextState.filter) return true;
         if (this.props.customFilter) {
-            if(!utils.are_equal_shallow(this.props.customFilter.fields, nextProps.customFilter.fields) ||
-                !utils.are_equal_shallow(this.props.customFilter.values, nextProps.customFilter.values)) {
+            if (
+                !utils.are_equal_shallow(
+                    this.props.customFilter.fields,
+                    nextProps.customFilter.fields
+                ) ||
+                !utils.are_equal_shallow(
+                    this.props.customFilter.values,
+                    nextProps.customFilter.values
+                )
+            ) {
                 return true;
-            };
+            }
         }
 
-        if(this.props.maxHeight !== nextProps.maxHeight) return true;
-        if (nextState.limit !== this.state.limit || nextState.csvExport !== this.state.csvExport) return true;
-        for(let key = 0; key < nextProps.accountsList.length; ++key) {
+        if (this.props.maxHeight !== nextProps.maxHeight) return true;
+        if (
+            nextState.limit !== this.state.limit ||
+            nextState.csvExport !== this.state.csvExport
+        )
+            return true;
+        for (let key = 0; key < nextProps.accountsList.length; ++key) {
             let npa = nextProps.accountsList[key];
             let nsa = this.props.accountsList[key];
-            if(npa && nsa && (npa.get("history") !== nsa.get("history"))) return true;
+            if (npa && nsa && npa.get("history") !== nsa.get("history"))
+                return true;
         }
         return false;
     }
@@ -102,18 +118,37 @@ class RecentTransactions extends React.Component {
     componentDidUpdate() {
         if (this.state.csvExport) {
             this.state.csvExport = false;
-            const csv_export_container = document.getElementById("csv_export_container");
+            const csv_export_container = document.getElementById(
+                "csv_export_container"
+            );
             const nodes = csv_export_container.childNodes;
             let csv = "";
             for (const n of nodes) {
                 //console.log("-- RecentTransactions._downloadCSV -->", n);
                 const cn = n.childNodes;
                 if (csv !== "") csv += "\n";
-                csv += [textContent(cn[0]), textContent(cn[1]), textContent(cn[2]), textContent(cn[3])].join(",");
+                csv += [
+                    textContent(cn[0]),
+                    textContent(cn[1]),
+                    textContent(cn[2]),
+                    textContent(cn[3])
+                ].join(",");
             }
-            var blob = new Blob([csv], { type: "text/csv;charset=utf-8" });
+            var blob = new Blob([csv], {type: "text/csv;charset=utf-8"});
             var today = new Date();
-            saveAs(blob, ('btshist-' + today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2) + '-' + ('0' + today.getHours()).slice(-2) + ('0' + today.getMinutes()).slice(-2) + '.csv'));
+            saveAs(
+                blob,
+                "btshist-" +
+                    today.getFullYear() +
+                    "-" +
+                    ("0" + (today.getMonth() + 1)).slice(-2) +
+                    "-" +
+                    ("0" + today.getDate()).slice(-2) +
+                    "-" +
+                    ("0" + today.getHours()).slice(-2) +
+                    ("0" + today.getMinutes()).slice(-2) +
+                    ".csv"
+            );
         }
 
         if (!this.props.fullHeight) {
@@ -121,9 +156,7 @@ class RecentTransactions extends React.Component {
             ps.update(t);
 
             this._setHeaderHeight();
-
         }
-
     }
 
     _onIncreaseLimit() {
@@ -136,9 +169,17 @@ class RecentTransactions extends React.Component {
         let history = [];
         let seen_ops = new Set();
         for (let account of accountsList) {
-            if(account) {
+            if (account) {
                 let h = account.get("history");
-                if (h) history = history.concat(h.toJS().filter(op => !seen_ops.has(op.id) && seen_ops.add(op.id)));
+                if (h)
+                    history = history.concat(
+                        h
+                            .toJS()
+                            .filter(
+                                op =>
+                                    !seen_ops.has(op.id) && seen_ops.add(op.id)
+                            )
+                    );
             }
         }
         if (filterOp) {
@@ -152,13 +193,20 @@ class RecentTransactions extends React.Component {
                 let finalValue = customFilter.fields.reduce((final, filter) => {
                     switch (filter) {
                         case "asset_id":
-                            return final && a.op[1]["amount"][filter] === customFilter.values[filter];
+                            return (
+                                final &&
+                                a.op[1]["amount"][filter] ===
+                                    customFilter.values[filter]
+                            );
                             break;
                         default:
-                            return final && a.op[1][filter] === customFilter.values[filter];
+                            return (
+                                final &&
+                                a.op[1][filter] === customFilter.values[filter]
+                            );
                             break;
                     }
-                }, true)
+                }, true);
                 return finalValue;
             });
         }
@@ -176,10 +224,26 @@ class RecentTransactions extends React.Component {
     }
 
     render() {
-        let {accountsList, compactView, filter, customFilter, style, maxHeight} = this.props;
+        let {
+            accountsList,
+            compactView,
+            filter,
+            customFilter,
+            style,
+            maxHeight
+        } = this.props;
         let {limit, headerHeight} = this.state;
-        let current_account_id = accountsList.length === 1 && accountsList[0] ? accountsList[0].get("id") : null;
-        let history = this._getHistory(accountsList, this.props.showFilters && this.state.filter !== "all" ?  this.state.filter : filter, customFilter).sort(compareOps);
+        let current_account_id =
+            accountsList.length === 1 && accountsList[0]
+                ? accountsList[0].get("id")
+                : null;
+        let history = this._getHistory(
+            accountsList,
+            this.props.showFilters && this.state.filter !== "all"
+                ? this.state.filter
+                : filter,
+            customFilter
+        ).sort(compareOps);
         let historyCount = history.length;
 
         style = style ? style : {};
@@ -188,52 +252,74 @@ class RecentTransactions extends React.Component {
 
         let options = null;
         if (true || this.props.showFilters) {
-            options = ["all", "transfer", "limit_order_create", "limit_order_cancel", "fill_order", "account_create", "account_update", "asset_create",
-            "witness_withdraw_pay", "vesting_balance_withdraw"]
-            .map(type => {
-                return <option value={type} key={type}>{counterpart.translate("transaction.trxTypes." + type)}</option>;
+            options = [
+                "all",
+                "transfer",
+                "limit_order_create",
+                "limit_order_cancel",
+                "fill_order",
+                "account_create",
+                "account_update",
+                "asset_create",
+                "witness_withdraw_pay",
+                "vesting_balance_withdraw"
+            ].map(type => {
+                return (
+                    <option value={type} key={type}>
+                        {counterpart.translate("transaction.trxTypes." + type)}
+                    </option>
+                );
             });
         }
 
-        let display_history = history.length ?
-            history.slice(0, limit)
-            .map(o => {
-                return (
-                    <Operation
-                        includeOperationId={true}
-                        operationId={o.id}
-                        style={alignLeft}
-                        key={o.id}
-                        op={o.op}
-                        result={o.result}
-                        block={o.block_num}
-                        current={current_account_id}
-                        hideFee
-                        inverted={false}
-                        hideOpLabel={compactView}
-                    />
-                );
-            }) : [<tr key="no_recent"><td colSpan={compactView ? "2" : "3"}><Translate content="operation.no_recent" /></td></tr>];
+        let display_history = history.length
+            ? history.slice(0, limit).map(o => {
+                  return (
+                      <Operation
+                          includeOperationId={true}
+                          operationId={o.id}
+                          style={alignLeft}
+                          key={o.id}
+                          op={o.op}
+                          result={o.result}
+                          block={o.block_num}
+                          current={current_account_id}
+                          hideFee
+                          inverted={false}
+                          hideOpLabel={compactView}
+                      />
+                  );
+              })
+            : [
+                  <tr key="no_recent">
+                      <td colSpan={compactView ? "2" : "3"}>
+                          <Translate content="operation.no_recent" />
+                      </td>
+                  </tr>
+              ];
         display_history.push(
             <tr className="total-value" key="total_value">
-                <td className="column-hide-tiny">
-                </td>
+                <td className="column-hide-tiny" />
                 <td style={alignRight}>
-                    {historyCount > 0 ?
-                    <span>
-                        <a
-                            className="inline-block"
-                            onClick={this._downloadCSV.bind(this)}
-                            data-tip={counterpart.translate("transaction.csv_tip")}
-                            data-place="bottom"
-                        >
-                            <Icon name="excel" className="icon-14px" />
-                        </a>
-
-                    </span> : null}
+                    {historyCount > 0 ? (
+                        <span>
+                            <a
+                                className="inline-block"
+                                onClick={this._downloadCSV.bind(this)}
+                                data-tip={counterpart.translate(
+                                    "transaction.csv_tip"
+                                )}
+                                data-place="bottom"
+                            >
+                                <Icon name="excel" className="icon-14px" />
+                            </a>
+                        </span>
+                    ) : null}
                 </td>
                 <td style={{textAlign: "center"}}>
-                    &nbsp;{this.props.showMore && historyCount > this.props.limit || 20 && limit < historyCount ? (
+                    &nbsp;{(this.props.showMore &&
+                        historyCount > this.props.limit) ||
+                    (20 && limit < historyCount) ? (
                         <a onClick={this._onIncreaseLimit.bind(this)}>
                             <Icon name="chevron-down" className="icon-14px" />
                         </a>
@@ -245,35 +331,81 @@ class RecentTransactions extends React.Component {
         return (
             <div className="recent-transactions no-overflow" style={style}>
                 <div className="generic-bordered-box">
-                    {this.props.dashboard ? null : <div ref="header">
-                        <div className="block-content-header">
-                            <span>{this.props.title ? this.props.title : <Translate content="account.recent" />}</span>
+                    {this.props.dashboard ? null : (
+                        <div ref="header">
+                            <div className="block-content-header">
+                                <span>
+                                    {this.props.title ? (
+                                        this.props.title
+                                    ) : (
+                                        <Translate content="account.recent" />
+                                    )}
+                                </span>
+                            </div>
                         </div>
-                    </div>}
+                    )}
                     <div className="header-selector">
                         <div className="selector">
                             <div className={cnames("inline-block")}>
                                 {this.props.showFilters ? (
-                                    <select data-place="left" data-tip={counterpart.translate("tooltip.filter_ops")} style={{paddingTop: 5, width: "auto"}} className="bts-select no-margin" value={this.state.filter} onChange={this._onChangeFilter.bind(this)}>{options}</select>
+                                    <select
+                                        data-place="left"
+                                        data-tip={counterpart.translate(
+                                            "tooltip.filter_ops"
+                                        )}
+                                        style={{paddingTop: 5, width: "auto"}}
+                                        className="bts-select no-margin"
+                                        value={this.state.filter}
+                                        onChange={this._onChangeFilter.bind(
+                                            this
+                                        )}
+                                    >
+                                        {options}
+                                    </select>
                                 ) : null}
                             </div>
                         </div>
                     </div>
                     <div
                         className="box-content grid-block no-margin"
-                        style={!this.props.fullHeight ? {
-                            maxHeight: maxHeight - headerHeight
-                        } : null}
-                        ref="transactions">
-                        
-
-                        <table className={"table table-striped " + (compactView ? "compact" : "") + (this.props.dashboard ? " dashboard-table table-hover" : "")}>
+                        style={
+                            !this.props.fullHeight
+                                ? {
+                                      maxHeight: maxHeight - headerHeight
+                                  }
+                                : null
+                        }
+                        ref="transactions"
+                    >
+                        <table
+                            className={
+                                "table table-striped " +
+                                (compactView ? "compact" : "") +
+                                (this.props.dashboard
+                                    ? " dashboard-table table-hover"
+                                    : "")
+                            }
+                        >
                             <thead>
                                 <tr>
-                                    <th className="column-hide-tiny" style={alignLeft}><Translate content="account.transactions.id" /></th>
-                                    <th className="column-hide-tiny" style={alignLeft}><Translate content="account.transactions.type" /></th>
-                                    <th style={alignLeft}><Translate content="account.transactions.info" /></th>
-                                    <th style={alignLeft}><Translate content="account.transactions.time" /></th>
+                                    <th
+                                        className="column-hide-tiny"
+                                        style={alignLeft}
+                                    >
+                                        <Translate content="account.transactions.id" />
+                                    </th>
+                                    <th
+                                        className="column-hide-tiny"
+                                        style={alignLeft}
+                                    >
+                                        <Translate content="account.transactions.type" />
+                                    </th>
+                                    <th style={alignLeft}>
+                                        <Translate content="account.transactions.info" />
+                                    </th>
+                                    <th style={alignLeft}>
+                                        <Translate content="account.transactions.time" />
+                                    </th>
                                 </tr>
                             </thead>
                             <TransitionWrapper
@@ -284,41 +416,42 @@ class RecentTransactions extends React.Component {
                             </TransitionWrapper>
                         </table>
                     </div>
-                {
-                    historyCount > 0 && this.state.csvExport &&
-                    <div id="csv_export_container" style={{display: "none"}}>
-                        <div>
-                            <div>DATE</div>
-                            <div>OPERATION</div>
-                            <div>MEMO</div>
-                            <div>AMOUNT</div>
-                        </div>
-                        {
-                            history.map(o => {
-                                return (
-                                    <Operation
-                                        key={o.id}
-                                        op={o.op}
-                                        result={o.result}
-                                        block={o.block_num}
-                                        inverted={false}
-                                        csvExportMode
-                                    />
-                                );
-                            })
-                        }
-                    </div>
-                }
+                    {historyCount > 0 &&
+                        this.state.csvExport && (
+                            <div
+                                id="csv_export_container"
+                                style={{display: "none"}}
+                            >
+                                <div>
+                                    <div>DATE</div>
+                                    <div>OPERATION</div>
+                                    <div>MEMO</div>
+                                    <div>AMOUNT</div>
+                                </div>
+                                {history.map(o => {
+                                    return (
+                                        <Operation
+                                            key={o.id}
+                                            op={o.op}
+                                            result={o.result}
+                                            block={o.block_num}
+                                            inverted={false}
+                                            csvExportMode
+                                        />
+                                    );
+                                })}
+                            </div>
+                        )}
                 </div>
-
             </div>
         );
     }
 }
-RecentTransactions = BindToChainState(RecentTransactions, {keep_updating: true});
+RecentTransactions = BindToChainState(RecentTransactions, {
+    keep_updating: true
+});
 
 class TransactionWrapper extends React.Component {
-
     static propTypes = {
         asset: ChainTypes.ChainAsset.isRequired,
         to: ChainTypes.ChainAccount.isRequired,
@@ -330,7 +463,9 @@ class TransactionWrapper extends React.Component {
     };
 
     render() {
-        return <span className="wrapper">{this.props.children(this.props)}</span>;
+        return (
+            <span className="wrapper">{this.props.children(this.props)}</span>
+        );
     }
 }
 TransactionWrapper = BindToChainState(TransactionWrapper);
diff --git a/app/components/Account/SignedMessage.jsx b/app/components/Account/SignedMessage.jsx
index 7e87dcd923..11fb78263a 100644
--- a/app/components/Account/SignedMessage.jsx
+++ b/app/components/Account/SignedMessage.jsx
@@ -11,7 +11,6 @@ import SignedMessageAction from "../../actions/SignedMessageAction";
  *    @author Stefan Schiessl <stefan.schiessl@blockchainprojectsbv.com>
  */
 class SignedMessage extends React.Component {
-
     // static propTypes = {
     //     signedMessage: PropTypes.string.isRequired
     //    noVerification
@@ -19,7 +18,7 @@ class SignedMessage extends React.Component {
 
     static defaultProps = {
         noVerification: false
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -47,15 +46,18 @@ class SignedMessage extends React.Component {
             messageParsed = SignedMessageAction.parseMessage(signedMessage);
             this.setState({
                 verified: null,
-                messageParsed: messageParsed,
+                messageParsed: messageParsed
             });
 
             if (!this.state.noVerification) {
                 this.setState({
                     verified: null,
-                    notification: counterpart.translate("account.signedmessages.verifying")
+                    notification: counterpart.translate(
+                        "account.signedmessages.verifying"
+                    )
                 });
-                setTimeout(() => { // do not block gui
+                setTimeout(() => {
+                    // do not block gui
                     try {
                         SignedMessageAction.verifyMemo(messageParsed);
                         this.setState({
@@ -80,8 +82,12 @@ class SignedMessage extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        let signedMessage = nextProps.message
-        if (signedMessage != undefined && signedMessage != null && signedMessage == this.state.message) {
+        let signedMessage = nextProps.message;
+        if (
+            signedMessage != undefined &&
+            signedMessage != null &&
+            signedMessage == this.state.message
+        ) {
             // already done
             return;
         }
@@ -106,72 +112,109 @@ class SignedMessage extends React.Component {
         if (this.state.messageParsed != null) {
             if (this.state.verified == null) {
                 borderColor = "#FFF";
-                legendMessage = "Unverified message from " + this.state.messageParsed.meta.account;
+                legendMessage =
+                    "Unverified message from " +
+                    this.state.messageParsed.meta.account;
             } else if (this.state.verified) {
                 borderColor = "#FFF";
-                legendMessage = "Verified message from " + this.state.messageParsed.meta.account;
+                legendMessage =
+                    "Verified message from " +
+                    this.state.messageParsed.meta.account;
             } else {
                 borderColor = "#F00";
-                legendMessage = "Refuted message, indicated sender " + this.state.messageParsed.meta.account;
+                legendMessage =
+                    "Refuted message, indicated sender " +
+                    this.state.messageParsed.meta.account;
             }
         }
-        let messageGiven = this.props.message != null && this.props.message != "";
-        let notificationGiven = this.state.notification && this.state.notification != "";
+        let messageGiven =
+            this.props.message != null && this.props.message != "";
+        let notificationGiven =
+            this.state.notification && this.state.notification != "";
         return (
             <div style={{color: "gray", margin: "10px 10px"}}>
-                {this.state.messageParsed != null &&
+                {this.state.messageParsed != null && (
                     <fieldset style={{borderColor: borderColor}}>
                         <legend style={{color: "white", weight: "bold"}}>
                             {legendMessage}
                         </legend>
-                        <pre style={{position: "relative", width: "100%", display: "table"}}>
+                        <pre
+                            style={{
+                                position: "relative",
+                                width: "100%",
+                                display: "table"
+                            }}
+                        >
                             {this.state.messageParsed.content}
-                            {notificationGiven &&
-                            <div style={{
-                                textAlign: "center",
-                                display: "table-cell",
-                                verticalAlign: "middle",
-                                position: "absolute",
-                                width: "calc(100% - 30px)",
-                                height: "calc(100% + 15px)",
-                                top: "0px",
-                                right: "30px",
-                                backgroundColor: "rgba(50,50,50,0.5)"
-                            }} id="overlay">
-                                {this.state.notification}
-                            </div>
-                            }
+                            {notificationGiven && (
+                                <div
+                                    style={{
+                                        textAlign: "center",
+                                        display: "table-cell",
+                                        verticalAlign: "middle",
+                                        position: "absolute",
+                                        width: "calc(100% - 30px)",
+                                        height: "calc(100% + 15px)",
+                                        top: "0px",
+                                        right: "30px",
+                                        backgroundColor: "rgba(50,50,50,0.5)"
+                                    }}
+                                    id="overlay"
+                                >
+                                    {this.state.notification}
+                                </div>
+                            )}
                         </pre>
-                        <span style={{
-                            fontSize: "small",
-                            float: "right"
-                        }}>
-                            Signed on {this.state.messageParsed.meta.timestamp} &nbsp;
-                            <button className="button" type="button" style={{
+                        <span
+                            style={{
                                 fontSize: "small",
-                                float: "right",
-                                padding: "0px 0px",
-                                background: "#777"
-                            }} onClick={this._toggleRawMessage.bind(this)}>&#x1f50d;</button></span>
-                        {this.state.showRawMessage &&
-                        <br />
-                        }
-                        {this.state.showRawMessage &&
-                        <br />
-                        }
-                        {this.state.showRawMessage &&
-                            <div style={{overflow: "auto", width: "calc(100%)", maxWidth: "1000px"}}>
+                                float: "right"
+                            }}
+                        >
+                            Signed on {this.state.messageParsed.meta.timestamp}{" "}
+                            &nbsp;
+                            <button
+                                className="button"
+                                type="button"
+                                style={{
+                                    fontSize: "small",
+                                    float: "right",
+                                    padding: "0px 0px",
+                                    background: "#777"
+                                }}
+                                onClick={this._toggleRawMessage.bind(this)}
+                            >
+                                &#x1f50d;
+                            </button>
+                        </span>
+                        {this.state.showRawMessage && <br />}
+                        {this.state.showRawMessage && <br />}
+                        {this.state.showRawMessage && (
+                            <div
+                                style={{
+                                    overflow: "auto",
+                                    width: "calc(100%)",
+                                    maxWidth: "1000px"
+                                }}
+                            >
                                 <pre>{this.state.message}</pre>
                             </div>
-                        }
-                    </fieldset>
-                }
-                {messageGiven && this.state.messageParsed == null &&
-                    <fieldset style={{borderColor: "#F00"}}>
-                        <legend style={{color: "red", weight: "bold"}} className="error">Error while parsing message, please check syntax from message below</legend>
-                        <pre>{this.props.message}</pre>
+                        )}
                     </fieldset>
-                }
+                )}
+                {messageGiven &&
+                    this.state.messageParsed == null && (
+                        <fieldset style={{borderColor: "#F00"}}>
+                            <legend
+                                style={{color: "red", weight: "bold"}}
+                                className="error"
+                            >
+                                Error while parsing message, please check syntax
+                                from message below
+                            </legend>
+                            <pre>{this.props.message}</pre>
+                        </fieldset>
+                    )}
             </div>
         );
     }
diff --git a/app/components/Account/Statistics.jsx b/app/components/Account/Statistics.jsx
index 1c37fabb1f..f4ba94ee46 100644
--- a/app/components/Account/Statistics.jsx
+++ b/app/components/Account/Statistics.jsx
@@ -5,18 +5,24 @@ import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 
 class Statistics extends React.Component {
-
     static propTypes = {
         stat_object: ChainTypes.ChainObject.isRequired
-    }
+    };
 
     render() {
         let stat_object = this.props.stat_object.toJS();
         return (
             <tbody>
                 <tr>
-                    <td><Translate content="account.member.fees_paid"/> </td>
-                    <td><FormattedAsset amount={parseFloat(stat_object.lifetime_fees_paid)} asset="1.3.0" /></td>
+                    <td>
+                        <Translate content="account.member.fees_paid" />{" "}
+                    </td>
+                    <td>
+                        <FormattedAsset
+                            amount={parseFloat(stat_object.lifetime_fees_paid)}
+                            asset="1.3.0"
+                        />
+                    </td>
                 </tr>
             </tbody>
         );
diff --git a/app/components/Account/VotingAccountsList.jsx b/app/components/Account/VotingAccountsList.jsx
index d13824c7a7..88be1fc327 100644
--- a/app/components/Account/VotingAccountsList.jsx
+++ b/app/components/Account/VotingAccountsList.jsx
@@ -10,7 +10,9 @@ import LinkToAccountById from "../Utility/LinkToAccountById";
 import counterpart from "counterpart";
 
 function getWitnessOrCommittee(type, acct) {
-    let url = "", votes = 0, account;
+    let url = "",
+        votes = 0,
+        account;
     if (type === "witness") {
         account = ChainStore.getWitnessById(acct.get("id"));
     } else if (type === "committee") {
@@ -30,7 +32,7 @@ class AccountItemRow extends React.Component {
     static propTypes = {
         account: React.PropTypes.object.isRequired,
         onAction: React.PropTypes.func.isRequired
-    }
+    };
 
     shouldComponentUpdate(nextProps) {
         return (
@@ -42,7 +44,7 @@ class AccountItemRow extends React.Component {
         );
     }
 
-    onAction(item_id){
+    onAction(item_id) {
         this.props.onAction(item_id);
     }
 
@@ -52,28 +54,67 @@ class AccountItemRow extends React.Component {
 
         let {url, votes} = getWitnessOrCommittee(type, account);
 
-        let link = url && url.length > 0 && url.indexOf("http") === -1 ? "http://" + url : url;
+        let link =
+            url && url.length > 0 && url.indexOf("http") === -1
+                ? "http://" + url
+                : url;
         const isSupported = action === "remove";
         return (
-            <tr className={(isSupported ? "": "unsupported")}>
-                <td style={{textAlign: "right"}}>
-                    {this.props.idx + 1}
+            <tr className={isSupported ? "" : "unsupported"}>
+                <td style={{textAlign: "right"}}>{this.props.idx + 1}</td>
+                <td style={{textAlign: "left"}}>
+                    <LinkToAccountById account={account.get("id")} />
+                </td>
+                <td>
+                    {link && link.indexOf(".") !== -1 ? (
+                        <a
+                            href={link}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                        >
+                            <Icon name="share" />
+                        </a>
+                    ) : null}
+                </td>
+                <td>
+                    <FormattedAsset
+                        amount={votes}
+                        asset="1.3.0"
+                        decimalOffset={5}
+                        hide_asset
+                    />
                 </td>
-                <td style={{textAlign: "left"}}><LinkToAccountById account={account.get("id")} /></td>
                 <td>
-                    {link && link.indexOf(".") !== -1 ?
-                    <a href={link} target="_blank" rel="noopener noreferrer">
-                        <Icon name="share" />
-                    </a> : null}
+                    <Translate
+                        content={`account.votes.${
+                            isActive ? "active_short" : "inactive"
+                        }`}
+                    />
                 </td>
-                <td><FormattedAsset amount={votes} asset="1.3.0" decimalOffset={5} hide_asset /></td>
-                <td><Translate content={`account.votes.${isActive ? "active_short" : "inactive"}`} /></td>
-                <td style={{textAlign: "center"}}><Translate content={`settings.${isSupported ? "yes" : "no"}`}/></td>
-                <td className={this.props.proxy ? "" : "clickable"} onClick={this.props.proxy ? () => {} : this.onAction.bind(this, item_id)}>
-                    {!this.props.proxy ?
-                        <Icon name={isSupported ? "checkmark-circle" : "minus-circle"} /> :
+                <td style={{textAlign: "center"}}>
+                    <Translate
+                        content={`settings.${isSupported ? "yes" : "no"}`}
+                    />
+                </td>
+                <td
+                    className={this.props.proxy ? "" : "clickable"}
+                    onClick={
+                        this.props.proxy
+                            ? () => {}
+                            : this.onAction.bind(this, item_id)
+                    }
+                >
+                    {!this.props.proxy ? (
+                        <Icon
+                            name={
+                                isSupported
+                                    ? "checkmark-circle"
+                                    : "minus-circle"
+                            }
+                        />
+                    ) : (
                         <Icon name="locked" />
-                }
+                    )}
                 </td>
             </tr>
         );
@@ -81,7 +122,6 @@ class AccountItemRow extends React.Component {
 }
 
 class VotingAccountsList extends React.Component {
-
     static propTypes = {
         items: ChainTypes.ChainObjectsList,
         onAddItem: React.PropTypes.func.isRequired,
@@ -118,16 +158,16 @@ class VotingAccountsList extends React.Component {
 
     onItemAccountChange(selected_item) {
         this.setState({selected_item, error: null});
-        if(selected_item && this.props.validateAccount) {
+        if (selected_item && this.props.validateAccount) {
             let res = this.props.validateAccount(selected_item);
-            if(res === null) return;
-            if(typeof(res) === "string") this.setState({error: res});
+            if (res === null) return;
+            if (typeof res === "string") this.setState({error: res});
             else res.then(error => this.setState({error: error}));
         }
     }
 
     onAddItem(item) {
-        if(!item) return;
+        if (!item) return;
         let next_state = {
             selected_item: null,
             item_name_input: "",
@@ -138,48 +178,67 @@ class VotingAccountsList extends React.Component {
     }
 
     render() {
-        if(!this.props.items) return null;
-
-        let item_rows = this.props.items.filter(i => {
-            if (!i) return false;
-            //if (this.state.item_name_input) return i.get("name").indexOf(this.state.item_name_input) !== -1;
-            return true;
-        })
-        .sort((a,b) =>{
-            let {votes: a_votes} = getWitnessOrCommittee(this.props.type, a);
-            let {votes: b_votes} = getWitnessOrCommittee(this.props.type, b);
-            if (a_votes !== b_votes) {
-                return b_votes - a_votes;
-            }
-            else if( a.get("name") > b.get("name") ) {
-                return 1;
-            }
-            else if ( a.get("name") < b.get("name") ) {
-                return -1;
-            } else {
-                return 0;
-            }
-        })
-        .map((i, idx) => {
-            let action = this.props.supported && this.props.supported.includes(i.get("id")) ? "remove" : "add";
-            let isActive = this.props.active.includes(getWitnessOrCommittee(this.props.type, i).id);
-            return (
-                <AccountItemRow
-                    idx={idx}
-                    key={i.get("name")}
-                    account={i}
-                    type={this.props.type}
-                    onAction={action === "add" ? this.props.onAddItem : this.props.onRemoveItem}
-                    isSelected={this.props.items.indexOf(i) !== -1}
-                    action={action}
-                    isActive={isActive}
-                    proxy={this.props.proxy}
-                />
-            );
-        });
+        if (!this.props.items) return null;
+
+        let item_rows = this.props.items
+            .filter(i => {
+                if (!i) return false;
+                //if (this.state.item_name_input) return i.get("name").indexOf(this.state.item_name_input) !== -1;
+                return true;
+            })
+            .sort((a, b) => {
+                let {votes: a_votes} = getWitnessOrCommittee(
+                    this.props.type,
+                    a
+                );
+                let {votes: b_votes} = getWitnessOrCommittee(
+                    this.props.type,
+                    b
+                );
+                if (a_votes !== b_votes) {
+                    return b_votes - a_votes;
+                } else if (a.get("name") > b.get("name")) {
+                    return 1;
+                } else if (a.get("name") < b.get("name")) {
+                    return -1;
+                } else {
+                    return 0;
+                }
+            })
+            .map((i, idx) => {
+                let action =
+                    this.props.supported &&
+                    this.props.supported.includes(i.get("id"))
+                        ? "remove"
+                        : "add";
+                let isActive = this.props.active.includes(
+                    getWitnessOrCommittee(this.props.type, i).id
+                );
+                return (
+                    <AccountItemRow
+                        idx={idx}
+                        key={i.get("name")}
+                        account={i}
+                        type={this.props.type}
+                        onAction={
+                            action === "add"
+                                ? this.props.onAddItem
+                                : this.props.onRemoveItem
+                        }
+                        isSelected={this.props.items.indexOf(i) !== -1}
+                        action={action}
+                        isActive={isActive}
+                        proxy={this.props.proxy}
+                    />
+                );
+            });
 
         let error = this.state.error;
-        if(!error && this.state.selected_item && this.props.items.indexOf(this.state.selected_item) !== -1) {
+        if (
+            !error &&
+            this.state.selected_item &&
+            this.props.items.indexOf(this.state.selected_item) !== -1
+        ) {
             error = counterpart.translate("account.votes.already");
         }
 
@@ -187,42 +246,57 @@ class VotingAccountsList extends React.Component {
 
         return (
             <div>
-                {this.props.withSelector ?
-                <AccountSelector
-                    style={{maxWidth: "600px"}}
-                    label={this.props.label}
-                    error={error}
-                    placeholder={this.props.placeholder}
-                    account={this.state.item_name_input}
-                    accountName={this.state.item_name_input}
-                    onChange={this.onItemChange}
-                    onAccountChanged={this.onItemAccountChange}
-                    onAction={this.onAddItem}
-                    action_label="account.votes.add_witness"
-                    tabIndex={this.props.tabIndex}
-                /> : null}
-                {this.props.title && item_rows.length ? <h4>{this.props.title}</h4> : null}
+                {this.props.withSelector ? (
+                    <AccountSelector
+                        style={{maxWidth: "600px"}}
+                        label={this.props.label}
+                        error={error}
+                        placeholder={this.props.placeholder}
+                        account={this.state.item_name_input}
+                        accountName={this.state.item_name_input}
+                        onChange={this.onItemChange}
+                        onAccountChanged={this.onItemAccountChange}
+                        onAction={this.onAddItem}
+                        action_label="account.votes.add_witness"
+                        tabIndex={this.props.tabIndex}
+                    />
+                ) : null}
+                {this.props.title && item_rows.length ? (
+                    <h4>{this.props.title}</h4>
+                ) : null}
                 {item_rows.length ? (
-                <table className="table dashboard-table table-hover">
-                    <thead>
-                        <tr>
-                            <th style={{textAlign: "right"}}>#</th>
-                            <th style={{textAlign: "left", maxWidth: cw[1]}}><Translate content="account.votes.name" /></th>
-                            <th style={{maxWidth: cw[2]}}><Translate content="account.votes.about"/></th>
-                            <th style={{maxWidth: cw[3]}}><Translate content="account.votes.votes" /></th>
-                            <th style={{maxWidth: cw[4]}}><Translate content="account.votes.status.title" /></th>
-                            <th style={{maxWidth: cw[0]}}><Translate content="account.votes.supported"/></th>
-                            <th style={{maxWidth: cw[5]}}><Translate content="account.votes.toggle" /></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {item_rows}
-                    </tbody>
-                </table>) : null}
+                    <table className="table dashboard-table table-hover">
+                        <thead>
+                            <tr>
+                                <th style={{textAlign: "right"}}>#</th>
+                                <th
+                                    style={{textAlign: "left", maxWidth: cw[1]}}
+                                >
+                                    <Translate content="account.votes.name" />
+                                </th>
+                                <th style={{maxWidth: cw[2]}}>
+                                    <Translate content="account.votes.about" />
+                                </th>
+                                <th style={{maxWidth: cw[3]}}>
+                                    <Translate content="account.votes.votes" />
+                                </th>
+                                <th style={{maxWidth: cw[4]}}>
+                                    <Translate content="account.votes.status.title" />
+                                </th>
+                                <th style={{maxWidth: cw[0]}}>
+                                    <Translate content="account.votes.supported" />
+                                </th>
+                                <th style={{maxWidth: cw[5]}}>
+                                    <Translate content="account.votes.toggle" />
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>{item_rows}</tbody>
+                    </table>
+                ) : null}
             </div>
         );
     }
-
 }
 
 export default BindToChainState(VotingAccountsList, {keep_updating: true});
diff --git a/app/components/Account/WorkerApproval.jsx b/app/components/Account/WorkerApproval.jsx
index 90a44d1fa2..95e25d0ca9 100644
--- a/app/components/Account/WorkerApproval.jsx
+++ b/app/components/Account/WorkerApproval.jsx
@@ -8,58 +8,59 @@ import BindToChainState from "../Utility/BindToChainState";
 import {EquivalentValueComponent} from "../Utility/EquivalentValueComponent";
 import Icon from "components/Icon/Icon";
 
-class WorkerApproval extends React.Component{
-
+class WorkerApproval extends React.Component {
     static propTypes = {
-        worker: ChainTypes.ChainObject.isRequired ,
+        worker: ChainTypes.ChainObject.isRequired,
         onAddVote: React.PropTypes.func, /// called with vote id to add
         onRemoveVote: React.PropTypes.func, /// called with vote id to remove
-        vote_ids: React.PropTypes.object  /// Set of items currently being voted for
+        vote_ids: React.PropTypes.object /// Set of items currently being voted for
     };
 
     static defaultProps = {
         tempComponent: "tr"
     };
 
-    constructor( props ) {
+    constructor(props) {
         super(props);
     }
 
     onApprove() {
-        let addVotes = [], removeVotes = [];
+        let addVotes = [],
+            removeVotes = [];
 
-        if( this.props.vote_ids.has( this.props.worker.get("vote_against") ) ) {
+        if (this.props.vote_ids.has(this.props.worker.get("vote_against"))) {
             removeVotes.push(this.props.worker.get("vote_against"));
         }
 
-        if( !this.props.vote_ids.has( this.props.worker.get("vote_for") ) ) {
+        if (!this.props.vote_ids.has(this.props.worker.get("vote_for"))) {
             addVotes.push(this.props.worker.get("vote_for"));
         }
 
-        this.props.onChangeVotes( addVotes, removeVotes);
+        this.props.onChangeVotes(addVotes, removeVotes);
     }
 
     onReject() {
-        let addVotes = [], removeVotes = [];
+        let addVotes = [],
+            removeVotes = [];
 
-        if( this.props.vote_ids.has( this.props.worker.get("vote_against") ) ) {
+        if (this.props.vote_ids.has(this.props.worker.get("vote_against"))) {
             removeVotes.push(this.props.worker.get("vote_against"));
         }
 
-        if( this.props.vote_ids.has( this.props.worker.get("vote_for") ) ) {
+        if (this.props.vote_ids.has(this.props.worker.get("vote_for"))) {
             removeVotes.push(this.props.worker.get("vote_for"));
         }
 
-        this.props.onChangeVotes( addVotes, removeVotes);
+        this.props.onChangeVotes(addVotes, removeVotes);
     }
 
     render() {
         let {rank} = this.props;
         let worker = this.props.worker.toJS();
         let total_votes = worker.total_votes_for - worker.total_votes_against;
-        let approvalState = this.props.vote_ids.has(worker.vote_for) ? true :
-            this.props.vote_ids.has(worker.vote_against) ? false :
-            null;
+        let approvalState = this.props.vote_ids.has(worker.vote_for)
+            ? true
+            : this.props.vote_ids.has(worker.vote_against) ? false : null;
 
         let fundedPercent = 0;
 
@@ -69,29 +70,62 @@ class WorkerApproval extends React.Component{
             fundedPercent = this.props.rest / worker.daily_pay * 100;
         }
 
-        let startDate = counterpart.localize(new Date(worker.work_begin_date + "Z"), { type: "date", format: "short_custom" });
-        let endDate = counterpart.localize(new Date(worker.work_end_date + "Z"), { type: "date", format: "short_custom" });
+        let startDate = counterpart.localize(
+            new Date(worker.work_begin_date + "Z"),
+            {type: "date", format: "short_custom"}
+        );
+        let endDate = counterpart.localize(
+            new Date(worker.work_end_date + "Z"),
+            {type: "date", format: "short_custom"}
+        );
 
         let now = new Date();
         let isExpired = new Date(worker.work_end_date + "Z") <= now;
         let hasStarted = new Date(worker.work_begin_date + "Z") <= now;
-        let isProposed = (!isExpired && total_votes < this.props.voteThreshold) || !hasStarted;
-        return  (
-
+        let isProposed =
+            (!isExpired && total_votes < this.props.voteThreshold) ||
+            !hasStarted;
+        return (
             <tr className={approvalState ? "" : "unsupported"}>
-                {isExpired ? null : <td style={{textAlign: "right", paddingRight: 10, paddingLeft: 0}}>{rank}</td>}
-                
+                {isExpired ? null : (
+                    <td
+                        style={{
+                            textAlign: "right",
+                            paddingRight: 10,
+                            paddingLeft: 0
+                        }}
+                    >
+                        {rank}
+                    </td>
+                )}
+
                 <td className="worker-id" style={{textAlign: "left"}}>
                     {worker.id}
                 </td>
 
                 <td className="worker-name" style={{textAlign: "left"}}>
-                    <div className="inline-block" style={{paddingRight: 5, position: "relative", top: -1}}>
-                        <a style={{visibility: worker.url && worker.url.indexOf(".") !== -1 ? "visible": "hidden"}} href={worker.url} target="_blank" rel="noopener noreferrer">
-                            <Icon name="share"/>
+                    <div
+                        className="inline-block"
+                        style={{paddingRight: 5, position: "relative", top: -1}}
+                    >
+                        <a
+                            style={{
+                                visibility:
+                                    worker.url && worker.url.indexOf(".") !== -1
+                                        ? "visible"
+                                        : "hidden"
+                            }}
+                            href={worker.url}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                        >
+                            <Icon name="share" />
                         </a>
                     </div>
-                    <div data-tip={worker.name} className="inline-block tooltip">
+                    <div
+                        data-tip={worker.name}
+                        className="inline-block tooltip"
+                    >
                         {worker.name}
                         <br />
                         <LinkToAccountById account={worker.worker_account} />
@@ -99,21 +133,40 @@ class WorkerApproval extends React.Component{
                 </td>
 
                 <td style={{textAlign: "right"}} className="hide-column-small">
-                    <FormattedAsset amount={total_votes} asset="1.3.0" decimalOffset={5} hide_asset/>
+                    <FormattedAsset
+                        amount={total_votes}
+                        asset="1.3.0"
+                        decimalOffset={5}
+                        hide_asset
+                    />
                 </td>
 
-                {!isProposed ? null :
-                <td style={{textAlign: "right"}}>
-                    <FormattedAsset amount={Math.max(0, this.props.voteThreshold - total_votes)} asset="1.3.0" hide_asset decimalOffset={5} />
-                </td>}
+                {!isProposed ? null : (
+                    <td style={{textAlign: "right"}}>
+                        <FormattedAsset
+                            amount={Math.max(
+                                0,
+                                this.props.voteThreshold - total_votes
+                            )}
+                            asset="1.3.0"
+                            hide_asset
+                            decimalOffset={5}
+                        />
+                    </td>
+                )}
 
                 <td>
                     {startDate} - {endDate}
                 </td>
 
-                {isExpired || isProposed ? null : <td style={{textAlign: "right"}} className="hide-column-small">
-                    {utils.format_number(fundedPercent, 2)}%
-                </td>}
+                {isExpired || isProposed ? null : (
+                    <td
+                        style={{textAlign: "right"}}
+                        className="hide-column-small"
+                    >
+                        {utils.format_number(fundedPercent, 2)}%
+                    </td>
+                )}
 
                 <td style={{textAlign: "right"}} className="hide-column-small">
                     <EquivalentValueComponent
@@ -124,25 +177,42 @@ class WorkerApproval extends React.Component{
                     />
                 </td>
 
-                {isExpired || isProposed ? null :
-                <td style={{textAlign: "right"}}>
-                    {this.props.rest <= 0 ? "0.00" :
-                        <EquivalentValueComponent
-                            hide_asset
-                            fromAsset="1.3.0"
-                            toAsset={this.props.preferredUnit}
-                            amount={this.props.rest}
-                        />
-                    }
-                </td>}
+                {isExpired || isProposed ? null : (
+                    <td style={{textAlign: "right"}}>
+                        {this.props.rest <= 0 ? (
+                            "0.00"
+                        ) : (
+                            <EquivalentValueComponent
+                                hide_asset
+                                fromAsset="1.3.0"
+                                toAsset={this.props.preferredUnit}
+                                amount={this.props.rest}
+                            />
+                        )}
+                    </td>
+                )}
 
                 <td
                     className="clickable"
-                    onClick={this.props.proxy ? () => {} : this[approvalState ? "onReject" : "onApprove"].bind(this)}
+                    onClick={
+                        this.props.proxy
+                            ? () => {}
+                            : this[
+                                  approvalState ? "onReject" : "onApprove"
+                              ].bind(this)
+                    }
                 >
-                    {!this.props.proxy ?
-                        <Icon name={approvalState ? "checkmark-circle" : "minus-circle"} /> :
-                        <Icon name="locked" />}
+                    {!this.props.proxy ? (
+                        <Icon
+                            name={
+                                approvalState
+                                    ? "checkmark-circle"
+                                    : "minus-circle"
+                            }
+                        />
+                    ) : (
+                        <Icon name="locked" />
+                    )}
                 </td>
             </tr>
         );
diff --git a/app/components/Blockchain/Block.jsx b/app/components/Blockchain/Block.jsx
index 4e4a1e7cc3..1b75008bee 100644
--- a/app/components/Blockchain/Block.jsx
+++ b/app/components/Blockchain/Block.jsx
@@ -10,11 +10,8 @@ import BindToChainState from "../Utility/BindToChainState";
 import LinkToWitnessById from "../Utility/LinkToWitnessById";
 
 class TransactionList extends React.Component {
-
     shouldComponentUpdate(nextProps) {
-        return (
-                nextProps.block.id !== this.props.block.id
-            );
+        return nextProps.block.id !== this.props.block.id;
     }
 
     render() {
@@ -28,29 +25,21 @@ class TransactionList extends React.Component {
 
             block.transactions.forEach((trx, index) => {
                 transactions.push(
-                    <Transaction
-                        key={index}
-                        trx={trx}
-                        index={index}
-                    />);
+                    <Transaction key={index} trx={trx} index={index} />
+                );
             });
         }
 
-        return (
-                <div>
-                    {transactions}
-                </div>
-            );
+        return <div>{transactions}</div>;
     }
 }
 
-
 class Block extends React.Component {
     static propTypes = {
         dynGlobalObject: ChainTypes.ChainObject.isRequired,
         blocks: PropTypes.object.isRequired,
         height: PropTypes.number.isRequired
-    }
+    };
 
     static defaultProps = {
         dynGlobalObject: "2.1.0",
@@ -96,7 +85,10 @@ class Block extends React.Component {
 
     _nextBlock() {
         let height = this.props.params.height;
-        let nextBlock = Math.min(this.props.dynGlobalObject.get("head_block_number"), parseInt(height, 10) + 1);
+        let nextBlock = Math.min(
+            this.props.dynGlobalObject.get("head_block_number"),
+            parseInt(height, 10) + 1
+        );
         this.props.router.push(`/block/${nextBlock}`);
     }
 
@@ -126,50 +118,96 @@ class Block extends React.Component {
     }
 
     render() {
-        const { showInput } = this.state;
+        const {showInput} = this.state;
         let {blocks} = this.props;
         let height = parseInt(this.props.height, 10);
         let block = blocks.get(height);
 
-        let blockHeight = showInput ?
+        let blockHeight = showInput ? (
             <span className="inline-label">
-                <input ref="blockInput" type="number" onKeyDown={this._onKeyDown.bind(this)}/>
-                <button onClick={this._onSubmit.bind(this)} className="button"><Translate content="explorer.block.go_to" /></button>
-            </span> :
+                <input
+                    ref="blockInput"
+                    type="number"
+                    onKeyDown={this._onKeyDown.bind(this)}
+                />
+                <button onClick={this._onSubmit.bind(this)} className="button">
+                    <Translate content="explorer.block.go_to" />
+                </button>
+            </span>
+        ) : (
             <span>
-                <Translate style={{textTransform: "uppercase"}} component="span" content="explorer.block.title" />
-                <a onClick={this.toggleInput.bind(this)}>
-                    &nbsp;#{height}
-                </a>
-            </span>;
+                <Translate
+                    style={{textTransform: "uppercase"}}
+                    component="span"
+                    content="explorer.block.title"
+                />
+                <a onClick={this.toggleInput.bind(this)}>&nbsp;#{height}</a>
+            </span>
+        );
 
         return (
             <div className="grid-block page-layout">
                 <div className="grid-block main-content">
-                <div className="grid-content">
+                    <div className="grid-content">
                         <div className="grid-content no-overflow medium-offset-2 medium-8 large-offset-3 large-6 small-12">
-                        <h4 className="text-center">
-
-                            {blockHeight}
-                        </h4>
-                        <ul>
-                           <li><Translate component="span" content="explorer.block.date" />:  {block ? <FormattedDate
-                                value={block.timestamp}
-                                format="full"
-                                /> : null}
-                            </li>
-                            <li><Translate component="span" content="explorer.block.witness" />:  {block ? <LinkToWitnessById witness={block.witness} /> : null}</li>
-                            <li><Translate component="span" content="explorer.block.previous" />: {block ? block.previous : null}</li>
-                            <li><Translate component="span" content="explorer.block.transactions" />: {block ? block.transactions.length : null}</li>
-                        </ul>
-                        <div className="clearfix" style={{marginBottom: "1rem"}}>
-                            <div className="button float-left outline" onClick={this._previousBlock.bind(this)}>&#8592;</div>
-                            <div className="button float-right outline" onClick={this._nextBlock.bind(this)}>&#8594;</div>
+                            <h4 className="text-center">{blockHeight}</h4>
+                            <ul>
+                                <li>
+                                    <Translate
+                                        component="span"
+                                        content="explorer.block.date"
+                                    />:{" "}
+                                    {block ? (
+                                        <FormattedDate
+                                            value={block.timestamp}
+                                            format="full"
+                                        />
+                                    ) : null}
+                                </li>
+                                <li>
+                                    <Translate
+                                        component="span"
+                                        content="explorer.block.witness"
+                                    />:{" "}
+                                    {block ? (
+                                        <LinkToWitnessById
+                                            witness={block.witness}
+                                        />
+                                    ) : null}
+                                </li>
+                                <li>
+                                    <Translate
+                                        component="span"
+                                        content="explorer.block.previous"
+                                    />: {block ? block.previous : null}
+                                </li>
+                                <li>
+                                    <Translate
+                                        component="span"
+                                        content="explorer.block.transactions"
+                                    />:{" "}
+                                    {block ? block.transactions.length : null}
+                                </li>
+                            </ul>
+                            <div
+                                className="clearfix"
+                                style={{marginBottom: "1rem"}}
+                            >
+                                <div
+                                    className="button float-left outline"
+                                    onClick={this._previousBlock.bind(this)}
+                                >
+                                    &#8592;
+                                </div>
+                                <div
+                                    className="button float-right outline"
+                                    onClick={this._nextBlock.bind(this)}
+                                >
+                                    &#8594;
+                                </div>
+                            </div>
+                            {block ? <TransactionList block={block} /> : null}
                         </div>
-                        {block ? <TransactionList
-                            block={block}
-                        /> : null}
-                    </div>
                     </div>
                 </div>
             </div>
diff --git a/app/components/Blockchain/BlockContainer.jsx b/app/components/Blockchain/BlockContainer.jsx
index d2ff44f602..c32bfa985d 100644
--- a/app/components/Blockchain/BlockContainer.jsx
+++ b/app/components/Blockchain/BlockContainer.jsx
@@ -4,21 +4,20 @@ import AltContainer from "alt-container";
 import Block from "./Block";
 
 class BlockContainer extends React.Component {
-
     render() {
         let height = parseInt(this.props.params.height, 10);
 
         return (
-              <AltContainer 
-                  stores={[BlockchainStore]}
-                  inject={{
+            <AltContainer
+                stores={[BlockchainStore]}
+                inject={{
                     blocks: () => {
                         return BlockchainStore.getState().blocks;
                     }
-                  }} 
-                  >
-                <Block {...this.props} height={height}/>
-              </AltContainer>
+                }}
+            >
+                <Block {...this.props} height={height} />
+            </AltContainer>
         );
     }
 }
diff --git a/app/components/Blockchain/BlockTime.jsx b/app/components/Blockchain/BlockTime.jsx
index 1695ba576d..126b707264 100644
--- a/app/components/Blockchain/BlockTime.jsx
+++ b/app/components/Blockchain/BlockTime.jsx
@@ -12,7 +12,6 @@ import utils from "common/utils";
  **/
 
 class BlockTime extends React.Component {
-
     static propTypes = {
         block_number: React.PropTypes.number.isRequired,
         globalObject: ChainTypes.ChainObject.isRequired,
@@ -34,11 +33,17 @@ class BlockTime extends React.Component {
     }
 
     calcTime(block_number) {
-        this.setState({time: utils.calc_block_time(block_number, this.props.globalObject, this.props.dynGlobalObject)});
+        this.setState({
+            time: utils.calc_block_time(
+                block_number,
+                this.props.globalObject,
+                this.props.dynGlobalObject
+            )
+        });
     }
 
     componentWillReceiveProps(next_props) {
-        if(next_props.block_number !== this.props.block_number) {
+        if (next_props.block_number !== this.props.block_number) {
             this.calcTime(next_props.block_number);
         }
     }
@@ -49,11 +54,11 @@ class BlockTime extends React.Component {
     }
     */
 
-                //{this.state.time ?  <FormattedDate value={this.state.time} format="short"/> : null}
+    //{this.state.time ?  <FormattedDate value={this.state.time} format="short"/> : null}
     render() {
         return (
             <span className="time" key={this.props.block_number}>
-                {this.state.time ? <TimeAgo time={this.state.time} /> : null }
+                {this.state.time ? <TimeAgo time={this.state.time} /> : null}
             </span>
         );
     }
diff --git a/app/components/Blockchain/Fees.jsx b/app/components/Blockchain/Fees.jsx
index ad79b9753c..53bc5afe44 100644
--- a/app/components/Blockchain/Fees.jsx
+++ b/app/components/Blockchain/Fees.jsx
@@ -14,24 +14,23 @@ let ops = Object.keys(operations);
 
 // Define groups and their corresponding operation ids
 let fee_grouping = {
-    general  : [0,25,26,27,28,32,33,37,39,40],
-    asset    : [10,11,12,13,14,15,16,17,18,19,38],
-    market   : [1,2,3,4,17,18],
-    account  : [5,6,7,8,9],
-    business : [20,21,22,23,24,29,30,31,34,35,36],
+    general: [0, 25, 26, 27, 28, 32, 33, 37, 39, 40],
+    asset: [10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 38],
+    market: [1, 2, 3, 4, 17, 18],
+    account: [5, 6, 7, 8, 9],
+    business: [20, 21, 22, 23, 24, 29, 30, 31, 34, 35, 36]
 };
 
 // Operations that require LTM
 let ltm_required = [5, 7, 20, 21, 34];
 
 class FeeGroup extends React.Component {
-
     static propTypes = {
         globalObject: ChainTypes.ChainObject.isRequired
     };
 
     static defaultProps = {
-        globalObject: "2.0.0",
+        globalObject: "2.0.0"
     };
 
     constructor(props) {
@@ -39,9 +38,7 @@ class FeeGroup extends React.Component {
     }
 
     shouldComponentUpdate(nextProps) {
-        return (
-            !Immutable.is(nextProps.globalObject, this.props.globalObject)
-        );
+        return !Immutable.is(nextProps.globalObject, this.props.globalObject);
     }
 
     render() {
@@ -50,62 +47,115 @@ class FeeGroup extends React.Component {
         const core_asset = ChainStore.getAsset("1.3.0");
 
         let current_fees = globalObject.parameters.current_fees;
-        let scale   = current_fees.scale;
+        let scale = current_fees.scale;
         let feesRaw = current_fees.parameters;
         let preferredUnit = settings.get("unit") || core_asset.get("symbol");
 
         let trxTypes = counterpart.translate("transaction.trxTypes");
 
-        let fees = opIds.map((feeIdx) => {
+        let fees = opIds.map(feeIdx => {
             if (feeIdx >= feesRaw.length) {
-                console.warn("Asking for non-existing fee id %d! Check group settings in Fees.jsx", feeIdx);
+                console.warn(
+                    "Asking for non-existing fee id %d! Check group settings in Fees.jsx",
+                    feeIdx
+                );
                 return; // FIXME, if I ask for a fee that does not exist?
             }
 
             let feeStruct = feesRaw[feeIdx];
 
-            let opId      = feeStruct[0]
-            let fee       = feeStruct[1]
-            let operation_name = ops[ opId ];
-            let feename        = trxTypes[ operation_name ];
+            let opId = feeStruct[0];
+            let fee = feeStruct[1];
+            let operation_name = ops[opId];
+            let feename = trxTypes[operation_name];
 
-            let feeRateForLTM = 0.2
+            let feeRateForLTM = 0.2;
             if (opId === 10) {
                 // Asset creation fee for LTM is 60% of standart user
                 // See https://github.com/bitshares/bitshares-ui/issues/996
-                feeRateForLTM = 0.6
+                feeRateForLTM = 0.6;
             }
 
-            let rows = []
-            let headIncluded = false
+            let rows = [];
+            let headIncluded = false;
             let labelClass = classNames("label", "info");
 
             for (let key in fee) {
-                let amount = fee[key]*scale/1e4;
-                let amountForLTM = amount * feeRateForLTM
+                let amount = fee[key] * scale / 1e4;
+                let amountForLTM = amount * feeRateForLTM;
                 let feeTypes = counterpart.translate("transaction.feeTypes");
-                let assetAmount = amount ? <FormattedAsset amount={amount} asset="1.3.0"/> : feeTypes["_none"];
-                let equivalentAmount = amount ? <EquivalentValueComponent fromAsset="1.3.0" fullPrecision={true} amount={amount} toAsset={preferredUnit} fullDecimals={true}/> : feeTypes["_none"];
-                let assetAmountLTM = amountForLTM ? <FormattedAsset amount={amountForLTM} asset="1.3.0"/> : feeTypes["_none"];
-                let equivalentAmountLTM = amountForLTM ? <EquivalentValueComponent fromAsset="1.3.0" fullPrecision={true} amount={amountForLTM} toAsset={preferredUnit} fullDecimals={true}/> : feeTypes["_none"];
+                let assetAmount = amount ? (
+                    <FormattedAsset amount={amount} asset="1.3.0" />
+                ) : (
+                    feeTypes["_none"]
+                );
+                let equivalentAmount = amount ? (
+                    <EquivalentValueComponent
+                        fromAsset="1.3.0"
+                        fullPrecision={true}
+                        amount={amount}
+                        toAsset={preferredUnit}
+                        fullDecimals={true}
+                    />
+                ) : (
+                    feeTypes["_none"]
+                );
+                let assetAmountLTM = amountForLTM ? (
+                    <FormattedAsset amount={amountForLTM} asset="1.3.0" />
+                ) : (
+                    feeTypes["_none"]
+                );
+                let equivalentAmountLTM = amountForLTM ? (
+                    <EquivalentValueComponent
+                        fromAsset="1.3.0"
+                        fullPrecision={true}
+                        amount={amountForLTM}
+                        toAsset={preferredUnit}
+                        fullDecimals={true}
+                    />
+                ) : (
+                    feeTypes["_none"]
+                );
                 let title = null;
 
                 if (!headIncluded) {
-                    headIncluded = true
-                    title = (<td rowSpan="6" style={{width:"15em"}}>
-                        <span className={labelClass}>
-                            {feename}
-                        </span>
-                    </td>)
+                    headIncluded = true;
+                    title = (
+                        <td rowSpan="6" style={{width: "15em"}}>
+                            <span className={labelClass}>{feename}</span>
+                        </td>
+                    );
                 }
 
-                if (ltm_required.indexOf(opId)<0) {
+                if (ltm_required.indexOf(opId) < 0) {
                     rows.push(
-                        <tr key={opId.toString() + key} className={feeTypes[key]==="Annual Membership" ? "linethrough" : ""}>
+                        <tr
+                            key={opId.toString() + key}
+                            className={
+                                feeTypes[key] === "Annual Membership"
+                                    ? "linethrough"
+                                    : ""
+                            }
+                        >
                             {title}
                             <td>{feeTypes[key]}</td>
-                            <td style={{textAlign: "right"}}>{assetAmount}{amount !== 0 && preferredUnit !== "BTS" && [" / ", equivalentAmount]}</td>
-                            <td style={{textAlign: "right"}}>{feeIdx !== 8 ? assetAmountLTM : null}{feeIdx !== 8 && amount !== 0 && preferredUnit !== "BTS" && [" / ", equivalentAmountLTM]}</td>
+                            <td style={{textAlign: "right"}}>
+                                {assetAmount}
+                                {amount !== 0 &&
+                                    preferredUnit !== "BTS" && [
+                                        " / ",
+                                        equivalentAmount
+                                    ]}
+                            </td>
+                            <td style={{textAlign: "right"}}>
+                                {feeIdx !== 8 ? assetAmountLTM : null}
+                                {feeIdx !== 8 &&
+                                    amount !== 0 &&
+                                    preferredUnit !== "BTS" && [
+                                        " / ",
+                                        equivalentAmountLTM
+                                    ]}
+                            </td>
                         </tr>
                     );
                 } else {
@@ -113,14 +163,23 @@ class FeeGroup extends React.Component {
                         <tr key={opId.toString() + key}>
                             {title}
                             <td>{feeTypes[key]}</td>
-                            <td style={{textAlign: "right"}}>- <sup>*</sup></td>
-                            <td style={{textAlign: "right"}}>{assetAmountLTM}{amount !== 0 && preferredUnit !== "BTS" && [" / ", equivalentAmountLTM]}</td>
+                            <td style={{textAlign: "right"}}>
+                                - <sup>*</sup>
+                            </td>
+                            <td style={{textAlign: "right"}}>
+                                {assetAmountLTM}
+                                {amount !== 0 &&
+                                    preferredUnit !== "BTS" && [
+                                        " / ",
+                                        equivalentAmountLTM
+                                    ]}
+                            </td>
                         </tr>
                     );
                 }
             }
-            return (<tbody key={feeIdx}>{rows}</tbody>);
-        })
+            return <tbody key={feeIdx}>{rows}</tbody>;
+        });
 
         return (
             <div className="asset-card">
@@ -128,10 +187,18 @@ class FeeGroup extends React.Component {
                 <table className="table">
                     <thead>
                         <tr>
-                            <th><Translate content={"explorer.block.op"} /></th>
-                            <th><Translate content={"explorer.fees.type"} /></th>
-                            <th style={{textAlign: "right"}}><Translate content={"explorer.fees.fee"} /></th>
-                            <th style={{textAlign: "right"}}><Translate content={"explorer.fees.feeltm"} /></th>
+                            <th>
+                                <Translate content={"explorer.block.op"} />
+                            </th>
+                            <th>
+                                <Translate content={"explorer.fees.type"} />
+                            </th>
+                            <th style={{textAlign: "right"}}>
+                                <Translate content={"explorer.fees.fee"} />
+                            </th>
+                            <th style={{textAlign: "right"}}>
+                                <Translate content={"explorer.fees.feeltm"} />
+                            </th>
                         </tr>
                     </thead>
                     {fees}
@@ -140,32 +207,41 @@ class FeeGroup extends React.Component {
         );
     }
 }
-FeeGroup = BindToChainState(FeeGroup, {keep_updating:true});
+FeeGroup = BindToChainState(FeeGroup, {keep_updating: true});
 
 class Fees extends React.Component {
-
     render() {
-
-        let FeeGroupsTitle  = counterpart.translate("transaction.feeGroups");
+        let FeeGroupsTitle = counterpart.translate("transaction.feeGroups");
         let feeGroups = [];
 
         for (let groupName in fee_grouping) {
             let groupNameText = FeeGroupsTitle[groupName];
             let feeIds = fee_grouping[groupName];
-            feeGroups.push(<FeeGroup key={groupName} settings={this.props.settings} opIds={feeIds} title={groupNameText}/>);
+            feeGroups.push(
+                <FeeGroup
+                    key={groupName}
+                    settings={this.props.settings}
+                    opIds={feeIds}
+                    title={groupNameText}
+                />
+            );
         }
 
-        return(
-                <div className="grid-block vertical" style={{overflow:"visible"}}>
-                    <div className="grid-block small-12 shrink" style={{ overflow:"visible"}}>
-                        <HelpContent path = {"components/Fees"} />
-                    </div>
-                    <div className="grid-block small-12 " style={{overflow:"visible"}}>
-                        <div className="grid-content">
-                            {feeGroups}
-                        </div>
-                    </div>
+        return (
+            <div className="grid-block vertical" style={{overflow: "visible"}}>
+                <div
+                    className="grid-block small-12 shrink"
+                    style={{overflow: "visible"}}
+                >
+                    <HelpContent path={"components/Fees"} />
                 </div>
+                <div
+                    className="grid-block small-12 "
+                    style={{overflow: "visible"}}
+                >
+                    <div className="grid-content">{feeGroups}</div>
+                </div>
+            </div>
         );
     }
 }
diff --git a/app/components/Blockchain/FeesContainer.jsx b/app/components/Blockchain/FeesContainer.jsx
index 879057bbfd..c1b24265a1 100644
--- a/app/components/Blockchain/FeesContainer.jsx
+++ b/app/components/Blockchain/FeesContainer.jsx
@@ -4,17 +4,17 @@ import AltContainer from "alt-container";
 import Fees from "./Fees";
 
 class FeesContainer extends React.Component {
-
     render() {
         return (
             <AltContainer
                 stores={[SettingsStore]}
                 inject={{
-                        settings : SettingsStore.getState().settings
-                }}>
-             <Fees {...this.props}/>
+                    settings: SettingsStore.getState().settings
+                }}
+            >
+                <Fees {...this.props} />
             </AltContainer>
-           );
+        );
     }
 }
 
diff --git a/app/components/Blockchain/MemoText.jsx b/app/components/Blockchain/MemoText.jsx
index e1064bbce1..3b55244b6a 100644
--- a/app/components/Blockchain/MemoText.jsx
+++ b/app/components/Blockchain/MemoText.jsx
@@ -3,13 +3,12 @@ import PrivateKeyStore from "stores/PrivateKeyStore";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import counterpart from "counterpart";
 import Icon from "../Icon/Icon";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import WalletUnlockStore from "stores/WalletUnlockStore";
 import utils from "common/utils";
 import ReactTooltip from "react-tooltip";
 
 class MemoText extends React.Component {
-
     static defaultProps = {
         fullLength: false
     };
@@ -37,12 +36,14 @@ class MemoText extends React.Component {
 
         let {text, isMine} = PrivateKeyStore.decodeMemo(memo);
 
-        if ( !text && isMine) {
+        if (!text && isMine) {
             return (
                 <div className="memo">
-                    <span>{counterpart.translate("transfer.memo_unlock")} </span>
+                    <span>
+                        {counterpart.translate("transfer.memo_unlock")}{" "}
+                    </span>
                     <a href onClick={this._toggleLock.bind(this)}>
-                        <Icon name="locked"/>
+                        <Icon name="locked" />
                     </a>
                 </div>
             );
@@ -56,7 +57,14 @@ class MemoText extends React.Component {
         if (text) {
             return (
                 <div className="memo" style={{paddingTop: 5, cursor: "help"}}>
-                    <span className="inline-block" data-class="memo-tip" data-tip={full_memo !== text ? full_memo : null} data-place="bottom" data-offset="{'bottom': 10}" data-html>
+                    <span
+                        className="inline-block"
+                        data-class="memo-tip"
+                        data-tip={full_memo !== text ? full_memo : null}
+                        data-place="bottom"
+                        data-offset="{'bottom': 10}"
+                        data-html
+                    >
                         {text}
                     </span>
                 </div>
@@ -68,8 +76,8 @@ class MemoText extends React.Component {
 }
 
 class MemoTextStoreWrapper extends React.Component {
-    render () {
-        return <MemoText {...this.props}/>;
+    render() {
+        return <MemoText {...this.props} />;
     }
 }
 
diff --git a/app/components/Blockchain/ProposedOperation.jsx b/app/components/Blockchain/ProposedOperation.jsx
index 69ed5b24cc..f0765f129a 100644
--- a/app/components/Blockchain/ProposedOperation.jsx
+++ b/app/components/Blockchain/ProposedOperation.jsx
@@ -32,9 +32,7 @@ class TransactionLabel extends React.Component {
         let trxTypes = counterpart.translate("transaction.trxTypes");
         let labelClass = classNames("label", this.props.color || "info");
         return (
-            <span className={labelClass}>
-                {trxTypes[ops[this.props.type]]}
-            </span>
+            <span className={labelClass}>{trxTypes[ops[this.props.type]]}</span>
         );
     }
 }
@@ -42,7 +40,7 @@ class TransactionLabel extends React.Component {
 class Row extends React.Component {
     static contextTypes = {
         router: React.PropTypes.object.isRequired
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -55,10 +53,20 @@ class Row extends React.Component {
     }
 
     render() {
-        let {block, fee, color, type, hideDate, hideFee, hideOpLabel} = this.props;
+        let {
+            block,
+            fee,
+            color,
+            type,
+            hideDate,
+            hideFee,
+            hideOpLabel
+        } = this.props;
 
         fee.amount = parseInt(fee.amount, 10);
-        let endDate = counterpart.localize(new Date(this.props.expiration), { format: 'short' });
+        let endDate = counterpart.localize(new Date(this.props.expiration), {
+            format: "short"
+        });
 
         return (
             <div style={{padding: "5px 0", textAlign: "left"}}>
@@ -67,27 +75,34 @@ class Row extends React.Component {
                         <a href onClick={this.showDetails}>
                             <TransactionLabel color={color} type={type} />
                         </a>
-                    </span>)}
+                    </span>
+                )}
                 <span>
                     {this.props.info}&nbsp;
                     {hideFee ? null : (
                         <span className="facolor-fee">
-                            (<FormattedAsset amount={fee.amount} asset={fee.asset_id} /> fee)
-                        </span>)}
+                            (<FormattedAsset
+                                amount={fee.amount}
+                                asset={fee.asset_id}
+                            />{" "}
+                            fee)
+                        </span>
+                    )}
                 </span>
                 {this.props.expiration ? (
                     <div style={{paddingTop: 5, fontSize: "0.85rem"}}>
                         <span>#{this.props.id} | </span>
-                        <span><Translate content="proposal.expires" />: {endDate}</span>
-
-                    </div>) : null}
+                        <span>
+                            <Translate content="proposal.expires" />: {endDate}
+                        </span>
+                    </div>
+                ) : null}
             </div>
         );
     }
 }
 
 class ProposedOperation extends React.Component {
-
     static defaultProps = {
         op: [],
         current: "",
@@ -112,31 +127,35 @@ class ProposedOperation extends React.Component {
     // }
 
     linkToAccount(name_or_id) {
-        if(!name_or_id) return <span>-</span>;
-        return utils.is_object_id(name_or_id) ?
-            <LinkToAccountById account={name_or_id}/> :
-            <Link to={`/account/${name_or_id}/overview`}>{name_or_id}</Link>;
+        if (!name_or_id) return <span>-</span>;
+        return utils.is_object_id(name_or_id) ? (
+            <LinkToAccountById account={name_or_id} />
+        ) : (
+            <Link to={`/account/${name_or_id}/overview`}>{name_or_id}</Link>
+        );
     }
 
     linkToAsset(symbol_or_id) {
-        if(!symbol_or_id) return <span>-</span>;
-        return utils.is_object_id(symbol_or_id) ?
-            <LinkToAssetById asset={symbol_or_id}/> :
-            <Link to={`/asset/${symbol_or_id}`}>{symbol_or_id}</Link>;
+        if (!symbol_or_id) return <span>-</span>;
+        return utils.is_object_id(symbol_or_id) ? (
+            <LinkToAssetById asset={symbol_or_id} />
+        ) : (
+            <Link to={`/asset/${symbol_or_id}`}>{symbol_or_id}</Link>
+        );
     }
 
     render() {
         let {op, current, block} = this.props;
-        let line = null, column = null, color = "info";
+        let line = null,
+            column = null,
+            color = "info";
 
         switch (ops[op[0]]) { // For a list of trx types, see chain_types.coffee
-
             case "transfer":
-
                 let memoComponent = null;
 
-                if(op[1].memo) {
-                    memoComponent = <MemoText memo={op[1].memo} />
+                if (op[1].memo) {
+                    memoComponent = <MemoText memo={op[1].memo} />;
                 }
 
                 color = "success";
@@ -147,8 +166,20 @@ class ProposedOperation extends React.Component {
                         <TranslateWithLinks
                             string="proposal.transfer"
                             keys={[
-                                {type: "account", value: op[1].from, arg: "from"},
-                                {type: "amount", value: op[1].amount, arg: "amount", decimalOffset: op[1].amount.asset_id === "1.3.0" ? 5 : null},
+                                {
+                                    type: "account",
+                                    value: op[1].from,
+                                    arg: "from"
+                                },
+                                {
+                                    type: "amount",
+                                    value: op[1].amount,
+                                    arg: "amount",
+                                    decimalOffset:
+                                        op[1].amount.asset_id === "1.3.0"
+                                            ? 5
+                                            : null
+                                },
                                 {type: "account", value: op[1].to, arg: "to"}
                             ]}
                         />
@@ -164,26 +195,53 @@ class ProposedOperation extends React.Component {
                 let isAsk = market_utils.isAskOp(op[1]);
 
                 column = (
-                        <span>
-                            <TranslateWithLinks
-                                string={isAsk ? "proposal.limit_order_sell" : "proposal.limit_order_buy"}
-                                keys={[
-                                    {type: "account", value: op[1].seller, arg: "account"},
-                                    {type: "amount", value: isAsk ? op[1].amount_to_sell : op[1].min_to_receive, arg: "amount"},
-                                    {type: "price", value: {base: isAsk ? op[1].min_to_receive : op[1].amount_to_sell, quote: isAsk ? op[1].amount_to_sell : op[1].min_to_receive}, arg: "price"}
-                                ]}
-                            />
-                        </span>
+                    <span>
+                        <TranslateWithLinks
+                            string={
+                                isAsk
+                                    ? "proposal.limit_order_sell"
+                                    : "proposal.limit_order_buy"
+                            }
+                            keys={[
+                                {
+                                    type: "account",
+                                    value: op[1].seller,
+                                    arg: "account"
+                                },
+                                {
+                                    type: "amount",
+                                    value: isAsk
+                                        ? op[1].amount_to_sell
+                                        : op[1].min_to_receive,
+                                    arg: "amount"
+                                },
+                                {
+                                    type: "price",
+                                    value: {
+                                        base: isAsk
+                                            ? op[1].min_to_receive
+                                            : op[1].amount_to_sell,
+                                        quote: isAsk
+                                            ? op[1].amount_to_sell
+                                            : op[1].min_to_receive
+                                    },
+                                    arg: "price"
+                                }
+                            ]}
+                        />
+                    </span>
                 );
                 break;
 
-
             case "limit_order_cancel":
                 color = "cancel";
                 column = (
                     <span>
                         {this.linkToAccount(op[1].fee_paying_account)}&nbsp;
-                        <Translate component="span" content="proposal.limit_order_cancel" />
+                        <Translate
+                            component="span"
+                            content="proposal.limit_order_cancel"
+                        />
                         &nbsp;#{op[1].order.substring(4)}
                     </span>
                 );
@@ -193,7 +251,10 @@ class ProposedOperation extends React.Component {
                 color = "cancel";
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.short_order_cancel" />
+                        <Translate
+                            component="span"
+                            content="proposal.short_order_cancel"
+                        />
                         &nbsp;{op[1].order}
                     </span>
                 );
@@ -206,10 +267,26 @@ class ProposedOperation extends React.Component {
                         <TranslateWithLinks
                             string="proposal.call_order_update"
                             keys={[
-                                {type: "account", value: op[1].funding_account, arg: "account"},
-                                {type: "asset", value: op[1].delta_debt.asset_id, arg: "debtSymbol"},
-                                {type: "amount", value: op[1].delta_debt, arg: "debt"},
-                                {type: "amount", value: op[1].delta_collateral, arg: "collateral"}
+                                {
+                                    type: "account",
+                                    value: op[1].funding_account,
+                                    arg: "account"
+                                },
+                                {
+                                    type: "asset",
+                                    value: op[1].delta_debt.asset_id,
+                                    arg: "debtSymbol"
+                                },
+                                {
+                                    type: "amount",
+                                    value: op[1].delta_debt,
+                                    arg: "debt"
+                                },
+                                {
+                                    type: "amount",
+                                    value: op[1].delta_collateral,
+                                    arg: "collateral"
+                                }
                             ]}
                         />
                     </span>
@@ -218,9 +295,12 @@ class ProposedOperation extends React.Component {
 
             case "key_create":
                 column = (
-                        <span>
-                            <Translate component="span" content="proposal.create_key" />
-                        </span>
+                    <span>
+                        <Translate
+                            component="span"
+                            content="proposal.create_key"
+                        />
+                    </span>
                 );
                 break;
 
@@ -228,7 +308,10 @@ class ProposedOperation extends React.Component {
                 if (current === op[1].registrar) {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.reg_account" />
+                            <Translate
+                                component="span"
+                                content="proposal.reg_account"
+                            />
                             &nbsp;{this.linkToAccount(op[1].name)}
                         </span>
                     );
@@ -236,7 +319,10 @@ class ProposedOperation extends React.Component {
                     column = (
                         <span>
                             {this.linkToAccount(op[1].name)}
-                            &nbsp;<Translate component="span" content="proposal.was_reg_account" />
+                            &nbsp;<Translate
+                                component="span"
+                                content="proposal.was_reg_account"
+                            />
                             &nbsp;{this.linkToAccount(op[1].registrar)}
                         </span>
                     );
@@ -244,13 +330,16 @@ class ProposedOperation extends React.Component {
                 break;
 
             case "account_update":
-
                 column = (
                     <span>
                         <TranslateWithLinks
                             string="proposal.update_account"
                             keys={[
-                                {type: "account", value: op[1].account, arg: "account"},
+                                {
+                                    type: "account",
+                                    value: op[1].account,
+                                    arg: "account"
+                                }
                             ]}
                         />
                     </span>
@@ -259,25 +348,29 @@ class ProposedOperation extends React.Component {
                 break;
 
             case "account_whitelist":
-
-                let label = op[1].new_listing === listings.no_listing ? "unlisted_by" :
-                              op[1].new_listing === listings.white_listed ? "whitelisted_by" :
-                              "blacklisted_by";
+                let label =
+                    op[1].new_listing === listings.no_listing
+                        ? "unlisted_by"
+                        : op[1].new_listing === listings.white_listed
+                            ? "whitelisted_by"
+                            : "blacklisted_by";
                 column = (
                     <span>
-                        <BindToChainState.Wrapper lister={op[1].authorizing_account} listee={op[1].account_to_list}>
-                            { ({lister, listee}) =>
+                        <BindToChainState.Wrapper
+                            lister={op[1].authorizing_account}
+                            listee={op[1].account_to_list}
+                        >
+                            {({lister, listee}) => (
                                 <Translate
                                     component="span"
                                     content={"transaction." + label}
                                     lister={lister.get("name")}
                                     listee={listee.get("name")}
                                 />
-
-                            }
+                            )}
                         </BindToChainState.Wrapper>
                     </span>
-                )
+                );
                 // if (current === op[1].authorizing_account) {
                 //     column = (
                 //         <span>
@@ -296,28 +389,38 @@ class ProposedOperation extends React.Component {
                 break;
 
             case "account_upgrade":
-                if( op[1].upgrade_to_lifetime_member ) {
-                   column = (
-                       <span>
-                       {this.linkToAccount(op[1].account_to_upgrade) } &nbsp;
-                           <Translate component="span" content="proposal.lifetime_upgrade_account" />
-                       </span>
-                   );
+                if (op[1].upgrade_to_lifetime_member) {
+                    column = (
+                        <span>
+                            {this.linkToAccount(op[1].account_to_upgrade)}{" "}
+                            &nbsp;
+                            <Translate
+                                component="span"
+                                content="proposal.lifetime_upgrade_account"
+                            />
+                        </span>
+                    );
                 } else {
-                   column = (
-                       <span>
-                       {this.linkToAccount(op[1].account_to_upgrade) } &nbsp;
-                           <Translate component="span" content="proposal.annual_upgrade_account" />
-                       </span>
-                   );
-
+                    column = (
+                        <span>
+                            {this.linkToAccount(op[1].account_to_upgrade)}{" "}
+                            &nbsp;
+                            <Translate
+                                component="span"
+                                content="proposal.annual_upgrade_account"
+                            />
+                        </span>
+                    );
                 }
                 break;
 
             case "account_transfer":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.transfer_account" />
+                        <Translate
+                            component="span"
+                            content="proposal.transfer_account"
+                        />
                         &nbsp;{this.linkToAccount(op[1].account_id)}
                         <Translate component="span" content="proposal.to" />
                         &nbsp;{this.linkToAccount(op[1].new_owner)}
@@ -329,14 +432,18 @@ class ProposedOperation extends React.Component {
                 color = "warning";
                 column = (
                     <TranslateWithLinks
-                            string="proposal.asset_create"
-                            keys={[
-                                {type: "account", value: op[1].issuer, arg: "account"}
-                            ]}
-                            params={{
-                                asset: op[1].symbol
-                            }}
-                        />
+                        string="proposal.asset_create"
+                        keys={[
+                            {
+                                type: "account",
+                                value: op[1].issuer,
+                                arg: "account"
+                            }
+                        ]}
+                        params={{
+                            asset: op[1].symbol
+                        }}
+                    />
                 );
                 break;
 
@@ -345,12 +452,20 @@ class ProposedOperation extends React.Component {
                 color = "warning";
                 column = (
                     <TranslateWithLinks
-                            string="proposal.asset_update"
-                            keys={[
-                                {type: "account", value: op[1].issuer, arg: "account"},
-                                {type: "asset", value: op[1].asset_to_update, arg: "asset"}
-                            ]}
-                        />
+                        string="proposal.asset_update"
+                        keys={[
+                            {
+                                type: "account",
+                                value: op[1].issuer,
+                                arg: "account"
+                            },
+                            {
+                                type: "asset",
+                                value: op[1].asset_to_update,
+                                arg: "asset"
+                            }
+                        ]}
+                    />
                 );
                 break;
 
@@ -360,8 +475,16 @@ class ProposedOperation extends React.Component {
                     <TranslateWithLinks
                         string="proposal.feed_producer"
                         keys={[
-                            {type: "account", value: op[1].issuer, arg: "account"},
-                            {type: "asset", value: op[1].asset_to_update, arg: "asset"}
+                            {
+                                type: "account",
+                                value: op[1].issuer,
+                                arg: "account"
+                            },
+                            {
+                                type: "asset",
+                                value: op[1].asset_to_update,
+                                arg: "asset"
+                            }
                         ]}
                     />
                 );
@@ -370,19 +493,34 @@ class ProposedOperation extends React.Component {
             case "asset_issue":
                 color = "warning";
 
-                if(op[1].memo) {
-                    memoComponent = <MemoText memo={op[1].memo} />
+                if (op[1].memo) {
+                    memoComponent = <MemoText memo={op[1].memo} />;
                 }
 
-                op[1].asset_to_issue.amount = parseInt(op[1].asset_to_issue.amount, 10);
+                op[1].asset_to_issue.amount = parseInt(
+                    op[1].asset_to_issue.amount,
+                    10
+                );
                 column = (
                     <span>
                         <TranslateWithLinks
                             string="proposal.asset_issue"
                             keys={[
-                                {type: "account", value: op[1].issuer, arg: "account"},
-                                {type: "amount", value: op[1].asset_to_issue, arg: "amount"},
-                                {type: "account", value: op[1].issue_to_account, arg: "to"},
+                                {
+                                    type: "account",
+                                    value: op[1].issuer,
+                                    arg: "account"
+                                },
+                                {
+                                    type: "amount",
+                                    value: op[1].asset_to_issue,
+                                    arg: "amount"
+                                },
+                                {
+                                    type: "account",
+                                    value: op[1].issue_to_account,
+                                    arg: "to"
+                                }
                             ]}
                         />
                         {memoComponent}
@@ -396,24 +534,40 @@ class ProposedOperation extends React.Component {
                         <TranslateWithLinks
                             string="proposal.asset_reserve"
                             keys={[
-                                {type: "account", value: op[1].payer, arg: "account"},
-                                {type: "amount", value: op[1].amount_to_reserve, arg: "amount"}
+                                {
+                                    type: "account",
+                                    value: op[1].payer,
+                                    arg: "account"
+                                },
+                                {
+                                    type: "amount",
+                                    value: op[1].amount_to_reserve,
+                                    arg: "amount"
+                                }
                             ]}
                         />
                     </span>
-                )
+                );
                 break;
 
             case "asset_fund_fee_pool":
                 color = "warning";
-                let asset = ChainStore.getAsset( op[1].asset_id );
-                if( asset ) asset = asset.get( "symbol" );
+                let asset = ChainStore.getAsset(op[1].asset_id);
+                if (asset) asset = asset.get("symbol");
                 else asset = op[1].asset_id;
                 column = (
                     <span>
                         {this.linkToAccount(op[1].from_account)} &nbsp;
-                        <Translate component="span" content="proposal.fund_pool"  asset={asset} />
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount} asset="1.3.0" />
+                        <Translate
+                            component="span"
+                            content="proposal.fund_pool"
+                            asset={asset}
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].amount}
+                            asset="1.3.0"
+                        />
                     </span>
                 );
                 break;
@@ -422,8 +576,15 @@ class ProposedOperation extends React.Component {
                 color = "warning";
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.asset_settle" />
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount.amount} asset={op[1].amount.asset_id} />
+                        <Translate
+                            component="span"
+                            content="proposal.asset_settle"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].amount.amount}
+                            asset={op[1].amount.asset_id}
+                        />
                     </span>
                 );
                 break;
@@ -432,16 +593,22 @@ class ProposedOperation extends React.Component {
                 color = "warning";
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.asset_global_settle" />
+                        <Translate
+                            component="span"
+                            content="proposal.asset_global_settle"
+                        />
                         &nbsp;{this.linkToAsset(op[1].asset_to_settle)}
-                        &nbsp;<Translate component="span" content="proposal.at" />
+                        &nbsp;<Translate
+                            component="span"
+                            content="proposal.at"
+                        />
                         &nbsp;<FormattedPrice
-                                style={{fontWeight: "bold"}}
-                                quote_amount={op[1].settle_price.quote.amount}
-                                quote_asset={op[1].settle_price.quote.asset_id}
-                                base_asset={op[1].settle_price.base.asset_id}
-                                base_amount={op[1].settle_price.base.amount}
-                            />
+                            style={{fontWeight: "bold"}}
+                            quote_amount={op[1].settle_price.quote.amount}
+                            quote_asset={op[1].settle_price.quote.asset_id}
+                            base_asset={op[1].settle_price.base.asset_id}
+                            base_amount={op[1].settle_price.base.amount}
+                        />
                     </span>
                 );
                 break;
@@ -451,12 +618,23 @@ class ProposedOperation extends React.Component {
                 column = (
                     <span>
                         {this.linkToAccount(op[1].publisher)}&nbsp;
-                        <Translate component="span" content="proposal.publish_feed" />
+                        <Translate
+                            component="span"
+                            content="proposal.publish_feed"
+                        />
                         &nbsp;<FormattedPrice
-                            base_asset={op[1].feed.settlement_price.base.asset_id}
-                            quote_asset={op[1].feed.settlement_price.quote.asset_id}
-                            base_amount={op[1].feed.settlement_price.base.amount}
-                            quote_amount={op[1].feed.settlement_price.quote.amount}
+                            base_asset={
+                                op[1].feed.settlement_price.base.asset_id
+                            }
+                            quote_asset={
+                                op[1].feed.settlement_price.quote.asset_id
+                            }
+                            base_amount={
+                                op[1].feed.settlement_price.base.amount
+                            }
+                            quote_amount={
+                                op[1].feed.settlement_price.quote.amount
+                            }
                         />
                     </span>
                 );
@@ -465,7 +643,10 @@ class ProposedOperation extends React.Component {
             case "witness_create":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.witness_create" />
+                        <Translate
+                            component="span"
+                            content="proposal.witness_create"
+                        />
                         &nbsp;{this.linkToAccount(op[1].witness_account)}
                     </span>
                 );
@@ -475,7 +656,10 @@ class ProposedOperation extends React.Component {
             case "witness_update":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.witness_update" />
+                        <Translate
+                            component="span"
+                            content="proposal.witness_update"
+                        />
                         &nbsp;{this.linkToAccount(op[1].witness_account)}
                     </span>
                 );
@@ -486,8 +670,15 @@ class ProposedOperation extends React.Component {
                 if (current === op[1].witness_account) {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.witness_pay" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount} asset={"1.3.0"} />
+                            <Translate
+                                component="span"
+                                content="proposal.witness_pay"
+                            />
+                            &nbsp;<FormattedAsset
+                                style={{fontWeight: "bold"}}
+                                amount={op[1].amount}
+                                asset={"1.3.0"}
+                            />
                             <Translate component="span" content="proposal.to" />
                             &nbsp;{this.linkToAccount(op[1].witness_account)}
                         </span>
@@ -495,9 +686,19 @@ class ProposedOperation extends React.Component {
                 } else {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.received" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount} asset={"1.3.0"} />
-                            <Translate component="span" content="proposal.from" />
+                            <Translate
+                                component="span"
+                                content="proposal.received"
+                            />
+                            &nbsp;<FormattedAsset
+                                style={{fontWeight: "bold"}}
+                                amount={op[1].amount}
+                                asset={"1.3.0"}
+                            />
+                            <Translate
+                                component="span"
+                                content="proposal.from"
+                            />
                             &nbsp;{this.linkToAccount(op[1].witness_account)}
                         </span>
                     );
@@ -507,7 +708,10 @@ class ProposedOperation extends React.Component {
             case "proposal_create":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.proposal_create" />
+                        <Translate
+                            component="span"
+                            content="proposal.proposal_create"
+                        />
                     </span>
                 );
                 break;
@@ -515,7 +719,10 @@ class ProposedOperation extends React.Component {
             case "proposal_update":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.proposal_update" />
+                        <Translate
+                            component="span"
+                            content="proposal.proposal_update"
+                        />
                     </span>
                 );
                 break;
@@ -523,7 +730,10 @@ class ProposedOperation extends React.Component {
             case "proposal_delete":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.proposal_delete" />
+                        <Translate
+                            component="span"
+                            content="proposal.proposal_delete"
+                        />
                     </span>
                 );
                 break;
@@ -531,7 +741,10 @@ class ProposedOperation extends React.Component {
             case "withdraw_permission_create":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.withdraw_permission_create" />
+                        <Translate
+                            component="span"
+                            content="proposal.withdraw_permission_create"
+                        />
                         &nbsp;{this.linkToAccount(op[1].withdraw_from_account)}
                         <Translate component="span" content="proposal.to" />
                         &nbsp;{this.linkToAccount(op[1].authorized_account)}
@@ -542,7 +755,10 @@ class ProposedOperation extends React.Component {
             case "withdraw_permission_update":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.withdraw_permission_update" />
+                        <Translate
+                            component="span"
+                            content="proposal.withdraw_permission_update"
+                        />
                         &nbsp;{this.linkToAccount(op[1].withdraw_from_account)}
                         <Translate component="span" content="proposal.to" />
                         &nbsp;{this.linkToAccount(op[1].authorized_account)}
@@ -553,7 +769,10 @@ class ProposedOperation extends React.Component {
             case "withdraw_permission_claim":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.withdraw_permission_claim" />
+                        <Translate
+                            component="span"
+                            content="proposal.withdraw_permission_claim"
+                        />
                         &nbsp;{this.linkToAccount(op[1].withdraw_from_account)}
                         <Translate component="span" content="proposal.to" />
                         &nbsp;{this.linkToAccount(op[1].withdraw_to_account)}
@@ -564,7 +783,10 @@ class ProposedOperation extends React.Component {
             case "withdraw_permission_delete":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.withdraw_permission_delete" />
+                        <Translate
+                            component="span"
+                            content="proposal.withdraw_permission_delete"
+                        />
                         &nbsp;{this.linkToAccount(op[1].withdraw_from_account)}
                         <Translate component="span" content="proposal.to" />
                         &nbsp;{this.linkToAccount(op[1].authorized_account)}
@@ -576,23 +798,44 @@ class ProposedOperation extends React.Component {
                 color = "success";
                 o = op[1];
                 column = (
-                        <span>
-                            {this.linkToAccount(op[1].account_id)}&nbsp;
-                            <Translate component="span" content="proposal.paid" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].pays.amount} asset={op[1].pays.asset_id} />
-                            &nbsp;<Translate component="span" content="proposal.obtain" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].receives.amount} asset={op[1].receives.asset_id} />
-                            &nbsp;<Translate component="span" content="proposal.at" />
-                            &nbsp;<FormattedPrice base_asset={o.pays.asset_id} base_amount={o.pays.amount}
-                                                  quote_asset={o.receives.asset_id} quote_amount={o.receives.amount}  />
-                        </span>
+                    <span>
+                        {this.linkToAccount(op[1].account_id)}&nbsp;
+                        <Translate component="span" content="proposal.paid" />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].pays.amount}
+                            asset={op[1].pays.asset_id}
+                        />
+                        &nbsp;<Translate
+                            component="span"
+                            content="proposal.obtain"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].receives.amount}
+                            asset={op[1].receives.asset_id}
+                        />
+                        &nbsp;<Translate
+                            component="span"
+                            content="proposal.at"
+                        />
+                        &nbsp;<FormattedPrice
+                            base_asset={o.pays.asset_id}
+                            base_amount={o.pays.amount}
+                            quote_asset={o.receives.asset_id}
+                            quote_amount={o.receives.amount}
+                        />
+                    </span>
                 );
                 break;
 
             case "global_parameters_update":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.global_parameters_update" />
+                        <Translate
+                            component="span"
+                            content="proposal.global_parameters_update"
+                        />
                     </span>
                 );
                 break;
@@ -600,7 +843,10 @@ class ProposedOperation extends React.Component {
             case "file_write":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.file_write" />
+                        <Translate
+                            component="span"
+                            content="proposal.file_write"
+                        />
                     </span>
                 );
                 break;
@@ -609,8 +855,15 @@ class ProposedOperation extends React.Component {
                 column = (
                     <span>
                         &nbsp;{this.linkToAccount(op[1].creator)}
-                        <Translate component="span" content="proposal.vesting_balance_create" />
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount.amount} asset={op[1].amount.asset_id} />
+                        <Translate
+                            component="span"
+                            content="proposal.vesting_balance_create"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].amount.amount}
+                            asset={op[1].amount.asset_id}
+                        />
                         &nbsp;{this.linkToAccount(op[1].owner)}
                     </span>
                 );
@@ -621,7 +874,11 @@ class ProposedOperation extends React.Component {
                     <TranslateWithLinks
                         string={"proposal.vesting_balance_withdraw"}
                         keys={[
-                            {type: "account", value: op[1].owner, arg: "account"},
+                            {
+                                type: "account",
+                                value: op[1].owner,
+                                arg: "account"
+                            },
                             {type: "amount", value: op[1].amount, arg: "amount"}
                         ]}
                     />
@@ -631,8 +888,15 @@ class ProposedOperation extends React.Component {
             case "bond_create_offer":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.bond_create_offer" />
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount.amount} asset={op[1].amount.asset_id} />
+                        <Translate
+                            component="span"
+                            content="proposal.bond_create_offer"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].amount.amount}
+                            asset={op[1].amount.asset_id}
+                        />
                     </span>
                 );
                 break;
@@ -640,7 +904,10 @@ class ProposedOperation extends React.Component {
             case "bond_cancel_offer":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.bond_cancel_offer" />
+                        <Translate
+                            component="span"
+                            content="proposal.bond_cancel_offer"
+                        />
                         &nbsp;{op[1].offer_id}
                     </span>
                 );
@@ -650,8 +917,15 @@ class ProposedOperation extends React.Component {
                 if (current === op[1].lender) {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.bond_accept_offer" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount_borrowed.amount} asset={op[1].amount_borrowed.asset_id} />
+                            <Translate
+                                component="span"
+                                content="proposal.bond_accept_offer"
+                            />
+                            &nbsp;<FormattedAsset
+                                style={{fontWeight: "bold"}}
+                                amount={op[1].amount_borrowed.amount}
+                                asset={op[1].amount_borrowed.asset_id}
+                            />
                             <Translate component="span" content="proposal.to" />
                             &nbsp;{this.linkToAccount(op[1].borrower)}
                         </span>
@@ -659,9 +933,19 @@ class ProposedOperation extends React.Component {
                 } else if (current === op[1].borrower) {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.bond_accept_offer" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount_borrowed.amount} asset={op[1].amount_borrowed.asset_id} />
-                            <Translate component="span" content="proposal.from" />
+                            <Translate
+                                component="span"
+                                content="proposal.bond_accept_offer"
+                            />
+                            &nbsp;<FormattedAsset
+                                style={{fontWeight: "bold"}}
+                                amount={op[1].amount_borrowed.amount}
+                                asset={op[1].amount_borrowed.asset_id}
+                            />
+                            <Translate
+                                component="span"
+                                content="proposal.from"
+                            />
                             &nbsp;{this.linkToAccount(op[1].lender)}
                         </span>
                     );
@@ -672,8 +956,15 @@ class ProposedOperation extends React.Component {
                 if (current === op[1].lender) {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.bond_pay_collateral" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].collateral_claimed.amount} asset={op[1].collateral_claimed.asset_id} />
+                            <Translate
+                                component="span"
+                                content="proposal.bond_pay_collateral"
+                            />
+                            &nbsp;<FormattedAsset
+                                style={{fontWeight: "bold"}}
+                                amount={op[1].collateral_claimed.amount}
+                                asset={op[1].collateral_claimed.asset_id}
+                            />
                             <Translate component="span" content="proposal.to" />
                             &nbsp;{this.linkToAccount(op[1].claimer)}
                         </span>
@@ -681,9 +972,19 @@ class ProposedOperation extends React.Component {
                 } else if (current === op[1].claimer) {
                     column = (
                         <span>
-                            <Translate component="span" content="proposal.bond_claim_collateral" />
-                            &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].collateral_claimed.amount} asset={op[1].collateral_claimed.asset_id} />
-                            <Translate component="span" content="proposal.from" />
+                            <Translate
+                                component="span"
+                                content="proposal.bond_claim_collateral"
+                            />
+                            &nbsp;<FormattedAsset
+                                style={{fontWeight: "bold"}}
+                                amount={op[1].collateral_claimed.amount}
+                                asset={op[1].collateral_claimed.asset_id}
+                            />
+                            <Translate
+                                component="span"
+                                content="proposal.from"
+                            />
                             &nbsp;{this.linkToAccount(op[1].lender)}
                         </span>
                     );
@@ -693,29 +994,45 @@ class ProposedOperation extends React.Component {
             case "worker_create":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.create_worker" />
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].daily_pay} asset={"1.3.0"} />
+                        <Translate
+                            component="span"
+                            content="proposal.create_worker"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].daily_pay}
+                            asset={"1.3.0"}
+                        />
                     </span>
                 );
                 break;
 
-
             case "balance_claim":
                 color = "success";
-                op[1].total_claimed.amount = parseInt(op[1].total_claimed.amount, 10);
+                op[1].total_claimed.amount = parseInt(
+                    op[1].total_claimed.amount,
+                    10
+                );
                 column = (
                     <span>
                         {this.linkToAccount(op[1].deposit_to_account)}&nbsp;
-                        <BindToChainState.Wrapper asset={op[1].total_claimed.asset_id}>
-                           { ({asset}) =>
-                                   <Translate
-                                       component="span"
-                                       content="proposal.balance_claim"
-                                       balance_amount={utils.format_asset(op[1].total_claimed.amount, asset)}
-                                       balance_id={op[1].balance_to_claim.substring(5)}
-                                   />
-                           }
-                       </BindToChainState.Wrapper>
+                        <BindToChainState.Wrapper
+                            asset={op[1].total_claimed.asset_id}
+                        >
+                            {({asset}) => (
+                                <Translate
+                                    component="span"
+                                    content="proposal.balance_claim"
+                                    balance_amount={utils.format_asset(
+                                        op[1].total_claimed.amount,
+                                        asset
+                                    )}
+                                    balance_id={op[1].balance_to_claim.substring(
+                                        5
+                                    )}
+                                />
+                            )}
+                        </BindToChainState.Wrapper>
                     </span>
                 );
                 break;
@@ -723,8 +1040,13 @@ class ProposedOperation extends React.Component {
             case "committee_member_create":
                 column = (
                     <span>
-                        <Translate component="span" content="proposal.committee_member_create" />
-                        &nbsp;{this.linkToAccount(op[1].committee_member_account)}
+                        <Translate
+                            component="span"
+                            content="proposal.committee_member_create"
+                        />
+                        &nbsp;{this.linkToAccount(
+                            op[1].committee_member_account
+                        )}
                     </span>
                 );
                 break;
@@ -733,8 +1055,15 @@ class ProposedOperation extends React.Component {
                 column = (
                     <span>
                         {this.linkToAccount(op[1].from)}
-                        &nbsp;<Translate component="span" content="proposal.sent"/>
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount.amount} asset={op[1].amount.asset_id} />
+                        &nbsp;<Translate
+                            component="span"
+                            content="proposal.sent"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].amount.amount}
+                            asset={op[1].amount.asset_id}
+                        />
                     </span>
                 );
                 break;
@@ -743,28 +1072,43 @@ class ProposedOperation extends React.Component {
                 column = (
                     <span>
                         {this.linkToAccount(op[1].to)}
-                        &nbsp;<Translate component="span" content="proposal.received"/>
-                        &nbsp;<FormattedAsset style={{fontWeight: "bold"}} amount={op[1].amount.amount} asset={op[1].amount.asset_id} />
+                        &nbsp;<Translate
+                            component="span"
+                            content="proposal.received"
+                        />
+                        &nbsp;<FormattedAsset
+                            style={{fontWeight: "bold"}}
+                            amount={op[1].amount.amount}
+                            asset={op[1].amount.asset_id}
+                        />
                     </span>
                 );
                 break;
 
             case "asset_claim_fees":
                 color = "success";
-                op[1].amount_to_claim.amount = parseInt(op[1].amount_to_claim.amount, 10);
+                op[1].amount_to_claim.amount = parseInt(
+                    op[1].amount_to_claim.amount,
+                    10
+                );
                 column = (
                     <span>
                         {this.linkToAccount(op[1].issuer)}&nbsp;
-                        <BindToChainState.Wrapper asset={op[1].amount_to_claim.asset_id}>
-                           { ({asset}) =>
-                                   <Translate
-                                       component="span"
-                                       content="proposal.asset_claim_fees"
-                                       balance_amount={utils.format_asset(op[1].amount_to_claim.amount, asset)}
-                                       asset={asset.get("symbol")}
-                                   />
-                           }
-                       </BindToChainState.Wrapper>
+                        <BindToChainState.Wrapper
+                            asset={op[1].amount_to_claim.asset_id}
+                        >
+                            {({asset}) => (
+                                <Translate
+                                    component="span"
+                                    content="proposal.asset_claim_fees"
+                                    balance_amount={utils.format_asset(
+                                        op[1].amount_to_claim.amount,
+                                        asset
+                                    )}
+                                    asset={asset.get("symbol")}
+                                />
+                            )}
+                        </BindToChainState.Wrapper>
                     </span>
                 );
                 break;
@@ -775,7 +1119,11 @@ class ProposedOperation extends React.Component {
                         <TranslateWithLinks
                             string="proposal.committee_member_update_global_parameters"
                             keys={[
-                                {type: "account", value: "1.2.0", arg: "account"}
+                                {
+                                    type: "account",
+                                    value: "1.2.0",
+                                    arg: "account"
+                                }
                             ]}
                         />
                     </span>
@@ -795,7 +1143,11 @@ class ProposedOperation extends React.Component {
                     <TranslateWithLinks
                         string="proposal.override_transfer"
                         keys={[
-                            {type: "account", value: op[1].issuer, arg: "issuer"},
+                            {
+                                type: "account",
+                                value: op[1].issuer,
+                                arg: "issuer"
+                            },
                             {type: "account", value: op[1].from, arg: "from"},
                             {type: "account", value: op[1].to, arg: "to"},
                             {type: "amount", value: op[1].amount, arg: "amount"}
@@ -810,20 +1162,28 @@ class ProposedOperation extends React.Component {
                     <span>
                         <Link to={`/block/${block}`}>#{block}</Link>
                     </span>
-
                 );
         }
 
         if (this.props.csvExportMode) {
             const globalObject = ChainStore.getObject("2.0.0");
             const dynGlobalObject = ChainStore.getObject("2.1.0");
-            const block_time = utils.calc_block_time(block, globalObject, dynGlobalObject)
+            const block_time = utils.calc_block_time(
+                block,
+                globalObject,
+                dynGlobalObject
+            );
             return (
                 <div key={this.props.key}>
                     <div>{block_time ? block_time.toLocaleString() : ""}</div>
                     <div>{ops[op[0]]}</div>
                     <div>{column}</div>
-                    <div><FormattedAsset amount={parseInt(op[1].fee.amount, 10)} asset={op[1].fee.asset_id} /></div>
+                    <div>
+                        <FormattedAsset
+                            amount={parseInt(op[1].fee.amount, 10)}
+                            asset={op[1].fee.asset_id}
+                        />
+                    </div>
                 </div>
             );
         }
@@ -841,15 +1201,10 @@ class ProposedOperation extends React.Component {
                 hideOpLabel={this.props.hideOpLabel}
                 info={column}
                 expiration={this.props.expiration}
-            >
-            </Row>
+            />
         ) : null;
 
-
-
-        return (
-            line ? line : <div></div>
-        );
+        return line ? line : <div />;
     }
 }
 
diff --git a/app/components/BrowserNotifications/BrowserNotificationsContainer.jsx b/app/components/BrowserNotifications/BrowserNotificationsContainer.jsx
index 16e6901415..29247acbd0 100644
--- a/app/components/BrowserNotifications/BrowserNotificationsContainer.jsx
+++ b/app/components/BrowserNotifications/BrowserNotificationsContainer.jsx
@@ -5,9 +5,7 @@ import AltContainer from "alt-container";
 import BrowserNotifications from "./BrowserNotifications";
 
 class BrowserNotificationsContainer extends React.Component {
-
     render() {
-
         return (
             <AltContainer
                 stores={[AccountStore]}
@@ -17,10 +15,10 @@ class BrowserNotificationsContainer extends React.Component {
                     },
                     settings: () => {
                         return SettingsStore.getState().settings;
-                    },
+                    }
                 }}
             >
-                <BrowserNotifications/>
+                <BrowserNotifications />
             </AltContainer>
         );
     }
diff --git a/app/components/Console/Console.jsx b/app/components/Console/Console.jsx
index ad5a44a0f5..b932ed38bc 100644
--- a/app/components/Console/Console.jsx
+++ b/app/components/Console/Console.jsx
@@ -5,58 +5,74 @@ import WalletApi from "api/WalletApi";
 import DebugApi from "api/DebugApi";
 
 function evalInContext(js) {
-
     var db = Apis.instance().db_api(),
         net = Apis.instance().network_api(),
         app = ApplicationApi,
         wallet = WalletApi,
-        debug = new DebugApi()
+        debug = new DebugApi();
 
     var $g = {
-        db, net, app, wallet, debug
-    }
-    return eval(js)
+        db,
+        net,
+        app,
+        wallet,
+        debug
+    };
+    return eval(js);
 }
 
 var keyCode = {
     enter: 13,
     up: 38,
     down: 40
-}
+};
 
-var cmd_history = [""], cmd_history_position = 0
+var cmd_history = [""],
+    cmd_history_position = 0;
 
 export default class Console extends Component {
-
     constructor() {
-        super()
+        super();
         this.state = {
             cmd_console: []
-        }
+        };
     }
 
     render() {
-        return <div className="grid-content" ref="console_div">
-            <form ref="console_form" onSubmit={this.on_cmd_submit.bind(this)} >
-                <div>{this.state.cmd_console}</div>&nbsp;
-                <textarea id="console_input" ref="console_input"
-                    onChange={this.on_cmd_change.bind(this)}
-                    onKeyDown={this.on_cmd_keydown.bind(this)}
-                    onKeyUp={this.on_cmd_keyup.bind(this)}
-                    value={this.state.cmd}
-                    placeholder="Console Command"
-                />
-                <p>
-                    <code onClick={this.run.bind(this)}>run</code>
-                    { ! this.state.cmd_console.length ? "" :
-                        <code onClick={this.clear.bind(this)}>clear</code>
-                    }
-                    { cmd_history.length == 1 ? "" :
-                         <code onClick={this.clear_history.bind(this)}>clear history</code>
-                    }
-                </p>
-            </form>
-        </div>
+        return (
+            <div className="grid-content" ref="console_div">
+                <form
+                    ref="console_form"
+                    onSubmit={this.on_cmd_submit.bind(this)}
+                >
+                    <div>{this.state.cmd_console}</div>&nbsp;
+                    <textarea
+                        id="console_input"
+                        ref="console_input"
+                        onChange={this.on_cmd_change.bind(this)}
+                        onKeyDown={this.on_cmd_keydown.bind(this)}
+                        onKeyUp={this.on_cmd_keyup.bind(this)}
+                        value={this.state.cmd}
+                        placeholder="Console Command"
+                    />
+                    <p>
+                        <code onClick={this.run.bind(this)}>run</code>
+                        {!this.state.cmd_console.length ? (
+                            ""
+                        ) : (
+                            <code onClick={this.clear.bind(this)}>clear</code>
+                        )}
+                        {cmd_history.length == 1 ? (
+                            ""
+                        ) : (
+                            <code onClick={this.clear_history.bind(this)}>
+                                clear history
+                            </code>
+                        )}
+                    </p>
+                </form>
+            </div>
+        );
     }
 
     componentDidUpdate() {
@@ -66,131 +82,129 @@ export default class Console extends Component {
     }
 
     clear() {
-        this.setState({cmd_console:[]})
+        this.setState({cmd_console: []});
     }
 
     clear_history() {
-        cmd_history = [""]
-        cmd_history_position = 0
-        this.forceUpdate()
+        cmd_history = [""];
+        cmd_history_position = 0;
+        this.forceUpdate();
     }
 
     on_cmd_change(evt) {
-        var cmd = evt.target.value
-        this.setState({cmd})
+        var cmd = evt.target.value;
+        this.setState({cmd});
     }
 
     on_cmd_keydown(evt) {
         // DEBUG console.log('... on_cmd_keydown', evt.type, evt.which, evt)
-        switch(evt.which) {
-        case keyCode.enter:
-            console.log('... evt',evt)
-            if( ! evt.shiftKey) {
-                this.on_cmd_submit(evt)
-                break
-            }
-        case keyCode.up:
-            if( cmd_history_position == 0)
-                return
-            cmd_history_position--
-            this.setState({cmd:cmd_history[cmd_history_position]})
-            break
-        case keyCode.down:
-            if(cmd_history_position < cmd_history.length - 1){
-                cmd_history_position++
-                this.setState({cmd:cmd_history[cmd_history_position]})
-                break
-            }
-            if( cmd_history.length - 1 == cmd_history_position &&
-                this.state.cmd != ""
-            ) {
-                cmd_history.pushState("")
-                cmd_history_position++
-                this.setState({cmd:""})
-                break
-            }
-        default:
-            // input field was altered, on_cmd_keyup will have the value
-            cmd_history_position = cmd_history.length - 1
-            return
+        switch (evt.which) {
+            case keyCode.enter:
+                console.log("... evt", evt);
+                if (!evt.shiftKey) {
+                    this.on_cmd_submit(evt);
+                    break;
+                }
+            case keyCode.up:
+                if (cmd_history_position == 0) return;
+                cmd_history_position--;
+                this.setState({cmd: cmd_history[cmd_history_position]});
+                break;
+            case keyCode.down:
+                if (cmd_history_position < cmd_history.length - 1) {
+                    cmd_history_position++;
+                    this.setState({cmd: cmd_history[cmd_history_position]});
+                    break;
+                }
+                if (
+                    cmd_history.length - 1 == cmd_history_position &&
+                    this.state.cmd != ""
+                ) {
+                    cmd_history.pushState("");
+                    cmd_history_position++;
+                    this.setState({cmd: ""});
+                    break;
+                }
+            default:
+                // input field was altered, on_cmd_keyup will have the value
+                cmd_history_position = cmd_history.length - 1;
+                return;
         }
         evt.preventDefault();
         evt.stopPropagation();
     }
 
     on_cmd_keyup() {
-        cmd_history[cmd_history_position] =
-            this.refs.console_input.props.value
+        cmd_history[cmd_history_position] = this.refs.console_input.props.value;
     }
 
     on_cmd_submit(evt) {
-        evt.preventDefault()
-        this.run()
+        evt.preventDefault();
+        this.run();
     }
 
     run() {
-        if(this.state.cmd.trim() == "")
-            return
-
+        if (this.state.cmd.trim() == "") return;
 
         // if pasted, it will not be in history via 'on_cmd_keyup'
-        cmd_history[cmd_history_position] =
-            this.refs.console_input.props.value
+        cmd_history[cmd_history_position] = this.refs.console_input.props.value;
 
-        var cmd_console = this.state.cmd_console
+        var cmd_console = this.state.cmd_console;
         cmd_console.push(
             <div>
-                <br/>
-                <div className="console_result monospace">&gt;&nbsp;{this.state.cmd}</div>
+                <br />
+                <div className="console_result monospace">
+                    &gt;&nbsp;{this.state.cmd}
+                </div>
             </div>
-        )
+        );
         try {
-            var result = evalInContext(this.state.cmd)
-            if(result && result["then"]) {
-                result.then( result => {
-                    this.cmd_console_result(result)
-                }).catch( error => {
-                    this.cmd_console_error(error)
-                })
+            var result = evalInContext(this.state.cmd);
+            if (result && result["then"]) {
+                result
+                    .then(result => {
+                        this.cmd_console_result(result);
+                    })
+                    .catch(error => {
+                        this.cmd_console_error(error);
+                    });
+            } else {
+                this.cmd_console_result(result);
             }
-            else {
-                this.cmd_console_result(result)
-            }
-        } catch(error) {
-            this.cmd_console_error(error)
+        } catch (error) {
+            this.cmd_console_error(error);
         }
         // prevent immediate duplicats in history
-        if(
+        if (
             cmd_history_position &&
             cmd_history[cmd_history_position - 1] == this.state.cmd
         )
-            cmd_history.pop()
+            cmd_history.pop();
 
-        while(cmd_history[cmd_history.length - 1] == "")
-            cmd_history.pop()
+        while (cmd_history[cmd_history.length - 1] == "") cmd_history.pop();
 
-        cmd_history_position = cmd_history.length
-        cmd_history.pushState("")
-        this.setState({cmd_console, cmd:""})
+        cmd_history_position = cmd_history.length;
+        cmd_history.pushState("");
+        this.setState({cmd_console, cmd: ""});
     }
 
     cmd_console_result(result) {
         // DEBUG console.log('... cmd_console_result result',result)
-        var cmd_console = this.state.cmd_console
-        var result_stringify = JSON.stringify(result)
+        var cmd_console = this.state.cmd_console;
+        var result_stringify = JSON.stringify(result);
         cmd_console.push(
             <div className="console_result monospace">{result_stringify}</div>
-        )
-        this.forceUpdate()
+        );
+        this.forceUpdate();
     }
 
     cmd_console_error(error) {
         // DEBUG console.log("user console command error", error)
-        var cmd_console = this.state.cmd_console
-        var message = error.message ? error.message : error
+        var cmd_console = this.state.cmd_console;
+        var message = error.message ? error.message : error;
         cmd_console.push(
             <div className="console-error monospace has-error">{message}</div>
-        )
-        this.forceUpdate()
+        );
+        this.forceUpdate();
     }
 }
diff --git a/app/components/Dashboard/AccountCard.jsx b/app/components/Dashboard/AccountCard.jsx
index 7f5a9b3c14..7f42951ebd 100644
--- a/app/components/Dashboard/AccountCard.jsx
+++ b/app/components/Dashboard/AccountCard.jsx
@@ -15,10 +15,9 @@ import {ChainStore} from "bitsharesjs/es";
  */
 
 class AccountCard extends React.Component {
-
     static contextTypes = {
         router: React.PropTypes.object.isRequired
-    }
+    };
 
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired
@@ -26,7 +25,7 @@ class AccountCard extends React.Component {
 
     onCardClick(e) {
         e.preventDefault();
-        let name = this.props.account.get('name');
+        let name = this.props.account.get("name");
         this.context.router.push(`/account/${name}/overview/`);
     }
 
@@ -34,33 +33,42 @@ class AccountCard extends React.Component {
         let name = null;
         let balances = null;
         let isMyAccount = false;
-        if( this.props.account )
-        {
-           name = this.props.account.get('name');
-           let abal = this.props.account.get('balances' )
-           if( abal ) {
-              balances = abal.map( x => {
-                let balanceAmount = ChainStore.getObject(x);
-                if (!balanceAmount.get("balance")) {
-                    return null;
-                }
-                return <li key={x}><BalanceComponent balance={x}/></li>;
-            }).toArray();
-           }
-           isMyAccount = AccountStore.isMyAccount(this.props.account);
+        if (this.props.account) {
+            name = this.props.account.get("name");
+            let abal = this.props.account.get("balances");
+            if (abal) {
+                balances = abal
+                    .map(x => {
+                        let balanceAmount = ChainStore.getObject(x);
+                        if (!balanceAmount.get("balance")) {
+                            return null;
+                        }
+                        return (
+                            <li key={x}>
+                                <BalanceComponent balance={x} />
+                            </li>
+                        );
+                    })
+                    .toArray();
+            }
+            isMyAccount = AccountStore.isMyAccount(this.props.account);
         }
 
         return (
-            <div className="grid-content account-card" onClick={this.onCardClick.bind(this)}>
+            <div
+                className="grid-content account-card"
+                onClick={this.onCardClick.bind(this)}
+            >
                 <div className={"card" + (isMyAccount ? " my-account" : "")}>
                     <h4 className="text-center">{name}</h4>
                     <div className="card-content clearfix">
                         <div className="float-left">
-                            <AccountImage account={name} size={{height: 64, width: 64}}/>
+                            <AccountImage
+                                account={name}
+                                size={{height: 64, width: 64}}
+                            />
                         </div>
-                        <ul className="balances">
-                            {balances}
-                        </ul>
+                        <ul className="balances">{balances}</ul>
                     </div>
                 </div>
             </div>
diff --git a/app/components/Dashboard/DashboardAccountsOnly.jsx b/app/components/Dashboard/DashboardAccountsOnly.jsx
index 76f1e8961a..c4c883432f 100644
--- a/app/components/Dashboard/DashboardAccountsOnly.jsx
+++ b/app/components/Dashboard/DashboardAccountsOnly.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import Immutable from "immutable";
 import DashboardList from "./DashboardList";
-import { RecentTransactions } from "../Account/RecentTransactions";
+import {RecentTransactions} from "../Account/RecentTransactions";
 import LoadingIndicator from "../LoadingIndicator";
 import LoginSelector from "../LoginSelector";
 import SettingsActions from "actions/SettingsActions";
@@ -24,7 +24,10 @@ class AccountsContainer extends React.Component {
                         return AccountStore.getState().myIgnoredAccounts;
                     },
                     accountsReady: () => {
-                        return AccountStore.getState().accountsLoaded && AccountStore.getState().refsLoaded;
+                        return (
+                            AccountStore.getState().accountsLoaded &&
+                            AccountStore.getState().refsLoaded
+                        );
                     },
                     passwordAccount: () => {
                         return AccountStore.getState().passwordAccount;
@@ -32,8 +35,12 @@ class AccountsContainer extends React.Component {
                     lowVolumeMarkets: () => {
                         return MarketsStore.getState().lowVolumeMarkets;
                     },
-                    currentEntry: SettingsStore.getState().viewSettings.get("dashboardEntry", "accounts")
-                }}>
+                    currentEntry: SettingsStore.getState().viewSettings.get(
+                        "dashboardEntry",
+                        "accounts"
+                    )
+                }}
+            >
                 <Accounts {...this.props} />
             </AltContainer>
         );
@@ -41,7 +48,6 @@ class AccountsContainer extends React.Component {
 }
 
 class Accounts extends React.Component {
-
     constructor(props) {
         super();
 
@@ -57,7 +63,10 @@ class Accounts extends React.Component {
     componentDidMount() {
         this._setDimensions();
 
-        window.addEventListener("resize", this._setDimensions, {capture: false, passive: true});
+        window.addEventListener("resize", this._setDimensions, {
+            capture: false,
+            passive: true
+        });
     }
 
     shouldComponentUpdate(nextProps, nextState) {
@@ -100,17 +109,32 @@ class Accounts extends React.Component {
     }
 
     render() {
-        let { linkedAccounts, myIgnoredAccounts, accountsReady, passwordAccount } = this.props;
-        let {width, showIgnored, featuredMarkets, newAssets, currentEntry} = this.state;
+        let {
+            linkedAccounts,
+            myIgnoredAccounts,
+            accountsReady,
+            passwordAccount
+        } = this.props;
+        let {
+            width,
+            showIgnored,
+            featuredMarkets,
+            newAssets,
+            currentEntry
+        } = this.state;
 
         if (passwordAccount && !linkedAccounts.has(passwordAccount)) {
             linkedAccounts = linkedAccounts.add(passwordAccount);
         }
         let names = linkedAccounts.toArray().sort();
-        if (passwordAccount && names.indexOf(passwordAccount) === -1) names.push(passwordAccount);
+        if (passwordAccount && names.indexOf(passwordAccount) === -1)
+            names.push(passwordAccount);
         let ignored = myIgnoredAccounts.toArray().sort();
 
-        let accountCount = linkedAccounts.size + myIgnoredAccounts.size + (passwordAccount ? 1 : 0);
+        let accountCount =
+            linkedAccounts.size +
+            myIgnoredAccounts.size +
+            (passwordAccount ? 1 : 0);
 
         if (!accountsReady) {
             return <LoadingIndicator />;
@@ -122,7 +146,10 @@ class Accounts extends React.Component {
 
         return (
             <div ref="wrapper" className="grid-block page-layout vertical">
-                <div ref="container" className="tabs-container generic-bordered-box">
+                <div
+                    ref="container"
+                    className="tabs-container generic-bordered-box"
+                >
                     <Tabs
                         setting="accountTab"
                         className="account-tabs"
@@ -135,9 +162,13 @@ class Accounts extends React.Component {
                                 <div className="box-content">
                                     <DashboardList
                                         accounts={Immutable.List(names)}
-                                        ignoredAccounts={Immutable.List(ignored)}
+                                        ignoredAccounts={Immutable.List(
+                                            ignored
+                                        )}
                                         width={width}
-                                        onToggleIgnored={this._onToggleIgnored.bind(this)}
+                                        onToggleIgnored={this._onToggleIgnored.bind(
+                                            this
+                                        )}
                                         showIgnored={showIgnored}
                                         showMyAccounts={true}
                                     />
@@ -150,9 +181,13 @@ class Accounts extends React.Component {
                                     <DashboardList
                                         accounts={Immutable.List(names)}
                                         passwordAccount={passwordAccount}
-                                        ignoredAccounts={Immutable.List(ignored)}
+                                        ignoredAccounts={Immutable.List(
+                                            ignored
+                                        )}
                                         width={width}
-                                        onToggleIgnored={this._onToggleIgnored.bind(this)}
+                                        onToggleIgnored={this._onToggleIgnored.bind(
+                                            this
+                                        )}
                                         showIgnored={showIgnored}
                                         showMyAccounts={false}
                                     />
@@ -176,7 +211,7 @@ class Accounts extends React.Component {
     }
 }
 
-const DashboardAccountsOnly = (props) => {
+const DashboardAccountsOnly = props => {
     return <AccountsContainer {...props} onlyAccounts />;
 };
 
diff --git a/app/components/Dashboard/DashboardList.jsx b/app/components/Dashboard/DashboardList.jsx
index 91bb37666b..590c2c77eb 100644
--- a/app/components/Dashboard/DashboardList.jsx
+++ b/app/components/Dashboard/DashboardList.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import Immutable from "immutable";
 import utils from "common/utils";
 import Translate from "react-translate-component";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import SettingsStore from "stores/SettingsStore";
 import WalletUnlockStore from "stores/WalletUnlockStore";
 import ChainTypes from "../Utility/ChainTypes";
@@ -17,327 +17,547 @@ import counterpart from "counterpart";
 import WalletDb from "stores/WalletDb";
 
 const starSort = function(a, b, inverse, starredAccounts) {
-	let aName = a.get("name");
-	let bName = b.get("name");
-	let aStarred = starredAccounts.has(aName);
-	let bStarred = starredAccounts.has(bName);
-
-	if (aStarred && !bStarred) {
-		return inverse ? -1 : 1;
-	} else if (bStarred && !aStarred) {
-		return inverse ? 1 : -1;
-	} else {
-		if (aName > bName) {
-			return inverse ? 1 : -1;
-		} else if (aName < bName) {
-			return inverse ? -1 : 1;
-		} else {
-			return utils.sortText(aName, bName, !inverse);
-		}
-	}
+    let aName = a.get("name");
+    let bName = b.get("name");
+    let aStarred = starredAccounts.has(aName);
+    let bStarred = starredAccounts.has(bName);
+
+    if (aStarred && !bStarred) {
+        return inverse ? -1 : 1;
+    } else if (bStarred && !aStarred) {
+        return inverse ? 1 : -1;
+    } else {
+        if (aName > bName) {
+            return inverse ? 1 : -1;
+        } else if (aName < bName) {
+            return inverse ? -1 : 1;
+        } else {
+            return utils.sortText(aName, bName, !inverse);
+        }
+    }
 };
 
-
 class DashboardList extends React.Component {
-	static contextTypes = {
-		router: React.PropTypes.object.isRequired
-	}
-
-	static propTypes = {
-		accounts: ChainTypes.ChainAccountsList.isRequired,
-		ignoredAccounts: ChainTypes.ChainAccountsList
-	};
-
-	static defaultProps = {
-		width: 2000,
-		compact: false
-	};
-
-	constructor(props) {
-		super();
-		let inputValue = props.viewSettings.get("marketLookupInput");
-		let symbols = inputValue ? inputValue.split(":") : [null];
-		let quote = symbols[0];
-		let base = symbols.length === 2 ? symbols[1] : null;
-
-		this.state = {
-			inverseSort: props.viewSettings.get("dashboardSortInverse", true),
-			sortBy: props.viewSettings.get("dashboardSort", "star"),
-			dashboardFilter: props.viewSettings.get("dashboardFilter", "")
-		};
-
-	}
-
-	shouldComponentUpdate(nextProps, nextState) {
-
-		return (
-			!utils.are_equal_shallow(nextProps.accounts, this.props.accounts) ||
-			nextProps.showMyAccounts !== this.props.showMyAccounts ||
-			nextProps.width !== this.props.width ||
-			nextProps.showIgnored !== this.props.showIgnored ||
-			nextProps.locked !== this.props.locked ||
-			nextProps.linkedAccounts !== this.props.linkedAccounts ||
-			nextProps.passwordAccount !== this.props.passwordAccount ||
-			!utils.are_equal_shallow(nextProps.starredAccounts, this.props.starredAccounts) ||
-			!utils.are_equal_shallow(nextState, this.state )
-		);
-
-	}
-
-	_onStar(account, isStarred, e) {
-		e.preventDefault();
-		if (!isStarred) {
-			AccountActions.addStarAccount(account);
-		} else {
-			AccountActions.removeStarAccount(account);
-		}
-	}
-
-	_goAccount(name, tab) {
-		this.context.router.push(`/account/${name}`);
-		SettingsActions.changeViewSetting({
-			overviewTab: tab
-		});
-	}
-
-        _createAccount() {
-            this.context.router.push("/create-account/wallet");
+    static contextTypes = {
+        router: React.PropTypes.object.isRequired
+    };
+
+    static propTypes = {
+        accounts: ChainTypes.ChainAccountsList.isRequired,
+        ignoredAccounts: ChainTypes.ChainAccountsList
+    };
+
+    static defaultProps = {
+        width: 2000,
+        compact: false
+    };
+
+    constructor(props) {
+        super();
+        let inputValue = props.viewSettings.get("marketLookupInput");
+        let symbols = inputValue ? inputValue.split(":") : [null];
+        let quote = symbols[0];
+        let base = symbols.length === 2 ? symbols[1] : null;
+
+        this.state = {
+            inverseSort: props.viewSettings.get("dashboardSortInverse", true),
+            sortBy: props.viewSettings.get("dashboardSort", "star"),
+            dashboardFilter: props.viewSettings.get("dashboardFilter", "")
+        };
+    }
+
+    shouldComponentUpdate(nextProps, nextState) {
+        return (
+            !utils.are_equal_shallow(nextProps.accounts, this.props.accounts) ||
+            nextProps.showMyAccounts !== this.props.showMyAccounts ||
+            nextProps.width !== this.props.width ||
+            nextProps.showIgnored !== this.props.showIgnored ||
+            nextProps.locked !== this.props.locked ||
+            nextProps.linkedAccounts !== this.props.linkedAccounts ||
+            nextProps.passwordAccount !== this.props.passwordAccount ||
+            !utils.are_equal_shallow(
+                nextProps.starredAccounts,
+                this.props.starredAccounts
+            ) ||
+            !utils.are_equal_shallow(nextState, this.state)
+        );
+    }
+
+    _onStar(account, isStarred, e) {
+        e.preventDefault();
+        if (!isStarred) {
+            AccountActions.addStarAccount(account);
+        } else {
+            AccountActions.removeStarAccount(account);
         }
+    }
 
-	_onFilter(e) {
-		this.setState({dashboardFilter: e.target.value.toLowerCase()});
+    _goAccount(name, tab) {
+        this.context.router.push(`/account/${name}`);
+        SettingsActions.changeViewSetting({
+            overviewTab: tab
+        });
+    }
 
-		SettingsActions.changeViewSetting({
-			dashboardFilter: e.target.value.toLowerCase()
-		});
-	}
+    _createAccount() {
+        this.context.router.push("/create-account/wallet");
+    }
 
-	_setSort(field) {
-		let inverse = field === this.state.sortBy ? !this.state.inverseSort : this.state.inverseSort;
-		this.setState({
-			sortBy: field,
-			inverseSort: inverse
-		});
+    _onFilter(e) {
+        this.setState({dashboardFilter: e.target.value.toLowerCase()});
 
-		SettingsActions.changeViewSetting({
-			dashboardSort: field,
-			dashboardSortInverse: inverse
-		});
-	}
+        SettingsActions.changeViewSetting({
+            dashboardFilter: e.target.value.toLowerCase()
+        });
+    }
 
-	_onUnLinkAccount(account, e) {
-		e.preventDefault();
-		AccountActions.unlinkAccount(account);
-	}
+    _setSort(field) {
+        let inverse =
+            field === this.state.sortBy
+                ? !this.state.inverseSort
+                : this.state.inverseSort;
+        this.setState({
+            sortBy: field,
+            inverseSort: inverse
+        });
+
+        SettingsActions.changeViewSetting({
+            dashboardSort: field,
+            dashboardSortInverse: inverse
+        });
+    }
+
+    _onUnLinkAccount(account, e) {
+        e.preventDefault();
+        AccountActions.unlinkAccount(account);
+    }
 
     _onLinkAccount(account, e) {
         e.preventDefault();
         AccountActions.linkAccount(account);
     }
 
-	_renderList(accounts, isHiddenAccountsList) {
-
-		const {width, starredAccounts, showMyAccounts, passwordAccount} = this.props;
-		const {dashboardFilter, sortBy, inverseSort} = this.state;
-		let balanceList = Immutable.List();
-
-		return accounts
-		.filter(account => {
-			let accountName = account.get("name");
-			let isMyAccount = AccountStore.isMyAccount(account) || accountName === passwordAccount;
-
-			return (isMyAccount === this.props.showMyAccounts);
-		})
-		.filter(a => {
-			if (!a) return false;
-			return a.get("name").toLowerCase().indexOf(dashboardFilter) !== -1;
-		})
-		.sort((a, b) => {
-			switch (sortBy) {
-				case "star":
-					return starSort(a, b, inverseSort, starredAccounts);
-					break;
-
-				case "name":
-					return utils.sortText(a.get("name"), b.get("name"), inverseSort);
-					break;
-
-				default:
-					break;
-			}
-		}).map(account => {
-
-			if (account) {
-				let collateral = {}, debt = {}, openOrders = {};
-				balanceList = balanceList.clear();
-
-				let accountName = account.get("name");
-				let isLTM = account.get("lifetime_referrer_name") === accountName;
-
-				if (account.get("orders")) {
-					account.get("orders").forEach( (orderID, key) => {
-						let order = ChainStore.getObject(orderID);
-						if (order) {
-							let orderAsset = order.getIn(["sell_price", "base", "asset_id"]);
-							if (!openOrders[orderAsset]) {
-								openOrders[orderAsset] = parseInt(order.get("for_sale"), 10);
-							} else {
-								openOrders[orderAsset] += parseInt(order.get("for_sale"), 10);
-							}
-						}
-					});
-				}
-
-				// console.log("openOrders:", openOrders);
-
-				if (account.get("call_orders")) {
-					account.get("call_orders").forEach( (callID, key) => {
-						let position = ChainStore.getObject(callID);
-						if (position) {
-							let collateralAsset = position.getIn(["call_price", "base", "asset_id"]);
-			                if (!collateral[collateralAsset]) {
-			                    collateral[collateralAsset] = parseInt(position.get("collateral"), 10);
-			                } else {
-			                    collateral[collateralAsset] += parseInt(position.get("collateral"), 10);
-			                }
-							let debtAsset = position.getIn(["call_price", "quote", "asset_id"]);
-							if (!debt[debtAsset]) {
-								debt[debtAsset] = parseInt(position.get("debt"), 10);
-							} else {
-								debt[debtAsset] += parseInt(position.get("debt"), 10);
-							}
-						}
-					});
-				}
-
-				let account_balances = account.get("balances");
-				if (account.get("balances")) {
-					account_balances.forEach( balance => {
-						let balanceAmount = ChainStore.getObject(balance);
-						if (!balanceAmount || !balanceAmount.get("balance")) {
-							return null;
-						}
-						balanceList = balanceList.push(balance);
-					});
-				}
-
-				let isMyAccount = AccountStore.isMyAccount(account) || accountName === passwordAccount;
-
-				let isStarred = starredAccounts.has(accountName);
-				let starClass = isStarred ? "gold-star" : "grey-star";
-
-				return (
-					<tr key={accountName}>
-						<td className="clickable" onClick={this._onStar.bind(this, accountName, isStarred)}>
-							<Icon className={starClass} name="fi-star"/>
-						</td>
-						{!showMyAccounts ? (isHiddenAccountsList && (
-                                <td onClick={this._onLinkAccount.bind(this, accountName)}>
-                                    <Icon name="plus-circle"/>
+    _renderList(accounts, isHiddenAccountsList) {
+        const {
+            width,
+            starredAccounts,
+            showMyAccounts,
+            passwordAccount
+        } = this.props;
+        const {dashboardFilter, sortBy, inverseSort} = this.state;
+        let balanceList = Immutable.List();
+
+        return accounts
+            .filter(account => {
+                let accountName = account.get("name");
+                let isMyAccount =
+                    AccountStore.isMyAccount(account) ||
+                    accountName === passwordAccount;
+
+                return isMyAccount === this.props.showMyAccounts;
+            })
+            .filter(a => {
+                if (!a) return false;
+                return (
+                    a
+                        .get("name")
+                        .toLowerCase()
+                        .indexOf(dashboardFilter) !== -1
+                );
+            })
+            .sort((a, b) => {
+                switch (sortBy) {
+                    case "star":
+                        return starSort(a, b, inverseSort, starredAccounts);
+                        break;
+
+                    case "name":
+                        return utils.sortText(
+                            a.get("name"),
+                            b.get("name"),
+                            inverseSort
+                        );
+                        break;
+
+                    default:
+                        break;
+                }
+            })
+            .map(account => {
+                if (account) {
+                    let collateral = {},
+                        debt = {},
+                        openOrders = {};
+                    balanceList = balanceList.clear();
+
+                    let accountName = account.get("name");
+                    let isLTM =
+                        account.get("lifetime_referrer_name") === accountName;
+
+                    if (account.get("orders")) {
+                        account.get("orders").forEach((orderID, key) => {
+                            let order = ChainStore.getObject(orderID);
+                            if (order) {
+                                let orderAsset = order.getIn([
+                                    "sell_price",
+                                    "base",
+                                    "asset_id"
+                                ]);
+                                if (!openOrders[orderAsset]) {
+                                    openOrders[orderAsset] = parseInt(
+                                        order.get("for_sale"),
+                                        10
+                                    );
+                                } else {
+                                    openOrders[orderAsset] += parseInt(
+                                        order.get("for_sale"),
+                                        10
+                                    );
+                                }
+                            }
+                        });
+                    }
+
+                    // console.log("openOrders:", openOrders);
+
+                    if (account.get("call_orders")) {
+                        account.get("call_orders").forEach((callID, key) => {
+                            let position = ChainStore.getObject(callID);
+                            if (position) {
+                                let collateralAsset = position.getIn([
+                                    "call_price",
+                                    "base",
+                                    "asset_id"
+                                ]);
+                                if (!collateral[collateralAsset]) {
+                                    collateral[collateralAsset] = parseInt(
+                                        position.get("collateral"),
+                                        10
+                                    );
+                                } else {
+                                    collateral[collateralAsset] += parseInt(
+                                        position.get("collateral"),
+                                        10
+                                    );
+                                }
+                                let debtAsset = position.getIn([
+                                    "call_price",
+                                    "quote",
+                                    "asset_id"
+                                ]);
+                                if (!debt[debtAsset]) {
+                                    debt[debtAsset] = parseInt(
+                                        position.get("debt"),
+                                        10
+                                    );
+                                } else {
+                                    debt[debtAsset] += parseInt(
+                                        position.get("debt"),
+                                        10
+                                    );
+                                }
+                            }
+                        });
+                    }
+
+                    let account_balances = account.get("balances");
+                    if (account.get("balances")) {
+                        account_balances.forEach(balance => {
+                            let balanceAmount = ChainStore.getObject(balance);
+                            if (
+                                !balanceAmount ||
+                                !balanceAmount.get("balance")
+                            ) {
+                                return null;
+                            }
+                            balanceList = balanceList.push(balance);
+                        });
+                    }
+
+                    let isMyAccount =
+                        AccountStore.isMyAccount(account) ||
+                        accountName === passwordAccount;
+
+                    let isStarred = starredAccounts.has(accountName);
+                    let starClass = isStarred ? "gold-star" : "grey-star";
+
+                    return (
+                        <tr key={accountName}>
+                            <td
+                                className="clickable"
+                                onClick={this._onStar.bind(
+                                    this,
+                                    accountName,
+                                    isStarred
+                                )}
+                            >
+                                <Icon className={starClass} name="fi-star" />
+                            </td>
+                            {!showMyAccounts
+                                ? (isHiddenAccountsList && (
+                                      <td
+                                          onClick={this._onLinkAccount.bind(
+                                              this,
+                                              accountName
+                                          )}
+                                      >
+                                          <Icon name="plus-circle" />
+                                      </td>
+                                  )) || (
+                                      <td
+                                          onClick={this._onUnLinkAccount.bind(
+                                              this,
+                                              accountName
+                                          )}
+                                      >
+                                          <Icon name="minus-circle" />
+                                      </td>
+                                  )
+                                : null}
+                            <td style={{textAlign: "left"}}>
+                                {account.get("id")}
+                            </td>
+                            <td
+                                style={{textAlign: "left", paddingLeft: 10}}
+                                onClick={this._goAccount.bind(
+                                    this,
+                                    accountName,
+                                    0
+                                )}
+                                className={
+                                    "clickable" +
+                                    (isMyAccount ? " my-account" : "")
+                                }
+                            >
+                                <span className={isLTM ? "lifetime" : ""}>
+                                    {accountName}
+                                </span>
+                            </td>
+                            <td
+                                className="clickable"
+                                onClick={this._goAccount.bind(
+                                    this,
+                                    accountName,
+                                    1
+                                )}
+                                style={{textAlign: "right"}}
+                            >
+                                <TotalBalanceValue
+                                    noTip
+                                    balances={[]}
+                                    openOrders={openOrders}
+                                />
+                            </td>
+                            {width >= 750 ? (
+                                <td
+                                    className="clickable"
+                                    onClick={this._goAccount.bind(
+                                        this,
+                                        accountName,
+                                        2
+                                    )}
+                                    style={{textAlign: "right"}}
+                                >
+                                    <TotalBalanceValue
+                                        noTip
+                                        balances={[]}
+                                        collateral={collateral}
+                                    />
                                 </td>
-                            ) || (
-                                <td onClick={this._onUnLinkAccount.bind(this, accountName)}>
-                                    <Icon name="minus-circle"/>
+                            ) : null}
+                            {width >= 1200 ? (
+                                <td
+                                    className="clickable"
+                                    onClick={this._goAccount.bind(
+                                        this,
+                                        accountName,
+                                        2
+                                    )}
+                                    style={{textAlign: "right"}}
+                                >
+                                    <TotalBalanceValue
+                                        noTip
+                                        balances={[]}
+                                        debt={debt}
+                                    />
                                 </td>
-                            ))
-						: null}
-						<td style={{textAlign: "left"}}>
-							{ account.get("id") }
-						</td>
-						<td style={{textAlign: "left", paddingLeft: 10}} onClick={this._goAccount.bind(this, accountName, 0)} className={"clickable" + (isMyAccount ? " my-account" : "")}>
-							<span className={isLTM ? "lifetime" : ""}>{accountName}</span>
-						</td>
-						<td className="clickable" onClick={this._goAccount.bind(this, accountName, 1)} style={{textAlign: "right"}}>
-							<TotalBalanceValue noTip balances={[]} openOrders={openOrders}/>
-						</td>
-						{width >= 750 ? <td className="clickable" onClick={this._goAccount.bind(this, accountName, 2)} style={{textAlign: "right"}}>
-							<TotalBalanceValue noTip balances={[]} collateral={collateral}/>
-						</td> : null}
-						{width >= 1200 ? <td className="clickable" onClick={this._goAccount.bind(this, accountName, 2)} style={{textAlign: "right"}}>
-							<TotalBalanceValue noTip balances={[]} debt={debt}/>
-						</td> : null}
-						<td className="clickable" onClick={this._goAccount.bind(this, accountName, 0)} style={{textAlign: "right"}}>
-							<TotalBalanceValue noTip balances={balanceList} collateral={collateral} debt={debt} openOrders={openOrders}/>
-						</td>
-					</tr>
-				);
-			}
-		});
-	}
-
-	render() {
-
-		let { width, showIgnored, showMyAccounts } = this.props;
-		const { dashboardFilter } = this.state;
-
-		let includedAccounts = this._renderList(this.props.accounts);
-
-		let hiddenAccounts = this._renderList(this.props.ignoredAccounts, true);
-
-		let filterText = (showMyAccounts) ? counterpart.translate("explorer.accounts.filter") : counterpart.translate("explorer.accounts.filter_contacts");
-		filterText += "...";
-
-		let hasLocalWallet = !!WalletDb.getWallet();
-
-		return (
-			<div style={this.props.style}>
-				{!this.props.compact ? (
-					<section style={{paddingTop: "1rem", paddingLeft: "2rem"}}>
-						<input placeholder={filterText} style={{maxWidth: "20rem", display:"inline-block"}} type="text" value={dashboardFilter} onChange={this._onFilter.bind(this)} />
-							{hasLocalWallet ? (<div onClick={this._createAccount.bind(this)} style={{display: "inline-block", marginLeft: 5, marginBottom: "1rem"}} className="button small">
-							<Translate content="header.create_account" />
-						</div>):null}
-                        {hiddenAccounts && hiddenAccounts.length ? <div onClick={this.props.onToggleIgnored} style={{display: "inline-block",float:"right",marginRight:"20px"}} className="button small">
-							<Translate content={`account.${ this.props.showIgnored ? "hide_ignored" : "show_ignored" }`} />
-						</div>:null}
-					</section>) : null}
-				<table className="table table-hover dashboard-table" style={{fontSize: "0.85rem"}}>
-					{!this.props.compact ? (
-					<thead>
-						<tr>
-							<th onClick={this._setSort.bind(this, "star")} className="clickable"><Icon className="grey-star" name="fi-star"/></th>
-							{!showMyAccounts ? <th><Icon name="user"/></th> : null}
-							<th style={{textAlign: "left"}}>ID</th>
-							<th style={{textAlign: "left", paddingLeft: 10}} onClick={this._setSort.bind(this, "name")} className="clickable"><Translate content="header.account" /></th>
-							<th style={{textAlign: "right"}}><Translate content="account.open_orders" /></th>
-							{width >= 750 ? <th style={{textAlign: "right"}}><Translate content="account.as_collateral" /></th> : null}
-							{width >= 1200 ? <th style={{textAlign: "right"}}><Translate content="transaction.borrow_amount" /></th> : null}
-							<th style={{textAlign: "right", marginRight: 20}}><Translate content="account.total_value" /></th>
-						</tr>
-					</thead>) : null}
-					<tbody>
-						{includedAccounts}
-						{showIgnored && hiddenAccounts.length ? <tr className="dashboard-table--hiddenAccounts" style={{backgroundColor: "transparent"}} key="hidden"><td colSpan="8">{ counterpart.translate("account.hidden_accounts_row") }:</td></tr> : null}
-						{showIgnored && hiddenAccounts}
-					</tbody>
-				</table>
-			</div>
-		);
-	}
+                            ) : null}
+                            <td
+                                className="clickable"
+                                onClick={this._goAccount.bind(
+                                    this,
+                                    accountName,
+                                    0
+                                )}
+                                style={{textAlign: "right"}}
+                            >
+                                <TotalBalanceValue
+                                    noTip
+                                    balances={balanceList}
+                                    collateral={collateral}
+                                    debt={debt}
+                                    openOrders={openOrders}
+                                />
+                            </td>
+                        </tr>
+                    );
+                }
+            });
+    }
+
+    render() {
+        let {width, showIgnored, showMyAccounts} = this.props;
+        const {dashboardFilter} = this.state;
+
+        let includedAccounts = this._renderList(this.props.accounts);
+
+        let hiddenAccounts = this._renderList(this.props.ignoredAccounts, true);
+
+        let filterText = showMyAccounts
+            ? counterpart.translate("explorer.accounts.filter")
+            : counterpart.translate("explorer.accounts.filter_contacts");
+        filterText += "...";
+
+        let hasLocalWallet = !!WalletDb.getWallet();
+
+        return (
+            <div style={this.props.style}>
+                {!this.props.compact ? (
+                    <section style={{paddingTop: "1rem", paddingLeft: "2rem"}}>
+                        <input
+                            placeholder={filterText}
+                            style={{maxWidth: "20rem", display: "inline-block"}}
+                            type="text"
+                            value={dashboardFilter}
+                            onChange={this._onFilter.bind(this)}
+                        />
+                        {hasLocalWallet ? (
+                            <div
+                                onClick={this._createAccount.bind(this)}
+                                style={{
+                                    display: "inline-block",
+                                    marginLeft: 5,
+                                    marginBottom: "1rem"
+                                }}
+                                className="button small"
+                            >
+                                <Translate content="header.create_account" />
+                            </div>
+                        ) : null}
+                        {hiddenAccounts && hiddenAccounts.length ? (
+                            <div
+                                onClick={this.props.onToggleIgnored}
+                                style={{
+                                    display: "inline-block",
+                                    float: "right",
+                                    marginRight: "20px"
+                                }}
+                                className="button small"
+                            >
+                                <Translate
+                                    content={`account.${
+                                        this.props.showIgnored
+                                            ? "hide_ignored"
+                                            : "show_ignored"
+                                    }`}
+                                />
+                            </div>
+                        ) : null}
+                    </section>
+                ) : null}
+                <table
+                    className="table table-hover dashboard-table"
+                    style={{fontSize: "0.85rem"}}
+                >
+                    {!this.props.compact ? (
+                        <thead>
+                            <tr>
+                                <th
+                                    onClick={this._setSort.bind(this, "star")}
+                                    className="clickable"
+                                >
+                                    <Icon
+                                        className="grey-star"
+                                        name="fi-star"
+                                    />
+                                </th>
+                                {!showMyAccounts ? (
+                                    <th>
+                                        <Icon name="user" />
+                                    </th>
+                                ) : null}
+                                <th style={{textAlign: "left"}}>ID</th>
+                                <th
+                                    style={{textAlign: "left", paddingLeft: 10}}
+                                    onClick={this._setSort.bind(this, "name")}
+                                    className="clickable"
+                                >
+                                    <Translate content="header.account" />
+                                </th>
+                                <th style={{textAlign: "right"}}>
+                                    <Translate content="account.open_orders" />
+                                </th>
+                                {width >= 750 ? (
+                                    <th style={{textAlign: "right"}}>
+                                        <Translate content="account.as_collateral" />
+                                    </th>
+                                ) : null}
+                                {width >= 1200 ? (
+                                    <th style={{textAlign: "right"}}>
+                                        <Translate content="transaction.borrow_amount" />
+                                    </th>
+                                ) : null}
+                                <th
+                                    style={{
+                                        textAlign: "right",
+                                        marginRight: 20
+                                    }}
+                                >
+                                    <Translate content="account.total_value" />
+                                </th>
+                            </tr>
+                        </thead>
+                    ) : null}
+                    <tbody>
+                        {includedAccounts}
+                        {showIgnored && hiddenAccounts.length ? (
+                            <tr
+                                className="dashboard-table--hiddenAccounts"
+                                style={{backgroundColor: "transparent"}}
+                                key="hidden"
+                            >
+                                <td colSpan="8">
+                                    {counterpart.translate(
+                                        "account.hidden_accounts_row"
+                                    )}:
+                                </td>
+                            </tr>
+                        ) : null}
+                        {showIgnored && hiddenAccounts}
+                    </tbody>
+                </table>
+            </div>
+        );
+    }
 }
 DashboardList = BindToChainState(DashboardList);
 
 class AccountsListWrapper extends React.Component {
-
-	render () {
-		return (
-			<DashboardList
-				{...this.props}
-			/>
-		);
-	}
+    render() {
+        return <DashboardList {...this.props} />;
+    }
 }
 
 export default connect(AccountsListWrapper, {
-	listenTo() {
-		return [SettingsStore, WalletUnlockStore, AccountStore];
-	},
-	getProps() {
-		return {
-			locked: WalletUnlockStore.getState().locked,
-			starredAccounts: AccountStore.getState().starredAccounts,
-			linkedAccounts: AccountStore.getState().linkedAccounts,
-			viewSettings: SettingsStore.getState().viewSettings
-		};
-	}
+    listenTo() {
+        return [SettingsStore, WalletUnlockStore, AccountStore];
+    },
+    getProps() {
+        return {
+            locked: WalletUnlockStore.getState().locked,
+            starredAccounts: AccountStore.getState().starredAccounts,
+            linkedAccounts: AccountStore.getState().linkedAccounts,
+            viewSettings: SettingsStore.getState().viewSettings
+        };
+    }
 });
diff --git a/app/components/DepositWithdraw/BitKapital.jsx b/app/components/DepositWithdraw/BitKapital.jsx
index 85a9b0da33..335a5f7a67 100644
--- a/app/components/DepositWithdraw/BitKapital.jsx
+++ b/app/components/DepositWithdraw/BitKapital.jsx
@@ -11,7 +11,6 @@ import utils from "common/utils";
 import SettingsStore from "stores/SettingsStore";
 
 class BitKapital extends React.Component {
-
     static propTypes = {
         jianjolly: ChainTypes.ChainAccount.isRequired,
         onay: ChainTypes.ChainAccount.isRequired,
@@ -37,26 +36,30 @@ class BitKapital extends React.Component {
     }
 
     _renderDeposits() {
- //       return <iframe
- //           style={{width: "100%", border: 0, minHeight: 800}}
- //           src={"https://bitkapital.com/kapital.html?u=" + this.props.account.get("name") + `&theme=${SettingsStore.getState().settings.get("themes")}`}
- //       >
- //       </iframe>;
-
-	// interim maintenance tout per issue #341 
-	return 
-		<div style={{width: "100%", border: 0, minHeight: 600}}>
-		Onarim / Under Maintenance 
-		</div>;
+        //       return <iframe
+        //           style={{width: "100%", border: 0, minHeight: 800}}
+        //           src={"https://bitkapital.com/kapital.html?u=" + this.props.account.get("name") + `&theme=${SettingsStore.getState().settings.get("themes")}`}
+        //       >
+        //       </iframe>;
+
+        // interim maintenance tout per issue #341
+        return;
+        <div style={{width: "100%", border: 0, minHeight: 600}}>
+            Onarim / Under Maintenance
+        </div>;
     }
 
     _renderWithdrawals() {
         return (
             <form onSubmit={this._onSubmit.bind(this)}>
-
                 <div style={{padding: "20px 0"}}>
-                    <Translate content="gateway.balance" />:
-                    &nbsp;<span style={{fontWeight: "bold", color: "#4A90E2", textAlign: "right"}}>
+                    <Translate content="gateway.balance" />: &nbsp;<span
+                        style={{
+                            fontWeight: "bold",
+                            color: "#4A90E2",
+                            textAlign: "right"
+                        }}
+                    >
                         <AccountBalance
                             account={this.props.account.get("name")}
                             asset={this.props.asset.get("symbol")}
@@ -64,15 +67,26 @@ class BitKapital extends React.Component {
                     </span>
                 </div>
 
-                <label><Translate content="exchange.quantity" />
-                    <input ref="amount" required id="amount" type="number" min={this.state.min} max={this.state.max}></input>
+                <label>
+                    <Translate content="exchange.quantity" />
+                    <input
+                        ref="amount"
+                        required
+                        id="amount"
+                        type="number"
+                        min={this.state.min}
+                        max={this.state.max}
+                    />
                 </label>
 
-                <label><Translate content="gateway.iban" />
-                    <input ref="iban" required id="iban" type="text"></input>
+                <label>
+                    <Translate content="gateway.iban" />
+                    <input ref="iban" required id="iban" type="text" />
                 </label>
 
-                <button className="button" type="submit"><Translate content="gateway.withdraw_now" /></button>
+                <button className="button" type="submit">
+                    <Translate content="gateway.withdraw_now" />
+                </button>
             </form>
         );
     }
@@ -109,15 +123,18 @@ class BitKapital extends React.Component {
             asset.get("id"), // bitkapital asset id
             new Buffer("BOZDURMA - " + iban.toUpperCase(), "utf-8"), // memo
             null, // propose set to false
-            asset.get("id"), // Pay fee with KAPITAL
-        ).then( () => {
+            asset.get("id") // Pay fee with KAPITAL
+        ).then(() => {
             TransactionConfirmStore.unlisten(this.onTrxIncluded);
             TransactionConfirmStore.listen(this.onTrxIncluded);
         });
     }
 
     onTrxIncluded(confirm_store_state) {
-        if(confirm_store_state.included && confirm_store_state.broadcasted_transaction) {
+        if (
+            confirm_store_state.included &&
+            confirm_store_state.broadcasted_transaction
+        ) {
             // this.setState(Transfer.getInitialState());
             TransactionConfirmStore.unlisten(this.onTrxIncluded);
             TransactionConfirmStore.reset();
@@ -127,7 +144,6 @@ class BitKapital extends React.Component {
         }
     }
 
-
     render() {
         let {jianjolly, onay, account} = this.props;
         let {action} = this.state;
@@ -136,11 +152,30 @@ class BitKapital extends React.Component {
         return (
             <div className="BitKapital">
                 <div className="content-block">
-                <div style={{paddingBottom: 15}}>
-                    <div style={{marginRight: 10}} onClick={this.changeAction.bind(this, "deposit")} className={cnames("button", action === "deposit" ? "active" : "outline")}><Translate content="gateway.deposit" /></div>
-                    <div onClick={this.changeAction.bind(this, "withdraw")} className={cnames("button", action === "withdraw" ? "active" : "outline")}><Translate content="gateway.withdraw" /></div>
-                </div>
-                {action === "deposit" ? this._renderDeposits() : this._renderWithdrawals()}
+                    <div style={{paddingBottom: 15}}>
+                        <div
+                            style={{marginRight: 10}}
+                            onClick={this.changeAction.bind(this, "deposit")}
+                            className={cnames(
+                                "button",
+                                action === "deposit" ? "active" : "outline"
+                            )}
+                        >
+                            <Translate content="gateway.deposit" />
+                        </div>
+                        <div
+                            onClick={this.changeAction.bind(this, "withdraw")}
+                            className={cnames(
+                                "button",
+                                action === "withdraw" ? "active" : "outline"
+                            )}
+                        >
+                            <Translate content="gateway.withdraw" />
+                        </div>
+                    </div>
+                    {action === "deposit"
+                        ? this._renderDeposits()
+                        : this._renderWithdrawals()}
                 </div>
             </div>
         );
diff --git a/app/components/DepositWithdraw/WithdrawModal.jsx b/app/components/DepositWithdraw/WithdrawModal.jsx
index 947b6f233d..b4899ade8b 100644
--- a/app/components/DepositWithdraw/WithdrawModal.jsx
+++ b/app/components/DepositWithdraw/WithdrawModal.jsx
@@ -10,7 +10,6 @@ import AmountSelector from "components/Utility/AmountSelector";
 import AccountActions from "actions/AccountActions";
 
 class WithdrawModal extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired,
         issuer: ChainTypes.ChainAccount.isRequired,
@@ -18,28 +17,28 @@ class WithdrawModal extends React.Component {
         receive_asset_name: React.PropTypes.string,
         receive_asset_symbol: React.PropTypes.string,
         memo_prefix: React.PropTypes.string
-    }
+    };
 
-    constructor( props ) {
+    constructor(props) {
         super(props);
         this.state = {
-            withdraw_amount:null,
-            withdraw_address:null
+            withdraw_amount: null,
+            withdraw_address: null
         };
     }
 
-    onWithdrawAmountChange( {amount} ) {
-        this.setState( {withdraw_amount:amount} );
+    onWithdrawAmountChange({amount}) {
+        this.setState({withdraw_amount: amount});
     }
 
-    onWithdrawAddressChanged( e ) {
-        this.setState( {withdraw_address:e.target.value} );
+    onWithdrawAddressChanged(e) {
+        this.setState({withdraw_address: e.target.value});
     }
 
     onSubmit() {
         let asset = this.props.asset;
         let precision = utils.get_asset_precision(asset.get("precision"));
-        let amount = this.state.withdraw_amount.replace( /,/g, "" );
+        let amount = this.state.withdraw_amount.replace(/,/g, "");
         AccountActions.transfer(
             this.props.account.get("id"),
             this.props.issuer.get("id"),
@@ -58,47 +57,80 @@ class WithdrawModal extends React.Component {
 
         if (asset_types.length > 0) {
             let current_asset_id = this.props.asset.get("id");
-            if( current_asset_id )
-                balance = (<span><Translate component="span" content="transfer.available"/>: <BalanceComponent balance={account_balances[current_asset_id]}/></span>);
-            else
-                balance = "No funds";
+            if (current_asset_id)
+                balance = (
+                    <span>
+                        <Translate
+                            component="span"
+                            content="transfer.available"
+                        />:{" "}
+                        <BalanceComponent
+                            balance={account_balances[current_asset_id]}
+                        />
+                    </span>
+                );
+            else balance = "No funds";
         } else {
             balance = "No funds";
         }
 
-        return (<form className="grid-block vertical full-width-content">
-                 <div className="grid-container">
-                   <div className="content-block">
-                      <h3>Withdraw {this.props.receive_asset_name}({this.props.receive_asset_symbol})</h3>
-                   </div>
-                   <div className="content-block">
-                     <AmountSelector label="modal.withdraw.amount"
-                                     amount={this.state.withdraw_amount}
-                                     asset={this.props.asset.get("id")}
-                                     assets={[this.props.asset.get("id")]}
-                                     placeholder="0.0"
-                                     onChange={this.onWithdrawAmountChange.bind(this)}
-                                     display_balance={balance}
-                                     />
-                   </div>
-                   <div className="content-block full-width-content">
-                       <label><Translate component="span" content="modal.withdraw.address"/></label>
-                       <input type="text" value={this.state.withdraw_address} tabIndex="4" onChange={this.onWithdrawAddressChanged.bind(this)} autoComplete="off"/>
-                       {/*<div>{memo_error}</div>*/}
-                   </div>
+        return (
+            <form className="grid-block vertical full-width-content">
+                <div className="grid-container">
+                    <div className="content-block">
+                        <h3>
+                            Withdraw {this.props.receive_asset_name}({
+                                this.props.receive_asset_symbol
+                            })
+                        </h3>
+                    </div>
+                    <div className="content-block">
+                        <AmountSelector
+                            label="modal.withdraw.amount"
+                            amount={this.state.withdraw_amount}
+                            asset={this.props.asset.get("id")}
+                            assets={[this.props.asset.get("id")]}
+                            placeholder="0.0"
+                            onChange={this.onWithdrawAmountChange.bind(this)}
+                            display_balance={balance}
+                        />
+                    </div>
+                    <div className="content-block full-width-content">
+                        <label>
+                            <Translate
+                                component="span"
+                                content="modal.withdraw.address"
+                            />
+                        </label>
+                        <input
+                            type="text"
+                            value={this.state.withdraw_address}
+                            tabIndex="4"
+                            onChange={this.onWithdrawAddressChanged.bind(this)}
+                            autoComplete="off"
+                        />
+                        {/*<div>{memo_error}</div>*/}
+                    </div>
 
-                   <div className="content-block">
-                     <input type="submit" className="button"
+                    <div className="content-block">
+                        <input
+                            type="submit"
+                            className="button"
                             onClick={this.onSubmit.bind(this)}
-                            value={counterpart.translate("modal.withdraw.submit")} />
-                       <Trigger close={this.props.modal_id}>
-                           <div className="button"><Translate content="account.perm.cancel" /></div>
-                       </Trigger>
-                   </div>
-                 </div>
-               </form>);
+                            value={counterpart.translate(
+                                "modal.withdraw.submit"
+                            )}
+                        />
+                        <Trigger close={this.props.modal_id}>
+                            <div className="button">
+                                <Translate content="account.perm.cancel" />
+                            </div>
+                        </Trigger>
+                    </div>
+                </div>
+            </form>
+        );
     }
+}
 
-};
-
-export default BindToChainState(WithdrawModal, {keep_updating:true});
+export default BindToChainState(WithdrawModal, {keep_updating: true});
diff --git a/app/components/Exchange/ConfirmOrderModal.jsx b/app/components/Exchange/ConfirmOrderModal.jsx
index 2f8a731ec5..2528ceea1c 100644
--- a/app/components/Exchange/ConfirmOrderModal.jsx
+++ b/app/components/Exchange/ConfirmOrderModal.jsx
@@ -5,7 +5,6 @@ import utils from "common/utils";
 import Translate from "react-translate-component";
 
 export default class ConfirmModal extends React.Component {
-
     show() {
         let modalId = "modal_confirm_" + this.props.type;
         ZfApi.publish(modalId, "open");
@@ -26,12 +25,29 @@ export default class ConfirmModal extends React.Component {
             <BaseModal id={"modal_confirm_" + type} overlay={true}>
                 <Translate component="h3" content="transaction.confirm" />
                 <div className="grid-block vertical">
-                    {!hasOrders ?
-                        <Translate content={"exchange.confirm_no_orders_" + type} />
-                    : <Translate content={"exchange.confirm_" + type} diff={utils.format_number(diff, 2)} />}
+                    {!hasOrders ? (
+                        <Translate
+                            content={"exchange.confirm_no_orders_" + type}
+                        />
+                    ) : (
+                        <Translate
+                            content={"exchange.confirm_" + type}
+                            diff={utils.format_number(diff, 2)}
+                        />
+                    )}
                     <div className="button-group" style={{paddingTop: "2rem"}}>
-                        <input onClick={this._onForce.bind(this, true)} className="button success" type="submit" value="Yes" />
-                        <input onClick={this._onForce.bind(this, false)} className="button info" type="submit" value="No" />
+                        <input
+                            onClick={this._onForce.bind(this, true)}
+                            className="button success"
+                            type="submit"
+                            value="Yes"
+                        />
+                        <input
+                            onClick={this._onForce.bind(this, false)}
+                            className="button info"
+                            type="submit"
+                            value="No"
+                        />
                     </div>
                 </div>
             </BaseModal>
diff --git a/app/components/Exchange/ExchangeContainer.jsx b/app/components/Exchange/ExchangeContainer.jsx
index 657e8fc928..2eadfe26b4 100644
--- a/app/components/Exchange/ExchangeContainer.jsx
+++ b/app/components/Exchange/ExchangeContainer.jsx
@@ -7,104 +7,122 @@ import WalletUnlockStore from "stores/WalletUnlockStore";
 import AltContainer from "alt-container";
 import Exchange from "./Exchange";
 import ChainTypes from "../Utility/ChainTypes";
-import { EmitterInstance } from "bitsharesjs/es";
+import {EmitterInstance} from "bitsharesjs/es";
 import BindToChainState from "../Utility/BindToChainState";
 import MarketsActions from "actions/MarketsActions";
 
 class ExchangeContainer extends React.Component {
-
     render() {
         let symbols = this.props.params.marketID.split("_");
 
         return (
-                <AltContainer
-                    stores={[MarketsStore, AccountStore, SettingsStore,WalletUnlockStore]}
-                    inject={{
-                        lockedWalletState: () => {
-                            return WalletUnlockStore.getState().locked;
-                        },
-                        marketLimitOrders: () => {
-                            return MarketsStore.getState().marketLimitOrders;
-                        },
-                        marketCallOrders: () => {
-                            return MarketsStore.getState().marketCallOrders;
-                        },
-                        invertedCalls: () => {
-                            return MarketsStore.getState().invertedCalls;
-                        },
-                        marketSettleOrders: () => {
-                            return MarketsStore.getState().marketSettleOrders;
-                        },
-                        marketData: () => {
-                            return MarketsStore.getState().marketData;
-                        },
-                        totals: () => {
-                            return MarketsStore.getState().totals;
-                        },
-                        priceData: () => {
-                            return MarketsStore.getState().priceData;
-                        },
-                        volumeData: () => {
-                            return MarketsStore.getState().volumeData;
-                        },
-                        activeMarketHistory: () => {
-                            return MarketsStore.getState().activeMarketHistory;
-                        },
-                        bucketSize: () => {
-                            return MarketsStore.getState().bucketSize;
-                        },
-                        buckets: () => {
-                            return MarketsStore.getState().buckets;
-                        },
-                        lowestCallPrice: () => {
-                            return MarketsStore.getState().lowestCallPrice;
-                        },
-                        feedPrice: () => {
-                            return MarketsStore.getState().feedPrice;
-                        },
-                        currentAccount: () => {
-                            return AccountStore.getState().currentAccount;
-                        },
-                        linkedAccounts: () => {
-                            return AccountStore.getState().linkedAccounts;
-                        },
-                        viewSettings: () => {
-                            return SettingsStore.getState().viewSettings;
-                        },
-                        settings: () => {
-                            return SettingsStore.getState().settings;
-                        },
-                        starredMarkets: () => {
-                            return SettingsStore.getState().starredMarkets;
-                        },
-                        marketDirections: () => {
-                            return SettingsStore.getState().marketDirections;
-                        },
-                        marketStats: () => {
-                            return MarketsStore.getState().marketStats;
-                        },
-                        marketReady: () => {
-                            return MarketsStore.getState().marketReady;
-                        },
-                        backedCoins: () => {
-                            return GatewayStore.getState().backedCoins.get("OPEN", []);
-                        },
-                        bridgeCoins: () => {
-                            return GatewayStore.getState().bridgeCoins;
-                        },
-                        miniDepthChart: () => {
-                            return SettingsStore.getState().viewSettings.get("miniDepthChart", true);
-                        }
-                    }}
-                  >
-                    <ExchangeSubscriber router={this.props.router} quoteAsset={symbols[0]} baseAsset={symbols[1]} />
-                </AltContainer>
+            <AltContainer
+                stores={[
+                    MarketsStore,
+                    AccountStore,
+                    SettingsStore,
+                    WalletUnlockStore
+                ]}
+                inject={{
+                    lockedWalletState: () => {
+                        return WalletUnlockStore.getState().locked;
+                    },
+                    marketLimitOrders: () => {
+                        return MarketsStore.getState().marketLimitOrders;
+                    },
+                    marketCallOrders: () => {
+                        return MarketsStore.getState().marketCallOrders;
+                    },
+                    invertedCalls: () => {
+                        return MarketsStore.getState().invertedCalls;
+                    },
+                    marketSettleOrders: () => {
+                        return MarketsStore.getState().marketSettleOrders;
+                    },
+                    marketData: () => {
+                        return MarketsStore.getState().marketData;
+                    },
+                    totals: () => {
+                        return MarketsStore.getState().totals;
+                    },
+                    priceData: () => {
+                        return MarketsStore.getState().priceData;
+                    },
+                    volumeData: () => {
+                        return MarketsStore.getState().volumeData;
+                    },
+                    activeMarketHistory: () => {
+                        return MarketsStore.getState().activeMarketHistory;
+                    },
+                    bucketSize: () => {
+                        return MarketsStore.getState().bucketSize;
+                    },
+                    buckets: () => {
+                        return MarketsStore.getState().buckets;
+                    },
+                    lowestCallPrice: () => {
+                        return MarketsStore.getState().lowestCallPrice;
+                    },
+                    feedPrice: () => {
+                        return MarketsStore.getState().feedPrice;
+                    },
+                    currentAccount: () => {
+                        return AccountStore.getState().currentAccount;
+                    },
+                    linkedAccounts: () => {
+                        return AccountStore.getState().linkedAccounts;
+                    },
+                    viewSettings: () => {
+                        return SettingsStore.getState().viewSettings;
+                    },
+                    settings: () => {
+                        return SettingsStore.getState().settings;
+                    },
+                    starredMarkets: () => {
+                        return SettingsStore.getState().starredMarkets;
+                    },
+                    marketDirections: () => {
+                        return SettingsStore.getState().marketDirections;
+                    },
+                    marketStats: () => {
+                        return MarketsStore.getState().marketStats;
+                    },
+                    marketReady: () => {
+                        return MarketsStore.getState().marketReady;
+                    },
+                    backedCoins: () => {
+                        return GatewayStore.getState().backedCoins.get(
+                            "OPEN",
+                            []
+                        );
+                    },
+                    bridgeCoins: () => {
+                        return GatewayStore.getState().bridgeCoins;
+                    },
+                    miniDepthChart: () => {
+                        return SettingsStore.getState().viewSettings.get(
+                            "miniDepthChart",
+                            true
+                        );
+                    }
+                }}
+            >
+                <ExchangeSubscriber
+                    router={this.props.router}
+                    quoteAsset={symbols[0]}
+                    baseAsset={symbols[1]}
+                />
+            </AltContainer>
         );
     }
 }
 
 let emitter = EmitterInstance();
-let callListener, limitListener, newCallListener, feedUpdateListener, settleOrderListener;
+let callListener,
+    limitListener,
+    newCallListener,
+    feedUpdateListener,
+    settleOrderListener;
 
 class ExchangeSubscriber extends React.Component {
     static propTypes = {
@@ -131,32 +149,64 @@ class ExchangeSubscriber extends React.Component {
             this._subToMarket(this.props);
             // this._addMarket(this.props.quoteAsset.get("symbol"), this.props.baseAsset.get("symbol"));
         }
-        
-        emitter.on("cancel-order", limitListener = MarketsActions.cancelLimitOrderSuccess);
-        emitter.on("close-call", callListener = MarketsActions.closeCallOrderSuccess);
-
-        emitter.on("call-order-update", newCallListener = (call_order) => {
-            let {asset_id: coBase} = call_order.call_price.base;
-            let {asset_id: coQuote} = call_order.call_price.quote;
-            let baseId = this.props.baseAsset.get("id"), quoteId = this.props.quoteAsset.get("id");
-            if ((coBase === baseId || coBase === quoteId) && (coQuote === baseId || coQuote === quoteId)) {
-                MarketsActions.callOrderUpdate(call_order);
-            }
-        });
-        emitter.on("bitasset-update", feedUpdateListener = MarketsActions.feedUpdate);
-        emitter.on("settle-order-update", settleOrderListener = (object) => {
-            let {isMarketAsset, marketAsset} = market_utils.isMarketAsset(this.props.quoteAsset, this.props.baseAsset);
 
-            if (isMarketAsset && marketAsset.id === object.balance.asset_id) {
-                MarketsActions.settleOrderUpdate(marketAsset.id);
-            }
-        });
+        emitter.on(
+            "cancel-order",
+            (limitListener = MarketsActions.cancelLimitOrderSuccess)
+        );
+        emitter.on(
+            "close-call",
+            (callListener = MarketsActions.closeCallOrderSuccess)
+        );
+
+        emitter.on(
+            "call-order-update",
+            (newCallListener = call_order => {
+                let {asset_id: coBase} = call_order.call_price.base;
+                let {asset_id: coQuote} = call_order.call_price.quote;
+                let baseId = this.props.baseAsset.get("id"),
+                    quoteId = this.props.quoteAsset.get("id");
+                if (
+                    (coBase === baseId || coBase === quoteId) &&
+                    (coQuote === baseId || coQuote === quoteId)
+                ) {
+                    MarketsActions.callOrderUpdate(call_order);
+                }
+            })
+        );
+        emitter.on(
+            "bitasset-update",
+            (feedUpdateListener = MarketsActions.feedUpdate)
+        );
+        emitter.on(
+            "settle-order-update",
+            (settleOrderListener = object => {
+                let {isMarketAsset, marketAsset} = market_utils.isMarketAsset(
+                    this.props.quoteAsset,
+                    this.props.baseAsset
+                );
+
+                if (
+                    isMarketAsset &&
+                    marketAsset.id === object.balance.asset_id
+                ) {
+                    MarketsActions.settleOrderUpdate(marketAsset.id);
+                }
+            })
+        );
     }
 
     componentWillReceiveProps(nextProps) {
         /* Prediction markets should only be shown in one direction, if the link goes to the wrong one we flip it */
-        if (nextProps.baseAsset && nextProps.baseAsset.getIn(["bitasset", "is_prediction_market"])) {
-            this.props.router.push(`/market/${nextProps.baseAsset.get("symbol")}_${nextProps.quoteAsset.get("symbol")}`);
+        if (
+            nextProps.baseAsset &&
+            nextProps.baseAsset.getIn(["bitasset", "is_prediction_market"])
+        ) {
+            this.props.router.push(
+                `/market/${nextProps.baseAsset.get(
+                    "symbol"
+                )}_${nextProps.quoteAsset.get("symbol")}`
+            );
         }
 
         if (nextProps.quoteAsset && nextProps.baseAsset) {
@@ -165,17 +215,27 @@ class ExchangeSubscriber extends React.Component {
             }
         }
 
-        if (nextProps.quoteAsset.get("symbol") !== this.props.quoteAsset.get("symbol") || nextProps.baseAsset.get("symbol") !== this.props.baseAsset.get("symbol")) {
+        if (
+            nextProps.quoteAsset.get("symbol") !==
+                this.props.quoteAsset.get("symbol") ||
+            nextProps.baseAsset.get("symbol") !==
+                this.props.baseAsset.get("symbol")
+        ) {
             let currentSub = this.state.sub.split("_");
-            MarketsActions.unSubscribeMarket(currentSub[0], currentSub[1]).then(() => {
-                this._subToMarket(nextProps);
-            });
+            MarketsActions.unSubscribeMarket(currentSub[0], currentSub[1]).then(
+                () => {
+                    this._subToMarket(nextProps);
+                }
+            );
         }
     }
 
     componentWillUnmount() {
-        let { quoteAsset, baseAsset } = this.props;
-        MarketsActions.unSubscribeMarket(quoteAsset.get("id"), baseAsset.get("id"));
+        let {quoteAsset, baseAsset} = this.props;
+        MarketsActions.unSubscribeMarket(
+            quoteAsset.get("id"),
+            baseAsset.get("id")
+        );
         if (emitter) {
             emitter.off("cancel-order", limitListener);
             emitter.off("close-call", callListener);
@@ -186,24 +246,39 @@ class ExchangeSubscriber extends React.Component {
     }
 
     _subToMarket(props, newBucketSize) {
-        let { quoteAsset, baseAsset, bucketSize } = props;
+        let {quoteAsset, baseAsset, bucketSize} = props;
         if (newBucketSize) {
             bucketSize = newBucketSize;
         }
         if (quoteAsset.get("id") && baseAsset.get("id")) {
-            MarketsActions.subscribeMarket.defer(baseAsset, quoteAsset, bucketSize);
-            this.setState({ sub: `${quoteAsset.get("id")}_${baseAsset.get("id")}` });
+            MarketsActions.subscribeMarket.defer(
+                baseAsset,
+                quoteAsset,
+                bucketSize
+            );
+            this.setState({
+                sub: `${quoteAsset.get("id")}_${baseAsset.get("id")}`
+            });
         }
     }
-                
 
     render() {
         return (
-            <Exchange {...this.props} sub={this.state.sub} subToMarket={this._subToMarket} isMyAccount={AccountStore.isMyAccount(this.props.currentAccount)}/>
+            <Exchange
+                {...this.props}
+                sub={this.state.sub}
+                subToMarket={this._subToMarket}
+                isMyAccount={AccountStore.isMyAccount(
+                    this.props.currentAccount
+                )}
+            />
         );
     }
 }
 
-ExchangeSubscriber = BindToChainState(ExchangeSubscriber, {keep_updating: true, show_loader: true});
+ExchangeSubscriber = BindToChainState(ExchangeSubscriber, {
+    keep_updating: true,
+    show_loader: true
+});
 
 export default ExchangeContainer;
diff --git a/app/components/Exchange/ExchangeHeaderCollateral.jsx b/app/components/Exchange/ExchangeHeaderCollateral.jsx
index ef1ff2abee..427a8bffd2 100644
--- a/app/components/Exchange/ExchangeHeaderCollateral.jsx
+++ b/app/components/Exchange/ExchangeHeaderCollateral.jsx
@@ -7,37 +7,59 @@ import counterpart from "counterpart";
 import Translate from "react-translate-component";
 
 class MarginPosition extends React.Component {
-
     static propTypes = {
         debtAsset: ChainTypes.ChainAsset.isRequired,
         collateralAsset: ChainTypes.ChainAsset.isRequired
     };
 
     _getFeedPrice() {
-
         if (!this.props) {
             return 1;
         }
 
-        return 1 / utils.get_asset_price(
-            this.props.debtAsset.getIn(["bitasset", "current_feed", "settlement_price", "quote", "amount"]),
-            this.props.collateralAsset,
-            this.props.debtAsset.getIn(["bitasset", "current_feed", "settlement_price", "base", "amount"]),
-            this.props.debtAsset
+        return (
+            1 /
+            utils.get_asset_price(
+                this.props.debtAsset.getIn([
+                    "bitasset",
+                    "current_feed",
+                    "settlement_price",
+                    "quote",
+                    "amount"
+                ]),
+                this.props.collateralAsset,
+                this.props.debtAsset.getIn([
+                    "bitasset",
+                    "current_feed",
+                    "settlement_price",
+                    "base",
+                    "amount"
+                ]),
+                this.props.debtAsset
+            )
         );
     }
 
     _getCollateralRatio() {
         const co = this.props.object.toJS();
-        const c = utils.get_asset_amount(co.collateral, this.props.collateralAsset);
+        const c = utils.get_asset_amount(
+            co.collateral,
+            this.props.collateralAsset
+        );
         const d = utils.get_asset_amount(co.debt, this.props.debtAsset);
         return c / (d / this._getFeedPrice());
     }
-    
+
     _getMR() {
-        return this.props.debtAsset.getIn(["bitasset", "current_feed", "maintenance_collateral_ratio"]) / 1000;
+        return (
+            this.props.debtAsset.getIn([
+                "bitasset",
+                "current_feed",
+                "maintenance_collateral_ratio"
+            ]) / 1000
+        );
     }
-    
+
     _getStatusClass() {
         let cr = this._getCollateralRatio();
         const mr = this._getMR();
@@ -45,7 +67,7 @@ class MarginPosition extends React.Component {
         if (isNaN(cr)) return null;
         if (cr < mr) {
             return "danger";
-        } else if (cr < (mr + 0.5)) {
+        } else if (cr < mr + 0.5) {
             return "warning";
         } else {
             return "";
@@ -71,17 +93,25 @@ class MarginPosition extends React.Component {
         const co = object.toJS();
         const cr = this._getCollateralRatio();
         const d = utils.get_asset_amount(co.debt, this.props.debtAsset);
-        
+
         const statusClass = this._getStatusClass();
 
-        return (<li className={cnames("stressed-stat", this.props.className)} onClick={this.props.onClick} data-place="bottom" data-tip={this._getCRTip()}>
-                    <span>
-                        <span className={cnames("value stat-primary",statusClass)}>
-                            {utils.format_number(cr, 2)}
-                        </span>
+        return (
+            <li
+                className={cnames("stressed-stat", this.props.className)}
+                onClick={this.props.onClick}
+                data-place="bottom"
+                data-tip={this._getCRTip()}
+            >
+                <span>
+                    <span className={cnames("value stat-primary", statusClass)}>
+                        {utils.format_number(cr, 2)}
                     </span>
-                    <div className="stat-text"><Translate content="header.collateral_ratio" /></div>
-                </li>
+                </span>
+                <div className="stat-text">
+                    <Translate content="header.collateral_ratio" />
+                </div>
+            </li>
         );
     }
 }
@@ -94,18 +124,22 @@ class ExchangeHeaderCollateral extends React.Component {
 
     render() {
         let {object, account} = this.props;
-        
+
         let debtAsset = object.getIn(["call_price", "quote", "asset_id"]);
         let collateralAsset = object.getIn(["call_price", "base", "asset_id"]);
 
-        return <MarginPosition 
-                    debtAsset={debtAsset} 
-                    collateralAsset={collateralAsset} 
-                    account={account}
-                    {...this.props} />;
+        return (
+            <MarginPosition
+                debtAsset={debtAsset}
+                collateralAsset={collateralAsset}
+                account={account}
+                {...this.props}
+            />
+        );
     }
 }
-ExchangeHeaderCollateral = BindToChainState(ExchangeHeaderCollateral, {keep_updating: true});
+ExchangeHeaderCollateral = BindToChainState(ExchangeHeaderCollateral, {
+    keep_updating: true
+});
 
 export default ExchangeHeaderCollateral;
-
diff --git a/app/components/Exchange/ExchangeInput.jsx b/app/components/Exchange/ExchangeInput.jsx
index b49319a339..31e6d89a56 100644
--- a/app/components/Exchange/ExchangeInput.jsx
+++ b/app/components/Exchange/ExchangeInput.jsx
@@ -1,43 +1,33 @@
 import React from "react";
 
 export class DecimalChecker extends React.Component {
-    
-   
-    
     onPaste(e) {
-        
         var pasteValue = e.clipboardData.getData("text");
 
         var decimal = pasteValue.match(/\./g);
         var decimalCount = decimal ? decimal.length : 0;
-        if (decimalCount > 1)
-            e.preventDefault();
-        if (parseFloat(pasteValue) != pasteValue)
-            e.preventDefault();
-
+        if (decimalCount > 1) e.preventDefault();
+        if (parseFloat(pasteValue) != pasteValue) e.preventDefault();
     }
 
     onKeyPress(e) {
-        if (!e.nativeEvent.ctrlKey) { // allow copy-paste
+        if (!e.nativeEvent.ctrlKey) {
+            // allow copy-paste
 
-            if (e.key === "." && e.target.value === "")
-                e.target.value = "0";
+            if (e.key === "." && e.target.value === "") e.target.value = "0";
             var nextValue = e.target.value + e.key;
             var decimal = nextValue.match(/\./g);
             var decimalCount = decimal ? decimal.length : 0;
-            if (e.key === "." && decimalCount > 1)
-                e.preventDefault();
-            if (parseFloat(nextValue) != nextValue)
-                e.preventDefault();
+            if (e.key === "." && decimalCount > 1) e.preventDefault();
+            if (parseFloat(nextValue) != nextValue) e.preventDefault();
 
-            if (this.props.onKeyPress)
-                this.props.onKeyPress(e);
+            if (this.props.onKeyPress) this.props.onKeyPress(e);
         }
     }
 }
 
 class ExchangeInput extends DecimalChecker {
-    constructor(){
+    constructor() {
         super();
     }
 
@@ -48,7 +38,15 @@ class ExchangeInput extends DecimalChecker {
     }
 
     render() {
-        return <input ref="input" type="text" {...this.props} onPaste={this.onPaste.bind(this)} onKeyPress={this.onKeyPress.bind(this)} />;
+        return (
+            <input
+                ref="input"
+                type="text"
+                {...this.props}
+                onPaste={this.onPaste.bind(this)}
+                onKeyPress={this.onKeyPress.bind(this)}
+            />
+        );
     }
 }
 
diff --git a/app/components/Exchange/IndicatorModal.jsx b/app/components/Exchange/IndicatorModal.jsx
index 2414b4df13..b4eee5aef5 100644
--- a/app/components/Exchange/IndicatorModal.jsx
+++ b/app/components/Exchange/IndicatorModal.jsx
@@ -5,7 +5,6 @@ import Trigger from "react-foundation-apps/src/trigger";
 import Translate from "react-translate-component";
 
 export default class IndicatorModal extends React.Component {
-
     show() {
         let modalId = "modal_indicators";
         ZfApi.publish(modalId, "open");
@@ -18,45 +17,82 @@ export default class IndicatorModal extends React.Component {
         // console.log("available:", available, "values:", indicators);
 
         let toggles = available.map((indicator, index) => {
-
             let indicatorKeys = Object.keys(indicatorSettings[indicator]);
 
             let options = indicatorKeys.map((setting, index) => {
                 return (
-                    <tr key={indicator + "_" + setting} style={{fontSize: "0.9rem"}}>
-                        <td style={index === indicatorKeys.length - 1 ? {} : {border: "none"}}>
+                    <tr
+                        key={indicator + "_" + setting}
+                        style={{fontSize: "0.9rem"}}
+                    >
+                        <td
+                            style={
+                                index === indicatorKeys.length - 1
+                                    ? {}
+                                    : {border: "none"}
+                            }
+                        >
                             <Translate content={"exchange." + setting} />
                         </td>
-                        <td style={index === indicatorKeys.length - 1 ? {} : {border: "none"}}>
+                        <td
+                            style={
+                                index === indicatorKeys.length - 1
+                                    ? {}
+                                    : {border: "none"}
+                            }
+                        >
                             <input
-                                onChange={this.props.onChangeSetting.bind(this, indicator, setting)}
+                                onChange={this.props.onChangeSetting.bind(
+                                    this,
+                                    indicator,
+                                    setting
+                                )}
                                 type="number"
                                 value={indicatorSettings[indicator][setting]}
-                                style={{fontSize: "0.9rem", height: "2rem", padding: "2px 8px"}}
+                                style={{
+                                    fontSize: "0.9rem",
+                                    height: "2rem",
+                                    padding: "2px 8px"
+                                }}
                             />
                         </td>
                     </tr>
-                )
+                );
             });
 
             return (
                 <table key={"table_" + indicator} className="table">
                     <tbody>
-                    <tr>
-                        <td style={{border: "none", width: "80%"}}><Translate style={{fontWeight: "bold"}} content={`exchange.${indicator}`} />:</td>
-                        <td style={{border: "none"}}>
-                            <div className="switch" style={{marginBottom: "10px"}} onClick={this.props.onChangeIndicator.bind(this, indicator)}>
-                                <input type="checkbox" checked={indicators[indicator]} onChange={() => {}} />
-                                <label />
-                            </div>
-                        </td>
-                    </tr>
-                    {indicators[indicator] ? options : null}
+                        <tr>
+                            <td style={{border: "none", width: "80%"}}>
+                                <Translate
+                                    style={{fontWeight: "bold"}}
+                                    content={`exchange.${indicator}`}
+                                />:
+                            </td>
+                            <td style={{border: "none"}}>
+                                <div
+                                    className="switch"
+                                    style={{marginBottom: "10px"}}
+                                    onClick={this.props.onChangeIndicator.bind(
+                                        this,
+                                        indicator
+                                    )}
+                                >
+                                    <input
+                                        type="checkbox"
+                                        checked={indicators[indicator]}
+                                        onChange={() => {}}
+                                    />
+                                    <label />
+                                </div>
+                            </td>
+                        </tr>
+                        {indicators[indicator] ? options : null}
                     </tbody>
                 </table>
-            )
-        })
-
+            );
+        });
 
         return (
             <BaseModal id={"modal_indicators"} overlay={true}>
@@ -65,7 +101,11 @@ export default class IndicatorModal extends React.Component {
                     {toggles}
                     <div className="button-group" style={{paddingTop: "2rem"}}>
                         <Trigger close={"modal_indicators"}>
-                            <input className="button success" type="submit" value="Close" />
+                            <input
+                                className="button success"
+                                type="submit"
+                                value="Close"
+                            />
                         </Trigger>
                     </div>
                 </div>
diff --git a/app/components/Exchange/MarketHistory.jsx b/app/components/Exchange/MarketHistory.jsx
index dc80e7f888..2d78ca2180 100644
--- a/app/components/Exchange/MarketHistory.jsx
+++ b/app/components/Exchange/MarketHistory.jsx
@@ -8,10 +8,10 @@ import PriceText from "../Utility/PriceText";
 import cnames from "classnames";
 import SettingsActions from "actions/SettingsActions";
 import SettingsStore from "stores/SettingsStore";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import TransitionWrapper from "../Utility/TransitionWrapper";
 import AssetName from "../Utility/AssetName";
-import { ChainTypes as grapheneChainTypes } from "bitsharesjs/es";
+import {ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 const {operations} = grapheneChainTypes;
 import BlockDate from "../Utility/BlockDate";
 import counterpart from "counterpart";
@@ -64,8 +64,16 @@ class MarketHistory extends React.Component {
     }
 
     render() {
-        let {history, myHistory, base, quote, baseSymbol, quoteSymbol, isNullAccount} = this.props;
-        let  {activeTab} = this.state;
+        let {
+            history,
+            myHistory,
+            base,
+            quote,
+            baseSymbol,
+            quoteSymbol,
+            isNullAccount
+        } = this.props;
+        let {activeTab} = this.state;
         let historyRows = null;
 
         if (isNullAccount) {
@@ -74,85 +82,120 @@ class MarketHistory extends React.Component {
 
         if (activeTab === "my_history" && (myHistory && myHistory.size)) {
             let keyIndex = -1;
-            let flipped = base.get("id").split(".")[2] > quote.get("id").split(".")[2];
-            historyRows = myHistory.filter(a => {
-                let opType = a.getIn(["op", 0]);
-                return (opType === operations.fill_order);
-            }).filter(a => {
-                let quoteID = quote.get("id");
-                let baseID = base.get("id");
-                let pays = a.getIn(["op", 1, "pays", "asset_id"]);
-                let receives = a.getIn(["op", 1, "receives", "asset_id"]);
-                let hasQuote = quoteID === pays || quoteID === receives;
-                let hasBase = baseID === pays || baseID === receives;
-                return hasQuote && hasBase;
-            })
-            .sort((a, b) => {
-                return b.get("block_num") - a.get("block_num");
-            })
-            .map(trx => {
-                let order  = trx.toJS().op[1];
-                keyIndex++;
-                let paysAsset, receivesAsset, isAsk = false;
-                if (order.pays.asset_id === base.get("id")) {
-                    paysAsset = base;
-                    receivesAsset = quote;
-                    isAsk = true;
-
-                } else {
-                    paysAsset = quote;
-                    receivesAsset = base;
-                }
-
-                let parsed_order = market_utils.parse_order_history(order, paysAsset, receivesAsset, isAsk, flipped);
-                const block_num = trx.get("block_num");
-                return (
-                    <tr key={"my_history_" + keyIndex}>
-                        <td className={parsed_order.className}>
-                            <PriceText preFormattedPrice={parsed_order} />
-                        </td>
-                        <td>{parsed_order.receives}</td>
-                        <td>{parsed_order.pays}</td>
-                        <BlockDate component="td" block_number={block_num} tooltip />
-                    </tr>
-                );
-            }).toArray();
+            let flipped =
+                base.get("id").split(".")[2] > quote.get("id").split(".")[2];
+            historyRows = myHistory
+                .filter(a => {
+                    let opType = a.getIn(["op", 0]);
+                    return opType === operations.fill_order;
+                })
+                .filter(a => {
+                    let quoteID = quote.get("id");
+                    let baseID = base.get("id");
+                    let pays = a.getIn(["op", 1, "pays", "asset_id"]);
+                    let receives = a.getIn(["op", 1, "receives", "asset_id"]);
+                    let hasQuote = quoteID === pays || quoteID === receives;
+                    let hasBase = baseID === pays || baseID === receives;
+                    return hasQuote && hasBase;
+                })
+                .sort((a, b) => {
+                    return b.get("block_num") - a.get("block_num");
+                })
+                .map(trx => {
+                    let order = trx.toJS().op[1];
+                    keyIndex++;
+                    let paysAsset,
+                        receivesAsset,
+                        isAsk = false;
+                    if (order.pays.asset_id === base.get("id")) {
+                        paysAsset = base;
+                        receivesAsset = quote;
+                        isAsk = true;
+                    } else {
+                        paysAsset = quote;
+                        receivesAsset = base;
+                    }
+
+                    let parsed_order = market_utils.parse_order_history(
+                        order,
+                        paysAsset,
+                        receivesAsset,
+                        isAsk,
+                        flipped
+                    );
+                    const block_num = trx.get("block_num");
+                    return (
+                        <tr key={"my_history_" + keyIndex}>
+                            <td className={parsed_order.className}>
+                                <PriceText preFormattedPrice={parsed_order} />
+                            </td>
+                            <td>{parsed_order.receives}</td>
+                            <td>{parsed_order.pays}</td>
+                            <BlockDate
+                                component="td"
+                                block_number={block_num}
+                                tooltip
+                            />
+                        </tr>
+                    );
+                })
+                .toArray();
         } else if (history && history.size) {
             let index = 0;
             let keyIndex = -1;
-            let flipped = base.get("id").split(".")[2] > quote.get("id").split(".")[2];
+            let flipped =
+                base.get("id").split(".")[2] > quote.get("id").split(".")[2];
             historyRows = this.props.history
-            .filter(() => {
-                index++;
-                return index % 2 === 0;
-            })
-            .take(100)
-            .map(order => {
-                keyIndex++;
-                let paysAsset, receivesAsset, isAsk = false;
-                if (order.pays.asset_id === base.get("id")) {
-                    paysAsset = base;
-                    receivesAsset = quote;
-                    isAsk = true;
-
-                } else {
-                    paysAsset = quote;
-                    receivesAsset = base;
-                }
-                let parsed_order = market_utils.parse_order_history(order, paysAsset, receivesAsset, isAsk, flipped);
-                return (
-                    <tr key={"history_" + keyIndex}>
-                        <td className={parsed_order.className}>
-                            <PriceText preFormattedPrice={parsed_order} />
-                        </td>
-                        <td>{parsed_order.receives}</td>
-                        <td>{parsed_order.pays}</td>
-                        <td className="tooltip" data-tip={new Date(order.time)}>
-                            {counterpart.localize(new Date(order.time), {type: "date", format: getLocale().toLowerCase().indexOf("en-us") !== -1 ? "market_history_us": "market_history"})}
-                        </td>
-                    </tr>
-                );
-            }).toArray();
+                .filter(() => {
+                    index++;
+                    return index % 2 === 0;
+                })
+                .take(100)
+                .map(order => {
+                    keyIndex++;
+                    let paysAsset,
+                        receivesAsset,
+                        isAsk = false;
+                    if (order.pays.asset_id === base.get("id")) {
+                        paysAsset = base;
+                        receivesAsset = quote;
+                        isAsk = true;
+                    } else {
+                        paysAsset = quote;
+                        receivesAsset = base;
+                    }
+                    let parsed_order = market_utils.parse_order_history(
+                        order,
+                        paysAsset,
+                        receivesAsset,
+                        isAsk,
+                        flipped
+                    );
+                    return (
+                        <tr key={"history_" + keyIndex}>
+                            <td className={parsed_order.className}>
+                                <PriceText preFormattedPrice={parsed_order} />
+                            </td>
+                            <td>{parsed_order.receives}</td>
+                            <td>{parsed_order.pays}</td>
+                            <td
+                                className="tooltip"
+                                data-tip={new Date(order.time)}
+                            >
+                                {counterpart.localize(new Date(order.time), {
+                                    type: "date",
+                                    format:
+                                        getLocale()
+                                            .toLowerCase()
+                                            .indexOf("en-us") !== -1
+                                            ? "market_history_us"
+                                            : "market_history"
+                                })}
+                            </td>
+                        </tr>
+                    );
+                })
+                .toArray();
         }
 
         let hc = "mymarkets-header clickable";
@@ -161,12 +204,26 @@ class MarketHistory extends React.Component {
 
         return (
             <div className={this.props.className}>
-                <div className="exchange-bordered small-12" style={{height: 266}}>
-                    <div style={this.props.headerStyle} className="grid-block shrink left-orderbook-header bottom-header">
-                            <div className={cnames(myHistoryClass, {disabled: isNullAccount})} onClick={this._changeTab.bind(this, "my_history")} >
-                                <Translate content="exchange.my_history" />
-                            </div>
-                        <div className={historyClass} onClick={this._changeTab.bind(this, "history")}>
+                <div
+                    className="exchange-bordered small-12"
+                    style={{height: 266}}
+                >
+                    <div
+                        style={this.props.headerStyle}
+                        className="grid-block shrink left-orderbook-header bottom-header"
+                    >
+                        <div
+                            className={cnames(myHistoryClass, {
+                                disabled: isNullAccount
+                            })}
+                            onClick={this._changeTab.bind(this, "my_history")}
+                        >
+                            <Translate content="exchange.my_history" />
+                        </div>
+                        <div
+                            className={historyClass}
+                            onClick={this._changeTab.bind(this, "history")}
+                        >
                             <Translate content="exchange.history" />
                         </div>
                     </div>
@@ -174,10 +231,34 @@ class MarketHistory extends React.Component {
                         <table className="table order-table text-right fixed-table market-right-padding">
                             <thead>
                                 <tr>
-                                    <th><Translate className="header-sub-title" content="exchange.price" /></th>
-                                    <th><span className="header-sub-title"><AssetName dataPlace="top" name={quoteSymbol} /></span></th>
-                                    <th><span className="header-sub-title"><AssetName dataPlace="top" name={baseSymbol} /></span></th>
-                                    <th><Translate className="header-sub-title" content="explorer.block.date" /></th>
+                                    <th>
+                                        <Translate
+                                            className="header-sub-title"
+                                            content="exchange.price"
+                                        />
+                                    </th>
+                                    <th>
+                                        <span className="header-sub-title">
+                                            <AssetName
+                                                dataPlace="top"
+                                                name={quoteSymbol}
+                                            />
+                                        </span>
+                                    </th>
+                                    <th>
+                                        <span className="header-sub-title">
+                                            <AssetName
+                                                dataPlace="top"
+                                                name={baseSymbol}
+                                            />
+                                        </span>
+                                    </th>
+                                    <th>
+                                        <Translate
+                                            className="header-sub-title"
+                                            content="explorer.block.date"
+                                        />
+                                    </th>
                                 </tr>
                             </thead>
                         </table>
diff --git a/app/components/Exchange/Markets.jsx b/app/components/Exchange/Markets.jsx
index ff3f7016cc..8b41bd4b09 100644
--- a/app/components/Exchange/Markets.jsx
+++ b/app/components/Exchange/Markets.jsx
@@ -2,7 +2,6 @@ import React from "react";
 import MyMarkets from "./MyMarkets";
 
 class Markets extends React.Component {
-
     constructor() {
         super();
         this.state = {
@@ -13,7 +12,10 @@ class Markets extends React.Component {
     }
 
     componentWillMount() {
-        window.addEventListener("resize", this._setDimensions, {capture: false, passive: true});
+        window.addEventListener("resize", this._setDimensions, {
+            capture: false,
+            passive: true
+        });
     }
 
     componentDidMount() {
@@ -34,24 +36,22 @@ class Markets extends React.Component {
 
     render() {
         return (
-            <div
-                ref="wrapper"
-                className="grid-block page-layout no-overflow">
+            <div ref="wrapper" className="grid-block page-layout no-overflow">
                 <MyMarkets
                     style={{width: "100%", padding: 20}}
-                    listHeight={this.state.height ? this.state.height - 82 : null}
+                    listHeight={
+                        this.state.height ? this.state.height - 82 : null
+                    }
                     className="no-overflow"
                     headerStyle={{paddingTop: 0, borderTop: "none"}}
-                    columns={
-                        [
-                            {name: "star", index: 1},
-                            {name: "market", index: 2},
-                            {name: "quoteSupply", index: 3},
-                            {name: "vol", index: 4},
-                            {name: "price", index: 5},
-                            {name: "change", index: 6}
-                        ]
-                    }
+                    columns={[
+                        {name: "star", index: 1},
+                        {name: "market", index: 2},
+                        {name: "quoteSupply", index: 3},
+                        {name: "vol", index: 4},
+                        {name: "price", index: 5},
+                        {name: "change", index: 6}
+                    ]}
                 />
             </div>
         );
diff --git a/app/components/Exchange/MarketsContainer.jsx b/app/components/Exchange/MarketsContainer.jsx
index 164cc052db..a6cb6f2dfb 100644
--- a/app/components/Exchange/MarketsContainer.jsx
+++ b/app/components/Exchange/MarketsContainer.jsx
@@ -6,13 +6,11 @@ import AltContainer from "alt-container";
 import Markets from "./Markets";
 
 class MarketsContainer extends React.Component {
-
     render() {
-
         return (
-              <AltContainer 
-                  stores={[SettingsStore, AssetStore, MarketsStore]}
-                  inject={{
+            <AltContainer
+                stores={[SettingsStore, AssetStore, MarketsStore]}
+                inject={{
                     starredMarkets: () => {
                         return SettingsStore.getState().starredMarkets;
                     },
@@ -25,10 +23,10 @@ class MarketsContainer extends React.Component {
                     marketBase: () => {
                         return MarketsStore.getState().marketBase;
                     }
-                  }} 
-                  >
-                <Markets/>
-              </AltContainer>
+                }}
+            >
+                <Markets />
+            </AltContainer>
         );
     }
 }
diff --git a/app/components/Exchange/MyOpenOrders.jsx b/app/components/Exchange/MyOpenOrders.jsx
index 499ef2c7cb..33c47f820f 100644
--- a/app/components/Exchange/MyOpenOrders.jsx
+++ b/app/components/Exchange/MyOpenOrders.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import {PropTypes} from "react";
-import { Link } from "react-router";
+import {Link} from "react-router";
 import counterpart from "counterpart";
 import Ps from "perfect-scrollbar";
 import OpenSettleOrders from "./OpenSettleOrders";
@@ -12,39 +12,88 @@ import SettingsActions from "actions/SettingsActions";
 import AssetName from "../Utility/AssetName";
 import cnames from "classnames";
 import Icon from "../Icon/Icon";
-import { ChainStore } from "bitsharesjs/es";
-import { LimitOrder, CallOrder } from "common/MarketClasses";
-import { EquivalentValueComponent } from "../Utility/EquivalentValueComponent";
+import {ChainStore} from "bitsharesjs/es";
+import {LimitOrder, CallOrder} from "common/MarketClasses";
+import {EquivalentValueComponent} from "../Utility/EquivalentValueComponent";
 import {MarketPrice} from "../Utility/MarketPrice";
 import FormattedPrice from "../Utility/FormattedPrice";
 const leftAlign = {textAlign: "left"};
 
 class TableHeader extends React.Component {
-
     render() {
-        let {baseSymbol, quoteSymbol, dashboard, isMyAccount, settings} = this.props;
+        let {
+            baseSymbol,
+            quoteSymbol,
+            dashboard,
+            isMyAccount,
+            settings
+        } = this.props;
         let preferredUnit = settings ? settings.get("unit") : "1.3.0";
 
         return !dashboard ? (
             <thead>
                 <tr>
-                    <th style={{textAlign: this.props.leftAlign ? "left" : ""}}><Translate className="header-sub-title" content="exchange.price" /></th>
-                    <th style={this.props.leftAlign ? {textAlign: "left"} : null}>{baseSymbol ? <span className="header-sub-title"><AssetName dataPlace="top" name={quoteSymbol} /></span> : null}</th>
-                    <th style={this.props.leftAlign ? {textAlign: "left"} : null}>{baseSymbol ? <span className="header-sub-title"><AssetName dataPlace="top" name={baseSymbol} /></span> : null}</th>
-                    <th style={{textAlign: this.props.leftAlign ? "left" : ""}}><Translate className="header-sub-title" content="transaction.expiration" /></th>
+                    <th style={{textAlign: this.props.leftAlign ? "left" : ""}}>
+                        <Translate
+                            className="header-sub-title"
+                            content="exchange.price"
+                        />
+                    </th>
+                    <th
+                        style={
+                            this.props.leftAlign ? {textAlign: "left"} : null
+                        }
+                    >
+                        {baseSymbol ? (
+                            <span className="header-sub-title">
+                                <AssetName dataPlace="top" name={quoteSymbol} />
+                            </span>
+                        ) : null}
+                    </th>
+                    <th
+                        style={
+                            this.props.leftAlign ? {textAlign: "left"} : null
+                        }
+                    >
+                        {baseSymbol ? (
+                            <span className="header-sub-title">
+                                <AssetName dataPlace="top" name={baseSymbol} />
+                            </span>
+                        ) : null}
+                    </th>
+                    <th style={{textAlign: this.props.leftAlign ? "left" : ""}}>
+                        <Translate
+                            className="header-sub-title"
+                            content="transaction.expiration"
+                        />
+                    </th>
                     <th style={{width: "6%"}} />
                 </tr>
             </thead>
         ) : (
             <thead>
                 <tr>
-                    <th style={leftAlign} colSpan="5"><Translate content="exchange.description" /></th>
-                    <th style={leftAlign}><Translate content="exchange.price" /></th>
-                    <th style={leftAlign}><Translate content="exchange.price_market" /></th>
-                    <th style={{textAlign: "right"}}><Translate content="exchange.value" /></th>
+                    <th style={leftAlign} colSpan="5">
+                        <Translate content="exchange.description" />
+                    </th>
+                    <th style={leftAlign}>
+                        <Translate content="exchange.price" />
+                    </th>
+                    <th style={leftAlign}>
+                        <Translate content="exchange.price_market" />
+                    </th>
+                    <th style={{textAlign: "right"}}>
+                        <Translate content="exchange.value" />
+                    </th>
                     {/* <th><Translate content="transaction.expiration" /></th> */}
-                    <th><Translate content="account.trade" /></th>
-                    {isMyAccount ? <th id="cancelAllOrders" style={{cursor: "pointer"}}><Translate content="wallet.cancel" /></th> : null}
+                    <th>
+                        <Translate content="account.trade" />
+                    </th>
+                    {isMyAccount ? (
+                        <th id="cancelAllOrders" style={{cursor: "pointer"}}>
+                            <Translate content="wallet.cancel" />
+                        </th>
+                    ) : null}
                 </tr>
             </thead>
         );
@@ -57,7 +106,6 @@ TableHeader.defaultProps = {
 };
 
 class OrderRow extends React.Component {
-
     shouldComponentUpdate(nextProps) {
         return (
             nextProps.order.for_sale !== this.props.order.for_sale ||
@@ -69,12 +117,24 @@ class OrderRow extends React.Component {
     }
 
     render() {
-        let {base, quote, order, showSymbols, dashboard, isMyAccount, settings} = this.props;
+        let {
+            base,
+            quote,
+            order,
+            showSymbols,
+            dashboard,
+            isMyAccount,
+            settings
+        } = this.props;
         const isBid = order.isBid();
         const isCall = order.isCall();
-        let tdClass = isCall ? "orderHistoryCall" : isBid ? "orderHistoryBid" : "orderHistoryAsk";
+        let tdClass = isCall
+            ? "orderHistoryCall"
+            : isBid ? "orderHistoryBid" : "orderHistoryAsk";
 
-        let priceSymbol = showSymbols ? <span>{` ${base.get("symbol")}/${quote.get("symbol")}`}</span> : null;
+        let priceSymbol = showSymbols ? (
+            <span>{` ${base.get("symbol")}/${quote.get("symbol")}`}</span>
+        ) : null;
         let valueSymbol = showSymbols ? " " + base.get("symbol") : null;
         let amountSymbol = showSymbols ? " " + quote.get("symbol") : null;
         let preferredUnit = settings ? settings.get("unit") : "1.3.0";
@@ -84,49 +144,134 @@ class OrderRow extends React.Component {
         return !dashboard ? (
             <tr key={order.id}>
                 <td className={tdClass} style={{paddingLeft: 10}}>
-                    <PriceText price={order.getPrice()} base={base} quote={quote} />
+                    <PriceText
+                        price={order.getPrice()}
+                        base={base}
+                        quote={quote}
+                    />
                     {priceSymbol}
                 </td>
-                <td>{utils.format_number(order[!isBid ? "amountForSale" : "amountToReceive"]().getAmount({real: true}), quote.get("precision"))} {amountSymbol}</td>
-                <td>{utils.format_number(order[!isBid ? "amountToReceive" : "amountForSale"]().getAmount({real: true}), base.get("precision"))} {valueSymbol}</td>
-                <td style={{width: "25%", textAlign: "right"}} className="tooltip" data-tip={new Date(order.expiration)}>
-                    {counterpart.localize(new Date(order.expiration), {type: "date", format: "short_custom"})}
+                <td>
+                    {utils.format_number(
+                        order[
+                            !isBid ? "amountForSale" : "amountToReceive"
+                        ]().getAmount({real: true}),
+                        quote.get("precision")
+                    )}{" "}
+                    {amountSymbol}
+                </td>
+                <td>
+                    {utils.format_number(
+                        order[
+                            !isBid ? "amountToReceive" : "amountForSale"
+                        ]().getAmount({real: true}),
+                        base.get("precision")
+                    )}{" "}
+                    {valueSymbol}
+                </td>
+                <td
+                    style={{width: "25%", textAlign: "right"}}
+                    className="tooltip"
+                    data-tip={new Date(order.expiration)}
+                >
+                    {counterpart.localize(new Date(order.expiration), {
+                        type: "date",
+                        format: "short_custom"
+                    })}
                 </td>
                 <td className="text-center" style={{width: "6%"}}>
-                    {isCall ? null : <a style={{marginRight: 0}} className="order-cancel" onClick={this.props.onCancel}>
-                        <Icon name="cross-circle" className="icon-14px" />
-                    </a>}
+                    {isCall ? null : (
+                        <a
+                            style={{marginRight: 0}}
+                            className="order-cancel"
+                            onClick={this.props.onCancel}
+                        >
+                            <Icon name="cross-circle" className="icon-14px" />
+                        </a>
+                    )}
                 </td>
             </tr>
         ) : (
             <tr key={order.id} className="clickable">
                 <td colSpan="5" style={leftAlign} onClick={this.props.onFlip}>
-                    {isBid ?
+                    {isBid ? (
                         <Translate
                             content="exchange.buy_description"
-                            baseAsset={utils.format_number(order[isBid ? "amountToReceive" : "amountForSale"]().getAmount({real: true}), base.get("precision"), false)}
-                            quoteAsset={utils.format_number(order[isBid ? "amountForSale" : "amountToReceive"]().getAmount({real: true}), quote.get("precision"), false)}
-                            baseName={<AssetName noTip customClass={quoteColor} name={quote.get("symbol")} />}
-                            quoteName={<AssetName noTip customClass={baseColor} name={base.get("symbol")} />}
-                            /> :
+                            baseAsset={utils.format_number(
+                                order[
+                                    isBid ? "amountToReceive" : "amountForSale"
+                                ]().getAmount({real: true}),
+                                base.get("precision"),
+                                false
+                            )}
+                            quoteAsset={utils.format_number(
+                                order[
+                                    isBid ? "amountForSale" : "amountToReceive"
+                                ]().getAmount({real: true}),
+                                quote.get("precision"),
+                                false
+                            )}
+                            baseName={
+                                <AssetName
+                                    noTip
+                                    customClass={quoteColor}
+                                    name={quote.get("symbol")}
+                                />
+                            }
+                            quoteName={
+                                <AssetName
+                                    noTip
+                                    customClass={baseColor}
+                                    name={base.get("symbol")}
+                                />
+                            }
+                        />
+                    ) : (
                         <Translate
                             content="exchange.sell_description"
-                            baseAsset={utils.format_number(order[isBid ? "amountToReceive" : "amountForSale"]().getAmount({real: true}), base.get("precision"), false)}
-                            quoteAsset={utils.format_number(order[isBid ? "amountForSale" : "amountToReceive"]().getAmount({real: true}), quote.get("precision"), false)}
-                            baseName={<AssetName noTip customClass={quoteColor} name={quote.get("symbol")} />}
-                            quoteName={<AssetName noTip customClass={baseColor} name={base.get("symbol")} />}
-                        />}
+                            baseAsset={utils.format_number(
+                                order[
+                                    isBid ? "amountToReceive" : "amountForSale"
+                                ]().getAmount({real: true}),
+                                base.get("precision"),
+                                false
+                            )}
+                            quoteAsset={utils.format_number(
+                                order[
+                                    isBid ? "amountForSale" : "amountToReceive"
+                                ]().getAmount({real: true}),
+                                quote.get("precision"),
+                                false
+                            )}
+                            baseName={
+                                <AssetName
+                                    noTip
+                                    customClass={quoteColor}
+                                    name={quote.get("symbol")}
+                                />
+                            }
+                            quoteName={
+                                <AssetName
+                                    noTip
+                                    customClass={baseColor}
+                                    name={base.get("symbol")}
+                                />
+                            }
+                        />
+                    )}
                 </td>
                 <td style={leftAlign} onClick={this.props.onFlip}>
                     <FormattedPrice
-                        base_amount={order.sellPrice().base.amount} base_asset={order.sellPrice().base.asset_id}
-                        quote_amount={order.sellPrice().quote.amount} quote_asset={order.sellPrice().quote.asset_id}
+                        base_amount={order.sellPrice().base.amount}
+                        base_asset={order.sellPrice().base.asset_id}
+                        quote_amount={order.sellPrice().quote.amount}
+                        quote_asset={order.sellPrice().quote.asset_id}
                         force_direction={base.get("symbol")}
                         hide_symbols
                     />
                 </td>
                 <td style={leftAlign} onClick={this.props.onFlip}>
-                    {isBid ?
+                    {isBid ? (
                         <MarketPrice
                             base={base.get("id")}
                             quote={quote.get("id")}
@@ -134,7 +279,7 @@ class OrderRow extends React.Component {
                             hide_symbols
                             hide_asset
                         />
-                        :
+                    ) : (
                         <MarketPrice
                             base={base.get("id")}
                             quote={quote.get("id")}
@@ -142,10 +287,17 @@ class OrderRow extends React.Component {
                             hide_symbols
                             hide_asset
                         />
-                    }
+                    )}
                 </td>
                 <td style={{textAlign: "right"}} onClick={this.props.onFlip}>
-                    <EquivalentValueComponent hide_asset amount={order.amountForSale().getAmount()} fromAsset={order.amountForSale().asset_id} noDecimals={true} toAsset={preferredUnit}/> <AssetName name={preferredUnit} />
+                    <EquivalentValueComponent
+                        hide_asset
+                        amount={order.amountForSale().getAmount()}
+                        fromAsset={order.amountForSale().asset_id}
+                        noDecimals={true}
+                        toAsset={preferredUnit}
+                    />{" "}
+                    <AssetName name={preferredUnit} />
                 </td>
                 {/* <td>
                     {isCall ? null : <FormattedDate
@@ -153,12 +305,31 @@ class OrderRow extends React.Component {
                         format="short"
                     />}
                     </td> */}
-                <td><Link to={`/market/${quote.get("symbol")}_${base.get("symbol")}`}><Icon name="trade" className="icon-14px" /></Link></td>
-                {isMyAccount ? <td className="text-center" style={{ padding: "2px 5px"}}>
-                    {isCall ? null : <span style={{marginRight: 0}} className="order-cancel">
-                        <input type="checkbox" className="orderCancel" onChange={this.props.onCheckCancel} />
-                    </span>}
-                </td> : null}
+                <td>
+                    <Link
+                        to={`/market/${quote.get("symbol")}_${base.get(
+                            "symbol"
+                        )}`}
+                    >
+                        <Icon name="trade" className="icon-14px" />
+                    </Link>
+                </td>
+                {isMyAccount ? (
+                    <td className="text-center" style={{padding: "2px 5px"}}>
+                        {isCall ? null : (
+                            <span
+                                style={{marginRight: 0}}
+                                className="order-cancel"
+                            >
+                                <input
+                                    type="checkbox"
+                                    className="orderCancel"
+                                    onChange={this.props.onCheckCancel}
+                                />
+                            </span>
+                        )}
+                    </td>
+                ) : null}
             </tr>
         );
     }
@@ -168,9 +339,7 @@ OrderRow.defaultProps = {
     showSymbols: false
 };
 
-
 class MyOpenOrders extends React.Component {
-
     constructor(props) {
         super();
         this.state = {
@@ -190,44 +359,68 @@ class MyOpenOrders extends React.Component {
     }
 
     _getOrders() {
-        const { currentAccount, base, quote, feedPrice } = this.props;
-        const orders = currentAccount.get("orders"), call_orders = currentAccount.get("call_orders");
-        const baseID = base.get("id"), quoteID = quote.get("id");
+        const {currentAccount, base, quote, feedPrice} = this.props;
+        const orders = currentAccount.get("orders"),
+            call_orders = currentAccount.get("call_orders");
+        const baseID = base.get("id"),
+            quoteID = quote.get("id");
         const assets = {
             [base.get("id")]: {precision: base.get("precision")},
             [quote.get("id")]: {precision: quote.get("precision")}
         };
-        let limitOrders = orders.toArray().map(order => {
-            let o = ChainStore.getObject(order);
-            if (!o) return null;
-            let sellBase = o.getIn(["sell_price", "base", "asset_id"]), sellQuote = o.getIn(["sell_price", "quote", "asset_id"]);
-            if (sellBase === baseID && sellQuote === quoteID ||
-                sellBase === quoteID && sellQuote === baseID
-            ) {
-                return new LimitOrder(o.toJS(), assets, quote.get("id"));
-            }
-        }).filter(a => !!a);
-
-        let callOrders = call_orders.toArray().map(order => {
-            try {
+        let limitOrders = orders
+            .toArray()
+            .map(order => {
                 let o = ChainStore.getObject(order);
                 if (!o) return null;
-                let sellBase = o.getIn(["call_price", "base", "asset_id"]), sellQuote = o.getIn(["call_price", "quote", "asset_id"]);
-                if (sellBase === baseID && sellQuote === quoteID ||
-                    sellBase === quoteID && sellQuote === baseID
+                let sellBase = o.getIn(["sell_price", "base", "asset_id"]),
+                    sellQuote = o.getIn(["sell_price", "quote", "asset_id"]);
+                if (
+                    (sellBase === baseID && sellQuote === quoteID) ||
+                    (sellBase === quoteID && sellQuote === baseID)
                 ) {
-                    return feedPrice ? new CallOrder(o.toJS(), assets, quote.get("id"), feedPrice) : null;
+                    return new LimitOrder(o.toJS(), assets, quote.get("id"));
                 }
-            } catch(e) {
-                return null;
-            }
-        }).filter(a => !!a).filter(a => {
-            try {
-                return a.isMarginCalled();
-            } catch(err) {
-                return false;
-            }
-        });
+            })
+            .filter(a => !!a);
+
+        let callOrders = call_orders
+            .toArray()
+            .map(order => {
+                try {
+                    let o = ChainStore.getObject(order);
+                    if (!o) return null;
+                    let sellBase = o.getIn(["call_price", "base", "asset_id"]),
+                        sellQuote = o.getIn([
+                            "call_price",
+                            "quote",
+                            "asset_id"
+                        ]);
+                    if (
+                        (sellBase === baseID && sellQuote === quoteID) ||
+                        (sellBase === quoteID && sellQuote === baseID)
+                    ) {
+                        return feedPrice
+                            ? new CallOrder(
+                                  o.toJS(),
+                                  assets,
+                                  quote.get("id"),
+                                  feedPrice
+                              )
+                            : null;
+                    }
+                } catch (e) {
+                    return null;
+                }
+            })
+            .filter(a => !!a)
+            .filter(a => {
+                try {
+                    return a.isMarginCalled();
+                } catch (err) {
+                    return false;
+                }
+            });
         return limitOrders.concat(callOrders);
     }
 
@@ -252,109 +445,206 @@ class MyOpenOrders extends React.Component {
         let {activeTab} = this.state;
 
         if (!base || !quote) return null;
-        
+
         let contentContainer;
 
         // Is asset a BitAsset with Settlements
-        let baseIsBitAsset = base.get("bitasset_data_id") && settleOrders.size > 0 ? true : false;
-        let quoteIsBitAsset = quote.get("bitasset_data_id") && settleOrders.size > 0 ? true : false;
+        let baseIsBitAsset =
+            base.get("bitasset_data_id") && settleOrders.size > 0
+                ? true
+                : false;
+        let quoteIsBitAsset =
+            quote.get("bitasset_data_id") && settleOrders.size > 0
+                ? true
+                : false;
 
         // Default Tab
-        if(!activeTab || (!baseIsBitAsset && !quoteIsBitAsset)) { activeTab = "my_orders"; }
+        if (!activeTab || (!baseIsBitAsset && !quoteIsBitAsset)) {
+            activeTab = "my_orders";
+        }
 
-        {/* Users Open Orders Tab (default) */}
-        if(activeTab == "my_orders") {
+        {
+            /* Users Open Orders Tab (default) */
+        }
+        if (activeTab == "my_orders") {
             const orders = this._getOrders();
-            let emptyRow = <tr><td style={{textAlign: "center"}} colSpan="5"><Translate content="account.no_orders" /></td></tr>;
-    
-            let bids = orders.filter(a => {
-                return a.isBid();
-            }).sort((a, b) => {
-                return b.getPrice() - a.getPrice();
-            }).map(order => {
-                let price = order.getPrice();
-                return <OrderRow price={price} key={order.id} order={order} base={base} quote={quote} onCancel={this.props.onCancel.bind(this, order.id)}/>;
-            });
-    
-            let asks = orders.filter(a => {
-                return !a.isBid();
-            }).sort((a, b) => {
-                return a.getPrice() - b.getPrice();
-            }).map(order => {
-                let price = order.getPrice();
-                return <OrderRow price={price} key={order.id} order={order} base={base} quote={quote} onCancel={this.props.onCancel.bind(this, order.id)}/>;
-            });
-    
+            let emptyRow = (
+                <tr>
+                    <td style={{textAlign: "center"}} colSpan="5">
+                        <Translate content="account.no_orders" />
+                    </td>
+                </tr>
+            );
+
+            let bids = orders
+                .filter(a => {
+                    return a.isBid();
+                })
+                .sort((a, b) => {
+                    return b.getPrice() - a.getPrice();
+                })
+                .map(order => {
+                    let price = order.getPrice();
+                    return (
+                        <OrderRow
+                            price={price}
+                            key={order.id}
+                            order={order}
+                            base={base}
+                            quote={quote}
+                            onCancel={this.props.onCancel.bind(this, order.id)}
+                        />
+                    );
+                });
+
+            let asks = orders
+                .filter(a => {
+                    return !a.isBid();
+                })
+                .sort((a, b) => {
+                    return a.getPrice() - b.getPrice();
+                })
+                .map(order => {
+                    let price = order.getPrice();
+                    return (
+                        <OrderRow
+                            price={price}
+                            key={order.id}
+                            order={order}
+                            base={base}
+                            quote={quote}
+                            onCancel={this.props.onCancel.bind(this, order.id)}
+                        />
+                    );
+                });
+
             let rows = [];
-    
+
             if (asks.length) {
                 rows = rows.concat(asks);
             }
-    
+
             if (bids.length) {
                 rows = rows.concat(bids);
             }
-    
+
             rows.sort((a, b) => {
                 return a.props.price - b.props.price;
             });
 
-            contentContainer = (<TransitionWrapper component="tbody" transitionName="newrow">{rows.length ? rows : emptyRow}</TransitionWrapper>);
-        } 
-        
-        {/* Open Settle Orders */}
-        
-        if(activeTab && activeTab == "open_settlement") {
-            contentContainer = 
-                <OpenSettleOrders 
+            contentContainer = (
+                <TransitionWrapper component="tbody" transitionName="newrow">
+                    {rows.length ? rows : emptyRow}
+                </TransitionWrapper>
+            );
+        }
+
+        {
+            /* Open Settle Orders */
+        }
+
+        if (activeTab && activeTab == "open_settlement") {
+            contentContainer = (
+                <OpenSettleOrders
                     key="settle_orders"
                     orders={settleOrders}
                     base={base}
                     quote={quote}
                     baseSymbol={baseSymbol}
                     quoteSymbol={quoteSymbol}
-                />;
+                />
+            );
         }
 
         let hc = "mymarkets-header clickable";
         let myOrdersClass = cnames(hc, {inactive: activeTab !== "my_orders"});
-        let openSettlementClass = cnames(hc, {inactive: activeTab !== "open_settlement"});
+        let openSettlementClass = cnames(hc, {
+            inactive: activeTab !== "open_settlement"
+        });
         let myOrdersWidth = baseIsBitAsset || quoteIsBitAsset ? "50%" : "100%";
-        let openSettlementWidth = baseIsBitAsset || quoteIsBitAsset ? "inherit" : "none";
+        let openSettlementWidth =
+            baseIsBitAsset || quoteIsBitAsset ? "inherit" : "none";
 
         return (
-            <div 
+            <div
                 style={{marginBottom: "15px"}}
                 key="open_orders"
                 className={this.props.className}
             >
-                <div className="exchange-bordered small-12" style={{height: 266}}>
+                <div
+                    className="exchange-bordered small-12"
+                    style={{height: 266}}
+                >
                     <div className="grid-block shrink left-orderbook-header">
-                        <div style={{width: myOrdersWidth}} className={myOrdersClass} onClick={this._changeTab.bind(this, "my_orders")}>
+                        <div
+                            style={{width: myOrdersWidth}}
+                            className={myOrdersClass}
+                            onClick={this._changeTab.bind(this, "my_orders")}
+                        >
                             <Translate content="exchange.my_orders" />
                         </div>
-                        <div style={{display: openSettlementWidth}} className={openSettlementClass} onClick={this._changeTab.bind(this, "open_settlement")}>
+                        <div
+                            style={{display: openSettlementWidth}}
+                            className={openSettlementClass}
+                            onClick={this._changeTab.bind(
+                                this,
+                                "open_settlement"
+                            )}
+                        >
                             <Translate content="exchange.settle_orders" />
                         </div>
                     </div>
                     <div className="grid-block shrink left-orderbook-header market-right-padding-only">
                         <table className="table order-table text-right fixed-table market-right-padding">
-                            {activeTab == "my_orders" ? 
-                                <TableHeader rightAlign type="sell" baseSymbol={baseSymbol} quoteSymbol={quoteSymbol} />
-                                :
+                            {activeTab == "my_orders" ? (
+                                <TableHeader
+                                    rightAlign
+                                    type="sell"
+                                    baseSymbol={baseSymbol}
+                                    quoteSymbol={quoteSymbol}
+                                />
+                            ) : (
                                 <thead>
                                     <tr>
-                                        <th><Translate className="header-sub-title" content="exchange.price" /></th>
-                                        <th><span className="header-sub-title"><AssetName dataPlace="top" name={quoteSymbol} /></span></th>
-                                        <th><span className="header-sub-title"><AssetName dataPlace="top" name={baseSymbol} /></span></th>
-                                        <th><Translate className="header-sub-title" content="explorer.block.date" /></th>
+                                        <th>
+                                            <Translate
+                                                className="header-sub-title"
+                                                content="exchange.price"
+                                            />
+                                        </th>
+                                        <th>
+                                            <span className="header-sub-title">
+                                                <AssetName
+                                                    dataPlace="top"
+                                                    name={quoteSymbol}
+                                                />
+                                            </span>
+                                        </th>
+                                        <th>
+                                            <span className="header-sub-title">
+                                                <AssetName
+                                                    dataPlace="top"
+                                                    name={baseSymbol}
+                                                />
+                                            </span>
+                                        </th>
+                                        <th>
+                                            <Translate
+                                                className="header-sub-title"
+                                                content="explorer.block.date"
+                                            />
+                                        </th>
                                     </tr>
                                 </thead>
-                            }
+                            )}
                         </table>
                     </div>
-                    
-                    <div className="table-container grid-block market-right-padding-only no-overflow" ref="container" style={{overflow: "hidden", maxHeight: 200}}>
+
+                    <div
+                        className="table-container grid-block market-right-padding-only no-overflow"
+                        ref="container"
+                        style={{overflow: "hidden", maxHeight: 200}}
+                    >
                         <table className="table order-table text-right fixed-table market-right-padding">
                             {contentContainer}
                         </table>
@@ -381,4 +671,4 @@ MyOpenOrders.propTypes = {
     baseSymbol: PropTypes.string.isRequired
 };
 
-export { OrderRow, TableHeader, MyOpenOrders };
+export {OrderRow, TableHeader, MyOpenOrders};
diff --git a/app/components/Exchange/OpenSettleOrders.jsx b/app/components/Exchange/OpenSettleOrders.jsx
index 1c2756b63f..822181b4df 100644
--- a/app/components/Exchange/OpenSettleOrders.jsx
+++ b/app/components/Exchange/OpenSettleOrders.jsx
@@ -7,18 +7,43 @@ import counterpart from "counterpart";
 import getLocale from "browser-locale";
 import TransitionWrapper from "../Utility/TransitionWrapper";
 
-
 class TableHeader extends React.Component {
-
     render() {
         let {baseSymbol, quoteSymbol} = this.props;
 
         return (
             <thead>
                 <tr>
-                    <th style={{textAlign: "right"}}><Translate content="exchange.price" /><br/>{baseSymbol ? <span className="header-sub-title">(<AssetName name={baseSymbol} />/<AssetName name={quoteSymbol} />)</span> : null}</th>
-                    <th style={{textAlign: "right"}}><Translate content="transfer.amount" /><br/>{quoteSymbol ? <span className="header-sub-title">(<AssetName name={quoteSymbol} />)</span> : null}</th>
-                    <th style={{textAlign: "right"}}><Translate content="transaction.settlement_date" /><br/><span style={{visibility: "hidden"}} className="header-sub-title">d</span></th>
+                    <th style={{textAlign: "right"}}>
+                        <Translate content="exchange.price" />
+                        <br />
+                        {baseSymbol ? (
+                            <span className="header-sub-title">
+                                (<AssetName name={baseSymbol} />/<AssetName
+                                    name={quoteSymbol}
+                                />)
+                            </span>
+                        ) : null}
+                    </th>
+                    <th style={{textAlign: "right"}}>
+                        <Translate content="transfer.amount" />
+                        <br />
+                        {quoteSymbol ? (
+                            <span className="header-sub-title">
+                                (<AssetName name={quoteSymbol} />)
+                            </span>
+                        ) : null}
+                    </th>
+                    <th style={{textAlign: "right"}}>
+                        <Translate content="transaction.settlement_date" />
+                        <br />
+                        <span
+                            style={{visibility: "hidden"}}
+                            className="header-sub-title"
+                        >
+                            d
+                        </span>
+                    </th>
                 </tr>
             </thead>
         );
@@ -31,24 +56,51 @@ TableHeader.defaultProps = {
 };
 
 class SettleOrderRow extends React.Component {
-
     render() {
         let {base, quote, order, showSymbols} = this.props;
 
-        let price = base.get("id") == "1.3.0" ? order.getPrice()/(1 + (order.offset_percent / (10000))) : order.getPrice()*(1 + (order.offset_percent / (10000)));
+        let price =
+            base.get("id") == "1.3.0"
+                ? order.getPrice() / (1 + order.offset_percent / 10000)
+                : order.getPrice() * (1 + order.offset_percent / 10000);
         let amountSymbol = showSymbols ? " " + quote.get("symbol") : null;
 
         return (
             <tr style={{paddingRight: 5}}>
-                <td style={{textAlign: "right", width: "25%"}}>{utils.format_number(price, quote.get("precision"))} {amountSymbol}</td>
                 <td style={{textAlign: "right", width: "25%"}}>
-                    {utils.format_number(order[!order.isBid() ? "amountForSale" : "amountToReceive"]().getAmount({real: true}), quote.get("precision"))}
+                    {utils.format_number(price, quote.get("precision"))}{" "}
+                    {amountSymbol}
+                </td>
+                <td style={{textAlign: "right", width: "25%"}}>
+                    {utils.format_number(
+                        order[
+                            !order.isBid() ? "amountForSale" : "amountToReceive"
+                        ]().getAmount({real: true}),
+                        quote.get("precision")
+                    )}
                 </td>
                 <td style={{textAlign: "right", width: "25%"}}>
-                    {utils.format_number(order[!order.isBid() ? "amountToReceive" : "amountForSale"]().getAmount({real: true}), base.get("precision"))}
+                    {utils.format_number(
+                        order[
+                            !order.isBid() ? "amountToReceive" : "amountForSale"
+                        ]().getAmount({real: true}),
+                        base.get("precision")
+                    )}
                 </td>
-                <td style={{textAlign: "right", width: "25%"}} className="tooltip" data-tip={new Date(order.settlement_date)}>
-                    {counterpart.localize(new Date(order.settlement_date), {type: "date", format: getLocale().toLowerCase().indexOf("en-us") !== -1 ? "market_history_us" : "market_history"})}
+                <td
+                    style={{textAlign: "right", width: "25%"}}
+                    className="tooltip"
+                    data-tip={new Date(order.settlement_date)}
+                >
+                    {counterpart.localize(new Date(order.settlement_date), {
+                        type: "date",
+                        format:
+                            getLocale()
+                                .toLowerCase()
+                                .indexOf("en-us") !== -1
+                                ? "market_history_us"
+                                : "market_history"
+                    })}
                 </td>
             </tr>
         );
@@ -60,9 +112,7 @@ SettleOrderRow.defaultProps = {
     invert: false
 };
 
-
 class OpenSettleOrders extends React.Component {
-
     shouldComponentUpdate(nextProps) {
         return (
             nextProps.currentAccount !== this.props.currentAccount ||
@@ -72,18 +122,27 @@ class OpenSettleOrders extends React.Component {
 
     render() {
         let {orders, base, quote} = this.props;
-        
+
         let activeOrders = null;
-        
-        if(orders.size > 0 && base && quote) {
+
+        if (orders.size > 0 && base && quote) {
             let index = 0;
 
             activeOrders = orders
-            .sort((a, b) => {
-                return a.isBefore(b) ? -1 : 1;
-            }).map(order => {
-                return Date.now() < order.settlement_date ? <SettleOrderRow key={index++} order={order} base={base} quote={quote}/> : null;
-            }).toArray();
+                .sort((a, b) => {
+                    return a.isBefore(b) ? -1 : 1;
+                })
+                .map(order => {
+                    return Date.now() < order.settlement_date ? (
+                        <SettleOrderRow
+                            key={index++}
+                            order={order}
+                            base={base}
+                            quote={quote}
+                        />
+                    ) : null;
+                })
+                .toArray();
         } else {
             return null;
         }
diff --git a/app/components/Exchange/PriceChart.jsx b/app/components/Exchange/PriceChart.jsx
index 0c816ef90c..329ae292a0 100644
--- a/app/components/Exchange/PriceChart.jsx
+++ b/app/components/Exchange/PriceChart.jsx
@@ -16,13 +16,21 @@ require("./highcharts-plugins/indicators.css");
 require("./highcharts-plugins/highstock-current-price-indicator.js");
 
 class PriceChart extends React.Component {
-
     shouldComponentUpdate(nextProps, nextState) {
-        if (nextProps.baseSymbol !== this.props.baseSymbol || nextProps.quoteSymbol !== this.props.quoteSymbol) {
+        if (
+            nextProps.baseSymbol !== this.props.baseSymbol ||
+            nextProps.quoteSymbol !== this.props.quoteSymbol
+        ) {
             return true;
         }
         let chart = this.refs.chart ? this.refs.chart.chart : null;
-        if (chart && (!utils.are_equal_shallow(nextProps.indicators, this.props.indicators))) {
+        if (
+            chart &&
+            !utils.are_equal_shallow(
+                nextProps.indicators,
+                this.props.indicators
+            )
+        ) {
             let changed, added;
 
             for (let key in nextProps.indicators) {
@@ -32,63 +40,92 @@ class PriceChart extends React.Component {
                 }
             }
 
-            let indicator = added ? this.getIndicators(nextProps, changed)[0] : changed;
+            let indicator = added
+                ? this.getIndicators(nextProps, changed)[0]
+                : changed;
 
             if (added) {
                 chart.addIndicator(indicator, true);
             } else {
                 console.log("indicators:", chart.indicators);
-                let indicators = chart.indicators ? chart.indicators.allItems : [];
-                for (let i = indicators.length - 1 ; i >= 0 ; i--) {
+                let indicators = chart.indicators
+                    ? chart.indicators.allItems
+                    : [];
+                for (let i = indicators.length - 1; i >= 0; i--) {
                     if (indicators[i].name === changed) {
                         indicators[i].destroy();
                         break;
                     }
-                };
+                }
             }
             return false;
         }
 
-        if (chart && (!utils.are_equal_shallow(nextProps.indicatorSettings, this.props.indicatorSettings))) {
+        if (
+            chart &&
+            !utils.are_equal_shallow(
+                nextProps.indicatorSettings,
+                this.props.indicatorSettings
+            )
+        ) {
             let changed, added, changedSetting;
 
             for (let key in nextProps.indicatorSettings) {
-                let change = reduce(nextProps.indicatorSettings[key], (total, a, settingKey) => {
-
-                    let change = a !== this.props.indicatorSettings[key][settingKey];
-                    changedSetting = change ? settingKey : changedSetting;
-                    return total ? total : a !== this.props.indicatorSettings[key][settingKey];
-                }, null);
+                let change = reduce(
+                    nextProps.indicatorSettings[key],
+                    (total, a, settingKey) => {
+                        let change =
+                            a !== this.props.indicatorSettings[key][settingKey];
+                        changedSetting = change ? settingKey : changedSetting;
+                        return total
+                            ? total
+                            : a !==
+                                  this.props.indicatorSettings[key][settingKey];
+                    },
+                    null
+                );
 
                 changed = change ? key : changed;
             }
 
             if (changedSetting !== "period") {
-                let indicators = chart.indicators ? chart.indicators.allItems : [];
+                let indicators = chart.indicators
+                    ? chart.indicators.allItems
+                    : [];
                 let options = this.getIndicators(nextProps, changed)[0];
 
-                for (let i = indicators.length - 1 ; i >= 0 ; i--) {
+                for (let i = indicators.length - 1; i >= 0; i--) {
                     if (indicators[i].name === changed) {
                         indicators[i].update(options);
                         break;
                     }
-                };
+                }
                 chart.redraw();
                 return false;
             }
         }
 
         let latestCheck = false;
-        if ((nextProps.priceData && !nextProps.priceData.length) && (nextProps.latest && this.props.latest)) {
+        if (
+            nextProps.priceData &&
+            !nextProps.priceData.length &&
+            (nextProps.latest && this.props.latest)
+        ) {
             latestCheck = nextProps.latest.full !== this.props.latest.full;
         }
         return (
-            !utils.are_equal_shallow(nextProps.priceData, this.props.priceData) ||
+            !utils.are_equal_shallow(
+                nextProps.priceData,
+                this.props.priceData
+            ) ||
             nextState.lastPointY !== this.state.lastPointY ||
             nextProps.baseSymbol !== this.props.baseSymbol ||
             latestCheck ||
             nextProps.leftOrderBook !== this.props.leftOrderBook ||
-            !utils.are_equal_shallow(nextProps.indicatorSettings, this.props.indicatorSettings) ||
+            !utils.are_equal_shallow(
+                nextProps.indicatorSettings,
+                this.props.indicatorSettings
+            ) ||
             nextProps.verticalOrderbook !== this.props.verticalOrderbook ||
             nextProps.height !== this.props.height ||
             nextProps.zoom !== this.props.zoom
@@ -113,10 +150,11 @@ class PriceChart extends React.Component {
         let height = this.offsetHeight;
         this.setState({offsetHeight: height - 10});
 
-        if (this.refs.chart &&
+        if (
+            this.refs.chart &&
             (nextProps.verticalOrderbook !== this.props.verticalOrderbook ||
-            nextProps.height !== this.props.height)
-                ) {
+                nextProps.height !== this.props.height)
+        ) {
             this.reflowChart(100);
         }
     }
@@ -130,7 +168,6 @@ class PriceChart extends React.Component {
     }
 
     getIndicators(props, select = false) {
-
         let {indicators, indicatorSettings} = props;
         let currentIndicator = [];
 
@@ -138,86 +175,89 @@ class PriceChart extends React.Component {
             if (indicators[indicator] && (!select || select === indicator)) {
                 // console.log(indicator, "params:", indicatorSettings[indicator]);
                 switch (indicator) {
-                case "sma":
-                    currentIndicator.push({
-                        id: "primary",
-                        type: "sma",
-                        params: indicatorSettings[indicator],
-                        tooltip:{
-                            pointFormat: '<span style="color: {point.color}; ">pointFormat SMA: </span> {point.y}<br>'
-                        },
-                    });
-                    break;
-
-                case "ema":
-                    currentIndicator.push({
-                        id: "primary",
-                        type: "ema",
-                        params: indicatorSettings[indicator],
-                        styles: {
-                            strokeWidth: 2,
-                            stroke: props.priceData.length ? "green" : "black",
-                            dashstyle: "solid"
-                        }
-                    });
-                    break;
-
-                case "rsi":
-                    currentIndicator.push({
-                        id: "primary",
-                        type: "rsi",
-                        params: indicatorSettings[indicator],
-                        styles: {
-                            strokeWidth: 2,
-                            stroke: "#A7DACD",
-                            dashstyle: "solid"
-                        },
-                        yAxis: {
-                            lineWidth:2,
-                            title: {
-                                text: "RSI",
-                                style: {
-                                    color: "#FFFFFF"
-                                }
+                    case "sma":
+                        currentIndicator.push({
+                            id: "primary",
+                            type: "sma",
+                            params: indicatorSettings[indicator],
+                            tooltip: {
+                                pointFormat:
+                                    '<span style="color: {point.color}; ">pointFormat SMA: </span> {point.y}<br>'
+                            }
+                        });
+                        break;
+
+                    case "ema":
+                        currentIndicator.push({
+                            id: "primary",
+                            type: "ema",
+                            params: indicatorSettings[indicator],
+                            styles: {
+                                strokeWidth: 2,
+                                stroke: props.priceData.length
+                                    ? "green"
+                                    : "black",
+                                dashstyle: "solid"
+                            }
+                        });
+                        break;
+
+                    case "rsi":
+                        currentIndicator.push({
+                            id: "primary",
+                            type: "rsi",
+                            params: indicatorSettings[indicator],
+                            styles: {
+                                strokeWidth: 2,
+                                stroke: "#A7DACD",
+                                dashstyle: "solid"
                             },
-                            labels: {
-                                style: {
-                                    color: "#FFFFFF"
+                            yAxis: {
+                                lineWidth: 2,
+                                title: {
+                                    text: "RSI",
+                                    style: {
+                                        color: "#FFFFFF"
+                                    }
+                                },
+                                labels: {
+                                    style: {
+                                        color: "#FFFFFF"
+                                    }
                                 }
                             }
-                        }
-                    });
-                    break;
-
-                case "atr":
-                    currentIndicator.push({
-                        id: "primary",
-                        type: "atr",
-                        params: indicatorSettings[indicator],
-                        styles: {
-                            strokeWidth: 2,
-                            stroke: "orange",
-                            dashstyle: "solid"
-                        },
-                        yAxis: {
-                            lineWidth: 2,
-                            title: {
-                                text:  "ATR",
-                                style: {
-                                    color: "#FFFFFF"
-                                }
+                        });
+                        break;
+
+                    case "atr":
+                        currentIndicator.push({
+                            id: "primary",
+                            type: "atr",
+                            params: indicatorSettings[indicator],
+                            styles: {
+                                strokeWidth: 2,
+                                stroke: "orange",
+                                dashstyle: "solid"
                             },
-                            labels: {
-                                style: {
-                                    color: "#FFFFFF"
+                            yAxis: {
+                                lineWidth: 2,
+                                title: {
+                                    text: "ATR",
+                                    style: {
+                                        color: "#FFFFFF"
+                                    }
+                                },
+                                labels: {
+                                    style: {
+                                        color: "#FFFFFF"
+                                    }
                                 }
                             }
-                        }
-                    });
-                    break;
+                        });
+                        break;
 
-                default:
-                    currentIndicator = [];
+                    default:
+                        currentIndicator = [];
                 }
             }
         }
@@ -226,8 +266,20 @@ class PriceChart extends React.Component {
     }
 
     render() {
-        let {priceData, volumeData, quoteSymbol, baseSymbol, base, quote, marketReady,
-            indicators, indicatorSettings, latest, bucketSize, theme} = this.props;
+        let {
+            priceData,
+            volumeData,
+            quoteSymbol,
+            baseSymbol,
+            base,
+            quote,
+            marketReady,
+            indicators,
+            indicatorSettings,
+            latest,
+            bucketSize,
+            theme
+        } = this.props;
 
         let priceSeriesData = cloneDeep(priceData);
         let currentIndicator = this.getIndicators(this.props);
@@ -236,13 +288,25 @@ class PriceChart extends React.Component {
         let negativeColor = colors[theme].negativeColor;
 
         if (!priceSeriesData.length && latest) {
-            let now = (new Date).getTime();
-            priceSeriesData.push([now, latest.full, latest.full, latest.full, latest.full]);
+            let now = new Date().getTime();
+            priceSeriesData.push([
+                now,
+                latest.full,
+                latest.full,
+                latest.full,
+                latest.full
+            ]);
             volumeData.push([now, 0]);
             for (let i = 1; i < 100; i++) {
-                priceSeriesData.unshift([now - (bucketSize * 1000) * i, latest.full, latest.full, latest.full, latest.full]);
-                volumeData.unshift([now - (bucketSize * 1000) * i, 0]);
-            };
+                priceSeriesData.unshift([
+                    now - bucketSize * 1000 * i,
+                    latest.full,
+                    latest.full,
+                    latest.full,
+                    latest.full
+                ]);
+                volumeData.unshift([now - bucketSize * 1000 * i, 0]);
+            }
             // is this required?
             positiveColor = "black";
             negativeColor = "black";
@@ -250,16 +314,17 @@ class PriceChart extends React.Component {
 
         // Find max volume
         // let maxVolume = 0;
-        let volumeColors = [], colorByPoint = false;
+        let volumeColors = [],
+            colorByPoint = false;
 
         // if (volumeData.length === priceSeriesData.length) {
         //     colorByPoint = true;
         // }
         // for (let i = 0; i < volumeData.length; i++) {
         //     maxVolume = Math.max(maxVolume, volumeData[i][1]);
-            // if (colorByPoint) {
-            //     volumeColors.push(priceSeriesData[i][1] <= priceSeriesData[i][4] ? positiveColor : negativeColor);
-            // }
+        // if (colorByPoint) {
+        //     volumeColors.push(priceSeriesData[i][1] <= priceSeriesData[i][4] ? positiveColor : negativeColor);
+        // }
         // }
 
         // Find highest price
@@ -331,32 +396,91 @@ class PriceChart extends React.Component {
                 shadow: false,
                 useHTML: true,
                 padding: 0,
-                formatter: function () {
+                formatter: function() {
                     let price_dec = base.get("precision");
                     let vol_dec = quote.get("precision");
-                    let time =  Highcharts.dateFormat("%Y-%m-%d %H:%M", this.x);
-
+                    let time = Highcharts.dateFormat("%Y-%m-%d %H:%M", this.x);
 
                     if (!this.points || this.points.length === 0) {
                         return "";
                     }
 
-                    let TA = (this.points[1] && "indicators" in this.points[1]) ? reduce(this.points[1].indicators, (finalString, indicator, key) => {
-                        return finalString + "<b>" + key.toUpperCase() + "</b>" + ": " + Highcharts.numberFormat(indicator[1], price_dec, ".", ",") + "  ";
-                    }, "") : "";
-
-                    return ("<span style='color: " + colors[theme].tooltipColor +";fill: "+ colors[theme].tooltipFillColor + "'>" +
-                             "<b>Open:&nbsp;&nbsp;&nbsp;</b>" + Highcharts.numberFormat(this.points[1].point.open, price_dec, ".", ",") +
-                             "<b>&nbsp;&nbsp;High:&nbsp;&nbsp;&nbsp;</b>" + Highcharts.numberFormat(this.points[1].point.high, price_dec, ".", ",") +
-                             "<b>&nbsp;&nbsp;Time:&nbsp;&nbsp;&nbsp;</b>" + time +
-                             "<br/><b>Close:&nbsp;&nbsp;</b>" + Highcharts.numberFormat(this.points[1].point.close, price_dec, ".", ",") +
-                             "<b>&nbsp;&nbsp;Low:&nbsp;&nbsp;&nbsp;&nbsp;</b>" + Highcharts.numberFormat(this.points[1].point.low, price_dec, ".", ",") +
-                             "<b>&nbsp;&nbsp;&nbsp;Vol:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>" + Highcharts.numberFormat(this.points[1] ? this.points[0].point.y : 0, vol_dec, ".", ",") + "&nbsp;&nbsp;" + quoteSymbol + "<br/>"
-                             + TA + "</span>");
-
+                    let TA =
+                        this.points[1] && "indicators" in this.points[1]
+                            ? reduce(
+                                  this.points[1].indicators,
+                                  (finalString, indicator, key) => {
+                                      return (
+                                          finalString +
+                                          "<b>" +
+                                          key.toUpperCase() +
+                                          "</b>" +
+                                          ": " +
+                                          Highcharts.numberFormat(
+                                              indicator[1],
+                                              price_dec,
+                                              ".",
+                                              ","
+                                          ) +
+                                          "  "
+                                      );
+                                  },
+                                  ""
+                              )
+                            : "";
+
+                    return (
+                        "<span style='color: " +
+                        colors[theme].tooltipColor +
+                        ";fill: " +
+                        colors[theme].tooltipFillColor +
+                        "'>" +
+                        "<b>Open:&nbsp;&nbsp;&nbsp;</b>" +
+                        Highcharts.numberFormat(
+                            this.points[1].point.open,
+                            price_dec,
+                            ".",
+                            ","
+                        ) +
+                        "<b>&nbsp;&nbsp;High:&nbsp;&nbsp;&nbsp;</b>" +
+                        Highcharts.numberFormat(
+                            this.points[1].point.high,
+                            price_dec,
+                            ".",
+                            ","
+                        ) +
+                        "<b>&nbsp;&nbsp;Time:&nbsp;&nbsp;&nbsp;</b>" +
+                        time +
+                        "<br/><b>Close:&nbsp;&nbsp;</b>" +
+                        Highcharts.numberFormat(
+                            this.points[1].point.close,
+                            price_dec,
+                            ".",
+                            ","
+                        ) +
+                        "<b>&nbsp;&nbsp;Low:&nbsp;&nbsp;&nbsp;&nbsp;</b>" +
+                        Highcharts.numberFormat(
+                            this.points[1].point.low,
+                            price_dec,
+                            ".",
+                            ","
+                        ) +
+                        "<b>&nbsp;&nbsp;&nbsp;Vol:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>" +
+                        Highcharts.numberFormat(
+                            this.points[1] ? this.points[0].point.y : 0,
+                            vol_dec,
+                            ".",
+                            ","
+                        ) +
+                        "&nbsp;&nbsp;" +
+                        quoteSymbol +
+                        "<br/>" +
+                        TA +
+                        "</span>"
+                    );
                 },
-                positioner: function () {
-                    return { x: 50, y: -5 };
+                positioner: function() {
+                    return {x: 50, y: -5};
                 }
             },
             series: [
@@ -374,53 +498,54 @@ class PriceChart extends React.Component {
                     data: priceSeriesData
                 }
             ],
-            yAxis: [{
-                labels: {
-                    style: {
-                        color: colors[theme].axisLabelsColor
+            yAxis: [
+                {
+                    labels: {
+                        style: {
+                            color: colors[theme].axisLabelsColor
+                        },
+                        align: "left",
+                        x: 10,
+                        format: "{value:,." + base.get("precision") + "f}"
                     },
-                    align: "left",
-                    x: 10,
-                    format: "{value:,." + (base.get("precision")) + "f}"
-                },
-                opposite: true,
-                title: {
-                    text: null,
-                    style: {
-                        color: colors[theme].axisLabelsColor
-                    }
-                },
-                offset: 5,
-                lineWidth: 1,
-                lineColor: "rgba(183, 183, 183, 0.29)",
-                gridLineWidth: 0,
-                plotLines: [],
-                crosshair: {
-                    snap: false
-                },
-                startOnTick: false,
-                endOnTick: true,
-                showLastLabel: true,
-                maxPadding: 0,
-                currentPriceIndicator: {
-                    precision: base.get("precision"),
-                    backgroundColor: "#C38B8B",
-                    borderColor: "#000000",
-                    lineColor: "#C38B8B",
-                    lineDashStyle: "Solid",
-                    lineOpacity: 0.8,
-                    enabled: priceSeriesData.length > 0 && marketReady,
-                    style: {
-                        color: "#ffffff",
-                        fontSize: "10px"
+                    opposite: true,
+                    title: {
+                        text: null,
+                        style: {
+                            color: colors[theme].axisLabelsColor
+                        }
                     },
-                    x: -30,
-                    y: 0,
-                    zIndex: 99,
-                    width: 80
+                    offset: 5,
+                    lineWidth: 1,
+                    lineColor: "rgba(183, 183, 183, 0.29)",
+                    gridLineWidth: 0,
+                    plotLines: [],
+                    crosshair: {
+                        snap: false
+                    },
+                    startOnTick: false,
+                    endOnTick: true,
+                    showLastLabel: true,
+                    maxPadding: 0,
+                    currentPriceIndicator: {
+                        precision: base.get("precision"),
+                        backgroundColor: "#C38B8B",
+                        borderColor: "#000000",
+                        lineColor: "#C38B8B",
+                        lineDashStyle: "Solid",
+                        lineOpacity: 0.8,
+                        enabled: priceSeriesData.length > 0 && marketReady,
+                        style: {
+                            color: "#ffffff",
+                            fontSize: "10px"
+                        },
+                        x: -30,
+                        y: 0,
+                        zIndex: 99,
+                        width: 80
+                    },
+                    height: "90%"
                 },
-                height: "90%"
-            },
                 {
                     labels: {
                         style: {
@@ -430,10 +555,20 @@ class PriceChart extends React.Component {
                         x: 10,
                         formatter: function() {
                             if (this.value !== 0) {
-                                if ( this.value > 1000000 ) {
-                                    return Highcharts.numberFormat( this.value / 1000, 2) + "M";
-                                } else if ( this.value > 1000 ) {
-                                    return Highcharts.numberFormat( this.value / 1000, 1) + "k";
+                                if (this.value > 1000000) {
+                                    return (
+                                        Highcharts.numberFormat(
+                                            this.value / 1000,
+                                            2
+                                        ) + "M"
+                                    );
+                                } else if (this.value > 1000) {
+                                    return (
+                                        Highcharts.numberFormat(
+                                            this.value / 1000,
+                                            1
+                                        ) + "k"
+                                    );
                                 } else {
                                     return this.value;
                                 }
@@ -462,7 +597,8 @@ class PriceChart extends React.Component {
                     },
                     height: "50%",
                     top: "50%"
-                }],
+                }
+            ],
             xAxis: {
                 type: "datetime",
                 lineWidth: 1,
@@ -476,8 +612,10 @@ class PriceChart extends React.Component {
                     text: null
                 },
                 plotLines: [],
-                min: this.props.zoom === "all" ? null : new Date().getTime() - 1000 * this.props.zoom
-
+                min:
+                    this.props.zoom === "all"
+                        ? null
+                        : new Date().getTime() - 1000 * this.props.zoom
             }
         };
 
@@ -501,7 +639,8 @@ class PriceChart extends React.Component {
 
         // Fix the height if defined, if not use offsetHeight
         if (this.props.height) {
-            config.chart.height = this.props.height + 20 * currentIndicator.length;
+            config.chart.height =
+                this.props.height + 20 * currentIndicator.length;
         } else if (this.state.offsetHeight) {
             config.chart.height = this.state.offsetHeight;
         }
@@ -521,13 +660,45 @@ class PriceChart extends React.Component {
                     <div className="exchange-content-header">
                         <Translate content="exchange.price_history" />
                         <div className="float-right">
-                            <div style={{marginBottom: -3, marginTop: -6, padding: "3px 8px"}} className="inline-block button outline clickable" onClick={this.props.onChangeSize.bind(this, false)}>-</div>
-                            <div style={{marginBottom: -3, marginTop: -6, padding: "3px 8px"}} className="inline-block button outline clickable" onClick={this.props.onChangeSize.bind(this, true)}>+</div>
+                            <div
+                                style={{
+                                    marginBottom: -3,
+                                    marginTop: -6,
+                                    padding: "3px 8px"
+                                }}
+                                className="inline-block button outline clickable"
+                                onClick={this.props.onChangeSize.bind(
+                                    this,
+                                    false
+                                )}
+                            >
+                                -
+                            </div>
+                            <div
+                                style={{
+                                    marginBottom: -3,
+                                    marginTop: -6,
+                                    padding: "3px 8px"
+                                }}
+                                className="inline-block button outline clickable"
+                                onClick={this.props.onChangeSize.bind(
+                                    this,
+                                    true
+                                )}
+                            >
+                                +
+                            </div>
                         </div>
                     </div>
-                    {!priceSeriesData.length ? <span className="no-data"><Translate content="exchange.no_data" /></span> : null}
+                    {!priceSeriesData.length ? (
+                        <span className="no-data">
+                            <Translate content="exchange.no_data" />
+                        </span>
+                    ) : null}
                     <div style={{paddingTop: 0, paddingBottom: "0.5rem"}}>
-                        {priceSeriesData && volumeData ? <ReactHighstock ref="chart" config={config}/> : null}
+                        {priceSeriesData && volumeData ? (
+                            <ReactHighstock ref="chart" config={config} />
+                        ) : null}
                     </div>
                 </div>
             </div>
diff --git a/app/components/Exchange/PriceChartD3.jsx b/app/components/Exchange/PriceChartD3.jsx
index c85f18dd81..3aef307abd 100644
--- a/app/components/Exchange/PriceChartD3.jsx
+++ b/app/components/Exchange/PriceChartD3.jsx
@@ -1,22 +1,48 @@
 import React from "react";
-import { format } from "d3-format";
-import { timeFormat } from "d3-time-format";
+import {format} from "d3-format";
+import {timeFormat} from "d3-time-format";
 import Translate from "react-translate-component";
-import { ChartCanvas, Chart, series, scale, coordinates, tooltip, axes,
-    indicator, helper, interactive } from "react-stockcharts/es";
-
-const { CandlestickSeries, BarSeries, LineSeries, AreaSeries, BollingerSeries,
-     MACDSeries } = series;
-const { XAxis, YAxis } = axes;
-const { fitWidth } = helper;
-const { discontinuousTimeScaleProvider } = scale;
-const { EdgeIndicator } = coordinates;
-const { ema, sma, macd, bollingerBand } = indicator;
-const { CrossHairCursor, MouseCoordinateX, MouseCoordinateY, CurrentCoordinate } = coordinates;
-const { FibonacciRetracement, TrendLine } = interactive;
-const { OHLCTooltip, MovingAverageTooltip, BollingerBandTooltip, MACDTooltip } = tooltip;
+import {
+    ChartCanvas,
+    Chart,
+    series,
+    scale,
+    coordinates,
+    tooltip,
+    axes,
+    indicator,
+    helper,
+    interactive
+} from "react-stockcharts/es";
+
+const {
+    CandlestickSeries,
+    BarSeries,
+    LineSeries,
+    AreaSeries,
+    BollingerSeries,
+    MACDSeries
+} = series;
+const {XAxis, YAxis} = axes;
+const {fitWidth} = helper;
+const {discontinuousTimeScaleProvider} = scale;
+const {EdgeIndicator} = coordinates;
+const {ema, sma, macd, bollingerBand} = indicator;
+const {
+    CrossHairCursor,
+    MouseCoordinateX,
+    MouseCoordinateY,
+    CurrentCoordinate
+} = coordinates;
+const {FibonacciRetracement, TrendLine} = interactive;
+const {
+    OHLCTooltip,
+    MovingAverageTooltip,
+    BollingerBandTooltip,
+    MACDTooltip
+} = tooltip;
 import colors from "assets/colors";
-import { cloneDeep } from "lodash";
+import {cloneDeep} from "lodash";
 import utils from "common/utils";
 import cnames from "classnames";
 import counterpart from "counterpart";
@@ -35,18 +61,20 @@ class CandleStickChartWithZoomPan extends React.Component {
             timeFormatter,
             volumeFormat,
             priceFormat,
-            margin: {left: 75, right: 75, top:20, bottom: 30},
+            margin: {left: 75, right: 75, top: 20, bottom: 30},
             calculators: this._getCalculators(props)
         };
 
         this.onTrendLineComplete = this.onTrendLineComplete.bind(this);
         this.onFibComplete = this.onFibComplete.bind(this);
         this.onKeyPress = this.onKeyPress.bind(this);
-
     }
 
     componentDidMount() {
-        document.addEventListener("keyup", this.onKeyPress, {capture: false, passive: true});
+        document.addEventListener("keyup", this.onKeyPress, {
+            capture: false,
+            passive: true
+        });
     }
     componentWillUnmount() {
         document.removeEventListener("keyup", this.onKeyPress);
@@ -55,7 +83,13 @@ class CandleStickChartWithZoomPan extends React.Component {
     _getFormats(props = this.props) {
         const pricePrecision = props.base.get("precision");
         const volumePrecision = props.quote.get("precision");
-        const priceFormat = format(`.${props.latest && props.latest.full && props.latest.full >= 0.8 ? 2 : Math.min(6, pricePrecision)}f`);
+        const priceFormat = format(
+            `.${
+                props.latest && props.latest.full && props.latest.full >= 0.8
+                    ? 2
+                    : Math.min(6, pricePrecision)
+            }f`
+        );
         const volumeFormat = format(`.${Math.min(3, volumePrecision)}s`);
         return {priceFormat, volumeFormat};
     }
@@ -77,19 +111,22 @@ class CandleStickChartWithZoomPan extends React.Component {
         const ref = this.refs[tools[tools.length - 1]];
         var keyCode = e.which;
         switch (keyCode) {
-            case 46: { // DEL
+            case 46: {
+                // DEL
                 if (ref) ref.removeLast();
                 tools.pop();
                 this.setState({tools});
                 break;
             }
-            case 27: { // ESC
+            case 27: {
+                // ESC
                 if (ref) ref.terminate();
-                try { // modal uses escape event as well, and this line throws an exception
-                  this.setState({
-                      [enableFib]: false
-                  });
-                } catch(e){}
+                try {
+                    // modal uses escape event as well, and this line throws an exception
+                    this.setState({
+                        [enableFib]: false
+                    });
+                } catch (e) {}
                 break;
             }
         }
@@ -104,15 +141,20 @@ class CandleStickChartWithZoomPan extends React.Component {
         if (np.tools && np.tools.trendline) {
             this.setState({enableTrendLine: true});
             tools.push("enableTrendLine");
-        };
+        }
         if (np.tools && np.tools.fib) {
             this.setState({enableFib: true});
             tools.push("enableFib");
-        };
+        }
         this.setState({tools});
 
-        if (!utils.are_equal_shallow(np.indicators, this.props.indicators) ||
-            !utils.are_equal_shallow(np.indicatorSettings, this.props.indicatorSettings)) {
+        if (
+            !utils.are_equal_shallow(np.indicators, this.props.indicators) ||
+            !utils.are_equal_shallow(
+                np.indicatorSettings,
+                this.props.indicatorSettings
+            )
+        ) {
             this.setState({calculators: this._getCalculators(np)});
         }
     }
@@ -122,8 +164,8 @@ class CandleStickChartWithZoomPan extends React.Component {
     }
 
     _getCalculators(props = this.props) {
-        const { positiveColor, negativeColor } = this._getThemeColors(props);
-        const { indicatorSettings } = props;
+        const {positiveColor, negativeColor} = this._getThemeColors(props);
+        const {indicatorSettings} = props;
         const calculators = {};
 
         calculators.sma = sma()
@@ -131,29 +173,39 @@ class CandleStickChartWithZoomPan extends React.Component {
             .sourcePath("close")
             .stroke("#1f77b4")
             .fill("#1f77b4")
-            .merge((d, c) => {d.sma = c;})
+            .merge((d, c) => {
+                d.sma = c;
+            })
             .accessor(d => d.sma);
 
         calculators.ema1 = ema()
             .windowSize(parseInt(indicatorSettings["ema1"], 10))
-            .merge((d, c) => {d.ema1 = c;})
+            .merge((d, c) => {
+                d.ema1 = c;
+            })
             .accessor(d => d.ema1);
 
         calculators.ema2 = ema()
             .windowSize(parseInt(indicatorSettings["ema2"], 10))
-            .merge((d, c) => {d.ema2 = c;})
+            .merge((d, c) => {
+                d.ema2 = c;
+            })
             .accessor(d => d.ema2);
 
         calculators.smaVolume = sma()
             .windowSize(parseInt(indicatorSettings["smaVolume"], 10))
             .sourcePath("volume")
-            .merge((d, c) => {d.smaVolume = c;})
+            .merge((d, c) => {
+                d.smaVolume = c;
+            })
             .stroke("#1f77b4")
             .fill("#1f77b4")
             .accessor(d => d.smaVolume);
 
         calculators.bb = bollingerBand()
-            .merge((d, c) => {d.bb = c;})
+            .merge((d, c) => {
+                d.bb = c;
+            })
             .accessor(d => d.bb);
 
         calculators.macd = macd()
@@ -161,235 +213,485 @@ class CandleStickChartWithZoomPan extends React.Component {
             .slow(26)
             .signal(9)
             .stroke({macd: negativeColor, signal: positiveColor})
-            .merge((d, c) => {d.macd = c;})
+            .merge((d, c) => {
+                d.macd = c;
+            })
             .accessor(d => d.macd);
 
         return calculators;
     }
 
     _renderVolumeChart(chartMultiplier) {
-        const { height, indicators } = this.props;
-        const { timeFormatter, volumeFormat, calculators } = this.state;
-        const { axisLineColor, volumeColor, indicatorLineColor } = this._getThemeColors();
-
-        return <Chart id={2}
-            yExtents={[d => d.volume, calculators.smaVolume.accessor()]}
-            height={height * 0.2}
-            origin={(w, h) => [0, h - (chartMultiplier * height * 0.2)]}
-        >
-
-            {indicators.macd ? null : <XAxis tickStroke={axisLineColor} stroke={axisLineColor} axisAt="bottom" orient="bottom" opacity={0.5}/>}
-            <YAxis tickFormat={volumeFormat} tickStroke={axisLineColor} stroke={axisLineColor} axisAt="left" orient="left" ticks={4}/>
-
-            {indicators.macd ? null : <MouseCoordinateX id={1}
-                rectWidth={125}
-                at="bottom"
-                orient="bottom"
-                displayFormat={timeFormatter}
-            />}
-
-            <MouseCoordinateY id={1}
-                rectWidth={65}
-                at="left"
-                orient="left"
-                displayFormat={volumeFormat} />
-            <MouseCoordinateY id={0}
-                rectWidth={65}
-                at="right"
-                orient="right"
-                displayFormat={volumeFormat} />
-
-            <BarSeries yAccessor={d => d.volume} fill={volumeColor} />
-            {indicators.smaVolume ? <AreaSeries yAccessor={calculators.smaVolume.accessor()} stroke={calculators.smaVolume.stroke()} fill={calculators.smaVolume.fill()} /> : null}
-
-            {indicators.smaVolume ? <CurrentCoordinate yAccessor={calculators.smaVolume.accessor()} fill={calculators.smaVolume.stroke()} /> : null}
-            <CurrentCoordinate yAccessor={d => d.volume} fill={volumeColor} />
-
-            <EdgeIndicator lineStroke={indicatorLineColor} rectWidth={65} itemType="first" orient="left" edgeAt="left"
-                yAccessor={d => d.volume} displayFormat={volumeFormat} fill="#0F0F0F"/>
-            <EdgeIndicator lineStroke={indicatorLineColor} rectWidth={65} itemType="last" orient="right" edgeAt="right"
-                yAccessor={d => d.volume} displayFormat={volumeFormat} fill="#0F0F0F"/>
-
-            {indicators.smaVolume ? <EdgeIndicator lineStroke={indicatorLineColor} rectWidth={65} itemType="first" orient="left" edgeAt="left"
-                yAccessor={calculators.smaVolume.accessor()} displayFormat={volumeFormat} fill={calculators.smaVolume.fill()}/> : null}
-            {indicators.smaVolume ? <EdgeIndicator lineStroke={indicatorLineColor} rectWidth={65} itemType="last" orient="right" edgeAt="right"
-                yAccessor={calculators.smaVolume.accessor()} displayFormat={volumeFormat} fill={calculators.smaVolume.fill()}/> : null}
-        </Chart>;
+        const {height, indicators} = this.props;
+        const {timeFormatter, volumeFormat, calculators} = this.state;
+        const {
+            axisLineColor,
+            volumeColor,
+            indicatorLineColor
+        } = this._getThemeColors();
+
+        return (
+            <Chart
+                id={2}
+                yExtents={[d => d.volume, calculators.smaVolume.accessor()]}
+                height={height * 0.2}
+                origin={(w, h) => [0, h - chartMultiplier * height * 0.2]}
+            >
+                {indicators.macd ? null : (
+                    <XAxis
+                        tickStroke={axisLineColor}
+                        stroke={axisLineColor}
+                        axisAt="bottom"
+                        orient="bottom"
+                        opacity={0.5}
+                    />
+                )}
+                <YAxis
+                    tickFormat={volumeFormat}
+                    tickStroke={axisLineColor}
+                    stroke={axisLineColor}
+                    axisAt="left"
+                    orient="left"
+                    ticks={4}
+                />
+
+                {indicators.macd ? null : (
+                    <MouseCoordinateX
+                        id={1}
+                        rectWidth={125}
+                        at="bottom"
+                        orient="bottom"
+                        displayFormat={timeFormatter}
+                    />
+                )}
+
+                <MouseCoordinateY
+                    id={1}
+                    rectWidth={65}
+                    at="left"
+                    orient="left"
+                    displayFormat={volumeFormat}
+                />
+                <MouseCoordinateY
+                    id={0}
+                    rectWidth={65}
+                    at="right"
+                    orient="right"
+                    displayFormat={volumeFormat}
+                />
+
+                <BarSeries yAccessor={d => d.volume} fill={volumeColor} />
+                {indicators.smaVolume ? (
+                    <AreaSeries
+                        yAccessor={calculators.smaVolume.accessor()}
+                        stroke={calculators.smaVolume.stroke()}
+                        fill={calculators.smaVolume.fill()}
+                    />
+                ) : null}
+
+                {indicators.smaVolume ? (
+                    <CurrentCoordinate
+                        yAccessor={calculators.smaVolume.accessor()}
+                        fill={calculators.smaVolume.stroke()}
+                    />
+                ) : null}
+                <CurrentCoordinate
+                    yAccessor={d => d.volume}
+                    fill={volumeColor}
+                />
+
+                <EdgeIndicator
+                    lineStroke={indicatorLineColor}
+                    rectWidth={65}
+                    itemType="first"
+                    orient="left"
+                    edgeAt="left"
+                    yAccessor={d => d.volume}
+                    displayFormat={volumeFormat}
+                    fill="#0F0F0F"
+                />
+                <EdgeIndicator
+                    lineStroke={indicatorLineColor}
+                    rectWidth={65}
+                    itemType="last"
+                    orient="right"
+                    edgeAt="right"
+                    yAccessor={d => d.volume}
+                    displayFormat={volumeFormat}
+                    fill="#0F0F0F"
+                />
+
+                {indicators.smaVolume ? (
+                    <EdgeIndicator
+                        lineStroke={indicatorLineColor}
+                        rectWidth={65}
+                        itemType="first"
+                        orient="left"
+                        edgeAt="left"
+                        yAccessor={calculators.smaVolume.accessor()}
+                        displayFormat={volumeFormat}
+                        fill={calculators.smaVolume.fill()}
+                    />
+                ) : null}
+                {indicators.smaVolume ? (
+                    <EdgeIndicator
+                        lineStroke={indicatorLineColor}
+                        rectWidth={65}
+                        itemType="last"
+                        orient="right"
+                        edgeAt="right"
+                        yAccessor={calculators.smaVolume.accessor()}
+                        displayFormat={volumeFormat}
+                        fill={calculators.smaVolume.fill()}
+                    />
+                ) : null}
+            </Chart>
+        );
     }
 
     _renderCandleStickChart(chartMultiplier, maCalcs, last) {
-        const { height, width, showVolumeChart, indicators } = this.props;
-        const { timeFormatter, volumeFormat, priceFormat, margin, enableTrendLine,
-            enableFib, calculators } = this.state;
-        const { positiveColor, negativeColor, strokeColor, axisLineColor, indicatorLineColor } = this._getThemeColors();
+        const {height, width, showVolumeChart, indicators} = this.props;
+        const {
+            timeFormatter,
+            volumeFormat,
+            priceFormat,
+            margin,
+            enableTrendLine,
+            enableFib,
+            calculators
+        } = this.state;
+        const {
+            positiveColor,
+            negativeColor,
+            strokeColor,
+            axisLineColor,
+            indicatorLineColor
+        } = this._getThemeColors();
 
         let gridWidth = width - margin.left - margin.right;
 
         let showGrid = true;
-        let yGrid = showGrid ? { innerTickSize: -1 * gridWidth, tickStrokeOpacity: 0.1 } : {};
-
-        return <Chart
-            id={1}
-            height={height * ((chartMultiplier ? 1 : 0.883) - (0.20 * chartMultiplier))}
-            yExtents={[d => [d.high, d.low], calculators.ema1.accessor(), calculators.ema2.accessor(), calculators.sma.accessor()]}
-            padding={{ top: 10, bottom: 20 }}
-        >
-            {indicators.macd || showVolumeChart ? null :
-                <XAxis tickStroke={axisLineColor} stroke={axisLineColor} axisAt="bottom" orient="bottom" opacity={0.5}/>}
-            <YAxis axisAt="right" orient="right" {...yGrid} ticks={5} tickStroke={axisLineColor} stroke={axisLineColor} />
-
-            {indicators.macd || showVolumeChart ? null :
-            <MouseCoordinateX id={1}
-                rectWidth={125}
-                at="bottom"
-                orient="bottom"
-                displayFormat={timeFormatter}
-            />}
-
-            <MouseCoordinateY id={1}
-                rectWidth={65}
-                at="left"
-                orient="left"
-                displayFormat={priceFormat} />
-
-            <MouseCoordinateY id={0}
-                rectWidth={65}
-                at="right"
-                orient="right"
-                displayFormat={priceFormat} />
-
-            <CandlestickSeries
-                wickStroke={d => d.close > d.open ? positiveColor : negativeColor}
-                fill={d => d.close > d.open ? positiveColor : negativeColor}
-                stroke={d => Math.abs(d.close - d.open) <= (last.high / 200) ? (strokeColor || "#000") : "#000"}
-                opacity={0.8}
-            />
-            {indicators.bb ? <BollingerSeries calculator={calculators.bb} /> : null}
-
-            {indicators.sma ? <LineSeries yAccessor={calculators.sma.accessor()} stroke={calculators.sma.stroke()}/> : null}
-            {indicators.ema1 ? <LineSeries yAccessor={calculators.ema1.accessor()} stroke={calculators.ema1.stroke()}/> : null}
-            {indicators.ema2 ? <LineSeries yAccessor={calculators.ema2.accessor()} stroke={calculators.ema2.stroke()}/> : null}
-
-            {indicators.sma ? <CurrentCoordinate yAccessor={calculators.sma.accessor()} fill={calculators.sma.stroke()} /> : null}
-            {indicators.ema1 ? <CurrentCoordinate yAccessor={calculators.ema1.accessor()} fill={calculators.ema1.stroke()} /> : null}
-            {indicators.ema2 ? <CurrentCoordinate yAccessor={calculators.ema2.accessor()} fill={calculators.ema2.stroke()} /> : null}
-
-            <EdgeIndicator lineStroke={indicatorLineColor} rectWidth={65} itemType="last" orient="right" edgeAt="right"
-                yAccessor={d => d.close} displayFormat={priceFormat} fill={d => d.close > d.open ? positiveColor : negativeColor}
-            />
-            <EdgeIndicator lineStroke={indicatorLineColor} rectWidth={65} itemType="first" orient="left" edgeAt="left"
-                yAccessor={d => d.close} displayFormat={priceFormat} fill={d => d.close > d.open ? positiveColor : negativeColor}
-            />
-
-            <OHLCTooltip
-                xDisplayFormat={timeFormatter}
-                volumeFormat={volumeFormat}
-                ohlcFormat={priceFormat}
-                origin={[-40, -10]}
-            />
-
-            {maCalcs.length ?
-            <MovingAverageTooltip
-                origin={[-40, 0]}
-                calculators={maCalcs}
-            /> : null}
-
-            {indicators.bb ? <BollingerBandTooltip origin={[-40, 40]} calculator={calculators.bb} /> : null}
-
-            <TrendLine ref="enableTrendLine"
-                enabled={enableTrendLine}
-                type="LINE"
-                snap={true} snapTo={d => [d.high, d.low]}
-                onComplete={this.onTrendLineComplete}
-                stroke={axisLineColor}
-                fontStroke={axisLineColor}
-            />
-
-            <FibonacciRetracement ref="enableFib"
-                enabled={enableFib}
-                type="BOUND"
-                onComplete={this.onFibComplete}
-                stroke={axisLineColor}
-                fontStroke={axisLineColor}
-            />
-        </Chart>;
+        let yGrid = showGrid
+            ? {innerTickSize: -1 * gridWidth, tickStrokeOpacity: 0.1}
+            : {};
+
+        return (
+            <Chart
+                id={1}
+                height={
+                    height *
+                    ((chartMultiplier ? 1 : 0.883) - 0.2 * chartMultiplier)
+                }
+                yExtents={[
+                    d => [d.high, d.low],
+                    calculators.ema1.accessor(),
+                    calculators.ema2.accessor(),
+                    calculators.sma.accessor()
+                ]}
+                padding={{top: 10, bottom: 20}}
+            >
+                {indicators.macd || showVolumeChart ? null : (
+                    <XAxis
+                        tickStroke={axisLineColor}
+                        stroke={axisLineColor}
+                        axisAt="bottom"
+                        orient="bottom"
+                        opacity={0.5}
+                    />
+                )}
+                <YAxis
+                    axisAt="right"
+                    orient="right"
+                    {...yGrid}
+                    ticks={5}
+                    tickStroke={axisLineColor}
+                    stroke={axisLineColor}
+                />
+
+                {indicators.macd || showVolumeChart ? null : (
+                    <MouseCoordinateX
+                        id={1}
+                        rectWidth={125}
+                        at="bottom"
+                        orient="bottom"
+                        displayFormat={timeFormatter}
+                    />
+                )}
+
+                <MouseCoordinateY
+                    id={1}
+                    rectWidth={65}
+                    at="left"
+                    orient="left"
+                    displayFormat={priceFormat}
+                />
+
+                <MouseCoordinateY
+                    id={0}
+                    rectWidth={65}
+                    at="right"
+                    orient="right"
+                    displayFormat={priceFormat}
+                />
+
+                <CandlestickSeries
+                    wickStroke={d =>
+                        d.close > d.open ? positiveColor : negativeColor
+                    }
+                    fill={d =>
+                        d.close > d.open ? positiveColor : negativeColor
+                    }
+                    stroke={d =>
+                        Math.abs(d.close - d.open) <= last.high / 200
+                            ? strokeColor || "#000"
+                            : "#000"
+                    }
+                    opacity={0.8}
+                />
+                {indicators.bb ? (
+                    <BollingerSeries calculator={calculators.bb} />
+                ) : null}
+
+                {indicators.sma ? (
+                    <LineSeries
+                        yAccessor={calculators.sma.accessor()}
+                        stroke={calculators.sma.stroke()}
+                    />
+                ) : null}
+                {indicators.ema1 ? (
+                    <LineSeries
+                        yAccessor={calculators.ema1.accessor()}
+                        stroke={calculators.ema1.stroke()}
+                    />
+                ) : null}
+                {indicators.ema2 ? (
+                    <LineSeries
+                        yAccessor={calculators.ema2.accessor()}
+                        stroke={calculators.ema2.stroke()}
+                    />
+                ) : null}
+
+                {indicators.sma ? (
+                    <CurrentCoordinate
+                        yAccessor={calculators.sma.accessor()}
+                        fill={calculators.sma.stroke()}
+                    />
+                ) : null}
+                {indicators.ema1 ? (
+                    <CurrentCoordinate
+                        yAccessor={calculators.ema1.accessor()}
+                        fill={calculators.ema1.stroke()}
+                    />
+                ) : null}
+                {indicators.ema2 ? (
+                    <CurrentCoordinate
+                        yAccessor={calculators.ema2.accessor()}
+                        fill={calculators.ema2.stroke()}
+                    />
+                ) : null}
+
+                <EdgeIndicator
+                    lineStroke={indicatorLineColor}
+                    rectWidth={65}
+                    itemType="last"
+                    orient="right"
+                    edgeAt="right"
+                    yAccessor={d => d.close}
+                    displayFormat={priceFormat}
+                    fill={d =>
+                        d.close > d.open ? positiveColor : negativeColor
+                    }
+                />
+                <EdgeIndicator
+                    lineStroke={indicatorLineColor}
+                    rectWidth={65}
+                    itemType="first"
+                    orient="left"
+                    edgeAt="left"
+                    yAccessor={d => d.close}
+                    displayFormat={priceFormat}
+                    fill={d =>
+                        d.close > d.open ? positiveColor : negativeColor
+                    }
+                />
+
+                <OHLCTooltip
+                    xDisplayFormat={timeFormatter}
+                    volumeFormat={volumeFormat}
+                    ohlcFormat={priceFormat}
+                    origin={[-40, -10]}
+                />
+
+                {maCalcs.length ? (
+                    <MovingAverageTooltip
+                        origin={[-40, 0]}
+                        calculators={maCalcs}
+                    />
+                ) : null}
+
+                {indicators.bb ? (
+                    <BollingerBandTooltip
+                        origin={[-40, 40]}
+                        calculator={calculators.bb}
+                    />
+                ) : null}
+
+                <TrendLine
+                    ref="enableTrendLine"
+                    enabled={enableTrendLine}
+                    type="LINE"
+                    snap={true}
+                    snapTo={d => [d.high, d.low]}
+                    onComplete={this.onTrendLineComplete}
+                    stroke={axisLineColor}
+                    fontStroke={axisLineColor}
+                />
+
+                <FibonacciRetracement
+                    ref="enableFib"
+                    enabled={enableFib}
+                    type="BOUND"
+                    onComplete={this.onFibComplete}
+                    stroke={axisLineColor}
+                    fontStroke={axisLineColor}
+                />
+            </Chart>
+        );
     }
 
     render() {
-        const { width, priceData, height, ratio, theme, zoom,
-            indicators, showVolumeChart, enableChartClamp } = this.props;
-        const { timeFormatter, enableFib, enableTrendLine, margin, calculators } = this.state;
+        const {
+            width,
+            priceData,
+            height,
+            ratio,
+            theme,
+            zoom,
+            indicators,
+            showVolumeChart,
+            enableChartClamp
+        } = this.props;
+        const {
+            timeFormatter,
+            enableFib,
+            enableTrendLine,
+            margin,
+            calculators
+        } = this.state;
         const themeColors = colors[theme];
-        const { axisLineColor, indicatorLineColor} = themeColors;
+        const {axisLineColor, indicatorLineColor} = themeColors;
         let chartMultiplier = showVolumeChart ? 1 : 0; // Used to adjust the height of the charts and their positioning
         // if (indicators.bb) calc.push(bb);
 
         // Indicator calculators
-        let calc = [], maCalcs = [], tooltipIncludes = ["sma", "ema1", "ema2", "smaVolume"];
+        let calc = [],
+            maCalcs = [],
+            tooltipIncludes = ["sma", "ema1", "ema2", "smaVolume"];
 
         // if (showVolumeChart) maCalcs.push(calculators["smaVolume"]);
 
         for (let i in indicators) {
             if (indicators[i]) {
                 // Don't add volume indicators if the volume chart is off
-                if (i.toLowerCase().indexOf("volume") !== -1 && !showVolumeChart) continue;
+                if (
+                    i.toLowerCase().indexOf("volume") !== -1 &&
+                    !showVolumeChart
+                )
+                    continue;
                 // Add active calculators
                 calc.push(calculators[i]);
                 // Add calculators needing tooltips
-                if (tooltipIncludes.indexOf(i) !== -1) maCalcs.push(calculators[i]);
+                if (tooltipIncludes.indexOf(i) !== -1)
+                    maCalcs.push(calculators[i]);
             }
-        };
+        }
         if (indicators["macd"]) chartMultiplier++;
 
-        const filterDate = new Date((new Date).getTime() - zoom * 1000);
-        const filteredData = zoom === "all" ? priceData : priceData.filter(a => {
-            return a.date > filterDate;
-        });
+        const filterDate = new Date(new Date().getTime() - zoom * 1000);
+        const filteredData =
+            zoom === "all"
+                ? priceData
+                : priceData.filter(a => {
+                      return a.date > filterDate;
+                  });
         const last = filteredData[filteredData.length - 1] || {high: 1};
         return (
             <ChartCanvas
-                ratio={ratio} width={width - 20} height={height}
+                ratio={ratio}
+                width={width - 20}
+                height={height}
                 seriesName="PriceChart"
                 margin={margin}
                 clamp={enableChartClamp}
-                data={filteredData} calculator={calc}
-                xAccessor={d => d.date} xScaleProvider={discontinuousTimeScaleProvider}
-                xExtents={[filteredData[0].date, filteredData[filteredData.length - 1].date]}
+                data={filteredData}
+                calculator={calc}
+                xAccessor={d => d.date}
+                xScaleProvider={discontinuousTimeScaleProvider}
+                xExtents={[
+                    filteredData[0].date,
+                    filteredData[filteredData.length - 1].date
+                ]}
                 type="hybrid"
                 className="ps-child no-overflow Stockcharts__wrapper ps-must-propagate"
-                drawMode={enableTrendLine || enableFib}>
+                drawMode={enableTrendLine || enableFib}
             >
-                {showVolumeChart ? this._renderVolumeChart(chartMultiplier)
-                 : <span></span>}
-
+                >
+                {showVolumeChart ? (
+                    this._renderVolumeChart(chartMultiplier)
+                ) : (
+                    <span />
+                )}
                 {this._renderCandleStickChart(chartMultiplier, maCalcs, last)}
-
-                {indicators.macd ?
+                {indicators.macd ? (
                     <Chart
-                        id={3} height={height * 0.2}
+                        id={3}
+                        height={height * 0.2}
                         yExtents={calculators.macd.accessor()}
-                        origin={(w, h) => [0, h - ((chartMultiplier - (showVolumeChart ? 1 : 0) ) * height * 0.2)]}
-                        padding={{ top: 40, bottom: 10 }} >
-                    <XAxis tickStroke={axisLineColor} stroke={axisLineColor} axisAt="bottom" orient="bottom"/>
-                    <YAxis tickStroke={axisLineColor} stroke={axisLineColor} axisAt="right" orient="right" ticks={2} />
-
-                    <MouseCoordinateX
-                        rectWidth={125}
-                        at="bottom"
-                        orient="bottom"
-                        displayFormat={timeFormatter}
-                    />
-                    <MouseCoordinateY
-                        at="right"
-                        orient="right"
-                        displayFormat={format(".2f")}
-                    />
-
-                    <MACDSeries calculator={calculators.macd} />
-                    <MACDTooltip origin={[-40, 35]} calculator={calculators.macd}/>
-                </Chart> : <span></span> /* Need to return an empty element here, null triggers an error */}
-
-                <CrossHairCursor stroke={indicatorLineColor}/>
+                        origin={(w, h) => [
+                            0,
+                            h -
+                                (chartMultiplier - (showVolumeChart ? 1 : 0)) *
+                                    height *
+                                    0.2
+                        ]}
+                        padding={{top: 40, bottom: 10}}
+                    >
+                        <XAxis
+                            tickStroke={axisLineColor}
+                            stroke={axisLineColor}
+                            axisAt="bottom"
+                            orient="bottom"
+                        />
+                        <YAxis
+                            tickStroke={axisLineColor}
+                            stroke={axisLineColor}
+                            axisAt="right"
+                            orient="right"
+                            ticks={2}
+                        />
+
+                        <MouseCoordinateX
+                            rectWidth={125}
+                            at="bottom"
+                            orient="bottom"
+                            displayFormat={timeFormatter}
+                        />
+                        <MouseCoordinateY
+                            at="right"
+                            orient="right"
+                            displayFormat={format(".2f")}
+                        />
+
+                        <MACDSeries calculator={calculators.macd} />
+                        <MACDTooltip
+                            origin={[-40, 35]}
+                            calculator={calculators.macd}
+                        />
+                    </Chart>
+                ) : (
+                    <span />
+                ) /* Need to return an empty element here, null triggers an error */}
+                <CrossHairCursor stroke={indicatorLineColor} />
             </ChartCanvas>
         );
     }
@@ -418,7 +720,10 @@ export default class Wrapper extends React.Component {
         return (
             !utils.are_equal_shallow(np.priceData, this.props.priceData) ||
             !utils.are_equal_shallow(np.indicators, this.props.indicators) ||
-            !utils.are_equal_shallow(np.indicatorSettings, this.props.indicatorSettings) ||
+            !utils.are_equal_shallow(
+                np.indicatorSettings,
+                this.props.indicatorSettings
+            ) ||
             !utils.are_equal_shallow(np.tools, this.props.tools) ||
             !utils.are_equal_shallow(ns, this.state) ||
             np.height !== this.props.height ||
@@ -467,7 +772,10 @@ export default class Wrapper extends React.Component {
             else newState[k] = false;
         }
         if (newState[key]) {
-            document.addEventListener("click", this._listener, {capture: false, passive: true});
+            document.addEventListener("click", this._listener, {
+                capture: false,
+                passive: true
+            });
         }
         this.setState({dropdowns: newState});
     }
@@ -491,136 +799,258 @@ export default class Wrapper extends React.Component {
     }
 
     render() {
-        const {currentPeriod, buckets, bucketSize, indicators,
-            indicatorSettings} = this.props;
+        const {
+            currentPeriod,
+            buckets,
+            bucketSize,
+            indicators,
+            indicatorSettings
+        } = this.props;
         const {dropdowns} = this.state;
 
         // Lower bar
-		let bucketText = function(size) {
-			if (size === "all") {
-				return counterpart.translate("exchange.zoom_all");
-			} else if (size < 60) {
-				return size + "s";
-			} else if (size < 3600) {
-				return (size / 60) + "m";
-			} else if (size < 86400) {
-				return (size / 3600) + "h";
-			} else if (size < 604800) {
-				return (size / 86400) + "d";
-			} else if (size < 2592000) {
-				return (size / 604800) + "w";
-			} else {
-				return (size / 2592000) + "m";
-			}
-		};
-
-		let bucketOptions = buckets.filter(bucket => {
-			return bucket > 60 * 4;
-		}).map(bucket => {
-			return <div key={bucket} className={cnames("label bucket-option", {"active-bucket": bucketSize === bucket})} onClick={this.props.changeBucketSize.bind(this, bucket)}>{bucketText(bucket)}</div>;
-		});
-
-		let oneHour = 3600, oneDay = oneHour * 24;
-		let zoomPeriods = [oneHour * 6, oneHour * 48, oneHour * 48 * 2, oneHour * 24 * 7, oneDay * 14, oneDay * 30, oneDay * 30 * 3, "all"];
-
-		let zoomOptions = zoomPeriods.map(period => {
-			return <div key={period} className={cnames("label bucket-option", {"active-bucket": currentPeriod === period})} onClick={this.props.changeZoomPeriod.bind(this, period)}>{bucketText(period)}</div>;
-		});
-
-		/* Indicators dropdown */
-		const indicatorOptionsVolume = [];
-		const indicatorOptionsPrice = Object.keys(indicators).map(i => {
-			let hasSetting = i in indicatorSettings;
-			let settingInput = hasSetting ?
-				<div style={{float: "right", clear: "both"}}>
-					<div className="inline-block" style={{paddingRight: 5}}><Translate content="exchange.chart_options.period" />:</div>
-					<input style={{margin: 0}} type="number" value={indicatorSettings[i]} onChange={this.props.onChangeIndicatorSetting.bind(null, i)} />
-				</div> : null;
-
-			if (i.toLowerCase().indexOf("volume") !== -1) {
-				if (!this.props.showVolumeChart) return null;
-				indicatorOptionsVolume.push(
-					<li className="indicator" key={i}>
-						<input className="clickable" type="checkbox" checked={indicators[i]} onClick={this.props.onChangeIndicators.bind(null, i)}/>
-						<div onClick={this.props.onChangeIndicators.bind(null, i)} className="clickable"><Translate content={`exchange.chart_options.${i}`} /></div>
-						{ settingInput }
-					</li>
-				);
-			} else {
-				return (
-					<li className="indicator" key={i} >
-						<input className="clickable" type="checkbox" checked={indicators[i]} onClick={this.props.onChangeIndicators.bind(null, i)}/>
-						<div className="clickable"><Translate content={`exchange.chart_options.${i}`} onClick={this.props.onChangeIndicators.bind(null, i)}/></div>
-						{ settingInput }
-					</li>
-				);
-			}
-		}).filter(a => !!a);
-
-		/* Tools dropdown */
-		const toolsOptions = Object.keys(this.props.tools).map(i => {
-			return (
-				<li className="clickable" key={i} onClick={this._toggleTools.bind(this, i)}>
-					<div style={{marginLeft: 5}} className="inline-block">
-						<Translate content={`exchange.chart_options.${i}`} />
-					</div>
-				</li>
-			);
-		});
-
-		/* Tools dropdown */
-		const settingsOptions = ["volume", "height", "clamp_chart"].map(i => {
-			let content;
-			switch (i) {
-				case "height": {
-					content = (
-						<li className="indicator" key={i}>
-							<div style={{marginLeft: 0, paddingRight: 10}}>
-								<div><Translate content="exchange.chart_options.height" />:</div>
-							</div>
-							<div>
-								<input style={{margin: 0, textAlign: "right", maxWidth: 75}} value={this.props.chartHeight} type="number" onChange={this._onInputHeight} />
-							</div>
-						</li>
-					);
-					break;
-				}
-
-				case "volume": {
-					content = (
-						<li className="clickable indicator" key={i} onClick={this.props.onToggleVolume}>
-							<input type="checkbox" checked={this.props.showVolumeChart} />
-							<div><Translate content={`exchange.chart_options.${i}`} /></div>
-						</li>
-					);
-					break;
-				}
-
-				case "clamp_chart": {
-					content = (
-						<li className="clickable indicator" key={i} onClick={this.props.onToggleChartClamp}>
-							<input type="checkbox" checked={this.props.enableChartClamp} />
-							<div><Translate content={`exchange.chart_options.${i}`} /></div>
-						</li>
-					);
-					break;
-				}
-
-				default:{
-					content = (
-						<li key={i}>
-							TBD
-						</li>
-					);
-				}
-			}
-			return content;
-		});
+        let bucketText = function(size) {
+            if (size === "all") {
+                return counterpart.translate("exchange.zoom_all");
+            } else if (size < 60) {
+                return size + "s";
+            } else if (size < 3600) {
+                return size / 60 + "m";
+            } else if (size < 86400) {
+                return size / 3600 + "h";
+            } else if (size < 604800) {
+                return size / 86400 + "d";
+            } else if (size < 2592000) {
+                return size / 604800 + "w";
+            } else {
+                return size / 2592000 + "m";
+            }
+        };
+
+        let bucketOptions = buckets
+            .filter(bucket => {
+                return bucket > 60 * 4;
+            })
+            .map(bucket => {
+                return (
+                    <div
+                        key={bucket}
+                        className={cnames("label bucket-option", {
+                            "active-bucket": bucketSize === bucket
+                        })}
+                        onClick={this.props.changeBucketSize.bind(this, bucket)}
+                    >
+                        {bucketText(bucket)}
+                    </div>
+                );
+            });
+
+        let oneHour = 3600,
+            oneDay = oneHour * 24;
+        let zoomPeriods = [
+            oneHour * 6,
+            oneHour * 48,
+            oneHour * 48 * 2,
+            oneHour * 24 * 7,
+            oneDay * 14,
+            oneDay * 30,
+            oneDay * 30 * 3,
+            "all"
+        ];
+
+        let zoomOptions = zoomPeriods.map(period => {
+            return (
+                <div
+                    key={period}
+                    className={cnames("label bucket-option", {
+                        "active-bucket": currentPeriod === period
+                    })}
+                    onClick={this.props.changeZoomPeriod.bind(this, period)}
+                >
+                    {bucketText(period)}
+                </div>
+            );
+        });
+
+        /* Indicators dropdown */
+        const indicatorOptionsVolume = [];
+        const indicatorOptionsPrice = Object.keys(indicators)
+            .map(i => {
+                let hasSetting = i in indicatorSettings;
+                let settingInput = hasSetting ? (
+                    <div style={{float: "right", clear: "both"}}>
+                        <div className="inline-block" style={{paddingRight: 5}}>
+                            <Translate content="exchange.chart_options.period" />:
+                        </div>
+                        <input
+                            style={{margin: 0}}
+                            type="number"
+                            value={indicatorSettings[i]}
+                            onChange={this.props.onChangeIndicatorSetting.bind(
+                                null,
+                                i
+                            )}
+                        />
+                    </div>
+                ) : null;
+
+                if (i.toLowerCase().indexOf("volume") !== -1) {
+                    if (!this.props.showVolumeChart) return null;
+                    indicatorOptionsVolume.push(
+                        <li className="indicator" key={i}>
+                            <input
+                                className="clickable"
+                                type="checkbox"
+                                checked={indicators[i]}
+                                onClick={this.props.onChangeIndicators.bind(
+                                    null,
+                                    i
+                                )}
+                            />
+                            <div
+                                onClick={this.props.onChangeIndicators.bind(
+                                    null,
+                                    i
+                                )}
+                                className="clickable"
+                            >
+                                <Translate
+                                    content={`exchange.chart_options.${i}`}
+                                />
+                            </div>
+                            {settingInput}
+                        </li>
+                    );
+                } else {
+                    return (
+                        <li className="indicator" key={i}>
+                            <input
+                                className="clickable"
+                                type="checkbox"
+                                checked={indicators[i]}
+                                onClick={this.props.onChangeIndicators.bind(
+                                    null,
+                                    i
+                                )}
+                            />
+                            <div className="clickable">
+                                <Translate
+                                    content={`exchange.chart_options.${i}`}
+                                    onClick={this.props.onChangeIndicators.bind(
+                                        null,
+                                        i
+                                    )}
+                                />
+                            </div>
+                            {settingInput}
+                        </li>
+                    );
+                }
+            })
+            .filter(a => !!a);
+
+        /* Tools dropdown */
+        const toolsOptions = Object.keys(this.props.tools).map(i => {
+            return (
+                <li
+                    className="clickable"
+                    key={i}
+                    onClick={this._toggleTools.bind(this, i)}
+                >
+                    <div style={{marginLeft: 5}} className="inline-block">
+                        <Translate content={`exchange.chart_options.${i}`} />
+                    </div>
+                </li>
+            );
+        });
+
+        /* Tools dropdown */
+        const settingsOptions = ["volume", "height", "clamp_chart"].map(i => {
+            let content;
+            switch (i) {
+                case "height": {
+                    content = (
+                        <li className="indicator" key={i}>
+                            <div style={{marginLeft: 0, paddingRight: 10}}>
+                                <div>
+                                    <Translate content="exchange.chart_options.height" />:
+                                </div>
+                            </div>
+                            <div>
+                                <input
+                                    style={{
+                                        margin: 0,
+                                        textAlign: "right",
+                                        maxWidth: 75
+                                    }}
+                                    value={this.props.chartHeight}
+                                    type="number"
+                                    onChange={this._onInputHeight}
+                                />
+                            </div>
+                        </li>
+                    );
+                    break;
+                }
+
+                case "volume": {
+                    content = (
+                        <li
+                            className="clickable indicator"
+                            key={i}
+                            onClick={this.props.onToggleVolume}
+                        >
+                            <input
+                                type="checkbox"
+                                checked={this.props.showVolumeChart}
+                            />
+                            <div>
+                                <Translate
+                                    content={`exchange.chart_options.${i}`}
+                                />
+                            </div>
+                        </li>
+                    );
+                    break;
+                }
+
+                case "clamp_chart": {
+                    content = (
+                        <li
+                            className="clickable indicator"
+                            key={i}
+                            onClick={this.props.onToggleChartClamp}
+                        >
+                            <input
+                                type="checkbox"
+                                checked={this.props.enableChartClamp}
+                            />
+                            <div>
+                                <Translate
+                                    content={`exchange.chart_options.${i}`}
+                                />
+                            </div>
+                        </li>
+                    );
+                    break;
+                }
+
+                default: {
+                    content = <li key={i}>TBD</li>;
+                }
+            }
+            return content;
+        });
 
         if (!this.props.priceData.length) {
             return (
                 <div className="grid-content text-center">
-                    <div style={{paddingTop: this.props.height / 2, height: this.props.height}}>
+                    <div
+                        style={{
+                            paddingTop: this.props.height / 2,
+                            height: this.props.height
+                        }}
+                    >
                         <Translate content="exchange.no_data" component="h2" />
                     </div>
                 </div>
@@ -630,63 +1060,123 @@ export default class Wrapper extends React.Component {
         const translator = require("counterpart");
 
         return (
-            <div className="no-margin no-padding" style={{overflow: "visible", width: "100%"}}>
+            <div
+                className="no-margin no-padding"
+                style={{overflow: "visible", width: "100%"}}
+            >
                 <CandleStickChartWithZoomPan ref="FitWidth" {...this.props} />
                 <div style={{paddingBottom: 10}}>
-                    <ul style={{justifyContent: "center"}} className="market-stats stats bottom-stats">
+                    <ul
+                        style={{justifyContent: "center"}}
+                        className="market-stats stats bottom-stats"
+                    >
                         {/* Chart controls */}
-                            <li className="stat" data-intro={translator.translate("walkthrough.chart_tool_zoom")}>
+                        <li
+                            className="stat"
+                            data-intro={translator.translate(
+                                "walkthrough.chart_tool_zoom"
+                            )}
+                        >
+                            <span>
                                 <span>
-                                    <span><Translate content="exchange.zoom" />:</span>
-                                    <span>{zoomOptions}</span>
+                                    <Translate content="exchange.zoom" />:
                                 </span>
-                            </li>
-                            <li className="stat" data-intro={translator.translate("walkthrough.chart_tool_duration")}>
+                                <span>{zoomOptions}</span>
+                            </span>
+                        </li>
+                        <li
+                            className="stat"
+                            data-intro={translator.translate(
+                                "walkthrough.chart_tool_duration"
+                            )}
+                        >
+                            <span>
                                 <span>
-                                    <span><Translate content="exchange.time" />:</span>
-                                    <span>{bucketOptions}</span>
+                                    <Translate content="exchange.time" />:
                                 </span>
-                            </li>
-
-                            <li className="stat input custom-dropdown" data-intro={translator.translate("walkthrough.chart_tool_indicators")}>
-                                <div className="v-align indicators clickable" onClick={this._toggleDropdown.bind(this, "indicators")}>
-                                    <Translate content="exchange.chart_options.title" />
-                                </div>
-                                {dropdowns.indicators ?
-                                <div className="custom-dropdown-content" onClick={this._stopPropagation}>
+                                <span>{bucketOptions}</span>
+                            </span>
+                        </li>
+
+                        <li
+                            className="stat input custom-dropdown"
+                            data-intro={translator.translate(
+                                "walkthrough.chart_tool_indicators"
+                            )}
+                        >
+                            <div
+                                className="v-align indicators clickable"
+                                onClick={this._toggleDropdown.bind(
+                                    this,
+                                    "indicators"
+                                )}
+                            >
+                                <Translate content="exchange.chart_options.title" />
+                            </div>
+                            {dropdowns.indicators ? (
+                                <div
+                                    className="custom-dropdown-content"
+                                    onClick={this._stopPropagation}
+                                >
                                     <ul>
-                                        <li className="indicator-title"><Translate content="exchange.chart_options.price_title" /></li>
+                                        <li className="indicator-title">
+                                            <Translate content="exchange.chart_options.price_title" />
+                                        </li>
                                         {indicatorOptionsPrice}
 
-                                        {indicatorOptionsVolume.length ? <li className="indicator-title"><Translate content="exchange.chart_options.volume_title" /></li> : null}
+                                        {indicatorOptionsVolume.length ? (
+                                            <li className="indicator-title">
+                                                <Translate content="exchange.chart_options.volume_title" />
+                                            </li>
+                                        ) : null}
                                         {indicatorOptionsVolume}
                                     </ul>
-                                </div> : null}
-                            </li>
-
-                            <li className="stat input custom-dropdown">
-                                <div className="v-align indicators clickable" onClick={this._toggleDropdown.bind(this, "tools")}>
-                                    <Translate content="exchange.chart_options.tools" />
                                 </div>
-                                {dropdowns.tools ?
-                                <div className="custom-dropdown-content"  onClick={this._stopPropagation}>
-                                    <ul>
-                                        {toolsOptions}
-                                    </ul>
-                                </div> : null}
-                            </li>
-
-                           <li className="stat input custom-dropdown">
-                                <div className="indicators clickable" onClick={this._toggleDropdown.bind(this, "settings")}>
-                                    <Icon className="icon-14px settings-cog" name="cog"/>
+                            ) : null}
+                        </li>
+
+                        <li className="stat input custom-dropdown">
+                            <div
+                                className="v-align indicators clickable"
+                                onClick={this._toggleDropdown.bind(
+                                    this,
+                                    "tools"
+                                )}
+                            >
+                                <Translate content="exchange.chart_options.tools" />
+                            </div>
+                            {dropdowns.tools ? (
+                                <div
+                                    className="custom-dropdown-content"
+                                    onClick={this._stopPropagation}
+                                >
+                                    <ul>{toolsOptions}</ul>
                                 </div>
-                                {dropdowns.settings ?
-                                <div className="custom-dropdown-content" onClick={this._stopPropagation}>
-                                    <ul>
-                                        {settingsOptions}
-                                    </ul>
-                                </div> : null}
-                            </li>
+                            ) : null}
+                        </li>
+
+                        <li className="stat input custom-dropdown">
+                            <div
+                                className="indicators clickable"
+                                onClick={this._toggleDropdown.bind(
+                                    this,
+                                    "settings"
+                                )}
+                            >
+                                <Icon
+                                    className="icon-14px settings-cog"
+                                    name="cog"
+                                />
+                            </div>
+                            {dropdowns.settings ? (
+                                <div
+                                    className="custom-dropdown-content"
+                                    onClick={this._stopPropagation}
+                                >
+                                    <ul>{settingsOptions}</ul>
+                                </div>
+                            ) : null}
+                        </li>
                     </ul>
                 </div>
             </div>
diff --git a/app/components/Exchange/PriceStatWithLabel.jsx b/app/components/Exchange/PriceStatWithLabel.jsx
index b9587cd7d7..d1b23fe75e 100644
--- a/app/components/Exchange/PriceStatWithLabel.jsx
+++ b/app/components/Exchange/PriceStatWithLabel.jsx
@@ -12,7 +12,7 @@ export default class PriceStatWithLabel extends React.Component {
             change: null,
             curMarket: null,
             marketChange: false
-        };        
+        };
     }
 
     shouldComponentUpdate(nextProps) {
@@ -26,24 +26,25 @@ export default class PriceStatWithLabel extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        
         let state = {
             change: 0
         };
-        
+
         let {market} = nextProps;
-        
+
         let checkMarketChange = this.state.curMarket !== market;
-        let marketChange = (this.state.curMarket == null)?false:checkMarketChange;        
-        
+        let marketChange =
+            this.state.curMarket == null ? false : checkMarketChange;
+
         state["marketChange"] = marketChange;
         state["curMarket"] = market;
         state["prevAsset"] = this.state.marketAsset;
-        
+
         if (nextProps.ready && this.props.ready) {
-            state["change"] = parseFloat(nextProps.price) - parseFloat(this.props.price);
+            state["change"] =
+                parseFloat(nextProps.price) - parseFloat(this.props.price);
         }
-        
+
         this.setState(state);
     }
 
@@ -52,25 +53,55 @@ export default class PriceStatWithLabel extends React.Component {
     }
 
     render() {
-        let {base, quote, price, content, ready, volume, toolTip, ignoreColorChange} = this.props;
-        let {change,marketChange} = this.state;
+        let {
+            base,
+            quote,
+            price,
+            content,
+            ready,
+            volume,
+            toolTip,
+            ignoreColorChange
+        } = this.props;
+        let {change, marketChange} = this.state;
         let changeClasses = null;
-        if (!marketChange && change && change !== null && ignoreColorChange !== true) {
+        if (
+            !marketChange &&
+            change &&
+            change !== null &&
+            ignoreColorChange !== true
+        ) {
             changeClasses = change > 0 ? "pulsate green" : "pulsate red";
         }
 
-        let value = !volume ? utils.price_text(price, quote, base) :
-            utils.format_volume(price);
-    
+        let value = !volume
+            ? utils.price_text(price, quote, base)
+            : utils.format_volume(price);
+
         return (
-            <li className={cnames("stressed-stat", this.props.className,changeClasses)} onClick={this.props.onClick} data-place="bottom" data-tip={toolTip}>
+            <li
+                className={cnames(
+                    "stressed-stat",
+                    this.props.className,
+                    changeClasses
+                )}
+                onClick={this.props.onClick}
+                data-place="bottom"
+                data-tip={toolTip}
+            >
                 <span>
                     <span className="value stat-primary">
                         {!ready ? 0 : value}&nbsp;
                     </span>
-                    <span className="symbol-text"><AssetName name={base.get("symbol")} /></span>
+                    <span className="symbol-text">
+                        <AssetName name={base.get("symbol")} />
+                    </span>
                 </span>
-                {content ? <div className="stat-text"><Translate content={content} /></div> : null}
+                {content ? (
+                    <div className="stat-text">
+                        <Translate content={content} />
+                    </div>
+                ) : null}
             </li>
         );
     }
diff --git a/app/components/Explorer/AccountsContainer.jsx b/app/components/Explorer/AccountsContainer.jsx
index cc00c01bf5..2ca36140af 100644
--- a/app/components/Explorer/AccountsContainer.jsx
+++ b/app/components/Explorer/AccountsContainer.jsx
@@ -5,24 +5,24 @@ import Accounts from "./Accounts";
 import Explorer from "./Explorer";
 
 class AccountsContainer extends React.Component {
-    
     render() {
-        let content = 
-              <AltContainer 
-                  stores={[AccountStore]}
-                  inject={{
+        let content = (
+            <AltContainer
+                stores={[AccountStore]}
+                inject={{
                     searchAccounts: () => {
                         return AccountStore.getState().searchAccounts;
                     },
                     searchTerm: () => {
                         return AccountStore.getState().searchTerm;
                     }
-                  }} 
-                  >
+                }}
+            >
                 <Accounts />
-              </AltContainer>;
-                      
-             return (<Explorer tab="accounts" content={content}/>);         
+            </AltContainer>
+        );
+
+        return <Explorer tab="accounts" content={content} />;
     }
 }
 
diff --git a/app/components/Explorer/AssetsContainer.jsx b/app/components/Explorer/AssetsContainer.jsx
index c0b2dba97a..5c53083f37 100644
--- a/app/components/Explorer/AssetsContainer.jsx
+++ b/app/components/Explorer/AssetsContainer.jsx
@@ -6,28 +6,32 @@ import Assets from "./Assets";
 import Explorer from "./Explorer";
 
 class AssetsContainer extends React.Component {
-
     render() {
-        
-        let content = <AltContainer 
-                        stores={[AssetStore, SettingsStore]}
-                        inject={{
-                        assets: () => {
-                                    return AssetStore.getState().assets;
-                        },
-                        filterMPA: () => {
-                                                    return SettingsStore.getState().viewSettings.get("filterMPA");
-                        },
-                        filterUIA: () => {
-                                                    return SettingsStore.getState().viewSettings.get("filterUIA");
-                        }
-                        }} 
-                        >
-                        <Assets/>
-                    </AltContainer>;
-        
-        return (<Explorer tab="assets" content={content}/>);
-        }
+        let content = (
+            <AltContainer
+                stores={[AssetStore, SettingsStore]}
+                inject={{
+                    assets: () => {
+                        return AssetStore.getState().assets;
+                    },
+                    filterMPA: () => {
+                        return SettingsStore.getState().viewSettings.get(
+                            "filterMPA"
+                        );
+                    },
+                    filterUIA: () => {
+                        return SettingsStore.getState().viewSettings.get(
+                            "filterUIA"
+                        );
+                    }
+                }}
+            >
+                <Assets />
+            </AltContainer>
+        );
+
+        return <Explorer tab="assets" content={content} />;
     }
+}
 
-    export default AssetsContainer;
+export default AssetsContainer;
diff --git a/app/components/Explorer/BlocksContainer.jsx b/app/components/Explorer/BlocksContainer.jsx
index fe17682835..b90c117d1c 100644
--- a/app/components/Explorer/BlocksContainer.jsx
+++ b/app/components/Explorer/BlocksContainer.jsx
@@ -5,10 +5,8 @@ import Blocks from "./Blocks";
 import Explorer from "./Explorer";
 
 class BlocksContainer extends React.Component {
-
     render() {
-
-        let content =
+        let content = (
             <AltContainer
                 stores={[BlockchainStore]}
                 inject={{
@@ -19,12 +17,12 @@ class BlocksContainer extends React.Component {
                         return BlockchainStore.getState().latestTransactions;
                     }
                 }}
-                >
-                <Blocks/>
-            </AltContainer>;
-
-        return <Explorer tab="blocks" content={content}/>;
+            >
+                <Blocks />
+            </AltContainer>
+        );
 
+        return <Explorer tab="blocks" content={content} />;
     }
 }
 
diff --git a/app/components/Explorer/BlocktimeChart.jsx b/app/components/Explorer/BlocktimeChart.jsx
index 99e67e325c..7953fd056f 100644
--- a/app/components/Explorer/BlocktimeChart.jsx
+++ b/app/components/Explorer/BlocktimeChart.jsx
@@ -4,9 +4,7 @@ import {takeRight} from "lodash";
 import counterpart from "counterpart";
 
 class BlocktimeChart extends React.Component {
-
     shouldComponentUpdate(nextProps) {
-
         if (nextProps.blockTimes.length < 19) {
             return false;
         } else if (this.props.blockTimes.length === 0) {
@@ -17,13 +15,17 @@ class BlocktimeChart extends React.Component {
         if (chart) {
             let {blockTimes, colors} = this._getData(nextProps);
             let series = chart.series[0];
-            let finalValue = series.xData[series.xData.length -1];
+            let finalValue = series.xData[series.xData.length - 1];
 
             if (series.xData.length) {
                 // console.log(chart, "series:", series.data, "finalValue:", finalValue);
                 blockTimes.forEach(point => {
                     if (point[0] > finalValue) {
-                        series.addPoint(point, false, series.xData.length >= 30);
+                        series.addPoint(
+                            point,
+                            false,
+                            series.xData.length >= 30
+                        );
                     }
                 });
 
@@ -35,7 +37,8 @@ class BlocktimeChart extends React.Component {
         }
 
         return (
-            nextProps.blockTimes[nextProps.blockTimes.length - 1][0] !== this.props.blockTimes[this.props.blockTimes.length - 1][0] ||
+            nextProps.blockTimes[nextProps.blockTimes.length - 1][0] !==
+                this.props.blockTimes[this.props.blockTimes.length - 1][0] ||
             nextProps.blockTimes.length !== this.props.blockTimes.length
         );
     }
@@ -44,7 +47,7 @@ class BlocktimeChart extends React.Component {
         let {blockTimes, head_block} = this.props;
 
         blockTimes.filter(a => {
-            return a[0] >= (head_block - 30);
+            return a[0] >= head_block - 30;
         });
 
         if (blockTimes && blockTimes.length) {
@@ -61,16 +64,15 @@ class BlocktimeChart extends React.Component {
             } else {
                 return "#deb869";
             }
-        })
+        });
 
         return {
             blockTimes,
             colors
-        }
+        };
     }
 
     render() {
-
         let {blockTimes, colors} = this._getData(this.props);
 
         let tooltipLabel = counterpart.translate("explorer.blocks.block_time");
@@ -145,10 +147,10 @@ class BlocktimeChart extends React.Component {
             }
         };
 
-        return (
-            blockTimes.length ? <ReactHighstock ref="chart" config={config}/> : null
-        );
+        return blockTimes.length ? (
+            <ReactHighstock ref="chart" config={config} />
+        ) : null;
     }
-};
+}
 
 export default BlocktimeChart;
diff --git a/app/components/Explorer/CommitteeMembers.jsx b/app/components/Explorer/CommitteeMembers.jsx
index bc5c3e32b3..22ae3e32f0 100644
--- a/app/components/Explorer/CommitteeMembers.jsx
+++ b/app/components/Explorer/CommitteeMembers.jsx
@@ -6,43 +6,65 @@ import BindToChainState from "../Utility/BindToChainState";
 import {ChainStore} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import Translate from "react-translate-component";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import SettingsActions from "actions/SettingsActions";
 import SettingsStore from "stores/SettingsStore";
 import Explorer from "./Explorer";
 
 class CommitteeMemberCard extends React.Component {
-
     static propTypes = {
         committee_member: ChainTypes.ChainAccount.isRequired
     };
 
     static contextTypes = {
         router: React.PropTypes.object.isRequired
-    }
+    };
 
     _onCardClick(e) {
         e.preventDefault();
-        this.context.router.push(`/account/${this.props.committee_member.get("name")}`);
+        this.context.router.push(
+            `/account/${this.props.committee_member.get("name")}`
+        );
     }
 
     render() {
-        let committee_member_data = ChainStore.getCommitteeMemberById( this.props.committee_member.get("id") );
+        let committee_member_data = ChainStore.getCommitteeMemberById(
+            this.props.committee_member.get("id")
+        );
 
         if (!committee_member_data) {
             return null;
         }
 
         return (
-            <div className="grid-content account-card" onClick={this._onCardClick.bind(this)}>
+            <div
+                className="grid-content account-card"
+                onClick={this._onCardClick.bind(this)}
+            >
                 <div className="card">
-                    <h4 className="text-center">{this.props.committee_member.get("name")}</h4>
+                    <h4 className="text-center">
+                        {this.props.committee_member.get("name")}
+                    </h4>
                     <div className="card-content clearfix">
                         <div className="float-left">
-                            <AccountImage account={this.props.committee_member.get("name")} size={{height: 64, width: 64}}/>
+                            <AccountImage
+                                account={this.props.committee_member.get(
+                                    "name"
+                                )}
+                                size={{height: 64, width: 64}}
+                            />
                         </div>
                         <ul className="balances">
-                            <li><Translate content="account.votes.votes" />: <FormattedAsset decimalOffset={5} amount={committee_member_data.get("total_votes")} asset={"1.3.0"}/></li>
+                            <li>
+                                <Translate content="account.votes.votes" />:{" "}
+                                <FormattedAsset
+                                    decimalOffset={5}
+                                    amount={committee_member_data.get(
+                                        "total_votes"
+                                    )}
+                                    asset={"1.3.0"}
+                                />
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -50,60 +72,84 @@ class CommitteeMemberCard extends React.Component {
         );
     }
 }
-CommitteeMemberCard = BindToChainState(CommitteeMemberCard, {keep_updating: true});
+CommitteeMemberCard = BindToChainState(CommitteeMemberCard, {
+    keep_updating: true
+});
 
 class CommitteeMemberRow extends React.Component {
-
     static propTypes = {
         committee_member: ChainTypes.ChainAccount.isRequired
     };
 
     static contextTypes = {
         router: React.PropTypes.object.isRequired
-    }
+    };
 
     _onRowClick(e) {
         e.preventDefault();
-        this.context.router.push(`/account/${this.props.committee_member.get("name")}`);
+        this.context.router.push(
+            `/account/${this.props.committee_member.get("name")}`
+        );
     }
 
     render() {
         let {committee_member, rank} = this.props;
-        let committee_member_data = ChainStore.getCommitteeMemberById( committee_member.get("id") );
-        if ( !committee_member_data ) return null;
+        let committee_member_data = ChainStore.getCommitteeMemberById(
+            committee_member.get("id")
+        );
+        if (!committee_member_data) return null;
 
         let url = committee_member_data.get("url");
-        url = url && url.length > 0 && url.indexOf("http") === -1 ? "http://" + url : url;
+        url =
+            url && url.length > 0 && url.indexOf("http") === -1
+                ? "http://" + url
+                : url;
 
         return (
             <tr>
                 <td onClick={this._onRowClick.bind(this)}>{rank}</td>
-                <td onClick={this._onRowClick.bind(this)}>{committee_member.get("name")}</td>
-                <td onClick={this._onRowClick.bind(this)}><FormattedAsset amount={committee_member_data.get("total_votes")} asset="1.3.0" /></td>
-                <td><a href={url} rel="noopener noreferrer" target="_blank">{committee_member_data.get("url")}</a></td>
+                <td onClick={this._onRowClick.bind(this)}>
+                    {committee_member.get("name")}
+                </td>
+                <td onClick={this._onRowClick.bind(this)}>
+                    <FormattedAsset
+                        amount={committee_member_data.get("total_votes")}
+                        asset="1.3.0"
+                    />
+                </td>
+                <td>
+                    <a href={url} rel="noopener noreferrer" target="_blank">
+                        {committee_member_data.get("url")}
+                    </a>
+                </td>
             </tr>
         );
     }
 }
-CommitteeMemberRow = BindToChainState(CommitteeMemberRow, {keep_updating: true});
+CommitteeMemberRow = BindToChainState(CommitteeMemberRow, {
+    keep_updating: true
+});
 
 class CommitteeMemberList extends React.Component {
     static propTypes = {
         committee_members: ChainTypes.ChainObjectsList.isRequired
-    }
+    };
 
-    constructor () {
+    constructor() {
         super();
         this.state = {
-          sortBy: 'rank',
-          inverseSort: true
+            sortBy: "rank",
+            inverseSort: true
         };
     }
 
     _setSort(field) {
         this.setState({
             sortBy: field,
-            inverseSort: field === this.state.sortBy ? !this.state.inverseSort : this.state.inverseSort
+            inverseSort:
+                field === this.state.sortBy
+                    ? !this.state.inverseSort
+                    : this.state.inverseSort
         });
     }
 
@@ -116,45 +162,61 @@ class CommitteeMemberList extends React.Component {
         let ranks = {};
 
         committee_members
-        .filter(a => {
-            if (!a) {
-                return false;
-            }
-            return membersList.indexOf(a.get("id")) !== -1;
-        })
-        .sort((a, b) => {
-            if (a && b) {
-                return parseInt(b.get("total_votes"), 10) - parseInt(a.get("total_votes"), 10);
-            }
-        })
-        .forEach( (c, index) => {
-            if (c) {
-                ranks[c.get("id")] = index + 1;
-            }
-        });
+            .filter(a => {
+                if (!a) {
+                    return false;
+                }
+                return membersList.indexOf(a.get("id")) !== -1;
+            })
+            .sort((a, b) => {
+                if (a && b) {
+                    return (
+                        parseInt(b.get("total_votes"), 10) -
+                        parseInt(a.get("total_votes"), 10)
+                    );
+                }
+            })
+            .forEach((c, index) => {
+                if (c) {
+                    ranks[c.get("id")] = index + 1;
+                }
+            });
 
         if (committee_members.length > 0 && committee_members[1]) {
             itemRows = committee_members
                 .filter(a => {
-                    if (!a) {return false; }
-                    let account = ChainStore.getObject(a.get("committee_member_account"));
-                    if (!account) { return false; }
-
-                    return account.get("name").indexOf(this.props.filter) !== -1;
+                    if (!a) {
+                        return false;
+                    }
+                    let account = ChainStore.getObject(
+                        a.get("committee_member_account")
+                    );
+                    if (!account) {
+                        return false;
+                    }
 
+                    return (
+                        account.get("name").indexOf(this.props.filter) !== -1
+                    );
                 })
                 .sort((a, b) => {
-                    let a_account = ChainStore.getObject(a.get("committee_member_account"));
-                    let b_account = ChainStore.getObject(b.get("committee_member_account"));
+                    let a_account = ChainStore.getObject(
+                        a.get("committee_member_account")
+                    );
+                    let b_account = ChainStore.getObject(
+                        b.get("committee_member_account")
+                    );
                     if (!a_account || !b_account) {
                         return 0;
                     }
 
                     switch (sortBy) {
-                        case 'name':
+                        case "name":
                             if (a_account.get("name") > b_account.get("name")) {
                                 return inverseSort ? 1 : -1;
-                            } else if (a_account.get("name") < b_account.get("name")) {
+                            } else if (
+                                a_account.get("name") < b_account.get("name")
+                            ) {
                                 return inverseSort ? -1 : 1;
                             } else {
                                 return 0;
@@ -162,21 +224,39 @@ class CommitteeMemberList extends React.Component {
                             break;
 
                         case "rank":
-                            return !inverseSort ? ranks[b.get("id")] - ranks[a.get("id")] : ranks[a.get("id")] - ranks[b.get("id")];
+                            return !inverseSort
+                                ? ranks[b.get("id")] - ranks[a.get("id")]
+                                : ranks[a.get("id")] - ranks[b.get("id")];
                             break;
 
                         default:
-                            return !inverseSort ? parseInt(b.get(sortBy), 10) - parseInt(a.get(sortBy), 10) : parseInt(a.get(sortBy), 10) - parseInt(b.get(sortBy), 10);
+                            return !inverseSort
+                                ? parseInt(b.get(sortBy), 10) -
+                                      parseInt(a.get(sortBy), 10)
+                                : parseInt(a.get(sortBy), 10) -
+                                      parseInt(b.get(sortBy), 10);
                     }
                 })
-                .map((a) => {
+                .map(a => {
                     if (!cardView) {
                         return (
-                            <CommitteeMemberRow key={a.get("id")} rank={ranks[a.get("id")]} committee_member={a.get("committee_member_account")} />
+                            <CommitteeMemberRow
+                                key={a.get("id")}
+                                rank={ranks[a.get("id")]}
+                                committee_member={a.get(
+                                    "committee_member_account"
+                                )}
+                            />
                         );
                     } else {
                         return (
-                            <CommitteeMemberCard key={a.get("id")} rank={ranks[a.get("id")]} committee_member={a.get("committee_member_account")} />
+                            <CommitteeMemberCard
+                                key={a.get("id")}
+                                rank={ranks[a.get("id")]}
+                                committee_member={a.get(
+                                    "committee_member_account"
+                                )}
+                            />
                         );
                     }
                 });
@@ -188,20 +268,36 @@ class CommitteeMemberList extends React.Component {
                 <table className="table table-hover">
                     <thead>
                         <tr>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'rank')}><Translate content="explorer.witnesses.rank" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'name')}><Translate content="account.votes.name" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'total_votes')}><Translate content="account.votes.votes" /></th>
-                            <th ><Translate content="account.votes.url" /></th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(this, "rank")}
+                            >
+                                <Translate content="explorer.witnesses.rank" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(this, "name")}
+                            >
+                                <Translate content="account.votes.name" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(
+                                    this,
+                                    "total_votes"
+                                )}
+                            >
+                                <Translate content="account.votes.votes" />
+                            </th>
+                            <th>
+                                <Translate content="account.votes.url" />
+                            </th>
                         </tr>
                     </thead>
-                <tbody>
-                    {itemRows}
-                </tbody>
-
-            </table>
-            )
-        }
-        else {
+                    <tbody>{itemRows}</tbody>
+                </table>
+            );
+        } else {
             return (
                 <div className="grid-block no-margin small-up-1 medium-up-2 large-up-3">
                     {itemRows}
@@ -210,17 +306,19 @@ class CommitteeMemberList extends React.Component {
         }
     }
 }
-CommitteeMemberList = BindToChainState(CommitteeMemberList, {keep_updating: true, show_loader: true});
+CommitteeMemberList = BindToChainState(CommitteeMemberList, {
+    keep_updating: true,
+    show_loader: true
+});
 
 class CommitteeMembers extends React.Component {
-
     static propTypes = {
         globalObject: ChainTypes.ChainObject.isRequired
-    }
+    };
 
     static defaultProps = {
         globalObject: "2.0.0"
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -233,7 +331,8 @@ class CommitteeMembers extends React.Component {
     shouldComponentUpdate(nextProps, nextState) {
         return (
             !Immutable.is(nextProps.globalObject, this.props.globalObject) ||
-            nextState.filterCommitteeMember !== this.state.filterCommitteeMember ||
+            nextState.filterCommitteeMember !==
+                this.state.filterCommitteeMember ||
             nextState.cardView !== this.state.cardView
         );
     }
@@ -264,50 +363,77 @@ class CommitteeMembers extends React.Component {
         let activeCommitteeMembers = [];
         for (let key in globalObject.active_committee_members) {
             if (globalObject.active_committee_members.hasOwnProperty(key)) {
-                activeCommitteeMembers.push(globalObject.active_committee_members[key]);
+                activeCommitteeMembers.push(
+                    globalObject.active_committee_members[key]
+                );
             }
         }
 
-        let content = 
+        let content = (
             <div className="grid-block">
                 <div className="grid-block vertical medium-horizontal">
                     <div className="grid-block shrink">
                         <div className="grid-content">
-                            <h5><Translate content="explorer.committee_members.active" />: {Object.keys(globalObject.active_committee_members).length}</h5>
-                            <br/>
+                            <h5>
+                                <Translate content="explorer.committee_members.active" />:{" "}
+                                {
+                                    Object.keys(
+                                        globalObject.active_committee_members
+                                    ).length
+                                }
+                            </h5>
+                            <br />
                             <div className="view-switcher">
-                                <span className="button outline" onClick={this._toggleView.bind(this)}>{!this.state.cardView ? <Translate content="explorer.witnesses.card"/> : <Translate content="explorer.witnesses.table"/>}</span>
+                                <span
+                                    className="button outline"
+                                    onClick={this._toggleView.bind(this)}
+                                >
+                                    {!this.state.cardView ? (
+                                        <Translate content="explorer.witnesses.card" />
+                                    ) : (
+                                        <Translate content="explorer.witnesses.table" />
+                                    )}
+                                </span>
                             </div>
                         </div>
-
                     </div>
                     <div className="grid-block vertical">
-                            <div className="grid-block vertical shrink">
-                                <Translate component="h3" content="markets.filter" />
-                                <input type="text" value={this.state.filterCommitteeMember} onChange={this._onFilter.bind(this)} />
-                            </div>
-                            <div className="grid-content">
-                                <CommitteeMemberList
-                                    committee_members={Immutable.List(globalObject.active_committee_members)}
-                                    membersList={globalObject.active_committee_members}
-                                    filter={this.state.filterCommitteeMember}
-                                    cardView={this.state.cardView}
-                                />
-                            </div>
+                        <div className="grid-block vertical shrink">
+                            <Translate
+                                component="h3"
+                                content="markets.filter"
+                            />
+                            <input
+                                type="text"
+                                value={this.state.filterCommitteeMember}
+                                onChange={this._onFilter.bind(this)}
+                            />
+                        </div>
+                        <div className="grid-content">
+                            <CommitteeMemberList
+                                committee_members={Immutable.List(
+                                    globalObject.active_committee_members
+                                )}
+                                membersList={
+                                    globalObject.active_committee_members
+                                }
+                                filter={this.state.filterCommitteeMember}
+                                cardView={this.state.cardView}
+                            />
                         </div>
+                    </div>
                 </div>
             </div>
-        ;
-        
-        return (<Explorer tab="committee_members" content={content}/>);
-        
+        );
+
+        return <Explorer tab="committee_members" content={content} />;
     }
 }
 CommitteeMembers = BindToChainState(CommitteeMembers, {keep_updating: true});
 
 class CommitteeMembersStoreWrapper extends React.Component {
-    render () {
-        return <CommitteeMembers {...this.props}/>;
+    render() {
+        return <CommitteeMembers {...this.props} />;
     }
 }
 
@@ -317,8 +443,12 @@ CommitteeMembersStoreWrapper = connect(CommitteeMembersStoreWrapper, {
     },
     getProps() {
         return {
-            cardView: SettingsStore.getState().viewSettings.get("cardViewCommittee"),
-            filterCommitteeMember: SettingsStore.getState().viewSettings.get("filterCommitteeMember"),
+            cardView: SettingsStore.getState().viewSettings.get(
+                "cardViewCommittee"
+            ),
+            filterCommitteeMember: SettingsStore.getState().viewSettings.get(
+                "filterCommitteeMember"
+            )
         };
     }
 });
diff --git a/app/components/Explorer/Explorer.jsx b/app/components/Explorer/Explorer.jsx
index 774c43d775..9c6af04a41 100644
--- a/app/components/Explorer/Explorer.jsx
+++ b/app/components/Explorer/Explorer.jsx
@@ -2,7 +2,6 @@ import React from "react";
 import {Tabs, Tab} from "../Utility/Tabs";
 
 class Explorer extends React.Component {
-
     static propTypes = {
         tab: React.PropTypes.string,
         content: React.PropTypes.object
@@ -17,36 +16,71 @@ class Explorer extends React.Component {
         super(props);
 
         this.state = {
-            "tabs": [
-                {name: "blocks", link: "/explorer/blocks", "translate": "explorer.blocks.title"},
-                {name: "assets", link: "/explorer/assets", "translate": "explorer.assets.title"},
-                {name: "accounts", link: "/explorer/accounts", "translate": "explorer.accounts.title"},
-                {name: "witnesses", link: "/explorer/witnesses", "translate": "explorer.witnesses.title"},
-                {name: "committee_members", link: "/explorer/committee-members", "translate": "explorer.committee_members.title"},
-                {name: "markets", link: "/explorer/markets", "translate": "markets.title"},
-                {name: "fees", link: "/explorer/fees", "translate": "fees.title"}
+            tabs: [
+                {
+                    name: "blocks",
+                    link: "/explorer/blocks",
+                    translate: "explorer.blocks.title"
+                },
+                {
+                    name: "assets",
+                    link: "/explorer/assets",
+                    translate: "explorer.assets.title"
+                },
+                {
+                    name: "accounts",
+                    link: "/explorer/accounts",
+                    translate: "explorer.accounts.title"
+                },
+                {
+                    name: "witnesses",
+                    link: "/explorer/witnesses",
+                    translate: "explorer.witnesses.title"
+                },
+                {
+                    name: "committee_members",
+                    link: "/explorer/committee-members",
+                    translate: "explorer.committee_members.title"
+                },
+                {
+                    name: "markets",
+                    link: "/explorer/markets",
+                    translate: "markets.title"
+                },
+                {name: "fees", link: "/explorer/fees", translate: "fees.title"}
             ]
         };
     }
 
     render() {
-        
-        let defaultActiveTab = this.state.tabs.findIndex(t => t.name === this.props.tab);
-        
+        let defaultActiveTab = this.state.tabs.findIndex(
+            t => t.name === this.props.tab
+        );
+
         let tabs = [];
-        
+
         for (var i = 0; i < this.state.tabs.length; i++) {
             let currentTab = this.state.tabs[i];
 
-            let tabContent = (defaultActiveTab==i)?this.props.content:null;            
-            let isLinkTo=(defaultActiveTab==i)?"":currentTab.link;
-            
-            tabs.push(<Tab key={i} title={currentTab.translate} isLinkTo={isLinkTo}>{tabContent}</Tab>);
+            let tabContent = defaultActiveTab == i ? this.props.content : null;
+            let isLinkTo = defaultActiveTab == i ? "" : currentTab.link;
+
+            tabs.push(
+                <Tab key={i} title={currentTab.translate} isLinkTo={isLinkTo}>
+                    {tabContent}
+                </Tab>
+            );
         }
-        
-        
+
         return (
-            <Tabs defaultActiveTab={defaultActiveTab} segmented={false} setting="explorerTab-{this.props.tab}" className="account-tabs" tabsClass="account-overview bordered-header content-block" contentClass="tab-content padding">
+            <Tabs
+                defaultActiveTab={defaultActiveTab}
+                segmented={false}
+                setting="explorerTab-{this.props.tab}"
+                className="account-tabs"
+                tabsClass="account-overview bordered-header content-block"
+                contentClass="tab-content padding"
+            >
                 {tabs}
             </Tabs>
         );
diff --git a/app/components/Explorer/FeesContainer.jsx b/app/components/Explorer/FeesContainer.jsx
index 56eff4219d..4fe4221d0f 100644
--- a/app/components/Explorer/FeesContainer.jsx
+++ b/app/components/Explorer/FeesContainer.jsx
@@ -1,17 +1,13 @@
 import React from "react";
 import Explorer from "./Explorer";
-import RealFeesContainer from "../Blockchain/FeesContainer"
-
+import RealFeesContainer from "../Blockchain/FeesContainer";
 
 class FeesContainer extends React.Component {
-
     render() {
+        let content = <RealFeesContainer />;
 
-        let content = <RealFeesContainer/>;
-
-        return (<Explorer tab="fees" content={content}/>);
-
+        return <Explorer tab="fees" content={content} />;
     }
 }
 
-export default FeesContainer;
\ No newline at end of file
+export default FeesContainer;
diff --git a/app/components/Explorer/MarketsContainer.jsx b/app/components/Explorer/MarketsContainer.jsx
index ccd7719507..92b0a366a5 100644
--- a/app/components/Explorer/MarketsContainer.jsx
+++ b/app/components/Explorer/MarketsContainer.jsx
@@ -1,17 +1,13 @@
 import React from "react";
 import Explorer from "./Explorer";
-import RealMarketsContainer from "../Exchange/MarketsContainer"
-
+import RealMarketsContainer from "../Exchange/MarketsContainer";
 
 class MarketsContainer extends React.Component {
-
     render() {
+        let content = <RealMarketsContainer />;
 
-        let content = <RealMarketsContainer/>;
-
-        return (<Explorer tab="markets" content={content}/>);
-
+        return <Explorer tab="markets" content={content} />;
     }
 }
 
-export default MarketsContainer;
\ No newline at end of file
+export default MarketsContainer;
diff --git a/app/components/Explorer/TransactionChart.jsx b/app/components/Explorer/TransactionChart.jsx
index bf6a3e06f2..a9793ab965 100644
--- a/app/components/Explorer/TransactionChart.jsx
+++ b/app/components/Explorer/TransactionChart.jsx
@@ -3,7 +3,6 @@ import ReactHighstock from "react-highcharts/dist/ReactHighstock";
 import counterpart from "counterpart";
 
 class TransactionChart extends React.Component {
-
     shouldComponentUpdate(nextProps) {
         if (nextProps.blocks.size < 20) {
             return false;
@@ -12,13 +11,17 @@ class TransactionChart extends React.Component {
         if (chart && nextProps.blocks !== this.props.blocks) {
             let {trxData, colors} = this._getData(nextProps);
             let series = chart.series[0];
-            let finalValue = series.xData[series.xData.length -1];
+            let finalValue = series.xData[series.xData.length - 1];
 
             // console.log("chart:", chart, "series:", series.data, "finalValue:", finalValue);
             if (series.xData.length) {
                 trxData.forEach(point => {
                     if (point[0] > finalValue) {
-                        series.addPoint(point, false, series.xData.length >= 30);
+                        series.addPoint(
+                            point,
+                            false,
+                            series.xData.length >= 30
+                        );
                     }
                 });
 
@@ -40,14 +43,18 @@ class TransactionChart extends React.Component {
         let trxData = [];
         let max = 0;
         trxData = blocks
-        .filter(a => {
-            return a.id >= head_block - 30;
-        }).sort((a, b) => {
-            return a.id - b.id;
-        }).takeLast(30).map(block => {
-            max = Math.max(block.transactions.length, max);
-            return [block.id, block.transactions.length];
-        }).toArray();
+            .filter(a => {
+                return a.id >= head_block - 30;
+            })
+            .sort((a, b) => {
+                return a.id - b.id;
+            })
+            .takeLast(30)
+            .map(block => {
+                max = Math.max(block.transactions.length, max);
+                return [block.id, block.transactions.length];
+            })
+            .toArray();
 
         let colors = trxData.map(entry => {
             // console.log("entry:", entry);
@@ -60,19 +67,21 @@ class TransactionChart extends React.Component {
             } else {
                 return "#deb869";
             }
-        })
+        });
 
         return {
             colors,
             trxData,
             max
-        }
+        };
     }
 
     render() {
         let {trxData, colors, max} = this._getData(this.props);
 
-        let tooltipLabel = counterpart.translate("explorer.blocks.transactions");
+        let tooltipLabel = counterpart.translate(
+            "explorer.blocks.transactions"
+        );
 
         let config = {
             chart: {
@@ -145,10 +154,10 @@ class TransactionChart extends React.Component {
             }
         };
 
-        return (
-            trxData.length ? <ReactHighstock ref="trx_chart" config={config}/> : null
-        );
+        return trxData.length ? (
+            <ReactHighstock ref="trx_chart" config={config} />
+        ) : null;
     }
-};
+}
 
 export default TransactionChart;
diff --git a/app/components/Explorer/Witnesses.jsx b/app/components/Explorer/Witnesses.jsx
index ba7677ec9c..d5ad964e46 100644
--- a/app/components/Explorer/Witnesses.jsx
+++ b/app/components/Explorer/Witnesses.jsx
@@ -7,7 +7,7 @@ import {ChainStore} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import Translate from "react-translate-component";
 import TimeAgo from "../Utility/TimeAgo";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import SettingsActions from "actions/SettingsActions";
 import SettingsStore from "stores/SettingsStore";
 import classNames from "classnames";
@@ -16,14 +16,13 @@ import Explorer from "./Explorer";
 require("./witnesses.scss");
 
 class WitnessCard extends React.Component {
-
     static propTypes = {
         witness: ChainTypes.ChainAccount.isRequired
-    }
+    };
 
     static contextTypes = {
         router: React.PropTypes.object.isRequired
-    }
+    };
 
     _onCardClick(e) {
         e.preventDefault();
@@ -31,42 +30,69 @@ class WitnessCard extends React.Component {
     }
 
     render() {
-        let witness_data = ChainStore.getWitnessById( this.props.witness.get('id') )
-        if ( !witness_data ) return null;
-        let total_votes = witness_data.get( "total_votes" );
+        let witness_data = ChainStore.getWitnessById(
+            this.props.witness.get("id")
+        );
+        if (!witness_data) return null;
+        let total_votes = witness_data.get("total_votes");
 
-        let witness_aslot = witness_data.get('last_aslot')
+        let witness_aslot = witness_data.get("last_aslot");
         let color = {};
-        if( this.props.most_recent - witness_aslot > 100 ) {
-           color = {borderLeft: "1px solid #FCAB53"};
-        }
-        else {
-           color = {borderLeft: "1px solid #50D2C2"};
+        if (this.props.most_recent - witness_aslot > 100) {
+            color = {borderLeft: "1px solid #FCAB53"};
+        } else {
+            color = {borderLeft: "1px solid #50D2C2"};
         }
-        let last_aslot_time = new Date(Date.now() - ((this.props.most_recent - witness_aslot ) * ChainStore.getObject( "2.0.0" ).getIn( ["parameters","block_interval"] )*1000));
+        let last_aslot_time = new Date(
+            Date.now() -
+                (this.props.most_recent - witness_aslot) *
+                    ChainStore.getObject("2.0.0").getIn([
+                        "parameters",
+                        "block_interval"
+                    ]) *
+                    1000
+        );
 
         return (
-            <div className="grid-content account-card" onClick={this._onCardClick.bind(this)}>
+            <div
+                className="grid-content account-card"
+                onClick={this._onCardClick.bind(this)}
+            >
                 <div className="card" style={color}>
-                    <h4 className="text-center">#{this.props.rank}: {this.props.witness.get('name')}</h4>
+                    <h4 className="text-center">
+                        #{this.props.rank}: {this.props.witness.get("name")}
+                    </h4>
                     <div className="card-content">
                         <div className="text-center">
-                            <AccountImage account={this.props.witness.get('name')} size={{height: 64, width: 64}}/>
+                            <AccountImage
+                                account={this.props.witness.get("name")}
+                                size={{height: 64, width: 64}}
+                            />
                         </div>
-                        <br/>
+                        <br />
                         <table className="table key-value-table">
                             <tbody>
                                 <tr>
                                     <td>Votes</td>
-                                    <td><FormattedAsset amount={total_votes} asset="1.3.0" decimalOffset={5} /></td>
+                                    <td>
+                                        <FormattedAsset
+                                            amount={total_votes}
+                                            asset="1.3.0"
+                                            decimalOffset={5}
+                                        />
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>Last&nbsp;Block</td>
-                                    <td><TimeAgo time={new Date(last_aslot_time)} /></td>
+                                    <td>
+                                        <TimeAgo
+                                            time={new Date(last_aslot_time)}
+                                        />
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>Missed</td>
-                                    <td>{witness_data.get('total_missed')}</td>
+                                    <td>{witness_data.get("total_missed")}</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -79,14 +105,13 @@ class WitnessCard extends React.Component {
 WitnessCard = BindToChainState(WitnessCard, {keep_updating: true});
 
 class WitnessRow extends React.Component {
-
     static propTypes = {
         witness: ChainTypes.ChainAccount.isRequired
-    }
+    };
 
     static contextTypes = {
         router: React.PropTypes.object.isRequired
-    }
+    };
 
     _onRowClick(e) {
         e.preventDefault();
@@ -99,109 +124,139 @@ class WitnessRow extends React.Component {
 
     render() {
         let {witness, isCurrent, rank} = this.props;
-        let witness_data = ChainStore.getWitnessById( this.props.witness.get('id') );
-        if ( !witness_data ) return null;
-        let total_votes = witness_data.get( "total_votes" );
+        let witness_data = ChainStore.getWitnessById(
+            this.props.witness.get("id")
+        );
+        if (!witness_data) return null;
+        let total_votes = witness_data.get("total_votes");
 
-        let witness_aslot = witness_data.get('last_aslot')
+        let witness_aslot = witness_data.get("last_aslot");
         let color = {};
-        if( this.props.most_recent - witness_aslot > 100 ) {
-           color = {borderLeft: "1px solid #FCAB53"};
-        }
-        else {
-           color = {borderLeft: "1px solid #50D2C2"};
+        if (this.props.most_recent - witness_aslot > 100) {
+            color = {borderLeft: "1px solid #FCAB53"};
+        } else {
+            color = {borderLeft: "1px solid #50D2C2"};
         }
-        let last_aslot_time = new Date(Date.now() - ((this.props.most_recent - witness_aslot ) * ChainStore.getObject( "2.0.0" ).getIn( ["parameters","block_interval"] )*1000));
+        let last_aslot_time = new Date(
+            Date.now() -
+                (this.props.most_recent - witness_aslot) *
+                    ChainStore.getObject("2.0.0").getIn([
+                        "parameters",
+                        "block_interval"
+                    ]) *
+                    1000
+        );
 
         let currentClass = isCurrent ? "active-witness" : "";
 
-        let missed = witness_data.get('total_missed');
-        let missedClass = classNames("txtlabel",
-            {"success": missed <= 500 },
-            {"info": missed > 500 && missed <= 1250},
-            {"warning": missed > 1250 && missed <= 2000},
-            {"error": missed >= 200}
+        let missed = witness_data.get("total_missed");
+        let missedClass = classNames(
+            "txtlabel",
+            {success: missed <= 500},
+            {info: missed > 500 && missed <= 1250},
+            {warning: missed > 1250 && missed <= 2000},
+            {error: missed >= 200}
         );
 
         return (
-            <tr className={currentClass} onClick={this._onRowClick.bind(this)} >
+            <tr className={currentClass} onClick={this._onRowClick.bind(this)}>
                 <td>{rank}</td>
                 <td style={color}>{witness.get("name")}</td>
-                <td><TimeAgo time={new Date(last_aslot_time)} /></td>
-                <td>{witness_data.get('last_confirmed_block_num')}</td>
+                <td>
+                    <TimeAgo time={new Date(last_aslot_time)} />
+                </td>
+                <td>{witness_data.get("last_confirmed_block_num")}</td>
                 <td className={missedClass}>{missed}</td>
-                <td><FormattedAsset amount={witness_data.get('total_votes')} asset="1.3.0" decimalOffset={5} /></td>
+                <td>
+                    <FormattedAsset
+                        amount={witness_data.get("total_votes")}
+                        asset="1.3.0"
+                        decimalOffset={5}
+                    />
+                </td>
             </tr>
-        )
+        );
     }
 }
 WitnessRow = BindToChainState(WitnessRow, {keep_updating: true});
 
 class WitnessList extends React.Component {
-
     static propTypes = {
         witnesses: ChainTypes.ChainObjectsList.isRequired
-    }
+    };
 
-    constructor () {
+    constructor() {
         super();
         this.state = {
-          sortBy: 'rank',
-          inverseSort: true
+            sortBy: "rank",
+            inverseSort: true
         };
     }
 
     _setSort(field) {
         this.setState({
-          sortBy: field,
-          inverseSort: field === this.state.sortBy ? !this.state.inverseSort : this.state.inverseSort
+            sortBy: field,
+            inverseSort:
+                field === this.state.sortBy
+                    ? !this.state.inverseSort
+                    : this.state.inverseSort
         });
-      }
+    }
 
     render() {
-
         let {witnesses, current, cardView, witnessList} = this.props;
         let {sortBy, inverseSort} = this.state;
         let most_recent_aslot = 0;
         let ranks = {};
 
         witnesses
-        .filter(a => {
-            if (!a) {
-                return false;
-            }
-            return witnessList.indexOf(a.get("id")) !== -1;
-        })
-        .sort((a, b) => {
-            if (a && b) {
-                return parseInt(b.get("total_votes"), 10) - parseInt(a.get("total_votes"), 10);
-            }
-        })
-        .forEach( (w, index) => {
-            if (w) {
-                let s = w.get("last_aslot");
-                if( most_recent_aslot < s ) {
-                    most_recent_aslot = s;
+            .filter(a => {
+                if (!a) {
+                    return false;
                 }
+                return witnessList.indexOf(a.get("id")) !== -1;
+            })
+            .sort((a, b) => {
+                if (a && b) {
+                    return (
+                        parseInt(b.get("total_votes"), 10) -
+                        parseInt(a.get("total_votes"), 10)
+                    );
+                }
+            })
+            .forEach((w, index) => {
+                if (w) {
+                    let s = w.get("last_aslot");
+                    if (most_recent_aslot < s) {
+                        most_recent_aslot = s;
+                    }
 
-                ranks[w.get("id")] = index + 1;
-            }
-        });
+                    ranks[w.get("id")] = index + 1;
+                }
+            });
 
         let itemRows = null;
         if (witnesses.length > 0 && witnesses[1]) {
             itemRows = witnesses
                 .filter(a => {
-                    if (!a) { return false; }
-                    let account = ChainStore.getObject(a.get("witness_account"));
+                    if (!a) {
+                        return false;
+                    }
+                    let account = ChainStore.getObject(
+                        a.get("witness_account")
+                    );
                     if (!account) return false;
                     let name = account.get("name");
                     if (!name) return false;
                     return name.indexOf(this.props.filter) !== -1;
                 })
                 .sort((a, b) => {
-                    let a_account = ChainStore.getObject(a.get("witness_account"));
-                    let b_account = ChainStore.getObject(b.get("witness_account"));
+                    let a_account = ChainStore.getObject(
+                        a.get("witness_account")
+                    );
+                    let b_account = ChainStore.getObject(
+                        b.get("witness_account")
+                    );
 
                     if (!a_account || !b_account) {
                         return 0;
@@ -209,10 +264,12 @@ class WitnessList extends React.Component {
                     // console.log("a:", a.toJS());
 
                     switch (sortBy) {
-                        case 'name':
+                        case "name":
                             if (a_account.get("name") > b_account.get("name")) {
                                 return inverseSort ? 1 : -1;
-                            } else if (a_account.get("name") < b_account.get("name")) {
+                            } else if (
+                                a_account.get("name") < b_account.get("name")
+                            ) {
                                 return inverseSort ? -1 : 1;
                             } else {
                                 return 0;
@@ -220,28 +277,40 @@ class WitnessList extends React.Component {
                             break;
 
                         case "rank":
-                            return !inverseSort ? ranks[b.get("id")] - ranks[a.get("id")] : ranks[a.get("id")] - ranks[b.get("id")];
+                            return !inverseSort
+                                ? ranks[b.get("id")] - ranks[a.get("id")]
+                                : ranks[a.get("id")] - ranks[b.get("id")];
                             break;
 
                         default:
-                            return !inverseSort ? parseInt(b.get(sortBy), 10) - parseInt(a.get(sortBy), 10) : parseInt(a.get(sortBy), 10) - parseInt(b.get(sortBy), 10);
+                            return !inverseSort
+                                ? parseInt(b.get(sortBy), 10) -
+                                      parseInt(a.get(sortBy), 10)
+                                : parseInt(a.get(sortBy), 10) -
+                                      parseInt(b.get(sortBy), 10);
                     }
-
-
                 })
-                .map((a) => {
-
+                .map(a => {
                     if (!cardView) {
                         return (
-                            <WitnessRow key={a.get("id")} rank={ranks[a.get("id")]} isCurrent={current === a.get("id")}  witness={a.get("witness_account")} most_recent={this.props.current_aslot} />
+                            <WitnessRow
+                                key={a.get("id")}
+                                rank={ranks[a.get("id")]}
+                                isCurrent={current === a.get("id")}
+                                witness={a.get("witness_account")}
+                                most_recent={this.props.current_aslot}
+                            />
                         );
                     } else {
                         return (
-                            <WitnessCard key={a.get("id")} rank={ranks[a.get("id")]} witness={a.get("witness_account")} most_recent={this.props.current_aslot} />
+                            <WitnessCard
+                                key={a.get("id")}
+                                rank={ranks[a.get("id")]}
+                                witness={a.get("witness_account")}
+                                most_recent={this.props.current_aslot}
+                            />
                         );
                     }
-
-
                 });
         }
 
@@ -251,22 +320,57 @@ class WitnessList extends React.Component {
                 <table className="table table-hover">
                     <thead>
                         <tr>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'rank')}><Translate content="explorer.witnesses.rank" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'name')}><Translate content="account.votes.name" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'last_aslot')}><Translate content="explorer.blocks.last_block" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'last_confirmed_block_num')}><Translate content="explorer.witnesses.last_confirmed" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'total_missed')}><Translate content="explorer.witnesses.missed" /></th>
-                            <th className="clickable" onClick={this._setSort.bind(this, 'total_votes')}><Translate content="account.votes.votes" /></th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(this, "rank")}
+                            >
+                                <Translate content="explorer.witnesses.rank" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(this, "name")}
+                            >
+                                <Translate content="account.votes.name" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(this, "last_aslot")}
+                            >
+                                <Translate content="explorer.blocks.last_block" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(
+                                    this,
+                                    "last_confirmed_block_num"
+                                )}
+                            >
+                                <Translate content="explorer.witnesses.last_confirmed" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(
+                                    this,
+                                    "total_missed"
+                                )}
+                            >
+                                <Translate content="explorer.witnesses.missed" />
+                            </th>
+                            <th
+                                className="clickable"
+                                onClick={this._setSort.bind(
+                                    this,
+                                    "total_votes"
+                                )}
+                            >
+                                <Translate content="account.votes.votes" />
+                            </th>
                         </tr>
                     </thead>
-                <tbody>
-                    {itemRows}
-                </tbody>
-
-            </table>
-            )
-        }
-        else {
+                    <tbody>{itemRows}</tbody>
+                </table>
+            );
+        } else {
             return (
                 <div className="grid-block small-up-1 medium-up-2 large-up-3">
                     {itemRows}
@@ -275,20 +379,21 @@ class WitnessList extends React.Component {
         }
     }
 }
-WitnessList = BindToChainState(WitnessList, {keep_updating: true, show_loader: true});
+WitnessList = BindToChainState(WitnessList, {
+    keep_updating: true,
+    show_loader: true
+});
 
 class Witnesses extends React.Component {
-
-
     static propTypes = {
         globalObject: ChainTypes.ChainObject.isRequired,
         dynGlobalObject: ChainTypes.ChainObject.isRequired
-    }
+    };
 
     static defaultProps = {
         globalObject: "2.0.0",
         dynGlobalObject: "2.1.0"
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -319,82 +424,160 @@ class Witnesses extends React.Component {
     }
 
     render() {
-        let { dynGlobalObject, globalObject } = this.props;
+        let {dynGlobalObject, globalObject} = this.props;
         dynGlobalObject = dynGlobalObject.toJS();
         globalObject = globalObject.toJS();
 
         let current = ChainStore.getObject(dynGlobalObject.current_witness),
             currentAccount = null;
         if (current) {
-            currentAccount = ChainStore.getObject(current.get("witness_account"));
+            currentAccount = ChainStore.getObject(
+                current.get("witness_account")
+            );
         }
 
-        let content =
+        let content = (
             <div className="grid-block">
                 <div className="grid-block">
                     <div className="grid-block vertical small-5 medium-3">
                         <div className="grid-content">
-                            <br/>
+                            <br />
                             <table className="table key-value-table">
                                 <tbody>
                                     <tr>
-                                        <td><Translate content="explorer.witnesses.current"/></td>
-                                        <td>{currentAccount ? currentAccount.get("name") : null}</td>
+                                        <td>
+                                            <Translate content="explorer.witnesses.current" />
+                                        </td>
+                                        <td>
+                                            {currentAccount
+                                                ? currentAccount.get("name")
+                                                : null}
+                                        </td>
                                     </tr>
                                     <tr>
-                                        <td><Translate content="explorer.blocks.active_witnesses"/></td>
-                                        <td>{Object.keys(globalObject.active_witnesses).length}</td>
+                                        <td>
+                                            <Translate content="explorer.blocks.active_witnesses" />
+                                        </td>
+                                        <td>
+                                            {
+                                                Object.keys(
+                                                    globalObject.active_witnesses
+                                                ).length
+                                            }
+                                        </td>
                                     </tr>
                                     <tr>
-                                        <td><Translate content="explorer.witnesses.participation"/></td>
-                                        <td>{dynGlobalObject.participation}%</td>
+                                        <td>
+                                            <Translate content="explorer.witnesses.participation" />
+                                        </td>
+                                        <td>
+                                            {dynGlobalObject.participation}%
+                                        </td>
                                     </tr>
                                     <tr>
-                                        <td><Translate content="explorer.witnesses.pay"/></td>
-                                        <td><FormattedAsset amount={globalObject.parameters.witness_pay_per_block} asset="1.3.0" /></td>
+                                        <td>
+                                            <Translate content="explorer.witnesses.pay" />
+                                        </td>
+                                        <td>
+                                            <FormattedAsset
+                                                amount={
+                                                    globalObject.parameters
+                                                        .witness_pay_per_block
+                                                }
+                                                asset="1.3.0"
+                                            />
+                                        </td>
                                     </tr>
                                     <tr>
-                                        <td><Translate content="explorer.witnesses.budget"/></td>
-                                        <td> <FormattedAsset amount={dynGlobalObject.witness_budget} asset="1.3.0" /></td>
+                                        <td>
+                                            <Translate content="explorer.witnesses.budget" />
+                                        </td>
+                                        <td>
+                                            {" "}
+                                            <FormattedAsset
+                                                amount={
+                                                    dynGlobalObject.witness_budget
+                                                }
+                                                asset="1.3.0"
+                                            />
+                                        </td>
                                     </tr>
                                     <tr>
-                                        <td><Translate content="explorer.witnesses.next_vote"/></td>
-                                        <td> <TimeAgo time={new Date(dynGlobalObject.next_maintenance_time + "Z")} /></td>
+                                        <td>
+                                            <Translate content="explorer.witnesses.next_vote" />
+                                        </td>
+                                        <td>
+                                            {" "}
+                                            <TimeAgo
+                                                time={
+                                                    new Date(
+                                                        dynGlobalObject.next_maintenance_time +
+                                                            "Z"
+                                                    )
+                                                }
+                                            />
+                                        </td>
                                     </tr>
                                     <tr>
-                                       <td> <Translate component="h4" content="markets.filter" /> </td>
-                                       <td> <input type="text" value={this.state.filterWitness} onChange={this._onFilter.bind(this)} /> </td>
+                                        <td>
+                                            {" "}
+                                            <Translate
+                                                component="h4"
+                                                content="markets.filter"
+                                            />{" "}
+                                        </td>
+                                        <td>
+                                            {" "}
+                                            <input
+                                                type="text"
+                                                value={this.state.filterWitness}
+                                                onChange={this._onFilter.bind(
+                                                    this
+                                                )}
+                                            />{" "}
+                                        </td>
                                     </tr>
                                 </tbody>
                             </table>
                             <div className="view-switcher">
-                                <span className="button outline" onClick={this._toggleView.bind(this)}>{!this.state.cardView ? <Translate content="explorer.witnesses.card"/> : <Translate content="explorer.witnesses.table"/>}</span>
+                                <span
+                                    className="button outline"
+                                    onClick={this._toggleView.bind(this)}
+                                >
+                                    {!this.state.cardView ? (
+                                        <Translate content="explorer.witnesses.card" />
+                                    ) : (
+                                        <Translate content="explorer.witnesses.table" />
+                                    )}
+                                </span>
                             </div>
                         </div>
                     </div>
                     <div className="grid-block">
-                            <div className="grid-content ">
-                                <WitnessList
-                                    current_aslot={dynGlobalObject.current_aslot}
-                                    current={current ? current.get("id") : null}
-                                    witnesses={Immutable.List(globalObject.active_witnesses)}
-                                    witnessList={globalObject.active_witnesses}
-                                    filter={this.state.filterWitness}
-                                    cardView={this.state.cardView}
-                                />
-                            </div>
+                        <div className="grid-content ">
+                            <WitnessList
+                                current_aslot={dynGlobalObject.current_aslot}
+                                current={current ? current.get("id") : null}
+                                witnesses={Immutable.List(
+                                    globalObject.active_witnesses
+                                )}
+                                witnessList={globalObject.active_witnesses}
+                                filter={this.state.filterWitness}
+                                cardView={this.state.cardView}
+                            />
+                        </div>
                     </div>
                 </div>
             </div>
-        ;
-        return (<Explorer tab="witnesses" content={content}/>);
+        );
+        return <Explorer tab="witnesses" content={content} />;
     }
 }
 Witnesses = BindToChainState(Witnesses, {keep_updating: true});
 
 class WitnessStoreWrapper extends React.Component {
-    render () {
-        return <Witnesses {...this.props}/>;
+    render() {
+        return <Witnesses {...this.props} />;
     }
 }
 
@@ -405,7 +588,9 @@ WitnessStoreWrapper = connect(WitnessStoreWrapper, {
     getProps() {
         return {
             cardView: SettingsStore.getState().viewSettings.get("cardView"),
-            filterWitness: SettingsStore.getState().viewSettings.get("filterWitness")
+            filterWitness: SettingsStore.getState().viewSettings.get(
+                "filterWitness"
+            )
         };
     }
 });
diff --git a/app/components/Forms/AccountNameInput.jsx b/app/components/Forms/AccountNameInput.jsx
index 42a7370296..47b9e9fc34 100644
--- a/app/components/Forms/AccountNameInput.jsx
+++ b/app/components/Forms/AccountNameInput.jsx
@@ -9,7 +9,6 @@ import counterpart from "counterpart";
 import AltContainer from "alt-container";
 
 class AccountNameInput extends React.Component {
-
     static propTypes = {
         id: PropTypes.string,
         placeholder: PropTypes.string,
@@ -39,11 +38,13 @@ class AccountNameInput extends React.Component {
     }
 
     shouldComponentUpdate(nextProps, nextState) {
-        return nextState.value !== this.state.value
-            || nextState.error !== this.state.error
-            || nextState.account_name !== this.state.account_name
-            || nextState.existing_account !== this.state.existing_account
-            || nextProps.searchAccounts !== this.props.searchAccounts
+        return (
+            nextState.value !== this.state.value ||
+            nextState.error !== this.state.error ||
+            nextState.account_name !== this.state.account_name ||
+            nextState.existing_account !== this.state.existing_account ||
+            nextProps.searchAccounts !== this.props.searchAccounts
+        );
     }
 
     componentDidUpdate() {
@@ -59,7 +60,7 @@ class AccountNameInput extends React.Component {
     }
 
     clear() {
-        this.setState({ account_name: null, error: null, warning: null })
+        this.setState({account_name: null, error: null, warning: null});
     }
 
     focus() {
@@ -71,14 +72,21 @@ class AccountNameInput extends React.Component {
     }
 
     getError() {
-        if(this.state.value === null) return null;
+        if (this.state.value === null) return null;
         let error = null;
         if (this.state.error) {
             error = this.state.error;
-        } else if (this.props.accountShouldExist || this.props.accountShouldNotExist) {
-            let account = this.props.searchAccounts.find(a => a === this.state.value);
+        } else if (
+            this.props.accountShouldExist ||
+            this.props.accountShouldNotExist
+        ) {
+            let account = this.props.searchAccounts.find(
+                a => a === this.state.value
+            );
             if (this.props.accountShouldNotExist && account) {
-                error = counterpart.translate("account.name_input.name_is_taken");
+                error = counterpart.translate(
+                    "account.name_input.name_is_taken"
+                );
             }
             if (this.props.accountShouldExist && !account) {
                 error = counterpart.translate("account.name_input.not_found");
@@ -88,33 +96,43 @@ class AccountNameInput extends React.Component {
     }
 
     validateAccountName(value) {
-        this.state.error = value === "" ?
-            "Please enter valid account name" :
-            ChainValidation.is_account_name_error(value)
-
-        this.state.warning = null
-        if(this.props.cheapNameOnly) {
-            if( ! this.state.error && ! ChainValidation.is_cheap_name( value ))
-                this.state.error = counterpart.translate("account.name_input.premium_name_faucet");
+        this.state.error =
+            value === ""
+                ? "Please enter valid account name"
+                : ChainValidation.is_account_name_error(value);
+
+        this.state.warning = null;
+        if (this.props.cheapNameOnly) {
+            if (!this.state.error && !ChainValidation.is_cheap_name(value))
+                this.state.error = counterpart.translate(
+                    "account.name_input.premium_name_faucet"
+                );
         } else {
-            if( ! this.state.error && ! ChainValidation.is_cheap_name( value ))
-                this.state.warning = counterpart.translate("account.name_input.premium_name_warning");
+            if (!this.state.error && !ChainValidation.is_cheap_name(value))
+                this.state.warning = counterpart.translate(
+                    "account.name_input.premium_name_warning"
+                );
         }
-        this.setState({value: value, error: this.state.error, warning: this.state.warning});
-        if (this.props.onChange) this.props.onChange({value: value, valid: !this.getError()});
-        if (this.props.accountShouldExist || this.props.accountShouldNotExist) AccountActions.accountSearch(value);
+        this.setState({
+            value: value,
+            error: this.state.error,
+            warning: this.state.warning
+        });
+        if (this.props.onChange)
+            this.props.onChange({value: value, valid: !this.getError()});
+        if (this.props.accountShouldExist || this.props.accountShouldNotExist)
+            AccountActions.accountSearch(value);
     }
 
     handleChange(e) {
         e.preventDefault();
         e.stopPropagation();
         // Simplify the rules (prevent typing of invalid characters)
-        var account_name = e.target.value.toLowerCase()
-        account_name = account_name.match(/[a-z0-9\.-]+/)
-        account_name = account_name ? account_name[0] : null
-        this.setState({ account_name })
+        var account_name = e.target.value.toLowerCase();
+        account_name = account_name.match(/[a-z0-9\.-]+/);
+        account_name = account_name ? account_name[0] : null;
+        this.setState({account_name});
         this.validateAccountName(account_name);
-
     }
 
     onKeyDown(e) {
@@ -123,7 +141,9 @@ class AccountNameInput extends React.Component {
 
     render() {
         let error = this.getError() || "";
-        let class_name = classNames("form-group", "account-name", {"has-error": false});
+        let class_name = classNames("form-group", "account-name", {
+            "has-error": false
+        });
         let warning = this.state.warning;
         // let {noLabel} = this.props;
 
@@ -131,7 +151,9 @@ class AccountNameInput extends React.Component {
             <div className={class_name}>
                 {/* {noLabel ? null : <label><Translate content="account.name" /></label>} */}
                 <section>
-                    <label className="left-label">{this.props.placeholder}</label>
+                    <label className="left-label">
+                        {this.props.placeholder}
+                    </label>
                     <input
                         name="username"
                         id="username"
@@ -141,33 +163,35 @@ class AccountNameInput extends React.Component {
                         placeholder={null}
                         onChange={this.handleChange}
                         onKeyDown={this.onKeyDown}
-                        value={this.state.account_name || this.props.initial_value}
+                        value={
+                            this.state.account_name || this.props.initial_value
+                        }
                     />
                 </section>
-                <div style={{textAlign: "left"}} className="facolor-error">{error}</div>
-                <div style={{textAlign: "left"}} className="facolor-warning">{error ? null : warning}</div>
+                <div style={{textAlign: "left"}} className="facolor-error">
+                    {error}
+                </div>
+                <div style={{textAlign: "left"}} className="facolor-warning">
+                    {error ? null : warning}
+                </div>
             </div>
         );
     }
 }
 
 export default class StoreWrapper extends React.Component {
-
     render() {
-
         return (
-            <AltContainer stores={[AccountStore]}
+            <AltContainer
+                stores={[AccountStore]}
                 inject={{
-                        searchAccounts: () => {
-                            return AccountStore.getState().searchAccounts;
-                        }
-                    }}
+                    searchAccounts: () => {
+                        return AccountStore.getState().searchAccounts;
+                    }
+                }}
             >
-                <AccountNameInput
-                    ref="nameInput"
-                    {...this.props}
-                />
+                <AccountNameInput ref="nameInput" {...this.props} />
             </AltContainer>
-        )
+        );
     }
 }
diff --git a/app/components/Forms/AccountSelect.jsx b/app/components/Forms/AccountSelect.jsx
index 5bef9840ab..7a5ff0bd6e 100644
--- a/app/components/Forms/AccountSelect.jsx
+++ b/app/components/Forms/AccountSelect.jsx
@@ -2,7 +2,6 @@ import React from "react";
 import counterpart from "counterpart";
 
 export default class AccountSelect extends React.Component {
-
     static propTypes = {
         account_names: React.PropTypes.array,
         list_size: React.PropTypes.number,
@@ -17,7 +16,9 @@ export default class AccountSelect extends React.Component {
     constructor(props) {
         super(props);
         this.state = {selected: null};
-        this.default_placeholder = counterpart.translate("account.select_placeholder");
+        this.default_placeholder = counterpart.translate(
+            "account.select_placeholder"
+        );
     }
 
     shouldComponentUpdate(nextProps) {
@@ -41,33 +42,43 @@ export default class AccountSelect extends React.Component {
         var account_names = this.props.account_names;
         var selected_account = this.props.selected;
         var placeholder = this.props.placeholder || this.default_placeholder;
-        var ikey
+        var ikey;
         if (this.props.list_size > 1) {
-            placeholder = <option value="" disabled>{placeholder}</option>;
-        }
-        else {
+            placeholder = (
+                <option value="" disabled>
+                    {placeholder}
+                </option>
+            );
+        } else {
             //When disabled and list_size was 1, chrome was skipping the
             //placeholder and selecting the 1st item automatically (not shown)
             placeholder = <option value="">{placeholder}</option>;
         }
-        var key = 0
+        var key = 0;
         return (
             <select
-                ref='account-selector'
+                ref="account-selector"
                 key={selected_account}
                 defaultValue={selected_account}
-                className={"form-control account-select bts-select " + (this.props.className || "")}
+                className={
+                    "form-control account-select bts-select " +
+                    (this.props.className || "")
+                }
                 onChange={this._onAccountChange.bind(this)}
-                style={this.props.center?{margin: '0 auto'}:null}
+                style={this.props.center ? {margin: "0 auto"} : null}
                 tabIndex={this.props.tabIndex}
             >
                 {placeholder}
-                {account_names
-                    .sort()
-                    .map((account_name) => {
-                        if (!account_name || account_name === "") {return null; }
-                        return <option key={key++} value={account_name}>{account_name}</option>;
-                    })}
+                {account_names.sort().map(account_name => {
+                    if (!account_name || account_name === "") {
+                        return null;
+                    }
+                    return (
+                        <option key={key++} value={account_name}>
+                            {account_name}
+                        </option>
+                    );
+                })}
             </select>
         );
         //Cannot read property 'getAttribute' of null
@@ -89,5 +100,4 @@ export default class AccountSelect extends React.Component {
             this.props.onChange(value);
         }
     }
-
 }
diff --git a/app/components/Forms/AutocompleteInput.jsx b/app/components/Forms/AutocompleteInput.jsx
index bec4c25534..be62f8f906 100644
--- a/app/components/Forms/AutocompleteInput.jsx
+++ b/app/components/Forms/AutocompleteInput.jsx
@@ -4,13 +4,12 @@ import ActionSheet from "react-foundation-apps/src/action-sheet";
 import ZfApi from "react-foundation-apps/src/utils/foundation-api";
 
 class AutocompleteInput extends Component {
-
     constructor() {
         super();
         this.handleChange = this.handleChange.bind(this);
         this.handleItemClick = this.handleItemClick.bind(this);
         this.onKeyDown = this.onKeyDown.bind(this);
-        this.state = { items: [] };
+        this.state = {items: []};
     }
 
     getInput() {
@@ -23,7 +22,7 @@ class AutocompleteInput extends Component {
     }
 
     setValue(value) {
-        return this.getInput().value = value;
+        return (this.getInput().value = value);
     }
 
     clear() {
@@ -39,19 +38,28 @@ class AutocompleteInput extends Component {
         e.stopPropagation();
         let action_sheet_id = this.props.id + "-container";
         let value = e.target.value;
-        let items = value === "" ? [] : this.props.options.filter( i => {
-            let v = typeof i === "string" ? i : i[1];
-            return v.startsWith(value);
-        });
+        let items =
+            value === ""
+                ? []
+                : this.props.options.filter(i => {
+                      let v = typeof i === "string" ? i : i[1];
+                      return v.startsWith(value);
+                  });
         this.setState({items});
-        if(items.size >= 0) {
-            if(items.size > 0 && !(items.size === 1 && items.first() === value)) {
+        if (items.size >= 0) {
+            if (
+                items.size > 0 &&
+                !(items.size === 1 && items.first() === value)
+            ) {
                 ZfApi.publish(action_sheet_id, "open");
             } else {
                 ZfApi.publish(action_sheet_id, "close");
             }
         } else {
-            if(items.length > 0 && !(items.length === 1 && items[0][1] === value)) {
+            if (
+                items.length > 0 &&
+                !(items.length === 1 && items[0][1] === value)
+            ) {
                 ZfApi.publish(action_sheet_id, "open");
             } else {
                 ZfApi.publish(action_sheet_id, "close");
@@ -68,33 +76,46 @@ class AutocompleteInput extends Component {
         input.value = value;
         ZfApi.publish(this.props.id + "-container", "close");
         if (this.props.onChange) {
-            let event = { target: { value: value, id: this.props.id}};
+            let event = {target: {value: value, id: this.props.id}};
             this.props.onChange(event);
         }
     }
 
     onKeyDown(e) {
-        if(this.props.onEnter && event.keyCode === 13) this.props.onEnter(e);
+        if (this.props.onEnter && event.keyCode === 13) this.props.onEnter(e);
     }
 
     render() {
-        var items = this.state.items
-            .sort()
-            .map( i => {
-                let j = typeof i === "string" ? [i, i] : i;
-                return (<li key={j[0]}><a href data-value={j[0]} onClick={this.handleItemClick}>{j[1]}</a></li>);
-            });
+        var items = this.state.items.sort().map(i => {
+            let j = typeof i === "string" ? [i, i] : i;
+            return (
+                <li key={j[0]}>
+                    <a href data-value={j[0]} onClick={this.handleItemClick}>
+                        {j[1]}
+                    </a>
+                </li>
+            );
+        });
         let action_sheet_id = this.props.id + "-container";
         return (
             <div className="autocomplete">
-                <ActionSheet className="autocomplete" ref="action_sheet" id={action_sheet_id}>
-                    <input name="value" type="text" autoComplete="off" id={this.props.id}
-                           placeholder={this.props.placeholder} defaultValue={this.props.initial_value}
-                           onChange={this.handleChange} onKeyDown={this.onKeyDown}/>
-                    <ActionSheet.Content >
-                        <ul className="no-first-element-top-border">
-                            {items}
-                        </ul>
+                <ActionSheet
+                    className="autocomplete"
+                    ref="action_sheet"
+                    id={action_sheet_id}
+                >
+                    <input
+                        name="value"
+                        type="text"
+                        autoComplete="off"
+                        id={this.props.id}
+                        placeholder={this.props.placeholder}
+                        defaultValue={this.props.initial_value}
+                        onChange={this.handleChange}
+                        onKeyDown={this.onKeyDown}
+                    />
+                    <ActionSheet.Content>
+                        <ul className="no-first-element-top-border">{items}</ul>
                     </ActionSheet.Content>
                 </ActionSheet>
             </div>
diff --git a/app/components/Forms/MyAccounts.jsx b/app/components/Forms/MyAccounts.jsx
index 555870ea39..8f8f64865e 100644
--- a/app/components/Forms/MyAccounts.jsx
+++ b/app/components/Forms/MyAccounts.jsx
@@ -5,22 +5,27 @@ import AccountSelect from "components/Forms/AccountSelect";
 import BindToChainState from "components/Utility/BindToChainState";
 
 class MyAccounts extends Component {
-
     static propTypes = {
         accounts: ChainTypes.ChainAccountsList.isRequired,
         onChange: React.PropTypes.func.isRequired
-    }
+    };
 
     render() {
         var account_names = this.props.accounts
-            .filter( account => !!account )
-            .filter( account => AccountStore.isMyAccount(account) )
-            .map( account => account.get("name") ).sort();
+            .filter(account => !!account)
+            .filter(account => AccountStore.isMyAccount(account))
+            .map(account => account.get("name"))
+            .sort();
 
-        return <span>
-            <AccountSelect onChange={this.onAccountSelect.bind(this)}
-                account_names={account_names} center={true}/>
-        </span>;
+        return (
+            <span>
+                <AccountSelect
+                    onChange={this.onAccountSelect.bind(this)}
+                    account_names={account_names}
+                    center={true}
+                />
+            </span>
+        );
     }
 
     onAccountSelect(account_name) {
diff --git a/app/components/Forms/PasswordInput.jsx b/app/components/Forms/PasswordInput.jsx
index e918ea500b..20953dd878 100644
--- a/app/components/Forms/PasswordInput.jsx
+++ b/app/components/Forms/PasswordInput.jsx
@@ -5,7 +5,6 @@ import Translate from "react-translate-component";
 import pw from "zxcvbn";
 
 class PasswordInput extends Component {
-
     static propTypes = {
         onChange: PropTypes.func,
         onEnter: PropTypes.func,
@@ -30,7 +29,12 @@ class PasswordInput extends Component {
         super();
         this.handleChange = this.handleChange.bind(this);
         this.onKeyDown = this.onKeyDown.bind(this);
-        this.state = {value: "", error: null, wrong: false, doesnt_match: false};
+        this.state = {
+            value: "",
+            error: null,
+            wrong: false,
+            doesnt_match: false
+        };
     }
 
     value() {
@@ -40,7 +44,7 @@ class PasswordInput extends Component {
 
     clear() {
         this.refs.password.value = "";
-        if(this.props.confirmation) this.refs.confirm_password.value = "";
+        if (this.props.confirmation) this.refs.confirm_password.value = "";
     }
 
     focus() {
@@ -48,19 +52,32 @@ class PasswordInput extends Component {
     }
 
     valid() {
-        return !(this.state.error || this.state.wrong || this.state.doesnt_match) && this.state.value.length >= this.props.passwordLength;
+        return (
+            !(
+                this.state.error ||
+                this.state.wrong ||
+                this.state.doesnt_match
+            ) && this.state.value.length >= this.props.passwordLength
+        );
     }
 
     handleChange(e) {
         e.preventDefault();
         e.stopPropagation();
-        const confirmation = this.props.confirmation ? this.refs.confirm_password.value : true;
+        const confirmation = this.props.confirmation
+            ? this.refs.confirm_password.value
+            : true;
         const password = this.refs.password.value;
-        const doesnt_match = this.props.confirmation ? confirmation && password !== confirmation : false;
+        const doesnt_match = this.props.confirmation
+            ? confirmation && password !== confirmation
+            : false;
         let state = {
-            valid: !this.state.error && !this.state.wrong
-            && !(this.props.confirmation && doesnt_match)
-            && confirmation && password.length >= this.props.passwordLength,
+            valid:
+                !this.state.error &&
+                !this.state.wrong &&
+                !(this.props.confirmation && doesnt_match) &&
+                confirmation &&
+                password.length >= this.props.passwordLength,
             value: password,
             doesnt_match
         };
@@ -69,41 +86,89 @@ class PasswordInput extends Component {
     }
 
     onKeyDown(e) {
-        if(this.props.onEnter && e.keyCode === 13) this.props.onEnter(e);
+        if (this.props.onEnter && e.keyCode === 13) this.props.onEnter(e);
     }
 
     render() {
-        let password_error = null, confirmation_error = null;
-        if(this.state.wrong || this.props.wrongPassword) password_error = <div><Translate content="wallet.pass_incorrect" /></div>;
-        else if(this.state.error) password_error = <div>{this.state.error}</div>;
-        if (!this.props.noValidation && !password_error && (this.state.value.length > 0 && this.state.value.length < this.props.passwordLength))
-            password_error = <div><Translate content="wallet.pass_length" minLength={this.props.passwordLength} /></div>;
-        if(this.state.doesnt_match) confirmation_error = <div><Translate content="wallet.confirm_error" /></div>;
-        let password_class_name = cname("form-group", {"has-error": password_error});
-        let password_confirmation_class_name = cname("form-group", {"has-error": this.state.doesnt_match});
+        let password_error = null,
+            confirmation_error = null;
+        if (this.state.wrong || this.props.wrongPassword)
+            password_error = (
+                <div>
+                    <Translate content="wallet.pass_incorrect" />
+                </div>
+            );
+        else if (this.state.error)
+            password_error = <div>{this.state.error}</div>;
+        if (
+            !this.props.noValidation &&
+            !password_error &&
+            (this.state.value.length > 0 &&
+                this.state.value.length < this.props.passwordLength)
+        )
+            password_error = (
+                <div>
+                    <Translate
+                        content="wallet.pass_length"
+                        minLength={this.props.passwordLength}
+                    />
+                </div>
+            );
+        if (this.state.doesnt_match)
+            confirmation_error = (
+                <div>
+                    <Translate content="wallet.confirm_error" />
+                </div>
+            );
+        let password_class_name = cname("form-group", {
+            "has-error": password_error
+        });
+        let password_confirmation_class_name = cname("form-group", {
+            "has-error": this.state.doesnt_match
+        });
         // let {noLabel} = this.props;
 
         let confirmMatch = false;
-        if (this.refs.confirm_password && this.refs.confirm_password.value && !this.state.doesnt_match) {
+        if (
+            this.refs.confirm_password &&
+            this.refs.confirm_password.value &&
+            !this.state.doesnt_match
+        ) {
             confirmMatch = true;
         }
 
-        let strength = 0, score;
+        let strength = 0,
+            score;
         if (this.props.checkStrength) {
-            strength = this.state.value.length > 100 ? {score: 4} : pw(this.state.value || "");
+            strength =
+                this.state.value.length > 100
+                    ? {score: 4}
+                    : pw(this.state.value || "");
             /* Require a length of passwordLength + 50% for the max score */
-            score = Math.min(5, strength.score + Math.floor(this.state.value.length / (this.props.passwordLength * 1.5)));
+            score = Math.min(
+                5,
+                strength.score +
+                    Math.floor(
+                        this.state.value.length /
+                            (this.props.passwordLength * 1.5)
+                    )
+            );
         }
 
-
         return (
             <div className="account-selector">
                 <div className={password_class_name}>
                     {/* {noLabel ? null : <Translate component="label" content="wallet.password" />} */}
                     <section>
-                        <label className="left-label"><Translate content="wallet.enter_password" /></label>
+                        <label className="left-label">
+                            <Translate content="wallet.enter_password" />
+                        </label>
                         <input
-                            style={{marginBottom: this.props.checkStrength ? 0 : null}}
+                            style={{
+                                marginBottom: this.props.checkStrength
+                                    ? 0
+                                    : null
+                            }}
                             name="password"
                             type="password"
                             ref="password"
@@ -112,28 +177,45 @@ class PasswordInput extends Component {
                             onKeyDown={this.onKeyDown}
                         />
                         {this.props.checkStrength ? (
-                                <progress style={{height: 10}} className={score === 5 ? "high" : score === 4 ? "medium" : "low"} value={score} max="5" min="0"></progress>
+                            <progress
+                                style={{height: 10}}
+                                className={
+                                    score === 5
+                                        ? "high"
+                                        : score === 4 ? "medium" : "low"
+                                }
+                                value={score}
+                                max="5"
+                                min="0"
+                            />
                         ) : null}
                     </section>
 
                     {password_error}
                 </div>
-                { this.props.confirmation ?
-                <div className={password_confirmation_class_name}>
-                    {/* {noLabel ? null : <Translate component="label" content="wallet.confirm" />} */}
-                    <label className="left-label"><Translate content="wallet.confirm_password" /></label>
-                    <section style={{position: "relative", maxWidth: "30rem"}}>
-                        <input
-                            name="confirm_password"
-                            type="password"
-                            ref="confirm_password"
-                            autoComplete="off"
-                            onChange={this.handleChange}
-                        />
-                        {confirmMatch ? <div className={"ok-indicator success"}>OK</div> : null}
-                    </section>
-                    {confirmation_error}
-                </div> : null}
+                {this.props.confirmation ? (
+                    <div className={password_confirmation_class_name}>
+                        {/* {noLabel ? null : <Translate component="label" content="wallet.confirm" />} */}
+                        <label className="left-label">
+                            <Translate content="wallet.confirm_password" />
+                        </label>
+                        <section
+                            style={{position: "relative", maxWidth: "30rem"}}
+                        >
+                            <input
+                                name="confirm_password"
+                                type="password"
+                                ref="confirm_password"
+                                autoComplete="off"
+                                onChange={this.handleChange}
+                            />
+                            {confirmMatch ? (
+                                <div className={"ok-indicator success"}>OK</div>
+                            ) : null}
+                        </section>
+                        {confirmation_error}
+                    </div>
+                ) : null}
             </div>
         );
     }
diff --git a/app/components/Forms/PubKeyInput.jsx b/app/components/Forms/PubKeyInput.jsx
index fa8e90f384..5f5f28217d 100644
--- a/app/components/Forms/PubKeyInput.jsx
+++ b/app/components/Forms/PubKeyInput.jsx
@@ -11,7 +11,6 @@ import PrivateKeyStore from "stores/PrivateKeyStore";
  */
 
 class PubKeyInput extends React.Component {
-
     static propTypes = {
         label: React.PropTypes.string.isRequired, // a translation key for the label
         value: React.PropTypes.string, // current value
@@ -21,7 +20,7 @@ class PubKeyInput extends React.Component {
         onAction: React.PropTypes.func, // a method called when Add button is clicked
         tabIndex: React.PropTypes.number, // tabindex property to be passed to input tag
         disableActionButton: React.PropTypes.bool // use it if you need to disable action button
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -42,47 +41,73 @@ class PubKeyInput extends React.Component {
 
     onAction(event) {
         event.preventDefault();
-        if(this.props.onAction && this.state.valid && !this.props.disableActionButton) {
+        if (
+            this.props.onAction &&
+            this.state.valid &&
+            !this.props.disableActionButton
+        ) {
             this.props.onAction(event);
         }
     }
 
     render() {
         let error = this.props.error;
-        if (!error && this.props.value && !this.isValidPubKey(this.props.value)) error = "Not a valid public key";
-        let action_class = classnames("button", {"disabled" : error || this.props.disableActionButton});
+        if (!error && this.props.value && !this.isValidPubKey(this.props.value))
+            error = "Not a valid public key";
+        let action_class = classnames("button", {
+            disabled: error || this.props.disableActionButton
+        });
         const keys = PrivateKeyStore.getState().keys;
-        const has_private = this.isValidPubKey(this.props.value) && keys.has(this.props.value);
+        const has_private =
+            this.isValidPubKey(this.props.value) && keys.has(this.props.value);
 
         return (
             <div className="pubkey-input no-overflow">
                 <div className="content-area">
                     <div className="header-area">
-                        {!error && this.props.value && this.isValidPubKey(this.props.value) ?<label className="right-label"><Translate content="account.perm.valid_pub" /></label> : null}
-                        <Translate className="left-label" component="label" content={this.props.label}/>
+                        {!error &&
+                        this.props.value &&
+                        this.isValidPubKey(this.props.value) ? (
+                            <label className="right-label">
+                                <Translate content="account.perm.valid_pub" />
+                            </label>
+                        ) : null}
+                        <Translate
+                            className="left-label"
+                            component="label"
+                            content={this.props.label}
+                        />
                     </div>
                     <div className="input-area">
                         <span className="inline-label">
-                        <div className="account-image">
-                            <PrivateKeyView pubkey={this.props.value}>
-                                <Icon name="key" size="4x"/>
-                            </PrivateKeyView>
-                        </div>
-                        <input type="text"
-                            className={has_private ? "my-key" : ""}
-                            value={this.props.value}
-                            placeholder={this.props.placeholder || counterpart.translate("account.public_key")}
-                            ref="user_input"
-                            onChange={this.onInputChanged.bind(this)}
-                            onKeyDown={this.onKeyDown.bind(this)}
-                            tabIndex={this.props.tabIndex}
-                        />
-                        { this.props.onAction ? (
-                            <button className={action_class}
-                                onClick={this.onAction.bind(this)}>
-                                <Translate content={this.props.action_label}/>
-                            </button>
-                        ) : null }
+                            <div className="account-image">
+                                <PrivateKeyView pubkey={this.props.value}>
+                                    <Icon name="key" size="4x" />
+                                </PrivateKeyView>
+                            </div>
+                            <input
+                                type="text"
+                                className={has_private ? "my-key" : ""}
+                                value={this.props.value}
+                                placeholder={
+                                    this.props.placeholder ||
+                                    counterpart.translate("account.public_key")
+                                }
+                                ref="user_input"
+                                onChange={this.onInputChanged.bind(this)}
+                                onKeyDown={this.onKeyDown.bind(this)}
+                                tabIndex={this.props.tabIndex}
+                            />
+                            {this.props.onAction ? (
+                                <button
+                                    className={action_class}
+                                    onClick={this.onAction.bind(this)}
+                                >
+                                    <Translate
+                                        content={this.props.action_label}
+                                    />
+                                </button>
+                            ) : null}
                         </span>
                     </div>
                     <div className="error-area has-error">
@@ -92,6 +117,5 @@ class PubKeyInput extends React.Component {
             </div>
         );
     }
-
 }
 export default PubKeyInput;
diff --git a/app/components/Forms/RefcodeInput.jsx b/app/components/Forms/RefcodeInput.jsx
index 165e8dd691..0861d564ab 100644
--- a/app/components/Forms/RefcodeInput.jsx
+++ b/app/components/Forms/RefcodeInput.jsx
@@ -9,14 +9,13 @@ import SettingsStore from "stores/SettingsStore";
  */
 
 class RefcodeInput extends React.Component {
-
     static propTypes = {
         label: React.PropTypes.string.isRequired, // a translation key for the label
         placeholder: React.PropTypes.string, // the placeholder text to be displayed when there is no user_input
         action_label: React.PropTypes.string, // the placeholder text to be displayed when there is no user_input
         tabIndex: React.PropTypes.number, // tabindex property to be passed to input tag
         allow_claim_to_account: React.PropTypes.string // show claim button and allow to claim to specified account
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -45,16 +44,26 @@ class RefcodeInput extends React.Component {
     onClaim(event) {
         event.preventDefault();
         let faucet_address = SettingsStore.getSetting("faucet_address");
-        console.log("-- RefcodeInput.onClaim -->", this.state.value, faucet_address);
-        let claim_url = `${SettingsStore.getSetting("faucet_address")}/api/v1/referral_codes/${this.state.value}/claim?account=${this.props.allow_claim_to_account}`;
+        console.log(
+            "-- RefcodeInput.onClaim -->",
+            this.state.value,
+            faucet_address
+        );
+        let claim_url = `${SettingsStore.getSetting(
+            "faucet_address"
+        )}/api/v1/referral_codes/${this.state.value}/claim?account=${
+            this.props.allow_claim_to_account
+        }`;
         fetch(claim_url, {
-            method: 'get',
-            mode: 'cors',
+            method: "get",
+            mode: "cors",
             headers: {
-                "Accept": "application/json",
+                Accept: "application/json",
                 "Content-type": "application/json"
             }
-        }).then(r => r.json()).then(res => {
+        })
+            .then(r => r.json())
+            .then(res => {
                 if (res.error) {
                     this.setState({error: res.error});
                 } else {
@@ -64,11 +73,10 @@ class RefcodeInput extends React.Component {
                 }
                 cookies.set("_refcode_", null);
             })
-        .catch(error => {
+            .catch(error => {
                 console.error("-- RefcodeInput.onClaim fetch error -->", error);
                 this.setState({error: "Unknown error"});
             });
-
     }
 
     isValidRefcode() {
@@ -77,23 +85,33 @@ class RefcodeInput extends React.Component {
 
     render() {
         let error = this.state.error;
-        if (!error && !this.isValidRefcode(this.props.value)) error = "Not a valid referral code";
-        let action_class = classnames("button", {"disabled" : !!error});
+        if (!error && !this.isValidRefcode(this.props.value))
+            error = "Not a valid referral code";
+        let action_class = classnames("button", {disabled: !!error});
 
         return (
             <div className="refcode-input">
-                <label><Translate component="label" content={this.props.label}/></label>
+                <label>
+                    <Translate component="label" content={this.props.label} />
+                </label>
                 <span className="inline-label">
-                <input type="text" ref="refcode_input" value={this.state.value}
-                       onChange={this.onInputChanged.bind(this)}
-                       onKeyDown={this.onKeyDown.bind(this)}
-                       tabIndex={this.props.tabIndex}
-                       autoComplete="off"/>
-                { this.props.allow_claim_to_account ? (
-                    <button className={action_class}
-                            onClick={this.onClaim.bind(this)}>
-                        <Translate content={this.props.action_label}/></button>
-                ) : null }
+                    <input
+                        type="text"
+                        ref="refcode_input"
+                        value={this.state.value}
+                        onChange={this.onInputChanged.bind(this)}
+                        onKeyDown={this.onKeyDown.bind(this)}
+                        tabIndex={this.props.tabIndex}
+                        autoComplete="off"
+                    />
+                    {this.props.allow_claim_to_account ? (
+                        <button
+                            className={action_class}
+                            onClick={this.onClaim.bind(this)}
+                        >
+                            <Translate content={this.props.action_label} />
+                        </button>
+                    ) : null}
                 </span>
                 <div className="has-error" style={{padding: "0.6rem 0 0 0"}}>
                     <span>{error}</span>
@@ -101,6 +119,5 @@ class RefcodeInput extends React.Component {
             </div>
         );
     }
-
 }
 export default RefcodeInput;
diff --git a/app/components/Icon/Icon.jsx b/app/components/Icon/Icon.jsx
index 4d87f1b61d..2c097f222f 100644
--- a/app/components/Icon/Icon.jsx
+++ b/app/components/Icon/Icon.jsx
@@ -2,14 +2,69 @@
 
 import React from "react";
 
-let icons = ["user", "trash", "chevron-down", "menu", "database", "download", "search",
-    "plus-circle", "question-circle", "cross-circle", "cog", "layers", "users", "wand", "b-logo",
-    "accounts", "witnesses", "assets", "proposals", "blocks", "committee_members", "workers", "key",
-    "checkmark-circle", "checkmark", "piggy", "locked", "unlocked" , "markets", "fi-star" ,"fees",
-    "thumb-tack", "thumb-untack", "clock", "clippy", "shuffle", "transfer", "dollar", "dollar-green", "deposit", "withdraw",
-    "settle", "trade", "adjust", "excel", "share", "minus-circle", "cogs", "dashboard",
-    "server", "power", "thumbs-up", "folder", "warning", "gift", "text", "list",
-    "hourglass", "news", "hamburger", "hamburger-x"];
+let icons = [
+    "user",
+    "trash",
+    "chevron-down",
+    "menu",
+    "database",
+    "download",
+    "search",
+    "plus-circle",
+    "question-circle",
+    "cross-circle",
+    "cog",
+    "layers",
+    "users",
+    "wand",
+    "b-logo",
+    "accounts",
+    "witnesses",
+    "assets",
+    "proposals",
+    "blocks",
+    "committee_members",
+    "workers",
+    "key",
+    "checkmark-circle",
+    "checkmark",
+    "piggy",
+    "locked",
+    "unlocked",
+    "markets",
+    "fi-star",
+    "fees",
+    "thumb-tack",
+    "thumb-untack",
+    "clock",
+    "clippy",
+    "shuffle",
+    "transfer",
+    "dollar",
+    "dollar-green",
+    "deposit",
+    "withdraw",
+    "settle",
+    "trade",
+    "adjust",
+    "excel",
+    "share",
+    "minus-circle",
+    "cogs",
+    "dashboard",
+    "server",
+    "power",
+    "thumbs-up",
+    "folder",
+    "warning",
+    "gift",
+    "text",
+    "list",
+    "hourglass",
+    "news",
+    "hamburger",
+    "hamburger-x"
+];
 
 let icons_map = {};
 for (let i of icons) icons_map[i] = require(`./${i}.svg`);
@@ -19,13 +74,20 @@ require("./icon.scss");
 class Icon extends React.Component {
     render() {
         let classes = "icon " + this.props.name;
-        if(this.props.size) {
+        if (this.props.size) {
             classes += " icon-" + this.props.size;
         }
-        if(this.props.className) {
+        if (this.props.className) {
             classes += " " + this.props.className;
         }
-        return <span className={classes} style={this.props.style || {}} dangerouslySetInnerHTML={{__html: icons_map[this.props.name]}} onClick={this.props.onClick} />;
+        return (
+            <span
+                className={classes}
+                style={this.props.style || {}}
+                dangerouslySetInnerHTML={{__html: icons_map[this.props.name]}}
+                onClick={this.props.onClick}
+            />
+        );
     }
 }
 
diff --git a/app/components/Icon/PulseIcon.js b/app/components/Icon/PulseIcon.js
index 54770b53ec..3f9ffc6b4d 100644
--- a/app/components/Icon/PulseIcon.js
+++ b/app/components/Icon/PulseIcon.js
@@ -4,16 +4,15 @@ import {PropTypes} from "react";
 import Icon from "./Icon";
 
 export default class PulseIcon extends Component {
-
     static propTypes = {
         duration: PropTypes.number.isRequired,
         offIcon: PropTypes.string.isRequired,
-        onIcon: PropTypes.string.isRequired,
+        onIcon: PropTypes.string.isRequired
     };
 
     componentDidMount() {
-        const { duration } = this.props;
-        this.interval = setInterval(this.tick,duration);
+        const {duration} = this.props;
+        this.interval = setInterval(this.tick, duration);
     }
 
     componentWillUnmount() {
@@ -21,18 +20,16 @@ export default class PulseIcon extends Component {
     }
 
     tick = () => {
-        const { onIcon, offIcon } = this.props;
-        const { name = onIcon } = this.state || {};
+        const {onIcon, offIcon} = this.props;
+        const {name = onIcon} = this.state || {};
         this.setState({
             name: name === onIcon ? offIcon : onIcon
         });
     };
 
     render() {
-        const { onIcon, rest } = this.props;
-        const { name = onIcon } = this.state || {};
-        return (
-            <Icon name={name} {...rest} />
-        );
+        const {onIcon, rest} = this.props;
+        const {name = onIcon} = this.state || {};
+        return <Icon name={name} {...rest} />;
     }
 }
diff --git a/app/components/Layout/Incognito.jsx b/app/components/Layout/Incognito.jsx
index 3764c0f25c..502c770ba1 100644
--- a/app/components/Layout/Incognito.jsx
+++ b/app/components/Layout/Incognito.jsx
@@ -2,12 +2,50 @@ import React from "react";
 import Translate from "react-translate-component";
 
 class Incognito extends React.Component {
-    render(){
+    render() {
         return (
-            <div id="incognito" style={{width: "100%", height: "100%", textAlign: "center", position: "absolute", background: "black"}}>
-                <div style={{height: "50%", float: "left", marginBottom: "-150px", width: "100%"}}></div>
-                <Translate content="incognito.no_support" style={{clear: "both", display: "block", fontSize: "3em", width: "50%", lineHeight: "1.5em", margin: "0 auto 1em auto"}} />
-                <button onClick={this.props.onClickIgnore} style={{display: "block", margin: "0 auto", width: "50%", borderRadius: "10px", padding: "1em", color: "black"}}><Translate content="incognito.ignore" /></button>
+            <div
+                id="incognito"
+                style={{
+                    width: "100%",
+                    height: "100%",
+                    textAlign: "center",
+                    position: "absolute",
+                    background: "black"
+                }}
+            >
+                <div
+                    style={{
+                        height: "50%",
+                        float: "left",
+                        marginBottom: "-150px",
+                        width: "100%"
+                    }}
+                />
+                <Translate
+                    content="incognito.no_support"
+                    style={{
+                        clear: "both",
+                        display: "block",
+                        fontSize: "3em",
+                        width: "50%",
+                        lineHeight: "1.5em",
+                        margin: "0 auto 1em auto"
+                    }}
+                />
+                <button
+                    onClick={this.props.onClickIgnore}
+                    style={{
+                        display: "block",
+                        margin: "0 auto",
+                        width: "50%",
+                        borderRadius: "10px",
+                        padding: "1em",
+                        color: "black"
+                    }}
+                >
+                    <Translate content="incognito.ignore" />
+                </button>
             </div>
         );
     }
diff --git a/app/components/Layout/MobileMenu.jsx b/app/components/Layout/MobileMenu.jsx
index 5c78a86ed1..a910f2d70f 100644
--- a/app/components/Layout/MobileMenu.jsx
+++ b/app/components/Layout/MobileMenu.jsx
@@ -5,11 +5,11 @@ import {Link} from "react-router/es";
 import ZfApi from "react-foundation-apps/src/utils/foundation-api";
 import Translate from "react-translate-component";
 import AccountStore from "stores/AccountStore";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import WalletUnlockStore from "stores/WalletUnlockStore";
 import WalletManagerStore from "stores/WalletManagerStore";
 import SettingsStore from "stores/SettingsStore";
-import { Apis } from "bitsharesjs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class MobileMenu extends React.Component {
     constructor() {
@@ -35,51 +35,106 @@ class MobileMenu extends React.Component {
         let {id, currentAccount, linkedAccounts, myAccounts} = this.props;
         let accounts = null;
 
-        if(linkedAccounts.size > 1) {
-            accounts = linkedAccounts.sort((a, b) => {
-                if (a > b) return 1;
-                if (a < b) return -1;
-                return 0;
-            }).map( a => {
-                return <li key={a} onClick={this.onClick}><Link to={`/account/${a}/overview`}>{a}</Link></li>;
-            });
-        }  else if (linkedAccounts.size === 1) {
-            accounts = <li key="account" onClick={this.onClick}><Link to={`/account/${linkedAccounts.first()}/overview`}><Translate content="header.account" /></Link></li>;
+        if (linkedAccounts.size > 1) {
+            accounts = linkedAccounts
+                .sort((a, b) => {
+                    if (a > b) return 1;
+                    if (a < b) return -1;
+                    return 0;
+                })
+                .map(a => {
+                    return (
+                        <li key={a} onClick={this.onClick}>
+                            <Link to={`/account/${a}/overview`}>{a}</Link>
+                        </li>
+                    );
+                });
+        } else if (linkedAccounts.size === 1) {
+            accounts = (
+                <li key="account" onClick={this.onClick}>
+                    <Link to={`/account/${linkedAccounts.first()}/overview`}>
+                        <Translate content="header.account" />
+                    </Link>
+                </li>
+            );
         }
 
         let linkToAccountOrDashboard;
-        if (linkedAccounts.size > 0) linkToAccountOrDashboard = <a onClick={this._onNavigate.bind(this, "/dashboard")}><Translate content="header.dashboard" /></a>;
-        else linkToAccountOrDashboard = <Link to="/create-account">Create Account</Link>;
-
-        let tradeLink = this.props.lastMarket ?
-            <a onClick={this._onNavigate.bind(this, `/market/${this.props.lastMarket}`)}><Translate content="header.exchange" /></a> :
-            <a onClick={this._onNavigate.bind(this, "/explorer/markets")}><Translate content="header.exchange" /></a>;
+        if (linkedAccounts.size > 0)
+            linkToAccountOrDashboard = (
+                <a onClick={this._onNavigate.bind(this, "/dashboard")}>
+                    <Translate content="header.dashboard" />
+                </a>
+            );
+        else
+            linkToAccountOrDashboard = (
+                <Link to="/create-account">Create Account</Link>
+            );
+
+        let tradeLink = this.props.lastMarket ? (
+            <a
+                onClick={this._onNavigate.bind(
+                    this,
+                    `/market/${this.props.lastMarket}`
+                )}
+            >
+                <Translate content="header.exchange" />
+            </a>
+        ) : (
+            <a onClick={this._onNavigate.bind(this, "/explorer/markets")}>
+                <Translate content="header.exchange" />
+            </a>
+        );
 
         return (
             <Panel id={id} position="left">
-              <div className="grid-content" style={{zIndex: 200}}>
-                <Trigger close={id}>
-                  <a className="close-button">&times;</a>
-                </Trigger>
-                <section style={{marginTop: "3rem"}} className="block-list">
-                    <ul>
-                        <li>{linkToAccountOrDashboard}</li>
-                        <li onClick={this.onClick}><Link to="transfer"><Translate content="header.payments"/></Link></li>
-                        {linkedAccounts.size === 0 ? null :
-                          <li>{tradeLink}</li>}
-                        {currentAccount && myAccounts.indexOf(currentAccount) !== -1 ? <li onClick={this.onClick}><Link to={"/deposit-withdraw/"}><Translate content="account.deposit_withdraw"/></Link></li> : null}
-                        <li><a onClick={this._onNavigate.bind(this, "/explorer")}><Translate content="header.explorer" /></a></li>
-                        <li onClick={this.onClick}><Link to="settings"><Translate content="header.settings"/></Link></li>
-
-                    </ul>
-                </section>
-
-                <section style={{marginTop: "3rem"}} className="block-list">
-                  <header><Translate content="account.accounts" /></header>
-                  <ul>
-                      {accounts}
-                  </ul>
-                  </section>
+                <div className="grid-content" style={{zIndex: 200}}>
+                    <Trigger close={id}>
+                        <a className="close-button">&times;</a>
+                    </Trigger>
+                    <section style={{marginTop: "3rem"}} className="block-list">
+                        <ul>
+                            <li>{linkToAccountOrDashboard}</li>
+                            <li onClick={this.onClick}>
+                                <Link to="transfer">
+                                    <Translate content="header.payments" />
+                                </Link>
+                            </li>
+                            {linkedAccounts.size === 0 ? null : (
+                                <li>{tradeLink}</li>
+                            )}
+                            {currentAccount &&
+                            myAccounts.indexOf(currentAccount) !== -1 ? (
+                                <li onClick={this.onClick}>
+                                    <Link to={"/deposit-withdraw/"}>
+                                        <Translate content="account.deposit_withdraw" />
+                                    </Link>
+                                </li>
+                            ) : null}
+                            <li>
+                                <a
+                                    onClick={this._onNavigate.bind(
+                                        this,
+                                        "/explorer"
+                                    )}
+                                >
+                                    <Translate content="header.explorer" />
+                                </a>
+                            </li>
+                            <li onClick={this.onClick}>
+                                <Link to="settings">
+                                    <Translate content="header.settings" />
+                                </Link>
+                            </li>
+                        </ul>
+                    </section>
+
+                    <section style={{marginTop: "3rem"}} className="block-list">
+                        <header>
+                            <Translate content="account.accounts" />
+                        </header>
+                        <ul>{accounts}</ul>
+                    </section>
                 </div>
             </Panel>
         );
@@ -88,7 +143,12 @@ class MobileMenu extends React.Component {
 
 MobileMenu = connect(MobileMenu, {
     listenTo() {
-        return [AccountStore, WalletUnlockStore, WalletManagerStore, SettingsStore];
+        return [
+            AccountStore,
+            WalletUnlockStore,
+            WalletManagerStore,
+            SettingsStore
+        ];
     },
     getProps() {
         const chainID = Apis.instance().chain_id;
@@ -97,14 +157,15 @@ MobileMenu = connect(MobileMenu, {
             currentAccount: AccountStore.getState().currentAccount,
             locked: WalletUnlockStore.getState().locked,
             current_wallet: WalletManagerStore.getState().current_wallet,
-            lastMarket: SettingsStore.getState().viewSettings.get(`lastMarket${chainID ? ("_" + chainID.substr(0, 8)) : ""}`),
+            lastMarket: SettingsStore.getState().viewSettings.get(
+                `lastMarket${chainID ? "_" + chainID.substr(0, 8) : ""}`
+            ),
             myAccounts: AccountStore.getMyAccounts()
         };
     }
 });
 
 export default class WidthWrapper extends React.Component {
-
     constructor() {
         super();
 
@@ -117,7 +178,10 @@ export default class WidthWrapper extends React.Component {
     }
 
     componentDidMount() {
-        window.addEventListener("resize", this._checkWidth, {capture: false, passive: true});
+        window.addEventListener("resize", this._checkWidth, {
+            capture: false,
+            passive: true
+        });
     }
 
     componentWillUnmount() {
diff --git a/app/components/Modal/BaseModal.jsx b/app/components/Modal/BaseModal.jsx
index 29572785ab..4648a497cf 100644
--- a/app/components/Modal/BaseModal.jsx
+++ b/app/components/Modal/BaseModal.jsx
@@ -11,9 +11,9 @@ class BaseModal extends React.Component {
         super();
     }
 
-    componentDidMount(){
-        this.modalEscapeListener = function(e){
-            if(e.keyCode === 27){
+    componentDidMount() {
+        this.modalEscapeListener = function(e) {
+            if (e.keyCode === 27) {
                 ZfApi.publish(this.props.id, "close");
             }
         }.bind(this);
@@ -21,25 +21,56 @@ class BaseModal extends React.Component {
         document.addEventListener("keydown", this.modalEscapeListener);
     }
 
-    componentWillUnmount(){
+    componentWillUnmount() {
         document.removeEventListener("keydown", this.modalEscapeListener);
     }
 
     render() {
-        const { props } = this;
-        const { id, overlay, onClose, overlayClose, className, modalHeader, noCloseBtn, noLoggo, noHeader, children } = props;
+        const {props} = this;
+        const {
+            id,
+            overlay,
+            onClose,
+            overlayClose,
+            className,
+            modalHeader,
+            noCloseBtn,
+            noLoggo,
+            noHeader,
+            children
+        } = props;
 
         return (
-            <Modal id={id} overlay={overlay} onClose={onClose} className={className} overlayClose={overlayClose}>
-                {!noCloseBtn && <Trigger close={id}>
-                    <a href="#" className="close-button">&times;</a>
-                </Trigger>}
-                {!noLoggo && <div className="modal__logo"><img src={logo} /></div>}
-                {!noHeader && modalHeader && <div className="text-center">
-                    <div className="modal__title">
-                        <Translate component="h4" content={modalHeader} />
+            <Modal
+                id={id}
+                overlay={overlay}
+                onClose={onClose}
+                className={className}
+                overlayClose={overlayClose}
+            >
+                {!noCloseBtn && (
+                    <Trigger close={id}>
+                        <a href="#" className="close-button">
+                            &times;
+                        </a>
+                    </Trigger>
+                )}
+                {!noLoggo && (
+                    <div className="modal__logo">
+                        <img src={logo} />
                     </div>
-                </div>}
+                )}
+                {!noHeader &&
+                    modalHeader && (
+                        <div className="text-center">
+                            <div className="modal__title">
+                                <Translate
+                                    component="h4"
+                                    content={modalHeader}
+                                />
+                            </div>
+                        </div>
+                    )}
                 {children}
             </Modal>
         );
@@ -47,7 +78,7 @@ class BaseModal extends React.Component {
 }
 
 BaseModal.defaultProps = {
-    overlay: false,
+    overlay: false
 };
 
 BaseModal.propTypes = {
diff --git a/app/components/Modal/BrowserSupportModal.jsx b/app/components/Modal/BrowserSupportModal.jsx
index 1c8a3036bb..fdb13faea3 100644
--- a/app/components/Modal/BrowserSupportModal.jsx
+++ b/app/components/Modal/BrowserSupportModal.jsx
@@ -5,13 +5,15 @@ import Translate from "react-translate-component";
 import BaseModal from "./BaseModal";
 
 export default class BrowserSupportModal extends React.Component {
-
     show() {
         ZfApi.publish("browser_modal", "open");
     }
 
     _openLink() {
-        let newWnd = window.open("https://www.google.com/chrome/browser/desktop/", "_blank");
+        let newWnd = window.open(
+            "https://www.google.com/chrome/browser/desktop/",
+            "_blank"
+        );
         newWnd.opener = null;
     }
 
@@ -19,15 +21,27 @@ export default class BrowserSupportModal extends React.Component {
         return (
             <BaseModal id="browser_modal" overlay={true} ref="browser_modal">
                 <div className="grid-block vertical no-overflow">
-                    <Translate component="h3" content="init_error.browser"/>
-                    <Translate component="p" content="init_error.browser_text"/>
-                    <br/>
+                    <Translate component="h3" content="init_error.browser" />
+                    <Translate
+                        component="p"
+                        content="init_error.browser_text"
+                    />
+                    <br />
 
-                    <p><a href onClick={this._openLink}>Google Chrome</a></p>
+                    <p>
+                        <a href onClick={this._openLink}>
+                            Google Chrome
+                        </a>
+                    </p>
 
-                    <div className="button-group no-overflow" style={{paddingTop: 0}}>
+                    <div
+                        className="button-group no-overflow"
+                        style={{paddingTop: 0}}
+                    >
                         <Trigger close="browser_modal">
-                            <div className="button"><Translate content="init_error.understand" /></div>
+                            <div className="button">
+                                <Translate content="init_error.understand" />
+                            </div>
                         </Trigger>
                     </div>
                 </div>
diff --git a/app/components/Modal/DepositModal.jsx b/app/components/Modal/DepositModal.jsx
index 9d6d214607..c0e0bcc22c 100644
--- a/app/components/Modal/DepositModal.jsx
+++ b/app/components/Modal/DepositModal.jsx
@@ -85,7 +85,8 @@ class DepositModalContent extends DecimalChecker {
     }
 
     onAssetSelected(asset, assetDetails) {
-        if(assetDetails.gateway == "") return this.setState({selectedAsset: asset, selectedGateway: null});
+        if (assetDetails.gateway == "")
+            return this.setState({selectedAsset: asset, selectedGateway: null});
 
         let {selectedAsset, selectedGateway} = _onAssetSelected.call(
             this,
@@ -237,12 +238,16 @@ class DepositModalContent extends DecimalChecker {
                         <Translate
                             component="p"
                             content="modal.deposit.header"
-                            account_name={<span className="modal__highlight">{account}</span>}
+                            account_name={
+                                <span className="modal__highlight">
+                                    {account}
+                                </span>
+                            }
                         />
                     ) : (
                         <Translate
                             component="p"
-                            content="modal.deposit.header_short" 
+                            content="modal.deposit.header_short"
                         />
                     )}
                 </div>
@@ -261,15 +266,13 @@ class DepositModalContent extends DecimalChecker {
 
                     {usingGateway && selectedAsset
                         ? gatewaySelector.call(this, {
-                            selectedGateway,
-                            gatewayStatus,
-                            nAvailableGateways,
-                            error: depositAddress && depositAddress.error,
-                            onGatewayChanged: this.onGatewayChanged.bind(this)
-                        })
-                        : 
-                        null
-                    }
+                              selectedGateway,
+                              gatewayStatus,
+                              nAvailableGateways,
+                              error: depositAddress && depositAddress.error,
+                              onGatewayChanged: this.onGatewayChanged.bind(this)
+                          })
+                        : null}
 
                     {!fetchingAddress ? (
                         (!usingGateway ||
@@ -317,11 +320,9 @@ class DepositModalContent extends DecimalChecker {
                             {this.state.isOpenledger && (
                                 <Translate
                                     className="grid-block container-row maxDeposit"
-                                    style={{ fontSize: "1rem" }}
+                                    style={{fontSize: "1rem"}}
                                     content="gateway.min_deposit_warning_amount"
-                                    minDeposit={
-                                        backingAsset.gateFee * 2 || 0
-                                    }
+                                    minDeposit={backingAsset.gateFee * 2 || 0}
                                     coin={selectedAsset}
                                 />
                             )}
@@ -336,7 +337,11 @@ class DepositModalContent extends DecimalChecker {
                                 <div>
                                     <Translate
                                         component="div"
-                                        style={{ fontSize: "0.8rem", fontWeight: "bold", paddingBottom: "0.3rem" }}
+                                        style={{
+                                            fontSize: "0.8rem",
+                                            fontWeight: "bold",
+                                            paddingBottom: "0.3rem"
+                                        }}
                                         content="gateway.purchase_notice"
                                         inputAsset={selectedAsset}
                                         outputAsset={
@@ -344,8 +349,10 @@ class DepositModalContent extends DecimalChecker {
                                             "." +
                                             selectedAsset
                                         }
-                                        />
-                                    <div className="modal__highlight">{depositAddress.address}</div>
+                                    />
+                                    <div className="modal__highlight">
+                                        {depositAddress.address}
+                                    </div>
                                 </div>
                             </div>
                             {depositAddress.memo ? (
@@ -359,18 +366,24 @@ class DepositModalContent extends DecimalChecker {
                                     <div>
                                         <Translate
                                             component="div"
-                                            style={{ fontSize: "0.8rem", fontWeight: "bold", paddingBottom: "0.3rem" }}
+                                            style={{
+                                                fontSize: "0.8rem",
+                                                fontWeight: "bold",
+                                                paddingBottom: "0.3rem"
+                                            }}
                                             unsafe
                                             content="gateway.purchase_notice_memo"
                                         />
-                                        <div className="modal__highlight">{depositAddress.memo}</div>
+                                        <div className="modal__highlight">
+                                            {depositAddress.memo}
+                                        </div>
                                     </div>
                                 </div>
                             ) : null}
                             {this.state.isOpenledger && (
                                 <Translate
                                     component="span"
-                                    style={{ fontSize: "0.8rem" }}
+                                    style={{fontSize: "0.8rem"}}
                                     content="gateway.min_deposit_warning_asset"
                                     minDeposit={backingAsset.gateFee * 2 || 0}
                                     coin={selectedAsset}
@@ -380,14 +393,20 @@ class DepositModalContent extends DecimalChecker {
                     ) : null}
                     {!usingGateway ? (
                         <div className="container-row deposit-directly">
-                            <h2 className="modal__highlight" style={{textAlign: "center"}}>{account}</h2>
-                            <Translate component="h6" content="modal.deposit.bts_transfer_description" />
+                            <h2
+                                className="modal__highlight"
+                                style={{textAlign: "center"}}
+                            >
+                                {account}
+                            </h2>
+                            <Translate
+                                component="h6"
+                                content="modal.deposit.bts_transfer_description"
+                            />
                         </div>
                     ) : null}
-                    
                 </div>
 
-
                 <div className="Modal__footer">
                     <div className="container-row">
                         <button
diff --git a/app/components/Modal/IssueModal.jsx b/app/components/Modal/IssueModal.jsx
index 45934d3f5f..af1098bd34 100644
--- a/app/components/Modal/IssueModal.jsx
+++ b/app/components/Modal/IssueModal.jsx
@@ -9,7 +9,6 @@ import AccountSelector from "../Account/AccountSelector";
 import AmountSelector from "../Utility/AmountSelector";
 
 class IssueModal extends React.Component {
-
     static propTypes = {
         asset_to_issue: ChainTypes.ChainAsset.isRequired
     };
@@ -24,12 +23,14 @@ class IssueModal extends React.Component {
         };
     }
 
-    onAmountChanged({amount,asset}) {
+    onAmountChanged({amount, asset}) {
         this.setState({amount: amount});
     }
 
     onToAccountChanged(to) {
-        let state = to ? {to: to.get('name'), to_id: to.get('id')} : {to_id: null};
+        let state = to
+            ? {to: to.get("name"), to_id: to.get("id")}
+            : {to_id: null};
         this.setState(state);
     }
 
@@ -39,7 +40,9 @@ class IssueModal extends React.Component {
 
     onSubmit() {
         let {asset_to_issue} = this.props;
-        let precision = utils.get_asset_precision(asset_to_issue.get("precision"));
+        let precision = utils.get_asset_precision(
+            asset_to_issue.get("precision")
+        );
         let amount = this.state.amount.replace(/,/g, "");
         amount *= precision;
 
@@ -48,7 +51,9 @@ class IssueModal extends React.Component {
             asset_to_issue.get("issuer"),
             asset_to_issue.get("id"),
             amount,
-            this.state.memo ? new Buffer(this.state.memo, "utf-8") : this.state.memo
+            this.state.memo
+                ? new Buffer(this.state.memo, "utf-8")
+                : this.state.memo
         );
 
         this.setState({
@@ -63,63 +68,79 @@ class IssueModal extends React.Component {
     }
 
     render() {
-        let asset_to_issue = this.props.asset_to_issue.get('id');
+        let asset_to_issue = this.props.asset_to_issue.get("id");
         let tabIndex = 1;
 
-        return ( <form className="grid-block vertical full-width-content">
-            <div className="grid-container " style={{paddingTop: "2rem"}}>
-                {/* T O */}
-                <div className="content-block">
-                    <AccountSelector
-                        label={"modal.issue.to"}
-                        accountName={this.state.to}
-                        onAccountChanged={this.onToAccountChanged.bind(this)}
-                        onChange={this.onToChanged.bind(this)}
-                        account={this.state.to}
-                        tabIndex={tabIndex++}
-                    />
-                </div>
-
-                {/* A M O U N T */}
-                <div className="content-block">
-                    <AmountSelector
-                        label="modal.issue.amount"
-                        amount={this.state.amount}
-                        onChange={this.onAmountChanged.bind(this)}
-                        asset={ asset_to_issue  }
-                        assets={[asset_to_issue]}
-                        tabIndex={tabIndex++}
-                    />
-                </div>
-
-                {/*  M E M O  */}
-                <div className="content-block">
-                    <label><Translate component="span" content="transfer.memo"/> (<Translate content="transfer.optional" />)</label>
-                    <textarea rows="3" value={this.state.memo} tabIndex={tabIndex++} onChange={this.onMemoChanged.bind(this)} />
-
-                </div>
+        return (
+            <form className="grid-block vertical full-width-content">
+                <div className="grid-container " style={{paddingTop: "2rem"}}>
+                    {/* T O */}
+                    <div className="content-block">
+                        <AccountSelector
+                            label={"modal.issue.to"}
+                            accountName={this.state.to}
+                            onAccountChanged={this.onToAccountChanged.bind(
+                                this
+                            )}
+                            onChange={this.onToChanged.bind(this)}
+                            account={this.state.to}
+                            tabIndex={tabIndex++}
+                        />
+                    </div>
 
-                <div className="content-block button-group">
-                    <input
-                        type="submit"
-                        className="button success"
-                        onClick={this.onSubmit.bind(this, this.state.to, this.state.amount )}
-                        value={counterpart.translate("modal.issue.submit")}
-                        tabIndex={tabIndex++}
-                    />
-
-                    <div
-                        className="button"
-                        onClick={this.props.onClose}
-                        tabIndex={tabIndex++}
-                    >
-                        {counterpart.translate("cancel")}
+                    {/* A M O U N T */}
+                    <div className="content-block">
+                        <AmountSelector
+                            label="modal.issue.amount"
+                            amount={this.state.amount}
+                            onChange={this.onAmountChanged.bind(this)}
+                            asset={asset_to_issue}
+                            assets={[asset_to_issue]}
+                            tabIndex={tabIndex++}
+                        />
                     </div>
 
+                    {/*  M E M O  */}
+                    <div className="content-block">
+                        <label>
+                            <Translate
+                                component="span"
+                                content="transfer.memo"
+                            />{" "}
+                            (<Translate content="transfer.optional" />)
+                        </label>
+                        <textarea
+                            rows="3"
+                            value={this.state.memo}
+                            tabIndex={tabIndex++}
+                            onChange={this.onMemoChanged.bind(this)}
+                        />
+                    </div>
 
+                    <div className="content-block button-group">
+                        <input
+                            type="submit"
+                            className="button success"
+                            onClick={this.onSubmit.bind(
+                                this,
+                                this.state.to,
+                                this.state.amount
+                            )}
+                            value={counterpart.translate("modal.issue.submit")}
+                            tabIndex={tabIndex++}
+                        />
+
+                        <div
+                            className="button"
+                            onClick={this.props.onClose}
+                            tabIndex={tabIndex++}
+                        >
+                            {counterpart.translate("cancel")}
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </form> );
+            </form>
+        );
     }
 }
 
diff --git a/app/components/Modal/ProposalApproveModal.jsx b/app/components/Modal/ProposalApproveModal.jsx
index befc84f325..bb4534f8f1 100644
--- a/app/components/Modal/ProposalApproveModal.jsx
+++ b/app/components/Modal/ProposalApproveModal.jsx
@@ -13,22 +13,21 @@ import pu from "common/permission_utils";
 import {ChainStore} from "bitsharesjs/es";
 
 class ProposalApproveModal extends React.Component {
+    static propTypes = {
+        accounts: ChainTypes.ChainAccountsList
+    };
 
-   static propTypes = {
-       accounts: ChainTypes.ChainAccountsList
-   };
-
-   constructor(props) {
+    constructor(props) {
         super();
         this.state = {
             active: null,
             key: null,
             owner: null,
             payee: null
-        }
-   }
+        };
+    }
 
-   onActiveAccount(accountMap, keyMap, type, account) {
+    onActiveAccount(accountMap, keyMap, type, account) {
         let newState = {};
 
         if (keyMap[account]) {
@@ -42,8 +41,7 @@ class ProposalApproveModal extends React.Component {
             newState["key"] = null;
         }
         this.setState(newState);
-
-   }
+    }
 
     _onProposalAction(oldProposal) {
         let proposalObject = oldProposal.toJS();
@@ -67,7 +65,10 @@ class ProposalApproveModal extends React.Component {
         ["active", "owner", "key"].forEach(auth_type => {
             let value = this.state[auth_type];
             if (value) {
-                let hasValue = proposalObject[`available_${auth_type}_approvals`].indexOf(value) !== -1;
+                let hasValue =
+                    proposalObject[`available_${auth_type}_approvals`].indexOf(
+                        value
+                    ) !== -1;
                 if ((isAdd && !hasValue) || (!isAdd && hasValue)) {
                     if (this.props.action === "approve") {
                         proposal[`${auth_type}_approvals_to_add`] = [value];
@@ -77,7 +78,6 @@ class ProposalApproveModal extends React.Component {
                         if (auth_type === "key") neededKeys.push(value);
                     }
                 }
-
             }
         });
 
@@ -111,8 +111,15 @@ class ProposalApproveModal extends React.Component {
 
         if (this.props.accounts.length) {
             this.props.accounts.forEach(account => {
-                let accountCheck = isAdd ? account && !proposal.get(`available_${type}_approvals`).includes(account.get("id")) :
-                        account && proposal.get(`available_${type}_approvals`).includes(account.get("id"));
+                let accountCheck = isAdd
+                    ? account &&
+                      !proposal
+                          .get(`available_${type}_approvals`)
+                          .includes(account.get("id"))
+                    : account &&
+                      proposal
+                          .get(`available_${type}_approvals`)
+                          .includes(account.get("id"));
                 if (accountCheck) {
                     accountMap[account.get("name")] = account.get("id");
                     accountNames.push(account.get("name"));
@@ -125,7 +132,10 @@ class ProposalApproveModal extends React.Component {
         if (this.props.keys.length) {
             this.props.keys.forEach(key => {
                 let isMine = AccountStore.isMyKey(key);
-                if (isMine && !proposal.get("available_key_approvals").includes(key)) {
+                if (
+                    isMine &&
+                    !proposal.get("available_key_approvals").includes(key)
+                ) {
                     keyMap[key] = true;
                     keyNames.push(key);
                 }
@@ -140,19 +150,36 @@ class ProposalApproveModal extends React.Component {
                     <div className="content-block">
                         <h4>{isAdd ? "Add approval" : "Remove approval"}</h4>
                     </div>
-                    <div className="content-block" style={{paddingRight: "20%"}}>
-
+                    <div
+                        className="content-block"
+                        style={{paddingRight: "20%"}}
+                    >
                         <NestedApprovalState
                             proposal={proposal.get("id")}
                             type={type}
-                            added={isAdd ? this.state.key ? this.state.key : this.state[type] || null : null}
-                            removed={!isAdd ? this.state.key ? this.state.key : this.state[type] || null : null}
+                            added={
+                                isAdd
+                                    ? this.state.key
+                                        ? this.state.key
+                                        : this.state[type] || null
+                                    : null
+                            }
+                            removed={
+                                !isAdd
+                                    ? this.state.key
+                                        ? this.state.key
+                                        : this.state[type] || null
+                                    : null
+                            }
                         />
                     </div>
 
                     <div className="content-block full-width-content">
-                       <div className="full-width-content form-group">
-                           <Translate content="modal.proposals.pay_with" component="label" />
+                        <div className="full-width-content form-group">
+                            <Translate
+                                content="modal.proposals.pay_with"
+                                component="label"
+                            />
                             <AccountSelect
                                 account_names={myAccounts}
                                 onChange={this.onChangePayee.bind(this)}
@@ -160,47 +187,75 @@ class ProposalApproveModal extends React.Component {
                         </div>
 
                         {accountNames.length || keyNames.length ? (
-                        <div className="full-width-content form-group">
-                            <Translate content={`modal.proposals.approval_${isAdd ? "add" : "remove"}`} component="label" />
-                            <AccountSelect
-                                account_names={accountNames.concat(keyNames)}
-                                onChange={this.onActiveAccount.bind(this, accountMap, keyMap, type)}
-                            />
-                        </div>) : null}
+                            <div className="full-width-content form-group">
+                                <Translate
+                                    content={`modal.proposals.approval_${
+                                        isAdd ? "add" : "remove"
+                                    }`}
+                                    component="label"
+                                />
+                                <AccountSelect
+                                    account_names={accountNames.concat(
+                                        keyNames
+                                    )}
+                                    onChange={this.onActiveAccount.bind(
+                                        this,
+                                        accountMap,
+                                        keyMap,
+                                        type
+                                    )}
+                                />
+                            </div>
+                        ) : null}
 
                         {false && keyNames.length ? (
-                        <div className="full-width-content form-group">
-                            <Translate content={`modal.proposals.key_approval_${isAdd ? "add" : "remove"}`} component="label" />
-                            <AccountSelect
-                                account_names={keyNames}
-                                onChange={this.onActiveAccount.bind(this, keyMap, "key")}
-                            />
-                        </div>) : null}
+                            <div className="full-width-content form-group">
+                                <Translate
+                                    content={`modal.proposals.key_approval_${
+                                        isAdd ? "add" : "remove"
+                                    }`}
+                                    component="label"
+                                />
+                                <AccountSelect
+                                    account_names={keyNames}
+                                    onChange={this.onActiveAccount.bind(
+                                        this,
+                                        keyMap,
+                                        "key"
+                                    )}
+                                />
+                            </div>
+                        ) : null}
                     </div>
 
                     <div className="content-block">
                         <input
                             type="submit"
                             className="button"
-                            onClick={this._onProposalAction.bind(this, proposal)}
+                            onClick={this._onProposalAction.bind(
+                                this,
+                                proposal
+                            )}
                             value={isAdd ? "Approve" : "Remove"}
                         />
-                        <div onClick={this.onCancel.bind(this)} className=" button">
+                        <div
+                            onClick={this.onCancel.bind(this)}
+                            className=" button"
+                        >
                             <Translate content="account.perm.cancel" />
                         </div>
                     </div>
                 </div>
             </form>
-        )
+        );
     }
-};
+}
 ProposalApproveModal = BindToChainState(ProposalApproveModal);
 
 class FirstLevel extends React.Component {
-
     static propTypes = {
-       account: ChainTypes.ChainAccount.isRequired,
-       proposal: ChainTypes.ChainObject.isRequired
+        account: ChainTypes.ChainAccount.isRequired,
+        proposal: ChainTypes.ChainObject.isRequired
     };
 
     constructor() {
@@ -221,11 +276,17 @@ class FirstLevel extends React.Component {
 
     _updateState() {
         let {proposal, account} = this.props;
-        let type = proposal.get("required_active_approvals").size ? "active" : "owner";
+        let type = proposal.get("required_active_approvals").size
+            ? "active"
+            : "owner";
 
         let required = pu.listToIDs(proposal.get(`required_${type}_approvals`));
-        let available = pu.listToIDs(proposal.get(`available_${type}_approvals`));
-        let availableKeys = pu.listToIDs(proposal.get(`available_key_approvals`));
+        let available = pu.listToIDs(
+            proposal.get(`available_${type}_approvals`)
+        );
+        let availableKeys = pu.listToIDs(
+            proposal.get(`available_key_approvals`)
+        );
 
         this.setState({
             requiredPermissions: pu.unnest(required, type),
@@ -241,13 +302,17 @@ class FirstLevel extends React.Component {
         let finalRequired = [];
 
         requiredPermissions.forEach(account => {
-            finalRequired = finalRequired.concat(account.getMissingSigs(available));
+            finalRequired = finalRequired.concat(
+                account.getMissingSigs(available)
+            );
         });
 
         let finalRequiredKeys = [];
 
         requiredPermissions.forEach(account => {
-            finalRequiredKeys = finalRequiredKeys.concat(account.getMissingKeys(availableKeys));
+            finalRequiredKeys = finalRequiredKeys.concat(
+                account.getMissingKeys(availableKeys)
+            );
         });
 
         return (
@@ -263,7 +328,6 @@ class FirstLevel extends React.Component {
 FirstLevel = BindToChainState(FirstLevel);
 
 export default class ModalWrapper extends React.Component {
-
     constructor() {
         super();
 
@@ -290,11 +354,10 @@ export default class ModalWrapper extends React.Component {
         return (
             <BaseModal id={modalId} overlay={true} ref={modalId}>
                 {this.state.open ? (
-                <div className="grid-block vertical">
-                    <FirstLevel
-                        {...this.props}
-                    />
-                </div>) : null}
+                    <div className="grid-block vertical">
+                        <FirstLevel {...this.props} />
+                    </div>
+                ) : null}
             </BaseModal>
         );
     }
diff --git a/app/components/Modal/ReserveAssetModal.jsx b/app/components/Modal/ReserveAssetModal.jsx
index b376ddaf93..a1fcf5c565 100644
--- a/app/components/Modal/ReserveAssetModal.jsx
+++ b/app/components/Modal/ReserveAssetModal.jsx
@@ -7,7 +7,6 @@ import AmountSelector from "../Utility/AmountSelector";
 import AssetActions from "actions/AssetActions";
 
 export default class ReserveAssetModal extends React.Component {
-
     constructor(props) {
         super(props);
         this.state = {
@@ -20,10 +19,16 @@ export default class ReserveAssetModal extends React.Component {
     }
 
     onSubmit() {
-        let precision = utils.get_asset_precision(this.state.asset.get("precision"));
+        let precision = utils.get_asset_precision(
+            this.state.asset.get("precision")
+        );
         let amount = this.state.amount.replace(/,/g, "");
         amount *= precision;
-        AssetActions.reserveAsset(amount, this.props.assetId, this.props.account.get("id"))
+        AssetActions.reserveAsset(
+            amount,
+            this.props.assetId,
+            this.props.account.get("id")
+        );
         this.props.onClose();
     }
 
@@ -39,20 +44,28 @@ export default class ReserveAssetModal extends React.Component {
                             label="modal.reserve.amount"
                             amount={this.state.amount}
                             onChange={this.onAmountChanged.bind(this)}
-                            asset={ assetId  }
+                            asset={assetId}
                             assets={[assetId]}
-                            display_balance={<BalanceComponent balance={this.props.account.getIn(["balances", assetId])}/>}
+                            display_balance={
+                                <BalanceComponent
+                                    balance={this.props.account.getIn([
+                                        "balances",
+                                        assetId
+                                    ])}
+                                />
+                            }
                             tabIndex={1}
                         />
                     </div>
 
                     <div className="content-block button-group">
-
                         <input
                             type="submit"
                             className="button success"
                             onClick={this.onSubmit.bind(this)}
-                            value={counterpart.translate("modal.reserve.submit")}
+                            value={counterpart.translate(
+                                "modal.reserve.submit"
+                            )}
                             tabIndex={2}
                         />
 
@@ -63,7 +76,6 @@ export default class ReserveAssetModal extends React.Component {
                         >
                             {counterpart.translate("cancel")}
                         </div>
-
                     </div>
                 </div>
             </form>
diff --git a/app/components/Modal/SendModal.jsx b/app/components/Modal/SendModal.jsx
index b8b8c1494e..9d562f166a 100644
--- a/app/components/Modal/SendModal.jsx
+++ b/app/components/Modal/SendModal.jsx
@@ -390,12 +390,12 @@ export default class SendModal extends React.Component {
                               this._updateFee
                           )
                         : this.setState({
-                            feeAmount: fee,
-                            fee_asset_id: fee.asset_id,
-                            hasBalance,
-                            hasPoolBalance,
-                            error: !hasBalance || !hasPoolBalance
-                        })
+                              feeAmount: fee,
+                              fee_asset_id: fee.asset_id,
+                              hasBalance,
+                              hasPoolBalance,
+                              error: !hasBalance || !hasPoolBalance
+                          })
             )
         );
     }
diff --git a/app/components/Modal/SettleModal.jsx b/app/components/Modal/SettleModal.jsx
index d230d09ed5..d0451cfe99 100644
--- a/app/components/Modal/SettleModal.jsx
+++ b/app/components/Modal/SettleModal.jsx
@@ -25,7 +25,7 @@ class ModalContent extends React.Component {
         };
     }
 
-    onAmountChanged({amount,asset}) {
+    onAmountChanged({amount, asset}) {
         this.setState({amount: amount});
     }
 
@@ -33,7 +33,9 @@ class ModalContent extends React.Component {
         e.preventDefault();
         ZfApi.publish("settlement_modal", "close");
 
-        let precision = utils.get_asset_precision(this.props.asset.get("precision"));
+        let precision = utils.get_asset_precision(
+            this.props.asset.get("precision")
+        );
         let amount = this.state.amount.replace(/,/g, "");
         amount *= precision;
 
@@ -43,24 +45,24 @@ class ModalContent extends React.Component {
                 amount: 0,
                 asset_id: 0
             },
-            "account": this.props.account.get("id"),
-            "amount": {
-                "amount": amount,
-                "asset_id": this.props.asset.get("id")
+            account: this.props.account.get("id"),
+            amount: {
+                amount: amount,
+                asset_id: this.props.asset.get("id")
             }
         });
-        return WalletDb.process_transaction(tr, null, true).then(result => {
-            // console.log("asset settle result:", result);
-            // this.dispatch(account_id);
-            return true;
-        }).catch(error => {
-            console.error("asset settle error: ", error);
-            return false;
-        });
-
+        return WalletDb.process_transaction(tr, null, true)
+            .then(result => {
+                // console.log("asset settle result:", result);
+                // this.dispatch(account_id);
+                return true;
+            })
+            .catch(error => {
+                console.error("asset settle error: ", error);
+                return false;
+            });
     }
 
-
     render() {
         let {asset, account} = this.props;
         let {amount} = this.state;
@@ -69,51 +71,71 @@ class ModalContent extends React.Component {
             return null;
         }
 
-        let assetID = asset.get('id');
+        let assetID = asset.get("id");
 
         let account_balances = account.get("balances");
 
-        let currentBalance = null, balanceAmount = 0;
-
-        account_balances && account_balances.forEach( balance => {
-            let balanceObject = ChainStore.getObject(balance);
-            if (!balanceObject.get("balance")) {
-                return null;
-            }
-            if (balanceObject.get("asset_type") === assetID) {
-                currentBalance = balance;
-                balanceAmount = balanceObject.get("balance");
-            }
-        });
+        let currentBalance = null,
+            balanceAmount = 0;
+
+        account_balances &&
+            account_balances.forEach(balance => {
+                let balanceObject = ChainStore.getObject(balance);
+                if (!balanceObject.get("balance")) {
+                    return null;
+                }
+                if (balanceObject.get("asset_type") === assetID) {
+                    currentBalance = balance;
+                    balanceAmount = balanceObject.get("balance");
+                }
+            });
 
         let precision = utils.get_asset_precision(asset.get("precision"));
         let parsedAmount = amount ? amount.replace(/,/g, "") : 0;
-        let submit_btn_class = parseFloat(parsedAmount) > 0 && parseFloat(parsedAmount) * precision <= parseFloat(balanceAmount) ? "button success" : "button disabled";
+        let submit_btn_class =
+            parseFloat(parsedAmount) > 0 &&
+            parseFloat(parsedAmount) * precision <= parseFloat(balanceAmount)
+                ? "button success"
+                : "button disabled";
 
         let balanceText = (
             <span>
-                <Translate content="exchange.balance"/>:&nbsp;
-                {currentBalance ? <BalanceComponent balance={currentBalance}/> : "0 " + asset.get("symbol")}
+                <Translate content="exchange.balance" />:&nbsp;
+                {currentBalance ? (
+                    <BalanceComponent balance={currentBalance} />
+                ) : (
+                    "0 " + asset.get("symbol")
+                )}
             </span>
         );
 
         return (
             <form className="grid-block vertical full-width-content">
-                <Translate component="h3" style={{textAlign: "center"}} content="modal.settle.title" asset={asset.get("symbol")} />
+                <Translate
+                    component="h3"
+                    style={{textAlign: "center"}}
+                    content="modal.settle.title"
+                    asset={asset.get("symbol")}
+                />
                 <div className="grid-container " style={{paddingTop: "2rem"}}>
                     <div className="content-block">
-                        <AmountSelector label="modal.settle.amount"
-                                        amount={amount}
-                                        onChange={this.onAmountChanged.bind(this)}
-                                        display_balance={balanceText}
-                                        asset={ assetID  }
-                                        assets={[assetID]}
-                                        tabIndex={1}/>
+                        <AmountSelector
+                            label="modal.settle.amount"
+                            amount={amount}
+                            onChange={this.onAmountChanged.bind(this)}
+                            display_balance={balanceText}
+                            asset={assetID}
+                            assets={[assetID]}
+                            tabIndex={1}
+                        />
                     </div>
                     <div className="content-block">
-                        <input type="submit" className={submit_btn_class}
-                               onClick={this.onSubmit.bind(this)}
-                               value={counterpart.translate("modal.settle.submit")}/>
+                        <input
+                            type="submit"
+                            className={submit_btn_class}
+                            onClick={this.onSubmit.bind(this)}
+                            value={counterpart.translate("modal.settle.submit")}
+                        />
                     </div>
                 </div>
             </form>
@@ -126,11 +148,11 @@ class SettleModal extends React.Component {
     constructor() {
         super();
 
-        this.state = { open: false };
+        this.state = {open: false};
     }
 
     show() {
-        this.setState({ open: true }, () => {
+        this.setState({open: true}, () => {
             ZfApi.publish(this.props.modalId, "open");
         });
     }
@@ -141,7 +163,12 @@ class SettleModal extends React.Component {
 
     render() {
         return !this.state.open ? null : (
-            <BaseModal id={this.props.modalId} onClose={this.onClose.bind(this)} overlay={true} ref="settlement_modal">
+            <BaseModal
+                id={this.props.modalId}
+                onClose={this.onClose.bind(this)}
+                overlay={true}
+                ref="settlement_modal"
+            >
                 <div className="grid-block vertical">
                     <ModalContent {...this.props} />
                 </div>
diff --git a/app/components/Notifier/Notifier.jsx b/app/components/Notifier/Notifier.jsx
index c8b7530f56..220c2d0e0e 100644
--- a/app/components/Notifier/Notifier.jsx
+++ b/app/components/Notifier/Notifier.jsx
@@ -11,20 +11,38 @@ let {operations} = GraphChainTypes;
 let ops = Object.keys(operations);
 
 class Notifier extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainAccount.isRequired
-    }
+    };
 
     componentWillReceiveProps(nextProps) {
         if (nextProps.account.size && this.props.account.get("history")) {
-            let ch = this.props.account.get("history") && this.props.account.get("history").first() ? this.props.account.get("history").first().toJS() : null;
-            let nh = nextProps.account.get("history") && nextProps.account.get("history").first() ? nextProps.account.get("history").first().toJS(): null;
+            let ch =
+                this.props.account.get("history") &&
+                this.props.account.get("history").first()
+                    ? this.props.account
+                          .get("history")
+                          .first()
+                          .toJS()
+                    : null;
+            let nh =
+                nextProps.account.get("history") &&
+                nextProps.account.get("history").first()
+                    ? nextProps.account
+                          .get("history")
+                          .first()
+                          .toJS()
+                    : null;
             if (nh && ch) {
                 // Only trigger notifications for order fills
-                if ( ops[nh.op[0]] === "fill_order" && ((!ch && nh.id) || (nh.id !== ch.id))) {
+                if (
+                    ops[nh.op[0]] === "fill_order" &&
+                    ((!ch && nh.id) || nh.id !== ch.id)
+                ) {
                     ZfApi.publish("account-notify", "open");
-                    setTimeout(function() {ZfApi.publish("account-notify", "close"); }, 5000);
+                    setTimeout(function() {
+                        ZfApi.publish("account-notify", "close");
+                    }, 5000);
                 }
             }
         }
@@ -32,41 +50,58 @@ class Notifier extends React.Component {
 
     shouldComponentUpdate(nextProps) {
         return (
-            !Immutable.is(nextProps.account.get("history"), this.props.account.get("history")) ||
-            !Immutable.is(nextProps.account, this.props.account)
+            !Immutable.is(
+                nextProps.account.get("history"),
+                this.props.account.get("history")
+            ) || !Immutable.is(nextProps.account, this.props.account)
         );
     }
 
     render() {
         let {account} = this.props;
 
-        if(!account) { return <div></div>; }
+        if (!account) {
+            return <div />;
+        }
 
         let trx, info;
 
-        if (this.props.account.get("history") && this.props.account.get("history").size) {
-            trx = this.props.account.get("history").first().toJS();
+        if (
+            this.props.account.get("history") &&
+            this.props.account.get("history").size
+        ) {
+            trx = this.props.account
+                .get("history")
+                .first()
+                .toJS();
             if (trx) {
-                info = <Operation
-                            key={trx.id}
-                            op={trx.op}
-                            result={trx.result}
-                            block={trx.block_num}
-                            current={account.get("id")}
-                            hideDate={true}
-                            hideFee={true}
-                        />;
+                info = (
+                    <Operation
+                        key={trx.id}
+                        op={trx.op}
+                        result={trx.result}
+                        block={trx.block_num}
+                        current={account.get("id")}
+                        hideDate={true}
+                        hideFee={true}
+                    />
+                );
             }
         }
 
-        if(!trx) { return <div></div>; }
+        if (!trx) {
+            return <div />;
+        }
 
         return (
-            <Notification.Static id='account-notify' title={null} image="" wrapperElement="div">
+            <Notification.Static
+                id="account-notify"
+                title={null}
+                image=""
+                wrapperElement="div"
+            >
                 <table className="table">
-                    <tbody>
-                        {info}
-                    </tbody>
+                    <tbody>{info}</tbody>
                 </table>
             </Notification.Static>
         );
diff --git a/app/components/Notifier/NotifierContainer.jsx b/app/components/Notifier/NotifierContainer.jsx
index af64cde4d4..df8cdd0b4b 100644
--- a/app/components/Notifier/NotifierContainer.jsx
+++ b/app/components/Notifier/NotifierContainer.jsx
@@ -4,20 +4,18 @@ import AltContainer from "alt-container";
 import Notifier from "./Notifier";
 
 class NotifierContainer extends React.Component {
-
     render() {
-
         return (
-              <AltContainer 
-                  stores={[AccountStore]}
-                  inject={{
+            <AltContainer
+                stores={[AccountStore]}
+                inject={{
                     account: () => {
                         return AccountStore.getState().currentAccount;
                     }
-                  }} 
-                  >
-                <Notifier/>
-              </AltContainer>
+                }}
+            >
+                <Notifier />
+            </AltContainer>
         );
     }
 }
diff --git a/app/components/Settings/AccountsSettings.jsx b/app/components/Settings/AccountsSettings.jsx
index 12dd312100..978f4e8191 100644
--- a/app/components/Settings/AccountsSettings.jsx
+++ b/app/components/Settings/AccountsSettings.jsx
@@ -2,15 +2,17 @@ import React from "react";
 import {Link} from "react-router/es";
 import AccountStore from "stores/AccountStore";
 import AccountActions from "actions/AccountActions";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import utils from "common/utils";
 import Translate from "react-translate-component";
 
 class AccountsSettings extends React.Component {
     shouldComponentUpdate(nextProps) {
         return (
-            !utils.are_equal_shallow(nextProps.myAccounts, this.props.myAccounts) ||
-            nextProps.ignoredAccounts !== this.props.ignoredAccounts
+            !utils.are_equal_shallow(
+                nextProps.myAccounts,
+                this.props.myAccounts
+            ) || nextProps.ignoredAccounts !== this.props.ignoredAccounts
         );
     }
 
@@ -27,10 +29,17 @@ class AccountsSettings extends React.Component {
     render() {
         let {myAccounts, ignoredAccounts} = this.props;
 
-        let accounts = ignoredAccounts.toArray().concat(myAccounts).sort();
+        let accounts = ignoredAccounts
+            .toArray()
+            .concat(myAccounts)
+            .sort();
 
         if (!accounts.length) {
-            return <div><Translate content="settings.no_accounts" /></div>;
+            return (
+                <div>
+                    <Translate content="settings.no_accounts" />
+                </div>
+            );
         }
 
         return (
@@ -38,21 +47,37 @@ class AccountsSettings extends React.Component {
                 <tbody>
                     {accounts.map(account => {
                         let isIgnored = ignoredAccounts.has(account);
-                        let hideLink = (<a
-                            href
-                            onClick={isIgnored ?
-                                this.onLinkAccount.bind(this, account) :
-                                this.onUnlinkAccount.bind(this, account)
-                            }
+                        let hideLink = (
+                            <a
+                                href
+                                onClick={
+                                    isIgnored
+                                        ? this.onLinkAccount.bind(this, account)
+                                        : this.onUnlinkAccount.bind(
+                                              this,
+                                              account
+                                          )
+                                }
                             >
-                                <Translate content={"account." + (isIgnored ? "unignore" : "ignore")} />
+                                <Translate
+                                    content={
+                                        "account." +
+                                        (isIgnored ? "unignore" : "ignore")
+                                    }
+                                />
                             </a>
                         );
 
                         return (
                             <tr key={account}>
                                 <td>{account}</td>
-                                <td><Link to={`/account/${account}/permissions`}><Translate content="settings.view_keys" /></Link></td>
+                                <td>
+                                    <Link
+                                        to={`/account/${account}/permissions`}
+                                    >
+                                        <Translate content="settings.view_keys" />
+                                    </Link>
+                                </td>
                                 <td>{hideLink}</td>
                             </tr>
                         );
diff --git a/app/components/Settings/BackupFavorites.jsx b/app/components/Settings/BackupFavorites.jsx
index 386c3bbc1f..44e75e34bc 100644
--- a/app/components/Settings/BackupFavorites.jsx
+++ b/app/components/Settings/BackupFavorites.jsx
@@ -1,28 +1,34 @@
 import {saveAs} from "file-saver";
 import React from "react";
 import Translate from "react-translate-component";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import SettingsStore from "stores/SettingsStore";
 
 class BackupFavorites extends React.Component {
-    makeBackup(){
+    makeBackup() {
         let data = this.props.starredMarkets.toJS();
-        
-        let blob = new Blob([ JSON.stringify(data) ], {
-            type: "application/json; charset=us-ascii"})
 
-        saveAs(blob, 'favorites.json');
+        let blob = new Blob([JSON.stringify(data)], {
+            type: "application/json; charset=us-ascii"
+        });
+
+        saveAs(blob, "favorites.json");
     }
 
-    render(){
-        return <div>
-            <p>
-                <Translate content="settings.backup_favoritestext" />
-            </p>
-            <button onClick={this.makeBackup.bind(this)} className="button success">
-                <Translate content="settings.backup_favoritesbtn" />
-            </button>
-        </div>
+    render() {
+        return (
+            <div>
+                <p>
+                    <Translate content="settings.backup_favoritestext" />
+                </p>
+                <button
+                    onClick={this.makeBackup.bind(this)}
+                    className="button success"
+                >
+                    <Translate content="settings.backup_favoritesbtn" />
+                </button>
+            </div>
+        );
     }
 }
 
diff --git a/app/components/Settings/BackupSettings.jsx b/app/components/Settings/BackupSettings.jsx
index 8cdacab612..05e8f4dc3d 100644
--- a/app/components/Settings/BackupSettings.jsx
+++ b/app/components/Settings/BackupSettings.jsx
@@ -5,7 +5,6 @@ import counterpart from "counterpart";
 import BackupFavorites from "./BackupFavorites";
 
 export default class BackupSettings extends React.Component {
-
     constructor() {
         super();
         this.state = {
@@ -15,7 +14,6 @@ export default class BackupSettings extends React.Component {
     }
 
     _changeType(e) {
-
         this.setState({
             restoreType: this.state.types.indexOf(e.target.value)
         });
@@ -24,26 +22,30 @@ export default class BackupSettings extends React.Component {
     render() {
         let {types, restoreType} = this.state;
         let options = types.map(type => {
-            return <option key={type} value={type}>{counterpart.translate(`settings.backupcreate_${type}`)} </option>;
+            return (
+                <option key={type} value={type}>
+                    {counterpart.translate(`settings.backupcreate_${type}`)}{" "}
+                </option>
+            );
         });
 
         let content;
 
         switch (types[restoreType]) {
-        case "backup":
-            content = <BackupCreate />;
-            break;
+            case "backup":
+                content = <BackupCreate />;
+                break;
 
-        case "brainkey":
-            content = <BackupBrainkey />;
-            break;
+            case "brainkey":
+                content = <BackupBrainkey />;
+                break;
 
-        case "favorites":
-            content = <BackupFavorites />;
-            break;
+            case "favorites":
+                content = <BackupFavorites />;
+                break;
 
-        default:
-            break;
+            default:
+                break;
         }
 
         return (
@@ -60,4 +62,4 @@ export default class BackupSettings extends React.Component {
             </div>
         );
     }
-};
+}
diff --git a/app/components/Settings/PasswordSettings.jsx b/app/components/Settings/PasswordSettings.jsx
index 17a7388243..dacd36bd9a 100644
--- a/app/components/Settings/PasswordSettings.jsx
+++ b/app/components/Settings/PasswordSettings.jsx
@@ -3,7 +3,6 @@ import WalletChangePassword from "../Wallet/WalletChangePassword";
 
 export default class PasswordSettings extends React.Component {
     render() {
-
         return <WalletChangePassword />;
     }
-};
+}
diff --git a/app/components/Settings/ResetSettings.jsx b/app/components/Settings/ResetSettings.jsx
index bfafa677b6..60ceee6144 100644
--- a/app/components/Settings/ResetSettings.jsx
+++ b/app/components/Settings/ResetSettings.jsx
@@ -4,7 +4,6 @@ import Translate from "react-translate-component";
 import SettingsActions from "actions/SettingsActions";
 
 export default class ResetSettings extends React.Component {
-
     constructor() {
         super();
 
@@ -28,30 +27,52 @@ export default class ResetSettings extends React.Component {
     }
 
     render() {
-
         return (
             <section className="block-list no-border-bottom">
-
                 <header>
-                    <Translate component="span"
-                               style={{fontWeight: "normal", fontFamily: "Roboto-Medium, arial, sans-serif", fontStyle: "normal"}}
-                               content={"settings.reset_text_description"}
-                               generalName={counterpart.translate("settings.general")}
-                               with={{
-                                   generalName: counterpart.translate("settings.general"),
-                                   accessName: counterpart.translate("settings.access"),
-                                   faucetName: counterpart.translate("settings.faucet_address")
-                               }}/>
+                    <Translate
+                        component="span"
+                        style={{
+                            fontWeight: "normal",
+                            fontFamily: "Roboto-Medium, arial, sans-serif",
+                            fontStyle: "normal"
+                        }}
+                        content={"settings.reset_text_description"}
+                        generalName={counterpart.translate("settings.general")}
+                        with={{
+                            generalName: counterpart.translate(
+                                "settings.general"
+                            ),
+                            accessName: counterpart.translate(
+                                "settings.access"
+                            ),
+                            faucetName: counterpart.translate(
+                                "settings.faucet_address"
+                            )
+                        }}
+                    />
                 </header>
 
-                <div style={{height: 60, width: "100%", paddingTop: 20}}
+                <div
+                    style={{height: 60, width: "100%", paddingTop: 20}}
                     className="button"
-                    onClick={() => {SettingsActions.clearSettings().then(() => {this._setMessage("settings.restore_default_success");});}}
+                    onClick={() => {
+                        SettingsActions.clearSettings().then(() => {
+                            this._setMessage(
+                                "settings.restore_default_success"
+                            );
+                        });
+                    }}
                 >
                     {counterpart.translate("settings.reset")}
                 </div>
 
-                <div className="facolor-success" style={{marginTop: "20px", height: "18px"}}>{this.state.message}</div>
+                <div
+                    className="facolor-success"
+                    style={{marginTop: "20px", height: "18px"}}
+                >
+                    {this.state.message}
+                </div>
             </section>
         );
     }
diff --git a/app/components/Settings/RestoreFavorites.jsx b/app/components/Settings/RestoreFavorites.jsx
index c408be2f63..3191a00a0b 100644
--- a/app/components/Settings/RestoreFavorites.jsx
+++ b/app/components/Settings/RestoreFavorites.jsx
@@ -5,7 +5,7 @@ import notify from "actions/NotificationActions";
 import counterpart from "counterpart";
 
 class RestoreFavorites extends React.Component {
-    constructor(props){
+    constructor(props) {
         super(props);
 
         this.state = {
@@ -14,7 +14,7 @@ class RestoreFavorites extends React.Component {
         };
     }
 
-    upload(evt){
+    upload(evt) {
         this.setState({error: false, json: null});
 
         let file = evt.target.files[0];
@@ -25,30 +25,31 @@ class RestoreFavorites extends React.Component {
             try {
                 let json = JSON.parse(contents);
 
-                for(var key in json){
+                for (var key in json) {
                     let market = json[key];
-                    let { quote, base } = market;
+                    let {quote, base} = market;
 
-                    if(!quote || !base) throw new Error("Cannot parse json data.");
+                    if (!quote || !base)
+                        throw new Error("Cannot parse json data.");
                 }
 
                 this.setState({json});
                 // this.finish();
-            } catch(message) {
+            } catch (message) {
                 this.setState({error: true});
             }
         };
         reader.readAsText(file);
     }
 
-    finish(){
-        const { json } = this.state;
+    finish() {
+        const {json} = this.state;
 
         SettingsActions.clearStarredMarkets();
 
-        for(var key in json){
+        for (var key in json) {
             let market = json[key];
-            let { quote, base } = market;
+            let {quote, base} = market;
 
             SettingsActions.addStarMarket(quote, base);
         }
@@ -60,33 +61,40 @@ class RestoreFavorites extends React.Component {
         });
     }
 
-    render(){
-        const { state } = this;
-
-        return <div>
-            <input
-              type="file"
-              id="file_input"
-              accept=".json"
-              style={{
-                  border: "solid" ,
-                  marginBottom: 15
-              }}
-              onChange={this.upload.bind(this)}
-            />
-
-            {state.error && <h5>
-                <Translate content="settings.backup_favorites_error" />
-            </h5>}
-
-            {state.json &&
-                <p>
-                    <button onClick={this.finish.bind(this)} className="button success">
-                        <Translate content="settings.backup_favorites_finish" />
-                    </button>
-                </p>
-            }
-        </div>
+    render() {
+        const {state} = this;
+
+        return (
+            <div>
+                <input
+                    type="file"
+                    id="file_input"
+                    accept=".json"
+                    style={{
+                        border: "solid",
+                        marginBottom: 15
+                    }}
+                    onChange={this.upload.bind(this)}
+                />
+
+                {state.error && (
+                    <h5>
+                        <Translate content="settings.backup_favorites_error" />
+                    </h5>
+                )}
+
+                {state.json && (
+                    <p>
+                        <button
+                            onClick={this.finish.bind(this)}
+                            className="button success"
+                        >
+                            <Translate content="settings.backup_favorites_finish" />
+                        </button>
+                    </p>
+                )}
+            </div>
+        );
     }
 }
 
diff --git a/app/components/Settings/RestoreSettings.jsx b/app/components/Settings/RestoreSettings.jsx
index 6c62a55790..2896738a38 100644
--- a/app/components/Settings/RestoreSettings.jsx
+++ b/app/components/Settings/RestoreSettings.jsx
@@ -8,7 +8,6 @@ import SettingsActions from "actions/SettingsActions";
 import RestoreFavorites from "./RestoreFavorites";
 
 export default class RestoreSettings extends React.Component {
-
     constructor() {
         super();
         this.state = {
@@ -25,7 +24,6 @@ export default class RestoreSettings extends React.Component {
     }
 
     _changeType(e) {
-
         this.setState({
             restoreType: this.state.types.indexOf(e.target.value)
         });
@@ -37,49 +35,62 @@ export default class RestoreSettings extends React.Component {
         if (passwordLogin) {
             return (
                 <div>
-                    <Translate content="settings.wallet_required" component="h4" />
-                    <p className="dark-text-color"><Translate content="settings.wallet_required_text" />:</p>
+                    <Translate
+                        content="settings.wallet_required"
+                        component="h4"
+                    />
+                    <p className="dark-text-color">
+                        <Translate content="settings.wallet_required_text" />:
+                    </p>
 
-                    <button className="button" onClick={this._setWalletMode}><Translate content="settings.enable_wallet" /></button>
+                    <button className="button" onClick={this._setWalletMode}>
+                        <Translate content="settings.enable_wallet" />
+                    </button>
                 </div>
             );
         }
         let {types, restoreType} = this.state;
         let options = types.map(type => {
-            return <option key={type} value={type}>{counterpart.translate(`settings.backup_${type}`)} </option>;
+            return (
+                <option key={type} value={type}>
+                    {counterpart.translate(`settings.backup_${type}`)}{" "}
+                </option>
+            );
         });
 
         let content;
 
         switch (types[restoreType]) {
-        case "backup":
-            content = (
-                <div>
-                    <BackupRestore />
-                </div>
-            );
-            break;
+            case "backup":
+                content = (
+                    <div>
+                        <BackupRestore />
+                    </div>
+                );
+                break;
 
-        case "brainkey":
-            content = (
-                <div>
-                    <p style={{maxWidth: "40rem", paddingBottom: 10}}><Translate content="settings.restore_brainkey_text" /></p>
-                    <CreateWalletFromBrainkey nested />
-                </div>
-            );
-            break;
+            case "brainkey":
+                content = (
+                    <div>
+                        <p style={{maxWidth: "40rem", paddingBottom: 10}}>
+                            <Translate content="settings.restore_brainkey_text" />
+                        </p>
+                        <CreateWalletFromBrainkey nested />
+                    </div>
+                );
+                break;
 
-        case "favorites":
-            content = (
-                <div>
-                    <RestoreFavorites />
-                </div>
-            );
-            break;           
+            case "favorites":
+                content = (
+                    <div>
+                        <RestoreFavorites />
+                    </div>
+                );
+                break;
 
-        default:
-            content = <ImportKeys privateKey={restoreType === 1} />;
-            break;
+            default:
+                content = <ImportKeys privateKey={restoreType === 1} />;
+                break;
         }
 
         return (
@@ -96,4 +107,4 @@ export default class RestoreSettings extends React.Component {
             </div>
         );
     }
-};
+}
diff --git a/app/components/Settings/SettingsContainer.jsx b/app/components/Settings/SettingsContainer.jsx
index df594752d6..e0d81a61f8 100644
--- a/app/components/Settings/SettingsContainer.jsx
+++ b/app/components/Settings/SettingsContainer.jsx
@@ -5,9 +5,7 @@ import AltContainer from "alt-container";
 import Settings from "./Settings";
 
 class SettingsContainer extends React.Component {
-
     render() {
-
         return (
             <AltContainer
                 stores={[SettingsStore]}
@@ -28,7 +26,7 @@ class SettingsContainer extends React.Component {
                         return SettingsStore.getState().apiLatencies;
                     }
                 }}
-                >
+            >
                 <Settings {...this.props} />
             </AltContainer>
         );
diff --git a/app/components/Settings/WalletSettings.jsx b/app/components/Settings/WalletSettings.jsx
index dbfc45a0f3..f7609b79e7 100644
--- a/app/components/Settings/WalletSettings.jsx
+++ b/app/components/Settings/WalletSettings.jsx
@@ -1,12 +1,11 @@
 import React from "react";
-import { ChangeActiveWallet, WalletDelete} from "../Wallet/WalletManager";
+import {ChangeActiveWallet, WalletDelete} from "../Wallet/WalletManager";
 import BalanceClaimActive from "../Wallet/BalanceClaimActive";
 import Translate from "react-translate-component";
 import counterpart from "counterpart";
 import WalletDb from "stores/WalletDb";
 
 export default class WalletSettings extends React.Component {
-
     constructor() {
         super();
 
@@ -44,38 +43,52 @@ export default class WalletSettings extends React.Component {
 
         return (
             <div>
-
                 <ChangeActiveWallet />
                 <WalletDelete />
 
                 <section style={{padding: "15px 0"}} className="block-list">
-                    <header><Translate content="wallet.balance_claims" />:</header>
-
+                    <header>
+                        <Translate content="wallet.balance_claims" />:
+                    </header>
                 </section>
 
                 <div style={{paddingBottom: 10}}>
                     <Translate content="settings.lookup_text" />:
                 </div>
-                <div className="button outline" onClick={this.onLookup.bind(this)}>
-                        <Translate content="wallet.balance_claim_lookup" />
+                <div
+                    className="button outline"
+                    onClick={this.onLookup.bind(this)}
+                >
+                    <Translate content="wallet.balance_claim_lookup" />
                 </div>
 
                 {lookupActive ? <BalanceClaimActive /> : null}
 
-
                 <section style={{padding: "15px 0"}} className="block-list">
-                    <header><Translate content="wallet.brainkey_seq_reset" />:</header>
+                    <header>
+                        <Translate content="wallet.brainkey_seq_reset" />:
+                    </header>
                 </section>
                 <div style={{paddingBottom: 10}}>
-
-                    <p><Translate unsafe content="wallet.brainkey_seq_reset_text" /></p>
-                    <div className="button outline" onClick={this.onResetBrainkeySequence.bind(this)}>
-                            <Translate content="wallet.brainkey_seq_reset_button" />
+                    <p>
+                        <Translate
+                            unsafe
+                            content="wallet.brainkey_seq_reset_text"
+                        />
+                    </p>
+                    <div
+                        className="button outline"
+                        onClick={this.onResetBrainkeySequence.bind(this)}
+                    >
+                        <Translate content="wallet.brainkey_seq_reset_button" />
                     </div>
-                    {this.state.resetMessage ? <p style={{paddingTop: 10}} className="facolor-success">{this.state.resetMessage}</p> : null}
+                    {this.state.resetMessage ? (
+                        <p style={{paddingTop: 10}} className="facolor-success">
+                            {this.state.resetMessage}
+                        </p>
+                    ) : null}
                 </div>
-
             </div>
         );
     }
-};
+}
diff --git a/app/components/Transfer/Invoice.jsx b/app/components/Transfer/Invoice.jsx
index cb3da064fe..d4b36b3eaa 100644
--- a/app/components/Transfer/Invoice.jsx
+++ b/app/components/Transfer/Invoice.jsx
@@ -28,7 +28,6 @@ import utils from "common/utils";
 // http://localhost:8080/#/invoice/8Cv8ZjMa8XCazX37XgNhj4jNc4Z5WgZFM5jueMEs2eEvL3pEmELjAVCWZEJhj9tEG5RuinPCjY1Fi34ozb8Cg3H5YBemy9JoTRt89X1QaE76xnxWPZzLcUjvUd4QZPjCyqZNxvrpCN2mm1xVRY8FNSVsoxsrZwREMyygahYz8S23ErWPRVsfZXTwJNCCbqjWDTReL5yytTKzxyKhg4YrnntYG3jdyrBimDGBRLU7yRS9pQQLcAH4T7j8LXkTocS7w1Zj4amckBmpg5EJCMATTRhtH8RSycfiXWZConzqqzxitWCxZK846YHNh
 
 class Invoice extends React.Component {
-
     constructor(props) {
         super(props);
         this.state = {
@@ -45,11 +44,13 @@ class Invoice extends React.Component {
         try {
             decompress(compressed_data, result => {
                 let invoice = JSON.parse(result);
-                FetchChainObjects(ChainStore.getAsset, [invoice.currency]).then(assets_array => {
-                    this.setState({invoice, asset: assets_array[0]});
-                });
+                FetchChainObjects(ChainStore.getAsset, [invoice.currency]).then(
+                    assets_array => {
+                        this.setState({invoice, asset: assets_array[0]});
+                    }
+                );
             });
-        } catch(error) {
+        } catch (error) {
             console.dir(error);
             this.setState({error: error.message});
         }
@@ -57,27 +58,32 @@ class Invoice extends React.Component {
 
     parsePrice(price) {
         let m = price.match(/([\d\,\.\s]+)/);
-        if(!m || m.length < 2) 0.0;
-        return parseFloat(m[1].replace(/[\,\s]/g,""));
+        if (!m || m.length < 2) 0.0;
+        return parseFloat(m[1].replace(/[\,\s]/g, ""));
     }
 
     getTotal(items) {
-        if(!items || items.length === 0) return 0.0;
-        let total_amount = items.reduce( (total, item) => {
+        if (!items || items.length === 0) return 0.0;
+        let total_amount = items.reduce((total, item) => {
             let price = this.parsePrice(item.price);
-            if(!price) return total;
+            if (!price) return total;
             return total + item.quantity * price;
         }, 0.0);
         return total_amount;
     }
 
     onBroadcastAndConfirm(confirm_store_state) {
-        if(confirm_store_state.included && confirm_store_state.broadcasted_transaction) {
+        if (
+            confirm_store_state.included &&
+            confirm_store_state.broadcasted_transaction
+        ) {
             TransactionConfirmStore.unlisten(this.onBroadcastAndConfirm);
             TransactionConfirmStore.reset();
-            if(this.state.invoice.callback) {
-                let trx =  confirm_store_state.broadcasted_transaction;
-                let url = `${this.state.invoice.callback}?block=${trx.ref_block_num}&trx=${trx.id()}`;
+            if (this.state.invoice.callback) {
+                let trx = confirm_store_state.broadcasted_transaction;
+                let url = `${this.state.invoice.callback}?block=${
+                    trx.ref_block_num
+                }&trx=${trx.id()}`;
                 window.location.href = url;
             }
         }
@@ -89,8 +95,10 @@ class Invoice extends React.Component {
         let precision = utils.get_asset_precision(asset.get("precision"));
         let amount = this.getTotal(this.state.invoice.line_items);
         let to_account = ChainStore.getAccount(this.state.invoice.to);
-        if(!to_account) {
-            NotificationActions.error(`Account ${this.state.invoice.to} not found`);
+        if (!to_account) {
+            NotificationActions.error(
+                `Account ${this.state.invoice.to} not found`
+            );
             return;
         }
         AccountActions.transfer(
@@ -99,11 +107,13 @@ class Invoice extends React.Component {
             parseInt(amount * precision, 10),
             asset.get("id"),
             this.state.invoice.memo
-        ).then( () => {
+        )
+            .then(() => {
                 TransactionConfirmStore.listen(this.onBroadcastAndConfirm);
-            }).catch( e => {
-                console.log( "error: ",e)
-            } );
+            })
+            .catch(e => {
+                console.log("error: ", e);
+            });
     }
 
     fromChanged(pay_from_name) {
@@ -116,44 +126,85 @@ class Invoice extends React.Component {
 
     render() {
         console.log("-- Invoice.render -->", this.state.invoice);
-        if(this.state.error) return(<div><br/><h4 className="has-error text-center">{this.state.error}</h4></div>);
-        if(!this.state.invoice) return null;
-        if(!this.state.asset) return (<div><br/><h4 className="has-error text-center">Asset {this.state.invoice.currency} is not supported by this blockchain.</h4></div>);
+        if (this.state.error)
+            return (
+                <div>
+                    <br />
+                    <h4 className="has-error text-center">
+                        {this.state.error}
+                    </h4>
+                </div>
+            );
+        if (!this.state.invoice) return null;
+        if (!this.state.asset)
+            return (
+                <div>
+                    <br />
+                    <h4 className="has-error text-center">
+                        Asset {this.state.invoice.currency} is not supported by
+                        this blockchain.
+                    </h4>
+                </div>
+            );
 
         let invoice = this.state.invoice;
         let total_amount = this.getTotal(invoice.line_items);
         let asset = this.state.invoice.currency;
         let balance = null;
-        if(this.state.pay_from_account) {
+        if (this.state.pay_from_account) {
             let balances = this.state.pay_from_account.get("balances");
-            console.log("-- Invoice.render balances -->", balances.get(this.state.asset.get("id")));
+            console.log(
+                "-- Invoice.render balances -->",
+                balances.get(this.state.asset.get("id"))
+            );
             balance = balances.get(this.state.asset.get("id"));
         }
-        let items = invoice.line_items.map( i => {
+        let items = invoice.line_items.map(i => {
             let price = this.parsePrice(i.price);
             let amount = i.quantity * price;
             return (
                 <tr>
                     <td>
                         <div className="item-name">{i.label}</div>
-                        <div className="item-description">{i.quantity} x {<FormattedAsset amount={i.price} asset={asset} exact_amount={true}/>}</div>
+                        <div className="item-description">
+                            {i.quantity} x{" "}
+                            {
+                                <FormattedAsset
+                                    amount={i.price}
+                                    asset={asset}
+                                    exact_amount={true}
+                                />
+                            }
+                        </div>
+                    </td>
+                    <td>
+                        <FormattedAsset
+                            amount={amount}
+                            asset={asset}
+                            exact_amount={true}
+                        />
                     </td>
-                    <td><FormattedAsset amount={amount} asset={asset} exact_amount={true} /></td>
                 </tr>
             );
         });
-        let payButtonClass = classNames("button", {disabled: !this.state.pay_from_account});
+        let payButtonClass = classNames("button", {
+            disabled: !this.state.pay_from_account
+        });
         return (
             <div className="grid-block vertical">
                 <div className="grid-content">
                     <div className="content-block invoice">
-                        <br/>
+                        <br />
                         <h3>Pay Invoice</h3>
                         <h4>{invoice.memo}</h4>
-                        <br/>
+                        <br />
                         <div>
-                            <AccountInfo title={invoice.to_label} account={invoice.to} image_size={{height: 80, width: 80}}/>
-                            <br/>
+                            <AccountInfo
+                                title={invoice.to_label}
+                                account={invoice.to}
+                                image_size={{height: 80, width: 80}}
+                            />
+                            <br />
                             <table className="table">
                                 <thead>
                                     <tr>
@@ -165,33 +216,59 @@ class Invoice extends React.Component {
                                     {items}
                                     <tr>
                                         <td className="text-right">Total:</td>
-                                        <td><FormattedAsset amount={total_amount} asset={asset} exact_amount={true} /></td>
+                                        <td>
+                                            <FormattedAsset
+                                                amount={total_amount}
+                                                asset={asset}
+                                                exact_amount={true}
+                                            />
+                                        </td>
                                     </tr>
                                 </tbody>
                             </table>
-                            <br/>
-                            <br/>
+                            <br />
+                            <br />
 
                             <form>
                                 <div className="grid-block">
                                     <div className="grid-content medium-4">
                                         {/*<AccountSelect ref="pay_from" account_names={accounts} onChange={this.onAccountChange.bind(this)}/>*/}
-                                        <AccountSelector label="transfer.pay_from"
-                                                         accountName={this.state.pay_from_name}
-                                                         onChange={this.fromChanged.bind(this)}
-                                                         onAccountChanged={this.onFromAccountChanged.bind(this)}
-                                                         account={this.state.pay_from_name}/>
+                                        <AccountSelector
+                                            label="transfer.pay_from"
+                                            accountName={
+                                                this.state.pay_from_name
+                                            }
+                                            onChange={this.fromChanged.bind(
+                                                this
+                                            )}
+                                            onAccountChanged={this.onFromAccountChanged.bind(
+                                                this
+                                            )}
+                                            account={this.state.pay_from_name}
+                                        />
                                     </div>
-                                    {this.state.pay_from_account ?
+                                    {this.state.pay_from_account ? (
                                         <div className="grid-content medium-1">
                                             <label>Balance</label>
-                                            <BalanceComponent balance={balance}/>
-                                        </div> : null
-                                    }
+                                            <BalanceComponent
+                                                balance={balance}
+                                            />
+                                        </div>
+                                    ) : null}
                                 </div>
-                                <br/>
-                                <a href className={payButtonClass} onClick={this.onPayClick.bind(this)}>
-                                    Pay <FormattedAsset amount={total_amount} asset={asset} exact_amount={true}/> to {invoice.to}
+                                <br />
+                                <a
+                                    href
+                                    className={payButtonClass}
+                                    onClick={this.onPayClick.bind(this)}
+                                >
+                                    Pay{" "}
+                                    <FormattedAsset
+                                        amount={total_amount}
+                                        asset={asset}
+                                        exact_amount={true}
+                                    />{" "}
+                                    to {invoice.to}
                                 </a>
                             </form>
                         </div>
diff --git a/app/components/Transfer/Transfer.jsx b/app/components/Transfer/Transfer.jsx
index 5bb043ed73..2e1544734a 100644
--- a/app/components/Transfer/Transfer.jsx
+++ b/app/components/Transfer/Transfer.jsx
@@ -9,36 +9,39 @@ import AmountSelector from "../Utility/AmountSelector";
 import utils from "common/utils";
 import counterpart from "counterpart";
 import TransactionConfirmStore from "stores/TransactionConfirmStore";
-import { RecentTransactions } from "../Account/RecentTransactions";
+import {RecentTransactions} from "../Account/RecentTransactions";
 import Immutable from "immutable";
 import {ChainStore} from "bitsharesjs/es";
 import {connect} from "alt-react";
-import { checkFeeStatusAsync, checkBalance, shouldPayFeeWithAssetAsync } from "common/trxHelper";
-import { debounce, isNaN } from "lodash";
+import {
+    checkFeeStatusAsync,
+    checkBalance,
+    shouldPayFeeWithAssetAsync
+} from "common/trxHelper";
+import {debounce, isNaN} from "lodash";
 import classnames from "classnames";
-import { Asset } from "common/MarketClasses";
+import {Asset} from "common/MarketClasses";
 
 class Transfer extends React.Component {
-
     constructor(props) {
         super(props);
         this.state = Transfer.getInitialState();
         let {query} = this.props.location;
 
-        if(query.from) {
+        if (query.from) {
             this.state.from_name = query.from;
             ChainStore.getAccount(query.from);
         }
-        if(query.to) {
+        if (query.to) {
             this.state.to_name = query.to;
             ChainStore.getAccount(query.to);
         }
-        if(query.amount) this.state.amount = query.amount;
-        if(query.asset) {
+        if (query.amount) this.state.amount = query.amount;
+        if (query.asset) {
             this.state.asset_id = query.asset;
             this.state.asset = ChainStore.getAsset(query.asset);
         }
-        if(query.memo) this.state.memo = query.memo;
+        if (query.memo) this.state.memo = query.memo;
         let currentAccount = AccountStore.getState().currentAccount;
         if (!this.state.from_name) this.state.from_name = currentAccount;
         this.onTrxIncluded = this.onTrxIncluded.bind(this);
@@ -66,8 +69,7 @@ class Transfer extends React.Component {
             feeAmount: new Asset({amount: 0}),
             feeStatus: {}
         };
-
-    };
+    }
 
     componentWillMount() {
         this.nestedRef = null;
@@ -76,8 +78,8 @@ class Transfer extends React.Component {
     }
 
     shouldComponentUpdate(np, ns) {
-        let { asset_types: current_types } = this._getAvailableAssets();
-        let { asset_types: next_asset_types } = this._getAvailableAssets(ns);
+        let {asset_types: current_types} = this._getAvailableAssets();
+        let {asset_types: next_asset_types} = this._getAvailableAssets(ns);
 
         if (next_asset_types.length === 1) {
             let asset = ChainStore.getAsset(next_asset_types[0]);
@@ -98,14 +100,25 @@ class Transfer extends React.Component {
     }
 
     componentWillReceiveProps(np) {
-        if (np.currentAccount !== this.state.from_name && np.currentAccount !== this.props.currentAccount) {
-            this.setState({
-                from_name: np.currentAccount,
-                from_account: ChainStore.getAccount(np.currentAccount),
-                feeStatus: {},
-                fee_asset_id: "1.3.0",
-                feeAmount: new Asset({amount: 0})
-            }, () => {this._updateFee(); this._checkFeeStatus(ChainStore.getAccount(np.currentAccount));});
+        if (
+            np.currentAccount !== this.state.from_name &&
+            np.currentAccount !== this.props.currentAccount
+        ) {
+            this.setState(
+                {
+                    from_name: np.currentAccount,
+                    from_account: ChainStore.getAccount(np.currentAccount),
+                    feeStatus: {},
+                    fee_asset_id: "1.3.0",
+                    feeAmount: new Asset({amount: 0})
+                },
+                () => {
+                    this._updateFee();
+                    this._checkFeeStatus(
+                        ChainStore.getAccount(np.currentAccount)
+                    );
+                }
+            );
         }
     }
 
@@ -113,16 +126,26 @@ class Transfer extends React.Component {
         const {feeAmount, amount, from_account, asset} = this.state;
         if (!asset) return;
         const balanceID = from_account.getIn(["balances", asset.get("id")]);
-        const feeBalanceID = from_account.getIn(["balances", feeAmount.asset_id]);
-        if (!asset || ! from_account) return;
+        const feeBalanceID = from_account.getIn([
+            "balances",
+            feeAmount.asset_id
+        ]);
+        if (!asset || !from_account) return;
         if (!balanceID) return this.setState({balanceError: true});
         let balanceObject = ChainStore.getObject(balanceID);
-        let feeBalanceObject = feeBalanceID ? ChainStore.getObject(feeBalanceID) : null;
+        let feeBalanceObject = feeBalanceID
+            ? ChainStore.getObject(feeBalanceID)
+            : null;
         if (!feeBalanceObject || feeBalanceObject.get("balance") === 0) {
             this.setState({fee_asset_id: "1.3.0"}, this._updateFee);
         }
         if (!balanceObject || !feeAmount) return;
-        const hasBalance = checkBalance(amount, asset, feeAmount, balanceObject);
+        const hasBalance = checkBalance(
+            amount,
+            asset,
+            feeAmount,
+            balanceObject
+        );
         if (hasBalance === null) return;
         this.setState({balanceError: !hasBalance});
     }
@@ -130,39 +153,48 @@ class Transfer extends React.Component {
     _checkFeeStatus(account = this.state.from_account) {
         if (!account) return;
 
-        const assets = Object.keys(account.get("balances").toJS()).sort(utils.sortID);
+        const assets = Object.keys(account.get("balances").toJS()).sort(
+            utils.sortID
+        );
         let feeStatus = {};
         let p = [];
         assets.forEach(a => {
-            p.push(checkFeeStatusAsync({
-                accountID: account.get("id"),
-                feeID: a,
-                options: ["price_per_kbyte"],
-                data: {
-                    type: "memo",
-                    content: this.state.memo
-                }
-            }));
+            p.push(
+                checkFeeStatusAsync({
+                    accountID: account.get("id"),
+                    feeID: a,
+                    options: ["price_per_kbyte"],
+                    data: {
+                        type: "memo",
+                        content: this.state.memo
+                    }
+                })
+            );
         });
-        Promise.all(p).then(status => {
-            assets.forEach((a, idx) => {
-                feeStatus[a] = status[idx];
-            });
-            if (!utils.are_equal_shallow(this.state.feeStatus, feeStatus)) {
-                this.setState({
-                    feeStatus
+        Promise.all(p)
+            .then(status => {
+                assets.forEach((a, idx) => {
+                    feeStatus[a] = status[idx];
                 });
-            }
-            this._checkBalance();
-        }).catch(err => {
-            console.error(err);
-        });
+                if (!utils.are_equal_shallow(this.state.feeStatus, feeStatus)) {
+                    this.setState({
+                        feeStatus
+                    });
+                }
+                this._checkBalance();
+            })
+            .catch(err => {
+                console.error(err);
+            });
     }
 
     _updateFee(state = this.state) {
-        let { fee_asset_id, from_account, asset_id } = state;
-        const { fee_asset_types } = this._getAvailableAssets(state);
-        if ( fee_asset_types.length === 1 && fee_asset_types[0] !== fee_asset_id) {
+        let {fee_asset_id, from_account, asset_id} = state;
+        const {fee_asset_types} = this._getAvailableAssets(state);
+        if (
+            fee_asset_types.length === 1 &&
+            fee_asset_types[0] !== fee_asset_id
+        ) {
             fee_asset_id = fee_asset_types[0];
         }
         if (!from_account) return null;
@@ -174,25 +206,33 @@ class Transfer extends React.Component {
                 type: "memo",
                 content: state.memo
             }
-        })
-        .then(({fee, hasBalance, hasPoolBalance}) =>
-            shouldPayFeeWithAssetAsync(from_account, fee).then(should => should ?
-                  this.setState({fee_asset_id: asset_id}, this._updateFee)
-              :
-                  this.setState({
-                      feeAmount: fee,
-                      fee_asset_id: fee.asset_id,
-                      hasBalance,
-                      hasPoolBalance,
-                      error: (!hasBalance || !hasPoolBalance)
-                  })
+        }).then(({fee, hasBalance, hasPoolBalance}) =>
+            shouldPayFeeWithAssetAsync(from_account, fee).then(
+                should =>
+                    should
+                        ? this.setState(
+                              {fee_asset_id: asset_id},
+                              this._updateFee
+                          )
+                        : this.setState({
+                              feeAmount: fee,
+                              fee_asset_id: fee.asset_id,
+                              hasBalance,
+                              hasPoolBalance,
+                              error: !hasBalance || !hasPoolBalance
+                          })
             )
         );
     }
 
     fromChanged(from_name) {
         if (!from_name) this.setState({from_account: null});
-        this.setState({from_name, error: null, propose: false, propose_account: ""});
+        this.setState({
+            from_name,
+            error: null,
+            propose: false,
+            propose_account: ""
+        });
     }
 
     toChanged(to_name) {
@@ -200,7 +240,10 @@ class Transfer extends React.Component {
     }
 
     onFromAccountChanged(from_account) {
-        this.setState({from_account, error: null}, () => {this._updateFee(); this._checkFeeStatus();});
+        this.setState({from_account, error: null}, () => {
+            this._updateFee();
+            this._checkFeeStatus();
+        });
     }
 
     onToAccountChanged(to_account) {
@@ -211,11 +254,17 @@ class Transfer extends React.Component {
         if (!asset) {
             return;
         }
-        this.setState({amount, asset, asset_id: asset.get("id"), error: null}, this._checkBalance);
+        this.setState(
+            {amount, asset, asset_id: asset.get("id"), error: null},
+            this._checkBalance
+        );
     }
 
     onFeeChanged({asset}) {
-        this.setState({feeAsset: asset, fee_asset_id: asset.get("id"), error: null}, this._updateFee);
+        this.setState(
+            {feeAsset: asset, fee_asset_id: asset.get("id"), error: null},
+            this._updateFee
+        );
     }
 
     onMemoChanged(e) {
@@ -223,7 +272,10 @@ class Transfer extends React.Component {
     }
 
     onTrxIncluded(confirm_store_state) {
-        if(confirm_store_state.included && confirm_store_state.broadcasted_transaction) {
+        if (
+            confirm_store_state.included &&
+            confirm_store_state.broadcasted_transaction
+        ) {
             // this.setState(Transfer.getInitialState());
             TransactionConfirmStore.unlisten(this.onTrxIncluded);
             TransactionConfirmStore.reset();
@@ -235,40 +287,50 @@ class Transfer extends React.Component {
 
     onPropose(propose, e) {
         e.preventDefault();
-        this.setState({ propose, propose_account: null });
+        this.setState({propose, propose_account: null});
     }
 
     onProposeAccount(propose_account) {
-        this.setState({ propose_account });
+        this.setState({propose_account});
     }
 
-    resetForm(){
-        this.setState({memo: '', to_name: '', amount: ''});
+    resetForm() {
+        this.setState({memo: "", to_name: "", amount: ""});
     }
 
     onSubmit(e) {
         e.preventDefault();
         this.setState({error: null});
         const {asset, amount} = this.state;
-        const sendAmount = new Asset({real: amount, asset_id: asset.get("id"), precision: asset.get("precision")});
+        const sendAmount = new Asset({
+            real: amount,
+            asset_id: asset.get("id"),
+            precision: asset.get("precision")
+        });
 
         AccountActions.transfer(
             this.state.from_account.get("id"),
             this.state.to_account.get("id"),
             sendAmount.getAmount(),
             asset.get("id"),
-            this.state.memo ? new Buffer(this.state.memo, "utf-8") : this.state.memo,
+            this.state.memo
+                ? new Buffer(this.state.memo, "utf-8")
+                : this.state.memo,
             this.state.propose ? this.state.propose_account : null,
             this.state.feeAsset ? this.state.feeAsset.get("id") : "1.3.0"
-        ).then( () => {
-            this.resetForm.call(this);
-            TransactionConfirmStore.unlisten(this.onTrxIncluded);
-            TransactionConfirmStore.listen(this.onTrxIncluded);
-        }).catch( e => {
-            let msg = e.message ? e.message.split( "\n" )[1] || e.message : null;
-            console.log( "error: ", e, msg);
-            this.setState({error: msg});
-        } );
+        )
+            .then(() => {
+                this.resetForm.call(this);
+                TransactionConfirmStore.unlisten(this.onTrxIncluded);
+                TransactionConfirmStore.listen(this.onTrxIncluded);
+            })
+            .catch(e => {
+                let msg = e.message
+                    ? e.message.split("\n")[1] || e.message
+                    : null;
+                console.log("error: ", e, msg);
+                this.setState({error: msg});
+            });
     }
 
     setNestedRef(ref) {
@@ -280,18 +342,25 @@ class Transfer extends React.Component {
         let balanceObject = ChainStore.getObject(balance_id);
         let transferAsset = ChainStore.getObject(asset_id);
 
-        let balance = new Asset({amount: balanceObject.get("balance"), asset_id: transferAsset.get("id"), precision: transferAsset.get("precision")});
+        let balance = new Asset({
+            amount: balanceObject.get("balance"),
+            asset_id: transferAsset.get("id"),
+            precision: transferAsset.get("precision")
+        });
 
         if (balanceObject) {
             if (feeAmount.asset_id === balance.asset_id) {
                 balance.minus(feeAmount);
             }
-            this.setState({amount: balance.getAmount({real: true})}, this._checkBalance);
+            this.setState(
+                {amount: balance.getAmount({real: true})},
+                this._checkBalance
+            );
         }
     }
 
     _getAvailableAssets(state = this.state) {
-        const { feeStatus } = this.state;
+        const {feeStatus} = this.state;
         function hasFeePoolBalance(id) {
             if (feeStatus[id] === undefined) return true;
             return feeStatus[id] && feeStatus[id].hasPoolBalance;
@@ -302,8 +371,9 @@ class Transfer extends React.Component {
             return feeStatus[id] && feeStatus[id].hasBalance;
         }
 
-        const { from_account, from_error } = state;
-        let asset_types = [], fee_asset_types = [];
+        const {from_account, from_error} = state;
+        let asset_types = [],
+            fee_asset_types = [];
         if (!(from_account && from_account.get("balances") && !from_error)) {
             return {asset_types, fee_asset_types};
         }
@@ -339,62 +409,127 @@ class Transfer extends React.Component {
 
     render() {
         let from_error = null;
-        let {propose, from_account, to_account, asset, asset_id, propose_account, feeAmount,
-            amount, error, to_name, from_name, memo, feeAsset, fee_asset_id, balanceError} = this.state;
-        let from_my_account = AccountStore.isMyAccount(from_account) || from_name === this.props.passwordAccount;
-
-        if(from_account && ! from_my_account && ! propose ) {
-            from_error = <span>
-                {counterpart.translate("account.errors.not_yours")}
-                &nbsp;(<a onClick={this.onPropose.bind(this, true)}>{counterpart.translate("propose")}</a>)
-            </span>;
+        let {
+            propose,
+            from_account,
+            to_account,
+            asset,
+            asset_id,
+            propose_account,
+            feeAmount,
+            amount,
+            error,
+            to_name,
+            from_name,
+            memo,
+            feeAsset,
+            fee_asset_id,
+            balanceError
+        } = this.state;
+        let from_my_account =
+            AccountStore.isMyAccount(from_account) ||
+            from_name === this.props.passwordAccount;
+
+        if (from_account && !from_my_account && !propose) {
+            from_error = (
+                <span>
+                    {counterpart.translate("account.errors.not_yours")}
+                    &nbsp;(<a onClick={this.onPropose.bind(this, true)}>
+                        {counterpart.translate("propose")}
+                    </a>)
+                </span>
+            );
         }
 
-        let { asset_types, fee_asset_types } = this._getAvailableAssets();
+        let {asset_types, fee_asset_types} = this._getAvailableAssets();
         let balance = null;
 
         // Estimate fee
         let fee = this.state.feeAmount.getAmount({real: true});
         if (from_account && from_account.get("balances") && !from_error) {
-
             let account_balances = from_account.get("balances").toJS();
-            if (asset_types.length === 1) asset = ChainStore.getAsset(asset_types[0]);
+            if (asset_types.length === 1)
+                asset = ChainStore.getAsset(asset_types[0]);
             if (asset_types.length > 0) {
                 let current_asset_id = asset ? asset.get("id") : asset_types[0];
                 let feeID = feeAsset ? feeAsset.get("id") : "1.3.0";
-                balance = (<span style={{borderBottom: "#A09F9F 1px dotted", cursor: "pointer"}} onClick={this._setTotal.bind(this, current_asset_id, account_balances[current_asset_id], fee, feeID)}><Translate component="span" content="transfer.available"/>: <BalanceComponent balance={account_balances[current_asset_id]}/></span>);
+                balance = (
+                    <span
+                        style={{
+                            borderBottom: "#A09F9F 1px dotted",
+                            cursor: "pointer"
+                        }}
+                        onClick={this._setTotal.bind(
+                            this,
+                            current_asset_id,
+                            account_balances[current_asset_id],
+                            fee,
+                            feeID
+                        )}
+                    >
+                        <Translate
+                            component="span"
+                            content="transfer.available"
+                        />:{" "}
+                        <BalanceComponent
+                            balance={account_balances[current_asset_id]}
+                        />
+                    </span>
+                );
             } else {
                 balance = "No funds";
             }
         }
 
-        let propose_incomplete = propose && ! propose_account;
-        const amountValue = parseFloat(String.prototype.replace.call(amount, /,/g, ""));
+        let propose_incomplete = propose && !propose_account;
+        const amountValue = parseFloat(
+            String.prototype.replace.call(amount, /,/g, "")
+        );
         const isAmountValid = amountValue && !isNaN(amountValue);
-        const isToAccountValid = to_account && to_account.get("name") === to_name;
-        const isSendNotValid = !from_account || !isToAccountValid || !isAmountValid || !asset || from_error || propose_incomplete || balanceError;
+        const isToAccountValid =
+            to_account && to_account.get("name") === to_name;
+        const isSendNotValid =
+            !from_account ||
+            !isToAccountValid ||
+            !isAmountValid ||
+            !asset ||
+            from_error ||
+            propose_incomplete ||
+            balanceError;
         let accountsList = Immutable.Set();
         accountsList = accountsList.add(from_account);
         let tabIndex = 1;
 
         return (
             <div className="grid-block vertical">
-            <div className="grid-block shrink vertical medium-horizontal" style={{paddingTop: "2rem"}}>
-
-                <form style={{paddingBottom: 20, overflow: "visible"}} className="grid-content small-12 medium-6 large-5 large-offset-1 full-width-content" onSubmit={this.onSubmit.bind(this)} noValidate>
-
+                <div
+                    className="grid-block shrink vertical medium-horizontal"
+                    style={{paddingTop: "2rem"}}
+                >
+                    <form
+                        style={{paddingBottom: 20, overflow: "visible"}}
+                        className="grid-content small-12 medium-6 large-5 large-offset-1 full-width-content"
+                        onSubmit={this.onSubmit.bind(this)}
+                        noValidate
+                    >
                         <Translate content="transfer.header" component="h2" />
                         {/*  F R O M  */}
                         <div className="content-block">
-                            <AccountSelector label="transfer.from" ref="from"
+                            <AccountSelector
+                                label="transfer.from"
+                                ref="from"
                                 accountName={from_name}
                                 onChange={this.fromChanged.bind(this)}
-                                onAccountChanged={this.onFromAccountChanged.bind(this)}
+                                onAccountChanged={this.onFromAccountChanged.bind(
+                                    this
+                                )}
                                 account={from_name}
                                 size={60}
                                 error={from_error}
                                 tabIndex={tabIndex++}
-                                onDropdownSelect={this._onAccountDropdown.bind(this)}
+                                onDropdownSelect={this._onAccountDropdown.bind(
+                                    this
+                                )}
                                 dropDownContent={AccountStore.getMyAccounts()}
                             />
                         </div>
@@ -404,7 +539,9 @@ class Transfer extends React.Component {
                                 label="transfer.to"
                                 accountName={to_name}
                                 onChange={this.toChanged.bind(this)}
-                                onAccountChanged={this.onToAccountChanged.bind(this)}
+                                onAccountChanged={this.onToAccountChanged.bind(
+                                    this
+                                )}
                                 account={to_name}
                                 size={60}
                                 tabIndex={tabIndex++}
@@ -416,94 +553,182 @@ class Transfer extends React.Component {
                                 label="transfer.amount"
                                 amount={amount}
                                 onChange={this.onAmountChanged.bind(this)}
-                                asset={asset_types.length > 0 && asset ? asset.get("id") : ( asset_id ? asset_id : asset_types[0])}
+                                asset={
+                                    asset_types.length > 0 && asset
+                                        ? asset.get("id")
+                                        : asset_id ? asset_id : asset_types[0]
+                                }
                                 assets={asset_types}
                                 display_balance={balance}
                                 tabIndex={tabIndex++}
                             />
-                            {this.state.balanceError ? <p className="has-error no-margin" style={{paddingTop: 10}}><Translate content="transfer.errors.insufficient" /></p>:null}
+                            {this.state.balanceError ? (
+                                <p
+                                    className="has-error no-margin"
+                                    style={{paddingTop: 10}}
+                                >
+                                    <Translate content="transfer.errors.insufficient" />
+                                </p>
+                            ) : null}
                         </div>
                         {/*  M E M O  */}
                         <div className="content-block transfer-input">
-                            {memo && memo.length ? <label className="right-label">{memo.length}</label> : null}
-                            <Translate className="left-label tooltip" component="label" content="transfer.memo" data-place="top" data-tip={counterpart.translate("tooltip.memo_tip")}/>
-                            <textarea style={{marginBottom: 0}} rows="3" value={memo} tabIndex={tabIndex++} onChange={this.onMemoChanged.bind(this)} />
+                            {memo && memo.length ? (
+                                <label className="right-label">
+                                    {memo.length}
+                                </label>
+                            ) : null}
+                            <Translate
+                                className="left-label tooltip"
+                                component="label"
+                                content="transfer.memo"
+                                data-place="top"
+                                data-tip={counterpart.translate(
+                                    "tooltip.memo_tip"
+                                )}
+                            />
+                            <textarea
+                                style={{marginBottom: 0}}
+                                rows="3"
+                                value={memo}
+                                tabIndex={tabIndex++}
+                                onChange={this.onMemoChanged.bind(this)}
+                            />
                             {/* warning */}
-                            { this.state.propose ?
-                                <div className="error-area" style={{position: "absolute"}}>
-                                    <Translate content="transfer.warn_name_unable_read_memo" name={this.state.from_name} />
+                            {this.state.propose ? (
+                                <div
+                                    className="error-area"
+                                    style={{position: "absolute"}}
+                                >
+                                    <Translate
+                                        content="transfer.warn_name_unable_read_memo"
+                                        name={this.state.from_name}
+                                    />
                                 </div>
-                            :null}
-
+                            ) : null}
                         </div>
 
                         {/*  F E E   */}
-                        <div className={"content-block transfer-input fee-row" + (this.state.propose ? " proposal" : "")}>
+                        <div
+                            className={
+                                "content-block transfer-input fee-row" +
+                                (this.state.propose ? " proposal" : "")
+                            }
+                        >
                             <AmountSelector
                                 refCallback={this.setNestedRef.bind(this)}
                                 label="transfer.fee"
                                 disabled={true}
                                 amount={fee}
                                 onChange={this.onFeeChanged.bind(this)}
-                                asset={fee_asset_types.length && feeAmount ? feeAmount.asset_id : ( fee_asset_types.length === 1 ? fee_asset_types[0] : fee_asset_id ? fee_asset_id : fee_asset_types[0])}
+                                asset={
+                                    fee_asset_types.length && feeAmount
+                                        ? feeAmount.asset_id
+                                        : fee_asset_types.length === 1
+                                            ? fee_asset_types[0]
+                                            : fee_asset_id
+                                                ? fee_asset_id
+                                                : fee_asset_types[0]
+                                }
                                 assets={fee_asset_types}
                                 tabIndex={tabIndex++}
-                                error={this.state.hasPoolBalance === false ? "transfer.errors.insufficient" : null}
+                                error={
+                                    this.state.hasPoolBalance === false
+                                        ? "transfer.errors.insufficient"
+                                        : null
+                                }
                             />
-                            {propose ?
-                                <button className={classnames("button float-right no-margin", {disabled: isSendNotValid})} type="submit" value="Submit" tabIndex={tabIndex++}>
-                                    <Translate component="span" content="propose" />
-                                </button> :
-                                <button className={classnames("button float-right no-margin", {disabled: isSendNotValid})} type="submit" value="Submit" tabIndex={tabIndex++}>
-                                    <Translate component="span" content="transfer.send" />
+                            {propose ? (
+                                <button
+                                    className={classnames(
+                                        "button float-right no-margin",
+                                        {disabled: isSendNotValid}
+                                    )}
+                                    type="submit"
+                                    value="Submit"
+                                    tabIndex={tabIndex++}
+                                >
+                                    <Translate
+                                        component="span"
+                                        content="propose"
+                                    />
                                 </button>
-                            }
+                            ) : (
+                                <button
+                                    className={classnames(
+                                        "button float-right no-margin",
+                                        {disabled: isSendNotValid}
+                                    )}
+                                    type="submit"
+                                    value="Submit"
+                                    tabIndex={tabIndex++}
+                                >
+                                    <Translate
+                                        component="span"
+                                        content="transfer.send"
+                                    />
+                                </button>
+                            )}
                         </div>
 
                         {/* P R O P O S E   F R O M
                             Having some proposed transaction logic here (prior to the transaction confirmation)
                             allows adjusting of the memo to / from parameters.
                         */}
-                        {propose ?
-                        <div className="full-width-content form-group transfer-input">
-                            <label className="left-label"><Translate content="account.propose_from" /></label>
-                            <AccountSelect
-                                account_names={AccountStore.getMyAccounts()}
-                                onChange={this.onProposeAccount.bind(this)}
-                                tabIndex={tabIndex++}
-                            />
-                        </div>:null}
-
+                        {propose ? (
+                            <div className="full-width-content form-group transfer-input">
+                                <label className="left-label">
+                                    <Translate content="account.propose_from" />
+                                </label>
+                                <AccountSelect
+                                    account_names={AccountStore.getMyAccounts()}
+                                    onChange={this.onProposeAccount.bind(this)}
+                                    tabIndex={tabIndex++}
+                                />
+                            </div>
+                        ) : null}
 
                         {/*  S E N D  B U T T O N  */}
-                        {error ? <div className="content-block has-error">{error}</div> : null}
+                        {error ? (
+                            <div className="content-block has-error">
+                                {error}
+                            </div>
+                        ) : null}
                         <div>
-                            {propose ?
-                            <span>
-                                <button className=" button" onClick={this.onPropose.bind(this, false)} tabIndex={tabIndex++}>
-                                    <Translate component="span" content="cancel" />
-                                </button>
-                            </span> :
-                            null}
+                            {propose ? (
+                                <span>
+                                    <button
+                                        className=" button"
+                                        onClick={this.onPropose.bind(
+                                            this,
+                                            false
+                                        )}
+                                        tabIndex={tabIndex++}
+                                    >
+                                        <Translate
+                                            component="span"
+                                            content="cancel"
+                                        />
+                                    </button>
+                                </span>
+                            ) : null}
                         </div>
 
                         {/* TODO: show remaining balance */}
-                </form>
-                <div className="grid-content small-12 medium-6 large-4 large-offset-1 right-column">
-                <div className="grid-content no-padding">
-                    <RecentTransactions
-                        accountsList={accountsList}
-                        limit={25}
-                        compactView={true}
-                        filter="transfer"
-                        fullHeight={true}
-                    />
-                </div>
-                </div>
-
-                <div className="grid-content medium-6 large-4">
+                    </form>
+                    <div className="grid-content small-12 medium-6 large-4 large-offset-1 right-column">
+                        <div className="grid-content no-padding">
+                            <RecentTransactions
+                                accountsList={accountsList}
+                                limit={25}
+                                compactView={true}
+                                filter="transfer"
+                                fullHeight={true}
+                            />
+                        </div>
+                    </div>
 
-                </div>
+                    <div className="grid-content medium-6 large-4" />
                 </div>
             </div>
         );
diff --git a/app/components/Utility/AccountName.jsx b/app/components/Utility/AccountName.jsx
index 50797237dc..17cd3711a5 100644
--- a/app/components/Utility/AccountName.jsx
+++ b/app/components/Utility/AccountName.jsx
@@ -9,7 +9,6 @@ import BindToChainState from "./BindToChainState";
  */
 
 class AccountName extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainObject.isRequired
     };
diff --git a/app/components/Utility/BalanceComponent.jsx b/app/components/Utility/BalanceComponent.jsx
index 031748cf3e..b61a5db93d 100644
--- a/app/components/Utility/BalanceComponent.jsx
+++ b/app/components/Utility/BalanceComponent.jsx
@@ -10,7 +10,6 @@ import BindToChainState from "./BindToChainState";
  */
 
 class BalanceComponent extends React.Component {
-
     static propTypes = {
         balance: ChainTypes.ChainObject.isRequired,
         assetInfo: React.PropTypes.node,
diff --git a/app/components/Utility/ChainResolveComponents.jsx b/app/components/Utility/ChainResolveComponents.jsx
index 6a514f4ac9..5120820f1d 100644
--- a/app/components/Utility/ChainResolveComponents.jsx
+++ b/app/components/Utility/ChainResolveComponents.jsx
@@ -1,39 +1,43 @@
 /** Generic set of components for dealing with data in the ChainStore */
 import React, {Component, Children} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import ChainTypes from "components/Utility/ChainTypes";
 import BindToChainState from "components/Utility/BindToChainState";
 import AccountStore from "stores/AccountStore";
 import {pairs} from "lodash";
 
 class ResolveLinkedAccountsChainState extends Component {
-
     static propTypes = {
         linkedAccounts: ChainTypes.ChainAccountsList.isRequired
-    }
+    };
 
     render() {
         let linkedAccounts = [];
-        pairs(this.props.linkedAccounts).forEach( account => {
-            if( !account[1]) return;
+        pairs(this.props.linkedAccounts).forEach(account => {
+            if (!account[1]) return;
             console.log("... account.toJS()", account[1].toJS());
             linkedAccounts.push(account[1]);
         });
         let child = Children.only(this.props.children);
-        if( ! child) return <span>{linkedAccounts.map(a => <br>{a.toJS()}</br>)}</span>;
+        if (!child)
+            return <span>{linkedAccounts.map(a => <br>{a.toJS()}</br>)}</span>;
         // Pass the list to a child reactjs component as this.props.resolvedLinkedAccounts
-        child = React.cloneElement(child, { linkedAccounts });
+        child = React.cloneElement(child, {linkedAccounts});
         return <span>{child}</span>;
     }
 }
-ResolveLinkedAccountsChainState = BindToChainState(ResolveLinkedAccountsChainState);
+ResolveLinkedAccountsChainState = BindToChainState(
+    ResolveLinkedAccountsChainState
+);
 
 class ResolveLinkedAccounts extends Component {
     render() {
-        return <ResolveLinkedAccountsChainState
-            linkedAccounts={this.props.linkedAccounts}
-            children={this.props.children}
-        />;
+        return (
+            <ResolveLinkedAccountsChainState
+                linkedAccounts={this.props.linkedAccounts}
+                children={this.props.children}
+            />
+        );
     }
 }
 
diff --git a/app/components/Utility/ChainTypes.js b/app/components/Utility/ChainTypes.js
index 4d34ca4105..7fdcbc3f0a 100644
--- a/app/components/Utility/ChainTypes.js
+++ b/app/components/Utility/ChainTypes.js
@@ -1,6 +1,6 @@
 import utils from "common/utils";
 import Immutable from "immutable";
-import { ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
+import {ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 const {object_type} = grapheneChainTypes;
 
 function createChainableTypeChecker(validate) {
@@ -9,8 +9,12 @@ function createChainableTypeChecker(validate) {
         if (props[propName] == null) {
             if (isRequired) {
                 return new Error(
-                    ("Required " + location + " `" + propName + "` was not specified in ") +
-                    ("`" + componentName + "`.")
+                    "Required " +
+                        location +
+                        " `" +
+                        propName +
+                        "` was not specified in " +
+                        ("`" + componentName + "`.")
                 );
             }
             return null;
@@ -30,11 +34,17 @@ function objectIdChecker(props, propName, componentName, location) {
     if (props[propName]) {
         let value = props[propName];
         if (typeof value === "string") {
-            return utils.is_object_id(value) ? null : new Error(`${propName} in ${componentName} should be an object id`);
+            return utils.is_object_id(value)
+                ? null
+                : new Error(
+                      `${propName} in ${componentName} should be an object id`
+                  );
         } else if (typeof value === "object") {
             // TODO: check object type (probably we should require an object to be a tcomb structure)
         } else {
-            return new Error(`${propName} in ${componentName} should be an object id or object`);
+            return new Error(
+                `${propName} in ${componentName} should be an object id or object`
+            );
         }
     }
     // assume all ok
@@ -50,7 +60,9 @@ function keyChecker(props, propName, componentName, location) {
             // PublicKey.fromPublicKeyString(value)
             return null;
         } else {
-            return new Error(`${propName} in ${componentName} should be a key string`);
+            return new Error(
+                `${propName} in ${componentName} should be a key string`
+            );
         }
     }
     // assume all ok
@@ -66,7 +78,9 @@ function assetChecker(props, propName, componentName, location) {
         } else if (typeof value === "object") {
             // TODO: check object type (probably we should require an object to be a tcomb structure)
         } else {
-            return new Error(`${propName} of ${value} in ${componentName} should be an asset symbol or id`);
+            return new Error(
+                `${propName} of ${value} in ${componentName} should be an asset symbol or id`
+            );
         }
     }
     // assume all ok
@@ -78,15 +92,22 @@ function accountChecker(props, propName, componentName, location) {
     if (props[propName]) {
         let value = props[propName];
         if (typeof value === "string") {
-            if (utils.is_object_id(value) && value.split(".")[1] === object_type.account) {
+            if (
+                utils.is_object_id(value) &&
+                value.split(".")[1] === object_type.account
+            ) {
                 return null;
             } else {
-                return new Error(`${propName} of ${value} in ${componentName} should be an account id`);
+                return new Error(
+                    `${propName} of ${value} in ${componentName} should be an account id`
+                );
             }
         } else if (typeof value === "object") {
             // TODO: check object type (probably we should require an object to be a tcomb structure)
         } else {
-            return new Error(`${propName} of ${value} in ${componentName} should be an account id`);
+            return new Error(
+                `${propName} of ${value} in ${componentName} should be an account id`
+            );
         }
     }
     // assume all ok
@@ -97,10 +118,16 @@ function objectsListChecker(props, propName, componentName, location) {
     componentName = componentName || "ANONYMOUS";
     if (props[propName]) {
         let value = props[propName];
-        if (Immutable.List.isList(value) || Immutable.Set.isSet(value) || value instanceof Object) {
-            return null
+        if (
+            Immutable.List.isList(value) ||
+            Immutable.Set.isSet(value) ||
+            value instanceof Object
+        ) {
+            return null;
         } else {
-            return new Error(`${propName} in ${componentName} should be Immutable.List`);
+            return new Error(
+                `${propName} in ${componentName} should be Immutable.List`
+            );
         }
     }
     // assume all ok
@@ -111,10 +138,16 @@ function assetsListChecker(props, propName, componentName, location) {
     componentName = componentName || "ANONYMOUS";
     if (props[propName]) {
         let value = props[propName];
-        if (Immutable.List.isList(value) || Immutable.Set.isSet(value) || value instanceof Object) {
-            return null
+        if (
+            Immutable.List.isList(value) ||
+            Immutable.Set.isSet(value) ||
+            value instanceof Object
+        ) {
+            return null;
         } else {
-            return new Error(`${propName} in ${componentName} should be Immutable.List`);
+            return new Error(
+                `${propName} in ${componentName} should be Immutable.List`
+            );
         }
     }
     // assume all ok
@@ -125,10 +158,16 @@ function accountsListChecker(props, propName, componentName, location) {
     componentName = componentName || "ANONYMOUS";
     if (props[propName]) {
         let value = props[propName];
-        if (Immutable.List.isList(value) || Immutable.Set.isSet(value) || value instanceof Object) {
-            return null
+        if (
+            Immutable.List.isList(value) ||
+            Immutable.Set.isSet(value) ||
+            value instanceof Object
+        ) {
+            return null;
         } else {
-            return new Error(`${propName} in ${componentName} should be Immutable.List`);
+            return new Error(
+                `${propName} in ${componentName} should be Immutable.List`
+            );
         }
     }
     // assume all ok
@@ -144,4 +183,13 @@ let ChainObjectsList = createChainableTypeChecker(objectsListChecker);
 let ChainAccountsList = createChainableTypeChecker(accountsListChecker);
 let ChainAssetsList = createChainableTypeChecker(assetsListChecker);
 
-export default {ChainObject, ChainAccount, ChainKeyRefs, ChainAddressBalances, ChainAsset, ChainObjectsList, ChainAccountsList, ChainAssetsList};
+export default {
+    ChainObject,
+    ChainAccount,
+    ChainKeyRefs,
+    ChainAddressBalances,
+    ChainAsset,
+    ChainObjectsList,
+    ChainAccountsList,
+    ChainAssetsList
+};
diff --git a/app/components/Utility/FloatingDropdown.jsx b/app/components/Utility/FloatingDropdown.jsx
index 4abfaef635..c3f8809056 100644
--- a/app/components/Utility/FloatingDropdown.jsx
+++ b/app/components/Utility/FloatingDropdown.jsx
@@ -2,14 +2,13 @@ import React from "react";
 import utils from "common/utils";
 
 class Dropdown extends React.Component {
-
     static propTypes = {
         scroll_length: React.PropTypes.number
-    }
+    };
 
     static defaultProps = {
         scroll_length: 9
-    }
+    };
 
     constructor(props) {
         const scroll_length = props.scroll_length;
@@ -35,9 +34,12 @@ class Dropdown extends React.Component {
     }
 
     _setListener(props = this.props) {
-        if(props.entries.length > 1 && !this.listener) {
+        if (props.entries.length > 1 && !this.listener) {
             this.listener = true;
-            document.body.addEventListener("click", this.onBodyClick, {capture: false, passive: true});
+            document.body.addEventListener("click", this.onBodyClick, {
+                capture: false,
+                passive: true
+            });
         }
     }
 
@@ -63,13 +65,17 @@ class Dropdown extends React.Component {
         let insideActionSheet = false;
 
         do {
-            if(el.classList && el.classList.contains("dropdown") && el.id === this.props.id) {
+            if (
+                el.classList &&
+                el.classList.contains("dropdown") &&
+                el.id === this.props.id
+            ) {
                 insideActionSheet = true;
                 break;
             }
         } while ((el = el.parentNode));
 
-        if(!insideActionSheet) {
+        if (!insideActionSheet) {
             this.setState({active: false});
         } else {
             e.stopPropagation();
@@ -94,23 +100,58 @@ class Dropdown extends React.Component {
     render() {
         const {entries, value} = this.props;
         let {active} = this.state;
-        if(entries.length === 0) return null;
-        if(entries.length == 1) {
+        if (entries.length === 0) return null;
+        if (entries.length == 1) {
             return (
-                <div className={"dropdown-wrapper inactive" + (this.props.upperCase ? " upper-case" : "")}>
+                <div
+                    className={
+                        "dropdown-wrapper inactive" +
+                        (this.props.upperCase ? " upper-case" : "")
+                    }
+                >
                     <div>
-                        {this.props.singleEntry ? this.props.singleEntry : entries[0]}
+                        {this.props.singleEntry
+                            ? this.props.singleEntry
+                            : entries[0]}
                     </div>
                 </div>
             );
         } else {
             let options = entries.map(value => {
-                return <li className={this.props.upperCase ? "upper-case" : ""} key={value} onClick={this.onChange.bind(this, this.props.values[value])}><span>{value}</span></li>;
+                return (
+                    <li
+                        className={this.props.upperCase ? "upper-case" : ""}
+                        key={value}
+                        onClick={this.onChange.bind(
+                            this,
+                            this.props.values[value]
+                        )}
+                    >
+                        <span>{value}</span>
+                    </li>
+                );
             });
             return (
-                <div onClick={this._toggleDropdown.bind(this)} className={"dropdown-wrapper" + (active ? " active" : "")  + (this.props.upperCase ? " upper-case" : "")}>
-                    <div style={{paddingRight: 15}}>{value ? value : <span className="hidden">A</span>}</div>
-                    <ul className="dropdown" style={{overflow: entries.length > this.props.scroll_length ? "auto": "hidden"}}>
+                <div
+                    onClick={this._toggleDropdown.bind(this)}
+                    className={
+                        "dropdown-wrapper" +
+                        (active ? " active" : "") +
+                        (this.props.upperCase ? " upper-case" : "")
+                    }
+                >
+                    <div style={{paddingRight: 15}}>
+                        {value ? value : <span className="hidden">A</span>}
+                    </div>
+                    <ul
+                        className="dropdown"
+                        style={{
+                            overflow:
+                                entries.length > this.props.scroll_length
+                                    ? "auto"
+                                    : "hidden"
+                        }}
+                    >
                         {options}
                     </ul>
                 </div>
diff --git a/app/components/Utility/FormattedFee.jsx b/app/components/Utility/FormattedFee.jsx
index 703a037129..f38f09b01f 100644
--- a/app/components/Utility/FormattedFee.jsx
+++ b/app/components/Utility/FormattedFee.jsx
@@ -2,7 +2,7 @@ import React, {PropTypes} from "react";
 import FormattedAsset from "./FormattedAsset";
 import ChainTypes from "./ChainTypes";
 import BindToChainState from "./BindToChainState";
-import { estimateFee } from "common/trxHelper";
+import {estimateFee} from "common/trxHelper";
 
 /**
  *
@@ -11,7 +11,6 @@ import { estimateFee } from "common/trxHelper";
  */
 
 class FormattedFee extends React.Component {
-
     static propTypes = {
         globalObject: ChainTypes.ChainObject.isRequired,
         opType: PropTypes.string,
@@ -23,8 +22,13 @@ class FormattedFee extends React.Component {
         options: []
     };
 
-    getFee() { // Return fee via refs
-        return estimateFee(this.props.opType, this.props.options, this.props.globalObject);
+    getFee() {
+        // Return fee via refs
+        return estimateFee(
+            this.props.opType,
+            this.props.options,
+            this.props.globalObject
+        );
     }
 
     render() {
@@ -36,7 +40,7 @@ class FormattedFee extends React.Component {
 
         let amount = estimateFee(opType, options, globalObject);
 
-        return <FormattedAsset amount={amount} asset="1.3.0"/>;
+        return <FormattedAsset amount={amount} asset="1.3.0" />;
     }
 }
 
diff --git a/app/components/Utility/HelpContent.jsx b/app/components/Utility/HelpContent.jsx
index b29547d747..1a972871dc 100644
--- a/app/components/Utility/HelpContent.jsx
+++ b/app/components/Utility/HelpContent.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { zipObject } from "lodash";
+import {zipObject} from "lodash";
 import counterpart from "counterpart";
 import utils from "common/utils";
 import {withRouter} from "react-router";
@@ -18,7 +18,7 @@ function split_into_sections(str) {
 
     for (let i = sections.length - 1; i >= 1; i -= 2) {
         // remove extra </p> and <p>
-        sections[i] = sections[i].replace(/(^<\/p>|<p>$)/g, '');
+        sections[i] = sections[i].replace(/(^<\/p>|<p>$)/g, "");
         sections[i - 1] = [sections[i - 1], sections[i]];
         sections.splice(i, 1);
     }
@@ -28,10 +28,16 @@ function split_into_sections(str) {
 
 function adjust_links(str) {
     return str.replace(/\<a\shref\=\"(.+?)\"/gi, (match, text) => {
-        if (text.indexOf((__HASH_HISTORY__ ? "#" : "") + "/") === 0) return `<a href="${text}" onclick="_onClickLink(event)"`;
-        if (text.indexOf("http") === 0) return `<a href="${text}" rel="noopener noreferrer" target="_blank"`;
-        let page = endsWith(text, ".md") ? text.substr(0, text.length - 3) : text;
-        let res = `<a href="${__HASH_HISTORY__ ? "#" : ""}/help/${page}" onclick="_onClickLink(event)"`;
+        if (text.indexOf((__HASH_HISTORY__ ? "#" : "") + "/") === 0)
+            return `<a href="${text}" onclick="_onClickLink(event)"`;
+        if (text.indexOf("http") === 0)
+            return `<a href="${text}" rel="noopener noreferrer" target="_blank"`;
+        let page = endsWith(text, ".md")
+            ? text.substr(0, text.length - 3)
+            : text;
+        let res = `<a href="${
+            __HASH_HISTORY__ ? "#" : ""
+        }/help/${page}" onclick="_onClickLink(event)"`;
         return res;
     });
 }
@@ -39,7 +45,6 @@ function adjust_links(str) {
 // console.log("-- HelpData -->", HelpData);
 
 class HelpContent extends React.Component {
-
     static propTypes = {
         path: React.PropTypes.string.isRequired,
         section: React.PropTypes.string
@@ -54,25 +59,29 @@ class HelpContent extends React.Component {
         let locale = this.props.locale || counterpart.getLocale() || "en";
 
         // Only load helpData for the current locale as well as the fallback 'en'
-        req.keys().filter(a => {
-            return (
-                a.indexOf(`/${locale}/`) !== -1 ||
-                a.indexOf("/en/") !== -1
-            );
-        }).forEach(function(filename) {
-            var res = filename.match(/\/(.+?)\/(.+)\./);
-            let locale = res[1];
-            let key = res[2];
-            let help_locale = HelpData[locale];
-            if (!help_locale) HelpData[locale] = help_locale = {};
-            let content = req(filename);
-            help_locale[key] = split_into_sections(adjust_links(content));
-        });
+        req
+            .keys()
+            .filter(a => {
+                return (
+                    a.indexOf(`/${locale}/`) !== -1 || a.indexOf("/en/") !== -1
+                );
+            })
+            .forEach(function(filename) {
+                var res = filename.match(/\/(.+?)\/(.+)\./);
+                let locale = res[1];
+                let key = res[2];
+                let help_locale = HelpData[locale];
+                if (!help_locale) HelpData[locale] = help_locale = {};
+                let content = req(filename);
+                help_locale[key] = split_into_sections(adjust_links(content));
+            });
     }
 
     onClickLink(e) {
         e.preventDefault();
-        let path = (__HASH_HISTORY__ ? e.target.hash : e.target.pathname).split("/").filter(p => p && p !== "#");
+        let path = (__HASH_HISTORY__ ? e.target.hash : e.target.pathname)
+            .split("/")
+            .filter(p => p && p !== "#");
         if (path.length === 0) return false;
         let route = "/" + path.join("/");
         this.props.router.push(route);
@@ -80,14 +89,20 @@ class HelpContent extends React.Component {
     }
 
     setVars(str, hideIssuer) {
-        if(hideIssuer == "true") {
-            var str = str.replace(/^.*{issuer}.*$/mg, "");
+        if (hideIssuer == "true") {
+            var str = str.replace(/^.*{issuer}.*$/gm, "");
         }
 
         return str.replace(/(\{.+?\})/gi, (match, text) => {
             let key = text.substr(1, text.length - 2);
             let value = this.props[key] !== undefined ? this.props[key] : text;
-            if (value.amount && value.asset) value = utils.format_asset(value.amount, value.asset, false, false);
+            if (value.amount && value.asset)
+                value = utils.format_asset(
+                    value.amount,
+                    value.asset,
+                    false,
+                    false
+                );
             if (value.date) value = utils.format_date(value.date);
             if (value.time) value = utils.format_time(value.time);
             // console.log("-- var -->", key, value);
@@ -96,44 +111,75 @@ class HelpContent extends React.Component {
     }
 
     render() {
-
         let locale = this.props.locale || counterpart.getLocale() || "en";
 
         if (!HelpData[locale]) {
-            console.error(`missing locale '${locale}' help files, rolling back to 'en'`);
+            console.error(
+                `missing locale '${locale}' help files, rolling back to 'en'`
+            );
             locale = "en";
         }
 
         let value = HelpData[locale][this.props.path];
 
         if (!value && locale !== "en") {
-            console.warn(`missing path '${this.props.path}' for locale '${locale}' help files, rolling back to 'en'`);
-            value = HelpData['en'][this.props.path];
+            console.warn(
+                `missing path '${
+                    this.props.path
+                }' for locale '${locale}' help files, rolling back to 'en'`
+            );
+            value = HelpData["en"][this.props.path];
         }
 
         if (!value && this.props.alt_path) {
-            console.warn(`missing path '${this.props.path}' for locale '${locale}' help files, rolling back to alt_path '${this.props.alt_path}'`);
+            console.warn(
+                `missing path '${
+                    this.props.path
+                }' for locale '${locale}' help files, rolling back to alt_path '${
+                    this.props.alt_path
+                }'`
+            );
             value = HelpData[locale][this.props.alt_path];
         }
 
-        if (!value && this.props.alt_path && locale != 'en') {
-            console.warn(`missing alt_path '${this.props.alt_path}' for locale '${locale}' help files, rolling back to 'en'`);
-            value = HelpData['en'][this.props.alt_path];
+        if (!value && this.props.alt_path && locale != "en") {
+            console.warn(
+                `missing alt_path '${
+                    this.props.alt_path
+                }' for locale '${locale}' help files, rolling back to 'en'`
+            );
+            value = HelpData["en"][this.props.alt_path];
         }
 
         if (!value) {
-            console.error(`help file not found '${this.props.path}' for locale '${locale}'`);
+            console.error(
+                `help file not found '${
+                    this.props.path
+                }' for locale '${locale}'`
+            );
             return !null;
         }
 
         if (this.props.section) value = value[this.props.section];
 
         if (!value) {
-            console.error(`help section not found ${this.props.path}#${this.props.section}`);
+            console.error(
+                `help section not found ${this.props.path}#${
+                    this.props.section
+                }`
+            );
             return null;
         }
 
-        return <div style={this.props.style} className="help-content" dangerouslySetInnerHTML={{__html: this.setVars(value, this.props.hide_issuer)}}/>;
+        return (
+            <div
+                style={this.props.style}
+                className="help-content"
+                dangerouslySetInnerHTML={{
+                    __html: this.setVars(value, this.props.hide_issuer)
+                }}
+            />
+        );
     }
 }
 
diff --git a/app/components/Utility/LinkToAccountById.jsx b/app/components/Utility/LinkToAccountById.jsx
index 3196745c79..9facc5254d 100644
--- a/app/components/Utility/LinkToAccountById.jsx
+++ b/app/components/Utility/LinkToAccountById.jsx
@@ -4,7 +4,6 @@ import ChainTypes from "./ChainTypes";
 import BindToChainState from "./BindToChainState";
 
 class LinkToAccountById extends React.Component {
-
     static propTypes = {
         account: ChainTypes.ChainObject.isRequired,
         subpage: React.PropTypes.string.isRequired
@@ -16,7 +15,11 @@ class LinkToAccountById extends React.Component {
     };
 
     shouldComponentUpdate(nextProps) {
-        if (nextProps.account.get("name") && this.props.account.get("name") && nextProps.account.get("name") === this.props.account.get("name")) {
+        if (
+            nextProps.account.get("name") &&
+            this.props.account.get("name") &&
+            nextProps.account.get("name") === this.props.account.get("name")
+        ) {
             return false;
         }
         return true;
@@ -28,8 +31,16 @@ class LinkToAccountById extends React.Component {
             return <span>{this.props.account.get("id")}</span>;
         }
 
-        return this.props.noLink ? <span>{account_name}</span> :
-            <Link onClick={this.props.onClick ? this.props.onClick : () => {}} to={`/account/${account_name}/${this.props.subpage}/`}>{account_name}</Link>;
+        return this.props.noLink ? (
+            <span>{account_name}</span>
+        ) : (
+            <Link
+                onClick={this.props.onClick ? this.props.onClick : () => {}}
+                to={`/account/${account_name}/${this.props.subpage}/`}
+            >
+                {account_name}
+            </Link>
+        );
     }
 }
 
diff --git a/app/components/Utility/LinkToWitnessById.jsx b/app/components/Utility/LinkToWitnessById.jsx
index d2f36a7e9d..be1ecf3bb7 100644
--- a/app/components/Utility/LinkToWitnessById.jsx
+++ b/app/components/Utility/LinkToWitnessById.jsx
@@ -6,7 +6,7 @@ import LinkToAccountById from "./LinkToAccountById";
 class LinkToWitnessById extends React.Component {
     static propTypes = {
         witness: ChainTypes.ChainObject.isRequired
-    }
+    };
 
     render() {
         let witness_account = this.props.witness.get("witness_account");
diff --git a/app/components/Utility/PriceText.jsx b/app/components/Utility/PriceText.jsx
index c6c9fb6557..2adaef7d21 100644
--- a/app/components/Utility/PriceText.jsx
+++ b/app/components/Utility/PriceText.jsx
@@ -2,36 +2,61 @@ import React from "react";
 import utils from "common/utils";
 
 class PriceText extends React.Component {
-
     render() {
         let {price, preFormattedPrice, quote, base, component} = this.props;
 
-        let formattedPrice = preFormattedPrice ? preFormattedPrice : utils.price_to_text(price, quote, base);
-        
+        let formattedPrice = preFormattedPrice
+            ? preFormattedPrice
+            : utils.price_to_text(price, quote, base);
+
         if (formattedPrice.full >= 1) {
             return (
                 <span>
                     <span className="price-integer">{formattedPrice.int}.</span>
-                    {formattedPrice.dec ? <span className="price-integer">{formattedPrice.dec}</span> : null}
-                    {formattedPrice.trailing ? <span className="price-decimal">{formattedPrice.trailing}</span> : null}
+                    {formattedPrice.dec ? (
+                        <span className="price-integer">
+                            {formattedPrice.dec}
+                        </span>
+                    ) : null}
+                    {formattedPrice.trailing ? (
+                        <span className="price-decimal">
+                            {formattedPrice.trailing}
+                        </span>
+                    ) : null}
                 </span>
-            )
+            );
         } else if (formattedPrice.full >= 0.1) {
             return (
                 <span>
                     <span className="price-decimal">{formattedPrice.int}.</span>
-                    {formattedPrice.dec ? <span className="price-integer">{formattedPrice.dec}</span> : null}
-                    {formattedPrice.trailing ? <span className="price-decimal">{formattedPrice.trailing}</span> : null}
+                    {formattedPrice.dec ? (
+                        <span className="price-integer">
+                            {formattedPrice.dec}
+                        </span>
+                    ) : null}
+                    {formattedPrice.trailing ? (
+                        <span className="price-decimal">
+                            {formattedPrice.trailing}
+                        </span>
+                    ) : null}
                 </span>
-            )
+            );
         } else {
             return (
                 <span>
                     <span className="price-decimal">{formattedPrice.int}.</span>
-                    {formattedPrice.dec ? <span className="price-decimal">{formattedPrice.dec}</span> : null}
-                    {formattedPrice.trailing ? <span className="price-integer">{formattedPrice.trailing}</span> : null}
+                    {formattedPrice.dec ? (
+                        <span className="price-decimal">
+                            {formattedPrice.dec}
+                        </span>
+                    ) : null}
+                    {formattedPrice.trailing ? (
+                        <span className="price-integer">
+                            {formattedPrice.trailing}
+                        </span>
+                    ) : null}
                 </span>
-            )
+            );
         }
     }
 }
diff --git a/app/components/Utility/Prototypes.js b/app/components/Utility/Prototypes.js
index f21e33db87..e60754e5f1 100644
--- a/app/components/Utility/Prototypes.js
+++ b/app/components/Utility/Prototypes.js
@@ -1,9 +1,9 @@
-Array.prototype.equals = function (array) {
+Array.prototype.equals = function(array) {
     // if the other array is a falsy value, return
     if (!array) {
         return false;
     }
-    // compare lengths - can save a lot of time 
+    // compare lengths - can save a lot of time
     if (this.length !== array.length) {
         return false;
     }
@@ -12,13 +12,12 @@ Array.prototype.equals = function (array) {
         if (this[i] instanceof Array && array[i] instanceof Array) {
             // recurse into the nested arrays
             if (!this[i].equals(array[i])) {
-                return false;       
+                return false;
             }
-        }           
-        else if (this[i] !== array[i]) { 
+        } else if (this[i] !== array[i]) {
             // Warning - two different object instances will never be equal: {x:20} != {x:20}
-            return false;   
-        }           
-    }       
+            return false;
+        }
+    }
     return true;
 };
diff --git a/app/components/Utility/TimeAgo.jsx b/app/components/Utility/TimeAgo.jsx
index 9eb99e076f..45a3f45b6d 100644
--- a/app/components/Utility/TimeAgo.jsx
+++ b/app/components/Utility/TimeAgo.jsx
@@ -3,7 +3,6 @@ import {FormattedRelative} from "react-intl";
 import {ChainStore} from "bitsharesjs/es";
 
 class TimeAgo extends React.Component {
-
     static propTypes = {
         time: React.PropTypes.any.isRequired,
         chain_time: React.PropTypes.bool,
@@ -16,30 +15,39 @@ class TimeAgo extends React.Component {
     };
 
     shouldComponentUpdate(nextProps) {
-        return (
-            nextProps.time !== this.props.time
-        );
+        return nextProps.time !== this.props.time;
     }
 
     render() {
         let {time, chain_time} = this.props;
-        var offset_mills = chain_time ? ChainStore.getEstimatedChainTimeOffset() : 0;
+        var offset_mills = chain_time
+            ? ChainStore.getEstimatedChainTimeOffset()
+            : 0;
         if (!time) {
             return null;
         }
-        if (typeof time === "string" && time.indexOf("+") === -1 && !/Z$/.test(time)) {
+        if (
+            typeof time === "string" &&
+            time.indexOf("+") === -1 &&
+            !/Z$/.test(time)
+        ) {
             time += "Z";
         }
 
-        let timePassed = Math.round( ( new Date().getTime() - new Date(time).getTime() + offset_mills ) / 1000 );
+        let timePassed = Math.round(
+            (new Date().getTime() - new Date(time).getTime() + offset_mills) /
+                1000
+        );
         let interval;
 
-        if (timePassed < 60) { // 60s
+        if (timePassed < 60) {
+            // 60s
             interval = 500; // 0.5s
-        } else if (timePassed < 60 * 60){ // 1 hour
+        } else if (timePassed < 60 * 60) {
+            // 1 hour
             interval = 60 * 500; // 30 seconds
         } else {
-            interval = 60 * 60 * 500 // 30 minutes
+            interval = 60 * 60 * 500; // 30 minutes
         }
 
         return (
@@ -56,7 +64,6 @@ class TimeAgo extends React.Component {
                 />
             </span>
         );
-
     }
 }
 
diff --git a/app/components/Utility/TransitionWrapper.jsx b/app/components/Utility/TransitionWrapper.jsx
index 9198759139..12e0acd23d 100644
--- a/app/components/Utility/TransitionWrapper.jsx
+++ b/app/components/Utility/TransitionWrapper.jsx
@@ -2,7 +2,6 @@ import React from "react";
 import CSSTransitionGroup from "react-transition-group/CSSTransitionGroup";
 
 export default class TransitionWrapper extends React.Component {
-
     static defaultProps = {
         component: "span",
         enterTimeout: 2000
diff --git a/app/components/Utility/VestingBalance.jsx b/app/components/Utility/VestingBalance.jsx
index de36bf3707..443d25dc5d 100644
--- a/app/components/Utility/VestingBalance.jsx
+++ b/app/components/Utility/VestingBalance.jsx
@@ -10,15 +10,21 @@ import BindToChainState from "./BindToChainState";
  */
 
 class VestingBalance extends React.Component {
-
     static propTypes = {
         balance: ChainTypes.ChainObject.isRequired
-    }
+    };
 
     render() {
-        let amount = Number(this.props.balance.getIn(["balance","amount"]));
-        let type = this.props.balance.getIn(["balance","asset_id"]);
-        return <FormattedAsset hide_asset={this.props.hide_asset} amount={amount} asset={type} decimalOffset={this.props.decimalOffset || 0}/>;
+        let amount = Number(this.props.balance.getIn(["balance", "amount"]));
+        let type = this.props.balance.getIn(["balance", "asset_id"]);
+        return (
+            <FormattedAsset
+                hide_asset={this.props.hide_asset}
+                amount={amount}
+                asset={type}
+                decimalOffset={this.props.decimalOffset || 0}
+            />
+        );
     }
 }
 
diff --git a/app/components/Utility/intlData.js b/app/components/Utility/intlData.js
index 7867bb1e49..88dbcf3c81 100644
--- a/app/components/Utility/intlData.js
+++ b/app/components/Utility/intlData.js
@@ -1,6 +1,6 @@
 module.exports = {
     formats: {
-        "date": {
+        date: {
             full: {
                 second: "numeric",
                 minute: "numeric",
diff --git a/app/components/Wallet/Backup.jsx b/app/components/Wallet/Backup.jsx
index d80ecf0b01..b174aa1a25 100644
--- a/app/components/Wallet/Backup.jsx
+++ b/app/components/Wallet/Backup.jsx
@@ -1,12 +1,15 @@
 import React, {PropTypes, Component} from "react";
 import {Link} from "react-router/es";
 import {FormattedDate} from "react-intl";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import WalletActions from "actions/WalletActions";
 import WalletManagerStore from "stores/WalletManagerStore";
 import BackupStore from "stores/BackupStore";
 import WalletDb from "stores/WalletDb";
-import BackupActions, {backup, decryptWalletBackup} from "actions/BackupActions";
+import BackupActions, {
+    backup,
+    decryptWalletBackup
+} from "actions/BackupActions";
 import notify from "actions/NotificationActions";
 import {saveAs} from "file-saver";
 import cname from "classnames";
@@ -22,7 +25,7 @@ const connectObject = {
     getProps() {
         let wallet = WalletManagerStore.getState();
         let backup = BackupStore.getState();
-        return { wallet, backup };
+        return {wallet, backup};
     }
 };
 
@@ -31,14 +34,20 @@ class BackupCreate extends Component {
     render() {
         return (
             <div style={{maxWidth: "40rem"}}>
-            <Create noText={this.props.noText} newAccount={this.props.location ? this.props.location.query.newAccount : null}>
-                <NameSizeModified/>
-                {this.props.noText ? null : <Sha1/>}
-                <Download downloadCb={this.props.downloadCb}/>
-            </Create>
-
-        </div>
-    );
+                <Create
+                    noText={this.props.noText}
+                    newAccount={
+                        this.props.location
+                            ? this.props.location.query.newAccount
+                            : null
+                    }
+                >
+                    <NameSizeModified />
+                    {this.props.noText ? null : <Sha1 />}
+                    <Download downloadCb={this.props.downloadCb} />
+                </Create>
+            </div>
+        );
     }
 }
 BackupCreate = connect(BackupCreate, connectObject);
@@ -56,12 +65,11 @@ BackupCreate = connect(BackupCreate, connectObject);
 // }
 
 class BackupRestore extends Component {
-
     constructor() {
-        super()
+        super();
         this.state = {
             newWalletName: null
-        }
+        };
     }
 
     componentWillMount() {
@@ -69,24 +77,39 @@ class BackupRestore extends Component {
     }
 
     render() {
-        let new_wallet = this.props.wallet.new_wallet
-        let has_new_wallet = this.props.wallet.wallet_names.has(new_wallet)
-        let restored = has_new_wallet
+        let new_wallet = this.props.wallet.new_wallet;
+        let has_new_wallet = this.props.wallet.wallet_names.has(new_wallet);
+        let restored = has_new_wallet;
 
         return (
             <div>
-                <Translate style={{textAlign: "left", maxWidth: "30rem"}} component="p" content="wallet.import_backup_choose" />
-                {(new FileReader).readAsBinaryString ? null : <p className="error">Warning! You browser doesn't support some some file operations required to restore backup, we recommend you to use Chrome or Firefox browsers to restore your backup.</p>}
+                <Translate
+                    style={{textAlign: "left", maxWidth: "30rem"}}
+                    component="p"
+                    content="wallet.import_backup_choose"
+                />
+                {new FileReader().readAsBinaryString ? null : (
+                    <p className="error">
+                        Warning! You browser doesn't support some some file
+                        operations required to restore backup, we recommend you
+                        to use Chrome or Firefox browsers to restore your
+                        backup.
+                    </p>
+                )}
                 <Upload>
-                    <NameSizeModified/>
+                    <NameSizeModified />
                     <DecryptBackup saveWalletObject={true}>
                         <NewWalletName>
-                            <Restore/>
+                            <Restore />
                         </NewWalletName>
                     </DecryptBackup>
                 </Upload>
                 <br />
-                <Link to="/"><button className="blue"><Translate content="wallet.back" /></button></Link>
+                <Link to="/">
+                    <button className="blue">
+                        <Translate content="wallet.back" />
+                    </button>
+                </Link>
             </div>
         );
     }
@@ -95,10 +118,9 @@ class BackupRestore extends Component {
 BackupRestore = connect(BackupRestore, connectObject);
 
 class Restore extends Component {
-
     constructor() {
-        super()
-        this.state = { }
+        super();
+        this.state = {};
     }
 
     isRestored() {
@@ -108,25 +130,46 @@ class Restore extends Component {
     }
 
     render() {
-        let new_wallet = this.props.wallet.new_wallet
-        let has_new_wallet = this.isRestored()
-
-        if(has_new_wallet)
-            return <span>
-                <h5><Translate content="wallet.restore_success" name={new_wallet.toUpperCase()} /></h5>
-                <Link to="/dashboard">
-                    <div className="button outline">
-                        <Translate component="span" content="header.dashboard" />
-                    </div>
-                </Link>
-                <div>{this.props.children}</div>
-            </span>
+        let new_wallet = this.props.wallet.new_wallet;
+        let has_new_wallet = this.isRestored();
+
+        if (has_new_wallet)
+            return (
+                <span>
+                    <h5>
+                        <Translate
+                            content="wallet.restore_success"
+                            name={new_wallet.toUpperCase()}
+                        />
+                    </h5>
+                    <Link to="/dashboard">
+                        <div className="button outline">
+                            <Translate
+                                component="span"
+                                content="header.dashboard"
+                            />
+                        </div>
+                    </Link>
+                    <div>{this.props.children}</div>
+                </span>
+            );
 
-        return <span>
-            <h3><Translate content="wallet.ready_to_restore" /></h3>
-            <div className="button outline"
-                onClick={this.onRestore.bind(this)}><Translate content="wallet.restore_wallet_of" name={new_wallet} /></div>
-        </span>
+        return (
+            <span>
+                <h3>
+                    <Translate content="wallet.ready_to_restore" />
+                </h3>
+                <div
+                    className="button outline"
+                    onClick={this.onRestore.bind(this)}
+                >
+                    <Translate
+                        content="wallet.restore_wallet_of"
+                        name={new_wallet}
+                    />
+                </div>
+            </span>
+        );
     }
 
     onRestore() {
@@ -139,107 +182,126 @@ class Restore extends Component {
             value: false
         });
     }
-
 }
 Restore = connect(Restore, connectObject);
 
 class NewWalletName extends Component {
-
     constructor() {
-        super()
+        super();
         this.state = {
             new_wallet: null,
             accept: false
-        }
+        };
     }
 
     componentWillMount() {
-        let has_current_wallet = !!this.props.wallet.current_wallet
-        if( ! has_current_wallet) {
+        let has_current_wallet = !!this.props.wallet.current_wallet;
+        if (!has_current_wallet) {
             let walletName = "default";
             if (this.props.backup.name) {
-                walletName = this.props.backup.name.match(/[a-z0-9_-]*/)[0]
+                walletName = this.props.backup.name.match(/[a-z0-9_-]*/)[0];
             }
-            WalletManagerStore.setNewWallet(walletName)
-            this.setState({accept: true})
+            WalletManagerStore.setNewWallet(walletName);
+            this.setState({accept: true});
         }
-        if( has_current_wallet && this.props.backup.name && ! this.state.new_wallet) {
+        if (
+            has_current_wallet &&
+            this.props.backup.name &&
+            !this.state.new_wallet
+        ) {
             // begning of the file name might make a good wallet name
-            let new_wallet = this.props.backup.name.toLowerCase().match(/[a-z0-9_-]*/)[0];
-            if( new_wallet )
-                this.setState({new_wallet})
+            let new_wallet = this.props.backup.name
+                .toLowerCase()
+                .match(/[a-z0-9_-]*/)[0];
+            if (new_wallet) this.setState({new_wallet});
         }
     }
 
     render() {
-        if(this.state.accept)
-            return <span>{this.props.children}</span>
+        if (this.state.accept) return <span>{this.props.children}</span>;
 
-        let has_wallet_name = !!this.state.new_wallet
-        let has_wallet_name_conflict = has_wallet_name ?
-            this.props.wallet.wallet_names.has(this.state.new_wallet) : false
-        let name_ready = ! has_wallet_name_conflict && has_wallet_name
+        let has_wallet_name = !!this.state.new_wallet;
+        let has_wallet_name_conflict = has_wallet_name
+            ? this.props.wallet.wallet_names.has(this.state.new_wallet)
+            : false;
+        let name_ready = !has_wallet_name_conflict && has_wallet_name;
 
         return (
-        <form onSubmit={this.onAccept.bind(this)}>
-            <h5><Translate content="wallet.new_wallet_name" /></h5>
-            <input
-                type="text"
-                id="new_wallet"
-                onChange={this.formChange.bind(this)}
-                value={this.state.new_wallet}
-            />
-            <p>{ has_wallet_name_conflict ? <Translate content="wallet.wallet_exist" /> : null}</p>
-            <div onClick={ this.onAccept.bind(this) } type="submit" className={cname("button outline", {disabled: ! name_ready})}>
-                <Translate content="wallet.accept" />
-            </div>
-        </form>);
+            <form onSubmit={this.onAccept.bind(this)}>
+                <h5>
+                    <Translate content="wallet.new_wallet_name" />
+                </h5>
+                <input
+                    type="text"
+                    id="new_wallet"
+                    onChange={this.formChange.bind(this)}
+                    value={this.state.new_wallet}
+                />
+                <p>
+                    {has_wallet_name_conflict ? (
+                        <Translate content="wallet.wallet_exist" />
+                    ) : null}
+                </p>
+                <div
+                    onClick={this.onAccept.bind(this)}
+                    type="submit"
+                    className={cname("button outline", {disabled: !name_ready})}
+                >
+                    <Translate content="wallet.accept" />
+                </div>
+            </form>
+        );
     }
 
     onAccept(e) {
         if (e) e.preventDefault();
-        this.setState({accept: true})
-        WalletManagerStore.setNewWallet(this.state.new_wallet)
+        this.setState({accept: true});
+        WalletManagerStore.setNewWallet(this.state.new_wallet);
     }
 
     formChange(event) {
-        let key_id = event.target.id
-        let value = event.target.value
-        if(key_id === "new_wallet") {
+        let key_id = event.target.id;
+        let value = event.target.value;
+        if (key_id === "new_wallet") {
             //case in-sensitive
-            value = value.toLowerCase()
+            value = value.toLowerCase();
             // Allow only valid file name characters
-            if( /[^a-z0-9_-]/.test(value) ) return
+            if (/[^a-z0-9_-]/.test(value)) return;
         }
-        let state = {}
-        state[key_id] = value
-        this.setState(state)
+        let state = {};
+        state[key_id] = value;
+        this.setState(state);
     }
 }
 NewWalletName = connect(NewWalletName, connectObject);
 
 class Download extends Component {
-
     componentWillMount() {
-        try { this.isFileSaverSupported = !!new Blob; } catch (e) {}
+        try {
+            this.isFileSaverSupported = !!new Blob();
+        } catch (e) {}
     }
 
     componentDidMount() {
-        if( ! this.isFileSaverSupported )
-            notify.error("File saving is not supported")
+        if (!this.isFileSaverSupported)
+            notify.error("File saving is not supported");
     }
 
     render() {
-        return <div className="button"
-            onClick={this.onDownload.bind(this)}><Translate content="wallet.download" /></div>
+        return (
+            <div className="button" onClick={this.onDownload.bind(this)}>
+                <Translate content="wallet.download" />
+            </div>
+        );
     }
 
     onDownload() {
-        let blob = new Blob([ this.props.backup.contents ], {
-            type: "application/octet-stream; charset=us-ascii"})
+        let blob = new Blob([this.props.backup.contents], {
+            type: "application/octet-stream; charset=us-ascii"
+        });
 
-        if(blob.size !== this.props.backup.size)
-            throw new Error("Invalid backup to download conversion")
+        if (blob.size !== this.props.backup.size)
+            throw new Error("Invalid backup to download conversion");
         saveAs(blob, this.props.backup.name);
         WalletActions.setBackupDate();
 
@@ -251,17 +313,18 @@ class Download extends Component {
 Download = connect(Download, connectObject);
 
 class Create extends Component {
-
     getBackupName() {
-        let name = this.props.wallet.current_wallet
-        let address_prefix = ChainConfig.address_prefix.toLowerCase()
-        if(name.indexOf(address_prefix) !== 0)
-            name = address_prefix + "_" + name
+        let name = this.props.wallet.current_wallet;
+        let address_prefix = ChainConfig.address_prefix.toLowerCase();
+        if (name.indexOf(address_prefix) !== 0)
+            name = address_prefix + "_" + name;
 
-        let date =  new Date();
+        let date = new Date();
         let month = date.getMonth() + 1;
         let day = date.getDate();
-        let stampedName = `${name}_${date.getFullYear()}${month >= 10 ? month : "0" + month}${day >= 10 ? day : "0" + day}`;
+        let stampedName = `${name}_${date.getFullYear()}${
+            month >= 10 ? month : "0" + month
+        }${day >= 10 ? day : "0" + day}`;
 
         name = stampedName + ".bin";
 
@@ -269,37 +332,48 @@ class Create extends Component {
     }
 
     render() {
+        let has_backup = !!this.props.backup.contents;
+        if (has_backup) return <div>{this.props.children}</div>;
 
-        let has_backup = !!this.props.backup.contents
-        if( has_backup ) return <div>{this.props.children}</div>
-
-        let ready = WalletDb.getWallet() != null
+        let ready = WalletDb.getWallet() != null;
 
         return (
             <div>
-                {this.props.noText ? null :
-                <div style={{textAlign: "left"}}>
-                    {this.props.newAccount ? <Translate component="p" content="wallet.backup_new_account"/> : null}
-                    <Translate component="p" content="wallet.backup_explain"/>
-                </div>}
+                {this.props.noText ? null : (
+                    <div style={{textAlign: "left"}}>
+                        {this.props.newAccount ? (
+                            <Translate
+                                component="p"
+                                content="wallet.backup_new_account"
+                            />
+                        ) : null}
+                        <Translate
+                            component="p"
+                            content="wallet.backup_explain"
+                        />
+                    </div>
+                )}
                 <div
                     onClick={this.onCreateBackup.bind(this)}
                     className={cname("button", {disabled: !ready})}
                     style={{marginBottom: 10}}
                 >
-                    <Translate content="wallet.create_backup_of" name={this.props.wallet.current_wallet} />
+                    <Translate
+                        content="wallet.create_backup_of"
+                        name={this.props.wallet.current_wallet}
+                    />
                 </div>
-                <LastBackupDate/>
+                <LastBackupDate />
             </div>
         );
     }
 
     onCreateBackup() {
-        let backup_pubkey = WalletDb.getWallet().password_pubkey
-        backup(backup_pubkey).then( contents => {
+        let backup_pubkey = WalletDb.getWallet().password_pubkey;
+        backup(backup_pubkey).then(contents => {
             let name = this.getBackupName();
-            BackupActions.incommingBuffer({name, contents})
-        })
+            BackupActions.incommingBuffer({name, contents});
+        });
     }
 }
 Create = connect(Create, connectObject);
@@ -309,26 +383,44 @@ class LastBackupDate extends Component {
         if (!WalletDb.getWallet()) {
             return null;
         }
-        let backup_date = WalletDb.getWallet().backup_date
-        let last_modified = WalletDb.getWallet().last_modified
-        let backup_time = backup_date ?
-            <h4><Translate content="wallet.last_backup" /> <FormattedDate value={backup_date}/></h4>:
-            <Translate style={{paddingTop: 20}} className="facolor-error" component="p" content="wallet.never_backed_up" />
-        let needs_backup = null
-        if( backup_date ) {
-            needs_backup = last_modified.getTime() > backup_date.getTime() ?
-                <h4 className="facolor-error"><Translate content="wallet.need_backup" /></h4>:
-                <h4 className="success"><Translate content="wallet.noneed_backup" /></h4>
+        let backup_date = WalletDb.getWallet().backup_date;
+        let last_modified = WalletDb.getWallet().last_modified;
+        let backup_time = backup_date ? (
+            <h4>
+                <Translate content="wallet.last_backup" />{" "}
+                <FormattedDate value={backup_date} />
+            </h4>
+        ) : (
+            <Translate
+                style={{paddingTop: 20}}
+                className="facolor-error"
+                component="p"
+                content="wallet.never_backed_up"
+            />
+        );
+        let needs_backup = null;
+        if (backup_date) {
+            needs_backup =
+                last_modified.getTime() > backup_date.getTime() ? (
+                    <h4 className="facolor-error">
+                        <Translate content="wallet.need_backup" />
+                    </h4>
+                ) : (
+                    <h4 className="success">
+                        <Translate content="wallet.noneed_backup" />
+                    </h4>
+                );
         }
-        return <span>
-            {backup_time}
-            {needs_backup}
-        </span>
+        return (
+            <span>
+                {backup_time}
+                {needs_backup}
+            </span>
+        );
     }
 }
 
 class Upload extends Component {
-
     reset() {
         // debugger;
         // this.refs.file_input.value = "";
@@ -340,28 +432,41 @@ class Upload extends Component {
             <div style={{paddingTop: 20}}>
                 <div
                     onClick={this.reset.bind(this)}
-                    className={cname("button outline", {disabled: !this.props.backup.contents})}
+                    className={cname("button outline", {
+                        disabled: !this.props.backup.contents
+                    })}
                 >
                     <Translate content="wallet.reset" />
                 </div>
             </div>
         );
 
-        if(
-            this.props.backup.contents &&
-            this.props.backup.public_key
-        )
-            return <span>{this.props.children}{resetButton}</span>;
+        if (this.props.backup.contents && this.props.backup.public_key)
+            return (
+                <span>
+                    {this.props.children}
+                    {resetButton}
+                </span>
+            );
 
         let is_invalid =
-            this.props.backup.contents &&
-            ! this.props.backup.public_key;
+            this.props.backup.contents && !this.props.backup.public_key;
 
         return (
             <div>
-                <input ref="file_input" accept=".bin" type="file" id="backup_input_file" style={{ border: "solid" }}
-                    onChange={this.onFileUpload.bind(this)} />
-                { is_invalid ? <h5><Translate content="wallet.invalid_format" /></h5> : null }
+                <input
+                    ref="file_input"
+                    accept=".bin"
+                    type="file"
+                    id="backup_input_file"
+                    style={{border: "solid"}}
+                    onChange={this.onFileUpload.bind(this)}
+                />
+                {is_invalid ? (
+                    <h5>
+                        <Translate content="wallet.invalid_format" />
+                    </h5>
+                ) : null}
                 {resetButton}
             </div>
         );
@@ -377,90 +482,117 @@ Upload = connect(Upload, connectObject);
 
 class NameSizeModified extends Component {
     render() {
-        return <span>
-            <h5><b>{this.props.backup.name}</b> ({this.props.backup.size} bytes)</h5>
-            {this.props.backup.last_modified ?
-                <div>{this.props.backup.last_modified}</div> : null }
-            <br/>
-        </span>
+        return (
+            <span>
+                <h5>
+                    <b>{this.props.backup.name}</b> ({this.props.backup.size}{" "}
+                    bytes)
+                </h5>
+                {this.props.backup.last_modified ? (
+                    <div>{this.props.backup.last_modified}</div>
+                ) : null}
+                <br />
+            </span>
+        );
     }
 }
 NameSizeModified = connect(NameSizeModified, connectObject);
 
 class DecryptBackup extends Component {
-
     static propTypes = {
         saveWalletObject: PropTypes.bool
-    }
+    };
 
     constructor() {
-        super()
-        this.state = this._getInitialState()
+        super();
+        this.state = this._getInitialState();
     }
 
     _getInitialState() {
         return {
             backup_password: "",
             verified: false
-        }
+        };
     }
 
     render() {
-        if(this.state.verified) return <span>{this.props.children}</span>
+        if (this.state.verified) return <span>{this.props.children}</span>;
         return (
-        <form onSubmit={this.onPassword.bind(this)}>
-            <label><Translate content="wallet.enter_password" /></label>
-            <input type="password" id="backup_password"
-                onChange={this.formChange.bind(this)}
-                value={this.state.backup_password}/>
-            <Sha1/>
-            <div
-                type="submit"
-                className="button outline"
-                onClick={this.onPassword.bind(this)}
-            >
-                <Translate content="wallet.submit" />
-            </div>
-        </form>);
+            <form onSubmit={this.onPassword.bind(this)}>
+                <label>
+                    <Translate content="wallet.enter_password" />
+                </label>
+                <input
+                    type="password"
+                    id="backup_password"
+                    onChange={this.formChange.bind(this)}
+                    value={this.state.backup_password}
+                />
+                <Sha1 />
+                <div
+                    type="submit"
+                    className="button outline"
+                    onClick={this.onPassword.bind(this)}
+                >
+                    <Translate content="wallet.submit" />
+                </div>
+            </form>
+        );
     }
 
     onPassword(e) {
         if (e) e.preventDefault();
-        let private_key = PrivateKey.fromSeed(this.state.backup_password || "")
-        let contents = this.props.backup.contents
-        decryptWalletBackup(private_key.toWif(), contents).then( wallet_object => {
-            this.setState({verified: true})
-            if(this.props.saveWalletObject)
-                BackupStore.setWalletObjct(wallet_object)
-
-        }).catch( error => {
-            console.error("Error verifying wallet " + this.props.backup.name,
-                error, error.stack)
-            if(error === "invalid_decryption_key")
-                notify.error("Invalid Password")
-            else
-                notify.error(""+error)
-        })
+        let private_key = PrivateKey.fromSeed(this.state.backup_password || "");
+        let contents = this.props.backup.contents;
+        decryptWalletBackup(private_key.toWif(), contents)
+            .then(wallet_object => {
+                this.setState({verified: true});
+                if (this.props.saveWalletObject)
+                    BackupStore.setWalletObjct(wallet_object);
+            })
+            .catch(error => {
+                console.error(
+                    "Error verifying wallet " + this.props.backup.name,
+                    error,
+                    error.stack
+                );
+                if (error === "invalid_decryption_key")
+                    notify.error("Invalid Password");
+                else notify.error("" + error);
+            });
     }
 
     formChange(event) {
-        let state = {}
-        state[event.target.id] = event.target.value
-        this.setState(state)
+        let state = {};
+        state[event.target.id] = event.target.value;
+        this.setState(state);
     }
-
 }
 DecryptBackup = connect(DecryptBackup, connectObject);
 
 class Sha1 extends Component {
     render() {
-        return <div>
-            <pre className="no-overflow">{this.props.backup.sha1} * SHA1</pre>
-            <br/>
-        </div>;
+        return (
+            <div>
+                <pre className="no-overflow">
+                    {this.props.backup.sha1} * SHA1
+                </pre>
+                <br />
+            </div>
+        );
     }
 }
 Sha1 = connect(Sha1, connectObject);
 
-export {BackupCreate, BackupRestore, Restore, NewWalletName,
-    Download, Create, Upload, NameSizeModified, DecryptBackup, Sha1};
+export {
+    BackupCreate,
+    BackupRestore,
+    Restore,
+    NewWalletName,
+    Download,
+    Create,
+    Upload,
+    NameSizeModified,
+    DecryptBackup,
+    Sha1
+};
diff --git a/app/components/Wallet/BackupBrainkey.jsx b/app/components/Wallet/BackupBrainkey.jsx
index e23d256af4..36647e1be8 100644
--- a/app/components/Wallet/BackupBrainkey.jsx
+++ b/app/components/Wallet/BackupBrainkey.jsx
@@ -6,10 +6,9 @@ import WalletDb from "stores/WalletDb";
 import {hash} from "bitsharesjs/es";
 
 export default class BackupBrainkey extends Component {
-
     constructor() {
-        super()
-        this.state = this._getInitialState()
+        super();
+        this.state = this._getInitialState();
     }
 
     _getInitialState() {
@@ -17,78 +16,142 @@ export default class BackupBrainkey extends Component {
             password: null,
             brainkey: null,
             invalid_password: false
-        }
+        };
     }
 
     render() {
-        var content
+        var content;
         var brainkey_backup_date = WalletDb.getWallet().brainkey_backup_date;
 
-        var brainkey_backup_time = brainkey_backup_date ?
-            <div><Translate content="wallet.brainkey_backed_up" />: <FormattedDate value={brainkey_backup_date}/></div> :
-            <Translate className="facolor-error" component="p" content="wallet.brainkey_not_backed_up" />
-
-        if(this.state.verified) {
-            var sha1 = hash.sha1(this.state.brainkey).toString('hex').substring(0,4)
-            content = <div>
-                <h3><Translate content="wallet.brainkey" /></h3>
-                <div className="card"><div className="card-content">
-                    <h5>{this.state.brainkey}</h5></div></div>
-                <br/>
-                <pre className="no-overflow">sha1 hash of the brainkey: {sha1}</pre>
-                <br/>
-                {brainkey_backup_time}
+        var brainkey_backup_time = brainkey_backup_date ? (
+            <div>
+                <Translate content="wallet.brainkey_backed_up" />:{" "}
+                <FormattedDate value={brainkey_backup_date} />
             </div>
+        ) : (
+            <Translate
+                className="facolor-error"
+                component="p"
+                content="wallet.brainkey_not_backed_up"
+            />
+        );
+
+        if (this.state.verified) {
+            var sha1 = hash
+                .sha1(this.state.brainkey)
+                .toString("hex")
+                .substring(0, 4);
+            content = (
+                <div>
+                    <h3>
+                        <Translate content="wallet.brainkey" />
+                    </h3>
+                    <div className="card">
+                        <div className="card-content">
+                            <h5>{this.state.brainkey}</h5>
+                        </div>
+                    </div>
+                    <br />
+                    <pre className="no-overflow">
+                        sha1 hash of the brainkey: {sha1}
+                    </pre>
+                    <br />
+                    {brainkey_backup_time}
+                </div>
+            );
         }
 
-        if(!content && this.state.brainkey) {
-            var sha1 = hash.sha1(this.state.brainkey).toString('hex').substring(0,4)
-            content = <span>
-                <h3><Translate content="wallet.brainkey" /></h3>
-                <div className="card"><div className="card-content">
-                    <h5>{this.state.brainkey}</h5></div></div>
+        if (!content && this.state.brainkey) {
+            var sha1 = hash
+                .sha1(this.state.brainkey)
+                .toString("hex")
+                .substring(0, 4);
+            content = (
+                <span>
+                    <h3>
+                        <Translate content="wallet.brainkey" />
+                    </h3>
+                    <div className="card">
+                        <div className="card-content">
+                            <h5>{this.state.brainkey}</h5>
+                        </div>
+                    </div>
                     <div style={{padding: "10px 0"}}>
-                        <pre className="no-overflow">sha1 hash of your brainkey: {sha1}</pre>
+                        <pre className="no-overflow">
+                            sha1 hash of your brainkey: {sha1}
+                        </pre>
+                    </div>
+                    <hr />
+                    <div style={{padding: "10px 0 20px 0"}}>
+                        <Translate content="wallet.brainkey_w1" />
+                        <br />
+                        <Translate content="wallet.brainkey_w2" />
+                        <br />
+                        <Translate content="wallet.brainkey_w3" />
                     </div>
-                <hr/>
-                <div style={{padding: "10px 0 20px 0"}}>
-                    <Translate content="wallet.brainkey_w1" /><br/>
-                    <Translate content="wallet.brainkey_w2" /><br/>
-                    <Translate content="wallet.brainkey_w3" />
-                </div>
-
-                <button className="button success" onClick={this.onComplete.bind(this)}><Translate content="wallet.verify" /></button>
-                <button className="button cancel" onClick={this.reset.bind(this)}><Translate content="wallet.cancel" /></button>
 
-            </span>
+                    <button
+                        className="button success"
+                        onClick={this.onComplete.bind(this)}
+                    >
+                        <Translate content="wallet.verify" />
+                    </button>
+                    <button
+                        className="button cancel"
+                        onClick={this.reset.bind(this)}
+                    >
+                        <Translate content="wallet.cancel" />
+                    </button>
+                </span>
+            );
         }
 
-        if(!content) {
-            var valid = this.state.password && this.state.password !== ""
-            content = <span>
-                <label><Translate content="wallet.enter_password" /></label>
-                <form onSubmit={this.onSubmit.bind(this)} className="name-form" noValidate>
-                    <input type="password" id="password" onChange={this.onPassword.bind(this)}/>
-                    <p>
-                        {this.state.invalid_password ?
-                            <span className="error">Invalid password</span>:
-                            <span><Translate content="wallet.pwd4brainkey" /></span>}
-                    </p>
-                    <div>{brainkey_backup_time}<br/></div>
-                    <button className="button success"><Translate content="wallet.show_brainkey" /></button>
-                </form>
-            </span>
+        if (!content) {
+            var valid = this.state.password && this.state.password !== "";
+            content = (
+                <span>
+                    <label>
+                        <Translate content="wallet.enter_password" />
+                    </label>
+                    <form
+                        onSubmit={this.onSubmit.bind(this)}
+                        className="name-form"
+                        noValidate
+                    >
+                        <input
+                            type="password"
+                            id="password"
+                            onChange={this.onPassword.bind(this)}
+                        />
+                        <p>
+                            {this.state.invalid_password ? (
+                                <span className="error">Invalid password</span>
+                            ) : (
+                                <span>
+                                    <Translate content="wallet.pwd4brainkey" />
+                                </span>
+                            )}
+                        </p>
+                        <div>
+                            {brainkey_backup_time}
+                            <br />
+                        </div>
+                        <button className="button success">
+                            <Translate content="wallet.show_brainkey" />
+                        </button>
+                    </form>
+                </span>
+            );
         }
-        return <div className="grid-block vertical">
-            <div className="grid-content no-overflow">
-                {content}
+        return (
+            <div className="grid-block vertical">
+                <div className="grid-content no-overflow">{content}</div>
             </div>
-        </div>
+        );
     }
 
-
     onComplete(brnkey) {
-        this.setState({ verified: true });
+        this.setState({verified: true});
         WalletActions.setBrainkeyBackupDate();
     }
 
@@ -96,27 +159,26 @@ export default class BackupBrainkey extends Component {
         if (e) {
             e.preventDefault();
         }
-        this.setState(this._getInitialState())
+        this.setState(this._getInitialState());
     }
 
     onBack(e) {
-        e.preventDefault()
+        e.preventDefault();
         window.history.back();
     }
 
     onSubmit(e) {
         e.preventDefault();
-        var was_locked = WalletDb.isLocked()
+        var was_locked = WalletDb.isLocked();
         let {success} = WalletDb.validatePassword(this.state.password, true);
-        if(success) {
-            var brainkey = WalletDb.getBrainKey()
-            if(was_locked) WalletDb.onLock()
-            this.setState({ brainkey })
-        } else
-            this.setState({ invalid_password: true })
+        if (success) {
+            var brainkey = WalletDb.getBrainKey();
+            if (was_locked) WalletDb.onLock();
+            this.setState({brainkey});
+        } else this.setState({invalid_password: true});
     }
 
     onPassword(event) {
-        this.setState({ password: event.target.value, invalid_password: false })
+        this.setState({password: event.target.value, invalid_password: false});
     }
 }
diff --git a/app/components/Wallet/BalanceClaimActive.jsx b/app/components/Wallet/BalanceClaimActive.jsx
index 4caad9987f..a52c916a0e 100644
--- a/app/components/Wallet/BalanceClaimActive.jsx
+++ b/app/components/Wallet/BalanceClaimActive.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import Immutable from "immutable";
 import cname from "classnames";
 import notify from "actions/NotificationActions";
@@ -18,99 +18,127 @@ class BalanceClaimActive extends Component {
     componentWillMount() {
         let keys = PrivateKeyStore.getState().keys;
         let keySeq = keys.keySeq();
-        BalanceClaimActiveActions.setPubkeys( keySeq );
+        BalanceClaimActiveActions.setPubkeys(keySeq);
         this.existing_keys = keySeq;
     }
 
     componentWillReceiveProps(nextProps) {
         let keys = PrivateKeyStore.getState().keys;
         let keySeq = keys.keySeq();
-        if( ! keySeq.equals(this.existing_keys)) {
+        if (!keySeq.equals(this.existing_keys)) {
             this.existing_keys = keySeq;
-            BalanceClaimActiveActions.setPubkeys( keySeq );
+            BalanceClaimActiveActions.setPubkeys(keySeq);
         }
     }
 
     render() {
-        if( !this.props.account_refs.size) {
+        if (!this.props.account_refs.size) {
             return (
                 <div>
-                    <h5><Translate content="wallet.no_balance" /></h5>
+                    <h5>
+                        <Translate content="wallet.no_balance" />
+                    </h5>
                 </div>
             );
         }
 
-        if( this.props.loading) {
+        if (this.props.loading) {
             return (
                 <div>
-                    <br/>
-                    <h5><Translate content="wallet.loading_balances"/>&hellip;</h5>
-                    <br/>
-                    <LoadingIndicator type="three-bounce"/>
+                    <br />
+                    <h5>
+                        <Translate content="wallet.loading_balances" />&hellip;
+                    </h5>
+                    <br />
+                    <LoadingIndicator type="three-bounce" />
                 </div>
             );
         }
 
-        if( !this.props.balances || !this.props.balances.size) {
+        if (!this.props.balances || !this.props.balances.size) {
             return (
                 <div>
-                    <br/>
-                    <h5><Translate content="wallet.no_balance" /></h5>
+                    <br />
+                    <h5>
+                        <Translate content="wallet.no_balance" />
+                    </h5>
                 </div>
             );
         }
 
-        let import_ready = this.props.selected_balances.size && this.props.claim_account_name;
-        let claim_balance_label = import_ready ?
-                ` (${this.props.claim_account_name})` :
-                null;
+        let import_ready =
+            this.props.selected_balances.size && this.props.claim_account_name;
+        let claim_balance_label = import_ready
+            ? ` (${this.props.claim_account_name})`
+            : null;
 
         return (
             <div>
                 <div className="content-block center-content">
-                    <h3 className="no-border-bottom"><Translate content="wallet.claim_balances" /></h3>
+                    <h3 className="no-border-bottom">
+                        <Translate content="wallet.claim_balances" />
+                    </h3>
                 </div>
                 <div className="grid-block vertical">
-                    <div className="grid-content" style={{overflowY:'hidden !important'}}>
+                    <div
+                        className="grid-content"
+                        style={{overflowY: "hidden !important"}}
+                    >
                         <div className="full-width-content center-content">
                             <MyAccounts
                                 key={this.props.balances}
-                                accounts={Immutable.List(this.props.account_refs)}
-                                onChange={this.onClaimAccountChange.bind(this)}/>
+                                accounts={Immutable.List(
+                                    this.props.account_refs
+                                )}
+                                onChange={this.onClaimAccountChange.bind(this)}
+                            />
                         </div>
-                        <br></br>
+                        <br />
                     </div>
-                    <br/>
-                    <BalanceClaimSelector/>
+                    <br />
+                    <BalanceClaimSelector />
+                </div>
+                <br />
+                <br />
+                <div
+                    className={cname("button success", {
+                        disabled: !import_ready
+                    })}
+                    onClick={this.onClaimBalance.bind(this)}
+                >
+                    <Translate content="wallet.claim_balance" />
+                    {claim_balance_label}
+                </div>
+                <div className="button cancel" onClick={this.onBack.bind(this)}>
+                    <Translate content="wallet.cancel" />
                 </div>
-                <br/><br/>
-                <div className={ cname("button success", {disabled: !import_ready}) }
-                    onClick={this.onClaimBalance.bind(this)}>
-                    <Translate content="wallet.claim_balance" />{claim_balance_label}</div>
-                <div className="button cancel" onClick={this.onBack.bind(this)}><Translate content="wallet.cancel" /></div>
             </div>
-        )
+        );
     }
 
     onBack(e) {
-        e.preventDefault()
-        window.history.back()
+        e.preventDefault();
+        window.history.back();
     }
 
     onClaimAccountChange(claim_account_name) {
-        BalanceClaimActiveActions.claimAccountChange(claim_account_name)
+        BalanceClaimActiveActions.claimAccountChange(claim_account_name);
     }
 
     onClaimBalance() {
-        WalletActions.importBalance( this.props.claim_account_name,
-            this.props.selected_balances, true //broadcast
-        ).catch((error)=> {
-            console.error("claimBalance", error)
-            let message = error
-            try { message = error.data.message } catch(e) {}
-            notify.error("Error claiming balance: " + message)
-            throw error
-        })
+        WalletActions.importBalance(
+            this.props.claim_account_name,
+            this.props.selected_balances,
+            true //broadcast
+        ).catch(error => {
+            console.error("claimBalance", error);
+            let message = error;
+            try {
+                message = error.data.message;
+            } catch (e) {}
+            notify.error("Error claiming balance: " + message);
+            throw error;
+        });
     }
 }
 
diff --git a/app/components/Wallet/BalanceClaimAssetTotal.jsx b/app/components/Wallet/BalanceClaimAssetTotal.jsx
index ad4732e790..5eb5b83d23 100644
--- a/app/components/Wallet/BalanceClaimAssetTotal.jsx
+++ b/app/components/Wallet/BalanceClaimAssetTotal.jsx
@@ -1,29 +1,39 @@
 import React, {Component} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import BalanceClaimActiveStore from "stores/BalanceClaimActiveStore";
 import FormattedAsset from "components/Utility/FormattedAsset";
 import Translate from "react-translate-component";
 
 class BalanceClaimAssetTotals extends Component {
     render() {
-
-        if( this.props.balances === undefined )
-            return <div><Translate content="wallet.loading_balances"/>&hellip;</div>;
+        if (this.props.balances === undefined)
+            return (
+                <div>
+                    <Translate content="wallet.loading_balances" />&hellip;
+                </div>
+            );
 
         var total_by_asset = this.props.balances
-            .groupBy( v => v.balance.asset_id )
-            .map( l => l.reduce( (r,v) => r + Number(v.balance.amount), 0 ));
+            .groupBy(v => v.balance.asset_id)
+            .map(l => l.reduce((r, v) => r + Number(v.balance.amount), 0));
 
-        if( ! total_by_asset.size)
-            return <div>None</div>;
+        if (!total_by_asset.size) return <div>None</div>;
 
-        return <div>
-            {total_by_asset.map( (total, asset_id) =>
-                <div key={asset_id}>
-                    <FormattedAsset color="info" amount={total} asset={asset_id} />
-                </div>
-            ).toArray()}
-        </div>;
+        return (
+            <div>
+                {total_by_asset
+                    .map((total, asset_id) => (
+                        <div key={asset_id}>
+                            <FormattedAsset
+                                color="info"
+                                amount={total}
+                                asset={asset_id}
+                            />
+                        </div>
+                    ))
+                    .toArray()}
+            </div>
+        );
     }
 }
 
diff --git a/app/components/Wallet/BalanceClaimByAsset.jsx b/app/components/Wallet/BalanceClaimByAsset.jsx
index 6a7987aebd..ce95c868d8 100644
--- a/app/components/Wallet/BalanceClaimByAsset.jsx
+++ b/app/components/Wallet/BalanceClaimByAsset.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import LoadingIndicator from "components/LoadingIndicator";
 import PrivateKeyStore from "stores/PrivateKeyStore";
 import BalanceClaimActiveStore from "stores/BalanceClaimActiveStore";
@@ -8,66 +8,74 @@ import FormattedAsset from "components/Utility/FormattedAsset";
 import Translate from "react-translate-component";
 
 class BalanceClaimByAsset extends Component {
-
     constructor() {
-        super()
+        super();
     }
 
-    static getStores() {
-
-    }
+    static getStores() {}
 
-    static getPropsFromStores() {
-
-    }
+    static getPropsFromStores() {}
 
     componentWillMount() {
-        var keys = PrivateKeyStore.getState().keys
-        var keySeq = keys.keySeq()
-        BalanceClaimActiveActions.setPubkeys( keySeq )
-        this.existing_keys = keySeq
+        var keys = PrivateKeyStore.getState().keys;
+        var keySeq = keys.keySeq();
+        BalanceClaimActiveActions.setPubkeys(keySeq);
+        this.existing_keys = keySeq;
     }
 
     componentWillReceiveProps(nextProps) {
-        var keys = PrivateKeyStore.getState().keys
-        var keySeq = keys.keySeq()
-        if( ! keySeq.equals(this.existing_keys)) {
-            this.existing_keys = keySeq
-            BalanceClaimActiveActions.setPubkeys( keySeq )
+        var keys = PrivateKeyStore.getState().keys;
+        var keySeq = keys.keySeq();
+        if (!keySeq.equals(this.existing_keys)) {
+            this.existing_keys = keySeq;
+            BalanceClaimActiveActions.setPubkeys(keySeq);
         }
     }
 
     render() {
-        if( this.props.loading || this.props.balances === undefined)
-            return <div className="center-content">
-                <p></p>
-                <h5><Translate content="wallet.loading_balances"/>&hellip;</h5>
-                <LoadingIndicator type="circle"/>
-            </div>
-
-        var content
-        if( ! this.props.total_by_asset.size)
-            content = <h5><Translate content="wallet.no_balance" /></h5>
+        if (this.props.loading || this.props.balances === undefined)
+            return (
+                <div className="center-content">
+                    <p />
+                    <h5>
+                        <Translate content="wallet.loading_balances" />&hellip;
+                    </h5>
+                    <LoadingIndicator type="circle" />
+                </div>
+            );
 
+        var content;
+        if (!this.props.total_by_asset.size)
+            content = (
+                <h5>
+                    <Translate content="wallet.no_balance" />
+                </h5>
+            );
         else {
-            var key = 0
-            content = <span>
-                <label>Unclaimed Balances</label>
-                {this.props.total_by_asset.map( (r, asset) =>
-                        <div key={key++}>
-                            <FormattedAsset color="info"
-                                amount={r.unclaimed + r.vesting.unclaimed}
-                                asset={asset}/>
-                        </div>
-                ).toArray()}
-                {this.props.children}
-            </span>
+            var key = 0;
+            content = (
+                <span>
+                    <label>Unclaimed Balances</label>
+                    {this.props.total_by_asset
+                        .map((r, asset) => (
+                            <div key={key++}>
+                                <FormattedAsset
+                                    color="info"
+                                    amount={r.unclaimed + r.vesting.unclaimed}
+                                    asset={asset}
+                                />
+                            </div>
+                        ))
+                        .toArray()}
+                    {this.props.children}
+                </span>
+            );
         }
-        return <div className="card">
-            <div className="card-content">
-                {content}
+        return (
+            <div className="card">
+                <div className="card-content">{content}</div>
             </div>
-        </div>
+        );
     }
 }
 
@@ -77,23 +85,31 @@ BalanceClaimByAsset = connect(BalanceClaimByAsset, {
     },
     getProps() {
         let props = BalanceClaimActiveStore.getState();
-        let { balances } = props;
-        if( balances !== undefined ) props.total_by_asset = balances
-            .groupBy( v => {
-                // K E Y S
-                return v.balance.asset_id;
-            })
-            .map( l => l.reduce( (r,v) => {
-                // V A L U E S
-                if(v.vested_balance != undefined) {
-                    r.vesting.unclaimed += Number(v.vested_balance.amount);
-                    r.vesting.total += Number(v.balance.amount);
-                } else {
-                    r.unclaimed += Number(v.balance.amount);
-                }
-                return r;
-            }, {unclaimed:0, vesting: {unclaimed:0, total:0} }))
-            .sortBy( k => k );
+        let {balances} = props;
+        if (balances !== undefined)
+            props.total_by_asset = balances
+                .groupBy(v => {
+                    // K E Y S
+                    return v.balance.asset_id;
+                })
+                .map(l =>
+                    l.reduce(
+                        (r, v) => {
+                            // V A L U E S
+                            if (v.vested_balance != undefined) {
+                                r.vesting.unclaimed += Number(
+                                    v.vested_balance.amount
+                                );
+                                r.vesting.total += Number(v.balance.amount);
+                            } else {
+                                r.unclaimed += Number(v.balance.amount);
+                            }
+                            return r;
+                        },
+                        {unclaimed: 0, vesting: {unclaimed: 0, total: 0}}
+                    )
+                )
+                .sortBy(k => k);
         return props;
     }
 });
diff --git a/app/components/Wallet/BalanceClaimSelector.jsx b/app/components/Wallet/BalanceClaimSelector.jsx
index ba609b46dc..19ce4f2f75 100644
--- a/app/components/Wallet/BalanceClaimSelector.jsx
+++ b/app/components/Wallet/BalanceClaimSelector.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import Immutable from "immutable";
 
 import PrivateKeyStore from "stores/PrivateKeyStore";
@@ -10,61 +10,95 @@ import Translate from "react-translate-component";
 
 class BalanceClaimSelector extends Component {
     componentWillReceiveProps(nextProps) {
-        if(nextProps.claim_account_name) this.onClaimAccount(nextProps.claim_account_name, nextProps.checked);
+        if (nextProps.claim_account_name)
+            this.onClaimAccount(
+                nextProps.claim_account_name,
+                nextProps.checked
+            );
     }
 
     render() {
-        if( this.props.balances === undefined || ! this.props.total_by_account_asset.size)
-            return <div></div>;
+        if (
+            this.props.balances === undefined ||
+            !this.props.total_by_account_asset.size
+        )
+            return <div />;
 
         let index = -1;
-        return <div>
-            <table className="table">
-                <thead>
-                <tr>
-                    <th>{ /* C H E C K B O X */ }</th>
-                    <th style={{textAlign: "center"}}><Translate content="wallet.unclaimed" /></th>
-                    <th style={{textAlign: "center"}}><Translate content="wallet.unclaimed_vesting" /></th>
-                    <th style={{textAlign: "center"}}><Translate content="account.name" /></th>
-                </tr></thead>
-                <tbody>
-                {this.props.total_by_account_asset.map( (r, name_asset) =>
-                    <tr key={++index}>
-                        <td>
-                            <input type="checkbox"
-                                checked={!!this.props.checked.get(index)}
-                                onChange={this.onCheckbox.bind(this, index, r.balances)} />
-                        </td>
-                        <td style={{textAlign: "right"}}>
-                        {r.unclaimed ?
-                            <FormattedAsset color="info"
-                                amount={r.unclaimed}
-                                asset={name_asset.get(1)}/>
-                        :null}
-                        </td>
-                        <td style={{textAlign: "right"}}>
-                        {r.vesting.unclaimed ? <div>
-                            <FormattedAsset color="info"
-                                amount={r.vesting.unclaimed}
-                                hide_asset={true}
-                                asset={name_asset.get(1)}/>
-                            <span> of </span>
-                            <FormattedAsset color="info"
-                                amount={r.vesting.total}
-                                asset={name_asset.get(1)}/>
-                        </div>:null}
-                        </td>
-                        <td> {name_asset.get(0)} </td>
-                    </tr>
-                ).toArray()}
-                </tbody>
-            </table>
-        </div>;
+        return (
+            <div>
+                <table className="table">
+                    <thead>
+                        <tr>
+                            <th>{/* C H E C K B O X */}</th>
+                            <th style={{textAlign: "center"}}>
+                                <Translate content="wallet.unclaimed" />
+                            </th>
+                            <th style={{textAlign: "center"}}>
+                                <Translate content="wallet.unclaimed_vesting" />
+                            </th>
+                            <th style={{textAlign: "center"}}>
+                                <Translate content="account.name" />
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {this.props.total_by_account_asset
+                            .map((r, name_asset) => (
+                                <tr key={++index}>
+                                    <td>
+                                        <input
+                                            type="checkbox"
+                                            checked={
+                                                !!this.props.checked.get(index)
+                                            }
+                                            onChange={this.onCheckbox.bind(
+                                                this,
+                                                index,
+                                                r.balances
+                                            )}
+                                        />
+                                    </td>
+                                    <td style={{textAlign: "right"}}>
+                                        {r.unclaimed ? (
+                                            <FormattedAsset
+                                                color="info"
+                                                amount={r.unclaimed}
+                                                asset={name_asset.get(1)}
+                                            />
+                                        ) : null}
+                                    </td>
+                                    <td style={{textAlign: "right"}}>
+                                        {r.vesting.unclaimed ? (
+                                            <div>
+                                                <FormattedAsset
+                                                    color="info"
+                                                    amount={r.vesting.unclaimed}
+                                                    hide_asset={true}
+                                                    asset={name_asset.get(1)}
+                                                />
+                                                <span> of </span>
+                                                <FormattedAsset
+                                                    color="info"
+                                                    amount={r.vesting.total}
+                                                    asset={name_asset.get(1)}
+                                                />
+                                            </div>
+                                        ) : null}
+                                    </td>
+                                    <td> {name_asset.get(0)} </td>
+                                </tr>
+                            ))
+                            .toArray()}
+                    </tbody>
+                </table>
+            </div>
+        );
     }
 
     onCheckbox(index, balances) {
         let checked = this.props.checked;
-        if(checked.get(index)) {
+        if (checked.get(index)) {
             checked = checked.delete(index);
         } else {
             checked = checked.set(index, balances);
@@ -76,16 +110,18 @@ class BalanceClaimSelector extends Component {
     onClaimAccount(claim_account_name, checked) {
         // A U T O  S E L E C T  A C C O U N T S
         // only if nothing is selected (play it safe)
-        if(checked.size) return;
+        if (checked.size) return;
         let index = -1;
-        this.props.total_by_account_asset.forEach( (v,k) => {
+        this.props.total_by_account_asset.forEach((v, k) => {
             index++;
             let name = k.get(0);
-            if(name === claim_account_name) {
-                if(v.unclaimed || v.vesting.unclaimed) checked = checked.set(index, v.balances);
+            if (name === claim_account_name) {
+                if (v.unclaimed || v.vesting.unclaimed)
+                    checked = checked.set(index, v.balances);
             }
         });
-        if(checked.size) BalanceClaimActiveActions.setSelectedBalanceClaims(checked);
+        if (checked.size)
+            BalanceClaimActiveActions.setSelectedBalanceClaims(checked);
     }
 }
 
@@ -95,45 +131,74 @@ BalanceClaimSelector = connect(BalanceClaimSelector, {
     },
     getProps() {
         let props = BalanceClaimActiveStore.getState();
-        let { balances, address_to_pubkey } = props;
+        let {balances, address_to_pubkey} = props;
         let private_keys = PrivateKeyStore.getState().keys;
         let groupCountMap = Immutable.Map().asMutable();
         let groupCount = (group, distinct) => {
             let set = groupCountMap.get(group);
-            if( ! set) {
+            if (!set) {
                 set = Immutable.Set().asMutable();
                 groupCountMap.set(group, set);
             }
             set.add(distinct);
             return set.size;
         };
-        if ( balances ) props.total_by_account_asset = balances
-            .groupBy( v => {
-                // K E Y S
-                let names = "";
-                let pubkey = address_to_pubkey.get(v.owner);
-                let private_key_object = private_keys.get(pubkey);
-                // Imported Account Names (just a visual aid, helps to auto select a real account)
-                if(private_key_object && private_key_object.import_account_names) names = private_key_object.import_account_names.join(", ");
+        if (balances)
+            props.total_by_account_asset = balances
+                .groupBy(v => {
+                    // K E Y S
+                    let names = "";
+                    let pubkey = address_to_pubkey.get(v.owner);
+                    let private_key_object = private_keys.get(pubkey);
+                    // Imported Account Names (just a visual aid, helps to auto select a real account)
+                    if (
+                        private_key_object &&
+                        private_key_object.import_account_names
+                    )
+                        names = private_key_object.import_account_names.join(
+                            ", "
+                        );
 
-                // Signing is very slow, further divide the groups based on the number of signatures required
-                let batch_number = Math.ceil( groupCount(Immutable.List([names, v.balance.asset_id]), v.owner) / 60 );
-                let name_asset_key = Immutable.List([names, v.balance.asset_id, batch_number]);
-                return name_asset_key;
-            })
-            .map( l => l.reduce( (r,v) => {
-                // V A L U E S
-                v.public_key_string = address_to_pubkey.get(v.owner);
-                r.balances = r.balances.add(v);
-                if(v.vested_balance != undefined) {
-                    r.vesting.unclaimed += Number(v.vested_balance.amount);
-                    r.vesting.total += Number(v.balance.amount);
-                } else {
-                    r.unclaimed += Number(v.balance.amount);
-                }
-                return r;
-            }, {unclaimed:0, vesting: {unclaimed:0, total:0}, balances: Immutable.Set() }))
-            .sortBy( k => k );
+                    // Signing is very slow, further divide the groups based on the number of signatures required
+                    let batch_number = Math.ceil(
+                        groupCount(
+                            Immutable.List([names, v.balance.asset_id]),
+                            v.owner
+                        ) / 60
+                    );
+                    let name_asset_key = Immutable.List([
+                        names,
+                        v.balance.asset_id,
+                        batch_number
+                    ]);
+                    return name_asset_key;
+                })
+                .map(l =>
+                    l.reduce(
+                        (r, v) => {
+                            // V A L U E S
+                            v.public_key_string = address_to_pubkey.get(
+                                v.owner
+                            );
+                            r.balances = r.balances.add(v);
+                            if (v.vested_balance != undefined) {
+                                r.vesting.unclaimed += Number(
+                                    v.vested_balance.amount
+                                );
+                                r.vesting.total += Number(v.balance.amount);
+                            } else {
+                                r.unclaimed += Number(v.balance.amount);
+                            }
+                            return r;
+                        },
+                        {
+                            unclaimed: 0,
+                            vesting: {unclaimed: 0, total: 0},
+                            balances: Immutable.Set()
+                        }
+                    )
+                )
+                .sortBy(k => k);
         return props;
     }
 });
diff --git a/app/components/Wallet/Brainkey.jsx b/app/components/Wallet/Brainkey.jsx
index 97fc4fd39b..368609501e 100644
--- a/app/components/Wallet/Brainkey.jsx
+++ b/app/components/Wallet/Brainkey.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import Immutable from "immutable";
 import cname from "classnames";
 import BrainkeyActions from "actions/BrainkeyActions";
@@ -27,9 +27,11 @@ class Brainkey extends Component {
     render() {
         return (
             <span>
-                <h3><Translate content="wallet.brainkey" /></h3>
+                <h3>
+                    <Translate content="wallet.brainkey" />
+                </h3>
                 <BrainkeyInputAccept>
-                    <ViewBrainkey/>
+                    <ViewBrainkey />
                 </BrainkeyInputAccept>
             </span>
         );
@@ -42,65 +44,80 @@ class ViewBrainkey extends Component {
     render() {
         let short_brnkey = this.props.brnkey.substring(0, 10);
         // console.log("this.props.account_ids.toArray()", this.props.account_ids.toArray())
-        return <span>
-            <div><span className="">{short_brnkey}</span>&hellip;</div>
-            <p></p>
-            {this.props.account_ids.size?
-            <BrainkeyAccounts accounts={Immutable.List(this.props.account_ids.toArray())}/>:
-            <h5><Translate content="wallet.no_accounts" /></h5>}
-        </span>;
+        return (
+            <span>
+                <div>
+                    <span className="">{short_brnkey}</span>&hellip;
+                </div>
+                <p />
+                {this.props.account_ids.size ? (
+                    <BrainkeyAccounts
+                        accounts={Immutable.List(
+                            this.props.account_ids.toArray()
+                        )}
+                    />
+                ) : (
+                    <h5>
+                        <Translate content="wallet.no_accounts" />
+                    </h5>
+                )}
+            </span>
+        );
     }
 }
 ViewBrainkey = connect(ViewBrainkey, connectObject);
 
 class BrainkeyAccounts {
-
     static propTypes = {
         accounts: ChainTypes.ChainAccountsList.isRequired
-    }
+    };
 
     render() {
-        let rows = pairs(this.props.accounts).filter( account => !!account[1] )
-            .map( account => account[1].get("name") ).sort()
-            .map( name => <AccountCard key={name} account={name}/> );
-        return <span>
-            {rows}
-        </span>;
+        let rows = pairs(this.props.accounts)
+            .filter(account => !!account[1])
+            .map(account => account[1].get("name"))
+            .sort()
+            .map(name => <AccountCard key={name} account={name} />);
+        return <span>{rows}</span>;
     }
 }
 BrainkeyAccounts = BindToChainState(BrainkeyAccounts, {keep_updating: true});
 
 export class BrainkeyInputAccept extends Component {
-
     constructor() {
         super();
-        this.state = { brnkey: "", accept: false };
+        this.state = {brnkey: "", accept: false};
     }
 
     render() {
-        if(this.state.accept) return <span>{this.props.children}</span>;
+        if (this.state.accept) return <span>{this.props.children}</span>;
 
         let ready = this.state.brnkey && this.state.brnkey !== "";
         return (
             <span className="grid-container">
                 <div>
-                    <BrainkeyInput onChange={this.onBrainkeyChange.bind(this)}/>
+                    <BrainkeyInput
+                        onChange={this.onBrainkeyChange.bind(this)}
+                    />
+                </div>
+                <div
+                    className={cname("button success", {disabled: !ready})}
+                    onClick={this.onAccept.bind(this)}
+                >
+                    <Translate content="wallet.accept" />
                 </div>
-                <div className={cname("button success", {disabled: ! ready})}
-                    onClick={this.onAccept.bind(this)}><Translate content="wallet.accept" /></div>
             </span>
         );
     }
 
     onBrainkeyChange(brnkey) {
-        this.setState({ brnkey });
+        this.setState({brnkey});
     }
 
     onAccept() {
         this.setState({accept: true});
         BrainkeyActions.setBrainkey(this.state.brnkey);
     }
-
 }
 
 // <div onClick={this.onLookupAccounts.bind(this)} className="button success">Lookup Accounts</div>
diff --git a/app/components/Wallet/BrainkeyInput.jsx b/app/components/Wallet/BrainkeyInput.jsx
index bf2df19e45..2c7e508a73 100644
--- a/app/components/Wallet/BrainkeyInput.jsx
+++ b/app/components/Wallet/BrainkeyInput.jsx
@@ -5,11 +5,12 @@ import {hash, key} from "bitsharesjs/es";
 var dictionary_set;
 
 if (__ELECTRON__) {
-    dictionary_set = new Set(require("json-loader!common/dictionary_en.json").en.split(","));
+    dictionary_set = new Set(
+        require("json-loader!common/dictionary_en.json").en.split(",")
+    );
 }
 
 export default class BrainkeyInput extends Component {
-
     static propTypes = {
         onChange: PropTypes.func.isRequired
     };
@@ -24,17 +25,18 @@ export default class BrainkeyInput extends Component {
 
     componentWillMount() {
         if (!__ELECTRON__) {
-            fetch(`${__BASE_URL__}dictionary.json`).then( (reply) => {
-                return reply.json().then(result => {
-                    dictionary_set = new Set(result.en.split(","));
-                    this.setState({
-                        loading: false
+            fetch(`${__BASE_URL__}dictionary.json`)
+                .then(reply => {
+                    return reply.json().then(result => {
+                        dictionary_set = new Set(result.en.split(","));
+                        this.setState({
+                            loading: false
+                        });
                     });
+                })
+                .catch(err => {
+                    console.log("fetch dictionary error:", err);
                 });
-            })
-            .catch(err => {
-                console.log("fetch dictionary error:", err);
-            });
         } else {
             this.setState({
                 loading: false
@@ -43,31 +45,42 @@ export default class BrainkeyInput extends Component {
     }
 
     _checkBrainKey() {
-        let spellcheck_words = this.state.brnkey.split(" ")
-        let checked_words = []
-        spellcheck_words.forEach( (word, i) => {
-            if(word === "") return
-            let spellcheckword = word.toLowerCase()
-            spellcheckword = spellcheckword.match(/[a-z]+/) //just spellcheck letters
-            if(spellcheckword === null || dictionary_set.has(spellcheckword[0]))
-                checked_words.push(<span key={i} style={{padding: '1px', margin: '1px'}}>{word}</span>)
+        let spellcheck_words = this.state.brnkey.split(" ");
+        let checked_words = [];
+        spellcheck_words.forEach((word, i) => {
+            if (word === "") return;
+            let spellcheckword = word.toLowerCase();
+            spellcheckword = spellcheckword.match(/[a-z]+/); //just spellcheck letters
+            if (
+                spellcheckword === null ||
+                dictionary_set.has(spellcheckword[0])
+            )
+                checked_words.push(
+                    <span key={i} style={{padding: "1px", margin: "1px"}}>
+                        {word}
+                    </span>
+                );
             else
-                checked_words.push(<MisspelledWord key={i}>{word}</MisspelledWord>)
-        })
+                checked_words.push(
+                    <MisspelledWord key={i}>{word}</MisspelledWord>
+                );
+        });
         // this.ready = checked_words.length > 0
         let word_count_label;
         let warn = true;
         let valid = true;
-        if(checked_words.length > 0) {
-            if(this.state.brnkey.length < 50) {
-                word_count_label = this.state.brnkey.length + " characters (50 minimum)";
+        if (checked_words.length > 0) {
+            if (this.state.brnkey.length < 50) {
+                word_count_label =
+                    this.state.brnkey.length + " characters (50 minimum)";
                 valid = false;
             } else {
-                if(checked_words.length < 16)
-                    word_count_label = checked_words.length + " words (16 recommended)"
+                if (checked_words.length < 16)
+                    word_count_label =
+                        checked_words.length + " words (16 recommended)";
                 else {
-                    word_count_label = checked_words.length + " words"
-                    warn = false
+                    word_count_label = checked_words.length + " words";
+                    warn = false;
                 }
             }
         }
@@ -77,7 +90,7 @@ export default class BrainkeyInput extends Component {
 
     render() {
         if (this.state.loading || !dictionary_set) {
-            return <div style={{padding: 20}}>Fetching dictionary....</div>
+            return <div style={{padding: 20}}>Fetching dictionary....</div>;
         }
 
         let {warn, word_count_label, checked_words} = this._checkBrainKey();
@@ -86,32 +99,52 @@ export default class BrainkeyInput extends Component {
             <span className="">
                 <div>
                     <textarea
-                        tabIndex={this.props.tabIndex || 1}
+                        tabIndex={this.props.tabIndex || 1}
                         onChange={this.formChange.bind(this)}
-                        value={this.state.brnkey} id="brnkey"
-                        style={{height: 100, minWidth: 450}} />
-                    <div style={{textAlign: "left"}} className="grid-content no-padding no-overflow">{ checked_words }</div>
-                    { this.state.check_digits && ! this.props.hideCheckDigits ? <div>
-                        <br/>
-                        <pre className="no-overflow">{this.state.check_digits} * Check Digits</pre>
-                        <br/>
-                    </div>:null}
-                    <p><i className={cname({error: warn})}>{ word_count_label }</i></p>
+                        value={this.state.brnkey}
+                        id="brnkey"
+                        style={{height: 100, minWidth: 450}}
+                    />
+                    <div
+                        style={{textAlign: "left"}}
+                        className="grid-content no-padding no-overflow"
+                    >
+                        {checked_words}
+                    </div>
+                    {this.state.check_digits && !this.props.hideCheckDigits ? (
+                        <div>
+                            <br />
+                            <pre className="no-overflow">
+                                {this.state.check_digits} * Check Digits
+                            </pre>
+                            <br />
+                        </div>
+                    ) : null}
+                    <p>
+                        <i className={cname({error: warn})}>
+                            {word_count_label}
+                        </i>
+                    </p>
                 </div>
             </span>
-        )
+        );
     }
 
     formChange(event) {
         var {id, value} = event.target;
         let {valid} = this._checkBrainKey();
-        var state = {}
-        state[id] = value
-        if(id === "brnkey") {
-            var brnkey = key.normalize_brainKey(value)
-            this.props.onChange( brnkey.length < 50 ? null : brnkey )
-            state.check_digits = brnkey.length < 50 ? null :
-                hash.sha1(brnkey).toString('hex').substring(0,4)
+        var state = {};
+        state[id] = value;
+        if (id === "brnkey") {
+            var brnkey = key.normalize_brainKey(value);
+            this.props.onChange(brnkey.length < 50 ? null : brnkey);
+            state.check_digits =
+                brnkey.length < 50
+                    ? null
+                    : hash
+                          .sha1(brnkey)
+                          .toString("hex")
+                          .substring(0, 4);
         }
         this.setState(state);
 
@@ -123,10 +156,18 @@ export default class BrainkeyInput extends Component {
 
 class MisspelledWord extends Component {
     render() {
-        return <span style={{borderBottom: '1px dotted #ff0000', padding: '1px', margin: '1px'}}>
-            <span style={{borderBottom: '1px dotted #ff0000'}}>
-                {this.props.children}
+        return (
+            <span
+                style={{
+                    borderBottom: "1px dotted #ff0000",
+                    padding: "1px",
+                    margin: "1px"
+                }}
+            >
+                <span style={{borderBottom: "1px dotted #ff0000"}}>
+                    {this.props.children}
+                </span>
             </span>
-        </span>
+        );
     }
 }
diff --git a/app/components/Wallet/ExistingAccount.jsx b/app/components/Wallet/ExistingAccount.jsx
index 0db0e4b1ce..bf1ece1964 100644
--- a/app/components/Wallet/ExistingAccount.jsx
+++ b/app/components/Wallet/ExistingAccount.jsx
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {Link} from "react-router/es";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import WalletManagerStore from "stores/WalletManagerStore";
 import BalanceClaimActive from "components/Wallet/BalanceClaimActive";
 import Translate from "react-translate-component";
@@ -23,10 +23,18 @@ class ExistingAccount extends Component {
                 <div className="grid-content">
                     <div className="content-block center-content">
                         <div className="page-header">
-                            <h1><Translate content="account.welcome" /></h1>
-                            {!has_wallet ?
-                                <h3><Translate content="wallet.create_wallet_backup" /></h3> :
-                                <h3><Translate content="wallet.setup_wallet" /></h3>}
+                            <h1>
+                                <Translate content="account.welcome" />
+                            </h1>
+                            {!has_wallet ? (
+                                <h3>
+                                    <Translate content="wallet.create_wallet_backup" />
+                                </h3>
+                            ) : (
+                                <h3>
+                                    <Translate content="wallet.setup_wallet" />
+                                </h3>
+                            )}
                         </div>
                         <div className="content-block">
                             {this.props.children}
@@ -40,32 +48,49 @@ class ExistingAccount extends Component {
 ExistingAccount = connect(ExistingAccount, connectObject);
 
 class ExistingAccountOptions extends Component {
-
     render() {
         const has_wallet = this.props.wallet.wallet_names.count() != 0;
         return (
             <span>
-                {!has_wallet ? <div>
-                    <Link to="existing-account/import-backup"><Translate content="wallet.import_backup" /></Link><br/><br/>
-                    <Link to="existing-account/import-keys"><Translate content="wallet.import_bts1" /></Link><br/><br/>
-                    <Link to="existing-account/import-keys"><Translate content="wallet.create_wallet" /></Link><br/>
-                    <hr/>
-                </div> : null}
+                {!has_wallet ? (
+                    <div>
+                        <Link to="existing-account/import-backup">
+                            <Translate content="wallet.import_backup" />
+                        </Link>
+                        <br />
+                        <br />
+                        <Link to="existing-account/import-keys">
+                            <Translate content="wallet.import_bts1" />
+                        </Link>
+                        <br />
+                        <br />
+                        <Link to="existing-account/import-keys">
+                            <Translate content="wallet.create_wallet" />
+                        </Link>
+                        <br />
+                        <hr />
+                    </div>
+                ) : null}
 
-                {!has_wallet ? null : <BalanceClaimActive/>}
+                {!has_wallet ? null : <BalanceClaimActive />}
 
-                {has_wallet ? <span>
-                    <Link to="dashboard">
-                        <div className="button outline">
-                            <Translate component="span" content="header.dashboard" />
-                        </div>
-                    </Link>
-                    <Link to="wallet">
-                        <div className="button outline">
-                            <Translate content="settings.wallets" />
-                        </div>
-                    </Link>
-                </span>:null}
+                {has_wallet ? (
+                    <span>
+                        <Link to="dashboard">
+                            <div className="button outline">
+                                <Translate
+                                    component="span"
+                                    content="header.dashboard"
+                                />
+                            </div>
+                        </Link>
+                        <Link to="wallet">
+                            <div className="button outline">
+                                <Translate content="settings.wallets" />
+                            </div>
+                        </Link>
+                    </span>
+                ) : null}
             </span>
         );
     }
diff --git a/app/components/Wallet/ImportKeys.jsx b/app/components/Wallet/ImportKeys.jsx
index abc8d4d8ed..9730287786 100644
--- a/app/components/Wallet/ImportKeys.jsx
+++ b/app/components/Wallet/ImportKeys.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import cname from "classnames";
 import notify from "actions/NotificationActions";
 import {PrivateKey, Aes, PublicKey, hash} from "bitsharesjs/es";
@@ -24,12 +24,11 @@ require("./ImportKeys.scss");
 let import_keys_assert_checking = false;
 
 const KeyCount = ({key_count}) => {
-    if( !key_count) return <span/>;
+    if (!key_count) return <span />;
     return <span>Found {key_count} private keys</span>;
 };
 
 class ImportKeys extends Component {
-
     constructor() {
         super();
         this.state = this._getInitialState();
@@ -43,12 +42,14 @@ class ImportKeys extends Component {
 
     _getInitialState(keep_file_name = false) {
         return {
-            keys_to_account: { },
+            keys_to_account: {},
             no_file: true,
             account_keys: [],
             //brainkey: null,
             //encrypted_brainkey: null,
-            reset_file_name: keep_file_name ? this.state.reset_file_name : Date.now(),
+            reset_file_name: keep_file_name
+                ? this.state.reset_file_name
+                : Date.now(),
             reset_password: Date.now(),
             password_checksum: null,
             import_file_message: null,
@@ -63,9 +64,9 @@ class ImportKeys extends Component {
     }
 
     reset(e, keep_file_name) {
-        if(e) e.preventDefault();
+        if (e) e.preventDefault();
         let state = this._getInitialState(keep_file_name);
-        this.setState(state, ()=> this.updateOnChange());
+        this.setState(state, () => this.updateOnChange());
     }
 
     onWif(event) {
@@ -75,19 +76,21 @@ class ImportKeys extends Component {
     }
 
     onCancel(e) {
-        if(e) e.preventDefault();
+        if (e) e.preventDefault();
         this.setState(this._getInitialState());
     }
 
     updateOnChange() {
-        BalanceClaimActiveActions.setPubkeys(Object.keys(this.state.imported_keys_public));
+        BalanceClaimActiveActions.setPubkeys(
+            Object.keys(this.state.imported_keys_public)
+        );
     }
 
     getImportAccountKeyCount(keys_to_account) {
         let account_keycount = {};
         let found = false;
-        for(let key in keys_to_account)
-            for(let account_name of keys_to_account[key].account_names) {
+        for (let key in keys_to_account)
+            for (let account_name of keys_to_account[key].account_names) {
                 account_keycount[account_name] =
                     (account_keycount[account_name] || 0) + 1;
                 found = true;
@@ -107,28 +110,32 @@ class ImportKeys extends Component {
                     json_contents = JSON.parse(contents);
                     // This is the only chance to encounter a large file,
                     // try this format first.
-                    this._parseImportKeyUpload(json_contents, file.name, update_state => {
-                        // console.log("update_state", update_state)
-                        this.setState(update_state, ()=> {
-                            if( update_state.genesis_filter_finished ) {
-                                // try empty password, also display "Enter import file password"
-                                this._passwordCheck();
-                            }
-                        });
-                    });
-                } catch(e) {
+                    this._parseImportKeyUpload(
+                        json_contents,
+                        file.name,
+                        update_state => {
+                            // console.log("update_state", update_state)
+                            this.setState(update_state, () => {
+                                if (update_state.genesis_filter_finished) {
+                                    // try empty password, also display "Enter import file password"
+                                    this._passwordCheck();
+                                }
+                            });
+                        }
+                    );
+                } catch (e) {
                     //DEBUG console.log("... _parseImportKeyUpload",e)
                     try {
-                        if( ! json_contents) file.name + " is an unrecognized format";
+                        if (!json_contents)
+                            file.name + " is an unrecognized format";
                         this._parseWalletJson(json_contents);
-                    } catch(ee) {
-                        if( ! this.addByPattern(contents))
-                            throw ee;
+                    } catch (ee) {
+                        if (!this.addByPattern(contents)) throw ee;
                     }
                     // try empty password, also display "Enter import file password"
                     this._passwordCheck();
                 }
-            } catch(message) {
+            } catch (message) {
                 console.error("... ImportKeys upload error", message);
                 this.setState({import_file_message: message});
             }
@@ -141,82 +148,107 @@ class ImportKeys extends Component {
         let password_checksum, unfiltered_account_keys;
         try {
             password_checksum = json_contents.password_checksum;
-            if( ! password_checksum)
+            if (!password_checksum)
                 throw file_name + " is an unrecognized format";
 
-            if( ! Array.isArray(json_contents.account_keys))
+            if (!Array.isArray(json_contents.account_keys))
                 throw file_name + " is an unrecognized format";
 
             unfiltered_account_keys = json_contents.account_keys;
-
-        } catch(e) { throw e.message || e; }
+        } catch (e) {
+            throw e.message || e;
+        }
 
         // BTS 1.0 wallets may have a lot of generated but unused keys or spent TITAN addresses making
         // wallets so large it is was not possible to use the JavaScript wallets with them.
 
-        let genesis_filter = new GenesisFilter;
-        if( ! genesis_filter.isAvailable() ) {
-            update_state({ password_checksum, account_keys: unfiltered_account_keys,
-                genesis_filter_finished: true, genesis_filtering: false });
+        let genesis_filter = new GenesisFilter();
+        if (!genesis_filter.isAvailable()) {
+            update_state({
+                password_checksum,
+                account_keys: unfiltered_account_keys,
+                genesis_filter_finished: true,
+                genesis_filtering: false
+            });
             return;
         }
-        this.setState({ genesis_filter_initalizing: true }, ()=>// setTimeout(()=>
-            genesis_filter.init(()=> {
-                let filter_status = this.state.genesis_filter_status;
-
-                // FF < version 41 does not support worker threads internals (like blob urls)
-                // let GenesisFilterWorker = require("worker-loader!workers/GenesisFilterWorker")
-                // let worker = new GenesisFilterWorker
-                // worker.postMessage({
-                //     account_keys: unfiltered_account_keys,
-                //     bloom_filter: genesis_filter.bloom_filter
-                // })
-                // worker.onmessage = event => { try {
-                //     let { status, account_keys } = event.data
-                //     // ...
-                // } catch( e ) { console.error('GenesisFilterWorker', e) }}
-
-                let account_keys = unfiltered_account_keys;
-                genesis_filter.filter( account_keys, status => {
-                    //console.log("import filter", status)
-                    if( status.error === "missing_public_keys" ) {
-                        console.error("un-released format, just for testing");
-                        update_state({ password_checksum, account_keys: unfiltered_account_keys,
-                            genesis_filter_finished: true, genesis_filtering: false });
-                        return;
-                    }
-                    if( status.success ) {
-                        // let { account_keys } = event.data // if using worker thread
-                        update_state({ password_checksum, account_keys,
-                            genesis_filter_finished: true, genesis_filtering: false });
-                        return;
-                    }
-                    if( status.initalizing !== undefined ) {
-                        update_state({ genesis_filter_initalizing: status.initalizing, genesis_filtering: true });
-                        return;
-                    }
-                    if( status.importing === undefined ) {
-                        // programmer error
-                        console.error("unknown status", status);
-                        return;
-                    }
-                    if( ! filter_status.length )
-                        // first account
-                        filter_status.push( status );
-                    else {
-                        let last_account_name = filter_status[filter_status.length - 1].account_name;
-                        if( last_account_name === status.account_name )
-                            // update same account
-                            filter_status[filter_status.length - 1] = status;
-                        else
-                            // new account
-                            filter_status.push( status );
-                    }
-                    update_state({ genesis_filter_status: filter_status });
-                });
-            })
-        //, 100)
-    );
+        this.setState(
+            {genesis_filter_initalizing: true},
+            () =>
+                // setTimeout(()=>
+                genesis_filter.init(() => {
+                    let filter_status = this.state.genesis_filter_status;
+
+                    // FF < version 41 does not support worker threads internals (like blob urls)
+                    // let GenesisFilterWorker = require("worker-loader!workers/GenesisFilterWorker")
+                    // let worker = new GenesisFilterWorker
+                    // worker.postMessage({
+                    //     account_keys: unfiltered_account_keys,
+                    //     bloom_filter: genesis_filter.bloom_filter
+                    // })
+                    // worker.onmessage = event => { try {
+                    //     let { status, account_keys } = event.data
+                    //     // ...
+                    // } catch( e ) { console.error('GenesisFilterWorker', e) }}
+
+                    let account_keys = unfiltered_account_keys;
+                    genesis_filter.filter(account_keys, status => {
+                        //console.log("import filter", status)
+                        if (status.error === "missing_public_keys") {
+                            console.error(
+                                "un-released format, just for testing"
+                            );
+                            update_state({
+                                password_checksum,
+                                account_keys: unfiltered_account_keys,
+                                genesis_filter_finished: true,
+                                genesis_filtering: false
+                            });
+                            return;
+                        }
+                        if (status.success) {
+                            // let { account_keys } = event.data // if using worker thread
+                            update_state({
+                                password_checksum,
+                                account_keys,
+                                genesis_filter_finished: true,
+                                genesis_filtering: false
+                            });
+                            return;
+                        }
+                        if (status.initalizing !== undefined) {
+                            update_state({
+                                genesis_filter_initalizing: status.initalizing,
+                                genesis_filtering: true
+                            });
+                            return;
+                        }
+                        if (status.importing === undefined) {
+                            // programmer error
+                            console.error("unknown status", status);
+                            return;
+                        }
+                        if (!filter_status.length)
+                            // first account
+                            filter_status.push(status);
+                        else {
+                            let last_account_name =
+                                filter_status[filter_status.length - 1]
+                                    .account_name;
+                            if (last_account_name === status.account_name)
+                                // update same account
+                                filter_status[
+                                    filter_status.length - 1
+                                ] = status;
+                            else
+                                // new account
+                                filter_status.push(status);
+                        }
+                        update_state({genesis_filter_status: filter_status});
+                    });
+                })
+            //, 100)
+        );
     }
 
     /**
@@ -236,10 +268,12 @@ class ImportKeys extends Component {
         let address_to_enckeys = {};
         let account_addresses = {};
 
-        let savePubkeyAccount = function (pubkey, account_name) {
+        let savePubkeyAccount = function(pubkey, account_name) {
             //replace BTS with GPH
             pubkey = ChainConfig.address_prefix + pubkey.substring(3);
-            let address = PublicKey.fromPublicKeyString(pubkey).toAddressString();
+            let address = PublicKey.fromPublicKeyString(
+                pubkey
+            ).toAddressString();
             let addresses = account_addresses[account_name] || [];
             address = "BTS" + address.substring(3);
             //DEBUG console.log("... address",address,account_name)
@@ -248,13 +282,13 @@ class ImportKeys extends Component {
         };
 
         try {
-            if(! Array.isArray(json_contents)) {
+            if (!Array.isArray(json_contents)) {
                 //DEBUG console.log('... json_contents',json_contents)
                 throw new Error("Invalid wallet format");
             }
-            for(let element of json_contents) {
-
-                if( "key_record_type" == element.type &&
+            for (let element of json_contents) {
+                if (
+                    "key_record_type" == element.type &&
                     element.data.account_address &&
                     element.data.encrypted_private_key
                 ) {
@@ -266,52 +300,53 @@ class ImportKeys extends Component {
                     continue;
                 }
 
-                if( "account_record_type" == element.type) {
+                if ("account_record_type" == element.type) {
                     let account_name = element.data.name;
                     savePubkeyAccount(element.data.owner_key, account_name);
-                    for(let history of element.data.active_key_history) {
+                    for (let history of element.data.active_key_history) {
                         savePubkeyAccount(history[1], account_name);
                     }
                     continue;
                 }
 
-                if ( "property_record_type" == element.type &&
+                if (
+                    "property_record_type" == element.type &&
                     "encrypted_brainkey" == element.data.key
                 ) {
                     encrypted_brainkey = element.data.value;
                     continue;
                 }
 
-                if( "master_key_record_type" == element.type) {
-                    if( ! element.data)
+                if ("master_key_record_type" == element.type) {
+                    if (!element.data)
                         throw file.name + " invalid master_key_record record";
 
-                    if( ! element.data.checksum)
-                        throw file.name + " is missing master_key_record checksum";
+                    if (!element.data.checksum)
+                        throw file.name +
+                            " is missing master_key_record checksum";
 
                     password_checksum = element.data.checksum;
                 }
-
             }
-            if( ! encrypted_brainkey)
+            if (!encrypted_brainkey)
                 throw "Please use a BTS 1.0 wallet_export_keys file instead";
 
-            if( ! password_checksum)
+            if (!password_checksum)
                 throw file.name + " is missing password_checksum";
 
-            if( ! enckeys.length)
+            if (!enckeys.length)
                 throw file.name + " does not contain any private keys";
-
-        } catch(e) { throw e.message || e; }
+        } catch (e) {
+            throw e.message || e;
+        }
 
         let account_keys = [];
-        for(let account_name in account_addresses) {
+        for (let account_name in account_addresses) {
             let encrypted_private_keys = [];
-            for(let address of account_addresses[account_name]) {
+            for (let address of account_addresses[account_name]) {
                 let enckeys = address_to_enckeys[address];
-                if( ! enckeys) continue;
-                for(let enckey of enckeys)
-                    encrypted_private_keys.push(enckey);
+                if (!enckeys) continue;
+                for (let enckey of enckeys) encrypted_private_keys.push(enckey);
             }
             account_keys.push({
                 account_name,
@@ -337,89 +372,124 @@ class ImportKeys extends Component {
         let password = pwNode ? pwNode.value : "";
         let checksum = this.state.password_checksum;
         let new_checksum = hash.sha512(hash.sha512(password)).toString("hex");
-        if(checksum != new_checksum) {
+        if (checksum != new_checksum) {
             return this.setState({
                 no_file: false,
-                import_password_message: password.length ? "Incorrect password" : null
+                import_password_message: password.length
+                    ? "Incorrect password"
+                    : null
             });
-
         }
-        this.setState({
-            no_file: false,
-            reset_password: Date.now(),
-            import_password_message: counterpart.translate("wallet.import_pass_match")
-        }, ()=> this._decryptPrivateKeys(password));
+        this.setState(
+            {
+                no_file: false,
+                reset_password: Date.now(),
+                import_password_message: counterpart.translate(
+                    "wallet.import_pass_match"
+                )
+            },
+            () => this._decryptPrivateKeys(password)
+        );
         // setTimeout(, 250)
     }
 
     _decryptPrivateKeys(password) {
         let password_aes = Aes.fromSeed(password);
         let format_error1_once = true;
-        for(let account of this.state.account_keys) {
-            if(! account.encrypted_private_keys) {
-                let error = `Account ${account.account_name} missing encrypted_private_keys`;
+        for (let account of this.state.account_keys) {
+            if (!account.encrypted_private_keys) {
+                let error = `Account ${
+                    account.account_name
+                } missing encrypted_private_keys`;
                 console.error(error);
-                if(format_error1_once) {
+                if (format_error1_once) {
                     notify.error(error);
                     format_error1_once = false;
                 }
                 continue;
             }
             let account_name = account.account_name.trim();
-            let same_prefix_regex = new RegExp("^" + ChainConfig.address_prefix);
-            for(let i = 0; i < account.encrypted_private_keys.length; i++) {
+            let same_prefix_regex = new RegExp(
+                "^" + ChainConfig.address_prefix
+            );
+            for (let i = 0; i < account.encrypted_private_keys.length; i++) {
                 let encrypted_private = account.encrypted_private_keys[i];
-                let public_key_string = account.public_keys ?
-                    account.public_keys[i] : null; // performance gain
+                let public_key_string = account.public_keys
+                    ? account.public_keys[i]
+                    : null; // performance gain
 
                 try {
-                    let private_plainhex = password_aes.decryptHex(encrypted_private);
-                    if(import_keys_assert_checking && public_key_string) {
-                        let private_key = PrivateKey.fromHex( private_plainhex );
+                    let private_plainhex = password_aes.decryptHex(
+                        encrypted_private
+                    );
+                    if (import_keys_assert_checking && public_key_string) {
+                        let private_key = PrivateKey.fromHex(private_plainhex);
                         let pub = private_key.toPublicKey(); // S L O W
                         let addy = pub.toAddressString();
                         let pubby = pub.toPublicKeyString();
                         let error = "";
 
-                        let address_string = account.addresses ?
-                            account.addresses[i] : null; // assert checking
-
-                        if(address_string && addy.substring(3) != address_string.substring(3))
-                            error = "address imported " + address_string + " but calculated " + addy + ". ";
-
-                        if(pubby.substring(3) != public_key_string.substring(3))
-                            error += "public key imported " + public_key_string + " but calculated " + pubby;
-
-                        if(error != "")
-                            console.log("ERROR Miss-match key",error);
+                        let address_string = account.addresses
+                            ? account.addresses[i]
+                            : null; // assert checking
+
+                        if (
+                            address_string &&
+                            addy.substring(3) != address_string.substring(3)
+                        )
+                            error =
+                                "address imported " +
+                                address_string +
+                                " but calculated " +
+                                addy +
+                                ". ";
+
+                        if (
+                            pubby.substring(3) != public_key_string.substring(3)
+                        )
+                            error +=
+                                "public key imported " +
+                                public_key_string +
+                                " but calculated " +
+                                pubby;
+
+                        if (error != "")
+                            console.log("ERROR Miss-match key", error);
                     }
 
-                    if( ! public_key_string) {
-                        let private_key = PrivateKey.fromHex( private_plainhex );
+                    if (!public_key_string) {
+                        let private_key = PrivateKey.fromHex(private_plainhex);
                         let public_key = private_key.toPublicKey(); // S L O W
                         public_key_string = public_key.toPublicKeyString();
                     } else {
-                        if( ! same_prefix_regex.test(public_key_string))
+                        if (!same_prefix_regex.test(public_key_string))
                             // This was creating a unresponsive chrome browser
                             // but after the results were shown.  It was probably
                             // caused by garbage collection.
-                            public_key_string = ChainConfig.address_prefix +
+                            public_key_string =
+                                ChainConfig.address_prefix +
                                 public_key_string.substring(3);
                     }
                     this.state.imported_keys_public[public_key_string] = true;
-                    let {account_names} = this.state.keys_to_account[private_plainhex] ||
-                        {account_names: []};
+                    let {account_names} = this.state.keys_to_account[
+                        private_plainhex
+                    ] || {account_names: []};
                     let dup = false;
-                    for(let _name of account_names)
-                        if(_name == account_name)
-                            dup = true;
-                    if(dup) continue;
+                    for (let _name of account_names)
+                        if (_name == account_name) dup = true;
+                    if (dup) continue;
                     account_names.push(account_name);
-                    this.state.keys_to_account[private_plainhex] = {account_names, public_key_string};
-                } catch(e) {
+                    this.state.keys_to_account[private_plainhex] = {
+                        account_names,
+                        public_key_string
+                    };
+                } catch (e) {
                     console.log(e, e.stack);
                     let message = e.message || e;
-                    notify.error(`Account ${account_name} had a private key import error: `+message);
+                    notify.error(
+                        `Account ${account_name} had a private key import error: ` +
+                            message
+                    );
                 }
             }
         }
@@ -429,43 +499,51 @@ class ImportKeys extends Component {
         //        brainkey: password_aes.decryptHexToText(enc_brainkey)
         //    })
         //}
-        this.setState({
-            import_file_message: null,
-            import_password_message: null,
-            password_checksum: null
-        }, ()=> this.updateOnChange());
+        this.setState(
+            {
+                import_file_message: null,
+                import_password_message: null,
+                password_checksum: null
+            },
+            () => this.updateOnChange()
+        );
     }
 
     _saveImport(e) {
         e.preventDefault();
         let keys = PrivateKeyStore.getState().keys;
         let dups = {};
-        for(let public_key_string in this.state.imported_keys_public) {
-            if( ! keys.has(public_key_string) ) continue;
+        for (let public_key_string in this.state.imported_keys_public) {
+            if (!keys.has(public_key_string)) continue;
             delete this.state.imported_keys_public[public_key_string];
             dups[public_key_string] = true;
         }
-        if( Object.keys(this.state.imported_keys_public).length === 0 ) {
+        if (Object.keys(this.state.imported_keys_public).length === 0) {
             notify.error("This wallet has already been imported");
             return;
         }
         let keys_to_account = this.state.keys_to_account;
-        for(let private_plainhex of Object.keys(keys_to_account)) {
-            let {account_names, public_key_string} = keys_to_account[private_plainhex];
-            if( dups[public_key_string] ) delete keys_to_account[private_plainhex];
+        for (let private_plainhex of Object.keys(keys_to_account)) {
+            let {account_names, public_key_string} = keys_to_account[
+                private_plainhex
+            ];
+            if (dups[public_key_string])
+                delete keys_to_account[private_plainhex];
         }
-        WalletUnlockActions.unlock().then(()=> {
+        WalletUnlockActions.unlock().then(() => {
             ImportKeysStore.importing(true);
             // show the loading indicator
-            setTimeout(()=> this.saveImport(), 200);
+            setTimeout(() => this.saveImport(), 200);
         });
     }
 
     saveImport() {
         let keys_to_account = this.state.keys_to_account;
         let private_key_objs = [];
-        for(let private_plainhex of Object.keys(keys_to_account)) {
-            let {account_names, public_key_string} = keys_to_account[private_plainhex];
+        for (let private_plainhex of Object.keys(keys_to_account)) {
+            let {account_names, public_key_string} = keys_to_account[
+                private_plainhex
+            ];
             private_key_objs.push({
                 private_plainhex,
                 import_account_names: account_names,
@@ -473,31 +551,39 @@ class ImportKeys extends Component {
             });
         }
         this.reset();
-        WalletDb.importKeysWorker( private_key_objs ).then( result => {
-            ImportKeysStore.importing(false);
-            let import_count = private_key_objs.length;
-
-            notify.success(counterpart.translate("wallet.import_key_success", {count: import_count}));
-            this.setState({
-                importSuccess: true
+        WalletDb.importKeysWorker(private_key_objs)
+            .then(result => {
+                ImportKeysStore.importing(false);
+                let import_count = private_key_objs.length;
+
+                notify.success(
+                    counterpart.translate("wallet.import_key_success", {
+                        count: import_count
+                    })
+                );
+                this.setState({
+                    importSuccess: true
+                });
+                // this.onCancel() // back to claim balances
+            })
+            .catch(error => {
+                console.log("error:", error);
+                ImportKeysStore.importing(false);
+                let message = error;
+                try {
+                    message = error.target.error.message;
+                } catch (e) {}
+                notify.error(`Key import error: ${message}`);
             });
-            // this.onCancel() // back to claim balances
-        }).catch( error => {
-            console.log("error:", error);
-            ImportKeysStore.importing(false);
-            let message = error;
-            try { message = error.target.error.message; } catch (e){}
-            notify.error(`Key import error: ${message}`);
-        });
     }
 
     addByPattern(contents) {
-        if( ! contents)
-            return false;
+        if (!contents) return false;
 
-        let count = 0, invalid_count = 0;
+        let count = 0,
+            invalid_count = 0;
         let wif_regex = /5[HJK][1-9A-Za-z]{49}/g;
-        for(let wif of contents.match(wif_regex) || [] ) {
+        for (let wif of contents.match(wif_regex) || []) {
             try {
                 let private_key = PrivateKey.fromWif(wif); //could throw and error
                 let private_plainhex = private_key.toBuffer().toString("hex");
@@ -505,16 +591,28 @@ class ImportKeys extends Component {
                 let public_key_string = public_key.toPublicKeyString();
                 this.state.imported_keys_public[public_key_string] = true;
                 this.state.keys_to_account[private_plainhex] = {
-                    account_names: [], public_key_string};
+                    account_names: [],
+                    public_key_string
+                };
                 count++;
-            } catch(e) { invalid_count++; }
+            } catch (e) {
+                invalid_count++;
+            }
         }
-        this.setState({
-            key_text_message: "Found " +
-                (!count ? "" : count + " valid") +
-                (!invalid_count ? "" : " and " + invalid_count + " invalid") +
-                " key" + ( count > 1 || invalid_count > 1 ? "s" : "") + "."
-        }, ()=> this.updateOnChange());
+        this.setState(
+            {
+                key_text_message:
+                    "Found " +
+                    (!count ? "" : count + " valid") +
+                    (!invalid_count
+                        ? ""
+                        : " and " + invalid_count + " invalid") +
+                    " key" +
+                    (count > 1 || invalid_count > 1 ? "s" : "") +
+                    "."
+            },
+            () => this.updateOnChange()
+        );
         // removes the message on the next render
         this.state.key_text_message = null;
         return count;
@@ -536,7 +634,10 @@ class ImportKeys extends Component {
                 <BalanceClaimActive />
 
                 <div style={{paddingTop: 15}}>
-                    <div className="button success" onClick={this.onCancel.bind(this)}>
+                    <div
+                        className="button success"
+                        onClick={this.onCancel.bind(this)}
+                    >
                         <Translate content="wallet.done" />
                     </div>
                 </div>
@@ -551,30 +652,44 @@ class ImportKeys extends Component {
         let account_keycount = this.getImportAccountKeyCount(keys_to_account);
 
         // Create wallet prior to the import keys (keeps layout clean)
-        if( ! WalletDb.getWallet()) return <WalletCreate importKeys={true} hideTitle={true}/>;
-        if( this.props.importing ) {
-            return <div>
-                <div className="center-content">
-                    <LoadingIndicator type="circle"/>
+        if (!WalletDb.getWallet())
+            return <WalletCreate importKeys={true} hideTitle={true} />;
+        if (this.props.importing) {
+            return (
+                <div>
+                    <div className="center-content">
+                        <LoadingIndicator type="circle" />
+                    </div>
                 </div>
-            </div>;
+            );
         }
 
         let filtering = this.state.genesis_filtering;
-        let was_filtered = !!this.state.genesis_filter_status.length && this.state.genesis_filter_finished;
+        let was_filtered =
+            !!this.state.genesis_filter_status.length &&
+            this.state.genesis_filter_finished;
         let account_rows = null;
 
-        if(this.state.genesis_filter_status.length) {
+        if (this.state.genesis_filter_status.length) {
             account_rows = [];
-            for(let status of this.state.genesis_filter_status) {
+            for (let status of this.state.genesis_filter_status) {
                 if (status.count && status.total) {
                     account_rows.push(
                         <tr key={status.account_name}>
                             <td>{status.account_name}</td>
-                            <td>{filtering ?
-                                <span>Filtering { Math.round( (status.count / status.total) * 100) } % </span>
-                                : <span>{status.count}</span>
-                            }</td>
+                            <td>
+                                {filtering ? (
+                                    <span>
+                                        Filtering{" "}
+                                        {Math.round(
+                                            status.count / status.total * 100
+                                        )}{" "}
+                                        %{" "}
+                                    </span>
+                                ) : (
+                                    <span>{status.count}</span>
+                                )}
+                            </td>
                         </tr>
                     );
                 }
@@ -582,22 +697,24 @@ class ImportKeys extends Component {
         }
 
         let import_ready = key_count !== 0;
-        let password_placeholder = counterpart.translate("wallet.import_password");
+        let password_placeholder = counterpart.translate(
+            "wallet.import_password"
+        );
 
         if (import_ready) password_placeholder = "";
 
-        if( ! account_rows && account_keycount) {
+        if (!account_rows && account_keycount) {
             account_rows = [];
             for (let account_name in account_keycount) {
                 account_rows.push(
                     <tr key={account_name}>
                         <td>{account_name}</td>
                         <td>{account_keycount[account_name]}</td>
-                    </tr>);
+                    </tr>
+                );
             }
         }
 
-
         let cancelButton = (
             <div className="button success" onClick={this.onCancel.bind(this)}>
                 <Translate content="wallet.cancel" />
@@ -608,134 +725,215 @@ class ImportKeys extends Component {
 
         if (this.state.importSuccess) {
             return this._renderBalanceClaims();
-        };
+        }
 
         return (
             <div>
                 {/* Key file upload */}
                 <div style={{padding: "10px 0"}}>
-                    <span>{this.state.key_text_message ?
-                        this.state.key_text_message :
-                        <KeyCount key_count={key_count}/>
-                    }</span>
-                    { ! import_ready ?
-                        null :
-                        <span> (<a onClick={this.reset.bind(this)}><Translate content="wallet.reset" /></a>)</span>
-                    }
+                    <span>
+                        {this.state.key_text_message ? (
+                            this.state.key_text_message
+                        ) : (
+                            <KeyCount key_count={key_count} />
+                        )}
+                    </span>
+                    {!import_ready ? null : (
+                        <span>
+                            {" "}
+                            (<a onClick={this.reset.bind(this)}>
+                                <Translate content="wallet.reset" />
+                            </a>)
+                        </span>
+                    )}
                 </div>
 
-                { account_rows ?
-                <div>
-                    { ! account_rows.length ? counterpart.translate("wallet.no_accounts") :
-                    <div>
-                        <table className="table">
-                            <thead>
-                                <tr>
-                                    <th><Translate content="explorer.account.title" /></th>
-                                    <th><Translate content="settings.restore_key_count" /></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {account_rows}
-                            </tbody>
-                        </table>
-                        <br/>
-                    </div>}
-                </div> : null}
-                <br/>
-
-                { ! import_ready && ! this.state.genesis_filter_initalizing ?
-                <div>
+                {account_rows ? (
                     <div>
+                        {!account_rows.length ? (
+                            counterpart.translate("wallet.no_accounts")
+                        ) : (
+                            <div>
+                                <table className="table">
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                <Translate content="explorer.account.title" />
+                                            </th>
+                                            <th>
+                                                <Translate content="settings.restore_key_count" />
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>{account_rows}</tbody>
+                                </table>
+                                <br />
+                            </div>
+                        )}
+                    </div>
+                ) : null}
+                <br />
 
+                {!import_ready && !this.state.genesis_filter_initalizing ? (
+                    <div>
                         <div>
-                            {privateKey ? (
-                            <form onSubmit={this.onWif.bind(this)}>
-                                    <Translate component="label" content="wallet.paste_private" />
-                                    <input ref="wifInput" type="password" id="wif" tabIndex={tabIndex++} />
-
-                                    <button className="button" type="submit"><Translate content="wallet.submit" /></button>
-                                    {cancelButton}
-                            </form>) : (
-                            <form onSubmit={this._passwordCheck.bind(this)}>
-                                <label><Translate content="wallet.bts_09_export" />
-                                {this.state.no_file ? null : <span>&nbsp;
-                                    (<a onClick={this.reset.bind(this)}>Reset</a>)</span>}
-                                </label>
-                                <input
-                                    type="file"
-                                    id="file_input"
-                                    accept=".json"
-                                    style={{
-                                        border: "solid" ,
-                                        marginBottom: 15
-                                    }}
-                                    key={this.state.reset_file_name}
-                                    onChange={this.upload.bind(this)}
-                                />
-                                <div>{this.state.import_file_message}</div>
-                                { ! this.state.no_file ?
-                                    (<div>
+                            <div>
+                                {privateKey ? (
+                                    <form onSubmit={this.onWif.bind(this)}>
+                                        <Translate
+                                            component="label"
+                                            content="wallet.paste_private"
+                                        />
                                         <input
+                                            ref="wifInput"
                                             type="password"
-                                            ref="password"
-                                            key={this.state.reset_password}
-                                            placeholder={password_placeholder}
-                                            onChange={() => {if (this.state.import_password_message && this.state.import_password_message.length) {
-                                                this.setState({
-                                                    import_password_message: null
-                                                });
-                                            }}}
+                                            id="wif"
+                                            tabIndex={tabIndex++}
                                         />
-                                        <p className="facolor-error">{this.state.import_password_message}</p>
-                                    </div>) : null}
-                                    <div className="button-group">
-                                    <button className={cname("button", {disabled: !!this.state.no_file})} type="submit"><Translate content="wallet.submit" /></button>
-                                    {cancelButton}
-                                    </div>
-                            </form>)}
-                        </div>
-                        <br/>
-
 
-                        <br/>
+                                        <button
+                                            className="button"
+                                            type="submit"
+                                        >
+                                            <Translate content="wallet.submit" />
+                                        </button>
+                                        {cancelButton}
+                                    </form>
+                                ) : (
+                                    <form
+                                        onSubmit={this._passwordCheck.bind(
+                                            this
+                                        )}
+                                    >
+                                        <label>
+                                            <Translate content="wallet.bts_09_export" />
+                                            {this.state.no_file ? null : (
+                                                <span>
+                                                    &nbsp; (<a
+                                                        onClick={this.reset.bind(
+                                                            this
+                                                        )}
+                                                    >
+                                                        Reset
+                                                    </a>)
+                                                </span>
+                                            )}
+                                        </label>
+                                        <input
+                                            type="file"
+                                            id="file_input"
+                                            accept=".json"
+                                            style={{
+                                                border: "solid",
+                                                marginBottom: 15
+                                            }}
+                                            key={this.state.reset_file_name}
+                                            onChange={this.upload.bind(this)}
+                                        />
+                                        <div>
+                                            {this.state.import_file_message}
+                                        </div>
+                                        {!this.state.no_file ? (
+                                            <div>
+                                                <input
+                                                    type="password"
+                                                    ref="password"
+                                                    key={
+                                                        this.state
+                                                            .reset_password
+                                                    }
+                                                    placeholder={
+                                                        password_placeholder
+                                                    }
+                                                    onChange={() => {
+                                                        if (
+                                                            this.state
+                                                                .import_password_message &&
+                                                            this.state
+                                                                .import_password_message
+                                                                .length
+                                                        ) {
+                                                            this.setState({
+                                                                import_password_message: null
+                                                            });
+                                                        }
+                                                    }}
+                                                />
+                                                <p className="facolor-error">
+                                                    {
+                                                        this.state
+                                                            .import_password_message
+                                                    }
+                                                </p>
+                                            </div>
+                                        ) : null}
+                                        <div className="button-group">
+                                            <button
+                                                className={cname("button", {
+                                                    disabled: !!this.state
+                                                        .no_file
+                                                })}
+                                                type="submit"
+                                            >
+                                                <Translate content="wallet.submit" />
+                                            </button>
+                                            {cancelButton}
+                                        </div>
+                                    </form>
+                                )}
+                            </div>
+                            <br />
 
+                            <br />
+                        </div>
                     </div>
-                </div> : null}
+                ) : null}
 
-                { this.state.genesis_filter_initalizing ? <div>
-                    <div className="center-content">
-                        <LoadingIndicator type="circle"/>
+                {this.state.genesis_filter_initalizing ? (
+                    <div>
+                        <div className="center-content">
+                            <LoadingIndicator type="circle" />
+                        </div>
                     </div>
-                </div>:null}
-
-                { import_ready ?
-                <div>
+                ) : null}
 
+                {import_ready ? (
                     <div>
-                        <div className="button-group">
-                            <div className={cname("button success", {disabled: !import_ready})}
-                               onClick={this._saveImport.bind(this)} >
-                                <Translate content="wallet.import_keys" />
-                            </div>
-                            <div className="button secondary" onClick={this.reset.bind(this)}>
-                                <Translate content="wallet.cancel" />
+                        <div>
+                            <div className="button-group">
+                                <div
+                                    className={cname("button success", {
+                                        disabled: !import_ready
+                                    })}
+                                    onClick={this._saveImport.bind(this)}
+                                >
+                                    <Translate content="wallet.import_keys" />
+                                </div>
+                                <div
+                                    className="button secondary"
+                                    onClick={this.reset.bind(this)}
+                                >
+                                    <Translate content="wallet.cancel" />
+                                </div>
                             </div>
                         </div>
-                    </div>
 
-                    <h4><Translate content="wallet.unclaimed" /></h4>
-                    <Translate component="p" content="wallet.claim_later" />
-                    <div className="grid-block">
-
-
-                        <div className="grid-content no-overflow">
-                            <Translate component="label" content="wallet.totals" />
-                            <BalanceClaimAssetTotal />
+                        <h4>
+                            <Translate content="wallet.unclaimed" />
+                        </h4>
+                        <Translate component="p" content="wallet.claim_later" />
+                        <div className="grid-block">
+                            <div className="grid-content no-overflow">
+                                <Translate
+                                    component="label"
+                                    content="wallet.totals"
+                                />
+                                <BalanceClaimAssetTotal />
+                            </div>
                         </div>
+                        <br />
                     </div>
-                    <br/>
-                </div> : null}
+                ) : null}
             </div>
         );
     }
diff --git a/app/components/Wallet/PasswordConfirm.jsx b/app/components/Wallet/PasswordConfirm.jsx
index 49f3f5d018..285367b372 100644
--- a/app/components/Wallet/PasswordConfirm.jsx
+++ b/app/components/Wallet/PasswordConfirm.jsx
@@ -4,21 +4,20 @@ import Immutable from "immutable";
 import cname from "classnames";
 
 export default class PasswordConfirm extends Component {
-
     static propTypes = {
         // Called everytime a valid password is provided and matches a confirmed password
         onValid: PropTypes.func.isRequired
     };
 
     constructor() {
-        super()
+        super();
         this.state = {
             password: "",
             confirm: "",
             errors: Immutable.Map(),
             // An empty form has no errors but is still invaid
             valid: false
-        }
+        };
     }
 
     componentDidMount() {
@@ -33,11 +32,14 @@ export default class PasswordConfirm extends Component {
         let tabIndex = 1;
 
         return (
-            <div
-                className={cname({"has-error": errors.size})}
-            >
-                    <Translate component="label" content={newPassword ? "wallet.new_password" : "wallet.password"} />
-                    <section>
+            <div className={cname({"has-error": errors.size})}>
+                <Translate
+                    component="label"
+                    content={
+                        newPassword ? "wallet.new_password" : "wallet.password"
+                    }
+                />
+                <section>
                     <input
                         type="password"
                         id="password"
@@ -46,10 +48,15 @@ export default class PasswordConfirm extends Component {
                         value={this.state.password}
                         tabIndex={tabIndex++}
                     />
-                    </section>
+                </section>
 
-                    <Translate component="label" content={newPassword ? "wallet.new_confirm" : "wallet.confirm"} />
-                    <section>
+                <Translate
+                    component="label"
+                    content={
+                        newPassword ? "wallet.new_confirm" : "wallet.confirm"
+                    }
+                />
+                <section>
                     <input
                         type="password"
                         id="confirm"
@@ -57,39 +64,45 @@ export default class PasswordConfirm extends Component {
                         value={this.state.confirm}
                         tabIndex={tabIndex++}
                     />
-                    </section>
+                </section>
 
-                <div style={{paddingBottom: 10}}>{errors.get("password_match") || errors.get("password_length")}</div>
+                <div style={{paddingBottom: 10}}>
+                    {errors.get("password_match") ||
+                        errors.get("password_length")}
+                </div>
 
                 {this.props.children}
-                <br/>
+                <br />
             </div>
         );
     }
 
     formChange(event) {
-        var state = this.state
-        state[event.target.id] = event.target.value
-        this.setState(state)
-        this.validate(state)
+        var state = this.state;
+        state[event.target.id] = event.target.value;
+        this.setState(state);
+        this.validate(state);
     }
 
     validate(state) {
-        var {password, confirm} = state
-        confirm = confirm.trim()
-        password = password.trim()
+        var {password, confirm} = state;
+        confirm = confirm.trim();
+        password = password.trim();
 
-        var errors = Immutable.Map()
+        var errors = Immutable.Map();
         // Don't report until typing begins
-        if(password.length !== 0 && password.length < 8)
-            errors = errors.set("password_length", "Password must be 8 characters or more")
+        if (password.length !== 0 && password.length < 8)
+            errors = errors.set(
+                "password_length",
+                "Password must be 8 characters or more"
+            );
 
         // Don't report it until the confirm is populated
-        if( password !== "" && confirm !== "" && password !== confirm)
-            errors = errors.set("password_match", "Passwords do not match")
+        if (password !== "" && confirm !== "" && password !== confirm)
+            errors = errors.set("password_match", "Passwords do not match");
 
-        var valid = password.length >= 8 && password === confirm
-        this.setState({errors, valid})
-        this.props.onValid(valid ? password : null)
+        var valid = password.length >= 8 && password === confirm;
+        this.setState({errors, valid});
+        this.props.onValid(valid ? password : null);
     }
 }
diff --git a/app/components/Wallet/WalletChangePassword.jsx b/app/components/Wallet/WalletChangePassword.jsx
index 76c9dc173c..53f3104496 100644
--- a/app/components/Wallet/WalletChangePassword.jsx
+++ b/app/components/Wallet/WalletChangePassword.jsx
@@ -9,29 +9,33 @@ import counterpart from "counterpart";
 
 export default class WalletChangePassword extends Component {
     constructor() {
-        super()
-        this.state = {success: false}
+        super();
+        this.state = {success: false};
     }
 
     onAccept(e) {
         e.preventDefault();
-        var {old_password, new_password} = this.state
-        WalletDb.changePassword(old_password, new_password, true/*unlock*/)
-            .then(()=> {
-                notify.success("Password changed")
+        var {old_password, new_password} = this.state;
+        WalletDb.changePassword(old_password, new_password, true /*unlock*/)
+            .then(() => {
+                notify.success("Password changed");
                 this.setState({success: true});
                 // window.history.back();
             })
-            .catch( error => {
+            .catch(error => {
                 // Programmer or database error ( validation missed something? )
                 // .. translation may be unnecessary
-                console.error(error)
-                notify.error("Unable to change password: " + error)
-            })
+                console.error(error);
+                notify.error("Unable to change password: " + error);
+            });
     }
 
-    onOldPassword(old_password) { this.setState({ old_password }); }
-    onNewPassword(new_password) { this.setState({ new_password }); }
+    onOldPassword(old_password) {
+        this.setState({old_password});
+    }
+    onNewPassword(new_password) {
+        this.setState({new_password});
+    }
 
     _onCancel() {
         this.setState({
@@ -59,42 +63,50 @@ export default class WalletChangePassword extends Component {
             );
         }
 
-        return <span>
-            <WalletPassword ref="pwd" onValid={this.onOldPassword.bind(this)}>
-                <PasswordConfirm
-                    onSubmit={this.onAccept.bind(this)}
-                    newPassword={true}
-                    onValid={this.onNewPassword.bind(this)}
+        return (
+            <span>
+                <WalletPassword
+                    ref="pwd"
+                    onValid={this.onOldPassword.bind(this)}
                 >
-                    <button
-                        className={cname("button outline", {disabled: ! ready})}
-                        type="submit"
-                        onClick={this.onAccept.bind(this)}
+                    <PasswordConfirm
+                        onSubmit={this.onAccept.bind(this)}
+                        newPassword={true}
+                        onValid={this.onNewPassword.bind(this)}
                     >
-                        <Translate content="wallet.accept" />
-                    </button>
-                    <div className="button outline" onClick={this._onCancel.bind(this)}>
-                        <Translate content="wallet.cancel" />
-                    </div>
-            </PasswordConfirm>
-            </WalletPassword>
-
-        </span>
+                        <button
+                            className={cname("button outline", {
+                                disabled: !ready
+                            })}
+                            type="submit"
+                            onClick={this.onAccept.bind(this)}
+                        >
+                            <Translate content="wallet.accept" />
+                        </button>
+                        <div
+                            className="button outline"
+                            onClick={this._onCancel.bind(this)}
+                        >
+                            <Translate content="wallet.cancel" />
+                        </div>
+                    </PasswordConfirm>
+                </WalletPassword>
+            </span>
+        );
     }
 }
 
 class WalletPassword extends Component {
-
     static propTypes = {
         onValid: React.PropTypes.func.isRequired
     };
 
     constructor() {
-        super()
+        super();
         this.state = {
             password: "",
             verified: false
-        }
+        };
     }
 
     cancel() {
@@ -107,57 +119,58 @@ class WalletPassword extends Component {
     onPassword(e) {
         e.preventDefault();
         let {success} = WalletDb.validatePassword(this.state.password, true);
-        if( success ) {
-            this.setState({ verified: true })
-            this.props.onValid(this.state.password)
-        } else
-            notify.error("Invalid Password")
+        if (success) {
+            this.setState({verified: true});
+            this.props.onValid(this.state.password);
+        } else notify.error("Invalid Password");
     }
 
     formChange(event) {
-        var state = {}
-        state[event.target.id] = event.target.value
-        this.setState(state)
+        var state = {};
+        state[event.target.id] = event.target.value;
+        this.setState(state);
     }
 
     render() {
-        if(this.state.verified) {
+        if (this.state.verified) {
             return <div className="grid-content">{this.props.children}</div>;
         } else {
             return (
                 <form onSubmit={this.onPassword.bind(this)}>
-
-                    <label><Translate content="wallet.existing_password"/></label>
+                    <label>
+                        <Translate content="wallet.existing_password" />
+                    </label>
                     <section>
                         <input
-                            placeholder={counterpart.translate("wallet.current_pass")}
+                            placeholder={counterpart.translate(
+                                "wallet.current_pass"
+                            )}
                             type="password"
                             id="password"
                             onChange={this.formChange.bind(this)}
                             value={this.state.password}
                         />
                     </section>
-                    <button
-                        className="button outline"
-                    >
+                    <button className="button outline">
                         <Translate content="wallet.submit" />
                     </button>
                 </form>
             );
         }
     }
-
 }
 
 class Reset extends Component {
-
     render() {
-        var label = this.props.label || <Translate content="wallet.reset" />
-        return  <span className="button outline"
-            onClick={this.onReset.bind(this)}>{label}</span>
+        var label = this.props.label || <Translate content="wallet.reset" />;
+        return (
+            <span className="button outline" onClick={this.onReset.bind(this)}>
+                {label}
+            </span>
+        );
     }
 
     onReset() {
-        window.history.back()
+        window.history.back();
     }
 }
diff --git a/app/components/Wallet/WalletCreate.jsx b/app/components/Wallet/WalletCreate.jsx
index 6887655303..ec5609c44d 100644
--- a/app/components/Wallet/WalletCreate.jsx
+++ b/app/components/Wallet/WalletCreate.jsx
@@ -6,12 +6,11 @@ import PasswordConfirm from "components/Wallet/PasswordConfirm";
 import WalletDb from "stores/WalletDb";
 import WalletManagerStore from "stores/WalletManagerStore";
 import WalletActions from "actions/WalletActions";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import cname from "classnames";
 import SettingsActions from "actions/SettingsActions";
 
 class CreateNewWallet extends Component {
-
     static propTypes = {
         hideTitle: React.PropTypes.bool
     };
@@ -41,27 +40,40 @@ class CreateNewWallet extends Component {
 
     onPassword(valid_password) {
         this.state.valid_password = valid_password;
-        this.setState({ valid_password }, this.validate);
+        this.setState({valid_password}, this.validate);
     }
 
     onCustomBrainkey() {
-        this.setState({ custom_brainkey: true });
+        this.setState({custom_brainkey: true});
     }
 
     onBrainkey(brnkey) {
         this.state.brnkey = brnkey;
-        this.setState({ brnkey }, this.validate);
+        this.setState({brnkey}, this.validate);
     }
 
     onSubmit(e) {
         e.preventDefault();
 
-        let {wallet_public_name, valid_password, custom_brainkey, errors} = this.state;
-        if (!valid_password || errors.wallet_public_name || (custom_brainkey && !errors.validBrainkey)) {
+        let {
+            wallet_public_name,
+            valid_password,
+            custom_brainkey,
+            errors
+        } = this.state;
+        if (
+            !valid_password ||
+            errors.wallet_public_name ||
+            (custom_brainkey && !errors.validBrainkey)
+        ) {
             return;
         }
 
-        WalletActions.setWallet(wallet_public_name, valid_password, this.state.brnkey);
+        WalletActions.setWallet(
+            wallet_public_name,
+            valid_password,
+            this.state.brnkey
+        );
         SettingsActions.changeSetting({
             setting: "passwordLogin",
             value: false
@@ -72,11 +84,11 @@ class CreateNewWallet extends Component {
     formChange(event) {
         let key_id = event.target.id;
         let value = event.target.value;
-        if(key_id === "wallet_public_name") {
+        if (key_id === "wallet_public_name") {
             //case in-sensitive
             value = value.toLowerCase();
             // Allow only valid file name characters
-            if( /[^a-z0-9_-]/.test(value) ) return;
+            if (/[^a-z0-9_-]/.test(value)) return;
         }
 
         // Set state is updated directly because validate is going to
@@ -89,14 +101,14 @@ class CreateNewWallet extends Component {
     validate(state = this.state) {
         let errors = state.errors;
         let {wallet_names} = this.props;
-        errors.wallet_public_name =
-            !wallet_names.has(state.wallet_public_name) ?
-            null : `Wallet ${state.wallet_public_name.toUpperCase()} exists, please change the name`;
-
-        var isValid = errors.wallet_public_name === null && state.valid_password !== null;
-        if(state.custom_brainkey && isValid)
-            isValid = state.brnkey !== null;
-        this.setState({ isValid, errors });
+        errors.wallet_public_name = !wallet_names.has(state.wallet_public_name)
+            ? null
+            : `Wallet ${state.wallet_public_name.toUpperCase()} exists, please change the name`;
+
+        var isValid =
+            errors.wallet_public_name === null && state.valid_password !== null;
+        if (state.custom_brainkey && isValid) isValid = state.brnkey !== null;
+        this.setState({isValid, errors});
     }
     //
     // onDone() {
@@ -108,84 +120,121 @@ class CreateNewWallet extends Component {
         let errors = state.errors;
         let has_wallet = !!this.props.current_wallet;
 
-        if(this.state.create_submitted &&
-            this.state.wallet_public_name === this.props.current_wallet) {
-            return <div>
-                <h4><Translate content="wallet.wallet_created" /></h4>
-                <Link to="/dashboard">
-                    <div className="button success"><Translate content="wallet.done" /></div>
-                </Link>
-            </div>;
+        if (
+            this.state.create_submitted &&
+            this.state.wallet_public_name === this.props.current_wallet
+        ) {
+            return (
+                <div>
+                    <h4>
+                        <Translate content="wallet.wallet_created" />
+                    </h4>
+                    <Link to="/dashboard">
+                        <div className="button success">
+                            <Translate content="wallet.done" />
+                        </div>
+                    </Link>
+                </div>
+            );
         }
 
         return (
             <div>
-
-            <form
-                style={{maxWidth: "40rem"}}
-                onSubmit={this.onSubmit.bind(this)}
-                onChange={this.formChange.bind(this)} noValidate
-            >
-
-                <div
-                    className="grid-content"
-                    style={{
-                        textAlign: "left"
-                    }}
+                <form
+                    style={{maxWidth: "40rem"}}
+                    onSubmit={this.onSubmit.bind(this)}
+                    onChange={this.formChange.bind(this)}
+                    noValidate
                 >
-                    {!this.props.restoreBrainkey ? <Translate component="p" content="wallet.create_importkeys_text" /> : null}
-                    {!this.props.restoreBrainkey ? <Translate component="p" content="wallet.create_text" /> : null}
-                </div>
-                <PasswordConfirm onValid={this.onPassword.bind(this)}/>
-                { has_wallet ? (
-                    <div className="no-overflow">
-                        <br/>
-                        <section>
-                        <label><Translate content="wallet.name" /></label>
-                        <input
-                            tabIndex={3}
-                            type="text"
-                            id="wallet_public_name"
-                            defaultValue={this.state.wallet_public_name}
-                        />
-                        </section>
-                        <div className="has-error">{errors.wallet_public_name}</div>
-                        <br/>
-                    </div>) : null}
-
-                <div className="no-overflow">
-
-                    { this.state.custom_brainkey ? (
-                    <div>
-                        <label><Translate content="wallet.brainkey" /></label>
-                        <BrainkeyInput tabIndex={4} onChange={this.onBrainkey.bind(this)} errorCallback={(warn) => {
-                            let {errors} = this.state;
-                            errors.validBrainkey = warn;
-                            this.setState({
-                                errors
-                            });
-                        }}/>
-                    </div>) : null}
-
-                    <button className={cname("button",{disabled: !(this.state.isValid)})}>
-                        <Translate content="wallet.create_wallet" />
-                    </button>
-
-                    <button className="button secondary" onClick={this.onBack.bind(this)}>
-                        <Translate content="wallet.cancel" />
-                    </button>
+                    <div
+                        className="grid-content"
+                        style={{
+                            textAlign: "left"
+                        }}
+                    >
+                        {!this.props.restoreBrainkey ? (
+                            <Translate
+                                component="p"
+                                content="wallet.create_importkeys_text"
+                            />
+                        ) : null}
+                        {!this.props.restoreBrainkey ? (
+                            <Translate
+                                component="p"
+                                content="wallet.create_text"
+                            />
+                        ) : null}
+                    </div>
+                    <PasswordConfirm onValid={this.onPassword.bind(this)} />
+                    {has_wallet ? (
+                        <div className="no-overflow">
+                            <br />
+                            <section>
+                                <label>
+                                    <Translate content="wallet.name" />
+                                </label>
+                                <input
+                                    tabIndex={3}
+                                    type="text"
+                                    id="wallet_public_name"
+                                    defaultValue={this.state.wallet_public_name}
+                                />
+                            </section>
+                            <div className="has-error">
+                                {errors.wallet_public_name}
+                            </div>
+                            <br />
+                        </div>
+                    ) : null}
 
-                </div>
-
-                { ! this.state.custom_brainkey ? (
-                <div style={{paddingTop: 20}}>
-                    <label>
-                        <a onClick={this.onCustomBrainkey.bind(this)}>
-                        <Translate content="wallet.custom_brainkey" /></a>
-                    </label>
-                </div>) : null}
-            </form>
-        </div>);
+                    <div className="no-overflow">
+                        {this.state.custom_brainkey ? (
+                            <div>
+                                <label>
+                                    <Translate content="wallet.brainkey" />
+                                </label>
+                                <BrainkeyInput
+                                    tabIndex={4}
+                                    onChange={this.onBrainkey.bind(this)}
+                                    errorCallback={warn => {
+                                        let {errors} = this.state;
+                                        errors.validBrainkey = warn;
+                                        this.setState({
+                                            errors
+                                        });
+                                    }}
+                                />
+                            </div>
+                        ) : null}
+
+                        <button
+                            className={cname("button", {
+                                disabled: !this.state.isValid
+                            })}
+                        >
+                            <Translate content="wallet.create_wallet" />
+                        </button>
+
+                        <button
+                            className="button secondary"
+                            onClick={this.onBack.bind(this)}
+                        >
+                            <Translate content="wallet.cancel" />
+                        </button>
+                    </div>
+
+                    {!this.state.custom_brainkey ? (
+                        <div style={{paddingTop: 20}}>
+                            <label>
+                                <a onClick={this.onCustomBrainkey.bind(this)}>
+                                    <Translate content="wallet.custom_brainkey" />
+                                </a>
+                            </label>
+                        </div>
+                    ) : null}
+                </form>
+            </div>
+        );
     }
 }
 
@@ -200,18 +249,23 @@ CreateNewWallet = connect(CreateNewWallet, {
 
 class WalletCreate extends Component {
     render() {
-        if(WalletDb.getWallet() && this.props.children) return <div>{this.props.children}</div>;
+        if (WalletDb.getWallet() && this.props.children)
+            return <div>{this.props.children}</div>;
 
-        return <CreateNewWallet {...this.props}/>;
+        return <CreateNewWallet {...this.props} />;
     }
 }
 
-const CreateWalletFromBrainkey = (props) => {
+const CreateWalletFromBrainkey = props => {
     if (!props.nested) {
         return (
             <div className="grid-container" style={{paddingTop: 30}}>
                 <Translate content="settings.backup_brainkey" component="h3" />
-                <Translate content="settings.restore_brainkey_text" component="p" style={{maxWidth: "40rem", paddingBottom: 10}} />
+                <Translate
+                    content="settings.restore_brainkey_text"
+                    component="p"
+                    style={{maxWidth: "40rem", paddingBottom: 10}}
+                />
                 <WalletCreate restoreBrainkey {...props} />
             </div>
         );
@@ -219,4 +273,4 @@ const CreateWalletFromBrainkey = (props) => {
     return <WalletCreate restoreBrainkey {...props} />;
 };
 
-export { WalletCreate, CreateWalletFromBrainkey };
+export {WalletCreate, CreateWalletFromBrainkey};
diff --git a/app/components/Wallet/WalletManager.jsx b/app/components/Wallet/WalletManager.jsx
index c05a602a0d..ef3a70639e 100644
--- a/app/components/Wallet/WalletManager.jsx
+++ b/app/components/Wallet/WalletManager.jsx
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {Link} from "react-router/es";
-import { connect } from "alt-react";
+import {connect} from "alt-react";
 import WalletActions from "actions/WalletActions";
 import BackupActions from "actions/BackupActions";
 import WalletManagerStore from "stores/WalletManagerStore";
@@ -18,54 +18,52 @@ const connectObject = {
 };
 
 class WalletManager extends Component {
-
     getTitle() {
-
         switch (this.props.location.pathname) {
+            case "/wallet/create":
+                return "wallet.create_wallet";
+                break;
 
-        case "/wallet/create":
-            return "wallet.create_wallet";
-            break;
-
-        case "/wallet/backup/create":
-            return "wallet.create_backup";
-            break;
-
-        case "/wallet/backup/restore":
-            return "wallet.restore_backup";
-            break;
+            case "/wallet/backup/create":
+                return "wallet.create_backup";
+                break;
 
-        case "/wallet/backup/brainkey":
-            return "wallet.backup_brainkey";
-            break;
+            case "/wallet/backup/restore":
+                return "wallet.restore_backup";
+                break;
 
-        case "/wallet/delete":
-            return "wallet.delete_wallet";
-            break;
+            case "/wallet/backup/brainkey":
+                return "wallet.backup_brainkey";
+                break;
 
-        case "/wallet/change-password":
-            return "wallet.change_password";
-            break;
+            case "/wallet/delete":
+                return "wallet.delete_wallet";
+                break;
 
-        case "/wallet/import-keys":
-            return "wallet.import_keys";
-            break;
+            case "/wallet/change-password":
+                return "wallet.change_password";
+                break;
 
+            case "/wallet/import-keys":
+                return "wallet.import_keys";
+                break;
 
-        default:
-            return "wallet.console";
-            break;
+            default:
+                return "wallet.console";
+                break;
         }
     }
 
     render() {
-
         return (
             <div className="grid-block vertical">
                 <div className="grid-container" style={{maxWidth: "40rem"}}>
                     <div className="content-block">
                         <div className="page-header">
-                            <Translate component="h3" content={this.getTitle()} />
+                            <Translate
+                                component="h3"
+                                content={this.getTitle()}
+                            />
                         </div>
                         <div className="content-block">
                             {this.props.children}
@@ -79,106 +77,138 @@ class WalletManager extends Component {
 WalletManager = connect(WalletManager, connectObject);
 
 class WalletOptions extends Component {
-
     render() {
         let has_wallet = !!this.props.current_wallet;
         let has_wallets = this.props.wallet_names.size > 1;
-        let current_wallet = this.props.current_wallet ? this.props.current_wallet.toUpperCase() : "";
-        return <span>
-            <div className="grid-block">
-
-                <div className="grid-content">
-                    <div className="card">
-                        <div className="card-content">
-                                <label><Translate content="wallet.active_wallet" />:</label>
+        let current_wallet = this.props.current_wallet
+            ? this.props.current_wallet.toUpperCase()
+            : "";
+        return (
+            <span>
+                <div className="grid-block">
+                    <div className="grid-content">
+                        <div className="card">
+                            <div className="card-content">
+                                <label>
+                                    <Translate content="wallet.active_wallet" />:
+                                </label>
                                 <div>{current_wallet}</div>
-                                <br/>
+                                <br />
                                 {has_wallets ? (
                                     <Link to="/wallet/change">
                                         <div className="button outline success">
                                             <Translate content="wallet.change_wallet" />
                                         </div>
                                     </Link>
-                                )
-                                :null}
+                                ) : null}
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                <div className="grid-content">
-                    <div className="card">
-                        <div className="card-content">
-                                <label><Translate content="wallet.import_keys_tool" /></label>
+                    <div className="grid-content">
+                        <div className="card">
+                            <div className="card-content">
+                                <label>
+                                    <Translate content="wallet.import_keys_tool" />
+                                </label>
                                 <div style={{visibility: "hidden"}}>Dummy</div>
-                                <br/>
+                                <br />
                                 {has_wallet ? (
                                     <Link to="/wallet/import-keys">
                                         <div className="button outline success">
                                             <Translate content="wallet.import_keys" />
                                         </div>
                                     </Link>
-                                )
-                                :null}
+                                ) : null}
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                {has_wallet ? <div className="grid-content">
-                    <div className="card">
-                        <div className="card-content">
-                            <label><Translate content="wallet.balance_claims" /></label>
-                            <div style={{visibility: "hidden"}}>Dummy</div>
-                            <br/>
-                            <Link to="wallet/balance-claims">
-                                <div className="button outline success">
-                                    <Translate content="wallet.balance_claim_lookup" />
-                                </div>
-                            </Link>
-                        {/*<BalanceClaimByAsset>
+                    {has_wallet ? (
+                        <div className="grid-content">
+                            <div className="card">
+                                <div className="card-content">
+                                    <label>
+                                        <Translate content="wallet.balance_claims" />
+                                    </label>
+                                    <div style={{visibility: "hidden"}}>
+                                        Dummy
+                                    </div>
+                                    <br />
+                                    <Link to="wallet/balance-claims">
+                                        <div className="button outline success">
+                                            <Translate content="wallet.balance_claim_lookup" />
+                                        </div>
+                                    </Link>
+                                    {/*<BalanceClaimByAsset>
                             <br/>
                             <div className="button outline success">
                                 <Translate content="wallet.balance_claims" /></div>
                         </BalanceClaimByAsset>
                         */}
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>:null}
-
-            </div>
-
-            {has_wallet ? <Link to="wallet/backup/create">
-            <div className="button outline success"><Translate content="wallet.create_backup" /></div></Link>:null}
-
-            {has_wallet ? <Link to="wallet/backup/brainkey">
-            <div className="button outline success"><Translate content="wallet.backup_brainkey" /></div></Link>:null}
+                    ) : null}
+                </div>
 
+                {has_wallet ? (
+                    <Link to="wallet/backup/create">
+                        <div className="button outline success">
+                            <Translate content="wallet.create_backup" />
+                        </div>
+                    </Link>
+                ) : null}
 
-            <Link to="wallet/backup/restore">
-            <div className="button outline success"><Translate content="wallet.restore_backup" /></div></Link>
+                {has_wallet ? (
+                    <Link to="wallet/backup/brainkey">
+                        <div className="button outline success">
+                            <Translate content="wallet.backup_brainkey" />
+                        </div>
+                    </Link>
+                ) : null}
 
-            <br/>
+                <Link to="wallet/backup/restore">
+                    <div className="button outline success">
+                        <Translate content="wallet.restore_backup" />
+                    </div>
+                </Link>
 
-            {has_wallet ? <br/> : null}
+                <br />
 
-            <Link to="wallet/create">
-            <div className="button outline success"><Translate content="wallet.new_wallet" /></div></Link>
+                {has_wallet ? <br /> : null}
 
-            {has_wallet ? <Link to="wallet/delete">
-            <div className="button outline success"><Translate content="wallet.delete_wallet" /></div></Link>:null}
+                <Link to="wallet/create">
+                    <div className="button outline success">
+                        <Translate content="wallet.new_wallet" />
+                    </div>
+                </Link>
 
-            {has_wallet ? <Link to="wallet/change-password">
-            <div className="button outline success"><Translate content="wallet.change_password" /></div></Link>:null}
+                {has_wallet ? (
+                    <Link to="wallet/delete">
+                        <div className="button outline success">
+                            <Translate content="wallet.delete_wallet" />
+                        </div>
+                    </Link>
+                ) : null}
 
-        </span>;
+                {has_wallet ? (
+                    <Link to="wallet/change-password">
+                        <div className="button outline success">
+                            <Translate content="wallet.change_password" />
+                        </div>
+                    </Link>
+                ) : null}
+            </span>
+        );
     }
 }
 WalletOptions = connect(WalletOptions, connectObject);
 
 class ChangeActiveWallet extends Component {
-
     constructor() {
         super();
-        this.state = { };
+        this.state = {};
     }
 
     componentWillMount() {
@@ -195,44 +225,67 @@ class ChangeActiveWallet extends Component {
     render() {
         let state = WalletManagerStore.getState();
 
-        let options = []
-        state.wallet_names.forEach( wallet_name => {
-            options.push(<option key={wallet_name} value={wallet_name}>{wallet_name.toLowerCase()}</option>)
-        })
+        let options = [];
+        state.wallet_names.forEach(wallet_name => {
+            options.push(
+                <option key={wallet_name} value={wallet_name}>
+                    {wallet_name.toLowerCase()}
+                </option>
+            );
+        });
 
-        let is_dirty = this.state.current_wallet !== this.props.current_wallet
+        let is_dirty = this.state.current_wallet !== this.props.current_wallet;
 
         return (
             <div>
                 <section className="block-list">
-                    <header><Translate content="wallet.active_wallet" />:</header>
+                    <header>
+                        <Translate content="wallet.active_wallet" />:
+                    </header>
 
-                        <ul>
+                    <ul>
                         <li className="with-dropdown" style={{borderBottom: 0}}>
-                            {state.wallet_names.count() <= 1 ? <div style={{paddingLeft :10, lineHeight: "36px", borderRadius: "3px"}} className="settings-input">{this.state.current_wallet}</div> : (
+                            {state.wallet_names.count() <= 1 ? (
+                                <div
+                                    style={{
+                                        paddingLeft: 10,
+                                        lineHeight: "36px",
+                                        borderRadius: "3px"
+                                    }}
+                                    className="settings-input"
+                                >
+                                    {this.state.current_wallet}
+                                </div>
+                            ) : (
                                 <select
-                                className="settings-select"
-                                value={this.state.current_wallet}
-                                onChange={this.onChange.bind(this)}
-                            >
-                                    { options }
-                            </select>)}
+                                    className="settings-select"
+                                    value={this.state.current_wallet}
+                                    onChange={this.onChange.bind(this)}
+                                >
+                                    {options}
+                                </select>
+                            )}
                         </li>
                     </ul>
                 </section>
 
-            <Link to="wallet/create">
-            <div className="button outline"><Translate content="wallet.new_wallet" /></div>
-            </Link>
-
-            { is_dirty ? (
-            <div
-                className="button outline"
-                onClick={this.onConfirm.bind(this)}
-            >
-                <Translate content="wallet.change" name={this.state.current_wallet} />
-            </div>) : null}
-
+                <Link to="wallet/create">
+                    <div className="button outline">
+                        <Translate content="wallet.new_wallet" />
+                    </div>
+                </Link>
+
+                {is_dirty ? (
+                    <div
+                        className="button outline"
+                        onClick={this.onConfirm.bind(this)}
+                    >
+                        <Translate
+                            content="wallet.change"
+                            name={this.state.current_wallet}
+                        />
+                    </div>
+                ) : null}
             </div>
         );
     }
@@ -255,7 +308,6 @@ class ChangeActiveWallet extends Component {
 ChangeActiveWallet = connect(ChangeActiveWallet, connectObject);
 
 class WalletDelete extends Component {
-
     constructor() {
         super();
         this.state = {
@@ -272,26 +324,44 @@ class WalletDelete extends Component {
     }
 
     render() {
-        if(this.state.confirm === 1) {
+        if (this.state.confirm === 1) {
             return (
                 <div style={{paddingTop: 20}}>
-                    <h4><Translate content="wallet.delete_confirm_line1"/></h4>
-                    <Translate component="p" content="wallet.delete_confirm_line3"/>
-                    <br/>
-                    <div className="button outline" onClick={this.onConfirm2.bind(this)}>
-                        <Translate content="wallet.delete_confirm_line4" name={this.state.selected_wallet} />
+                    <h4>
+                        <Translate content="wallet.delete_confirm_line1" />
+                    </h4>
+                    <Translate
+                        component="p"
+                        content="wallet.delete_confirm_line3"
+                    />
+                    <br />
+                    <div
+                        className="button outline"
+                        onClick={this.onConfirm2.bind(this)}
+                    >
+                        <Translate
+                            content="wallet.delete_confirm_line4"
+                            name={this.state.selected_wallet}
+                        />
                     </div>
-                    <div className="button outline" onClick={this._onCancel.bind(this)} >
+                    <div
+                        className="button outline"
+                        onClick={this._onCancel.bind(this)}
+                    >
                         <Translate content="wallet.cancel" />
                     </div>
-
                 </div>
             );
         }
 
-
         // this.props.current_wallet
-        let placeholder = <option key="placeholder" value="" disabled={this.props.wallet_names.size > 1}></option>
+        let placeholder = (
+            <option
+                key="placeholder"
+                value=""
+                disabled={this.props.wallet_names.size > 1}
+            />
+        );
         // if (this.props.wallet_names.size > 1) {
         //     placeholder = <option value="" disabled>{placeholder}</option>;
         // }
@@ -300,37 +370,51 @@ class WalletDelete extends Component {
         //     //placeholder and selecting the 1st item automatically (not shown)
         //     placeholder = <option value="">{placeholder}</option>;
         // }
-        let options = [placeholder]
-        options.push(<option key="select_option" value="">{counterpart.translate("settings.delete_select")}&hellip;</option>)
-        this.props.wallet_names.forEach( wallet_name => {
-            options.push(<option key={wallet_name} value={wallet_name}>{wallet_name.toLowerCase()}</option>)
-        })
+        let options = [placeholder];
+        options.push(
+            <option key="select_option" value="">
+                {counterpart.translate("settings.delete_select")}&hellip;
+            </option>
+        );
+        this.props.wallet_names.forEach(wallet_name => {
+            options.push(
+                <option key={wallet_name} value={wallet_name}>
+                    {wallet_name.toLowerCase()}
+                </option>
+            );
+        });
 
-        let is_dirty = !!this.state.selected_wallet
+        let is_dirty = !!this.state.selected_wallet;
 
         return (
             <div style={{paddingTop: 20}}>
                 <section className="block-list">
-                <header><Translate content="wallet.delete_wallet" /></header>
-                <ul>
-                    <li className="with-dropdown" style={{borderBottom: 0}}>
-                        <select
-                            className="settings-select"
-                            value={this.state.selected_wallet || ""}
-                            style={{margin: "0 auto"}}
-                            onChange={this.onChange.bind(this)}
-                        >
-                            { options }
-                        </select>
-                    </li>
-                </ul>
+                    <header>
+                        <Translate content="wallet.delete_wallet" />
+                    </header>
+                    <ul>
+                        <li className="with-dropdown" style={{borderBottom: 0}}>
+                            <select
+                                className="settings-select"
+                                value={this.state.selected_wallet || ""}
+                                style={{margin: "0 auto"}}
+                                onChange={this.onChange.bind(this)}
+                            >
+                                {options}
+                            </select>
+                        </li>
+                    </ul>
                 </section>
                 <div
-                    className={ cname("button outline", {disabled: !is_dirty}) }
+                    className={cname("button outline", {disabled: !is_dirty})}
                     onClick={this.onConfirm.bind(this)}
                 >
                     <Translate
-                        content={this.state.selected_wallet ? "wallet.delete_wallet_name" : "wallet.delete_wallet"}
+                        content={
+                            this.state.selected_wallet
+                                ? "wallet.delete_wallet_name"
+                                : "wallet.delete_wallet"
+                        }
                         name={this.state.selected_wallet}
                     />
                 </div>
@@ -339,7 +423,7 @@ class WalletDelete extends Component {
     }
 
     onConfirm() {
-        this.setState({ confirm: 1 });
+        this.setState({confirm: 1});
     }
 
     onConfirm2() {
diff --git a/app/components/Wallet/WalletUnlockModal.jsx b/app/components/Wallet/WalletUnlockModal.jsx
index bad6c6b3a3..51925cce5e 100644
--- a/app/components/Wallet/WalletUnlockModal.jsx
+++ b/app/components/Wallet/WalletUnlockModal.jsx
@@ -18,10 +18,9 @@ import utils from "common/utils";
 import AccountSelector from "../Account/AccountSelector";
 
 class WalletUnlockModal extends React.Component {
-
     static contextTypes = {
         router: React.PropTypes.object
-    }
+    };
 
     constructor(props) {
         super();
@@ -57,9 +56,8 @@ class WalletUnlockModal extends React.Component {
 
     componentDidMount() {
         ZfApi.subscribe(this.props.modalId, (name, msg) => {
-            if(name !== this.props.modalId)
-                return;
-            if(msg === "close") {
+            if (name !== this.props.modalId) return;
+            if (msg === "close") {
                 //if(this.props.reject) this.props.reject()
                 WalletUnlockActions.cancel();
             } else if (msg === "open") {
@@ -68,10 +66,21 @@ class WalletUnlockModal extends React.Component {
                         this.refs.password_input.clear();
                         this.refs.password_input.focus();
                     }
-                    if(WalletDb.getWallet() && Apis.instance().chain_id !== WalletDb.getWallet().chain_id) {
-                        notify.error("This wallet was intended for a different block-chain; expecting " +
-                            WalletDb.getWallet().chain_id.substring(0,4).toUpperCase() + ", but got " +
-                            Apis.instance().chain_id.substring(0,4).toUpperCase());
+                    if (
+                        WalletDb.getWallet() &&
+                        Apis.instance().chain_id !==
+                            WalletDb.getWallet().chain_id
+                    ) {
+                        notify.error(
+                            "This wallet was intended for a different block-chain; expecting " +
+                                WalletDb.getWallet()
+                                    .chain_id.substring(0, 4)
+                                    .toUpperCase() +
+                                ", but got " +
+                                Apis.instance()
+                                    .chain_id.substring(0, 4)
+                                    .toUpperCase()
+                        );
                         ZfApi.publish(this.props.modalId, "close");
                         return;
                     }
@@ -82,7 +91,10 @@ class WalletUnlockModal extends React.Component {
         if (this.props.passwordLogin) {
             if (this.state.account_name) {
                 this.refs.password_input.focus();
-            } else if (this.refs.account_input && this.refs.account_input.refs.bound_component) {
+            } else if (
+                this.refs.account_input &&
+                this.refs.account_input.refs.bound_component
+            ) {
                 this.refs.account_input.refs.bound_component.refs.user_input.focus();
             }
         }
@@ -90,19 +102,21 @@ class WalletUnlockModal extends React.Component {
 
     componentDidUpdate() {
         //DEBUG console.log('... componentDidUpdate this.props.resolve', this.props.resolve)
-        if(this.props.resolve) {
-            if (WalletDb.isLocked())
-                ZfApi.publish(this.props.modalId, "open");
-            else
-                this.props.resolve();
+        if (this.props.resolve) {
+            if (WalletDb.isLocked()) ZfApi.publish(this.props.modalId, "open");
+            else this.props.resolve();
         }
     }
 
     onPasswordEnter(e) {
         const {passwordLogin} = this.props;
         e.preventDefault();
-        const password = passwordLogin ? this.refs.password_input.value : this.refs.password_input.value();
-        const account = passwordLogin ? this.state.account && this.state.account.get("name") : null;
+        const password = passwordLogin
+            ? this.refs.password_input.value
+            : this.refs.password_input.value();
+        const account = passwordLogin
+            ? this.state.account && this.state.account.get("name")
+            : null;
         this.setState({password_error: null});
         let {cloudMode} = WalletDb.validatePassword(
             password || "",
@@ -122,7 +136,10 @@ class WalletUnlockModal extends React.Component {
             ZfApi.publish(this.props.modalId, "close");
             this.props.resolve();
             WalletUnlockActions.change();
-            this.setState({password_input_reset: Date.now(), password_error: false});
+            this.setState({
+                password_input_reset: Date.now(),
+                password_error: false
+            });
         }
         return false;
     }
@@ -145,7 +162,12 @@ class WalletUnlockModal extends React.Component {
                 <div>
                     <Translate content="wallet.no_wallet" component="p" />
                     <div className="button-group">
-                        <div className="button" onClick={this._onCreateWallet.bind(this)}><Translate content="wallet.create_wallet" /></div>
+                        <div
+                            className="button"
+                            onClick={this._onCreateWallet.bind(this)}
+                        >
+                            <Translate content="wallet.create_wallet" />
+                        </div>
                     </div>
 
                     {/* <div onClick={this._toggleLoginType.bind(this)} className="button small outline float-right"><Translate content="wallet.switch_model_password" /></div> */}
@@ -153,7 +175,11 @@ class WalletUnlockModal extends React.Component {
             );
         }
         return (
-            <form className="full-width" onSubmit={this.onPasswordEnter} noValidate>
+            <form
+                className="full-width"
+                onSubmit={this.onPasswordEnter}
+                noValidate
+            >
                 <PasswordInput
                     ref="password_input"
                     onEnter={this.onPasswordEnter}
@@ -164,9 +190,19 @@ class WalletUnlockModal extends React.Component {
 
                 <div>
                     <div className="button-group">
-                        <button className="button" data-place="bottom" data-html data-tip={counterpart.translate("tooltip.login")} onClick={this.onPasswordEnter}><Translate content="header.unlock_short" /></button>
+                        <button
+                            className="button"
+                            data-place="bottom"
+                            data-html
+                            data-tip={counterpart.translate("tooltip.login")}
+                            onClick={this.onPasswordEnter}
+                        >
+                            <Translate content="header.unlock_short" />
+                        </button>
                         <Trigger close={this.props.modalId}>
-                            <div className="button primary hollow"><Translate content="account.perm.cancel" /></div>
+                            <div className="button primary hollow">
+                                <Translate content="account.perm.cancel" />
+                            </div>
                         </Trigger>
                     </div>
                     {/* <div onClick={this._toggleLoginType.bind(this)} className="button small outline float-right"><Translate content="wallet.switch_model_password" /></div> */}
@@ -189,12 +225,22 @@ class WalletUnlockModal extends React.Component {
         let tabIndex = 1;
 
         return (
-            <form onSubmit={this.onPasswordEnter} noValidate style={{paddingTop: 20, marginRight: "3.5rem"}}>
+            <form
+                onSubmit={this.onPasswordEnter}
+                noValidate
+                style={{paddingTop: 20, marginRight: "3.5rem"}}
+            >
                 {/* Dummy input to trick Chrome into disabling auto-complete */}
-                <input type="text" className="no-padding no-margin" style={{visibility: "hidden", height: 0}}/>
+                <input
+                    type="text"
+                    className="no-padding no-margin"
+                    style={{visibility: "hidden", height: 0}}
+                />
 
                 <div className="content-block">
-                    <AccountSelector label="account.name" ref="account_input"
+                    <AccountSelector
+                        label="account.name"
+                        ref="account_input"
                         accountName={account_name}
                         onChange={this.accountChanged.bind(this)}
                         onAccountChanged={this.onAccountChanged.bind(this)}
@@ -205,33 +251,59 @@ class WalletUnlockModal extends React.Component {
                     />
                 </div>
 
-                <div className="content-block" style={{marginBottom:"1.5rem"}}>
+                <div className="content-block" style={{marginBottom: "1.5rem"}}>
                     <div className="account-selector">
                         <div className="content-area">
                             <div className="header-area">
-                                <label className="left-label"><Translate content="settings.password" /></label>
+                                <label className="left-label">
+                                    <Translate content="settings.password" />
+                                </label>
                             </div>
                             <div className="input-area">
                                 <div className="inline-label input-wrapper">
                                     <div className="account-image">
-                                        <canvas style={{height: "2.4rem", width: "2.4rem"}}></canvas>
+                                        <canvas
+                                            style={{
+                                                height: "2.4rem",
+                                                width: "2.4rem"
+                                            }}
+                                        />
                                     </div>
-                                    <input ref="password_input" name="password" id="password" type="password" tabIndex={tabIndex++} />
+                                    <input
+                                        ref="password_input"
+                                        name="password"
+                                        id="password"
+                                        type="password"
+                                        tabIndex={tabIndex++}
+                                    />
                                 </div>
                             </div>
-                            {this.state.password_error ? <div className="error-area">
-                                <Translate content="wallet.pass_incorrect" />
-                            </div> : null}
+                            {this.state.password_error ? (
+                                <div className="error-area">
+                                    <Translate content="wallet.pass_incorrect" />
+                                </div>
+                            ) : null}
                         </div>
                     </div>
                 </div>
 
-
                 <div style={{marginLeft: "3.5rem"}}>
                     <div className="button-group">
-                        <button tabIndex={tabIndex++} className="button" type="submit" onClick={this.onPasswordEnter}><Translate content="header.unlock_short" /></button>
+                        <button
+                            tabIndex={tabIndex++}
+                            className="button"
+                            type="submit"
+                            onClick={this.onPasswordEnter}
+                        >
+                            <Translate content="header.unlock_short" />
+                        </button>
                         <Trigger close={this.props.modalId}>
-                            <div tabIndex={tabIndex++} className="button hollow primary"><Translate content="account.perm.cancel" /></div>
+                            <div
+                                tabIndex={tabIndex++}
+                                className="button hollow primary"
+                            >
+                                <Translate content="account.perm.cancel" />
+                            </div>
                         </Trigger>
                     </div>
                     {/* <div onClick={this._toggleLoginType.bind(this)} className="button small outline float-right"><Translate content="wallet.switch_model_wallet" /></div> */}
@@ -249,18 +321,21 @@ class WalletUnlockModal extends React.Component {
         // https://github.com/akiran/react-foundation-apps/issues/34
         return (
             // U N L O C K
-            <BaseModal 
+            <BaseModal
                 id={this.props.modalId}
                 ref="modal"
                 overlay={true}
                 overlayClose={false}
-                modalHeader={"header.unlock" + (passwordLogin ? "_password" : "")}
+                modalHeader={
+                    "header.unlock" + (passwordLogin ? "_password" : "")
+                }
             >
-                {passwordLogin ? this.renderPasswordLogin() : this.renderWalletLogin()}
+                {passwordLogin
+                    ? this.renderPasswordLogin()
+                    : this.renderWalletLogin()}
             </BaseModal>
         );
     }
-
 }
 
 WalletUnlockModal.defaultProps = {