diff --git a/.travis.yml b/.travis.yml
index f7e7d580e..5ff25ce8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,34 @@
-language: node_js
-os:
-  - linux
-  - osx
-osx_image: xcode10.2
-node_js:
-  - '10'
+matrix:
+  include:
+    - language: node_js
+      node_js: '10'
+      script: scripts/test.sh
+
+    - language: android
+      android:
+        components:
+          - build-tools-28.0.3
+          - android-28
+      before_install:
+        - yes | sdkmanager "platforms;android-28"
+        - nvm install 10
+      script: scripts/build-cordova.sh
+
+    - language: objective-c
+      os: osx
+      osx_image: xcode10.2
+      before_install: nvm install 10
+      script: scripts/build-cordova.sh
+
 cache:
   directories:
     - node_modules
     - platforms
     - plugins
     - /home/travis/.cache/Cypress
-install:
-  - travis_wait 30 scripts/install.sh
-script: scripts/script.sh
-before_deploy: scripts/before-deploy.sh
+
+install: travis_wait 30 scripts/install.sh
+
 deploy:
   - provider: script
     skip_cleanup: true
@@ -23,7 +37,9 @@ deploy:
       all_branches: true
   - provider: releases
     api_key: $GITHUB_TOKEN
-    file: aeternity.app.tar.gz
+    file:
+      - aeternity.apk
+      - aeternity.app.tar.gz
     skip_cleanup: true
     on:
       condition: $TRAVIS_OS_NAME = osx
