diff --git a/.env b/.env
index 0a628577e..9c8e23b19 100644
--- a/.env
+++ b/.env
@@ -5,5 +5,3 @@ VUE_APP_REMOTE_CONNECTION_BACKEND_URL=https://stage-signaling.aepps.com
 VUE_APP_VAPID_PUBLIC_KEY=BJP4PnSPRizQofIOBhe8o-AlaElRYbp7Mi_nirXzPYkJPkZfu-ONL7M14Y2c_q9LfU1K3XUcwzfx3lNM_jBLJrc
 VUE_APP_MATOMO_URL=https://analytics-other.aepps.com
 VUE_APP_MATOMO_SITE_ID=1
-VUE_APP_COUNTLY_URL=https://analytics.aepps.com
-VUE_APP_COUNTLY_APP_KEY=a14d0329eab4b17923ccbe7b6ca271e29d4906fc
diff --git a/README.md b/README.md
index 6e1e8619c..3df52ea5b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,12 @@
-# Base æpp
+# Base æpp [![Build Status](https://api.travis-ci.org/aeternity/aepp-base.svg?branch=master)](https://api.travis-ci.org/aeternity/aepp-base)
+
+## How to get the Base æpp
+
+* [Google Play](https://play.google.com/store/apps/details?id=com.aeternity.base)
+* [App Store](https://apps.apple.com/ru/app/base-%C3%A6pp-wallet/id1458655724)
+* [Web version](https://base.aepps.com/)
+
+Also join our [Telegram channel](https://t.me/aeppbase) and our [Forum](https://forum.aeternity.com/t/base-aepp-wallet-we-would-like-your-feedback/3387).
 
 ## Build Setup
 
@@ -12,17 +20,44 @@ npm run serve
 # serve with hot reload at https://localhost:8080/
 npm run serve -- --https
 
+# run on android emulator or device
+npm run serve:android
+
+# run on ios emulator
+npm run serve:ios
+
 # build for production with minification
 npm run build
 
 # build for production and view the bundle analyzer report
 npm run build -- --report
 
+# generate resources for cordova
+npm run gen:cordova-resource
+
+# build for cordova
+npm run build:cordova
+
+# build an app file
+npm run build:ios
+
+# build an apk file
+npm run build:android
+
 # run unit tests
 npm run test:unit
 
+# run e2e tests
+npm run test:e2e
+
 # run all tests
 npm test
+
+# build a storybook
+npm run storybook:build
+
+# serve a storybook at http://localhost:6006
+npm run storybook:serve
 ```
 
 ## Contributing
@@ -35,16 +70,28 @@ We use the [gitflow](https://danielkummer.github.io/git-flow-cheatsheet/) workfl
 * Create a PR to master which then also has to be accepted.
 * Create a tag for this version and push the tag.
 * Also merge back the changes (like the version bump) into develop.
-* The master branch is deployed to the [live environment](https://identity.aepps.com) by travis.
+* The master branch has to be deployed to the [production environment](https://base.aepps.com/) manually.
 
-## Live vs. Stage
+## Deployment
 
-We have a stage (develop) and a live (master) branch and environments where these branches will be deployed to.
+We have a stage (develop) and a production (master) branch and environments where these branches will be deployed to.
 * [stage environment](https://stage-identity.aepps.com)
-* [live environment](https://identity.aepps.com)
+* [production environment](https://base.aepps.com/)
 
 ### stage
-* Is used to see changes to the code in effect in a "real" environment without the fear of breaking the live environment.
+* Is used to see changes to the code in effect in a "real" environment without the fear of breaking the production environment.
+
+### production
+* Is the production environment, code lives in the "master" branch.
+
+### other branches
+* Every branch is auto-deployed on https://`branch-name`.origin.aepps.com/, with each `/`, `.` symbol in a branch name replaced by `-`.
+
+### unsigned .apk and .app file
+* Find `aetenity.app.tar.gz` file in the [latest release](https://github.com/aeternity/aepp-base/releases/latest) or download corresponding
+version from a branch https://`branch-name`.origin.aepps.com/aetenity.app.tar.gz
+* Find `aeternity.apk` file in the [latest release](https://github.com/aeternity/aepp-base/releases/latest) or download corresponding
+version from a branch https://`branch-name`.origin.aepps.com/aeternity.apk
 
-### live
-* Is the live environment, code lives in the "master" branch
+### bundle analyzer report
+* Get bundle analyzer report on each domain by adding /report.html. Example [https://stage-identity.aepps.com/report.html](https://stage-identity.aepps.com/report.html).
diff --git a/config.xml b/config.xml
index e0375c82a..71980012b 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.aeternity.base" version="0.8.5" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.aeternity.base" version="0.8.6" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Base æpp</name>
     <author href="https://aeternity.com">
         aeternity developers
@@ -18,6 +18,7 @@
         <access origin="cors-anywhere.herokuapp.com" />
         <allow-intent href="market:*" />
         <preference name="SplashMaintainAspectRatio" value="true" />
+        <preference name="HeaderColor" value="#f7296e" />
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:usesCleartextTraffic="true" />
         </edit-config>
@@ -40,6 +41,7 @@
     <feature name="SplashScreen">
         <param name="onload" value="true" />
     </feature>
+    <preference name="StatusBarBackgroundColor" value="#ff0d6a" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
     <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
     <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
@@ -51,6 +53,9 @@
     <plugin name="cordova-plugin-wkwebview-engine" spec="github:mwchambers/cordova-plugin-wkwebview-engine#da67d6bb6ce8597c38fc69e66b84566e34efea8d" />
     <plugin name="com.lampa.startapp" spec="^6.1.6" />
     <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.5" />
+    <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
+    <plugin name="cordova-plugin-headercolor" spec="^1.0.0" />
+    <plugin name="cordova-clipboard" spec="github:ihadeed/cordova-clipboard#12dadc710dd2d374f942abe746ae2f828112e934" />
     <engine name="android" spec="^8.0.0" />
     <engine name="ios" spec="^5.0.0" />
 </widget>
diff --git a/package-lock.json b/package-lock.json
index a8a19ade8..18a1bb44a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,12 @@
 {
   "name": "aepp-base",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@aeternity/aepp-sdk": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-3.4.1.tgz",
-      "integrity": "sha512-GpVmD1olWxsjteAe1+Os9eY0fsQsJa8NywLTMWqtnBpTyAtoogsngBdJkSm8PFAxJCjaKPm3AVFYgCz6/H7aOQ==",
+      "version": "github:aeternity/aepp-sdk-js#9a959c61b4a2c0e7ff344cd2a6b15e66072c94fe",
+      "from": "github:aeternity/aepp-sdk-js#9a959c61b4a2c0e7ff344cd2a6b15e66072c94fe",
       "requires": {
         "@aeternity/bip39": "^0.1.0",
         "@babel/runtime": "^7.0.0-beta.46",
@@ -22,7 +21,6 @@
         "bs58check": "^2.1.1",
         "commander": "^2.14.1",
         "joi-browser": "^13.4.0",
-        "json-bigint": "github:davidyuk/json-bigint",
         "libsodium-wrappers-sumo": "0.7.3",
         "ramda": "^0.25.0",
         "rlp": "2.1.0",
@@ -30,7 +28,6 @@
         "sha.js": "^2.4.11",
         "tweetnacl": "^1.0.0",
         "tweetnacl-auth": "^1.0.1",
-        "universal-url": "^2.0.0",
         "uuid": "^3.3.2",
         "websocket": "^1.0.26"
       }
@@ -107,9 +104,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -894,9 +891,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -1146,16 +1143,23 @@
       "dev": true
     },
     "@hapi/joi": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.0.3.tgz",
-      "integrity": "sha512-z6CesJ2YBwgVCi+ci8SI8zixoj8bGFn/vZb9MBPbSyoxsS2PnWYjHcyTM17VLK6tx64YVK38SDIh10hJypB+ig==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz",
+      "integrity": "sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==",
       "dev": true,
       "requires": {
         "@hapi/address": "2.x.x",
         "@hapi/hoek": "6.x.x",
+        "@hapi/marker": "1.x.x",
         "@hapi/topo": "3.x.x"
       }
     },
+    "@hapi/marker": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz",
+      "integrity": "sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==",
+      "dev": true
+    },
     "@hapi/topo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.0.tgz",
@@ -1218,9 +1222,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "through2": {
@@ -1235,45 +1239,45 @@
       }
     },
     "@ledgerhq/devices": {
-      "version": "4.61.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-4.61.0.tgz",
-      "integrity": "sha512-ZBXtV4JFOSvxwfr9PwoAfOdh9Qb/nIPpMR69uG0BwCkz6KzFyJWinsJvf+wFBQmnxDJKcPz2eWrCEL/viQ0HOQ==",
+      "version": "4.63.2",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-4.63.2.tgz",
+      "integrity": "sha512-91kWtrAcGoAV5zNWBDTMF3gqwMBvyZBvDnSiOJ2Top3hZvHUrwLqb6HuA87bOwPDIWBnW4BVGWswy2VnYb/ueQ==",
       "requires": {
-        "@ledgerhq/errors": "^4.61.0",
-        "@ledgerhq/logs": "^4.61.0",
+        "@ledgerhq/errors": "^4.63.2",
+        "@ledgerhq/logs": "^4.62.0",
         "rxjs": "^6.5.2"
       }
     },
     "@ledgerhq/errors": {
-      "version": "4.61.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-4.61.0.tgz",
-      "integrity": "sha512-sEbAF7H/0EL8WiQ+m2qaZFzIJjtrXUFaxHyI4J/FSgK3uszDAVcnXwetq7TFOswZtPS2u2g/5oa1/iuoNVKwXQ=="
+      "version": "4.63.2",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-4.63.2.tgz",
+      "integrity": "sha512-NF4KkRQ2X1ZEmaxcCXUv0VNHaMqy/t/PXvii5IoZeNochQn56DlXcbgMzZ8HBpGQYTLdZuliT7RjKSZmUMjhrg=="
     },
     "@ledgerhq/hw-transport": {
-      "version": "4.61.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-4.61.0.tgz",
-      "integrity": "sha512-jsITF3HAttITBVKZOEASeTSBENbnrhcZmyxhiI1ijRFqDSEAPp7LuttNnI1d99301/4dWZV9NSe40naBsCJHXQ==",
+      "version": "4.63.2",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-4.63.2.tgz",
+      "integrity": "sha512-WtejtJXyeDQe+ppiOvES2bxWaXkmHLxrwCt2cQzq2wvrH32AABE652isIxkJfUst0Q6p2QwCKO6YZN2PZiSRuQ==",
       "requires": {
-        "@ledgerhq/devices": "^4.61.0",
-        "@ledgerhq/errors": "^4.61.0",
+        "@ledgerhq/devices": "^4.63.2",
+        "@ledgerhq/errors": "^4.63.2",
         "events": "^3.0.0"
       }
     },
     "@ledgerhq/hw-transport-u2f": {
-      "version": "4.61.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.61.0.tgz",
-      "integrity": "sha512-qQlELJcwdtheE2WmPPVZo43F+Pa1IppzsXID8j89VVjwAKk22uCI0a75pyPG3Of2H07BZVab+jqL3fxzPEMCPw==",
+      "version": "4.63.2",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.63.2.tgz",
+      "integrity": "sha512-IvsR1PBwSrmrg83gfmTXzcaFrC/txZScjbNYHEQ1JTv8cB5W+lt4Y2zwD4mrpArc7kRJvrYeJy4M2UJJQgkB3Q==",
       "requires": {
-        "@ledgerhq/errors": "^4.61.0",
-        "@ledgerhq/hw-transport": "^4.61.0",
-        "@ledgerhq/logs": "^4.61.0",
+        "@ledgerhq/errors": "^4.63.2",
+        "@ledgerhq/hw-transport": "^4.63.2",
+        "@ledgerhq/logs": "^4.62.0",
         "u2f-api": "0.2.7"
       }
     },
     "@ledgerhq/logs": {
-      "version": "4.61.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-4.61.0.tgz",
-      "integrity": "sha512-AObEnA+tgzKEwY306i6FOT/hlc+zjF817Bty/IxG3f2wPJFRK9cJuD3Ijl4pfJP2pt7KubN4YbRGXREXhEsknQ=="
+      "version": "4.62.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-4.62.0.tgz",
+      "integrity": "sha512-f/XtWHzHxE4AJlB53vZllH/4gY3t7n1vNoGkjHFfu3keLmbyHWC1sGdG+lW9FRlToSLQuVotGIbm04SBn0vSIQ=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -1724,9 +1728,9 @@
           }
         },
         "inquirer": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
-          "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.4.1.tgz",
+          "integrity": "sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==",
           "dev": true,
           "requires": {
             "ansi-escapes": "^3.2.0",
@@ -1997,9 +2001,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz",
-      "integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==",
+      "version": "12.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.10.tgz",
+      "integrity": "sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -2341,9 +2345,9 @@
       }
     },
     "@vue/cli-service": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.8.0.tgz",
-      "integrity": "sha512-ipJF4RHjyLyLC4oLx+JM1Jk6tiIG0KjCFAqfOscQ44K4CdyS03oFMAUR+SZYy/UXKccMnoeY6Ld4YrGXSytQsg==",
+      "version": "3.8.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.8.4.tgz",
+      "integrity": "sha512-OWKTPZN+Wk3gpd8ar6DsQWlpIFPCIULZuVsHarJXjlXpIx3FOleXzaT2QiDB+tprbTRZMfsMMZMt5b0nvacY9Q==",
       "dev": true,
       "requires": {
         "@intervolga/optimize-cssnano-plugin": "^1.0.5",
@@ -2369,6 +2373,7 @@
         "cssnano": "^4.1.10",
         "current-script-polyfill": "^1.0.0",
         "debug": "^4.1.1",
+        "default-gateway": "^5.0.2",
         "dotenv": "^7.0.0",
         "dotenv-expand": "^5.1.0",
         "escape-string-regexp": "^1.0.5",
@@ -2457,9 +2462,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "parse-json": {
@@ -2485,9 +2490,9 @@
           }
         },
         "semver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
           "dev": true
         },
         "string-width": {
@@ -2535,9 +2540,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
           "dev": true
         }
       }
@@ -3385,16 +3390,17 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz",
-      "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.0.tgz",
+      "integrity": "sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.5.4",
-        "caniuse-lite": "^1.0.30000957",
+        "browserslist": "^4.6.1",
+        "caniuse-lite": "^1.0.30000971",
+        "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.14",
+        "postcss": "^7.0.16",
         "postcss-value-parser": "^3.3.1"
       }
     },
@@ -3485,9 +3491,9 @@
       "dev": true
     },
     "babel-eslint": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
-      "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz",
+      "integrity": "sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -3627,9 +3633,9 @@
       }
     },
     "babel-plugin-dynamic-import-node": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.2.0.tgz",
-      "integrity": "sha512-fP899ELUnTaBcIzmrW7nniyqqdYWrWuJUyPWHxFa/c7r7hS6KC8FscNfLlBNIoPSc55kYMGEEKjPjJGCLbE1qA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
       "dev": true,
       "requires": {
         "object.assign": "^4.1.0"
@@ -3654,9 +3660,9 @@
       "dev": true
     },
     "babel-plugin-macros": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.0.tgz",
-      "integrity": "sha512-6hrXm6NIoSp+JiqhHZ6tUemhClnu//vjx9fAU5tkRCztTKxgiUpFpMDBX4yZiJIco7qkf0CPX2u4Ax3x6GCiUg==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz",
+      "integrity": "sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.4.2",
@@ -4214,9 +4220,9 @@
       }
     },
     "big-integer": {
-      "version": "1.6.43",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
-      "integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==",
+      "version": "1.6.44",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz",
+      "integrity": "sha512-7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ==",
       "dev": true
     },
     "big.js": {
@@ -4564,14 +4570,14 @@
       }
     },
     "browserslist": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.1.tgz",
-      "integrity": "sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz",
+      "integrity": "sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000971",
-        "electron-to-chromium": "^1.3.137",
-        "node-releases": "^1.1.21"
+        "caniuse-lite": "^1.0.30000975",
+        "electron-to-chromium": "^1.3.164",
+        "node-releases": "^1.1.23"
       }
     },
     "bs58": {
@@ -4593,9 +4599,9 @@
       }
     },
     "bser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
-      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
+      "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
       "dev": true,
       "requires": {
         "node-int64": "^0.4.0"
@@ -4685,22 +4691,22 @@
       "dev": true
     },
     "cacache": {
-      "version": "11.3.2",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+      "version": "11.3.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
+      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.3",
+        "bluebird": "^3.5.5",
         "chownr": "^1.1.1",
         "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.3",
+        "glob": "^7.1.4",
         "graceful-fs": "^4.1.15",
         "lru-cache": "^5.1.1",
         "mississippi": "^3.0.0",
         "mkdirp": "^0.5.1",
         "move-concurrently": "^1.0.1",
         "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
+        "rimraf": "^2.6.3",
         "ssri": "^6.0.1",
         "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
@@ -4850,9 +4856,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000971",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
-      "integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==",
+      "version": "1.0.30000977",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000977.tgz",
+      "integrity": "sha512-RTXL32vdfAc2g9aoDL6vnBzbOO/3sM+T+YX4m7W9iFZnl3qIz7WYoZZpcZpALud8xq4+N56rnruX/NQy9HQu6A==",
       "dev": true
     },
     "capture-exit": {
@@ -5239,9 +5245,9 @@
           }
         },
         "yargs-parser": {
-          "version": "13.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz",
-          "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==",
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -5317,9 +5323,9 @@
       "dev": true
     },
     "clipboardy": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.0.0.tgz",
-      "integrity": "sha512-XbVjHMsss0giNUkp/tV/3eEAZe8i1fZTLzmPKqjE1RGIAWOTiF5D014f6R+g53ZAq0IK3cPrJXFvqE8eQjhFYQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.1.0.tgz",
+      "integrity": "sha512-2pzOUxWcLlXWtn+Jd6js3o12TysNOOVes/aQfg+MT/35vrxWzedHlLwyoJpXjsFKWm95BTNEcMGD9+a7mKzZkQ==",
       "dev": true,
       "requires": {
         "arch": "^2.1.1",
@@ -5433,9 +5439,9 @@
       }
     },
     "color": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.1.tgz",
-      "integrity": "sha512-PvUltIXRjehRKPSy89VnDWFKY58xyhTLyxIg21vwQBI6qLwZNPmC8k3C1uytIgFKEpOIzN4y32iPm8231zFHIg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
@@ -5973,9 +5979,9 @@
       "dev": true
     },
     "cordova-common": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
-      "integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.0.tgz",
+      "integrity": "sha512-EvlQ6PirfR65hGDoQvsluW00uSS2MTVIRKQ3c1Xvsddx7D5T5JgF3fHWkGik/Y/8yNcpI0zI2NcJyie2z/ak2A==",
       "dev": true,
       "requires": {
         "ansi": "^0.3.1",
@@ -5983,7 +5989,7 @@
         "cross-spawn": "^6.0.5",
         "elementtree": "0.1.7",
         "endent": "^1.1.1",
-        "fs-extra": "^7.0.0",
+        "fs-extra": "^8.0.0",
         "glob": "^7.1.2",
         "minimatch": "^3.0.0",
         "plist": "^3.0.1",
@@ -5994,9 +6000,9 @@
       },
       "dependencies": {
         "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.2",
@@ -6221,9 +6227,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "sharp": {
@@ -6296,11 +6302,6 @@
         }
       }
     },
-    "countly-sdk-web": {
-      "version": "19.2.1",
-      "resolved": "https://registry.npmjs.org/countly-sdk-web/-/countly-sdk-web-19.2.1.tgz",
-      "integrity": "sha512-EcVxRjwIREaMaGy9Th4cIbB4RZ9PVFT3AdD/2vbSgMWRvbEGDJMtP0H5cBiS1zIExBiOEAuu77BPSiU2sO/8Og=="
-    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
@@ -6802,9 +6803,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "ramda": {
@@ -6833,6 +6834,19 @@
         "abab": "^2.0.0",
         "whatwg-mimetype": "^2.2.0",
         "whatwg-url": "^7.0.0"
+      },
+      "dependencies": {
+        "whatwg-url": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+          "dev": true,
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        }
       }
     },
     "date-fns": {
@@ -6912,9 +6926,9 @@
       "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
     },
     "default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.2.tgz",
+      "integrity": "sha512-wXuT0q8T5vxQNecrTgz/KbU2lPUMRc98I9Y5dnH3yhFB3BGYqtADK4lhivLlG0OfjhmfKx1PGILG2jR4zjI+WA==",
       "dev": true,
       "requires": {
         "execa": "^1.0.0",
@@ -7409,15 +7423,15 @@
       "dev": true
     },
     "ejs": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
-      "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz",
+      "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==",
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.143",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.143.tgz",
-      "integrity": "sha512-J9jOpxIljQZlV6GIP2fwAWq0T69syawU0sH3EW3O2Bgxquiy+veeIT5mBDRz+i3oHUSL1tvVgRKH3/4QiQh9Pg==",
+      "version": "1.3.173",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.173.tgz",
+      "integrity": "sha512-weH16m8as+4Fy4XJxrn/nFXsIqB7zkxERhvj/5YX2HE4HB8MCu98Wsef4E3mu0krIT27ic0bGsr+TvqYrUn6Qg==",
       "dev": true
     },
     "elegant-spinner": {
@@ -7444,9 +7458,9 @@
       }
     },
     "elliptic": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
+      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
@@ -7827,9 +7841,9 @@
           }
         },
         "inquirer": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
-          "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.4.1.tgz",
+          "integrity": "sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==",
           "dev": true,
           "requires": {
             "ansi-escapes": "^3.2.0",
@@ -7871,9 +7885,9 @@
           "dev": true
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "regexpp": {
@@ -7919,9 +7933,9 @@
           }
         },
         "table": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
-          "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz",
+          "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==",
           "dev": true,
           "requires": {
             "ajv": "^6.9.1",
@@ -8115,9 +8129,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.17.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz",
-      "integrity": "sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz",
+      "integrity": "sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==",
       "dev": true,
       "requires": {
         "array-includes": "^3.0.3",
@@ -8215,9 +8229,9 @@
       }
     },
     "eslint-plugin-vue": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz",
-      "integrity": "sha512-CtGWH7IB0DA6BZOwcV9w9q3Ri6Yuo8qMjx05SmOGJ6X6E0Yo3y9E/gQ5tuNxg2dEt30tRnBoFTbvtmW9iEoyHA==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz",
+      "integrity": "sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==",
       "dev": true,
       "requires": {
         "vue-eslint-parser": "^5.0.0"
@@ -8256,9 +8270,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "vue-eslint-parser": {
@@ -9143,9 +9157,9 @@
       }
     },
     "flatted": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
-      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
       "dev": true
     },
     "flush-write-stream": {
@@ -10058,13 +10072,13 @@
       "dev": true
     },
     "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
       "dev": true,
       "requires": {
         "min-document": "^2.19.0",
-        "process": "~0.5.1"
+        "process": "^0.11.10"
       }
     },
     "global-dirs": {
@@ -10363,11 +10377,6 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
-    "hasurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hasurl/-/hasurl-1.0.0.tgz",
-      "integrity": "sha512-43ypUd3DbwyCT01UYpA99AEZxZ4aKtRxWGBHEIbjcOsUghd9YUON0C+JF6isNjaiwC/UF5neaUudy6JS9jZPZQ=="
-    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -10623,12 +10632,20 @@
         "setprototypeof": "1.1.1",
         "statuses": ">= 1.5.0 < 2",
         "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
       }
     },
     "http-parser-js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
       "dev": true
     },
     "http-proxy": {
@@ -10867,9 +10884,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
       "version": "1.3.5",
@@ -11035,9 +11052,9 @@
           }
         },
         "inquirer": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
-          "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.4.1.tgz",
+          "integrity": "sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==",
           "dev": true,
           "requires": {
             "ansi-escapes": "^3.2.0",
@@ -11112,6 +11129,18 @@
       "requires": {
         "default-gateway": "^4.2.0",
         "ipaddr.js": "^1.9.0"
+      },
+      "dependencies": {
+        "default-gateway": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+          "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "ip-regex": "^2.1.0"
+          }
+        }
       }
     },
     "interpret": {
@@ -11321,10 +11350,14 @@
       "dev": true
     },
     "is-dom": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.0.9.tgz",
-      "integrity": "sha1-SDgy1SlyBz3hK5/j9gMghw2oNw0=",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.1.0.tgz",
+      "integrity": "sha512-u82f6mvhYxRPKpw8V1N0W8ce1xXwOrQtgGcxl6UCL5zBmZu3is/18K0rR7uFCnMDuAsS/3W54mGL4vsaFUQlEQ==",
+      "dev": true,
+      "requires": {
+        "is-object": "^1.0.1",
+        "is-window": "^1.0.2"
+      }
     },
     "is-dotfile": {
       "version": "1.0.3",
@@ -11434,6 +11467,12 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
     "is-path-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz",
@@ -11588,6 +11627,12 @@
       "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=",
       "dev": true
     },
+    "is-window": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz",
+      "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0=",
+      "dev": true
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -12974,17 +13019,6 @@
         "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
-        "whatwg-url": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-          "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-          "dev": true,
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        },
         "ws": {
           "version": "5.2.2",
           "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
@@ -13002,13 +13036,6 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
-    "json-bigint": {
-      "version": "github:davidyuk/json-bigint#64b099a5d8e9d1210175db0a13cfd7ab0c66d85a",
-      "from": "github:davidyuk/json-bigint",
-      "requires": {
-        "bignumber.js": "^8.0.0"
-      }
-    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -13691,7 +13718,8 @@
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
     },
     "lodash.tail": {
       "version": "4.1.1",
@@ -13777,9 +13805,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.2.tgz",
-      "integrity": "sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
+      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==",
       "dev": true
     },
     "loose-envify": {
@@ -13822,9 +13850,9 @@
       }
     },
     "macos-release": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.2.0.tgz",
-      "integrity": "sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
+      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==",
       "dev": true
     },
     "make-dir": {
@@ -14058,9 +14086,9 @@
       }
     },
     "mime": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
-      "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
       "dev": true
     },
     "mime-db": {
@@ -14200,9 +14228,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -14377,9 +14405,9 @@
       }
     },
     "node-abi": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
-      "integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.9.0.tgz",
+      "integrity": "sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA==",
       "dev": true,
       "requires": {
         "semver": "^5.4.1"
@@ -14487,9 +14515,9 @@
       }
     },
     "node-libs-browser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
-      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
       "dev": true,
       "requires": {
         "assert": "^1.1.1",
@@ -14502,7 +14530,7 @@
         "events": "^3.0.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
+        "path-browserify": "0.0.1",
         "process": "^0.11.10",
         "punycode": "^1.2.4",
         "querystring-es3": "^0.2.0",
@@ -14514,15 +14542,9 @@
         "tty-browserify": "0.0.0",
         "url": "^0.11.0",
         "util": "^0.11.0",
-        "vm-browserify": "0.0.4"
+        "vm-browserify": "^1.0.1"
       },
       "dependencies": {
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -14545,9 +14567,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.22",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.22.tgz",
-      "integrity": "sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz",
+      "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
@@ -15195,6 +15217,15 @@
       "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "requires": {
+        "retry": "^0.12.0"
+      }
+    },
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
@@ -15349,9 +15380,9 @@
       "dev": true
     },
     "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
       "dev": true
     },
     "path-dirname": {
@@ -15580,9 +15611,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz",
-      "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
+      "version": "7.0.17",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
+      "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -15688,37 +15719,13 @@
       }
     },
     "postcss-load-config": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
-      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^4.0.0",
+        "cosmiconfig": "^5.0.0",
         "import-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "cosmiconfig": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-          "dev": true,
-          "requires": {
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.9.0",
-            "parse-json": "^4.0.0",
-            "require-from-string": "^2.0.1"
-          }
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        }
       }
     },
     "postcss-loader": {
@@ -16280,15 +16287,15 @@
       "dev": true
     },
     "process": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
       "dev": true
     },
     "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
     "progress": {
@@ -16408,9 +16415,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.1.32",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
-      "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==",
+      "version": "1.1.33",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.33.tgz",
+      "integrity": "sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw==",
       "dev": true
     },
     "public-encrypt": {
@@ -16463,7 +16470,8 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
     },
     "q": {
       "version": "1.5.1",
@@ -16720,9 +16728,9 @@
           }
         },
         "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
           "dev": true,
           "requires": {
             "websocket-driver": ">=0.5.1"
@@ -17523,12 +17531,6 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -17559,9 +17561,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
-      "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -17632,6 +17634,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true
+    },
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -18018,9 +18026,9 @@
       "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="
     },
     "serve": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/serve/-/serve-11.0.1.tgz",
-      "integrity": "sha512-kmcR5jOumMcmoDVJk7izj2Gnz+ql4K3Xq1g0l4XX598lLYvbXgfS1oeTgckPVGzsk0MU/dBPHiolRgH0fI7c5g==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/serve/-/serve-11.0.2.tgz",
+      "integrity": "sha512-TjjjwUdPU+STkUyxvZFtkWOTRXdNDNMfot9Z/f97eEeyjPAV69o1TmJrNAlDbvpPu1JEjCoWiGCjkel7kWNF4A==",
       "dev": true,
       "requires": {
         "@zeit/schemas": "2.6.0",
@@ -18030,7 +18038,7 @@
         "chalk": "2.4.1",
         "clipboardy": "1.2.3",
         "compression": "1.7.3",
-        "serve-handler": "6.0.1",
+        "serve-handler": "6.0.2",
         "update-check": "1.5.2"
       },
       "dependencies": {
@@ -18175,9 +18183,9 @@
       }
     },
     "serve-handler": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.1.tgz",
-      "integrity": "sha512-k/im4Fbx96d8VcrJDjrsagNd9Vq18tVYRDDe90rpNO8Mr76KJF/zES5tBZdlLEbhBXjOs36m9Wl+hRCiDnYfmA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.2.tgz",
+      "integrity": "sha512-D1zgDpvx9Rgjip6rzY2QBjlZwfr/oiDSg66HipOWkEw1appHn7/mXdVRL6F8+bd1KD117Wch4+4x78OTXQVwDg==",
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
@@ -18267,6 +18275,12 @@
             "statuses": ">= 1.4.0 < 2"
           }
         },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
@@ -18294,9 +18308,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -18381,9 +18395,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
           "dev": true
         }
       }
@@ -18712,18 +18726,18 @@
           }
         },
         "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
           "dev": true,
           "requires": {
             "websocket-driver": ">=0.5.1"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -18850,9 +18864,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -18881,9 +18895,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "readable-stream": {
@@ -19310,46 +19324,34 @@
       }
     },
     "svg-url-loader": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-2.3.2.tgz",
-      "integrity": "sha1-3YaybBn+O5FPBOoQ7zlZTq3gRGQ=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-2.3.3.tgz",
+      "integrity": "sha512-dFXrXCrtyEucN6dWdvDGMipbVwPPez4OVVYUpxJwLJ5WuaPLYY9RmpOjUparDNs1+sPEXrsdDGIOCOK8NOy5VQ==",
       "dev": true,
       "requires": {
-        "file-loader": "1.1.11",
-        "loader-utils": "1.1.0"
+        "file-loader": "4.0.0",
+        "loader-utils": "1.2.3"
       },
       "dependencies": {
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
-        },
         "file-loader": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
-          "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.0.0.tgz",
+          "integrity": "sha512-roAbL6IdSGczwfXxhMi6Zq+jD4IfUpL0jWHD7fvmjdOVb7xBfdRUHe4LpBgO23VtVK5AW1OlWZo0p34Jvx3iWg==",
           "dev": true,
           "requires": {
-            "loader-utils": "^1.0.2",
-            "schema-utils": "^0.4.5"
+            "loader-utils": "^1.2.2",
+            "schema-utils": "^1.0.0"
           }
         },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         }
       }
@@ -19377,12 +19379,12 @@
       }
     },
     "svgo-loader": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/svgo-loader/-/svgo-loader-2.2.0.tgz",
-      "integrity": "sha512-AtIy4kmUQc1zo+QK3ZFvRrULRZAhUC63cLJxdVo1cONZ9WeYAkySUlaB05uZKKcYpsTb/9tDsBSXMab3/0QWtw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/svgo-loader/-/svgo-loader-2.2.1.tgz",
+      "integrity": "sha512-9dyz/h6ae04pAVRz7QY8bLXtMbwA19NPpCPfCixgW0qXNDCOlHbDRqvtT5/2gzRxfuibWCUP6ZBQmZWF9rjWhQ==",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.12.0",
+        "js-yaml": "^3.13.1",
         "loader-utils": "^1.0.3"
       }
     },
@@ -19393,9 +19395,9 @@
       "dev": true
     },
     "symbol-tree": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
     "symbol.prototype.description": {
@@ -19548,9 +19550,9 @@
       }
     },
     "tar": {
-      "version": "4.4.9",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.9.tgz",
-      "integrity": "sha512-xisFa7Q2i3HOgfn+nmnWLGHD6Tm23hxjkx6wwGmgxkJFr6wxwXnJOdJYcZjL453PSdF0+bemO03+flAzkIdLBQ==",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz",
+      "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==",
       "dev": true,
       "requires": {
         "chownr": "^1.1.1",
@@ -20065,6 +20067,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
       "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -20122,9 +20125,9 @@
       }
     },
     "tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
     },
     "tty-browserify": {
       "version": "0.0.0",
@@ -20199,9 +20202,9 @@
       "integrity": "sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg=="
     },
     "ua-parser-js": {
-      "version": "0.7.19",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz",
-      "integrity": "sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==",
+      "version": "0.7.20",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
+      "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==",
       "dev": true
     },
     "uglify-js": {
@@ -20259,38 +20262,15 @@
       "dev": true
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "uniq": {
@@ -20315,9 +20295,9 @@
       }
     },
     "unique-slug": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
@@ -20332,15 +20312,6 @@
         "crypto-random-string": "^1.0.0"
       }
     },
-    "universal-url": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universal-url/-/universal-url-2.0.0.tgz",
-      "integrity": "sha512-3DLtXdm/G1LQMCnPj+Aw7uDoleQttNHp2g5FnNQKR6cP6taNWS1b/Ehjjx4PVyvejKi3TJyu8iBraKM4q3JQPg==",
-      "requires": {
-        "hasurl": "^1.0.0",
-        "whatwg-url": "^7.0.0"
-      }
-    },
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -20597,6 +20568,14 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
       }
     },
     "util-deprecate": {
@@ -20664,9 +20643,9 @@
       "dev": true
     },
     "vee-validate": {
-      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.2.9.tgz",
-      "integrity": "sha512-+nfg8dwH3rDOg8Y9sZ1TCvFFWXecRxG2L6sZelQECKrqLVjX4/UuFoyezhfPGMTfI6Lx66ygERgeRdOw4S3r4g=="
+      "version": "2.2.11",
+      "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.2.11.tgz",
+      "integrity": "sha512-wQMhq1cPOk+eaE+iKVyoyEUp1mczpeSvL4V3sardi9+KMgDw853kCd6v0iajdH8uUSpj319BVdXkmDlx1qWFog=="
     },
     "velocity-animate": {
       "version": "1.5.2",
@@ -20704,13 +20683,10 @@
       }
     },
     "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
+      "dev": true
     },
     "vue": {
       "version": "2.6.10",
@@ -20948,7 +20924,8 @@
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+      "dev": true
     },
     "webpack": {
       "version": "4.28.4",
@@ -21042,9 +21019,9 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.5.1.tgz",
-      "integrity": "sha512-0IdMGddJcnK9zesZOeHWl4uAOVfypn7DSrdNWtclROkVBXy/TcBN+6eEG1wNfLT9dXVfaRZZsLTJt0mJtgTQgw==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz",
+      "integrity": "sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -21061,8 +21038,9 @@
         "internal-ip": "^4.3.0",
         "ip": "^1.1.5",
         "killable": "^1.0.1",
-        "loglevel": "^1.6.2",
+        "loglevel": "^1.6.3",
         "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
         "portfinder": "^1.0.20",
         "schema-utils": "^1.0.0",
         "selfsigned": "^1.10.4",
@@ -21162,9 +21140,9 @@
           "dev": true
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "os-locale": {
@@ -21214,9 +21192,9 @@
           }
         },
         "semver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
           "dev": true
         },
         "string-width": {
@@ -21384,12 +21362,13 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0",
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       }
     },
@@ -21421,9 +21400,10 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "dev": true,
       "requires": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
diff --git a/package.json b/package.json
index 51e6bff59..bd032aeaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aepp-base",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "author": "Sascha Hanse <shanse@posteo.de>",
   "private": true,
   "scripts": {
@@ -20,7 +20,7 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@aeternity/aepp-sdk": "^3.4.1",
+    "@aeternity/aepp-sdk": "github:aeternity/aepp-sdk-js#9a959c61b4a2c0e7ff344cd2a6b15e66072c94fe",
     "@aeternity/bip39": "^0.1.0",
     "@aeternity/hd-wallet": "^0.2.0",
     "@aeternity/ledger-app-api": "0.1.0",
@@ -31,7 +31,6 @@
     "bignumber.js": "^8.1.1",
     "bluebird": "^3.5.3",
     "copy-to-clipboard": "^3.0.8",
-    "countly-sdk-web": "^19.2.1",
     "emoji-datasource-apple": "^4.0.3",
     "focus-visible": "^4.1.5",
     "fuse.js": "^3.4.2",
@@ -101,7 +100,6 @@
     "./src/lib/storeErrorHandler.js",
     "./src/lib/switchWebmanifest.js",
     "./src/store/index.js",
-    "./src/register-modals.js",
     "./src/ui-common.js",
     "*.css",
     "*.scss",
diff --git a/public/index.html b/public/index.html
index 65b3ac971..6f41873ff 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
     <% } %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover" />
-    <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono:400,500&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono:300,400,500,600,700&display=swap" rel="stylesheet">
     <link href="https://rsms.me/inter/inter.css" rel="stylesheet">
   </head>
   <body>
diff --git a/scripts/current-branch.js b/scripts/current-branch.js
new file mode 100644
index 000000000..909e70bfd
--- /dev/null
+++ b/scripts/current-branch.js
@@ -0,0 +1,6 @@
+const { execSync } = require('child_process');
+
+const branch = process.env.TRAVIS_BRANCH
+  || execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+
+module.exports = branch;
diff --git a/scripts/label-icons.js b/scripts/label-icons.js
index bc9c6ced9..5b2f3521c 100644
--- a/scripts/label-icons.js
+++ b/scripts/label-icons.js
@@ -1,13 +1,11 @@
-const { execSync } = require('child_process');
 const sharp = require('sharp'); // eslint-disable-line import/no-extraneous-dependencies
+const branch = require('./current-branch');
 
 (async () => {
-  const { NODE_ENV, npm_lifecycle_event: npmEvent, TRAVIS_BRANCH } = process.env;
+  const { NODE_ENV, npm_lifecycle_event: npmEvent } = process.env;
 
   if (!['build', 'serve'].includes(npmEvent)) return;
 
-  const branch = (TRAVIS_BRANCH || execSync('git rev-parse --abbrev-ref HEAD').toString().trim())
-    .replace('feature/', '');
   const showLabel = branch !== 'master';
   console.log(`Generating ${showLabel ? 'labeled ' : ''}icons`);
 
diff --git a/src/assets/account-card.svg b/src/assets/account-card.svg
index 3460a760a..efc03d8da 100644
--- a/src/assets/account-card.svg
+++ b/src/assets/account-card.svg
@@ -27,11 +27,7 @@
                         <path d="M0.41091954,107 L213.41092,107 L213.41092,121 C213.41092,125.418278 209.829198,129 205.41092,129 L8.41091954,129 C3.99264154,129 0.41091954,125.418278 0.41091954,121 L0.41091954,107 Z" id="Rectangle-3-Copy-25" fill="#D12869"></path>
                         <circle id="Oval-9" fill="#D12869" cx="20.4109195" cy="22" r="11"></circle>
                         <path d="M40.4109195,18.3450346 L41.9928513,18.3450346 L44.7433033,24.9630485 L44.8445469,24.9630485 L47.5949989,18.3450346 L49.1769306,18.3450346 L49.1769306,26.8586605 L47.9366961,26.8586605 L47.9366961,20.6979215 L47.8565449,20.6979215 L45.3085802,26.8461894 L44.2792699,26.8461894 L41.7313052,20.6937644 L41.651154,20.6937644 L41.651154,26.8586605 L40.4109195,26.8586605 L40.4109195,18.3450346 Z M53.0748104,27 C52.6642092,27 52.2936893,26.925174 51.9632397,26.7755196 C51.6327901,26.6258653 51.3705436,26.406237 51.1764923,26.1166282 C50.9824411,25.8270193 50.8854169,25.4729813 50.8854169,25.0545035 C50.8854169,24.6914532 50.9564273,24.3935347 51.0984504,24.160739 C51.2404734,23.9279434 51.4303033,23.7436496 51.6679458,23.6078522 C51.9055883,23.4720547 52.1720532,23.3702082 52.4673486,23.3023095 C52.762644,23.2344107 53.0635596,23.1824482 53.3701043,23.1464203 C53.7582069,23.1020783 54.0724808,23.0653581 54.3129356,23.0362587 C54.5533905,23.0071592 54.7291589,22.9593537 54.8402462,22.8928406 C54.9513335,22.8263276 55.0068764,22.7182456 55.0068764,22.5685912 L55.0068764,22.5394919 C55.0068764,22.1764416 54.9035245,21.8951511 54.6968177,21.695612 C54.490111,21.4960729 54.1828677,21.3963048 53.7750789,21.3963048 C53.3504159,21.3963048 53.0164559,21.4877589 52.7731888,21.6706697 C52.5299216,21.8535806 52.361887,22.0586594 52.2690798,22.2859122 L51.0836857,22.0198614 C51.2946109,21.4378724 51.6468509,21.0207865 52.1404161,20.7685912 C52.6339812,20.516396 53.1732388,20.3903002 53.7582049,20.3903002 C54.0169399,20.3903002 54.2911387,20.4200921 54.5808094,20.4796767 C54.8704801,20.5392613 55.1439758,20.648729 55.4013047,20.8080831 C55.6586335,20.9674373 55.8681495,21.1926082 56.0298589,21.4836028 C56.1915683,21.7745973 56.2724218,22.1528845 56.2724218,22.6184758 L56.2724218,26.8586605 L55.0406242,26.8586605 L55.0406242,25.9856813 L54.9900024,25.9856813 C54.8690719,26.2240197 54.6539314,26.4526548 54.3445743,26.6715935 C54.0352172,26.8905323 53.6119668,27 53.0748104,27 Z M53.3490119,26.0023095 C53.7005541,26.0023095 54.0000635,25.9344118 54.2475491,25.7986143 C54.4950348,25.6628169 54.6841616,25.4847586 54.8149353,25.2644342 C54.945709,25.0441098 55.0110949,24.8078535 55.0110949,24.5556582 L55.0110949,23.7325635 C54.9520358,23.7907624 54.8226702,23.8420321 54.6229943,23.8863741 C54.4233183,23.9307162 54.2123962,23.9681292 53.9902216,23.9986143 C53.7680469,24.0290995 53.5880601,24.0540415 53.4502555,24.0734411 C53.0846517,24.1205545 52.7717839,24.2154727 52.5116427,24.3581986 C52.2515015,24.5009245 52.1214329,24.7385665 52.1214329,25.0711316 C52.1214329,25.3787544 52.236737,25.6108537 52.4673486,25.7674365 C52.6979603,25.9240193 52.9918451,26.0023095 53.3490119,26.0023095 Z M57.9513786,26.8586605 L57.9513786,20.4734411 L59.2127055,20.4734411 L59.2127055,26.8586605 L57.9513786,26.8586605 Z M58.5883698,19.5090069 C58.3690075,19.5090069 58.1812868,19.4348737 58.0252021,19.2866051 C57.8691174,19.1383364 57.7910762,18.9602782 57.7910762,18.7524249 C57.7910762,18.5445717 57.8691174,18.3672063 58.0252021,18.2203233 C58.1812868,18.0734404 58.3690075,18 58.5883698,18 C58.8049198,18 58.9919374,18.0734404 59.1494283,18.2203233 C59.3069192,18.3672063 59.3856634,18.5445717 59.3856634,18.7524249 C59.3856634,18.9602782 59.3069192,19.1383364 59.1494283,19.2866051 C58.9919374,19.4348737 58.8049198,19.5090069 58.5883698,19.5090069 Z M62.1698633,23.0674365 L62.1698633,26.8586605 L60.9085364,26.8586605 L60.9085364,20.4734411 L62.1192415,20.4734411 L62.1192415,21.5127021 L62.1993927,21.5127021 C62.3484465,21.1745942 62.5825701,20.9030033 62.9017704,20.6979215 C63.2209706,20.4928396 63.6238319,20.3903002 64.1103662,20.3903002 C64.7740778,20.3903002 65.3077107,20.5939933 65.7112811,21.0013857 C66.1148515,21.408778 66.3166337,22.0073864 66.3166337,22.7972286 L66.3166337,26.8586605 L65.0553068,26.8586605 L65.0553068,22.9468822 C65.0553068,22.4840624 64.9329719,22.1217103 64.6882986,21.8598152 C64.4436253,21.5979202 64.107556,21.4669746 63.6800808,21.4669746 C63.2413562,21.4669746 62.8799763,21.6062342 62.5959302,21.8847575 C62.3118842,22.1632808 62.1698633,22.5575032 62.1698633,23.0674365 Z M71.9820585,26.8586605 L70.5983956,26.8586605 L73.7074187,18.3450346 L75.2134178,18.3450346 L78.3224409,26.8586605 L76.938778,26.8586605 L76.1499213,24.6055427 L72.7751336,24.6055427 L71.9820585,26.8586605 Z M73.1547973,23.5247113 L75.7702577,23.5247113 L74.4962754,19.891455 L74.4287796,19.891455 L73.1547973,23.5247113 Z M82.1950098,26.9875289 C81.5678586,26.9875289 81.0286011,26.8468836 80.577221,26.5655889 C80.1258409,26.2842942 79.7792255,25.8956145 79.5373645,25.3995381 C79.2955035,24.9034617 79.1745748,24.3353381 79.1745748,23.6951501 C79.1745748,23.0438767 79.2983158,22.4702103 79.5458015,21.9741339 C79.7932871,21.4780576 80.1427148,21.0900707 80.5940949,20.8101617 C81.045475,20.5302526 81.5748895,20.3903002 82.1823544,20.3903002 C82.6745134,20.3903002 83.1132314,20.4796758 83.4985216,20.6584296 C83.8838118,20.8371833 84.1952734,21.0872963 84.4329159,21.408776 C84.6705584,21.7302556 84.8118762,22.1057715 84.8568736,22.5353349 L83.6292946,22.5353349 C83.5617985,22.2360262 83.4078254,21.9782921 83.1673705,21.7621247 C82.9269157,21.5459573 82.605611,21.4378753 82.2034468,21.4378753 C81.6775397,21.4378753 81.2535863,21.6381042 80.9315737,22.0385681 C80.6095611,22.439032 80.4485572,22.9815208 80.4485572,23.6660508 C80.4485572,24.3616663 80.6074519,24.9138548 80.925246,25.3226328 C81.2430401,25.7314108 81.6691027,25.9357968 82.2034468,25.9357968 C82.563426,25.9357968 82.8713722,25.8388 83.1272949,25.6448037 C83.3832176,25.4508073 83.5505492,25.1819879 83.6292946,24.8383372 L84.8568736,24.8383372 C84.8118762,25.2512723 84.6754799,25.6198598 84.4476806,25.9441109 C84.2198813,26.2683619 83.9154504,26.5233247 83.5343787,26.7090069 C83.153307,26.8946892 82.7068552,26.9875289 82.1950098,26.9875289 Z M88.9403668,26.9875289 C88.3132156,26.9875289 87.773958,26.8468836 87.3225779,26.5655889 C86.8711978,26.2842942 86.5245824,25.8956145 86.2827214,25.3995381 C86.0408604,24.9034617 85.9199318,24.3353381 85.9199318,23.6951501 C85.9199318,23.0438767 86.0436727,22.4702103 86.2911584,21.9741339 C86.5386441,21.4780576 86.8880717,21.0900707 87.3394518,20.8101617 C87.7908319,20.5302526 88.3202465,20.3903002 88.9277113,20.3903002 C89.4198703,20.3903002 89.8585883,20.4796758 90.2438785,20.6584296 C90.6291687,20.8371833 90.9406304,21.0872963 91.1782729,21.408776 C91.4159153,21.7302556 91.5572332,22.1057715 91.6022306,22.5353349 L90.3746515,22.5353349 C90.3071554,22.2360262 90.1531823,21.9782921 89.9127275,21.7621247 C89.6722726,21.5459573 89.3509679,21.4378753 88.9488037,21.4378753 C88.4228967,21.4378753 87.9989432,21.6381042 87.6769306,22.0385681 C87.354918,22.439032 87.1939141,22.9815208 87.1939141,23.6660508 C87.1939141,24.3616663 87.3528088,24.9138548 87.6706029,25.3226328 C87.988397,25.7314108 88.4144597,25.9357968 88.9488037,25.9357968 C89.3087829,25.9357968 89.6167292,25.8388 89.8726519,25.6448037 C90.1285745,25.4508073 90.2959061,25.1819879 90.3746515,24.8383372 L91.6022306,24.8383372 C91.5572332,25.2512723 91.4208369,25.6198598 91.1930375,25.9441109 C90.9652382,26.2683619 90.6608073,26.5233247 90.2797356,26.7090069 C89.8986639,26.8946892 89.4522121,26.9875289 88.9403668,26.9875289 Z M95.6857237,26.9875289 C95.0782589,26.9875289 94.5481413,26.8503478 94.095355,26.5759815 C93.6425687,26.3016153 93.2910318,25.9170925 93.0407338,25.4224018 C92.7904358,24.9277112 92.6652887,24.3519663 92.6652887,23.6951501 C92.6652887,23.0327911 92.7904358,22.4535822 93.0407338,21.9575058 C93.2910318,21.4614294 93.6425687,21.0762138 94.095355,20.8018476 C94.5481413,20.5274813 95.0782589,20.3903002 95.6857237,20.3903002 C96.2960008,20.3903002 96.8268215,20.5274813 97.2782016,20.8018476 C97.7295817,21.0762138 98.0804155,21.4614294 98.3307135,21.9575058 C98.5810116,22.4535822 98.7061587,23.0327911 98.7061587,23.6951501 C98.7061587,24.3519663 98.5810116,24.9277112 98.3307135,25.4224018 C98.0804155,25.9170925 97.7295817,26.3016153 97.2782016,26.5759815 C96.8268215,26.8503478 96.2960008,26.9875289 95.6857237,26.9875289 Z M95.6899422,25.9441109 C96.0864817,25.9441109 96.413411,25.8415715 96.6707398,25.6364896 C96.9280687,25.4314078 97.1193048,25.1577384 97.2444538,24.8154734 C97.3696028,24.4732085 97.4321763,24.0983854 97.4321763,23.6909931 C97.4321763,23.2836007 97.3696028,22.9080849 97.2444538,22.5644342 C97.1193048,22.2207835 96.9280687,21.9457285 96.6707398,21.739261 C96.413411,21.5327934 96.0864817,21.4295612 95.6899422,21.4295612 C95.2934026,21.4295612 94.9657703,21.5327934 94.7070352,21.739261 C94.4483002,21.9457285 94.255658,22.2207835 94.1291029,22.5644342 C94.0025477,22.9080849 93.939271,23.2836007 93.939271,23.6909931 C93.939271,24.0983854 94.0025477,24.4732085 94.1291029,24.8154734 C94.255658,25.1577384 94.4483002,25.4314078 94.7070352,25.6364896 C94.9657703,25.8415715 95.2934026,25.9441109 95.6899422,25.9441109 Z M104.2155,24.2106236 L104.2155,20.4734411 L105.481045,20.4734411 L105.481045,26.8586605 L104.240811,26.8586605 L104.240811,25.7528868 L104.173315,25.7528868 C104.024261,26.0937661 103.785919,26.3771351 103.458282,26.6030023 C103.130644,26.8288695 102.723565,26.9418014 102.23703,26.9418014 C101.615504,26.9418014 101.105775,26.7388011 100.70783,26.3327945 C100.309884,25.9267878 100.110914,25.3274866 100.110914,24.534873 L100.110914,20.4734411 L101.372241,20.4734411 L101.372241,24.3852194 C101.372241,24.8203255 101.494576,25.1667424 101.739249,25.4244804 C101.983922,25.6822184 102.301712,25.8110855 102.692627,25.8110855 C102.928863,25.8110855 103.164393,25.7528874 103.399223,25.6364896 C103.634053,25.5200918 103.829507,25.3434192 103.985592,25.1064665 C104.141677,24.8695138 104.218312,24.5709025 104.2155,24.2106236 Z M108.433984,23.0674365 L108.433984,26.8586605 L107.172657,26.8586605 L107.172657,20.4734411 L108.383362,20.4734411 L108.383362,21.5127021 L108.463514,21.5127021 C108.612568,21.1745942 108.846691,20.9030033 109.165891,20.6979215 C109.485092,20.4928396 109.887953,20.3903002 110.374487,20.3903002 C111.038199,20.3903002 111.571832,20.5939933 111.975402,21.0013857 C112.378972,21.408778 112.580755,22.0073864 112.580755,22.7972286 L112.580755,26.8586605 L111.319428,26.8586605 L111.319428,22.9468822 C111.319428,22.4840624 111.197093,22.1217103 110.95242,21.8598152 C110.707746,21.5979202 110.371677,21.4669746 109.944202,21.4669746 C109.505477,21.4669746 109.144097,21.6062342 108.860051,21.8847575 C108.576005,22.1632808 108.433984,22.5575032 108.433984,23.0674365 Z M117.292802,20.4734411 L117.292802,21.4711316 L115.963979,21.4711316 L115.963979,24.9796767 C115.963979,25.3399556 116.04202,25.5720549 116.198105,25.6759815 C116.35419,25.7799081 116.53488,25.8318707 116.74018,25.8318707 C116.841425,25.8318707 116.930012,25.8249423 117.005945,25.8110855 C117.081878,25.7972286 117.140936,25.7861432 117.183121,25.7778291 L117.41092,26.8046189 C117.337799,26.8323327 117.233041,26.8607389 117.096642,26.8898383 C116.960244,26.9189378 116.792209,26.934873 116.592534,26.9376443 C116.260678,26.9431871 115.950622,26.8842962 115.662358,26.76097 C115.374093,26.6376437 115.142079,26.449193 114.966308,26.195612 C114.790537,25.9420311 114.702652,25.6226347 114.702652,25.2374134 L114.702652,21.4711316 L113.753493,21.4711316 L113.753493,20.4734411 L114.702652,20.4734411 L114.702652,18.943649 L115.963979,18.943649 L115.963979,20.4734411 L117.292802,20.4734411 Z" id="Main-Account" fill="#BD2A67"></path>
-                        <text id="Type-something-ethin" font-family="BLOKKNeue-Regular, BLOKK Neue" font-size="13" font-weight="normal" line-spacing="10" letter-spacing="-0.26" fill="#D12869">
-                            <tspan x="11.4109195" y="71">Type something</tspan>
-                            <tspan x="11.4109195" y="81">ething 33 333</tspan>
-                            <tspan x="11.4109195" y="91">et 2rewf 33f</tspan>
-                        </text>
+                        <path d="M11.4109195,66.4140625 L19.7898258,66.4140625 L19.7898258,72 L11.4109195,72 L11.4109195,66.4140625 Z M19.2759195,66.4140625 L27.6548258,66.4140625 L27.6548258,72 L19.2759195,72 L19.2759195,66.4140625 Z M27.1409195,66.4140625 L35.5198258,66.4140625 L35.5198258,72 L27.1409195,72 L27.1409195,66.4140625 Z M35.0059195,66.4140625 L43.3848258,66.4140625 L43.3848258,72 L35.0059195,72 L35.0059195,66.4140625 Z M58.9117008,66.4140625 L67.290607,66.4140625 L67.290607,72 L58.9117008,72 L58.9117008,66.4140625 Z M66.7767008,66.4140625 L75.155607,66.4140625 L75.155607,72 L66.7767008,72 L66.7767008,66.4140625 Z M74.6417008,66.4140625 L83.020607,66.4140625 L83.020607,72 L74.6417008,72 L74.6417008,66.4140625 Z M82.5067008,66.4140625 L90.885607,66.4140625 L90.885607,72 L82.5067008,72 L82.5067008,66.4140625 Z M90.3717008,66.4140625 L98.750607,66.4140625 L98.750607,72 L90.3717008,72 L90.3717008,66.4140625 Z M98.2367008,66.4140625 L106.615607,66.4140625 L106.615607,72 L98.2367008,72 L98.2367008,66.4140625 Z M106.101701,66.4140625 L114.480607,66.4140625 L114.480607,72 L106.101701,72 L106.101701,66.4140625 Z M113.966701,66.4140625 L122.345607,66.4140625 L122.345607,72 L113.966701,72 L113.966701,66.4140625 Z M121.831701,66.4140625 L130.210607,66.4140625 L130.210607,72 L121.831701,72 L121.831701,66.4140625 Z M11.4109195,76.4140625 L19.7898258,76.4140625 L19.7898258,82 L11.4109195,82 L11.4109195,76.4140625 Z M19.2759195,76.4140625 L27.6548258,76.4140625 L27.6548258,82 L19.2759195,82 L19.2759195,76.4140625 Z M27.1409195,76.4140625 L35.5198258,76.4140625 L35.5198258,82 L27.1409195,82 L27.1409195,76.4140625 Z M35.0059195,76.4140625 L43.3848258,76.4140625 L43.3848258,82 L35.0059195,82 L35.0059195,76.4140625 Z M42.8709195,76.4140625 L51.2498258,76.4140625 L51.2498258,82 L42.8709195,82 L42.8709195,76.4140625 Z M50.7359195,76.4140625 L59.1148258,76.4140625 L59.1148258,82 L50.7359195,82 L50.7359195,76.4140625 Z M74.6417008,76.4140625 L83.020607,76.4140625 L83.020607,82 L74.6417008,82 L74.6417008,76.4140625 Z M82.5067008,76.4140625 L90.885607,76.4140625 L90.885607,82 L82.5067008,82 L82.5067008,76.4140625 Z M106.412482,76.4140625 L114.791388,76.4140625 L114.791388,82 L106.412482,82 L106.412482,76.4140625 Z M114.277482,76.4140625 L122.656388,76.4140625 L122.656388,82 L114.277482,82 L114.277482,76.4140625 Z M122.142482,76.4140625 L130.521388,76.4140625 L130.521388,82 L122.142482,82 L122.142482,76.4140625 Z M11.4109195,86.4140625 L19.7898258,86.4140625 L19.7898258,92 L11.4109195,92 L11.4109195,86.4140625 Z M19.2759195,86.4140625 L27.6548258,86.4140625 L27.6548258,92 L19.2759195,92 L19.2759195,86.4140625 Z M43.1817008,86.4140625 L51.560607,86.4140625 L51.560607,92 L43.1817008,92 L43.1817008,86.4140625 Z M51.0467008,86.4140625 L59.425607,86.4140625 L59.425607,92 L51.0467008,92 L51.0467008,86.4140625 Z M58.9117008,86.4140625 L67.290607,86.4140625 L67.290607,92 L58.9117008,92 L58.9117008,86.4140625 Z M66.7767008,86.4140625 L75.155607,86.4140625 L75.155607,92 L66.7767008,92 L66.7767008,86.4140625 Z M74.6417008,86.4140625 L83.020607,86.4140625 L83.020607,92 L74.6417008,92 L74.6417008,86.4140625 Z M98.547482,86.4140625 L106.926388,86.4140625 L106.926388,92 L98.547482,92 L98.547482,86.4140625 Z M106.412482,86.4140625 L114.791388,86.4140625 L114.791388,92 L106.412482,92 L106.412482,86.4140625 Z M114.277482,86.4140625 L122.656388,86.4140625 L122.656388,92 L114.277482,92 L114.277482,86.4140625 Z" id="Typesomethingething33333et2rewf33f" fill="#D12869" fill-rule="nonzero"></path>
                     </g>
                     <g id="Group-3" transform="translate(201.500000, 17.218667)">
                         <circle id="Oval-9" fill="#14CCB7" cx="19.5" cy="19.5" r="19.5"></circle>
diff --git a/src/components/AeInputAddress.vue b/src/components/AeInputAddress.vue
index 723015fe2..1e25a5940 100644
--- a/src/components/AeInputAddress.vue
+++ b/src/components/AeInputAddress.vue
@@ -19,7 +19,7 @@
       size="s"
     />
 
-    <template slot="footer-right">
+    <template :slot="$globals.IS_MOBILE_DEVICE ? 'default-bottom-right' : 'footer-right'">
       <template v-if="!$globals.IS_MOBILE_DEVICE">
         <AeToolbarButton
           v-if="accounts.length"
@@ -45,6 +45,14 @@
         </AePopover>
       </template>
 
+      <AeToolbarButton
+        v-if="clipboardReadSupported"
+        type="button"
+        @click="readValueFromClipboard"
+      >
+        <Paste />
+        {{ $globals.IS_MOBILE_DEVICE ? 'Paste' : '' }}
+      </AeToolbarButton>
       <AeToolbarButton
         type="button"
         @click="readValueFromQrCode"
@@ -61,7 +69,7 @@ import removeSpacesOnCopy from '../directives/removeSpacesOnCopy';
 import AeTextareaFormatted from './AeTextareaFormatted.vue';
 import AeIdenticon from './AeIdenticon.vue';
 import AeToolbarButton from './AeToolbarButton.vue';
-import { Card, Camera } from './icons';
+import { Card, Paste, Camera } from './icons';
 import AePopover from './AePopover.vue';
 import ListItemAccount from './ListItemAccount.vue';
 
@@ -70,7 +78,14 @@ export default {
     removeSpacesOnCopy,
   },
   components: {
-    AeIdenticon, AeTextareaFormatted, AeToolbarButton, Card, Camera, AePopover, ListItemAccount,
+    AeIdenticon,
+    AeTextareaFormatted,
+    AeToolbarButton,
+    Card,
+    Paste,
+    Camera,
+    AePopover,
+    ListItemAccount,
   },
   props: {
     value: {
@@ -80,6 +95,7 @@ export default {
   },
   data: () => ({
     showAccountsDropdown: false,
+    clipboardReadSupported: process.env.IS_CORDOVA || navigator.clipboard,
   }),
   subscriptions() {
     return !process.env.IS_MOBILE_DEVICE && {
@@ -114,6 +130,11 @@ export default {
     async readValueFromQrCode() {
       this.setAddress(await this.$store.dispatch('modals/open', { name: 'readQrCode', title: 'Scan AE Address' }));
     },
+    async readValueFromClipboard() {
+      this.setAddress(await (process.env.IS_CORDOVA
+        ? new Promise((...args) => window.cordova.plugins.clipboard.paste(...args))
+        : navigator.clipboard.readText()));
+    },
   },
 };
 </script>
diff --git a/src/components/AeInputAmount.vue b/src/components/AeInputAmount.vue
index 58dbf2d22..265623d8e 100644
--- a/src/components/AeInputAmount.vue
+++ b/src/components/AeInputAmount.vue
@@ -3,6 +3,11 @@
     class="ae-input-amount"
     v-bind="$attrs"
   >
+    <slot
+      v-for="slot in Object.keys($slots)"
+      :slot="slot"
+      :name="slot"
+    />
     <input
       :id="id"
       v-focus.lazy="autofocus"
diff --git a/src/components/AeInputAmountAe.vue b/src/components/AeInputAmountAe.vue
index 998caca73..a090bdf72 100644
--- a/src/components/AeInputAmountAe.vue
+++ b/src/components/AeInputAmountAe.vue
@@ -3,23 +3,35 @@
     class="ae-input-amount-ae"
     header="Amount"
     header-right="AE"
-    :footer="footer || 'Minimum transaction fee'"
-    :footer-right="footerRight || (footer ? '' : minSpendTxFee)"
+    :footer="footer || (max ? '' : 'Minimum transaction fee')"
+    :footer-right="footerRight || (footer || max ? '' : minSpendTxFee)"
     :value="value"
     v-bind="$attrs"
     v-on="$listeners"
-  />
+  >
+    <AeToolbarButton
+      v-if="max"
+      slot="footer-right"
+      type="button"
+      :active="max === value"
+      @click="$emit('input', max)"
+    >
+      Max
+    </AeToolbarButton>
+  </AeInputAmount>
 </template>
 
 <script>
 import AeInputAmount from './AeInputAmount.vue';
+import AeToolbarButton from './AeToolbarButton.vue';
 import { MIN_SPEND_TX_FEE } from '../lib/constants';
 import prefixedAmount from '../filters/prefixedAmount';
 
 export default {
-  components: { AeInputAmount },
+  components: { AeInputAmount, AeToolbarButton },
   props: {
     value: { type: [String, Number], default: '' },
+    max: { type: [String, Number], default: '' },
     footer: { type: String, default: '' },
     footerRight: { type: String, default: '' },
   },
diff --git a/src/components/AeInputWrapper.vue b/src/components/AeInputWrapper.vue
index 4ca7871a1..49c4a4cc7 100644
--- a/src/components/AeInputWrapper.vue
+++ b/src/components/AeInputWrapper.vue
@@ -19,7 +19,26 @@
         :setFocus="f => focus = f"
       />
     </main>
-    <AeToolbar v-if="footer || $slots.footer || footerRight || $slots['footer-right']">
+    <AeToolbar
+      v-if="
+        defaultBottom || $slots['default-bottom']
+          || defaultBottomRight || $slots['default-bottom-right']
+      "
+      class="default-bottom"
+    >
+      <div>
+        {{ defaultBottom }}
+        <slot name="default-bottom" />
+      </div>
+      <div>
+        {{ defaultBottomRight }}
+        <slot name="default-bottom-right" />
+      </div>
+    </AeToolbar>
+    <AeToolbar
+      v-if="footer || $slots.footer || footerRight || $slots['footer-right']"
+      class="footer"
+    >
       <div>
         {{ footer }}
         <slot name="footer" />
@@ -50,6 +69,14 @@ export default {
       type: String,
       default: '',
     },
+    defaultBottom: {
+      type: String,
+      default: '',
+    },
+    defaultBottomRight: {
+      type: String,
+      default: '',
+    },
     footer: {
       type: String,
       default: '',
@@ -94,6 +121,15 @@ export default {
     }
   }
 
+  &.error:not(.focus) {
+    background-color: $color-primary-positive-3;
+
+    .ae-toolbar.footer {
+      background-color: $color-primary-positive-1;
+      color: $color-white;
+    }
+  }
+
   $states: (
     error: $color-error,
     focus: $color-focus,
@@ -129,6 +165,11 @@ export default {
     justify-content: space-between;
     @extend %face-sans-xs;
     line-height: rem(32px);
+
+    &.default-bottom {
+      justify-content: flex-end;
+      background-color: transparent;
+    }
   }
 }
 </style>
diff --git a/src/components/AeLoader.vue b/src/components/AeLoader.vue
index 89108b2de..552943924 100644
--- a/src/components/AeLoader.vue
+++ b/src/components/AeLoader.vue
@@ -46,7 +46,7 @@
   }
 
   .stop-start {
-    stop-color: #fff;
+    stop-color: rgba($color-primary, 0);
   }
 
   .stop-end {
diff --git a/src/components/AeToolbarButton.vue b/src/components/AeToolbarButton.vue
index 729063a26..b02527b8b 100644
--- a/src/components/AeToolbarButton.vue
+++ b/src/components/AeToolbarButton.vue
@@ -1,6 +1,7 @@
 <template>
   <ButtonPlain
     class="ae-toolbar-button"
+    :class="{ active }"
     v-bind="$attrs"
     v-on="$listeners"
   >
@@ -13,6 +14,7 @@ import ButtonPlain from './ButtonPlain.vue';
 
 export default {
   components: { ButtonPlain },
+  props: { active: Boolean },
 };
 </script>
 
@@ -30,6 +32,10 @@ export default {
   text-transform: uppercase;
   color: $color-neutral-negative-1;
 
+  &.active {
+    color: #000;
+  }
+
   /deep/ .icon {
     height: rem(14px);
     vertical-align: -.2em;
diff --git a/src/components/IconGroup.vue b/src/components/IconGroup.vue
new file mode 100644
index 000000000..a3e2c8cbe
--- /dev/null
+++ b/src/components/IconGroup.vue
@@ -0,0 +1,19 @@
+<template>
+  <span class="icon-group">
+    <slot />
+  </span>
+</template>
+
+<style lang="scss" scoped>
+@import '../styles/globals/functions.scss';
+
+.icon-group {
+  position: relative;
+
+  > :nth-child(2) {
+    position: absolute;
+    top: rem(-5px);
+    right: rem(-5px);
+  }
+}
+</style>
diff --git a/src/components/ListItemTransaction.vue b/src/components/ListItemTransaction.vue
index fffc37634..053f684d5 100644
--- a/src/components/ListItemTransaction.vue
+++ b/src/components/ListItemTransaction.vue
@@ -55,7 +55,7 @@ export default {
   props: {
     pending: { type: Boolean },
     received: { type: Boolean },
-    time: { type: Date, required: true },
+    time: { type: Date, default: null },
     peerId: { type: String, default: '' },
     tx: { type: Object, required: true },
   },
diff --git a/src/components/NetworkSwitcher.vue b/src/components/NetworkSwitcher.vue
index c593000a9..17d5453cf 100644
--- a/src/components/NetworkSwitcher.vue
+++ b/src/components/NetworkSwitcher.vue
@@ -6,14 +6,14 @@
       :title="network.name"
       :subtitle="network.url"
     >
-      <ButtonPlain
+      <div
         v-if="network.custom"
         slot="icon"
         :ref="`button-${idx}`"
         @click="menuForNetworkIdx = idx"
       >
         <More />
-      </ButtonPlain>
+      </div>
       <AeRadio
         slot="right"
         :checked="network === currentNetwork"
@@ -47,7 +47,6 @@ import { mapGetters } from 'vuex';
 import copyOnClick from '../directives/copyOnClick';
 import ListItem from './ListItem.vue';
 import ListItemButton from './ListItemButton.vue';
-import ButtonPlain from './ButtonPlain.vue';
 import { More, Copy, Close } from './icons';
 import AeRadio from './AeRadio.vue';
 import Menu from './Menu.vue';
@@ -57,7 +56,6 @@ export default {
   components: {
     ListItem,
     ListItemButton,
-    ButtonPlain,
     More,
     AeRadio,
     Menu,
diff --git a/src/components/desktop/ConnectGuide.vue b/src/components/desktop/ConnectGuide.vue
index aa1e81b57..ed1d64887 100644
--- a/src/components/desktop/ConnectGuide.vue
+++ b/src/components/desktop/ConnectGuide.vue
@@ -74,8 +74,16 @@
           numerator="3"
           denominator="3"
         />
-        Confirm your Ledger address
+        Create a first account by pressing the button below
       </Guide>
+      <ListItem
+        title="Create a new account"
+        @click="create"
+      >
+        <ListItemCircle slot="icon">
+          <Plus />
+        </ListItemCircle>
+      </ListItem>
     </template>
 
     <div
@@ -96,16 +104,26 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 import Guide from '../Guide.vue';
 import { AeQrCode } from '../async';
 import AeFraction from '../AeFraction.vue';
-import { Settings, Device } from '../icons';
+import ListItem from '../ListItem.vue';
+import ListItemCircle from '../ListItemCircle.vue';
+import { Settings, Device, Plus } from '../icons';
 import Note from '../Note.vue';
 
 export default {
   components: {
-    Guide, AeQrCode, AeFraction, Settings, Device, Note,
+    Guide,
+    AeQrCode,
+    AeFraction,
+    Settings,
+    Device,
+    Note,
+    Plus,
+    ListItem,
+    ListItemCircle,
   },
   props: {
     forLedger: { type: Boolean, default: false },
@@ -114,6 +132,7 @@ export default {
     peerId: ({ peerId }) => peerId,
     ledgerSupported: ({ desktop }) => desktop.ledgerSupported,
   }),
+  methods: mapActions('accounts/ledger', ['create']),
 };
 </script>
 
diff --git a/src/components/mobile/ConfirmSpendModal.vue b/src/components/mobile/ConfirmSpendModal.vue
index 59dd56da9..4237bdda8 100644
--- a/src/components/mobile/ConfirmSpendModal.vue
+++ b/src/components/mobile/ConfirmSpendModal.vue
@@ -24,6 +24,7 @@
     <DetailsFeeInput
       v-model="newFee"
       :min="minFee"
+      :amount="amount"
     />
 
     <DetailsRawData
diff --git a/src/components/mobile/ConnectionStatus.vue b/src/components/mobile/ConnectionStatus.vue
index 726b49460..33d72f365 100644
--- a/src/components/mobile/ConnectionStatus.vue
+++ b/src/components/mobile/ConnectionStatus.vue
@@ -16,6 +16,7 @@ export default {
     message: ({ onLine, sdk }) => {
       if (!onLine) return { text: 'You are offline... Please check your connection.' };
       if (!sdk) return { text: 'We are unable to connect to the chosen node.' };
+      if (sdk.then) return { text: 'Connecting to the network...', className: 'connecting' };
       if (process.env.NODE_ENV === 'production' && sdk.nodeNetworkId !== 'ae_mainnet') {
         return { text: 'You are connected to a testnet.', className: 'test-net' };
       }
@@ -36,7 +37,8 @@ export default {
   text-align: center;
   background-color: $color-primary;
 
-  &.test-net {
+  &.test-net,
+  &.connecting {
     background-color: $color-secondary;
   }
 }
diff --git a/src/components/mobile/DetailsAmount.vue b/src/components/mobile/DetailsAmount.vue
index aa683005c..2f2287899 100644
--- a/src/components/mobile/DetailsAmount.vue
+++ b/src/components/mobile/DetailsAmount.vue
@@ -1,7 +1,7 @@
 <template>
   <DetailsField
     class="details-amount"
-    name="Amount"
+    :name="name"
     :value="`${prefixedAmount(amount)} AE`"
     value-monospace
   />
@@ -15,6 +15,7 @@ import prefixedAmount from '../../filters/prefixedAmount';
 export default {
   components: { DetailsField },
   props: {
+    name: { type: String, default: 'Amount' },
     amount: { type: BigNumber, required: true },
   },
   methods: { prefixedAmount },
diff --git a/src/components/mobile/DetailsFeeInput.vue b/src/components/mobile/DetailsFeeInput.vue
index 00d4960bb..4b59dee27 100644
--- a/src/components/mobile/DetailsFeeInput.vue
+++ b/src/components/mobile/DetailsFeeInput.vue
@@ -5,23 +5,26 @@
     :value="`${toMicroString(value)} MICRO AE`"
     value-monospace
   >
-    <DetailsRow class="turtle-rabbit">
-      <img src="../../assets/icons/turtle.svg">
-      <img src="../../assets/icons/rabbit.svg">
-    </DetailsRow>
+    <template v-if="min.isLessThan(max)">
+      <DetailsRow class="turtle-rabbit">
+        <img src="../../assets/icons/turtle.svg">
+        <img src="../../assets/icons/rabbit.svg">
+      </DetailsRow>
 
-    <AeInputRange
-      fill="light"
-      :value="value | toMicroString"
-      :min="min | toMicroString"
-      :max="min.multipliedBy(10) | toMicroString"
-      step="0.01"
-      @input="$emit('input', toBigNumber($event))"
-    />
+      <AeInputRange
+        fill="light"
+        :value="value | toMicroString"
+        :min="min | toMicroString"
+        :max="max | toMicroString"
+        step="0.01"
+        @input="$emit('input', toBigNumber($event))"
+      />
+    </template>
   </DetailsField>
 </template>
 
 <script>
+import { pick } from 'lodash-es';
 import BigNumber from 'bignumber.js';
 import DetailsField from './DetailsField.vue';
 import DetailsRow from './DetailsRow.vue';
@@ -41,6 +44,18 @@ export default {
   props: {
     value: { type: BigNumber, required: true },
     min: { type: BigNumber, required: true },
+    amount: { type: BigNumber, default: null },
+  },
+  subscriptions() {
+    return pick(this.$store.state.observables, ['activeAccount']);
+  },
+  computed: {
+    max() {
+      const recommendedMax = this.min.multipliedBy(10);
+      if (!this.amount) return recommendedMax;
+      const actualMax = this.activeAccount.balance.minus(this.amount);
+      return actualMax.isLessThan(recommendedMax) ? actualMax : recommendedMax;
+    },
   },
   methods: { toMicroString, toBigNumber },
 };
diff --git a/src/components/mobile/MnemonicBackupWarning.vue b/src/components/mobile/MnemonicBackupWarning.vue
new file mode 100644
index 000000000..68473c6a6
--- /dev/null
+++ b/src/components/mobile/MnemonicBackupWarning.vue
@@ -0,0 +1,40 @@
+<template>
+  <IconGroup>
+    <slot />
+    <span
+      v-if="!mnemonicBackedUp"
+      class="warning-icon"
+    >
+      !
+    </span>
+  </IconGroup>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import IconGroup from '../IconGroup.vue';
+
+export default {
+  components: { IconGroup },
+  computed: mapState('accounts/hdWallet', ['mnemonicBackedUp']),
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/variables/typography.scss';
+@import '../../styles/variables/colors.scss';
+@import '../../styles/globals/functions.scss';
+
+.warning-icon {
+  border-radius: 50%;
+  width: rem(14px);
+  height: rem(14px);
+  background-color: $color-primary;
+  color: #fff;
+  font-family: $font-sans;
+  font-size: rem(12px);
+  line-height: rem(14px);
+  text-align: center;
+  font-weight: 600;
+}
+</style>
diff --git a/src/components/mobile/NotificationMnemonicBackup.vue b/src/components/mobile/NotificationMnemonicBackup.vue
new file mode 100644
index 000000000..da3f2159a
--- /dev/null
+++ b/src/components/mobile/NotificationMnemonicBackup.vue
@@ -0,0 +1,61 @@
+<template>
+  <Notification
+    v-bind="$attrs"
+    class="notification-mnemonic-backup"
+  >
+    <ListItem
+      title="Please Backup your Recover Phrase!"
+      subtitle="Secure your funds to prevent loss."
+    >
+      <ListItemCircle slot="icon">
+        !
+      </ListItemCircle>
+    </ListItem>
+
+    <template slot="footer">
+      <AeButton
+        :to="{ name: 'settings-security-course-intro' }"
+        fill="dark"
+        size="small"
+        plain
+      >
+        Security course
+      </AeButton>
+      <AeButton
+        :to="{ name: 'settings-mnemonic' }"
+        fill="primary"
+        size="small"
+        plain
+      >
+        Backup now
+      </AeButton>
+    </template>
+  </Notification>
+</template>
+
+<script>
+import Notification from '../Notification.vue';
+import ListItem from '../ListItem.vue';
+import ListItemCircle from '../ListItemCircle.vue';
+import AeButton from '../AeButton.vue';
+
+export default {
+  components: {
+    Notification,
+    ListItem,
+    ListItemCircle,
+    AeButton,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/placeholders/typography.scss';
+@import '../../styles/variables/colors.scss';
+
+.notification-mnemonic-backup .list-item-circle {
+  @extend %face-sans-l;
+  line-height: rem(32px);
+  background-color: $color-primary;
+}
+</style>
diff --git a/src/components/mobile/Page.vue b/src/components/mobile/Page.vue
index 9f49104fb..6c254f937 100644
--- a/src/components/mobile/Page.vue
+++ b/src/components/mobile/Page.vue
@@ -69,6 +69,17 @@ export default {
     },
     hideTabBar: { type: Boolean },
   },
+  async mounted() {
+    if (process.env.IS_CORDOVA && process.env.IS_IOS) {
+      await new Promise(resolve => document.addEventListener('deviceready', resolve));
+      this.$watch(({ headerFill, fill }) => headerFill || fill, (fill) => {
+        const style = ['primary', 'alternative', 'dark']
+          .includes(fill) ? 'LightContent' : 'Default';
+        window.StatusBar[`style${style}`]();
+      }, { immediate: true });
+      this.$once('hook:destroyed', () => window.StatusBar.styleDefault());
+    }
+  },
 };
 </script>
 
diff --git a/src/components/mobile/PasswordModal.vue b/src/components/mobile/PasswordModal.vue
new file mode 100644
index 000000000..97194b22c
--- /dev/null
+++ b/src/components/mobile/PasswordModal.vue
@@ -0,0 +1,82 @@
+<template>
+  <MobilePage
+    hide-tab-bar
+    right-button-icon-name="close"
+    @right-button-click="cancelHandler"
+  >
+    <Guide>
+      Enter your password to continue
+    </Guide>
+
+    <form
+      :id="_uid"
+      @submit.prevent="continueHandler"
+    >
+      <PasswordPurpose />
+      <AeInputPassword
+        v-model="password"
+        v-validate="'required|min:4'"
+        autofocus
+        autocomplete="current-password"
+        :error="errors.has('password') || wrongPassword"
+        name="password"
+        @input="wrongPassword = false"
+      >
+        <template slot="footer">
+          <template v-if="errors.has('password')">
+            {{ errors.first('password') }}
+          </template>
+          <template v-else-if="wrongPassword">
+            Wrong password, try again
+          </template>
+        </template>
+      </AeInputPassword>
+    </form>
+
+    <AeButton
+      slot="footer"
+      :disabled="errors.any() || wrongPassword"
+      :form="_uid"
+      fill="secondary"
+    >
+      Continue
+    </AeButton>
+  </MobilePage>
+</template>
+
+<script>
+import MobilePage from './Page.vue';
+import Guide from '../Guide.vue';
+import AeButton from '../AeButton.vue';
+import PasswordPurpose from './PasswordPurpose.vue';
+import AeInputPassword from '../AeInputPassword.vue';
+
+export default {
+  components: {
+    MobilePage, PasswordPurpose, AeInputPassword, AeButton, Guide,
+  },
+  props: {
+    resolve: { type: Function, required: true },
+    reject: { type: Function, required: true },
+  },
+  data: () => ({
+    password: '',
+    wrongPassword: false,
+  }),
+  methods: {
+    async continueHandler() {
+      if (!await this.$validator.validateAll()) return;
+
+      try {
+        await this.$store.dispatch('accounts/hdWallet/deriveAndCheckPasswordKey', this.password);
+        this.resolve();
+      } catch (e) {
+        this.wrongPassword = true;
+      }
+    },
+    cancelHandler() {
+      this.reject(new Error('Cancelled by user'));
+    },
+  },
+};
+</script>
diff --git a/src/components/mobile/TabBar.vue b/src/components/mobile/TabBar.vue
index afebc0c37..8c9ffbecd 100644
--- a/src/components/mobile/TabBar.vue
+++ b/src/components/mobile/TabBar.vue
@@ -5,12 +5,12 @@
     <div class="wrapper">
       <ButtonPlain :to="browserPath || { name: 'app-intro' }">
         <Grid />
-        æpps
+        <div>æpps</div>
       </ButtonPlain>
 
       <ButtonPlain :to="{ name: 'transfer' }">
         <Transfer />
-        Transfer
+        <div>Transfer</div>
       </ButtonPlain>
 
       <ButtonPlain
@@ -25,12 +25,12 @@
         :disabled="!$globals.UNFINISHED_FEATURES"
       >
         <Contacts />
-        Contacts
+        <div>Contacts</div>
       </ButtonPlain>
 
       <ButtonPlain :to="{ name: 'settings' }">
-        <Settings />
-        Settings
+        <MnemonicBackupWarning><Settings /></MnemonicBackupWarning>
+        <div>Settings</div>
       </ButtonPlain>
     </div>
   </div>
@@ -44,6 +44,7 @@ import {
 } from '../icons';
 import AeIdenticon from '../AeIdenticon.vue';
 import ConnectionStatus from './ConnectionStatus.vue';
+import MnemonicBackupWarning from './MnemonicBackupWarning.vue';
 
 export default {
   components: {
@@ -54,6 +55,7 @@ export default {
     Contacts,
     Settings,
     ConnectionStatus,
+    MnemonicBackupWarning,
   },
   props: {
     showAccountSwitcher: { type: Boolean },
@@ -104,9 +106,8 @@ export default {
         color: $color-neutral-negative-3;
       }
 
-      .icon {
-        display: block;
-        margin: 0 auto 4px auto;
+      div {
+        margin-top: 4px;
       }
 
       .ae-identicon {
diff --git a/src/pages/mobile/Intro.vue b/src/pages/mobile/Intro.vue
index 388dc1556..9a61cd8ad 100644
--- a/src/pages/mobile/Intro.vue
+++ b/src/pages/mobile/Intro.vue
@@ -12,15 +12,15 @@
 
     <template slot="footer">
       <AeButton
-        :to="{ name: encryptedHdWallet ? 'login' : 'recover' }"
+        :to="{ name: encryptedWallet ? 'login' : 'recover' }"
         fill="secondary"
       >
-        {{ encryptedHdWallet ? 'Login' : 'Recover' }}
+        {{ encryptedWallet ? 'Login' : 'Recover' }}
       </AeButton>
       <AeButton
-        :to="{ name: 'set-password' }"
         fill="light"
         plain
+        @click="() => createWallet()"
       >
         Create New Account
       </AeButton>
@@ -37,16 +37,15 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 import MobilePage from '../../components/mobile/Page.vue';
 import Guide from '../../components/Guide.vue';
 import AeButton from '../../components/AeButton.vue';
 
 export default {
   components: { MobilePage, AeButton, Guide },
-  computed: mapState({
-    encryptedHdWallet: state => state.accounts.hdWallet.encryptedWallet,
-  }),
+  computed: mapState('accounts/hdWallet', ['encryptedWallet']),
+  methods: mapActions('accounts/hdWallet', ['createWallet']),
 };
 </script>
 
diff --git a/src/pages/mobile/Onboarding.vue b/src/pages/mobile/Onboarding.vue
index 03a2a5ae0..8391f06e4 100644
--- a/src/pages/mobile/Onboarding.vue
+++ b/src/pages/mobile/Onboarding.vue
@@ -9,7 +9,7 @@
 
     <footer>
       <AeButton
-        :to="{ name: 'set-password'}"
+        :to="{ name: 'intro'}"
         size="small"
         plain
       >
@@ -27,7 +27,7 @@
         />
       </TransitionGroup>
       <AeButton
-        :to="{ name: isLastStep ? 'set-password' : stepRouteNames[currentStepIdx + 1] }"
+        :to="{ name: isLastStep ? 'intro' : stepRouteNames[currentStepIdx + 1] }"
         size="small"
         plain
       >
diff --git a/src/pages/mobile/Receive.vue b/src/pages/mobile/Receive.vue
index 401185942..b8e9d6019 100644
--- a/src/pages/mobile/Receive.vue
+++ b/src/pages/mobile/Receive.vue
@@ -40,6 +40,12 @@
         slot="icon"
         :src="envelopeEmoji"
       >
+      <ListItemCircle
+        v-if="sharedChecked"
+        slot="right"
+      >
+        <Check />
+      </ListItemCircle>
     </ListItem>
   </MobilePage>
 </template>
@@ -71,19 +77,21 @@ export default {
       writingHandEmoji,
       envelopeEmoji,
       sharingSupported: navigator.share || process.env.IS_CORDOVA,
+      sharedChecked: false,
     };
   },
   computed: mapGetters({ activeAccount: 'accounts/active' }),
   methods: {
-    share() {
-      if (process.env.IS_CORDOVA) {
-        window.plugins.socialsharing.share(this.activeAccount.address);
-        return;
-      }
-      navigator.share({
-        title: 'My address',
-        text: this.activeAccount.address,
-      });
+    async share() {
+      await (process.env.IS_CORDOVA
+        ? new Promise(resolve => window.plugins.socialsharing.shareWithOptions(
+          { message: this.activeAccount.address },
+          ({ app }) => app && resolve(),
+        ))
+        : navigator.share({ text: this.activeAccount.address }));
+
+      this.sharedChecked = true;
+      setTimeout(() => { this.sharedChecked = false; }, 500);
     },
   },
 };
@@ -92,8 +100,8 @@ export default {
 <style lang="scss" scoped>
 @import '../../styles/variables/colors.scss';
 
-.receive .list-item.copy {
-  &:not(.v-copied) .list-item-circle {
+.receive .list-item {
+  &.copy:not(.v-copied) .list-item-circle {
     display: none;
   }
 
diff --git a/src/pages/mobile/Recover.vue b/src/pages/mobile/Recover.vue
index ca701d827..fc78b9469 100644
--- a/src/pages/mobile/Recover.vue
+++ b/src/pages/mobile/Recover.vue
@@ -65,7 +65,7 @@ export default {
     async setMnemonic() {
       if (!await this.$validator.validateAll()) return;
 
-      this.$router.push({ name: 'set-password', params: { mnemonic: this.mnemonic } });
+      await this.$store.dispatch('accounts/hdWallet/createWallet', this.mnemonic);
     },
   },
 };
diff --git a/src/pages/mobile/SendAmount.vue b/src/pages/mobile/SendAmount.vue
index 3ef79597f..4c7cc352e 100644
--- a/src/pages/mobile/SendAmount.vue
+++ b/src/pages/mobile/SendAmount.vue
@@ -30,8 +30,9 @@
             required: true,
             decimal: MAGNITUDE,
             min_value_exclusive: 0,
-            max_value: activeAccount.balance.minus(MIN_SPEND_TX_FEE).toString(),
+            max_value: max,
           }"
+          :max="max"
           :error="errors.has('amount')"
           :footer="errors.first('amount')"
           autofocus
@@ -40,6 +41,16 @@
       </form>
     </template>
 
+    <DetailsAmount
+      name="Minimum transaction fee"
+      :amount="minFee"
+    />
+
+    <DetailsAmount
+      name="Balance"
+      :amount="activeAccount.balance"
+    />
+
     <AeButton
       :disabled="errors.any()"
       :form="_uid"
@@ -54,13 +65,15 @@
 import { pick } from 'lodash-es';
 import { mapGetters } from 'vuex';
 import BigNumber from 'bignumber.js';
+import { TxBuilder } from '@aeternity/aepp-sdk/es';
 import MobilePage from '../../components/mobile/Page.vue';
 import Guide from '../../components/Guide.vue';
 import AeFraction from '../../components/AeFraction.vue';
 import AccountInline from '../../components/AccountInline.vue';
 import AeInputAmountAe from '../../components/AeInputAmountAe.vue';
+import DetailsAmount from '../../components/mobile/DetailsAmount.vue';
 import AeButton from '../../components/AeButton.vue';
-import { MAGNITUDE, MIN_SPEND_TX_FEE } from '../../lib/constants';
+import { MAGNITUDE } from '../../lib/constants';
 
 export default {
   components: {
@@ -69,6 +82,7 @@ export default {
     AeFraction,
     AccountInline,
     AeInputAmountAe,
+    DetailsAmount,
     AeButton,
   },
   props: {
@@ -78,15 +92,56 @@ export default {
     },
   },
   data: () => ({
-    amount: '',
+    customAmount: '',
+    maxSelected: false,
+    minFee: BigNumber(0),
     MAGNITUDE,
-    MIN_SPEND_TX_FEE,
-    BigNumber,
   }),
-  computed: mapGetters('accounts', ['activeColor']),
+  computed: {
+    ...mapGetters('accounts', ['activeColor']),
+    max() {
+      const max = this.activeAccount.balance.minus(this.minFee);
+      return (max.isPositive() ? max : 0).toString();
+    },
+    amount: {
+      get() {
+        return this.maxSelected ? this.max : this.customAmount;
+      },
+      set(value) {
+        if (value === this.max) this.maxSelected = true;
+        else {
+          this.customAmount = value;
+          this.maxSelected = false;
+        }
+      },
+    },
+  },
   subscriptions() {
     return pick(this.$store.state.observables, ['activeAccount']);
   },
+  mounted() {
+    this.$watch(
+      ({ activeAccount: { address, nonce }, amount }) => ({ address, nonce, amount }),
+      ({ address, nonce, amount }) => {
+        const minFee = BigNumber(TxBuilder.calculateMinFee(
+          'spendTx', {
+            gas: this.$store.state.sdk.Ae.defaults.gas,
+            params: {
+              ...this.$store.state.sdk.Ae.defaults,
+              senderId: address,
+              recipientId: address,
+              amount: BigNumber(amount > 0 ? amount : 0).shiftedBy(MAGNITUDE),
+              ttl: 0,
+              nonce: nonce + 1,
+              payload: '',
+            },
+          },
+        )).shiftedBy(-MAGNITUDE);
+        if (!minFee.isEqualTo(this.minFee)) this.minFee = minFee;
+      },
+      { immediate: true },
+    );
+  },
   methods: {
     async setAmount() {
       if (!await this.$validator.validateAll()) return;
@@ -95,3 +150,17 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+@import '../../styles/variables/colors.scss';
+
+.mobile-page .details-item {
+  --color-primary: #{$color-neutral-negative-1};
+  --color-secondary: #{$color-neutral-negative-1};
+
+  &:first-child {
+    border-top: none;
+    padding-top: 0;
+  }
+}
+</style>
diff --git a/src/pages/mobile/SetPassword.vue b/src/pages/mobile/SetPassword.vue
deleted file mode 100644
index 3a9261f5b..000000000
--- a/src/pages/mobile/SetPassword.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <MobilePage
-    :title="recover ? 'Recover Account' : 'New Account'"
-    :left-button-to="{ name: 'recover' }"
-    :left-button-icon-name="recover ? 'back' : null"
-    :right-button-to="{ name: 'intro' }"
-    right-button-icon-name="close"
-    hide-tab-bar
-  >
-    <Guide>
-      <AeFraction
-        v-if="recover"
-        slot="icon"
-        :numerator="2"
-        :denominator="2"
-      />
-
-      <template v-if="recover">
-        You recovered your
-        account <em>successfully</em>!
-        Now <mark>choose a new <img :src="keyEmoji"> password</mark>
-        and confirm.
-      </template>
-      <template v-else>
-        <mark>Choose a <img :src="keyEmoji"> password</mark> and confirm.
-      </template>
-    </Guide>
-
-    <form
-      :id="_uid"
-      @submit.prevent="createHdWallet"
-    >
-      <PasswordPurpose />
-      <AeInputPassword
-        v-model="password"
-        v-validate="'required|min:4'"
-        autofocus
-        autocomplete="new-password"
-        :error="errors.has('password')"
-        :footer="errors.first('password')"
-        name="password"
-        hide-reveal-button
-      />
-      <AeInputPassword
-        v-model="passwordConfirm"
-        v-validate="`required|confirmed:${password}`"
-        autocomplete="new-password"
-        :error="errors.has('passwordConfirm')"
-        :footer="errors.first('passwordConfirm')"
-        header="Repeat password"
-        name="passwordConfirm"
-        hide-reveal-button
-      />
-    </form>
-
-    <AeButton
-      slot="footer"
-      :form="_uid"
-      :disabled="errors.any() || working"
-      fill="secondary"
-    >
-      Confirm
-    </AeButton>
-  </MobilePage>
-</template>
-
-<script>
-import keyEmoji from 'emoji-datasource-apple/img/apple/64/1f511.png';
-import MobilePage from '../../components/mobile/Page.vue';
-import Guide from '../../components/Guide.vue';
-import AeFraction from '../../components/AeFraction.vue';
-import AeButton from '../../components/AeButton.vue';
-import PasswordPurpose from '../../components/mobile/PasswordPurpose.vue';
-import AeInputPassword from '../../components/AeInputPassword.vue';
-
-export default {
-  components: {
-    MobilePage, PasswordPurpose, AeInputPassword, AeButton, Guide, AeFraction,
-  },
-  props: {
-    mnemonic: { type: String, default: '' },
-  },
-  data() {
-    return {
-      password: '',
-      passwordConfirm: '',
-      recover: false,
-      working: false,
-      keyEmoji,
-    };
-  },
-  methods: {
-    async createHdWallet() {
-      if (!await this.$validator.validateAll()) return;
-
-      this.working = true;
-      try {
-        await this.$store.dispatch('accounts/hdWallet/createWallet', {
-          password: this.password,
-          mnemonic: this.mnemonic,
-        });
-      } finally {
-        this.working = false;
-      }
-    },
-  },
-  beforeRouteEnter(to, from, next) {
-    next((vm) => {
-      vm.recover = from.name === 'recover'; // eslint-disable-line no-param-reassign
-    });
-  },
-};
-</script>
diff --git a/src/pages/mobile/Settings.vue b/src/pages/mobile/Settings.vue
index 56a07cec2..491f514df 100644
--- a/src/pages/mobile/Settings.vue
+++ b/src/pages/mobile/Settings.vue
@@ -56,9 +56,22 @@
         subtitle="Secure your funds"
         title="Backup Recovery Phrase"
         class="mnemonic"
+      >
+        <MnemonicBackupWarning slot="icon">
+          <ListItemCircle>
+            <Key />
+          </ListItemCircle>
+        </MnemonicBackupWarning>
+        <LeftMore slot="right" />
+      </ListItem>
+      <ListItem
+        :to="{ name: 'settings-password' }"
+        subtitle="Setup and manage a password"
+        title="Wallet Authentication"
+        class="password"
       >
         <ListItemCircle slot="icon">
-          <Key />
+          <Shield />
         </ListItemCircle>
         <LeftMore slot="right" />
       </ListItem>
@@ -82,6 +95,7 @@
     <h2>Account</h2>
     <AeCard fill="maximum">
       <ListItem
+        v-if="isWalletEncrypted"
         title="Logout"
         subtitle="And see you soon!"
         class="logout"
@@ -110,8 +124,9 @@ import ListItem from '../../components/ListItem.vue';
 import ListItemCircle from '../../components/ListItemCircle.vue';
 import ListItemAccount from '../../components/ListItemAccount.vue';
 import ListItemSettingsReset from '../../components/ListItemSettingsReset.vue';
+import MnemonicBackupWarning from '../../components/mobile/MnemonicBackupWarning.vue';
 import {
-  Globe, LeftMore, Device, Grid, Key, Share, LockOpen,
+  Globe, LeftMore, Device, Grid, Key, Share, LockOpen, Shield,
 } from '../../components/icons';
 
 export default {
@@ -123,6 +138,7 @@ export default {
     ListItemCircle,
     ListItemAccount,
     ListItemSettingsReset,
+    MnemonicBackupWarning,
     Globe,
     LeftMore,
     Device,
@@ -130,6 +146,7 @@ export default {
     Key,
     Share,
     LockOpen,
+    Shield,
   },
   data: () => ({
     version: process.env.npm_package_version,
@@ -148,6 +165,7 @@ export default {
     removableAccounts: ({ accounts: { list } }) => list
       .map((account, idx) => ({ ...account, idx }))
       .filter(({ source: { type } }) => type !== 'hd-wallet'),
+    isWalletEncrypted: (state, getters) => getters['accounts/hdWallet/isWalletEncrypted'],
   }),
   methods: mapActions(['logout']),
 };
@@ -165,8 +183,10 @@ export default {
       }
     }
 
-    &.remote-connection .list-item-circle {
-      background-color: #515ec8;
+    &.remote-connection, &.password {
+      .list-item-circle {
+        background-color: #515ec8;
+      }
     }
 
     &.app-list .list-item-circle {
diff --git a/src/pages/mobile/SettingsMnemonicConfirm.vue b/src/pages/mobile/SettingsMnemonicConfirm.vue
index 190b419b1..089cb5772 100644
--- a/src/pages/mobile/SettingsMnemonicConfirm.vue
+++ b/src/pages/mobile/SettingsMnemonicConfirm.vue
@@ -96,7 +96,8 @@ export default {
   computed: {
     ...mapState('accounts/hdWallet', ['mnemonic']),
     mnemonicPermutation() {
-      return shuffle(this.mnemonic.split(' '));
+      const words = this.mnemonic.split(' ');
+      return process.env.NODE_ENV === 'production' ? shuffle(words) : words;
     },
     selectedMnemonic() {
       return this.selectedWordIds.map(idx => this.mnemonicPermutation[idx]).join(' ');
@@ -114,7 +115,9 @@ export default {
     },
     confirmPhrase() {
       this.error = this.selectedMnemonic !== this.mnemonic;
-      if (!this.error) this.$router.push({ name: 'settings-mnemonic-confirmed' });
+      if (this.error) return;
+      this.$store.commit('accounts/hdWallet/markMnemonicAsBackedUp');
+      this.$router.push({ name: 'settings-mnemonic-confirmed' });
     },
   },
 };
diff --git a/src/pages/mobile/SettingsPassword.vue b/src/pages/mobile/SettingsPassword.vue
new file mode 100644
index 000000000..48fb774ac
--- /dev/null
+++ b/src/pages/mobile/SettingsPassword.vue
@@ -0,0 +1,55 @@
+<template>
+  <MobilePage
+    :left-button-to="{ name: 'settings' }"
+    left-button-icon-name="back"
+    title="Wallet Authentication"
+    header-fill="light"
+    fill="neutral"
+    class="settings-password"
+  >
+    <AeCard fill="maximum">
+      <ListItem
+        :title="`${isWalletEncrypted ? 'Change' : 'Choose'} password`"
+        :subtitle="isWalletEncrypted ? 'Update your password' : ''"
+        :to="{ name: 'settings-password-set' }"
+      >
+        <LeftMore slot="right" />
+      </ListItem>
+      <ListItemButton
+        v-if="isWalletEncrypted"
+        @click="() => changeWalletPassword()"
+      >
+        Remove password
+      </ListItemButton>
+    </AeCard>
+  </MobilePage>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex';
+import MobilePage from '../../components/mobile/Page.vue';
+import AeCard from '../../components/AeCard.vue';
+import ListItem from '../../components/ListItem.vue';
+import { LeftMore } from '../../components/icons';
+import ListItemButton from '../../components/ListItemButton.vue';
+
+export default {
+  components: {
+    MobilePage,
+    AeCard,
+    ListItem,
+    LeftMore,
+    ListItemButton,
+  },
+  computed: mapGetters('accounts/hdWallet', ['isWalletEncrypted']),
+  methods: mapActions('accounts/hdWallet', ['changeWalletPassword']),
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/variables/colors.scss';
+
+.settings-password.mobile-page .list-item-button {
+  color: $color-primary;
+}
+</style>
diff --git a/src/pages/mobile/SettingsPasswordSet.vue b/src/pages/mobile/SettingsPasswordSet.vue
new file mode 100644
index 000000000..f102ddf75
--- /dev/null
+++ b/src/pages/mobile/SettingsPasswordSet.vue
@@ -0,0 +1,112 @@
+<template>
+  <MobilePage
+    title="Wallet Authentication"
+    :right-button-to="{ name: 'settings-password' }"
+    right-button-icon-name="close"
+    hide-tab-bar
+  >
+    <Guide>
+      <template v-if="isWalletEncrypted">
+        <mark>Change your password</mark>
+      </template>
+      <template v-else>
+        <mark>Choose a <img :src="keyEmoji"> password</mark> and confirm.
+      </template>
+    </Guide>
+
+    <form
+      :id="_uid"
+      @submit.prevent="createHdWallet"
+    >
+      <PasswordPurpose />
+      <AeInputPassword
+        v-if="isWalletEncrypted"
+        v-model="password"
+        v-validate="'required|min:4'"
+        :autofocus="isWalletEncrypted"
+        autocomplete="current-password"
+        :error="errors.has('password') || wrongPassword"
+        name="password"
+        @input="wrongPassword = false"
+      >
+        <template slot="footer">
+          <template v-if="errors.has('password')">
+            {{ errors.first('password') }}
+          </template>
+          <template v-else-if="wrongPassword">
+            Wrong password, try again
+          </template>
+        </template>
+      </AeInputPassword>
+      <AeInputPassword
+        v-model="newPassword"
+        v-validate="'required|min:4'"
+        :autofocus="!isWalletEncrypted"
+        autocomplete="new-password"
+        :error="errors.has('newPassword')"
+        :footer="errors.first('newPassword')"
+        header="New password"
+        name="newPassword"
+        hide-reveal-button
+      />
+      <AeInputPassword
+        v-model="newPasswordConfirm"
+        v-validate="`required|confirmed:${newPassword}`"
+        autocomplete="new-password"
+        :error="errors.has('newPasswordConfirm')"
+        :footer="errors.first('newPasswordConfirm')"
+        header="Confirm your new password"
+        name="newPasswordConfirm"
+        hide-reveal-button
+      />
+    </form>
+
+    <AeButton
+      slot="footer"
+      :form="_uid"
+      :disabled="errors.any() || wrongPassword"
+      fill="secondary"
+    >
+      Confirm
+    </AeButton>
+  </MobilePage>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import keyEmoji from 'emoji-datasource-apple/img/apple/64/1f511.png';
+import MobilePage from '../../components/mobile/Page.vue';
+import Guide from '../../components/Guide.vue';
+import PasswordPurpose from '../../components/mobile/PasswordPurpose.vue';
+import AeInputPassword from '../../components/AeInputPassword.vue';
+import AeButton from '../../components/AeButton.vue';
+
+export default {
+  components: {
+    MobilePage, Guide, PasswordPurpose, AeInputPassword, AeButton,
+  },
+  data: () => ({
+    password: '',
+    newPassword: '',
+    newPasswordConfirm: '',
+    wrongPassword: false,
+    keyEmoji,
+  }),
+  computed: mapGetters('accounts/hdWallet', ['isWalletEncrypted']),
+  methods: {
+    async createHdWallet() {
+      if (!await this.$validator.validateAll()) return;
+
+      try {
+        await this.$store.dispatch('accounts/hdWallet/changeWalletPassword', {
+          password: this.password,
+          newPassword: this.newPassword,
+        });
+        this.$router.push({ name: 'settings-password' });
+      } catch (e) {
+        this.wrongPassword = true;
+      }
+    },
+  },
+};
+</script>
diff --git a/src/pages/mobile/SettingsRemoteConnection.vue b/src/pages/mobile/SettingsRemoteConnection.vue
index c74045b67..331955630 100644
--- a/src/pages/mobile/SettingsRemoteConnection.vue
+++ b/src/pages/mobile/SettingsRemoteConnection.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 import MobilePage from '../../components/mobile/Page.vue';
 import AeCard from '../../components/AeCard.vue';
 import ListItem from '../../components/ListItem.vue';
@@ -53,6 +53,6 @@ export default {
         disconnectedAt: new Date(f.disconnectedAt).toLocaleString(),
       })),
   }),
-  methods: mapMutations(['removeFollower']),
+  methods: mapActions(['removeFollower']),
 };
 </script>
diff --git a/src/pages/mobile/SettingsSecurityCourseWrapper.vue b/src/pages/mobile/SettingsSecurityCourseWrapper.vue
index 0f208032a..0b276d65a 100644
--- a/src/pages/mobile/SettingsSecurityCourseWrapper.vue
+++ b/src/pages/mobile/SettingsSecurityCourseWrapper.vue
@@ -4,6 +4,7 @@
     class="settings-security-course-details"
     hide-tab-bar
     :class="name"
+    header-fill="alternative"
   >
     <template slot="header">
       <h1>{{ course.title }}</h1>
diff --git a/src/pages/mobile/TransactionDetails.vue b/src/pages/mobile/TransactionDetails.vue
index 1dcf82705..9a0f392cb 100644
--- a/src/pages/mobile/TransactionDetails.vue
+++ b/src/pages/mobile/TransactionDetails.vue
@@ -26,6 +26,7 @@
     </template>
 
     <DetailsField
+      v-if="!transaction.pending"
       name="Date"
       :value="transaction.time.toLocaleString()"
     />
@@ -39,7 +40,6 @@
 
     <Component
       :is="transaction.received ? 'DetailsAmount' : 'DetailsAmountAndFee'"
-      :name="!transaction.received && 'Transaction Fee'"
       :amount="transaction.tx.amount"
       :fee="transaction.tx.fee"
     />
diff --git a/src/pages/mobile/TransactionList.vue b/src/pages/mobile/TransactionList.vue
index 9f2a1de79..512d61740 100644
--- a/src/pages/mobile/TransactionList.vue
+++ b/src/pages/mobile/TransactionList.vue
@@ -101,7 +101,7 @@ export default {
             || this.direction === ''
           )),
         (tx) => {
-          const dateString = tx.time.toDateString();
+          const dateString = tx.pending ? 'Pending transactions' : tx.time.toDateString();
           return dateString === new Date().toDateString() ? 'Today' : dateString;
         },
       );
diff --git a/src/pages/mobile/VaultSetupMethod.vue b/src/pages/mobile/VaultSetupMethod.vue
index 937de0632..c191e1f6c 100644
--- a/src/pages/mobile/VaultSetupMethod.vue
+++ b/src/pages/mobile/VaultSetupMethod.vue
@@ -35,7 +35,7 @@
       >
     </ListItemChoose>
     <ListItemChoose
-      v-if="$globals.IS_CORDOVA && $globals.UNFINISHED_FEATURES"
+      v-if="$globals.IS_CORDOVA"
       title="Normal"
       subtitle="Install AirGap on this device"
       :active="!maximumSecure"
diff --git a/src/register-modals.js b/src/register-modals.js
deleted file mode 100644
index dcb6db333..000000000
--- a/src/register-modals.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { merge } from 'lodash-es';
-import { registerModal } from './store/plugins/ui/modals';
-import AlertModal from './components/AlertModal.vue';
-import { QrCodeReader } from './components/async';
-import Notification from './components/Notification.vue';
-import NotificationSpend from './components/NotificationSpend.vue';
-import AccountSwitcherModal from './components/mobile/AccountSwitcherModal.vue';
-import SecurityCourseModal from './components/mobile/SecurityCourseModal.vue';
-import MigratedBalanceModal from './components/mobile/MigratedBalanceModal.vue';
-import ConfirmAccountAccessModal from './components/mobile/ConfirmAccountAccessModal.vue';
-import ConfirmContractCallModal from './components/mobile/ConfirmContractCallModal.vue';
-import ConfirmContractDeployModal from './components/mobile/ConfirmContractDeployModal.vue';
-import ConfirmSignModal from './components/mobile/ConfirmSignModal.vue';
-import ConfirmSpendModal from './components/mobile/ConfirmSpendModal.vue';
-import VaultSignModal from './components/mobile/VaultSignModal.vue';
-import LedgerAccountNotFoundModal from './components/desktop/LedgerAccountNotFoundModal.vue';
-import LedgerAddressConfirmModal from './components/desktop/LedgerAddressConfirmModal.vue';
-import LedgerAddressNotConfirmedModal from './components/desktop/LedgerAddressNotConfirmedModal.vue';
-import LedgerRequestModal from './components/desktop/LedgerRequestModal.vue';
-import LedgerRequestRetryModal from './components/desktop/LedgerRequestRetryModal.vue';
-import LedgerSignTransactionModal from './components/desktop/LedgerSignTransactionModal.vue';
-import LedgerTransactionFeeModal from './components/desktop/LedgerTransactionFeeModal.vue';
-import CancelSignModal from './components/desktop/CancelSignModal.vue';
-
-registerModal({ name: 'alert', component: AlertModal });
-registerModal({
-  name: 'confirm',
-  component: {
-    functional: true,
-    render: (h, context) => h(AlertModal, merge({}, context, { props: { confirm: true } })),
-  },
-});
-registerModal({ name: 'readQrCode', component: QrCodeReader, hidePage: true });
-const notificationOptions = { allowRedirect: true, dontGrayscalePage: true };
-registerModal({ name: 'notification', component: Notification, ...notificationOptions });
-registerModal({ name: 'notificationSpend', component: NotificationSpend, ...notificationOptions });
-
-if (process.env.IS_MOBILE_DEVICE) {
-  registerModal({ name: 'accountSwitcher', component: AccountSwitcherModal });
-  registerModal({ name: 'proposeToOpenSecurityCourses', component: SecurityCourseModal, allowRedirect: true });
-  registerModal({ name: 'migratedBalance', component: MigratedBalanceModal });
-  registerModal({ name: 'confirmAccountAccess', component: ConfirmAccountAccessModal });
-  registerModal({ name: 'confirmContractCall', component: ConfirmContractCallModal, hidePage: true });
-  registerModal({ name: 'confirmContractDeploy', component: ConfirmContractDeployModal, hidePage: true });
-  registerModal({ name: 'confirmSign', component: ConfirmSignModal, hidePage: true });
-  registerModal({ name: 'confirmSpend', component: ConfirmSpendModal, hidePage: true });
-  registerModal({ name: 'vaultSign', component: VaultSignModal, hidePage: true });
-} else {
-  registerModal({ name: 'ledgerAccountNotFound', component: LedgerAccountNotFoundModal });
-  registerModal({ name: 'confirmLedgerAddress', component: LedgerAddressConfirmModal });
-  registerModal({ name: 'ledgerAddressNotConfirmed', component: LedgerAddressNotConfirmedModal });
-  registerModal({ name: 'ledgerRequest', component: LedgerRequestModal });
-  registerModal({ name: 'retryLedgerRequest', component: LedgerRequestRetryModal });
-  registerModal({ name: 'getLedgerTransactionFee', component: LedgerTransactionFeeModal });
-  registerModal({ name: 'ledgerSignTransaction', component: LedgerSignTransactionModal });
-  registerModal({ name: 'cancelSign', component: CancelSignModal });
-}
diff --git a/src/router/index.js b/src/router/index.js
index 7027c3f43..841fdc3c4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,45 +1,7 @@
 import Router from 'vue-router';
 import store from '../store';
-import mobileRoutes from './routes/mobile';
-import desktopRoutes from './routes/desktop';
-import commonRoutes from './routes/common';
 import AddToHomeScreenPrompt from '../pages/mobile/AddToHomeScreenPrompt.vue';
 
-const router = new Router({
-  mode: process.env.IS_CORDOVA ? 'hash' : 'history',
-  routes:
-    process.env.IS_MOBILE_DEVICE
-      ? (!process.env.IS_CORDOVA && !process.env.IS_PWA && !process.env.IS_IOS && process.env.NODE_ENV === 'production'
-        && [{
-          path: '/',
-          component: AddToHomeScreenPrompt,
-        }])
-        || [...mobileRoutes, ...commonRoutes]
-      : [...desktopRoutes, ...commonRoutes],
-  scrollBehavior(to, from, savedPosition) {
-    if (savedPosition) {
-      return savedPosition;
-    }
-    return { x: 0, y: 0 };
-  },
-});
-
-store.watch(
-  (state, { loggedIn }) => loggedIn,
-  (loggedIn) => {
-    if (loggedIn) {
-      if (process.env.IS_MOBILE_DEVICE || store.state.loginTarget) {
-        router.push(store.state.loginTarget || { name: 'transfer' });
-        store.commit('setLoginTarget');
-      }
-    } else {
-      const { fullPath } = router.currentRoute;
-      router.replace({ name: process.env.IS_MOBILE_DEVICE ? 'intro' : 'apps' });
-      router.replace(fullPath);
-    }
-  },
-);
-
 store.subscribe((mutation, state) => {
   switch (mutation.type) {
     case 'toggleSidebar':
@@ -49,4 +11,51 @@ store.subscribe((mutation, state) => {
   }
 });
 
-export default router;
+export default (async () => {
+  const router = new Router({
+    mode: process.env.IS_CORDOVA ? 'hash' : 'history',
+    scrollBehavior(to, from, savedPosition) {
+      if (savedPosition) {
+        return savedPosition;
+      }
+      return { x: 0, y: 0 };
+    },
+  });
+
+  if (
+    process.env.IS_MOBILE_DEVICE && !process.env.IS_CORDOVA
+    && !process.env.IS_PWA && !process.env.IS_IOS
+    && process.env.NODE_ENV === 'production'
+  ) {
+    router.addRoutes([{
+      path: '/',
+      component: AddToHomeScreenPrompt,
+    }]);
+  } else {
+    await Promise.all([
+      process.env.IS_MOBILE_DEVICE
+        ? import(/* webpackChunkName: "ui-mobile" */ './routes/mobile')
+        : import(/* webpackChunkName: "ui-desktop" */ './routes/desktop'),
+      import('./routes/common'),
+    ]
+      .map(async module => router.addRoutes((await module).default)));
+  }
+
+  store.watch(
+    (state, { loggedIn }) => loggedIn,
+    (loggedIn) => {
+      if (loggedIn) {
+        if (process.env.IS_MOBILE_DEVICE || store.state.loginTarget) {
+          router.push(store.state.loginTarget || { name: 'transfer' });
+          store.commit('setLoginTarget');
+        }
+      } else {
+        const { fullPath } = router.currentRoute;
+        router.replace({ name: process.env.IS_MOBILE_DEVICE ? 'intro' : 'apps' });
+        router.replace(fullPath);
+      }
+    },
+  );
+
+  return router;
+})();
diff --git a/src/router/modals/desktop.js b/src/router/modals/desktop.js
new file mode 100644
index 000000000..9902cb1b1
--- /dev/null
+++ b/src/router/modals/desktop.js
@@ -0,0 +1,20 @@
+import { registerModal } from '../../store/plugins/ui/modals';
+import LedgerAccountNotFoundModal from '../../components/desktop/LedgerAccountNotFoundModal.vue';
+import LedgerAddressConfirmModal from '../../components/desktop/LedgerAddressConfirmModal.vue';
+import LedgerAddressNotConfirmedModal from '../../components/desktop/LedgerAddressNotConfirmedModal.vue';
+import LedgerRequestModal from '../../components/desktop/LedgerRequestModal.vue';
+import LedgerRequestRetryModal from '../../components/desktop/LedgerRequestRetryModal.vue';
+import LedgerSignTransactionModal from '../../components/desktop/LedgerSignTransactionModal.vue';
+import LedgerTransactionFeeModal from '../../components/desktop/LedgerTransactionFeeModal.vue';
+import CancelSignModal from '../../components/desktop/CancelSignModal.vue';
+
+export default () => {
+  registerModal({ name: 'ledgerAccountNotFound', component: LedgerAccountNotFoundModal });
+  registerModal({ name: 'confirmLedgerAddress', component: LedgerAddressConfirmModal });
+  registerModal({ name: 'ledgerAddressNotConfirmed', component: LedgerAddressNotConfirmedModal });
+  registerModal({ name: 'ledgerRequest', component: LedgerRequestModal });
+  registerModal({ name: 'retryLedgerRequest', component: LedgerRequestRetryModal });
+  registerModal({ name: 'getLedgerTransactionFee', component: LedgerTransactionFeeModal });
+  registerModal({ name: 'ledgerSignTransaction', component: LedgerSignTransactionModal });
+  registerModal({ name: 'cancelSign', component: CancelSignModal });
+};
diff --git a/src/router/modals/index.js b/src/router/modals/index.js
new file mode 100644
index 000000000..7b0234773
--- /dev/null
+++ b/src/router/modals/index.js
@@ -0,0 +1,25 @@
+import { merge } from 'lodash-es';
+import { registerModal } from '../../store/plugins/ui/modals';
+import { notificationOptions } from './utils';
+import AlertModal from '../../components/AlertModal.vue';
+import { QrCodeReader } from '../../components/async';
+import Notification from '../../components/Notification.vue';
+import NotificationSpend from '../../components/NotificationSpend.vue';
+
+export default async () => {
+  registerModal({ name: 'alert', component: AlertModal });
+  registerModal({
+    name: 'confirm',
+    component: {
+      functional: true,
+      render: (h, context) => h(AlertModal, merge({}, context, { props: { confirm: true } })),
+    },
+  });
+  registerModal({ name: 'readQrCode', component: QrCodeReader, hidePage: true });
+  registerModal({ name: 'notification', component: Notification, ...notificationOptions });
+  registerModal({ name: 'notificationSpend', component: NotificationSpend, ...notificationOptions });
+
+  (await (process.env.IS_MOBILE_DEVICE
+    ? import(/* webpackChunkName: "ui-mobile" */ './mobile')
+    : import(/* webpackChunkName: "ui-desktop" */ './desktop'))).default();
+};
diff --git a/src/router/modals/mobile.js b/src/router/modals/mobile.js
new file mode 100644
index 000000000..6a64b3670
--- /dev/null
+++ b/src/router/modals/mobile.js
@@ -0,0 +1,27 @@
+import { registerModal } from '../../store/plugins/ui/modals';
+import { notificationOptions } from './utils';
+import AccountSwitcherModal from '../../components/mobile/AccountSwitcherModal.vue';
+import SecurityCourseModal from '../../components/mobile/SecurityCourseModal.vue';
+import MigratedBalanceModal from '../../components/mobile/MigratedBalanceModal.vue';
+import ConfirmAccountAccessModal from '../../components/mobile/ConfirmAccountAccessModal.vue';
+import ConfirmContractCallModal from '../../components/mobile/ConfirmContractCallModal.vue';
+import ConfirmContractDeployModal from '../../components/mobile/ConfirmContractDeployModal.vue';
+import ConfirmSignModal from '../../components/mobile/ConfirmSignModal.vue';
+import ConfirmSpendModal from '../../components/mobile/ConfirmSpendModal.vue';
+import VaultSignModal from '../../components/mobile/VaultSignModal.vue';
+import NotificationMnemonicBackup from '../../components/mobile/NotificationMnemonicBackup.vue';
+import PasswordModal from '../../components/mobile/PasswordModal.vue';
+
+export default () => {
+  registerModal({ name: 'accountSwitcher', component: AccountSwitcherModal });
+  registerModal({ name: 'proposeToOpenSecurityCourses', component: SecurityCourseModal, allowRedirect: true });
+  registerModal({ name: 'migratedBalance', component: MigratedBalanceModal });
+  registerModal({ name: 'confirmAccountAccess', component: ConfirmAccountAccessModal });
+  registerModal({ name: 'confirmContractCall', component: ConfirmContractCallModal, hidePage: true });
+  registerModal({ name: 'confirmContractDeploy', component: ConfirmContractDeployModal, hidePage: true });
+  registerModal({ name: 'confirmSign', component: ConfirmSignModal, hidePage: true });
+  registerModal({ name: 'confirmSpend', component: ConfirmSpendModal, hidePage: true });
+  registerModal({ name: 'vaultSign', component: VaultSignModal, hidePage: true });
+  registerModal({ name: 'notificationMnemonicBackup', component: NotificationMnemonicBackup, ...notificationOptions });
+  registerModal({ name: 'ensureKnowPassword', component: PasswordModal, hidePage: true });
+};
diff --git a/src/router/modals/utils.js b/src/router/modals/utils.js
new file mode 100644
index 000000000..94f1a617f
--- /dev/null
+++ b/src/router/modals/utils.js
@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/prefer-default-export
+export const notificationOptions = { allowRedirect: true, dontGrayscalePage: true };
diff --git a/src/router/routes/common.js b/src/router/routes/common.js
index 958689528..6bf0ad8ee 100644
--- a/src/router/routes/common.js
+++ b/src/router/routes/common.js
@@ -1,4 +1,4 @@
-import { checkLoggedIn } from '../utils';
+import { ensureLoggedIn } from '../utils';
 import AddressBook from '../../pages/AddressBook.vue';
 import AddressBookNew from '../../pages/AddressBookNew.vue';
 import AddressBookChoose from '../../pages/AddressBookChoose.vue';
@@ -8,17 +8,17 @@ export default [...process.env.UNFINISHED_FEATURES ? [{
   name: 'address-book',
   path: '/addresses',
   component: AddressBook,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'address-book-new',
   path: '/addresses/new',
   component: AddressBookNew,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'address-book-choose',
   path: '/addresses/choose/:redirectPathTemplate',
   component: AddressBookChoose,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }] : [], {
   name: 'not-found',
diff --git a/src/router/routes/desktop.js b/src/router/routes/desktop.js
index 637f127be..c60d5dc16 100644
--- a/src/router/routes/desktop.js
+++ b/src/router/routes/desktop.js
@@ -2,7 +2,7 @@ import Apps from '../../pages/desktop/Apps.vue';
 import Send from '../../pages/desktop/Send.vue';
 import Receive from '../../pages/desktop/Receive.vue';
 import Settings from '../../pages/desktop/Settings.vue';
-import { checkLoggedIn } from '../utils';
+import { ensureLoggedIn } from '../utils';
 
 export default [{
   name: 'apps',
@@ -12,7 +12,7 @@ export default [{
   name: 'send',
   path: '/send',
   component: Send,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'receive',
   path: '/receive',
diff --git a/src/router/routes/mobile.js b/src/router/routes/mobile.js
index aeb87eba7..0059ed195 100644
--- a/src/router/routes/mobile.js
+++ b/src/router/routes/mobile.js
@@ -1,4 +1,4 @@
-import { checkLoggedIn } from '../utils';
+import { ensureLoggedIn } from '../utils';
 import store from '../../store/index';
 import Intro from '../../pages/mobile/Intro.vue';
 import Onboarding from '../../pages/mobile/Onboarding.vue';
@@ -10,7 +10,6 @@ import Login from '../../pages/mobile/Login.vue';
 import Recover from '../../pages/mobile/Recover.vue';
 import AppIntro from '../../pages/mobile/AppIntro.vue';
 import AppBrowser from '../../pages/mobile/AppBrowser.vue';
-import SetPassword from '../../pages/mobile/SetPassword.vue';
 import AccountsNew from '../../pages/mobile/AccountsNew.vue';
 import VaultSetupMethod from '../../pages/mobile/VaultSetupMethod.vue';
 import VaultSetupAnotherDevice from '../../pages/mobile/VaultSetupAnotherDevice.vue';
@@ -43,6 +42,8 @@ import SettingsSecurityCourseBank from '../../pages/mobile/SettingsSecurityCours
 import SettingsSecurityCoursePrivacy from '../../pages/mobile/SettingsSecurityCoursePrivacy.vue';
 import SettingsSecurityCourseLayers from '../../pages/mobile/SettingsSecurityCourseLayers.vue';
 import SettingsAccountRemove from '../../pages/mobile/SettingsAccountRemove.vue';
+import SettingsPassword from '../../pages/mobile/SettingsPassword.vue';
+import SettingsPasswordSet from '../../pages/mobile/SettingsPasswordSet.vue';
 
 const Apps = () => import(/* webpackChunkName: "page-apps" */ '../../pages/mobile/Apps.vue');
 
@@ -71,15 +72,15 @@ const checkStoreMnemonic = (to, from, next) => {
   next();
 };
 
-const vaultBeforeEnter = mergeEnterHandlers(checkLoggedIn(true), checkAccountName);
-const settingsMnemonicBeforeEnter = mergeEnterHandlers(checkLoggedIn(true), checkStoreMnemonic);
+const vaultBeforeEnter = mergeEnterHandlers(ensureLoggedIn, checkAccountName);
+const settingsMnemonicBeforeEnter = mergeEnterHandlers(ensureLoggedIn, checkStoreMnemonic);
 
 export default [{
   name: 'intro',
   path: '/',
   component: Intro,
   beforeEnter(to, from, next) {
-    if (!from.name && store.state.accounts.hdWallet.encryptedWallet) {
+    if (!from.name && store.getters['accounts/hdWallet/isWalletEncrypted']) {
       next({ name: 'login' });
       return;
     }
@@ -111,7 +112,7 @@ export default [{
   component: Login,
   beforeEnter(to, from, next) {
     if (!store.state.accounts.hdWallet.encryptedWallet) {
-      next({ name: 'set-password' });
+      next({ name: 'intro' });
       return;
     }
     if (store.getters.loggedIn) {
@@ -124,31 +125,26 @@ export default [{
   name: 'recover',
   path: '/recover',
   component: Recover,
-}, {
-  name: 'set-password',
-  path: '/set-password',
-  component: SetPassword,
-  props: true,
 }, {
   name: 'app-intro',
   path: '/browser/intro',
   component: AppIntro,
-  beforeEnter: checkLoggedIn(false),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'apps',
   path: '/browser',
   component: Apps,
-  beforeEnter: checkLoggedIn(false),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'app-browser',
   path: '/browser/*',
   component: AppBrowser,
-  beforeEnter: checkLoggedIn(false),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'accounts-new',
   path: '/accounts-new',
   component: AccountsNew,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   meta: {
     accountType: 'hd-wallet',
   },
@@ -156,7 +152,7 @@ export default [{
   name: 'vault-new',
   path: '/vault/new',
   component: AccountsNew,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   meta: {
     accountType: 'air-gap',
   },
@@ -180,7 +176,7 @@ export default [{
   path: '/vault/sync-completed',
   component: VaultSetupCompleted,
   beforeEnter: vaultBeforeEnter,
-}, ...process.env.IS_CORDOVA && process.env.UNFINISHED_FEATURES
+}, ...process.env.IS_CORDOVA
   ? [{
     name: 'vault-setup-same-device',
     path: '/vault/same-device',
@@ -195,76 +191,76 @@ export default [{
   name: 'transfer',
   path: '/transfer',
   component: Transfer,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'receive',
   path: '/transfer/receive',
   component: Receive,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'send',
   path: '/transfer/send',
   component: Send,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'send-to',
   path: '/transfer/send/:to',
   component: SendAmount,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'send-confirm',
   path: '/transfer/send/:to/:amount',
   component: SendConfirm,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'transaction-list',
   path: '/transfer/transactions/:direction?',
   component: TransactionList,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'transaction-details',
   path: '/transfer/transactions/details/:hash',
   component: TransactionDetails,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'settings',
   path: '/settings',
   component: Settings,
-  beforeEnter: checkLoggedIn(false),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-network',
   path: '/settings/network',
   component: SettingsNetwork,
-  beforeEnter: checkLoggedIn(false),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-network-new',
   path: '/settings/network/new',
   component: SettingsNetworkNew,
-  beforeEnter: checkLoggedIn(false),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-remote-connection',
   path: '/settings/remote-connection',
   component: SettingsRemoteConnection,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-remote-connection-new',
   path: '/settings/remote-connection/new',
   component: SettingsRemoteConnectionNew,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-app-list',
   path: '/settings/apps',
   component: SettingsAppList,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-app-details',
   path: '/settings/apps/:appHost',
   component: SettingsAppDetails,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'settings-mnemonic',
@@ -290,37 +286,47 @@ export default [{
   name: 'settings-mnemonic-deleted',
   path: '/settings/mnemonic/deleted',
   component: SettingsMnemonicDeleted,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-security-course-list',
   path: '/settings/security-courses',
   component: SettingsSecurityCourseList,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'settings-security-course-intro',
   path: '/settings/security-courses/intro',
   component: SettingsSecurityCourseIntro,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-security-course-bank',
   path: '/settings/security-courses/bank',
   component: SettingsSecurityCourseBank,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-security-course-privacy',
   path: '/settings/security-courses/privacy',
   component: SettingsSecurityCoursePrivacy,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-security-course-layers',
   path: '/settings/security-courses/layers',
   component: SettingsSecurityCourseLayers,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
 }, {
   name: 'settings-account-remove',
   path: '/settings/wallet/:idx',
   component: SettingsAccountRemove,
-  beforeEnter: checkLoggedIn(true),
+  beforeEnter: ensureLoggedIn,
   props: true,
+}, {
+  name: 'settings-password',
+  path: '/settings/password',
+  component: SettingsPassword,
+  beforeEnter: ensureLoggedIn,
+}, {
+  name: 'settings-password-set',
+  path: '/settings/password/set',
+  component: SettingsPasswordSet,
+  beforeEnter: ensureLoggedIn,
 }];
diff --git a/src/router/utils.js b/src/router/utils.js
index 544bb310d..67daccd97 100644
--- a/src/router/utils.js
+++ b/src/router/utils.js
@@ -1,19 +1,17 @@
 import store from '../store';
 
 // eslint-disable-next-line import/prefer-default-export
-export const checkLoggedIn = requireLoggedIn => (to, from, next) => {
+export const ensureLoggedIn = (to, from, next) => {
   if (!store.getters.loggedIn) {
+    store.commit('setLoginTarget', to.fullPath);
     if (process.env.IS_MOBILE_DEVICE) {
-      store.commit('setLoginTarget', to.fullPath);
       next({ name: store.state.accounts.hdWallet.encryptedWallet ? 'login' : 'intro' });
-      return;
-    } if (requireLoggedIn) {
-      store.commit('setLoginTarget', to.fullPath);
+    } else {
       if (from.name) next(false);
       else next({ name: 'apps' });
       store.commit('toggleSidebar');
-      return;
     }
+    return;
   }
   next();
 };
diff --git a/src/setupAnalytics.js b/src/setupAnalytics.js
index 9e7d7efbc..b45877ca8 100644
--- a/src/setupAnalytics.js
+++ b/src/setupAnalytics.js
@@ -1,21 +1,46 @@
-import Vue from 'vue';
-import Matomo from 'vue-matomo';
-import Countly from 'countly-sdk-web';
-import { defer } from 'lodash-es';
-import router from './router';
+import Matomo from 'vue-matomo/src/matomo';
+import routerPromise from './router';
+import store from './store';
 
-export default () => {
-  Vue.use(Matomo, {
-    host: process.env.VUE_APP_MATOMO_URL,
-    siteId: process.env.VUE_APP_MATOMO_SITE_ID,
-    router,
-  });
+export default async () => {
+  const router = await routerPromise;
+  const matomo = Matomo.getTracker(
+    `${process.env.VUE_APP_MATOMO_URL}/piwik.php`,
+    process.env.VUE_APP_MATOMO_SITE_ID,
+  );
+
+  const trackPageView = (route) => {
+    let { fullPath } = route;
+    switch (route.name) {
+      case 'send-to':
+      case 'send-confirm':
+        fullPath = fullPath.replace(route.params.to, '<to>');
+        break;
+      case 'transaction-details':
+        fullPath = fullPath.replace(route.params.hash, '<hash>');
+        break;
+      default:
+    }
+    matomo.setCustomUrl(fullPath);
+    matomo.setDocumentTitle(route.name);
+    matomo.trackPageView();
+  };
+
+  matomo.disableCookies();
+  matomo.setCustomDimension(1, process.env.IS_MOBILE_DEVICE);
+  matomo.setCustomDimension(2, process.env.IS_PWA);
+  matomo.setCustomDimension(3, process.env.IS_IOS);
+  matomo.setCustomDimension(4, process.env.npm_package_version);
+  matomo.setCustomDimension(5, process.env.IS_CORDOVA);
+  matomo.setCustomVariable(1, 'accounts-count', store.state.accounts.list.length);
+  trackPageView(router.currentRoute);
+  matomo.enableLinkTracking();
+  matomo.enableJSErrorTracking();
+
+  router.afterEach(to => trackPageView(to));
 
-  Countly.init({
-    url: process.env.VUE_APP_COUNTLY_URL,
-    app_key: process.env.VUE_APP_COUNTLY_APP_KEY,
+  store.subscribeAction(({ type, payload }) => {
+    if (type !== 'modals/open') return;
+    matomo.trackEvent('modal', 'open', payload.name);
   });
-  Countly.q.push(['track_sessions']);
-  router.afterEach(() => defer(() => Countly.q
-    .push(['track_pageview', window.location.pathname + window.location.hash])));
 };
diff --git a/src/store/index.js b/src/store/index.js
index 6361d7fc6..f1dc73171 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -27,7 +27,7 @@ const store = new Vuex.Store({
       ({
         migrations, sdkUrl, addressBook, customNetworks,
         apps, cachedAppManifests, peerId,
-        accounts: { list, activeIdx, hdWallet: { encryptedWallet } = {} } = {},
+        accounts: { list, activeIdx, hdWallet: { encryptedWallet, mnemonicBackedUp } = {} } = {},
         mobile: { readSecurityCourses, followers } = {},
         desktop: { showGuideOnStartup } = {},
       }) => ({
@@ -50,7 +50,7 @@ const store = new Vuex.Store({
             }
           }),
           activeIdx,
-          hdWallet: { encryptedWallet },
+          hdWallet: { encryptedWallet, mnemonicBackedUp },
         },
         ...process.env.IS_MOBILE_DEVICE ? {
           apps,
diff --git a/src/store/migrations/03-set-mnemonic-backed-up.js b/src/store/migrations/03-set-mnemonic-backed-up.js
new file mode 100644
index 000000000..6a4a4fb46
--- /dev/null
+++ b/src/store/migrations/03-set-mnemonic-backed-up.js
@@ -0,0 +1,8 @@
+export default {
+  migrate(state) {
+    if (!process.env.IS_MOBILE_DEVICE) return state;
+    const newState = { ...state };
+    newState.accounts.hdWallet.mnemonicBackedUp = !state.accounts.hdWallet.encryptedWallet.mnemonic;
+    return newState;
+  },
+};
diff --git a/src/store/migrations/index.js b/src/store/migrations/index.js
index 425b2b899..e6ebc6c6a 100644
--- a/src/store/migrations/index.js
+++ b/src/store/migrations/index.js
@@ -2,9 +2,11 @@ import runMigrations, { registerMigration } from './runner';
 import fixEasCounterIssue from './00-fix-aes-ctr-counter-issue';
 import resetAppsStateField from './01-reset-apps-state-field';
 import buildAccountsArray from './02-build-accounts-array';
+import setMnemonicBackedUp from './03-set-mnemonic-backed-up';
 
 registerMigration(fixEasCounterIssue);
 registerMigration(resetAppsStateField);
 registerMigration(buildAccountsArray);
+registerMigration(setMnemonicBackedUp);
 
 export default runMigrations;
diff --git a/src/store/modules/accounts/hdWallet.js b/src/store/modules/accounts/hdWallet.js
index cc0e1bbbd..9048badf5 100644
--- a/src/store/modules/accounts/hdWallet.js
+++ b/src/store/modules/accounts/hdWallet.js
@@ -25,6 +25,7 @@ export default {
     encryptedWallet: null,
     passwordDerivedKey: null,
     mnemonic: '',
+    mnemonicBackedUp: false,
     wallet: null,
   } : {},
 
@@ -33,6 +34,7 @@ export default {
       ...rootGetters['accounts/getByType']('hd-wallet').map(({ source: { idx } }) => idx),
       -1,
     ) + 1,
+    isWalletEncrypted: ({ encryptedWallet }) => encryptedWallet && !!encryptedWallet.mac,
   } : {},
 
   mutations: process.env.IS_MOBILE_DEVICE ? {
@@ -48,6 +50,10 @@ export default {
       state.mnemonic = mnemonic;
     },
 
+    markMnemonicAsBackedUp(state) {
+      state.mnemonicBackedUp = true;
+    },
+
     setWallet(state, wallet) {
       state.wallet = wallet;
       this.getters['accounts/getByType']('hd-wallet')
@@ -78,64 +84,108 @@ export default {
     async discover({
       state, getters, rootState: { sdk }, commit,
     }) {
+      const { api } = sdk.then ? await sdk : sdk;
       let account;
       do {
         if (account) {
           commit('accounts/add', { ...account, type: 'hd-wallet' }, { root: true });
         }
         account = getHdWalletAccount(state.wallet, getters.nextIdx);
-      } while (await sdk.api // eslint-disable-line no-await-in-loop
+      } while (await api // eslint-disable-line no-await-in-loop
         .getAccountByPubkey(account.address).then(() => true, () => false));
     },
 
-    async createWallet({ commit, dispatch }, { password, mnemonic }) {
-      const salt = genRandomBuffer(16);
-      const passwordDerivedKey = await derivePasswordKey(password, salt);
-      const aes = new AES(passwordDerivedKey);
-      commit('setPasswordDerivedKey', passwordDerivedKey);
+    async createWallet({ commit, dispatch }, mnemonic) {
+      if (mnemonic) commit('markMnemonicAsBackedUp');
       const newMnemonic = mnemonic || generateMnemonic();
       commit('setMnemonic', newMnemonic);
-      commit('setEncryptedWallet', {
-        mnemonic: await aes.encrypt(Buffer.from(newMnemonic)),
-        mac: await aes.encrypt(new Uint8Array(2)),
-        salt,
-      });
+      commit('setEncryptedWallet', { mnemonic: newMnemonic });
       commit('setWallet', generateHdWallet(mnemonicToSeed(newMnemonic)));
       dispatch('create', 'Main Account');
       dispatch('discover');
       dispatch('modals/open', { name: 'proposeToOpenSecurityCourses' }, { root: true });
     },
 
-    async unlockWallet({ state: { encryptedWallet }, commit, dispatch }, password) {
+    async setWalletPassword({ state: { wallet, mnemonic }, commit }, password) {
+      if (password) {
+        const salt = genRandomBuffer(16);
+        const newPasswordDerivedKey = await derivePasswordKey(password, salt);
+        commit('setPasswordDerivedKey', newPasswordDerivedKey);
+        const aes = new AES(newPasswordDerivedKey);
+        commit('setEncryptedWallet', {
+          ...mnemonic ? {
+            mnemonic: await aes.encrypt(Buffer.from(mnemonic)),
+          } : {
+            privateKey: await aes.encrypt(wallet.privateKey),
+            chainCode: await aes.encrypt(wallet.chainCode),
+          },
+          mac: await aes.encrypt(new Uint8Array(2)),
+          salt,
+        });
+      } else {
+        commit('setPasswordDerivedKey', null);
+        commit('setEncryptedWallet', mnemonic ? { mnemonic } : wallet);
+      }
+    },
+
+    async changeWalletPassword({ getters, dispatch }, { password, newPassword } = {}) {
+      if (getters.isWalletEncrypted) {
+        if (password) await dispatch('deriveAndCheckPasswordKey', password);
+        else await dispatch('modals/open', { name: 'ensureKnowPassword' }, { root: true });
+      }
+      await dispatch('setWalletPassword', newPassword);
+    },
+
+    async deriveAndCheckPasswordKey({ state: { encryptedWallet } }, password) {
       const passwordDerivedKey = await derivePasswordKey(password, encryptedWallet.salt);
       const aes = new AES(passwordDerivedKey);
-      let mnemonic;
-      let wallet;
       if (encryptedWallet.mnemonic) {
-        mnemonic = Buffer.from(await aes.decrypt(encryptedWallet.mnemonic)).toString();
-        wallet = generateHdWallet(mnemonicToSeed(mnemonic));
+        await aes.decrypt(encryptedWallet.mnemonic);
       } else {
-        wallet = {
+        await aes.decrypt(encryptedWallet.privateKey);
+        await aes.decrypt(encryptedWallet.chainCode);
+      }
+      const mac = new Uint8Array(await aes.decrypt(encryptedWallet.mac));
+      if (mac.reduce((p, n) => p || n !== 0, false)) throw new Error('Wrong password');
+      return passwordDerivedKey;
+    },
+
+    async unlockWallet({
+      state: { encryptedWallet }, getters: { isWalletEncrypted }, commit, dispatch,
+    }, password) {
+      let wallet;
+      if (isWalletEncrypted) {
+        const passwordDerivedKey = await dispatch('deriveAndCheckPasswordKey', password);
+        const aes = new AES(passwordDerivedKey);
+        commit('setPasswordDerivedKey', passwordDerivedKey);
+
+        wallet = encryptedWallet.mnemonic ? {
+          mnemonic: Buffer.from(await aes.decrypt(encryptedWallet.mnemonic)).toString(),
+        } : {
           privateKey: await aes.decrypt(encryptedWallet.privateKey),
           chainCode: await aes.decrypt(encryptedWallet.chainCode),
         };
+      } else wallet = encryptedWallet;
+      if (wallet.mnemonic) {
+        commit('setMnemonic', wallet.mnemonic);
+        wallet = generateHdWallet(mnemonicToSeed(wallet.mnemonic));
       }
-      const mac = new Uint8Array(await aes.decrypt(encryptedWallet.mac));
-      if (mac.reduce((p, n) => p || n !== 0, false)) throw new Error('Invalid password');
-      if (mnemonic) commit('setMnemonic', mnemonic);
-      commit('setPasswordDerivedKey', passwordDerivedKey);
       commit('setWallet', wallet);
       dispatch('discover');
     },
 
     async deleteMnemonic({ state: { passwordDerivedKey, encryptedWallet, wallet }, commit }) {
-      const newAes = new AES(passwordDerivedKey);
-      commit('setEncryptedWallet', {
-        privateKey: await newAes.encrypt(wallet.privateKey),
-        chainCode: await newAes.encrypt(wallet.chainCode),
-        mac: await newAes.encrypt(new Uint8Array(2)),
-        salt: encryptedWallet.salt,
-      });
+      if (passwordDerivedKey) {
+        const aes = new AES(passwordDerivedKey);
+        commit('setEncryptedWallet', {
+          privateKey: await aes.encrypt(wallet.privateKey),
+          chainCode: await aes.encrypt(wallet.chainCode),
+          mac: await aes.encrypt(new Uint8Array(2)),
+          salt: encryptedWallet.salt,
+        });
+      } else {
+        commit('setEncryptedWallet', wallet);
+      }
       commit('setMnemonic', '');
     },
 
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index eb5914432..0a958f7fc 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -42,4 +42,14 @@ export default {
       state.readSecurityCourses.push(courseName);
     },
   },
+
+  actions: {
+    removeFollower({ state: { followers }, commit, dispatch }, followerId) {
+      dispatch('modals/open', {
+        name: 'notification',
+        text: `Access was successfully revoked for ${followers[followerId].name}`,
+      });
+      commit('removeFollower', followerId);
+    },
+  },
 };
diff --git a/src/store/plugins/initSdk.js b/src/store/plugins/initSdk.js
index f66f8ca39..c8fde28fb 100644
--- a/src/store/plugins/initSdk.js
+++ b/src/store/plugins/initSdk.js
@@ -79,24 +79,19 @@ export default (store) => {
   };
 
   let lastNetwork;
-  let latestSdkPromise;
 
   store.watch(
     ({ onLine }, { currentNetwork }) => ({ ...currentNetwork, onLine }),
     async (currentNetwork) => {
       if (isEqual(currentNetwork, lastNetwork)) return;
       lastNetwork = currentNetwork;
+      if (store.state.sdk && !store.state.sdk.then) store.state.sdk.destroyInstance();
       const sdkPromise = createSdk(currentNetwork.url);
-      latestSdkPromise = sdkPromise;
-      let sdk = null;
-      try {
-        sdk = await sdkPromise;
-      } finally {
-        if (sdkPromise === latestSdkPromise) {
-          if (store.state.sdk) store.state.sdk.destroyInstance();
-          store.commit('setSdk', sdk);
-        } else sdk.destroyInstance();
-      }
+      const sdkThenable = { then: sdkPromise.then.bind(sdkPromise) };
+      store.commit('setSdk', sdkThenable);
+      const sdk = await sdkThenable.then(s => s, () => null);
+      if (sdkThenable === store.state.sdk) store.commit('setSdk', sdk);
+      else if (sdk) sdk.destroyInstance();
     },
     { immediate: true },
   );
diff --git a/src/store/plugins/persistState.js b/src/store/plugins/persistState.js
index 5102ef0ab..53996be87 100644
--- a/src/store/plugins/persistState.js
+++ b/src/store/plugins/persistState.js
@@ -5,16 +5,28 @@ const KEY = 'vuex';
 
 const setState = state => localStorage.setItem(
   KEY,
-  JSON.stringify(state, (key, value) => (value instanceof ArrayBuffer
-    ? { type: 'ArrayBuffer', data: Array.from(new Uint8Array(value)) }
-    : value)),
+  JSON.stringify(state, (key, value) => {
+    if (value instanceof ArrayBuffer) {
+      return { type: 'ArrayBuffer', data: Array.from(new Uint8Array(value)) };
+    }
+    if (value instanceof Uint8Array) {
+      return { type: 'Uint8Array', data: Array.from(value) };
+    }
+    return value;
+  }),
 );
 
 const getState = () => JSON.parse(
   localStorage.getItem(KEY),
-  (key, value) => (value && value.type === 'ArrayBuffer'
-    ? new Uint8Array(value.data).buffer
-    : value),
+  (key, value) => {
+    if (value && value.type === 'ArrayBuffer') {
+      return new Uint8Array(value.data).buffer;
+    }
+    if (value && value.type === 'Uint8Array') {
+      return new Uint8Array(value.data);
+    }
+    return value;
+  },
 );
 
 export const resetState = () => {
diff --git a/src/store/plugins/reverseIframe.js b/src/store/plugins/reverseIframe.js
index 82e61ec22..640c8664d 100644
--- a/src/store/plugins/reverseIframe.js
+++ b/src/store/plugins/reverseIframe.js
@@ -7,7 +7,7 @@ const modals = {
 export default (store) => {
   if (!process.env.RUNNING_IN_FRAME) return;
   const unsubscribe = store.watch(
-    ({ sdk }, getters) => sdk && getters['accounts/active'],
+    ({ sdk }, getters) => sdk && !sdk.then && getters['accounts/active'],
     (ready) => {
       if (!ready) return;
       window.parent.postMessage({ jsonrpc: '2.0', method: 'ready' }, '*');
diff --git a/src/store/plugins/ui/index.js b/src/store/plugins/ui/index.js
index 0b1a0a1cc..2023f10f8 100644
--- a/src/store/plugins/ui/index.js
+++ b/src/store/plugins/ui/index.js
@@ -3,8 +3,10 @@ import connectionStatusTracker from './connectionStatusTracker';
 import desktopGuide from './desktopGuide';
 import ledgerConnection from './ledgerConnection';
 import modals from './modals';
+import notificationForMnemonicBackup from './notificationForMnemonicBackup';
 import notificationOnRemoteConnection from './notificationOnRemoteConnection';
 import observables from './observables';
+import unlockWalletIfNotEncrypted from './unlockWalletIfNotEncrypted';
 
 export default store => [
   connectionStatusTracker,
@@ -13,7 +15,9 @@ export default store => [
   ...process.env.IS_MOBILE_DEVICE
     ? [
       browserPathTracker,
+      notificationForMnemonicBackup,
       notificationOnRemoteConnection,
+      unlockWalletIfNotEncrypted,
     ]
     : [
       desktopGuide,
diff --git a/src/store/plugins/ui/ledgerConnection.js b/src/store/plugins/ui/ledgerConnection.js
index a9835118b..f46a2db44 100644
--- a/src/store/plugins/ui/ledgerConnection.js
+++ b/src/store/plugins/ui/ledgerConnection.js
@@ -1,16 +1,6 @@
 import TransportU2F from '@ledgerhq/hw-transport-u2f';
-import Ae from '@aeternity/ledger-app-api';
 
 export default async (store) => {
   const isSupported = await TransportU2F.isSupported();
   store.commit('setLedgerSupported', isSupported);
-  if (!isSupported) return;
-
-  if (!store.state.accounts.list.some(({ source: { type } }) => type === 'ledger')) {
-    const transport = new TransportU2F();
-    const ledgerAppApi = new Ae(transport);
-    // eslint-disable-next-line no-await-in-loop
-    while (await ledgerAppApi.getAppConfiguration().then(() => false, () => true));
-    store.dispatch('accounts/ledger/create');
-  }
 };
diff --git a/src/store/plugins/ui/notificationForMnemonicBackup.js b/src/store/plugins/ui/notificationForMnemonicBackup.js
new file mode 100644
index 000000000..dfe179a2b
--- /dev/null
+++ b/src/store/plugins/ui/notificationForMnemonicBackup.js
@@ -0,0 +1,15 @@
+export default (store) => {
+  store.subscribeAction(({ type }) => {
+    if (
+      type !== 'accounts/hdWallet/unlockWallet'
+      || store.state.accounts.hdWallet.mnemonicBackedUp
+    ) return;
+    const unwatch = store.watch(
+      (state, { loggedIn }) => loggedIn,
+      () => {
+        store.dispatch('modals/open', { name: 'notificationMnemonicBackup' });
+        unwatch();
+      },
+    );
+  });
+};
diff --git a/src/store/plugins/ui/observables.js b/src/store/plugins/ui/observables.js
index 6fbf876f8..524469d09 100644
--- a/src/store/plugins/ui/observables.js
+++ b/src/store/plugins/ui/observables.js
@@ -17,17 +17,20 @@ export default (store) => {
     options,
   );
 
-  const sdk$ = watchAsObservable(({ sdk }) => sdk, { immediate: true })
+  const sdk$ = watchAsObservable(({ sdk }) => (sdk && sdk.then ? null : sdk), { immediate: true })
     .pipe(
       pluck('newValue'),
     );
 
-  const getBalance = memoize(address => sdk$
+  const defaultAccountInfo = { balance: BigNumber(0), nonce: 0 };
+  const getAccountInfo = memoize(address => sdk$
     .pipe(
       switchMap(sdk => timer(0, 3000).pipe(map(() => sdk))),
-      switchMap(async sdk => BigNumber(sdk ? await sdk.balance(address).catch(() => 0) : 0)
-        .shiftedBy(-MAGNITUDE)),
-      multicast(new BehaviorSubject(BigNumber(0))),
+      switchMap(sdk => (sdk
+        ? sdk.api.getAccountByPubkey(address).catch(() => defaultAccountInfo)
+        : defaultAccountInfo)),
+      map(aci => ({ ...aci, balance: BigNumber(aci.balance).shiftedBy(-MAGNITUDE) })),
+      multicast(new BehaviorSubject(defaultAccountInfo)),
       refCountDelay(1000),
     ));
 
@@ -35,8 +38,8 @@ export default (store) => {
     .pipe(
       pluck('newValue'),
       switchMap(acs => (acs.length
-        ? combineLatest(acs.map(({ address }) => getBalance(address)))
-          .pipe(map(balances => balances.map((balance, idx) => ({ ...acs[idx], balance }))))
+        ? combineLatest(acs.map(({ address }) => getAccountInfo(address)))
+          .pipe(map(acis => acis.map((aci, idx) => ({ ...acs[idx], ...aci }))))
         : of([]))),
     );
 
@@ -47,7 +50,11 @@ export default (store) => {
   }) => ({
     ...otherTransaction,
     blockHash,
-    time: new Date(time || (await store.state.sdk.api.getMicroBlockHeaderByHash(blockHash)).time),
+    ...blockHash !== 'none' && {
+      time: new Date(
+        time || (await store.state.sdk.api.getMicroBlockHeaderByHash(blockHash)).time,
+      ),
+    },
     tx: {
       ...otherTx,
       amount: BigNumber(amount).shiftedBy(-MAGNITUDE),
@@ -133,14 +140,18 @@ export default (store) => {
   const getTransactionsByAddress = (address) => {
     if (!transactionRangeForAddress[address]) return [];
     const txs = Object.values(transactions)
-      .filter(({ tx }) => [tx.senderId, tx.accountId, tx.recipientId, tx.ownerId].includes(address))
+      .filter(({ tx }) => [tx.senderId, tx.accountId, tx.recipientId, tx.ownerId]
+        .includes(address));
+    const minedTxs = txs
+      .filter(({ pending }) => !pending)
       .sort((a, b) => b.time - a.time);
     const { begin, end } = transactionRangeForAddress[address];
-    const beginIdx = txs.findIndex(({ hash }) => hash === begin);
-    const endIdx = txs.findIndex(({ hash }) => hash === end);
-    return txs
-      .slice(beginIdx, endIdx - beginIdx + 1)
-      .map(tx => setTransactionFieldsRelatedToAddress(tx, address));
+    const beginIdx = minedTxs.findIndex(({ hash }) => hash === begin);
+    const endIdx = minedTxs.findIndex(({ hash }) => hash === end);
+    return [
+      ...txs.filter(({ pending }) => pending),
+      ...minedTxs.slice(beginIdx, endIdx - beginIdx + 1),
+    ].map(tx => setTransactionFieldsRelatedToAddress(tx, address));
   };
 
   const getTransactionList = (loadMore$) => {
@@ -247,7 +258,6 @@ export default (store) => {
 
   store.state.observables = { // eslint-disable-line no-param-reassign
     topBlockHeight: topBlockHeight$,
-    getBalance,
     getTransaction,
     getTransactionList,
     activeAccount: watchAsObservable(
@@ -257,7 +267,7 @@ export default (store) => {
       .pipe(
         pluck('newValue'),
         switchMap(acc => (acc
-          ? getBalance(acc.address).pipe(map(balance => ({ ...acc, balance })))
+          ? getAccountInfo(acc.address).pipe(map(acci => ({ ...acc, ...acci })))
           : of(acc))),
       ),
     accounts: accounts$,
diff --git a/src/store/plugins/ui/unlockWalletIfNotEncrypted.js b/src/store/plugins/ui/unlockWalletIfNotEncrypted.js
new file mode 100644
index 000000000..b1e957c6d
--- /dev/null
+++ b/src/store/plugins/ui/unlockWalletIfNotEncrypted.js
@@ -0,0 +1,7 @@
+export default async (store) => {
+  if (
+    !store.state.accounts.hdWallet.encryptedWallet
+    || store.getters['accounts/hdWallet/isWalletEncrypted']
+  ) return;
+  await store.dispatch('accounts/hdWallet/unlockWallet');
+};
diff --git a/src/ui.js b/src/ui.js
index 01f6d5b97..e54011096 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -1,28 +1,30 @@
 import Vue from 'vue';
 import Router from 'vue-router';
 import './ui-common';
-import './register-modals';
+import registerModals from './router/modals';
 import sync from './lib/vuexRouterSync';
 import VeeValidate from './lib/veeValidatePlugin';
-import App from './App.vue';
-import AppDesktop from './AppDesktop.vue';
-import router from './router';
+import routerPromise from './router';
 import store from './store';
 import uiPlugin from './store/plugins/ui';
-import setupAnalytics from './setupAnalytics';
+
+const AppMobile = () => import(/* webpackChunkName: "ui-mobile" */ './App.vue');
+const AppDesktop = () => import(/* webpackChunkName: "ui-desktop" */ './AppDesktop.vue');
 
 Vue.use(Router);
 Vue.use(VeeValidate);
 
-if (process.env.UNFINISHED_FEATURES) {
-  setupAnalytics();
-}
+import(/* webpackChunkName: "analytics" */ './setupAnalytics').then(module => module.default());
+
+(async () => {
+  const [router] = await Promise.all([routerPromise, registerModals()]);
+  sync(store, router);
 
-sync(store, router);
-uiPlugin(store);
+  new Vue({
+    store,
+    router,
+    render: h => h(process.env.IS_MOBILE_DEVICE ? AppMobile : AppDesktop),
+  }).$mount('#app');
 
-new Vue({
-  store,
-  router,
-  render: h => h(process.env.IS_MOBILE_DEVICE ? App : AppDesktop),
-}).$mount('#app');
+  uiPlugin(store);
+})();
diff --git a/tests/e2e/specs/migrations/03-set-mnemonic-backed-up.js b/tests/e2e/specs/migrations/03-set-mnemonic-backed-up.js
new file mode 100644
index 000000000..e462233a3
--- /dev/null
+++ b/tests/e2e/specs/migrations/03-set-mnemonic-backed-up.js
@@ -0,0 +1,63 @@
+import { prepare } from '../../utils';
+
+describe('Migration 3: Set mnemonic backed up', () => {
+  it('applicable', () => {
+    prepare();
+    window.localStorage.vuex = JSON.stringify({
+      migrations: {
+        0: true,
+        1: true,
+        2: true,
+      },
+      accounts: {
+        list: [{
+          address: 'ak_2swhLkgBPeeADxVTAVCJnZLY5NZtCFiM93JxsEaMuC59euuFRQ',
+          name: 'Main Account',
+          source: {
+            idx: 0,
+            type: 'hd-wallet',
+          },
+        }],
+        hdWallet: {
+          encryptedWallet: {
+            privateKey: {
+              type: 'ArrayBuffer',
+              data: [
+                99, 4, 219, 158, 15, 198, 201, 236, 138, 202, 221, 189, 219, 87, 203, 15, 184,
+                28, 207, 134, 243, 213, 211, 141, 156, 20, 132, 145, 136, 28, 109, 9,
+              ],
+            },
+            chainCode: {
+              type: 'ArrayBuffer',
+              data: [
+                144, 218, 66, 92, 180, 54, 87, 114, 131, 132, 143, 226, 224, 173, 28, 197, 114,
+                142, 124, 11, 21, 5, 172, 88, 155, 166, 49, 135, 6, 41, 82, 54,
+              ],
+            },
+            mac: {
+              type: 'ArrayBuffer',
+              data: [96, 104],
+            },
+            salt: {
+              type: 'ArrayBuffer',
+              data: [163, 236, 16, 158, 177, 79, 169, 173, 130, 16, 227, 229, 16, 184, 186, 172],
+            },
+          },
+        },
+      },
+    });
+    cy
+      .viewport('iphone-5')
+      .visit('/login')
+      .get('input[type=password]').type('1234')
+      .get('button')
+      .contains('Log in')
+      .click()
+      .url()
+      .should('contain', '/transfer')
+      .then(() => {
+        const state = JSON.parse(localStorage.vuex);
+        expect(state.accounts.hdWallet.mnemonicBackedUp).equal(true);
+      });
+  });
+});
diff --git a/vue.config.js b/vue.config.js
index 31a2d8898..94fa9bd8c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,6 @@
 require('./scripts/label-icons');
 const path = require('path');
+const branch = require('./scripts/current-branch');
 
 const parseBool = val => (val ? JSON.parse(val) : false);
 
@@ -8,9 +9,14 @@ const { IS_MOBILE_DEVICE, IS_PWA, npm_package_version } = process.env;
 const IS_CORDOVA = parseBool(process.env.IS_CORDOVA);
 const UNFINISHED_FEATURES = parseBool(process.env.UNFINISHED_FEATURES);
 
+if (branch === 'master') {
+  process.env.VUE_APP_MATOMO_SITE_ID = 2;
+}
+
 module.exports = {
   publicPath: IS_CORDOVA ? './' : '/',
   outputDir: IS_CORDOVA ? 'www' : 'dist',
+  productionSourceMap: !IS_CORDOVA,
   chainWebpack: config => config.plugin('define').tap((options) => {
     const definitions = Object.assign({}, options[0]);