diff --git a/.gitignore b/.gitignore
index c520c18..7de49a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,5 @@ UserInterfaceState.xcuserstate
 .todo
 
 out
-*.apk
\ No newline at end of file
+*.apk
+.env*
\ No newline at end of file
diff --git a/config.xml b/config.xml
index 81bde40..40c2bf3 100644
--- a/config.xml
+++ b/config.xml
@@ -4,7 +4,7 @@
     <name>Saza</name>
     <description>A wallet that supports Stellar Lumens(XLM) and assets issued on the Stellar network.</description>
     <author email="peter@oliha.dev" href="https://saza.io/">Peter Oliha</author>
-    <content original-src="index.html" src="http://localhost:8100" />
+    <content src="index.html" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -110,5 +110,4 @@
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="cordova-plugin-ionic-webview" spec="^4.0.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
-    <allow-navigation href="http://localhost:8100" sessionid="433d1cd8" />
 </widget>
diff --git a/forge.config.js b/forge.config.js
index f044814..feaf444 100644
--- a/forge.config.js
+++ b/forge.config.js
@@ -1,3 +1,6 @@
+const fs = require('fs');
+const path = require('path');
+
 module.exports = {
   packagerConfig: {
     "dir": "./www"
@@ -9,7 +12,21 @@ module.exports = {
   ],
   hooks: {
     postMake: (_, results) => {
-      results.map(({ artifacts }) => artifacts).flat().forEach(result => console.log(result));
+
+      const builds = results.map(({ artifacts }) => artifacts).flat();
+      try {
+        for (const b of builds) {
+          const destination = path.resolve('./dist', path.basename(b))
+          fs.copyFileSync(b, destination)
+          console.log(`copied: ${b} => ${destination}`);
+        }
+
+        console.log('All files copied to ./dist');
+
+      } catch (error) {
+        console.log(error)
+      }
+
     }
   }
 }
\ No newline at end of file
diff --git a/scripts/android-build.sh b/scripts/android-build.sh
index 5599570..d0a6223 100755
--- a/scripts/android-build.sh
+++ b/scripts/android-build.sh
@@ -1,6 +1,8 @@
 #! /bin/bash
 set -e
 
+source .env
+
 UNSIGNED_APK="platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk"
 VERSION=`node -pe "require('./package.json').version"`
 RELEASE_FILE=saza-v$VERSION.apk
@@ -18,7 +20,7 @@ echo "Signing apk ..."
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $SAZA_KEYSTORE $UNSIGNED_APK $SAZA_KEYSTORE_ALIAS
 
 echo "Run zipalign on apk ..."
-~/Android/Sdk/build-tools/28.0.3/zipalign -v 4 $UNSIGNED_APK $RELEASE_FILE
+~/Android/Sdk/build-tools/29.0.3/zipalign -f -v 4 $UNSIGNED_APK $RELEASE_FILE
 
 echo "Android production build completed..."
 ls -alh $RELEASE_FILE
\ No newline at end of file
diff --git a/scripts/electron-build.sh b/scripts/electron-build.sh
index 02eab61..430c453 100755
--- a/scripts/electron-build.sh
+++ b/scripts/electron-build.sh
@@ -1,10 +1,18 @@
 #! /bin/bash
 set -e
 
+if [ -d "./dist" ] 
+then
+    echo "Removing dist directory from previous build ..." 
+    rm -rf dist
+fi
+
+echo "Making dist directory ..."
+mkdir dist
 
 
 echo "Building production release ..."
-ng build --prod --base-href ./
+#ng build --prod --base-href ./
 
 echo "Making electron build ..."
 electron-forge make
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 736c2f2..7fc78ba 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,4 +1,4 @@
-<app-header [title]="pageTitle" [helpUrl]="helpUrl" [subTitle]="subTitle"></app-header>
+<app-header [title]="pageTitle" [helpUrl]="helpUrl"></app-header>
 
 <ion-content>
   <form [formGroup]="loginForm" (submit)="formSubmit()">
diff --git a/src/app/pages/saza-setup/saza-setup.page.html b/src/app/pages/saza-setup/saza-setup.page.html
index 50ec700..0f4f9d6 100644
--- a/src/app/pages/saza-setup/saza-setup.page.html
+++ b/src/app/pages/saza-setup/saza-setup.page.html
@@ -1,4 +1,4 @@
-<app-header [title]="pageTitle" [helpUrl]="helpUrl" [subTitle]="subTitle"></app-header>
+<app-header [title]="pageTitle" [helpUrl]="helpUrl"></app-header>
 
 <ion-content>
   <form [formGroup]="passwordForm">