diff --git a/Dockerfile.ci b/Dockerfile.ci
deleted file mode 100644
index 9fdd743f7..000000000
--- a/Dockerfile.ci
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM tamasbarta/docker-android-sdk:28.0.3
-
-ENV NODEJS_VERSION=10.15.3 \
-    PATH=$PATH:/opt/node/bin
-
-RUN apt-get update && \
-    apt-get install -y python \
-                       build-essential \
-                       libfontconfig \
-                       curl \
-                       gradle \
-                       imagemagick &&\
-    curl -sL https://nodejs.org/dist/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-x64.tar.gz | tar xz --strip-components=1 &&\
-    rm -rf /var/lib/apt/lists/*
-
-ENV GRADLE_OPTS=${GRADLE_OPTS}\ -Dorg.gradle.daemon=false
-
-RUN mkdir app
-WORKDIR /app
-
-COPY package*.json ./
-RUN npm install && npx cordova telemetry off
-
-# As cordova changes global modules when adding a platform, we have to build the apk already during the docker build process
-COPY . .
-RUN npm run build:cordova
-RUN npx cordova prepare android
-RUN npm run gen:cordova-resources
-RUN npx cordova build android -- --gradleArg=--no-daemon
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 1e10734ac..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,20 +0,0 @@
-pipeline {
-  agent {
-    dockerfile {
-      filename 'Dockerfile.ci'
-      args '-v /etc/group:/etc/group:ro ' +
-           '-v /etc/passwd:/etc/passwd:ro ' +
-           '-v /var/lib/jenkins:/var/lib/jenkins '
-
-    }
-  }
-
-  stages {
-    stage('Archive Artifacts') {
-      steps {
-        sh 'cp /app/platforms/android/app/build/outputs/apk/debug/app-debug.apk $WORKSPACE/android-debug.apk'
-        archiveArtifacts artifacts: 'android-debug.apk', fingerprint: true
-      }
-    }
-  }
-}
diff --git a/config.xml b/config.xml
index 206e7cf14..e20d963d8 100644
--- a/config.xml
+++ b/config.xml
@@ -1,28 +1,32 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.aeternity.base" version="0.8.2" 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.3" 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
     </author>
     <content src="index.html" />
-    <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
     <allow-intent href="tel:*" />
     <allow-intent href="sms:*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
-    <allow-navigation href="*" />
     <platform name="android">
+        <access origin="*.aepps.com" />
+        <access origin="aeternity.com" />
+        <access origin="api.backendless.com" />
+        <access origin="cors-anywhere.herokuapp.com" />
         <allow-intent href="market:*" />
         <preference name="SplashMaintainAspectRatio" value="true" />
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
-          <application android:usesCleartextTraffic="true" />
+            <application android:usesCleartextTraffic="true" />
         </edit-config>
     </platform>
     <platform name="ios">
+        <access origin="*" />
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
+        <allow-navigation href="*" />
         <preference name="UseSwiftLanguageVersion" value="5" />
         <preference name="DisallowOverscroll" value="true" />
     </platform>
diff --git a/package-lock.json b/package-lock.json
index a8513aa7a..5a4ededca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "aepp-base",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -31,9 +31,9 @@
       }
     },
     "@aeternity/aepp-sdk": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-3.1.0.tgz",
-      "integrity": "sha512-dvdoZuHN6fOJvQJuelbt4DmNlI0xpS8ObSs5LN1X8Q0Ifc/a+rk3ROGyECKMGw99+rx1ASCjhYubCe/nkLoihg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-3.3.0.tgz",
+      "integrity": "sha512-Me/x+GOoupDAQ8DS4osk8Wqqh72ty0Do86GlOVSNMmqdzOFfrmbqDduvchRPlwjWlO9xClaQQ8Vk2z0hJwkrcQ==",
       "requires": {
         "@aeternity/bip39": "^0.1.0",
         "@babel/runtime": "^7.0.0-beta.46",
@@ -46,20 +46,17 @@
         "bip32-path": "^0.4.2",
         "blakejs": "^1.1.0",
         "bs58check": "^2.1.1",
-        "cacache": "^11.2.0",
-        "chalk": "^2.4.1",
         "commander": "^2.14.1",
-        "esm": "^3.0.77",
-        "json-bigint": "^0.3.0",
+        "joi-browser": "^13.4.0",
+        "json-bigint": "github:davidyuk/json-bigint#64b099a5d8e9d1210175db0a13cfd7ab0c66d85a",
+        "libsodium-wrappers-sumo": "0.7.3",
         "ramda": "^0.25.0",
-        "recursive-rename": "^2.0.0",
         "rlp": "2.1.0",
-        "semver": "^5.6.0",
         "serialize-javascript": "^1.5.0",
         "sha.js": "^2.4.11",
         "tweetnacl": "^1.0.0",
         "tweetnacl-auth": "^1.0.1",
-        "url": "^0.11.0",
+        "universal-url": "^2.0.0",
         "uuid": "^3.3.2",
         "websocket": "^1.0.26"
       }
@@ -3612,6 +3609,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       }
@@ -3934,7 +3932,8 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
     },
     "arch": {
       "version": "2.1.1",
@@ -4871,6 +4870,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -4879,7 +4879,8 @@
         "regenerator-runtime": {
           "version": "0.11.1",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
         }
       }
     },
@@ -5489,7 +5490,8 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
     },
     "buffer-indexof": {
       "version": "1.1.1",
@@ -5530,6 +5532,7 @@
       "version": "11.3.1",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.1.tgz",
       "integrity": "sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==",
+      "dev": true,
       "requires": {
         "bluebird": "^3.5.1",
         "chownr": "^1.0.1",
@@ -5745,6 +5748,7 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -5914,7 +5918,8 @@
     "chownr": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "dev": true
     },
     "chrome-trace-event": {
       "version": "1.0.0",
@@ -6196,6 +6201,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -6203,7 +6209,8 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
     },
     "color-string": {
       "version": "1.5.3",
@@ -6218,7 +6225,9 @@
     "colors": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="
+      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+      "dev": true,
+      "optional": true
     },
     "combined-stream": {
       "version": "1.0.7",
@@ -6313,6 +6322,7 @@
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -6458,6 +6468,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
       "requires": {
         "aproba": "^1.1.1",
         "fs-write-stream-atomic": "^1.0.8",
@@ -6926,12 +6937,14 @@
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "dev": true
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "cosmiconfig": {
       "version": "5.0.7",
@@ -7359,7 +7372,8 @@
     "cyclist": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
     },
     "cypress": {
       "version": "3.2.0",
@@ -7949,7 +7963,8 @@
     "dom-walk": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
+      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
+      "dev": true
     },
     "domain-browser": {
       "version": "1.2.0",
@@ -8046,6 +8061,7 @@
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
       "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+      "dev": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
@@ -8191,6 +8207,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -8331,7 +8348,8 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
     },
     "escodegen": {
       "version": "1.11.1",
@@ -9035,11 +9053,6 @@
       "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
-    "esm": {
-      "version": "3.2.22",
-      "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.22.tgz",
-      "integrity": "sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
-    },
     "espree": {
       "version": "3.5.4",
       "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
@@ -9828,7 +9841,8 @@
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
     },
     "figures": {
       "version": "1.7.0",
@@ -10046,6 +10060,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.4"
@@ -10128,6 +10143,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0"
@@ -10169,6 +10185,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "iferr": "^0.1.5",
@@ -10179,7 +10196,8 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
     },
     "fsevents": {
       "version": "1.2.9",
@@ -10879,6 +10897,7 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -10917,6 +10936,7 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
       "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "dev": true,
       "requires": {
         "min-document": "^2.19.0",
         "process": "~0.5.1"
@@ -10925,7 +10945,8 @@
         "process": {
           "version": "0.5.2",
           "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-          "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
+          "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+          "dev": true
         }
       }
     },
@@ -11024,7 +11045,8 @@
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -11138,7 +11160,8 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
     },
     "has-symbols": {
       "version": "1.0.0",
@@ -11231,6 +11254,11 @@
         "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",
@@ -11869,7 +11897,8 @@
     "iferr": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
     },
     "ignore": {
       "version": "3.3.10",
@@ -11972,7 +12001,8 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
     },
     "in-publish": {
       "version": "2.0.0",
@@ -12004,6 +12034,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -13344,6 +13375,11 @@
         "topo": "3.x.x"
       }
     },
+    "joi-browser": {
+      "version": "13.4.0",
+      "resolved": "https://registry.npmjs.org/joi-browser/-/joi-browser-13.4.0.tgz",
+      "integrity": "sha512-TfzJd2JaJ/lg/gU+q5j9rLAjnfUNF9DUmXTP9w+GfmG79LjFOXFeM7hIFuXCBcZCivUDFwd9l1btTV9rhHumtQ=="
+    },
     "js-base64": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -13463,18 +13499,10 @@
       "dev": true
     },
     "json-bigint": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz",
-      "integrity": "sha1-DM2RLEuCcNBfBW+9E4FLU9OCWx4=",
+      "version": "github:davidyuk/json-bigint#64b099a5d8e9d1210175db0a13cfd7ab0c66d85a",
+      "from": "github:davidyuk/json-bigint",
       "requires": {
-        "bignumber.js": "^7.0.0"
-      },
-      "dependencies": {
-        "bignumber.js": {
-          "version": "7.2.1",
-          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
-          "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="
-        }
+        "bignumber.js": "^8.0.0"
       }
     },
     "json-parse-better-errors": {
@@ -13668,6 +13696,19 @@
         "type-check": "~0.3.2"
       }
     },
+    "libsodium-sumo": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/libsodium-sumo/-/libsodium-sumo-0.7.3.tgz",
+      "integrity": "sha512-zCik0rx9XVNKMLY/t+kI6L/+LGomPx/UZ5iiU2YzCDN2K3GPxY2e0OnjJuX/W3/03fRV7W0btNOOgWpvab2P5g=="
+    },
+    "libsodium-wrappers-sumo": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.3.tgz",
+      "integrity": "sha512-JNEZ74zu83BiPxXiYCexVOJdLaNpQTig5bC28MsPzBjzUwIDdLSabEfQNbEtODaNcqq3UlEgYa8IGvDF1jrINA==",
+      "requires": {
+        "libsodium-sumo": "0.7.3"
+      }
+    },
     "listr": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
@@ -14120,8 +14161,7 @@
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
     "lodash.tail": {
       "version": "4.1.1",
@@ -14246,6 +14286,7 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
@@ -14520,6 +14561,7 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
       "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "dev": true,
       "requires": {
         "dom-walk": "^0.1.0"
       }
@@ -14595,7 +14637,8 @@
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
     },
     "minipass": {
       "version": "2.3.5",
@@ -14628,6 +14671,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
       "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
       "requires": {
         "concat-stream": "^1.5.0",
         "duplexify": "^3.4.2",
@@ -14682,6 +14726,7 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
@@ -14696,6 +14741,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
       "requires": {
         "aproba": "^1.1.1",
         "copy-concurrently": "^1.0.0",
@@ -14744,9 +14790,9 @@
       }
     },
     "nan": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA=="
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -15372,6 +15418,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -15636,6 +15683,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
       "requires": {
         "cyclist": "~0.2.2",
         "inherits": "^2.0.3",
@@ -15762,7 +15810,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -16665,7 +16714,8 @@
     "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=="
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
     },
     "progress": {
       "version": "2.0.3",
@@ -16685,7 +16735,8 @@
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
     },
     "promise-polyfill": {
       "version": "6.1.0",
@@ -16768,7 +16819,8 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
     },
     "psl": {
       "version": "1.1.29",
@@ -16794,6 +16846,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -16803,6 +16856,7 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
       "requires": {
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
@@ -16813,6 +16867,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
             "once": "^1.3.1"
@@ -16823,7 +16878,8 @@
     "punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
     },
     "q": {
       "version": "1.5.1",
@@ -16856,7 +16912,8 @@
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
     },
     "querystring-es3": {
       "version": "0.2.1",
@@ -17424,6 +17481,7 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -17757,25 +17815,6 @@
         "minimatch": "3.0.4"
       }
     },
-    "recursive-rename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/recursive-rename/-/recursive-rename-2.0.0.tgz",
-      "integrity": "sha1-da66Q08kJk1QjR2Dr5U9iYknMec=",
-      "requires": {
-        "babel-runtime": "^6.23.0",
-        "bluebird": "^3.5.0",
-        "colors": "^1.1.2",
-        "global": "^4.3.2",
-        "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
-      }
-    },
     "redent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
@@ -18214,6 +18253,7 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
       "requires": {
         "glob": "^7.0.5"
       }
@@ -18587,6 +18627,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
       "requires": {
         "aproba": "^1.1.1"
       }
@@ -19151,7 +19192,8 @@
     "semver": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "dev": true
     },
     "semver-diff": {
       "version": "2.1.0",
@@ -20070,6 +20112,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
       "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
       "requires": {
         "figgy-pudding": "^3.5.1"
       }
@@ -20152,6 +20195,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "stream-shift": "^1.0.0"
@@ -20173,7 +20217,8 @@
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
     },
     "stream-to-observable": {
       "version": "0.1.0",
@@ -20263,6 +20308,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -20381,6 +20427,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
       }
@@ -20435,6 +20482,16 @@
         "util.promisify": "~1.0.0"
       }
     },
+    "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==",
+      "dev": true,
+      "requires": {
+        "js-yaml": "^3.12.0",
+        "loader-utils": "^1.0.3"
+      }
+    },
     "symbol-observable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
@@ -20868,6 +20925,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -21018,7 +21076,6 @@
       "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"
       },
@@ -21026,8 +21083,7 @@
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
       }
     },
@@ -21144,7 +21200,8 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
     },
     "typedarray-to-buffer": {
       "version": "3.1.5",
@@ -21271,6 +21328,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
       "requires": {
         "unique-slug": "^2.0.0"
       }
@@ -21279,6 +21337,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
       "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
       }
@@ -21292,6 +21351,27 @@
         "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"
+      },
+      "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==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        }
+      }
+    },
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -21487,6 +21567,7 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
       "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
       "requires": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"
@@ -21558,7 +21639,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "util.promisify": {
       "version": "1.0.0",
@@ -21907,8 +21989,7 @@
     "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==",
-      "dev": true
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "webpack": {
       "version": "4.27.1",
@@ -23180,7 +23261,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write": {
       "version": "0.2.1",
@@ -23259,12 +23341,14 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
     },
     "yaeti": {
       "version": "0.0.6",
@@ -23274,7 +23358,8 @@
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
     },
     "yargs": {
       "version": "11.1.0",
diff --git a/package.json b/package.json
index 915e42e54..c7615c9cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aepp-base",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "author": "Sascha Hanse <shanse@posteo.de>",
   "private": true,
   "scripts": {
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@aeternity/aepp-components-3": "3.0.0-alpha.9",
-    "@aeternity/aepp-sdk": "^3.1.0",
+    "@aeternity/aepp-sdk": "^3.3.0",
     "@aeternity/bip39": "^0.1.0",
     "@aeternity/hd-wallet": "^0.2.0",
     "@aeternity/ledger-app-api": "0.1.0",
@@ -77,6 +77,9 @@
     "node-sass": "^4.12.0",
     "sass-loader": "^7.0.3",
     "serve": "^11.0.0",
+    "svg-url-loader": "^2.3.2",
+    "svgo": "^1.2.2",
+    "svgo-loader": "^2.2.0",
     "vue-cli-plugin-storybook": "^0.5.2",
     "vue-template-compiler": "^2.6.7"
   },
diff --git a/public/index.html b/public/index.html
index 822836eac..7b95b7e33 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,6 @@
     <% } %>
 
     <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=Roboto+Mono:500|Roboto:300,400,500,700" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono" rel="stylesheet">
     <link href="https://rsms.me/inter/inter-ui.css" rel="stylesheet">
   </head>
diff --git a/scripts/before-deploy.sh b/scripts/build-cordova.sh
similarity index 50%
rename from scripts/before-deploy.sh
rename to scripts/build-cordova.sh
index 93c334501..01e1662e9 100755
--- a/scripts/before-deploy.sh
+++ b/scripts/build-cordova.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -e
 
+npm run build:cordova
+npm run gen:cordova-resources
+
 if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-  npm run build:cordova
-  npm run gen:cordova-resources
   npx cordova build ios
   tar -czvf aeternity.app.tar.gz -C platforms/ios/build/emulator Base\ æpp.app
+else
+  npx cordova build android
+  mv platforms/android/app/build/outputs/apk/debug/app-debug.apk ./aeternity.apk
 fi
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 02e3759c1..7d6491b43 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -24,8 +24,10 @@ case $TRAVIS_BRANCH in
     ;;
 esac
 
-if [[ $TRAVIS_OS_NAME != "osx" ]]; then
-  rsync -r --delete-after -v $TRAVIS_BUILD_DIR/dist/* deploy@139.59.142.164:/var/www/html/$UPLOAD_PATH
-else
+if [[ $TRAVIS_OS_NAME == "osx" ]]; then
   rsync -r --delete-after -v $TRAVIS_BUILD_DIR/aeternity.app.tar.gz deploy@139.59.142.164:/var/www/html/$UPLOAD_PATH
+elif [[ $ANDROID_HOME != "" ]]; then
+  rsync -r --delete-after -v $TRAVIS_BUILD_DIR/aeternity.apk deploy@139.59.142.164:/var/www/html/$UPLOAD_PATH/aeternity.apk
+else
+  rsync -r --delete-after -v $TRAVIS_BUILD_DIR/dist/* deploy@139.59.142.164:/var/www/html/$UPLOAD_PATH
 fi
diff --git a/scripts/install.sh b/scripts/install.sh
index b87866597..385789309 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -3,8 +3,12 @@ set -e
 
 npm ci
 
-if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-  HOMEBREW_NO_AUTO_UPDATE=1 brew install imagemagick
+if [[ $ANDROID_HOME != "" || $TRAVIS_OS_NAME == "osx" ]]; then
   mkdir www
-  npx cordova prepare ios
+
+  if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+    npx cordova prepare ios
+  else
+    npx cordova prepare android
+  fi
 fi
diff --git a/scripts/script.sh b/scripts/script.sh
deleted file mode 100755
index ae715e5ff..000000000
--- a/scripts/script.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ $TRAVIS_OS_NAME != "osx" ]]; then
-  npm run lint
-  npm run test:unit
-  npm run build -- --report
-
-  npx serve --single dist &
-  trap "kill $!" EXIT
-  npm run test:e2e -- --headless --url http://localhost:5000
-fi
diff --git a/scripts/test.sh b/scripts/test.sh
new file mode 100755
index 000000000..1f48c4950
--- /dev/null
+++ b/scripts/test.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+npm run lint
+npm run test:unit
+npm run build -- --report
+
+npx serve --single dist &
+trap "kill $!" EXIT
+npm run test:e2e -- --headless --url http://localhost:5000
diff --git a/src/assets/icons/aepps/transfer.svg b/src/assets/icons/aepps/transfer.svg
deleted file mode 100644
index f46b4ee98..000000000
--- a/src/assets/icons/aepps/transfer.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="22" viewBox="0 0 46 22">
-    <defs>
-        <path id="a" d="M44.024 21.018a10.995 10.995 0 0 0-10.95 10h-2.1c-.548-6.056-5.901-10.52-11.956-9.973-6.055.548-10.52 5.9-9.973 11.955.548 6.055 5.9 10.52 11.956 9.973a11.008 11.008 0 0 0 9.598-7.955h-2.1c-1.664 4.675-6.804 7.116-11.48 5.452a8.987 8.987 0 1 1 11.946-9.452h-8.941a1 1 0 1 0 0 2h13.05c.554 6.048 5.906 10.503 11.955 9.95 6.049-.554 10.503-5.906 9.949-11.955a10.996 10.996 0 0 0-10.954-9.995m-1.414 12l-2.293 2.293a1 1 0 0 0 1.414 1.414l4-4a1 1 0 0 0 0-1.415l-4-4a1 1 0 0 0-1.414 1.415l2.293 2.293h-7.527a8.997 8.997 0 0 1 9.944-7.94 8.998 8.998 0 0 1-1.003 17.94 9.01 9.01 0 0 1-8.941-8h7.527z"/>
-    </defs>
-    <use fill="#F7296E" fill-rule="evenodd" transform="translate(-9 -21)" xlink:href="#a"/>
-</svg>
diff --git a/src/assets/icons/grid-black.svg b/src/assets/icons/grid-black.svg
deleted file mode 100644
index fbdf7d798..000000000
--- a/src/assets/icons/grid-black.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g fill="#000" fill-rule="evenodd" transform="translate(2 2)">
-        <rect width="8.421" height="8.421" rx="1.5"/>
-        <rect width="8.421" height="8.421" x="11.579" rx="1.5"/>
-        <rect width="8.421" height="8.421" y="11.579" rx="1.5"/>
-        <rect width="8.421" height="8.421" x="11.579" y="11.579" rx="1.5"/>
-    </g>
-</svg>
diff --git a/src/assets/icons/grid.svg b/src/assets/icons/grid.svg
deleted file mode 100644
index f417e0f47..000000000
--- a/src/assets/icons/grid.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g fill="#FFF" fill-rule="evenodd" transform="translate(2 2)">
-        <rect width="8.421" height="8.421" rx="1.5"/>
-        <rect width="8.421" height="8.421" x="11.579" rx="1.5"/>
-        <rect width="8.421" height="8.421" y="11.579" rx="1.5"/>
-        <rect width="8.421" height="8.421" x="11.579" y="11.579" rx="1.5"/>
-    </g>
-</svg>
diff --git a/src/assets/icons/plus.svg b/src/assets/icons/plus.svg
deleted file mode 100644
index b669cb998..000000000
--- a/src/assets/icons/plus.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="54" height="54" viewBox="-18 -18 60 60">
-    <defs>
-        <path id="a" d="M13 13h9v-2h-9V2h-2v9H2v2h9v9h2z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <use fill="#f03c6e" xlink:href="#a"/>
-    </g>
-</svg>
diff --git a/src/assets/icons/remote-connect.svg b/src/assets/icons/remote-connect.svg
deleted file mode 100644
index bc5150bc5..000000000
--- a/src/assets/icons/remote-connect.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="39" height="33" viewBox="0 0 39 33">
-    <defs>
-        <path id="a" d="M48.75 15.999a2.75 2.75 0 0 1 2.75 2.75v22a2.75 2.75 0 0 1-2.75 2.788H36.944a4.714 4.714 0 0 0 2.071 1.832c.918.478 1.724.954 1.834 1.834a1.834 1.834 0 0 1-.624 1.52.912.912 0 0 1-.641.276H24.916a.915.915 0 0 1-.732-.311 1.831 1.831 0 0 1-.624-1.521c.184-.844.99-1.32 1.834-1.834a4.718 4.718 0 0 0 2.071-1.834H15.75a2.75 2.75 0 0 1-2.75-2.75v-22a2.75 2.75 0 0 1 2.75-2.75h33zm-33 1.834a.916.916 0 0 0-.916.916v19.25h34.832v-19.25a.917.917 0 0 0-.916-.916h-33zm22.404 29.095a5.604 5.604 0 0 1-3.044-3.43h-5.701a5.61 5.61 0 0 1-3.063 3.43h.002l-.404.239h12.614l-.404-.24zm10.596-5.261a.919.919 0 0 0 .916-.918l.002-.916H14.834v.916c0 .507.409.918.916.918h33z"/>
-    </defs>
-    <use fill="#F7296E" fill-rule="evenodd" transform="translate(-13 -16)" xlink:href="#a"/>
-</svg>
diff --git a/src/components/Notification.vue b/src/components/Notification.vue
index bb36e1a81..a143b103c 100644
--- a/src/components/Notification.vue
+++ b/src/components/Notification.vue
@@ -22,7 +22,7 @@ export default {
     text: { type: String, default: '' },
   },
   mounted() {
-    setInterval(() => this.resolve(), 5000);
+    setTimeout(() => this.resolve(), 5000);
   },
 };
 </script>
@@ -36,6 +36,9 @@ export default {
   top: 0;
   left: rem(10px);
   right: rem(10px);
+  max-width: rem(520px);
+  margin-left: auto;
+  margin-right: auto;
   padding-top: env(safe-area-inset-top);
   border-radius: 0 0 rem(8px) rem(8px);
   background-color: $color-neutral-maximum;
@@ -52,11 +55,15 @@ export default {
 
   .content {
     overflow-wrap: break-word;
-    padding: rem(6px) rem(16px);
+    padding: rem(20px) rem(16px);
 
     /deep/ .list-item {
       padding-left: 0;
       padding-right: 0;
+
+      .content {
+        height: rem(40px);
+      }
     }
   }
 
diff --git a/src/lib/currencyConverter.js b/src/lib/currencyConverter.js
deleted file mode 100644
index b77cf19b8..000000000
--- a/src/lib/currencyConverter.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export const CURRENCIES = {
-  AE: 'AE',
-  BTC: 'BTC',
-  ETH: 'ETH',
-  EUR: 'EUR',
-  USD: 'USD',
-  CHF: 'CHF',
-};
-
-export const convertCurrency = (fromCurrency, toCurrency, value = 1) => fetch(`https://min-api.cryptocompare.com/data/price?fsym=${fromCurrency}&tsyms=${toCurrency}`).then((response) => {
-  const contentType = response.headers.get('content-type');
-  if (contentType && contentType.includes('application/json')) {
-    return response.json();
-  }
-
-  return {};
-}).then((body) => {
-  const rate = parseFloat(body[toCurrency]);
-  return !Number.isNaN(rate) ? value * rate : undefined;
-});
-
-export const convertAEtoUSD = convertCurrency.bind(undefined, CURRENCIES.AE, CURRENCIES.USD);
-
-export const convertETHtoUSD = convertCurrency.bind(undefined, CURRENCIES.ETH, CURRENCIES.USD);
-
-export const convertAEtoCHF = convertCurrency.bind(undefined, CURRENCIES.AE, CURRENCIES.CHF);
-
-export const convertETHtoCHF = convertCurrency.bind(undefined, CURRENCIES.ETH, CURRENCIES.CHF);
diff --git a/src/pages/NotFound.vue b/src/pages/NotFound.vue
index f0e80f531..da94bd751 100644
--- a/src/pages/NotFound.vue
+++ b/src/pages/NotFound.vue
@@ -4,15 +4,25 @@
     class="not-found"
     :hide-tab-bar="!loggedIn"
   >
-    Page not found
+    It looks like the page you are looking for was not found.
+
+    <AeButton
+      v-if="!loggedIn && $globals.IS_MOBILE_DEVICE"
+      slot="footer"
+      :to="{ name: 'intro' }"
+    >
+      Go home
+    </AeButton>
   </component>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import MobilePage from '../components/mobile/Page.vue';
+import AeButton from '../components/AeButton.vue';
 
 export default {
+  components: { AeButton },
   data: () => ({
     wrapper: process.env.IS_MOBILE_DEVICE ? MobilePage : 'div',
   }),
diff --git a/src/pages/desktop/Send.vue b/src/pages/desktop/Send.vue
index f482ad974..a2512a2be 100644
--- a/src/pages/desktop/Send.vue
+++ b/src/pages/desktop/Send.vue
@@ -104,11 +104,5 @@ export default {
     margin-left: auto;
     margin-right: auto;
   }
-
-  .transfer-notification {
-    left: auto;
-    right: auto;
-    width: rem(520px);
-  }
 }
 </style>
diff --git a/src/store/modules/root.js b/src/store/modules/root.js
index 3ff03c6f5..887d91a68 100644
--- a/src/store/modules/root.js
+++ b/src/store/modules/root.js
@@ -74,14 +74,14 @@ export default {
 
   mutations: {
     syncState(state, remoteState) {
-      Object.entries(
-        mergeWith(
-          {},
-          state,
-          remoteState,
-          (objValue, srcValue) => (Array.isArray(srcValue) ? srcValue : undefined),
-        ),
-      )
+      const customizer = (objValue, srcValue) => {
+        if (!Array.isArray(srcValue)) return undefined;
+        if (!Array.isArray(objValue)) return srcValue;
+        return srcValue.map((el, idx) => (
+          el && typeof el === 'object' ? mergeWith({}, objValue[idx], el, customizer) : el
+        ));
+      };
+      Object.entries(mergeWith({}, state, remoteState, customizer))
         .forEach(([name, value]) => Vue.set(state, name, value));
     },
     markMigrationAsApplied(state, migrationId) {
diff --git a/src/stories/notifications.stories.js b/src/stories/notifications.stories.js
new file mode 100644
index 000000000..fb7ffab03
--- /dev/null
+++ b/src/stories/notifications.stories.js
@@ -0,0 +1,39 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { storiesOf } from '@storybook/vue';
+import { action } from '@storybook/addon-actions';
+import Notification from '../components/Notification.vue';
+import NotificationSpend from '../components/NotificationSpend.vue';
+import { amount } from './mock-data';
+
+const methods = { resolve: action('resolve') };
+
+storiesOf('notifications', module)
+  .add('Notification', () => ({
+    components: { Notification },
+    template: `
+      <Notification
+        text="Notification content"
+        :resolve="resolve"
+      />`,
+    methods,
+  }))
+  .add('long text', () => ({
+    components: { Notification },
+    template: `
+      <Notification
+        text="Test Test Test Test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Test Test Test"
+        :resolve="resolve"
+      />`,
+    methods,
+  }))
+  .add('NotificationSpend', () => ({
+    components: { NotificationSpend },
+    template: `
+      <NotificationSpend
+        :amount="amount"
+        transaction-hash="th_9HqNoJafu4sbTgxZBQf91Xm4xD5Rw6FNSxxrqPTr98TCZW71o"
+        :resolve="resolve"
+      />`,
+    data: () => ({ amount }),
+    methods,
+  }));
diff --git a/vue.config.js b/vue.config.js
index 40964670c..e40b0c198 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,7 +33,19 @@ module.exports = {
     }
 
     return [definitions];
-  }),
+  }).end()
+    .module.rule('svg')
+    .use('file-loader')
+    .loader('svg-url-loader')
+    .options({
+      noquotes: true,
+      limit: 4096,
+      name: 'img/[name].[hash:8].[ext]',
+    })
+    .end()
+    .use('svgo-loader')
+    .loader('svgo-loader')
+    .end(),
   pwa: {
     workboxPluginMode: 'InjectManifest',
     workboxOptions: {
@@ -51,5 +63,5 @@ module.exports = {
     themeColor: '#f7296e',
     msTileColor: '#f7296e',
   },
-  transpileDependencies: ['@aeternity/aepp-sdk', '@aeternity/hd-wallet', '@download/blockies'],
+  transpileDependencies: ['@aeternity/aepp-sdk/es', '@aeternity/hd-wallet', '@download/blockies'],
 };