diff --git a/mobile/assets/iitc.js b/mobile/assets/iitc.js
index fce3d449..cbb53766 120000
--- a/mobile/assets/iitc.js
+++ b/mobile/assets/iitc.js
@@ -1 +1 @@
-../../iitc-debug.user.js
\ No newline at end of file
+../../build/local8000/total-conversion-build.user.js
\ No newline at end of file
diff --git a/mobile/build_mobile.js b/mobile/build_mobile.js
index ef8057ca..16380359 100755
--- a/mobile/build_mobile.js
+++ b/mobile/build_mobile.js
@@ -4,9 +4,10 @@ set -e
 
 cd `dirname "$0"`
 cd ..
-./build.py
-compressed="$(uglifyjs iitc-debug.user.js)"
-echo "${compressed}" > "iitc-debug.user.js"
+./build.py local8000
+cd build/local8000
+compressed="$(uglifyjs total-conversion-build.user.js)"
+echo "${compressed}" > "total-conversion-build.user.js"
 
-cd mobile
+cd ../../mobile
 ant release
diff --git a/mobile/res/layout/activity_main.xml b/mobile/res/layout/activity_main.xml
index 1353be2c..9abfe63c 100644
--- a/mobile/res/layout/activity_main.xml
+++ b/mobile/res/layout/activity_main.xml
@@ -1,6 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.cradle.iitc_mobile.IITC_WebView  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/webview"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-/>
\ No newline at end of file
+    android:orientation="vertical" >
+
+    <com.cradle.iitc_mobile.IITC_WebView
+        android:id="@+id/iitc_webview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 0dbd3901..8cd5b218 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -25,15 +25,15 @@ public class IITC_Mobile extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
+		iitc_view = (IITC_WebView) findViewById(R.id.iitc_webview);
 
 		// we do not want to reload our page every time we switch orientations...
 		// so restore state if activity was already created
 		if(savedInstanceState != null) {
-			((IITC_WebView)findViewById(R.id.webview)).restoreState(savedInstanceState);
+			iitc_view.restoreState(savedInstanceState);
 		}
 		else {
 			// load new iitc web view with ingress intel page
-			iitc_view= (IITC_WebView) findViewById(R.id.webview);
 			Intent intent = getIntent();
 			String action = intent.getAction();
 			if (Intent.ACTION_VIEW.equals(action)) {
@@ -99,6 +99,8 @@ public class IITC_Mobile extends Activity {
 				iitc_view.getWebViewClient().loadIITC_JS(this);
 			} catch (IOException e1) {
 				e1.printStackTrace();
+			} catch (NullPointerException e2) {
+				e2.printStackTrace();
 			}
 			return true;
 		// print version number